Changeset 242669 in webkit

Timestamp:

Mar 8, 2019, 6:35:54 PM (7 years ago)

Author:

Simon Fraser

Message:

Share some code that sets CALayer positions
​https://bugs.webkit.org/show_bug.cgi?id=195485

Reviewed by Zalan Bujtas.

Share some code between ScrollingTreeStickyNode and ScrollingTreeFixedNode that sets the position
of a CALayer given the top-left location.

• page/scrolling/cocoa/ScrollingTreeFixedNode.mm:

(WebCore::ScrollingTreeFixedNode::relatedNodeScrollPositionDidChange):
(WebCore::ScrollingTreeFixedNodeInternal::operator*): Deleted.

• page/scrolling/cocoa/ScrollingTreeStickyNode.mm:

(WebCore::ScrollingTreeStickyNode::relatedNodeScrollPositionDidChange):
(WebCore::ScrollingTreeStickyNodeInternal::operator*): Deleted.

• platform/graphics/cocoa/WebCoreCALayerExtras.h:
• platform/graphics/cocoa/WebCoreCALayerExtras.mm:

(-[CALayer _web_setLayerTopLeftPosition:]):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/scrolling/cocoa/ScrollingTreeFixedNode.mm (modified) (3 diffs)
• page/scrolling/cocoa/ScrollingTreeStickyNode.mm (modified) (3 diffs)
• platform/graphics/cocoa/WebCoreCALayerExtras.h (modified) (1 diff)
• platform/graphics/cocoa/WebCoreCALayerExtras.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-03-08  Simon Fraser  <simon.fraser@apple.com>
+
+        Share some code that sets CALayer positions
+        https://bugs.webkit.org/show_bug.cgi?id=195485
+
+        Reviewed by Zalan Bujtas.
+
+        Share some code between ScrollingTreeStickyNode and ScrollingTreeFixedNode that sets the position
+        of a CALayer given the top-left location.
+
+        * page/scrolling/cocoa/ScrollingTreeFixedNode.mm:
+        (WebCore::ScrollingTreeFixedNode::relatedNodeScrollPositionDidChange):
+        (WebCore::ScrollingTreeFixedNodeInternal::operator*): Deleted.
+        * page/scrolling/cocoa/ScrollingTreeStickyNode.mm:
+        (WebCore::ScrollingTreeStickyNode::relatedNodeScrollPositionDidChange):
+        (WebCore::ScrollingTreeStickyNodeInternal::operator*): Deleted.
+        * platform/graphics/cocoa/WebCoreCALayerExtras.h:
+        * platform/graphics/cocoa/WebCoreCALayerExtras.mm:
+        (-[CALayer _web_setLayerTopLeftPosition:]):
+
 2019-03-08  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/page/scrolling/cocoa/ScrollingTreeFixedNode.mm

@@ -32 +32 @@
 #import "ScrollingStateFixedNode.h"
 #import "ScrollingTree.h"
-#import <QuartzCore/CALayer.h>
+#import "WebCoreCALayerExtras.h"
 #import <wtf/text/TextStream.h>
 
@@ -64 +64 @@
 }
 
-namespace ScrollingTreeFixedNodeInternal {
-static inline CGPoint operator*(CGPoint& a, const CGSize& b)
-{
-    return CGPointMake(a.x * b.width, a.y * b.height);
-}
-}
-
 void ScrollingTreeFixedNode::relatedNodeScrollPositionDidChange(const ScrollingTreeScrollingNode&, const FloatRect& layoutViewport, FloatSize& cumulativeDelta)
 {
-    using namespace ScrollingTreeFixedNodeInternal;
     FloatPoint layerPosition = m_constraints.layerPositionForViewportRect(layoutViewport);
 
@@ -80 +72 @@
     layerPosition -= cumulativeDelta;
 
-    CGRect layerBounds = [m_layer bounds];
-    CGPoint anchorPoint = [m_layer anchorPoint];
-    CGPoint newPosition = layerPosition - m_constraints.alignmentOffset() + anchorPoint * layerBounds.size;
-
-    if (isnan(newPosition.x) || isnan(newPosition.y)) {
-        WTFLogAlways("Attempt to call [CALayer setPosition] with NaN: newPosition=(%f, %f) layerPosition=(%f, %f) alignmentOffset=(%f, %f)",
-            newPosition.x, newPosition.y, layerPosition.x(), layerPosition.y(),
-            m_constraints.alignmentOffset().width(), m_constraints.alignmentOffset().height());
-        ASSERT_NOT_REACHED();
-        return;
-    }
-
-    [m_layer setPosition:newPosition];
+    [m_layer _web_setLayerTopLeftPosition:layerPosition - m_constraints.alignmentOffset()];
     cumulativeDelta += layerPosition - m_constraints.layerPositionAtLastLayout();
 }

