Changeset 92030 in webkit

Timestamp:

Jul 29, 2011 4:11:13 PM (13 years ago)

Author:

enne@google.com

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):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/FrameView.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-07-29  Adrienne Walker  <enne@google.com>
+
+        [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  <eae@chromium.org>
 

trunk/Source/WebCore/page/FrameView.cpp

@@ -1147 +1147 @@
     // 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