Title: [168779] trunk/Source
- Revision
- 168779
- Author
- [email protected]
- Date
- 2014-05-13 21:15:16 -0700 (Tue, 13 May 2014)
Log Message
Fix "ASSERTION FAILED: m_representation == PlatformLayerRepresentation" with UI-side compositing
https://bugs.webkit.org/show_bug.cgi?id=132899
Reviewed by Beth Dakin.
Source/WebCore:
Export some things
* WebCore.exp.in:
Source/WebKit2:
The new InsetClipLayer and ContentShadowLayer members on scrolling nodes
need to be correctly encoded/decoded for UI-side compositing, and dumped
correctly.
* Shared/Scrolling/RemoteScrollingCoordinatorTransaction.cpp:
(ArgumentCoder<ScrollingStateScrollingNode>::encode):
(ArgumentCoder<ScrollingStateScrollingNode>::decode):
(WebKit::RemoteScrollingTreeTextStream::dump):
* UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.cpp:
(WebKit::RemoteScrollingCoordinatorProxy::connectStateNodeLayers):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (168778 => 168779)
--- trunk/Source/WebCore/ChangeLog 2014-05-14 04:13:47 UTC (rev 168778)
+++ trunk/Source/WebCore/ChangeLog 2014-05-14 04:15:16 UTC (rev 168779)
@@ -1,3 +1,14 @@
+2014-05-13 Simon Fraser <[email protected]>
+
+ Fix "ASSERTION FAILED: m_representation == PlatformLayerRepresentation" with UI-side compositing
+ https://bugs.webkit.org/show_bug.cgi?id=132899
+
+ Reviewed by Beth Dakin.
+
+ Export some things
+
+ * WebCore.exp.in:
+
2014-05-13 Hans Muller <[email protected]>
[CSS Shapes] line height grows around polygon and incorrectly causes text to wrap to next line
Modified: trunk/Source/WebCore/WebCore.exp.in (168778 => 168779)
--- trunk/Source/WebCore/WebCore.exp.in 2014-05-14 04:13:47 UTC (rev 168778)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-05-14 04:15:16 UTC (rev 168779)
@@ -2821,10 +2821,12 @@
__ZN7WebCore27ScrollingStateScrollingNode15setHeaderHeightEi
__ZN7WebCore27ScrollingStateScrollingNode15setScrollOriginERKNS_8IntPointE
__ZN7WebCore27ScrollingStateScrollingNode15setViewportSizeERKNS_9FloatSizeE
+__ZN7WebCore27ScrollingStateScrollingNode17setInsetClipLayerERKNS_19LayerRepresentationE
__ZN7WebCore27ScrollingStateScrollingNode17setScrollPositionERKNS_10FloatPointE
__ZN7WebCore27ScrollingStateScrollingNode18setTopContentInsetEf
__ZN7WebCore27ScrollingStateScrollingNode19setFrameScaleFactorEf
__ZN7WebCore27ScrollingStateScrollingNode20setTotalContentsSizeERKNS_7IntSizeE
+__ZN7WebCore27ScrollingStateScrollingNode21setContentShadowLayerERKNS_19LayerRepresentationE
__ZN7WebCore27ScrollingStateScrollingNode24setCounterScrollingLayerERKNS_19LayerRepresentationE
__ZN7WebCore27ScrollingStateScrollingNode24setScrolledContentsLayerERKNS_19LayerRepresentationE
__ZN7WebCore27ScrollingStateScrollingNode25setWheelEventHandlerCountEj
Modified: trunk/Source/WebKit2/ChangeLog (168778 => 168779)
--- trunk/Source/WebKit2/ChangeLog 2014-05-14 04:13:47 UTC (rev 168778)
+++ trunk/Source/WebKit2/ChangeLog 2014-05-14 04:15:16 UTC (rev 168779)
@@ -1,3 +1,21 @@
+2014-05-13 Simon Fraser <[email protected]>
+
+ Fix "ASSERTION FAILED: m_representation == PlatformLayerRepresentation" with UI-side compositing
+ https://bugs.webkit.org/show_bug.cgi?id=132899
+
+ Reviewed by Beth Dakin.
+
+ The new InsetClipLayer and ContentShadowLayer members on scrolling nodes
+ need to be correctly encoded/decoded for UI-side compositing, and dumped
+ correctly.
+
+ * Shared/Scrolling/RemoteScrollingCoordinatorTransaction.cpp:
+ (ArgumentCoder<ScrollingStateScrollingNode>::encode):
+ (ArgumentCoder<ScrollingStateScrollingNode>::decode):
+ (WebKit::RemoteScrollingTreeTextStream::dump):
+ * UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.cpp:
+ (WebKit::RemoteScrollingCoordinatorProxy::connectStateNodeLayers):
+
2014-05-13 Anders Carlsson <[email protected]>
Another build fix.
Modified: trunk/Source/WebKit2/Shared/Scrolling/RemoteScrollingCoordinatorTransaction.cpp (168778 => 168779)
--- trunk/Source/WebKit2/Shared/Scrolling/RemoteScrollingCoordinatorTransaction.cpp 2014-05-14 04:13:47 UTC (rev 168778)
+++ trunk/Source/WebKit2/Shared/Scrolling/RemoteScrollingCoordinatorTransaction.cpp 2014-05-14 04:15:16 UTC (rev 168779)
@@ -133,6 +133,12 @@
if (node.hasChangedProperty(ScrollingStateScrollingNode::CounterScrollingLayer))
encoder << static_cast<GraphicsLayer::PlatformLayerID>(node.counterScrollingLayer());
+
+ if (node.hasChangedProperty(ScrollingStateScrollingNode::InsetClipLayer))
+ encoder << static_cast<GraphicsLayer::PlatformLayerID>(node.insetClipLayer());
+
+ if (node.hasChangedProperty(ScrollingStateScrollingNode::ContentShadowLayer))
+ encoder << static_cast<GraphicsLayer::PlatformLayerID>(node.contentShadowLayer());
}
#define SCROLLING_NODE_DECODE(property, type, setter) \
@@ -197,6 +203,20 @@
node.setCounterScrollingLayer(layerID);
}
+ if (node.hasChangedProperty(ScrollingStateScrollingNode::InsetClipLayer)) {
+ GraphicsLayer::PlatformLayerID layerID;
+ if (!decoder.decode(layerID))
+ return false;
+ node.setInsetClipLayer(layerID);
+ }
+
+ if (node.hasChangedProperty(ScrollingStateScrollingNode::ContentShadowLayer)) {
+ GraphicsLayer::PlatformLayerID layerID;
+ if (!decoder.decode(layerID))
+ return false;
+ node.setContentShadowLayer(layerID);
+ }
+
return true;
}
@@ -528,6 +548,9 @@
if (!changedPropertiesOnly || node.hasChangedProperty(ScrollingStateScrollingNode::InsetClipLayer))
dumpProperty(ts, "clip-inset-layer", static_cast<GraphicsLayer::PlatformLayerID>(node.insetClipLayer()));
+ if (!changedPropertiesOnly || node.hasChangedProperty(ScrollingStateScrollingNode::ContentShadowLayer))
+ dumpProperty(ts, "content-shadow-layer", static_cast<GraphicsLayer::PlatformLayerID>(node.contentShadowLayer()));
+
if (!changedPropertiesOnly || node.hasChangedProperty(ScrollingStateScrollingNode::HeaderLayer))
dumpProperty(ts, "header-layer", static_cast<GraphicsLayer::PlatformLayerID>(node.headerLayer()));
Modified: trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.cpp (168778 => 168779)
--- trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.cpp 2014-05-14 04:13:47 UTC (rev 168778)
+++ trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.cpp 2014-05-14 04:15:16 UTC (rev 168779)
@@ -108,6 +108,12 @@
if (scrollingStateNode->hasChangedProperty(ScrollingStateScrollingNode::CounterScrollingLayer))
scrollingStateNode->setCounterScrollingLayer(layerTreeHost.getLayer(scrollingStateNode->counterScrollingLayer()));
+ if (scrollingStateNode->hasChangedProperty(ScrollingStateScrollingNode::InsetClipLayer))
+ scrollingStateNode->setInsetClipLayer(layerTreeHost.getLayer(scrollingStateNode->insetClipLayer()));
+
+ if (scrollingStateNode->hasChangedProperty(ScrollingStateScrollingNode::ContentShadowLayer))
+ scrollingStateNode->setContentShadowLayer(layerTreeHost.getLayer(scrollingStateNode->contentShadowLayer()));
+
// FIXME: we should never have header and footer layers coming from the WebProcess.
if (scrollingStateNode->hasChangedProperty(ScrollingStateScrollingNode::HeaderLayer))
scrollingStateNode->setHeaderLayer(layerTreeHost.getLayer(scrollingStateNode->headerLayer()));
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
