Changeset 243129 in webkit

Timestamp:

Mar 18, 2019, 9:13:37 PM (8 years ago)

Author:

Simon Fraser

Message:

Unreviewed followup to r243126.

LayerRepresentation operator=() needs to copy m_graphicsLayer now that it doesn't
share a pointer with m_typelessPlatformLayer. Also make the LayerRepresentation construction
from a GraphiscLayer* explicit.

• page/scrolling/ScrollingStateNode.h:

(WebCore::LayerRepresentation::operator=):
(WebCore::LayerRepresentation::toRepresentation const):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/scrolling/ScrollingStateNode.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-03-18  Simon Fraser  <simon.fraser@apple.com>
+
+        Unreviewed followup to r243126.
+
+        LayerRepresentation operator=() needs to copy m_graphicsLayer now that it doesn't
+        share a pointer with m_typelessPlatformLayer. Also make the LayerRepresentation construction
+        from a GraphiscLayer* explicit.
+
+        * page/scrolling/ScrollingStateNode.h:
+        (WebCore::LayerRepresentation::operator=):
+        (WebCore::LayerRepresentation::toRepresentation const):
+
 2019-03-18  Simon Fraser  <simon.fraser@apple.com>
 

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

@@ -120 +120 @@
     LayerRepresentation& operator=(const LayerRepresentation& other)
     {
+        m_graphicsLayer = other.m_graphicsLayer;
         m_typelessPlatformLayer = other.m_typelessPlatformLayer;
         m_layerID = other.m_layerID;
@@ -156 +157 @@
         case GraphicsLayerRepresentation:
             ASSERT(m_representation == GraphicsLayerRepresentation);
-            return *this;
+            return LayerRepresentation(m_graphicsLayer.get());
         case PlatformLayerRepresentation:
             return m_graphicsLayer ? m_graphicsLayer->platformLayer() : nullptr;