From 71fb04c9b30eb193aee5c19759bafff48c624e30 Mon Sep 17 00:00:00 2001 From: Daniel Weck Date: Tue, 21 Oct 2014 01:42:56 +0100 Subject: [PATCH] OSX launcher now uses CSS 3D rendering by default, setWantsLayer for UIViews (including WebView) needs further experimentation (my library of FXL test EPUBs renders best overall with CSS3D...with the caveat that video/audio do not always interact, text not selectable, etc.) TODO continued... --- LauncherOSX/LOXPreferences.mm | 2 ++ LauncherOSX/LOXWebViewController.mm | 7 +++++-- readium-shared-js | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/LauncherOSX/LOXPreferences.mm b/LauncherOSX/LOXPreferences.mm index c028c1c..60ff9ae 100644 --- a/LauncherOSX/LOXPreferences.mm +++ b/LauncherOSX/LOXPreferences.mm @@ -108,6 +108,8 @@ -(id)initWithDictionary:(NSDictionary *)dict -(NSDictionary *) toDictionary { return @{ + @"enableGPUHardwareAccelerationCSS3D": [NSNumber numberWithBool:YES], + NSStringFromSelector(@selector(fontSize)): self.fontSize, NSStringFromSelector(@selector(mediaOverlaysSkipSkippables)): self.mediaOverlaysSkipSkippables, NSStringFromSelector(@selector(mediaOverlaysEscapeEscapables)): self.mediaOverlaysEscapeEscapables, diff --git a/LauncherOSX/LOXWebViewController.mm b/LauncherOSX/LOXWebViewController.mm index 21253ac..a894927 100644 --- a/LauncherOSX/LOXWebViewController.mm +++ b/LauncherOSX/LOXWebViewController.mm @@ -194,8 +194,11 @@ - (void)awakeFromNib NSURL *url = [NSURL fileURLWithPath:_baseUrlPath]; - [[_webView superview] setWantsLayer:YES]; - [_webView setWantsLayer:NO]; + // See enableGPUHardwareAccelerationCSS3D in LOXPreferences@toDictionary() + //[[_webView superview] setWantsLayer:YES]; + //[_webView setWantsLayer:YES]; + //[[[_webView mainFrame] frameView] setWantsLayer:YES]; + //[[[[_webView mainFrame] frameView] documentView] setWantsLayer:YES]; [[_webView mainFrame] loadRequest:[NSURLRequest requestWithURL:url]]; } diff --git a/readium-shared-js b/readium-shared-js index 6d97d35..152f961 160000 --- a/readium-shared-js +++ b/readium-shared-js @@ -1 +1 @@ -Subproject commit 6d97d359d0c6dfd51feb51eb6329c82a613a5f99 +Subproject commit 152f9613dc284795d779e7e3f11b741c8db2730f