Title: [105806] trunk/Source/WebKit2
- Revision
- 105806
- Author
- [email protected]
- Date
- 2012-01-24 14:10:32 -0800 (Tue, 24 Jan 2012)
Log Message
https://bugs.webkit.org/show_bug.cgi?id=76928
Accelerated drawing should force compositing mode
-and corresponding-
<rdar://problem/10697417>
Reviewed by Simon Fraser.
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::updatePreferences):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (105805 => 105806)
--- trunk/Source/WebKit2/ChangeLog 2012-01-24 22:09:45 UTC (rev 105805)
+++ trunk/Source/WebKit2/ChangeLog 2012-01-24 22:10:32 UTC (rev 105806)
@@ -1,3 +1,15 @@
+2012-01-24 Beth Dakin <[email protected]>
+
+ https://bugs.webkit.org/show_bug.cgi?id=76928
+ Accelerated drawing should force compositing mode
+ -and corresponding-
+ <rdar://problem/10697417>
+
+ Reviewed by Simon Fraser.
+
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::updatePreferences):
+
2012-01-24 Alexis Menard <[email protected]>
Unreviewed build fix for Qt.
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (105805 => 105806)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2012-01-24 22:09:45 UTC (rev 105805)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2012-01-24 22:10:32 UTC (rev 105806)
@@ -1840,7 +1840,6 @@
settings->setShowsToolTipOverTruncatedText(store.getBoolValueForKey(WebPreferencesKey::showsToolTipOverTruncatedTextKey()));
settings->setAcceleratedCompositingEnabled(store.getBoolValueForKey(WebPreferencesKey::acceleratedCompositingEnabledKey()) && LayerTreeHost::supportsAcceleratedCompositing());
- settings->setForceCompositingMode(store.getBoolValueForKey(WebPreferencesKey::forceCompositingModeKey()) && LayerTreeHost::supportsAcceleratedCompositing());
settings->setAcceleratedDrawingEnabled(store.getBoolValueForKey(WebPreferencesKey::acceleratedDrawingEnabledKey()) && LayerTreeHost::supportsAcceleratedCompositing());
settings->setCanvasUsesAcceleratedDrawing(store.getBoolValueForKey(WebPreferencesKey::canvasUsesAcceleratedDrawingKey()) && LayerTreeHost::supportsAcceleratedCompositing());
settings->setShowDebugBorders(store.getBoolValueForKey(WebPreferencesKey::compositingBordersVisibleKey()));
@@ -1851,6 +1850,15 @@
settings->setMediaPlaybackAllowsInline(store.getBoolValueForKey(WebPreferencesKey::mediaPlaybackAllowsInlineKey()));
settings->setMockScrollbarsEnabled(store.getBoolValueForKey(WebPreferencesKey::mockScrollbarsEnabledKey()));
+ // <rdar://problem/10697417>: It is necessary to force compositing when accelerate drawing
+ // is enabled on Mac so that scrollbars are always in their own layers.
+#if PLATFORM(MAC)
+ if (settings->acceleratedDrawingEnabled())
+ settings->setForceCompositingMode(LayerTreeHost::supportsAcceleratedCompositing());
+ else
+#endif
+ settings->setForceCompositingMode(store.getBoolValueForKey(WebPreferencesKey::forceCompositingModeKey()) && LayerTreeHost::supportsAcceleratedCompositing());
+
#if ENABLE(SQL_DATABASE)
AbstractDatabase::setIsAvailable(store.getBoolValueForKey(WebPreferencesKey::databasesEnabledKey()));
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
