Title: [136840] trunk/Source/WebKit2
- Revision
- 136840
- Author
- commit-qu...@webkit.org
- Date
- 2012-12-06 06:45:50 -0800 (Thu, 06 Dec 2012)
Log Message
Unreviewed, rolling out r136795.
http://trac.webkit.org/changeset/136795
https://bugs.webkit.org/show_bug.cgi?id=104257
Asserts on EFL WebKit2 Debug bot (Requested by yael on
#webkit).
Patch by Sheriff Bot <webkit.review....@gmail.com> on 2012-12-06
* UIProcess/CoordinatedGraphics/LayerTreeRenderer.cpp:
(WebKit::LayerTreeRenderer::setRootLayerID):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (136839 => 136840)
--- trunk/Source/WebKit2/ChangeLog 2012-12-06 14:11:05 UTC (rev 136839)
+++ trunk/Source/WebKit2/ChangeLog 2012-12-06 14:45:50 UTC (rev 136840)
@@ -1,3 +1,15 @@
+2012-12-06 Sheriff Bot <webkit.review....@gmail.com>
+
+ Unreviewed, rolling out r136795.
+ http://trac.webkit.org/changeset/136795
+ https://bugs.webkit.org/show_bug.cgi?id=104257
+
+ Asserts on EFL WebKit2 Debug bot (Requested by yael on
+ #webkit).
+
+ * UIProcess/CoordinatedGraphics/LayerTreeRenderer.cpp:
+ (WebKit::LayerTreeRenderer::setRootLayerID):
+
2012-12-06 Shinya Kawanaka <shin...@chromium.org>
Internals.getElementByIdInShadowRoot is nonsense now.
Modified: trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/LayerTreeRenderer.cpp (136839 => 136840)
--- trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/LayerTreeRenderer.cpp 2012-12-06 14:11:05 UTC (rev 136839)
+++ trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/LayerTreeRenderer.cpp 2012-12-06 14:45:50 UTC (rev 136840)
@@ -391,12 +391,16 @@
void LayerTreeRenderer::setRootLayerID(WebLayerID layerID)
{
- ASSERT(layerID != m_rootLayerID);
- ASSERT(layerID != InvalidWebLayerID);
+ if (layerID == m_rootLayerID)
+ return;
m_rootLayerID = layerID;
+
m_rootLayer->removeAllChildren();
+ if (!layerID)
+ return;
+
GraphicsLayer* layer = ensureLayer(layerID);
m_rootLayer->addChild(layer);
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
