Title: [92299] branches/chromium/835/Source/WebCore/page/FrameView.cpp
- Revision
- 92299
- Author
- [email protected]
- Date
- 2011-08-03 12:06:48 -0700 (Wed, 03 Aug 2011)
Log Message
Merge 92030 - [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):
[email protected]
Review URL: http://codereview.chromium.org/7565014
Modified Paths
Diff
Modified: branches/chromium/835/Source/WebCore/page/FrameView.cpp (92298 => 92299)
--- branches/chromium/835/Source/WebCore/page/FrameView.cpp 2011-08-03 18:56:37 UTC (rev 92298)
+++ branches/chromium/835/Source/WebCore/page/FrameView.cpp 2011-08-03 19:06:48 UTC (rev 92299)
@@ -1151,7 +1151,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
