Title: [92030] trunk/Source/WebCore
- Revision
- 92030
- Author
- [email protected]
- Date
- 2011-07-29 16:11:13 -0700 (Fri, 29 Jul 2011)
Log Message
[chromium] Only force slow scrolling for iframes under --force-compositing-mode
https://bugs.webkit.org/show_bug.cgi?id=65394
Reviewed by James Robinson.
The previous code introduced by r91591 made composited frames as well
as non-composited subframes go down the slow scrolling path. Adjust
the check to use ownerElement to test for subframe and use
hasCompositedContent() which is a more correct test for compositing
than isEnclosedInCompositingLayer.
* page/FrameView.cpp:
(WebCore::FrameView::useSlowRepaints):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (92029 => 92030)
--- trunk/Source/WebCore/ChangeLog 2011-07-29 23:11:06 UTC (rev 92029)
+++ trunk/Source/WebCore/ChangeLog 2011-07-29 23:11:13 UTC (rev 92030)
@@ -1,3 +1,19 @@
+2011-07-29 Adrienne Walker <[email protected]>
+
+ [chromium] Only force slow scrolling for iframes under --force-compositing-mode
+ https://bugs.webkit.org/show_bug.cgi?id=65394
+
+ Reviewed by James Robinson.
+
+ The previous code introduced by r91591 made composited frames as well
+ as non-composited subframes go down the slow scrolling path. Adjust
+ the check to use ownerElement to test for subframe and use
+ hasCompositedContent() which is a more correct test for compositing
+ than isEnclosedInCompositingLayer.
+
+ * page/FrameView.cpp:
+ (WebCore::FrameView::useSlowRepaints):
+
2011-07-29 Emil A Eklund <[email protected]>
-webkit-marquee with anonymous node causes segmentation fault in Node::document
Modified: trunk/Source/WebCore/page/FrameView.cpp (92029 => 92030)
--- trunk/Source/WebCore/page/FrameView.cpp 2011-07-29 23:11:06 UTC (rev 92029)
+++ trunk/Source/WebCore/page/FrameView.cpp 2011-07-29 23:11:13 UTC (rev 92030)
@@ -1146,7 +1146,7 @@
#if PLATFORM(CHROMIUM)
// The chromium compositor does not support scrolling a non-composited frame within a composited page through
// the fast scrolling path, so force slow scrolling in that case.
- if (!isEnclosedInCompositingLayer() && m_frame->page() && m_frame->page()->mainFrame()->view()->hasCompositedContent())
+ if (m_frame->ownerElement() && !hasCompositedContent() && m_frame->page() && m_frame->page()->mainFrame()->view()->hasCompositedContent())
return true;
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