trunk/Source/WebCore/page/scrolling/cocoa/ScrollingTreeStickyNode.mm

@@ -34 +34 @@
 #import "ScrollingTreeFrameScrollingNode.h"
 #import "ScrollingTreeOverflowScrollingNode.h"
-#import <QuartzCore/CALayer.h>
+#import "WebCoreCALayerExtras.h"
 #import <wtf/text/TextStream.h>
 
@@ -66 +66 @@
 }
 
-namespace ScrollingTreeStickyNodeInternal {
-static inline CGPoint operator*(CGPoint& a, const CGSize& b)
-{
-    return CGPointMake(a.x * b.width, a.y * b.height);
-}
-}
-
 void ScrollingTreeStickyNode::relatedNodeScrollPositionDidChange(const ScrollingTreeScrollingNode&, const FloatRect& layoutViewport, FloatSize& cumulativeDelta)
 {
-    using namespace ScrollingTreeStickyNodeInternal;
     FloatRect constrainingRect;
 
@@ -88 +80 @@
     LOG_WITH_STREAM(Scrolling, stream << "ScrollingTreeStickyNode " << scrollingNodeID() << " relatedNodeScrollPositionDidChange: new viewport " << layoutViewport << " constrainingRectAtLastLayout " << m_constraints.constrainingRectAtLastLayout() << " last layer pos " << m_constraints.layerPositionAtLastLayout());
 
-    FloatPoint layerPosition = m_constraints.layerPositionForConstrainingRect(constrainingRect);
-
-    CGRect layerBounds = [m_layer bounds];
-    CGPoint anchorPoint = [m_layer anchorPoint];
-    CGPoint newPosition = layerPosition - m_constraints.alignmentOffset() + anchorPoint * layerBounds.size;
-    [m_layer setPosition:newPosition];
+    FloatPoint layerPosition = m_constraints.layerPositionForConstrainingRect(constrainingRect) - m_constraints.alignmentOffset();
+    [m_layer _web_setLayerTopLeftPosition:layerPosition];
 
     cumulativeDelta += layerPosition - m_constraints.layerPositionAtLastLayout();

trunk/Source/WebCore/platform/graphics/cocoa/WebCoreCALayerExtras.h

@@ -29 +29 @@
 
 - (void)web_disableAllActions;
+- (void)_web_setLayerTopLeftPosition:(CGPoint)position;
 + (CALayer *)_web_renderLayerWithContextID:(uint32_t)contextID;
 

trunk/Source/WebCore/platform/graphics/cocoa/WebCoreCALayerExtras.mm

@@ -57 +57 @@
 }
 
+- (void)_web_setLayerTopLeftPosition:(CGPoint)position
+{
+    CGSize layerSize = [self bounds].size;
+    CGPoint anchorPoint = [self anchorPoint];
+    CGPoint newPosition = CGPointMake(position.x + anchorPoint.x * layerSize.width, position.y + anchorPoint.y * layerSize.height);
+    if (isnan(newPosition.x) || isnan(newPosition.y)) {
+        WTFLogAlways("Attempt to call [CALayer setPosition] with NaN: newPosition=(%f, %f) position=(%f, %f) anchorPoint=(%f, %f)",
+            newPosition.x, newPosition.y, position.x, position.y, anchorPoint.x, anchorPoint.y);
+        ASSERT_NOT_REACHED();
+        return;
+    }
+    
+    [self setPosition:newPosition];
+}
+
 + (CALayer *)_web_renderLayerWithContextID:(uint32_t)contextID
 {