Title: [136841] trunk/Source/WebKit2
- Revision
- 136841
- Author
- commit-qu...@webkit.org
- Date
- 2012-12-06 06:56:26 -0800 (Thu, 06 Dec 2012)
Log Message
Unreviewed, rolling out r136788.
http://trac.webkit.org/changeset/136788
https://bugs.webkit.org/show_bug.cgi?id=104260
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::setLayerState):
(WebKit::LayerTreeRenderer::setRootLayerID):
* WebProcess/WebPage/CoordinatedGraphics/LayerTreeCoordinator.cpp:
(WebKit::LayerTreeCoordinator::LayerTreeCoordinator):
(WebKit::LayerTreeCoordinator::flushPendingLayerChanges):
* WebProcess/WebPage/CoordinatedGraphics/LayerTreeCoordinator.h:
(LayerTreeCoordinator):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (136840 => 136841)
--- trunk/Source/WebKit2/ChangeLog 2012-12-06 14:45:50 UTC (rev 136840)
+++ trunk/Source/WebKit2/ChangeLog 2012-12-06 14:56:26 UTC (rev 136841)
@@ -1,5 +1,23 @@
2012-12-06 Sheriff Bot <webkit.review....@gmail.com>
+ Unreviewed, rolling out r136788.
+ http://trac.webkit.org/changeset/136788
+ https://bugs.webkit.org/show_bug.cgi?id=104260
+
+ Asserts on EFL WebKit2 Debug bot (Requested by yael on
+ #webkit).
+
+ * UIProcess/CoordinatedGraphics/LayerTreeRenderer.cpp:
+ (WebKit::LayerTreeRenderer::setLayerState):
+ (WebKit::LayerTreeRenderer::setRootLayerID):
+ * WebProcess/WebPage/CoordinatedGraphics/LayerTreeCoordinator.cpp:
+ (WebKit::LayerTreeCoordinator::LayerTreeCoordinator):
+ (WebKit::LayerTreeCoordinator::flushPendingLayerChanges):
+ * WebProcess/WebPage/CoordinatedGraphics/LayerTreeCoordinator.h:
+ (LayerTreeCoordinator):
+
+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
Modified: trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/LayerTreeRenderer.cpp (136840 => 136841)
--- trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/LayerTreeRenderer.cpp 2012-12-06 14:45:50 UTC (rev 136840)
+++ trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/LayerTreeRenderer.cpp 2012-12-06 14:56:26 UTC (rev 136841)
@@ -328,7 +328,6 @@
void LayerTreeRenderer::setLayerState(WebLayerID id, const WebLayerInfo& layerInfo)
{
- ASSERT(m_rootLayerID != InvalidWebLayerID);
GraphicsLayer* layer = ensureLayer(id);
layer->setReplicatedByLayer(layerByID(layerInfo.replica));
@@ -359,6 +358,8 @@
layer->setMasksToBounds(layerInfo.isRootLayer ? false : layerInfo.masksToBounds);
layer->setOpacity(layerInfo.opacity);
layer->setPreserves3D(layerInfo.preserves3D);
+ if (layerInfo.isRootLayer && m_rootLayerID != id)
+ setRootLayerID(id);
}
void LayerTreeRenderer::deleteLayer(WebLayerID layerID)
@@ -401,7 +402,10 @@
if (!layerID)
return;
- GraphicsLayer* layer = ensureLayer(layerID);
+ GraphicsLayer* layer = layerByID(layerID);
+ if (!layer)
+ return;
+
m_rootLayer->addChild(layer);
}
Modified: trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/LayerTreeCoordinator.cpp (136840 => 136841)
--- trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/LayerTreeCoordinator.cpp 2012-12-06 14:45:50 UTC (rev 136840)
+++ trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/LayerTreeCoordinator.cpp 2012-12-06 14:56:26 UTC (rev 136841)
@@ -90,6 +90,7 @@
, m_contentsScale(1)
, m_shouldSendScrollPositionUpdate(true)
, m_shouldSyncFrame(false)
+ , m_shouldSyncRootLayer(true)
, m_layerFlushTimer(this, &LayerTreeCoordinator::layerFlushTimerFired)
, m_releaseInactiveAtlasesTimer(this, &LayerTreeCoordinator::releaseInactiveAtlasesTimerFired)
, m_layerFlushSchedulingEnabled(true)
@@ -119,16 +120,9 @@
if (m_webPage->hasPageOverlay())
createPageOverlayLayer();
- initializeRootCompositingLayer();
scheduleLayerFlush();
}
-void LayerTreeCoordinator::initializeRootCompositingLayer()
-{
- m_webPage->send(Messages::LayerTreeCoordinatorProxy::SetRootCompositingLayer(toCoordinatedGraphicsLayer(m_rootLayer.get())->id()));
- m_shouldSyncFrame = true;
-}
-
void LayerTreeCoordinator::setLayerFlushSchedulingEnabled(bool layerFlushingEnabled)
{
if (m_layerFlushSchedulingEnabled == layerFlushingEnabled)
@@ -283,6 +277,12 @@
flushPendingImageBackingChanges();
+ if (m_shouldSyncRootLayer) {
+ m_webPage->send(Messages::LayerTreeCoordinatorProxy::SetRootCompositingLayer(toCoordinatedGraphicsLayer(m_rootLayer.get())->id()));
+ m_shouldSyncRootLayer = false;
+ m_shouldSyncFrame = true;
+ }
+
for (size_t i = 0; i < m_detachedLayers.size(); ++i)
m_webPage->send(Messages::LayerTreeCoordinatorProxy::DeleteCompositingLayer(m_detachedLayers[i]));
m_detachedLayers.clear();
Modified: trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/LayerTreeCoordinator.h (136840 => 136841)
--- trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/LayerTreeCoordinator.h 2012-12-06 14:45:50 UTC (rev 136840)
+++ trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/LayerTreeCoordinator.h 2012-12-06 14:56:26 UTC (rev 136841)
@@ -135,7 +135,6 @@
virtual PassOwnPtr<WebCore::GraphicsLayer> createGraphicsLayer(WebCore::GraphicsLayerClient*) OVERRIDE;
// LayerTreeCoordinator
- void initializeRootCompositingLayer();
void createPageOverlayLayer();
void destroyPageOverlayLayer();
bool flushPendingLayerChanges();
@@ -194,6 +193,7 @@
LayerTreeContext m_layerTreeContext;
bool m_shouldSyncFrame;
+ bool m_shouldSyncRootLayer;
WebCore::Timer<LayerTreeCoordinator> m_layerFlushTimer;
WebCore::Timer<LayerTreeCoordinator> m_releaseInactiveAtlasesTimer;
bool m_layerFlushSchedulingEnabled;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
