Changeset 194410 in webkit

Timestamp:

Dec 23, 2015, 7:43:23 PM (11 years ago)

Author:

Simon Fraser

Message:

Use "constrainedBetween" in more places
​https://bugs.webkit.org/show_bug.cgi?id=152543

Reviewed by Zalan Bujtas.

Replace code that contrains points via shrunkTo/expandedTo() with calls
to constrainedBetween(), and implement constrainedBetween() on IntPoint,
FloatPoint and LayoutPoint.

Convert some functions that return points to more modern syntax.

Source/WebCore:

• page/scrolling/ScrollingTreeFrameScrollingNode.cpp:

(WebCore::ScrollingTreeFrameScrollingNode::setScrollPosition):

• page/scrolling/ScrollingTreeScrollingNode.cpp:

(WebCore::ScrollingTreeScrollingNode::setScrollPosition):

• platform/ScrollView.cpp:

(WebCore::ScrollView::adjustScrollPositionWithinRange):

• platform/graphics/FloatPoint.cpp:

(WebCore::FloatPoint::constrainedBetween):

• platform/graphics/FloatPoint.h:

(WebCore::FloatPoint::shrunkTo):
(WebCore::FloatPoint::expandedTo):
(WebCore::FloatPoint::transposedPoint):

• platform/graphics/IntPoint.cpp:
• platform/graphics/LayoutPoint.cpp:

(WebCore::LayoutPoint::constrainedBetween):

• platform/graphics/LayoutPoint.h:

(WebCore::LayoutPoint::expandedTo):
(WebCore::LayoutPoint::shrunkTo):
(WebCore::LayoutPoint::transposedPoint):
(WebCore::LayoutPoint::fraction):
(WebCore::LayoutPoint::operator FloatPoint):

Source/WebKit2:

• UIProcess/API/Cocoa/WKWebView.mm:

(constrainContentOffset):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/page/scrolling/ScrollingTreeFrameScrollingNode.cpp (modified) (1 diff)
• WebCore/page/scrolling/ScrollingTreeScrollingNode.cpp (modified) (1 diff)
• WebCore/platform/ScrollView.cpp (modified) (1 diff)
• WebCore/platform/graphics/FloatPoint.cpp (modified) (1 diff)
• WebCore/platform/graphics/FloatPoint.h (modified) (1 diff)
• WebCore/platform/graphics/IntPoint.cpp (modified) (1 diff)
• WebCore/platform/graphics/LayoutPoint.cpp (modified) (1 diff)
• WebCore/platform/graphics/LayoutPoint.h (modified) (2 diffs)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/UIProcess/API/Cocoa/WKWebView.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-12-23  Simon Fraser  <simon.fraser@apple.com>
+
+        Use "constrainedBetween" in more places
+        https://bugs.webkit.org/show_bug.cgi?id=152543
+
+        Reviewed by Zalan Bujtas.
+
+        Replace code that contrains points via shrunkTo/expandedTo() with calls
+        to constrainedBetween(), and implement constrainedBetween() on IntPoint,
+        FloatPoint and LayoutPoint.
+
+        Convert some functions that return points to more modern syntax.
+
+        * page/scrolling/ScrollingTreeFrameScrollingNode.cpp:
+        (WebCore::ScrollingTreeFrameScrollingNode::setScrollPosition):
+        * page/scrolling/ScrollingTreeScrollingNode.cpp:
+        (WebCore::ScrollingTreeScrollingNode::setScrollPosition):
+        * platform/ScrollView.cpp:
+        (WebCore::ScrollView::adjustScrollPositionWithinRange):
+        * platform/graphics/FloatPoint.cpp:
+        (WebCore::FloatPoint::constrainedBetween):
+        * platform/graphics/FloatPoint.h:
+        (WebCore::FloatPoint::shrunkTo):
+        (WebCore::FloatPoint::expandedTo):
+        (WebCore::FloatPoint::transposedPoint):
+        * platform/graphics/IntPoint.cpp:
+        * platform/graphics/LayoutPoint.cpp:
+        (WebCore::LayoutPoint::constrainedBetween):
+        * platform/graphics/LayoutPoint.h:
+        (WebCore::LayoutPoint::expandedTo):
+        (WebCore::LayoutPoint::shrunkTo):
+        (WebCore::LayoutPoint::transposedPoint):
+        (WebCore::LayoutPoint::fraction):
+        (WebCore::LayoutPoint::operator FloatPoint):
+
 2015-12-23  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/page/scrolling/ScrollingTreeFrameScrollingNode.cpp

@@ -83 +83 @@
 void ScrollingTreeFrameScrollingNode::setScrollPosition(const FloatPoint& scrollPosition)
 {
-    FloatPoint newScrollPosition = scrollPosition;
-    newScrollPosition = newScrollPosition.shrunkTo(maximumScrollPosition());
-    newScrollPosition = newScrollPosition.expandedTo(minimumScrollPosition());
-
+    FloatPoint newScrollPosition = scrollPosition.constrainedBetween(minimumScrollPosition(), maximumScrollPosition());
     setScrollPositionWithoutContentEdgeConstraints(newScrollPosition);
 }

trunk/Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.cpp

@@ -104 +104 @@
 void ScrollingTreeScrollingNode::setScrollPosition(const FloatPoint& scrollPosition)
 {
-    FloatPoint newScrollPosition = scrollPosition;
-    newScrollPosition = newScrollPosition.shrunkTo(maximumScrollPosition());
-    newScrollPosition = newScrollPosition.expandedTo(minimumScrollPosition());
-
+    FloatPoint newScrollPosition = scrollPosition.constrainedBetween(minimumScrollPosition(), maximumScrollPosition());
     setScrollPositionWithoutContentEdgeConstraints(newScrollPosition);
 }

