Changeset 144687 in webkit

Timestamp:

Mar 4, 2013, 3:25:14 PM (12 years ago)

Author:

Simon Fraser

Message:

Give ViewportConstraints classes copy constructors
​https://bugs.webkit.org/show_bug.cgi?id=111367

Reviewed by Beth Dakin.

Downstream code requires that ViewportConstraints objects have
copy constructors, so add them.

Also clean up some redundant initialization of stack objects
in RenderLayerCompositor.

No behavior change.

• page/scrolling/ScrollingConstraints.h:

(WebCore::ViewportConstraints::ViewportConstraints):
(ViewportConstraints):
(WebCore::FixedPositionViewportConstraints::FixedPositionViewportConstraints):
(FixedPositionViewportConstraints):
(WebCore::StickyPositionViewportConstraints::StickyPositionViewportConstraints):
(StickyPositionViewportConstraints):

• rendering/RenderLayerCompositor.cpp:

(WebCore::RenderLayerCompositor::computeFixedViewportConstraints):
(WebCore::RenderLayerCompositor::computeStickyViewportConstraints):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/scrolling/ScrollingConstraints.h (modified) (3 diffs)
• rendering/RenderLayerCompositor.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-03-04  Simon Fraser  <simon.fraser@apple.com>
+
+        Give ViewportConstraints classes copy constructors
+        https://bugs.webkit.org/show_bug.cgi?id=111367
+
+        Reviewed by Beth Dakin.
+        
+        Downstream code requires that ViewportConstraints objects have
+        copy constructors, so add them.
+        
+        Also clean up some redundant initialization of stack objects
+        in RenderLayerCompositor.
+
+        No behavior change.
+
+        * page/scrolling/ScrollingConstraints.h:
+        (WebCore::ViewportConstraints::ViewportConstraints):
+        (ViewportConstraints):
+        (WebCore::FixedPositionViewportConstraints::FixedPositionViewportConstraints):
+        (FixedPositionViewportConstraints):
+        (WebCore::StickyPositionViewportConstraints::StickyPositionViewportConstraints):
+        (StickyPositionViewportConstraints):
+        * rendering/RenderLayerCompositor.cpp:
+        (WebCore::RenderLayerCompositor::computeFixedViewportConstraints):
+        (WebCore::RenderLayerCompositor::computeStickyViewportConstraints):
+
 2013-03-04  Roger Fong  <roger_fong@apple.com>
 

trunk/Source/WebCore/page/scrolling/ScrollingConstraints.h

@@ -48 +48 @@
     typedef unsigned AnchorEdges;
 
+    ViewportConstraints(const ViewportConstraints& other)
+        : m_alignmentOffset(other.m_alignmentOffset)
+        , m_anchorEdges(other.m_anchorEdges)
+    { }
+    
     virtual ~ViewportConstraints() { }
     
@@ -71 +76 @@
 class FixedPositionViewportConstraints : public ViewportConstraints {
 public:
+    FixedPositionViewportConstraints()
+        : ViewportConstraints()
+    { }
+
+    FixedPositionViewportConstraints(const FixedPositionViewportConstraints& other)
+        : ViewportConstraints(other)
+        , m_viewportRectAtLastLayout(other.m_viewportRectAtLastLayout)
+        , m_layerPositionAtLastLayout(other.m_layerPositionAtLastLayout)
+    { }
+    
     FloatPoint layerPositionForViewportRect(const FloatRect& viewportRect) const;
 
@@ -103 +118 @@
         , m_topOffset(0)
         , m_bottomOffset(0)
+    { }
+
+    StickyPositionViewportConstraints(const StickyPositionViewportConstraints& other)
+        : ViewportConstraints(other)
+        , m_leftOffset(other.m_leftOffset)
+        , m_rightOffset(other.m_rightOffset)
+        , m_topOffset(other.m_topOffset)
+        , m_bottomOffset(other.m_bottomOffset)
+        , m_absoluteContainingBlockRect(other.m_absoluteContainingBlockRect)
+        , m_absoluteStickyBoxRect(other.m_absoluteStickyBoxRect)
+        , m_stickyOffsetAtLastLayout(other.m_stickyOffsetAtLastLayout)
+        , m_layerPositionAtLastLayout(other.m_layerPositionAtLastLayout)
     { }
 

trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp

@@ -2869 +2869 @@
     LayoutRect viewportRect = frameView->viewportConstrainedVisibleContentRect();
 
-    FixedPositionViewportConstraints constraints = FixedPositionViewportConstraints();
+    FixedPositionViewportConstraints constraints;
 
     GraphicsLayer* graphicsLayer = layer->backing()->graphicsLayer();
@@ -2907 +2907 @@
     LayoutRect viewportRect = frameView->viewportConstrainedVisibleContentRect();
 
-    StickyPositionViewportConstraints constraints = StickyPositionViewportConstraints();
+    StickyPositionViewportConstraints constraints;
 
     RenderBoxModelObject* renderer = toRenderBoxModelObject(layer->renderer());