Changeset 194515 in webkit

Timestamp:

Jan 3, 2016, 11:50:51 AM (10 years ago)

Author:

Simon Fraser

Message:

Rename scrollPosition(Scrollbar*) to scrollOffset(ScrollbarOrientation)
​https://bugs.webkit.org/show_bug.cgi?id=152666

Reviewed by Dan Bernstein.

Scrollbar values take offsets (zero-based), so rename the accessor used
by scrollbars to set their value, and pass in an orientation, rather than
a pointer to the scrollbar.

Source/WebCore:

• platform/ScrollView.cpp:

(WebCore::ScrollView::scrollOffset): Use scrollOffsetFromPosition rather than
manually adding scrollOrigin.
(WebCore::ScrollView::scrollPosition): Renamed.

• platform/ScrollView.h:

(WebCore::ScrollView::cachedScrollPosition):

• platform/ScrollableArea.h:
• platform/Scrollbar.cpp:

(WebCore::Scrollbar::Scrollbar):
(WebCore::Scrollbar::offsetDidChange):

• rendering/RenderLayer.cpp:

(WebCore::RenderLayer::scrollOffset):
(WebCore::RenderLayer::scrollPosition): Renamed.

• rendering/RenderLayer.h:
• rendering/RenderListBox.cpp:

(WebCore::RenderListBox::scrollOffset):
(WebCore::RenderListBox::scrollPosition): Renamed.

• rendering/RenderListBox.h:

Source/WebKit2:

• WebProcess/Plugins/PDF/DeprecatedPDFPlugin.h:
• WebProcess/Plugins/PDF/DeprecatedPDFPlugin.mm:

(WebKit::PDFPlugin::scrollOffset):
(WebKit::PDFPlugin::scrollPosition): Renamed.

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/ScrollView.cpp (modified) (1 diff)
• WebCore/platform/ScrollView.h (modified) (2 diffs)
• WebCore/platform/ScrollableArea.h (modified) (2 diffs)
• WebCore/platform/Scrollbar.cpp (modified) (2 diffs)
• WebCore/rendering/RenderLayer.cpp (modified) (1 diff)
• WebCore/rendering/RenderLayer.h (modified) (1 diff)
• WebCore/rendering/RenderListBox.cpp (modified) (1 diff)
• WebCore/rendering/RenderListBox.h (modified) (1 diff)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/WebProcess/Plugins/PDF/DeprecatedPDFPlugin.h (modified) (1 diff)
• WebKit2/WebProcess/Plugins/PDF/DeprecatedPDFPlugin.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-01-03  Simon Fraser  <simon.fraser@apple.com>
+
+        Rename scrollPosition(Scrollbar*) to scrollOffset(ScrollbarOrientation)
+        https://bugs.webkit.org/show_bug.cgi?id=152666
+
+        Reviewed by Dan Bernstein.
+
+        Scrollbar values take offsets (zero-based), so rename the accessor used
+        by scrollbars to set their value, and pass in an orientation, rather than
+        a pointer to the scrollbar.
+
+        * platform/ScrollView.cpp:
+        (WebCore::ScrollView::scrollOffset): Use scrollOffsetFromPosition rather than
+        manually adding scrollOrigin.
+        (WebCore::ScrollView::scrollPosition): Renamed.
+        * platform/ScrollView.h:
+        (WebCore::ScrollView::cachedScrollPosition):
+        * platform/ScrollableArea.h:
+        * platform/Scrollbar.cpp:
+        (WebCore::Scrollbar::Scrollbar):
+        (WebCore::Scrollbar::offsetDidChange):
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::scrollOffset):
+        (WebCore::RenderLayer::scrollPosition): Renamed.
+        * rendering/RenderLayer.h:
+        * rendering/RenderListBox.cpp:
+        (WebCore::RenderListBox::scrollOffset):
+        (WebCore::RenderListBox::scrollPosition): Renamed.
+        * rendering/RenderListBox.h:
+
 2016-01-03  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/platform/ScrollView.cpp

@@ -509 +509 @@
 }
 
