Changeset 130700 in webkit

Timestamp:

Oct 8, 2012, 4:20:33 PM (14 years ago)

Author:

Nate Chapin

Message:

Post-r130226 Cleanup: Comment a complicated if statement and make it a helper.
​https://bugs.webkit.org/show_bug.cgi?id=98463

Reviewed by Eric Seidel.

No new tests, refactor only.

• rendering/RenderLayer.cpp:

(WebCore::frameElementAndViewPermitScroll):
(WebCore::RenderLayer::scrollRectToVisible):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderLayer.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-10-08  Nate Chapin  <japhet@chromium.org>
+
+        Post-r130226 Cleanup: Comment a complicated if statement and make it a helper.
+        https://bugs.webkit.org/show_bug.cgi?id=98463
+
+        Reviewed by Eric Seidel.
+
+        No new tests, refactor only.
+
+        * rendering/RenderLayer.cpp:
+        (WebCore::frameElementAndViewPermitScroll):
+        (WebCore::RenderLayer::scrollRectToVisible):
+
 2012-10-06  Martin Robinson  <mrobinson@igalia.com>
 

trunk/Source/WebCore/rendering/RenderLayer.cpp

@@ -1756 +1756 @@
 }
 
+static inline bool frameElementAndViewPermitScroll(HTMLFrameElement* frameElement, FrameView* frameView) 
+{
+    // If scrollbars aren't explicitly forbidden, permit scrolling.
+    if (frameElement && frameElement->scrollingMode() != ScrollbarAlwaysOff)
+        return true;
+
+    // If scrollbars are forbidden, user initiated scrolls should obviously be ignored.
+    if (frameView->wasScrolledByUser())
+        return false;
+
+    // Forbid autoscrolls when scrollbars are off, but permits other programmatic scrolls,
+    // like navigation to an anchor.
+    return !frameView->frame()->eventHandler()->autoscrollInProgress();
+}
+
 void RenderLayer::scrollRectToVisible(const LayoutRect& rect, const ScrollAlignment& alignX, const ScrollAlignment& alignY)
 {
@@ -1806 +1821 @@
                     frameElement = static_cast<HTMLFrameElement*>(ownerElement);
 
-                if ((frameElement && frameElement->scrollingMode() != ScrollbarAlwaysOff)
-                    || (!frameView->frame()->eventHandler()->autoscrollInProgress() && !frameView->wasScrolledByUser())) {
+                if (frameElementAndViewPermitScroll(frameElement, frameView)) {
                     LayoutRect viewRect = frameView->visibleContentRect();
                     LayoutRect exposeRect = getRectToExpose(viewRect, rect, alignX, alignY);