Title: [101322] trunk/Source/WebCore
- Revision
- 101322
- Author
- [email protected]
- Date
- 2011-11-28 20:34:17 -0800 (Mon, 28 Nov 2011)
Log Message
[chromium] Disable compositing for RTL pages even in forceCompositingMode
https://bugs.webkit.org/show_bug.cgi?id=73195
Reviewed by James Robinson.
* rendering/RenderLayerCompositor.cpp:
(WebCore::RenderLayerCompositor::cacheAcceleratedCompositingFlags):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (101321 => 101322)
--- trunk/Source/WebCore/ChangeLog 2011-11-29 04:06:18 UTC (rev 101321)
+++ trunk/Source/WebCore/ChangeLog 2011-11-29 04:34:17 UTC (rev 101322)
@@ -1,3 +1,13 @@
+2011-11-28 Vangelis Kokkevis <[email protected]>
+
+ [chromium] Disable compositing for RTL pages even in forceCompositingMode
+ https://bugs.webkit.org/show_bug.cgi?id=73195
+
+ Reviewed by James Robinson.
+
+ * rendering/RenderLayerCompositor.cpp:
+ (WebCore::RenderLayerCompositor::cacheAcceleratedCompositingFlags):
+
2011-11-29 Roland Steiner <[email protected]>
From @keyframes rules with the same name, the last rule should be used
Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp (101321 => 101322)
--- trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2011-11-29 04:06:18 UTC (rev 101321)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2011-11-29 04:34:17 UTC (rev 101322)
@@ -139,6 +139,19 @@
if (Settings* settings = m_renderView->document()->settings()) {
hasAcceleratedCompositing = settings->acceleratedCompositingEnabled();
+
+ // We allow the chrome to override the settings, in case the page is rendered
+ // on a chrome that doesn't allow accelerated compositing.
+ if (hasAcceleratedCompositing) {
+ Frame* frame = m_renderView->frameView()->frame();
+ Page* page = frame ? frame->page() : 0;
+ if (page) {
+ ChromeClient* chromeClient = page->chrome()->client();
+ m_compositingTriggers = chromeClient->allowedCompositingTriggers();
+ hasAcceleratedCompositing = m_compositingTriggers;
+ }
+ }
+
showDebugBorders = settings->showDebugBorders();
showRepaintCounter = settings->showRepaintCounter();
forceCompositingMode = settings->forceCompositingMode() && hasAcceleratedCompositing;
@@ -147,17 +160,6 @@
forceCompositingMode = settings->acceleratedCompositingForScrollableFramesEnabled() && requiresCompositingForScrollableFrame();
}
- // We allow the chrome to override the settings, in case the page is rendered
- // on a chrome that doesn't allow accelerated compositing.
- if (hasAcceleratedCompositing) {
- Frame* frame = m_renderView->frameView()->frame();
- Page* page = frame ? frame->page() : 0;
- if (page) {
- ChromeClient* chromeClient = page->chrome()->client();
- m_compositingTriggers = chromeClient->allowedCompositingTriggers();
- hasAcceleratedCompositing = m_compositingTriggers;
- }
- }
if (hasAcceleratedCompositing != m_hasAcceleratedCompositing || showDebugBorders != m_showDebugBorders || showRepaintCounter != m_showRepaintCounter || forceCompositingMode != m_forceCompositingMode)
setCompositingLayersNeedRebuild();
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