trunk/Source/WebCore/platform/ScrollView.cpp

@@ -404 +404 @@
         return scrollPoint;
 
-    IntPoint newScrollPosition = scrollPoint.shrunkTo(maximumScrollPosition());
-    newScrollPosition = newScrollPosition.expandedTo(minimumScrollPosition());
-    return newScrollPosition;
+    return scrollPoint.constrainedBetween(minimumScrollPosition(), maximumScrollPosition());
 }
 

trunk/Source/WebCore/platform/graphics/FloatPoint.cpp

@@ -40 +40 @@
 FloatPoint::FloatPoint(const IntPoint& p) : m_x(p.x()), m_y(p.y())
 {
+}
+
+FloatPoint FloatPoint::constrainedBetween(const FloatPoint& min, const FloatPoint& max) const
+{
+    return {
+        std::max(min.x(), std::min(max.x(), m_x)),
+        std::max(min.y(), std::min(max.y(), m_y))
+    };
 }
 

trunk/Source/WebCore/platform/graphics/FloatPoint.h

@@ -122 +122 @@
     }
 
+    WEBCORE_EXPORT FloatPoint constrainedBetween(const FloatPoint& min, const FloatPoint& max) const;
+
     FloatPoint shrunkTo(const FloatPoint& other) const
     {
-        return FloatPoint(std::min(m_x, other.m_x), std::min(m_y, other.m_y));
+        return { std::min(m_x, other.m_x), std::min(m_y, other.m_y) };
     }
 
     FloatPoint expandedTo(const FloatPoint& other) const
     {
-        return FloatPoint(std::max(m_x, other.m_x), std::max(m_y, other.m_y));
+        return { std::max(m_x, other.m_x), std::max(m_y, other.m_y) };
     }
 
     FloatPoint transposedPoint() const
     {
-        return FloatPoint(m_y, m_x);
+        return { m_y, m_x };
     }
 

trunk/Source/WebCore/platform/graphics/IntPoint.cpp

@@ -46 +46 @@
 }
 
-
 TextStream& operator<<(TextStream& ts, const IntPoint& p)
 {

trunk/Source/WebCore/platform/graphics/LayoutPoint.cpp

@@ -31 +31 @@
 namespace WebCore {
 
+LayoutPoint LayoutPoint::constrainedBetween(const LayoutPoint& min, const LayoutPoint& max) const
+{
+    return {
+        std::max(min.x(), std::min(max.x(), m_x)),
+        std::max(min.y(), std::min(max.y(), m_y))
+    };
+}
+
 TextStream& operator<<(TextStream& ts, const LayoutPoint& p)
 {

trunk/Source/WebCore/platform/graphics/LayoutPoint.h

@@ -61 +61 @@
         m_y *= sy;
     }
-    
+
+    LayoutPoint constrainedBetween(const LayoutPoint& min, const LayoutPoint& max) const;
+
     LayoutPoint expandedTo(const LayoutPoint& other) const
     {
-        return LayoutPoint(std::max(m_x, other.m_x), std::max(m_y, other.m_y));
+        return { std::max(m_x, other.m_x), std::max(m_y, other.m_y) };
     }
 
     LayoutPoint shrunkTo(const LayoutPoint& other) const
     {
-        return LayoutPoint(std::min(m_x, other.m_x), std::min(m_y, other.m_y));
+        return { std::min(m_x, other.m_x), std::min(m_y, other.m_y) };
     }
 
@@ -79 +81 @@
     LayoutPoint transposedPoint() const
     {
-        return LayoutPoint(m_y, m_x);
+        return { m_y, m_x };
     }
 
     LayoutPoint fraction() const
     {
-        return LayoutPoint(m_x.fraction(), m_y.fraction());
-    }
-
-    operator FloatPoint() const { return FloatPoint(m_x, m_y); }
+        return { m_x.fraction(), m_y.fraction() };
+    }
+
+    operator FloatPoint() const { return { m_x, m_y }; }
 
 private:

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-12-23  Simon Fraser  <simon.fraser@apple.com>
+
+        Use "constrainedBetween" in more places
+        https://bugs.webkit.org/show_bug.cgi?id=152543
+
+        Reviewed by Zalan Bujtas.
+
+        Replace code that contrains points via shrunkTo/expandedTo() with calls
+        to constrainedBetween(), and implement constrainedBetween() on IntPoint,
+        FloatPoint and LayoutPoint.
+
+        Convert some functions that return points to more modern syntax.
+
+        * UIProcess/API/Cocoa/WKWebView.mm:
+        (constrainContentOffset):
+
 2015-12-22  Hunseop Jeong  <hs85.jeong@samsung.com>
 

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm

@@ -1260 +1260 @@
 {
     WebCore::FloatSize maximumContentOffset = contentSize - unobscuredContentSize;
-    contentOffset = contentOffset.shrunkTo(WebCore::FloatPoint(maximumContentOffset.width(), maximumContentOffset.height()));
-    contentOffset = contentOffset.expandedTo(WebCore::FloatPoint());
-    return contentOffset;
+    return contentOffset.constrainedBetween(WebCore::FloatPoint(), WebCore::FloatPoint(maximumContentOffset));
 }