Changeset 194404 in webkit

Timestamp:

Dec 23, 2015, 4:34:59 PM (11 years ago)

Author:

Simon Fraser

Message:

Minor cleanup in RenderBox::canBeProgramaticallyScrolled()
​https://bugs.webkit.org/show_bug.cgi?id=152515

Reviewed by Tim Horton.

Source/WebCore:

Remove the scrollsOverflow() check in RenderBox::canBeProgramaticallyScrolled(),
since if hasScrollableOverflow is true, scrollsOverflow() must also be true.

Factor clientWidth/Height vs. scrollWidth/Height checks into separate functions,
and call them from two places.

Added a test which is not affected by this particular change, but will verify
that a later change doesn't break anything.

Test: fast/overflow/overflow-hidden-scroll-into-view.html

• rendering/RenderBox.cpp:

(WebCore::RenderBox::canBeScrolledAndHasScrollableArea):
(WebCore::RenderBox::canBeProgramaticallyScrolled):

• rendering/RenderBox.h:

(WebCore::RenderBox::hasHorizontalOverflow):
(WebCore::RenderBox::hasVerticalOverflow):
(WebCore::RenderBox::hasScrollableOverflowX):
(WebCore::RenderBox::hasScrollableOverflowY):

LayoutTests:

Test that programmatic scrolling works inside overflow:hidden.

• fast/overflow/overflow-hidden-scroll-into-view-expected.html: Added.
• fast/overflow/overflow-hidden-scroll-into-view.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/overflow/overflow-hidden-scroll-into-view-expected.html (added)
• LayoutTests/fast/overflow/overflow-hidden-scroll-into-view.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBox.cpp (modified) (2 diffs)
• Source/WebCore/rendering/RenderBox.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2015-12-22  Simon Fraser  <simon.fraser@apple.com>
+
+        Minor cleanup in RenderBox::canBeProgramaticallyScrolled()
+        https://bugs.webkit.org/show_bug.cgi?id=152515
+
+        Reviewed by Tim Horton.
+
+        Test that programmatic scrolling works inside overflow:hidden.
+
+        * fast/overflow/overflow-hidden-scroll-into-view-expected.html: Added.
+        * fast/overflow/overflow-hidden-scroll-into-view.html: Added.
+
 2015-12-23  Ryan Haddad  <ryanhaddad@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-12-22  Simon Fraser  <simon.fraser@apple.com>
+
+        Minor cleanup in RenderBox::canBeProgramaticallyScrolled()
+        https://bugs.webkit.org/show_bug.cgi?id=152515
+
+        Reviewed by Tim Horton.
+
+        Remove the scrollsOverflow() check in RenderBox::canBeProgramaticallyScrolled(),
+        since if hasScrollableOverflow is true, scrollsOverflow() must also be true.
+        
+        Factor clientWidth/Height vs. scrollWidth/Height checks into separate functions,
+        and call them from two places.
+        
+        Added a test which is not affected by this particular change, but will verify
+        that a later change doesn't break anything.
+
+        Test: fast/overflow/overflow-hidden-scroll-into-view.html
+
+        * rendering/RenderBox.cpp:
+        (WebCore::RenderBox::canBeScrolledAndHasScrollableArea):
+        (WebCore::RenderBox::canBeProgramaticallyScrolled):
+        * rendering/RenderBox.h:
+        (WebCore::RenderBox::hasHorizontalOverflow):
+        (WebCore::RenderBox::hasVerticalOverflow):
+        (WebCore::RenderBox::hasScrollableOverflowX):
+        (WebCore::RenderBox::hasScrollableOverflowY):
+
 2015-12-23  Pranjal Jumde  <pjumde@apple.com>
 

trunk/Source/WebCore/rendering/RenderBox.cpp

@@ -868 +868 @@
 bool RenderBox::canBeScrolledAndHasScrollableArea() const
 {
-    return canBeProgramaticallyScrolled() && (scrollHeight() != roundToInt(clientHeight()) || scrollWidth() != roundToInt(clientWidth()));
+    return canBeProgramaticallyScrolled() && (hasHorizontalOverflow() || hasVerticalOverflow());
 }
 
@@ -884 +884 @@
         return false;
 
-    bool hasScrollableOverflow = hasScrollableOverflowX() || hasScrollableOverflowY();
-    if (scrollsOverflow() && hasScrollableOverflow)
+    if (hasScrollableOverflowX() || hasScrollableOverflowY())
         return true;
 

trunk/Source/WebCore/rendering/RenderBox.h

@@ -470 +470 @@
     bool hasVerticalScrollbarWithAutoBehavior() const;
     bool hasHorizontalScrollbarWithAutoBehavior() const;
+
     bool scrollsOverflow() const { return scrollsOverflowX() || scrollsOverflowY(); }
     bool scrollsOverflowX() const { return hasOverflowClip() && (style().overflowX() == OSCROLL || hasHorizontalScrollbarWithAutoBehavior()); }
     bool scrollsOverflowY() const { return hasOverflowClip() && (style().overflowY() == OSCROLL || hasVerticalScrollbarWithAutoBehavior()); }
-    bool hasScrollableOverflowX() const { return scrollsOverflowX() && scrollWidth() != roundToInt(clientWidth()); }
-    bool hasScrollableOverflowY() const { return scrollsOverflowY() && scrollHeight() != roundToInt(clientHeight()); }
+
+    bool hasHorizontalOverflow() const { return scrollWidth() != roundToInt(clientWidth()); }
+    bool hasVerticalOverflow() const { return scrollHeight() != roundToInt(clientHeight()); }
+
+    bool hasScrollableOverflowX() const { return scrollsOverflowX() && hasHorizontalOverflow(); }
+    bool hasScrollableOverflowY() const { return scrollsOverflowY() && hasVerticalOverflow(); }
 
     bool usesCompositedScrolling() const;