Title: [243129] trunk/Source/WebCore
- Revision
- 243129
- Author
- [email protected]
- Date
- 2019-03-18 21:13:37 -0700 (Mon, 18 Mar 2019)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (243128 => 243129)
--- trunk/Source/WebCore/ChangeLog 2019-03-19 03:00:26 UTC (rev 243128)
+++ trunk/Source/WebCore/ChangeLog 2019-03-19 04:13:37 UTC (rev 243129)
@@ -1,5 +1,17 @@
2019-03-18 Simon Fraser <[email protected]>
+ 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 <[email protected]>
+
Scrolling state nodes should hold references to GraphicsLayers
https://bugs.webkit.org/show_bug.cgi?id=195844
<rdar://problem/48949634>
Modified: trunk/Source/WebCore/page/scrolling/ScrollingStateNode.h (243128 => 243129)
--- trunk/Source/WebCore/page/scrolling/ScrollingStateNode.h 2019-03-19 03:00:26 UTC (rev 243128)
+++ trunk/Source/WebCore/page/scrolling/ScrollingStateNode.h 2019-03-19 04:13:37 UTC (rev 243129)
@@ -119,6 +119,7 @@
LayerRepresentation& operator=(const LayerRepresentation& other)
{
+ m_graphicsLayer = other.m_graphicsLayer;
m_typelessPlatformLayer = other.m_typelessPlatformLayer;
m_layerID = other.m_layerID;
m_representation = other.m_representation;
@@ -155,7 +156,7 @@
return LayerRepresentation();
case GraphicsLayerRepresentation:
ASSERT(m_representation == GraphicsLayerRepresentation);
- return *this;
+ return LayerRepresentation(m_graphicsLayer.get());
case PlatformLayerRepresentation:
return m_graphicsLayer ? m_graphicsLayer->platformLayer() : nullptr;
case PlatformLayerIDRepresentation:
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