-int ScrollView::scrollPosition(Scrollbar* scrollbar) const
-{
-    if (scrollbar->orientation() == HorizontalScrollbar)
-        return scrollPosition().x() + scrollOrigin().x();
-    if (scrollbar->orientation() == VerticalScrollbar)
-        return scrollPosition().y() + scrollOrigin().y();
+int ScrollView::scrollOffset(ScrollbarOrientation orientation) const
+{
+    ScrollOffset offset = scrollOffsetFromPosition(scrollPosition());
+
+    if (orientation == HorizontalScrollbar)
+        return offset.x();
+
+    if (orientation == VerticalScrollbar)
+        return offset.y();
+
     return 0;
 }

trunk/Source/WebCore/platform/ScrollView.h

@@ -67 +67 @@
     // ScrollableArea functions.
     virtual int scrollSize(ScrollbarOrientation) const override;
-    virtual int scrollPosition(Scrollbar*) const override;
+    virtual int scrollOffset(ScrollbarOrientation) const override;
     WEBCORE_EXPORT virtual void setScrollOffset(const ScrollOffset&) override;
     virtual bool isScrollCornerVisible() const override;
@@ -264 +264 @@
 
     void cacheCurrentScrollPosition() { m_cachedScrollPosition = scrollPosition(); }
-    IntPoint cachedScrollPosition() const { return m_cachedScrollPosition; }
+    ScrollPosition cachedScrollPosition() const { return m_cachedScrollPosition; }
 
     // Functions for scrolling the view.

trunk/Source/WebCore/platform/ScrollableArea.h

@@ -147 +147 @@
     virtual bool isActive() const = 0;
     virtual int scrollSize(ScrollbarOrientation) const = 0;
-    virtual int scrollPosition(Scrollbar*) const = 0;
+    virtual int scrollOffset(ScrollbarOrientation) const = 0;
     WEBCORE_EXPORT virtual void invalidateScrollbar(Scrollbar*, const IntRect&);
     virtual bool isScrollCornerVisible() const = 0;
@@ -282 +282 @@
 
 #if PLATFORM(IOS)
-    bool isHorizontalScrollerPinnedToMinimumPosition() const { return !horizontalScrollbar() || scrollPosition(horizontalScrollbar()) <= minimumScrollPosition().x(); }
-    bool isHorizontalScrollerPinnedToMaximumPosition() const { return !horizontalScrollbar() || scrollPosition(horizontalScrollbar()) >= maximumScrollPosition().x(); }
-    bool isVerticalScrollerPinnedToMinimumPosition() const { return !verticalScrollbar() || scrollPosition(verticalScrollbar()) <= minimumScrollPosition().y(); }
-    bool isVerticalScrollerPinnedToMaximumPosition() const { return !verticalScrollbar() || scrollPosition(verticalScrollbar()) >= maximumScrollPosition().y(); } 
+    bool isHorizontalScrollerPinnedToMinimumPosition() const { return !horizontalScrollbar() || scrollOffset(HorizontalScrollbar) <= 0; }
+    bool isHorizontalScrollerPinnedToMaximumPosition() const { return !horizontalScrollbar() || scrollOffset(HorizontalScrollbar) >= maximumScrollOffset().x(); }
+    bool isVerticalScrollerPinnedToMinimumPosition() const { return !verticalScrollbar() || scrollOffset(VerticalScrollbar) <= 0; }
+    bool isVerticalScrollerPinnedToMaximumPosition() const { return !verticalScrollbar() || scrollOffset(VerticalScrollbar) >= maximumScrollOffset().y(); }
 
     bool isPinnedInBothDirections(const IntSize&) const; 

trunk/Source/WebCore/platform/Scrollbar.cpp

@@ -88 +88 @@
     Widget::setFrameRect(IntRect(0, 0, thickness, thickness));
 
-    m_currentPos = static_cast<float>(m_scrollableArea.scrollPosition(this));
+    m_currentPos = static_cast<float>(m_scrollableArea.scrollOffset(m_orientation));
 }
 
