Title: [136795] trunk/Source/WebKit2
Revision
136795
Author
[email protected]
Date
2012-12-05 21:09:37 -0800 (Wed, 05 Dec 2012)

Log Message

Coordinated Graphics: Reorder messages to LayerTreeCoordinatorProxy
https://bugs.webkit.org/show_bug.cgi?id=103843

Patch by Huang Dongsung <[email protected]> on 2012-12-05
Reviewed by Noam Rosenthal.

Clarify LayerTreeRenderer::setRootLayerID() can be called only once during its
lifecycle. LayerTreeRenderer, LayerTreeCoordinator and LayerTreeCoordinatorProxy
have the same lifecycle to WebPage and the root layer is reused even if loading
new page, so it is impossible to call LayerTreeRenderer::setRootLayerID() more
than twice.

* UIProcess/CoordinatedGraphics/LayerTreeRenderer.cpp:
(WebKit::LayerTreeRenderer::setRootLayerID):

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (136794 => 136795)


--- trunk/Source/WebKit2/ChangeLog	2012-12-06 04:54:09 UTC (rev 136794)
+++ trunk/Source/WebKit2/ChangeLog	2012-12-06 05:09:37 UTC (rev 136795)
@@ -1,3 +1,19 @@
+2012-12-05  Huang Dongsung  <[email protected]>
+
+        Coordinated Graphics: Reorder messages to LayerTreeCoordinatorProxy
+        https://bugs.webkit.org/show_bug.cgi?id=103843
+
+        Reviewed by Noam Rosenthal.
+
+        Clarify LayerTreeRenderer::setRootLayerID() can be called only once during its
+        lifecycle. LayerTreeRenderer, LayerTreeCoordinator and LayerTreeCoordinatorProxy
+        have the same lifecycle to WebPage and the root layer is reused even if loading
+        new page, so it is impossible to call LayerTreeRenderer::setRootLayerID() more
+        than twice.
+
+        * UIProcess/CoordinatedGraphics/LayerTreeRenderer.cpp:
+        (WebKit::LayerTreeRenderer::setRootLayerID):
+
 2012-12-05  Brent Fulgham  <[email protected]>
 
         [Windows, WinCairo] Regenerate .def files on changes

Modified: trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/LayerTreeRenderer.cpp (136794 => 136795)


--- trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/LayerTreeRenderer.cpp	2012-12-06 04:54:09 UTC (rev 136794)
+++ trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/LayerTreeRenderer.cpp	2012-12-06 05:09:37 UTC (rev 136795)
@@ -391,16 +391,12 @@
 
 void LayerTreeRenderer::setRootLayerID(WebLayerID layerID)
 {
-    if (layerID == m_rootLayerID)
-        return;
+    ASSERT(layerID != m_rootLayerID);
+    ASSERT(layerID != InvalidWebLayerID);
 
     m_rootLayerID = layerID;
-
     m_rootLayer->removeAllChildren();
 
-    if (!layerID)
-        return;
-
     GraphicsLayer* layer = ensureLayer(layerID);
     m_rootLayer->addChild(layer);
 }
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to