@@ -110 +110 @@
 void Scrollbar::offsetDidChange()
 {
-    float position = static_cast<float>(m_scrollableArea.scrollPosition(this));
+    float position = static_cast<float>(m_scrollableArea.scrollOffset(m_orientation));
     if (position == m_currentPos)
         return;

trunk/Source/WebCore/rendering/RenderLayer.cpp

@@ -2736 +2736 @@
 }
 
-int RenderLayer::scrollPosition(Scrollbar* scrollbar) const
-{
-    if (scrollbar->orientation() == HorizontalScrollbar)
+int RenderLayer::scrollOffset(ScrollbarOrientation orientation) const
+{
+    if (orientation == HorizontalScrollbar)
         return scrollOffset().x();
-    if (scrollbar->orientation() == VerticalScrollbar)
+
+    if (orientation == VerticalScrollbar)
         return scrollOffset().y();
+
     return 0;
 }

trunk/Source/WebCore/rendering/RenderLayer.h

@@ -856 +856 @@
     bool shouldBeSelfPaintingLayer() const;
 
-    virtual int scrollPosition(Scrollbar*) const override;
+    virtual int scrollOffset(ScrollbarOrientation) const override;
     
     // ScrollableArea interface

trunk/Source/WebCore/rendering/RenderListBox.cpp

@@ -604 +604 @@
 }
 
-int RenderListBox::scrollPosition(Scrollbar*) const
+int RenderListBox::scrollOffset(ScrollbarOrientation) const
 {
     return m_indexOffset;

trunk/Source/WebCore/rendering/RenderListBox.h

@@ -111 +111 @@
     // ScrollableArea interface.
     virtual int scrollSize(ScrollbarOrientation) const override;
-    virtual int scrollPosition(Scrollbar*) const override;
+    virtual int scrollOffset(ScrollbarOrientation) const override;
     virtual void setScrollOffset(const ScrollOffset&) override;
     virtual ScrollPosition minimumScrollPosition() const override;

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2016-01-03  Simon Fraser  <simon.fraser@apple.com>
+
+        Rename scrollPosition(Scrollbar*) to scrollOffset(ScrollbarOrientation)
+        https://bugs.webkit.org/show_bug.cgi?id=152666
+
+        Reviewed by Dan Bernstein.
+
+        Scrollbar values take offsets (zero-based), so rename the accessor used
+        by scrollbars to set their value, and pass in an orientation, rather than
+        a pointer to the scrollbar.
+
+        * WebProcess/Plugins/PDF/DeprecatedPDFPlugin.h:
+        * WebProcess/Plugins/PDF/DeprecatedPDFPlugin.mm:
+        (WebKit::PDFPlugin::scrollOffset):
+        (WebKit::PDFPlugin::scrollPosition): Renamed.
+
 2015-12-31  Andy Estes  <aestes@apple.com>
 

trunk/Source/WebKit2/WebProcess/Plugins/PDF/DeprecatedPDFPlugin.h

@@ -197 +197 @@
     virtual bool isActive() const override;
     virtual bool isScrollCornerVisible() const override { return false; }
-    virtual int scrollPosition(WebCore::Scrollbar*) const override;
+    virtual int scrollOffset(WebCore::ScrollbarOrientation) const override;
     virtual WebCore::ScrollPosition scrollPosition() const override;
     virtual WebCore::ScrollPosition minimumScrollPosition() const override;

trunk/Source/WebKit2/WebProcess/Plugins/PDF/DeprecatedPDFPlugin.mm

@@ -774 +774 @@
 }
 
-int PDFPlugin::scrollPosition(Scrollbar* scrollbar) const
-{
-    if (scrollbar->orientation() == HorizontalScrollbar)
+int PDFPlugin::scrollOffset(ScrollbarOrientation orientation) const
+{
+    if (orientation == HorizontalScrollbar)
         return m_scrollOffset.width();
-    if (scrollbar->orientation() == VerticalScrollbar)
+
+    if (orientation == VerticalScrollbar)
         return m_scrollOffset.height();
+
     ASSERT_NOT_REACHED();
     return 0;