Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4456)

Unified Diff: cc/CCLayerTreeHostCommon.cpp

Issue 10916307: Add the ubercomp DelegatedRendererLayer. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Use OwnPtrVector Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/CCLayerImpl.h ('k') | cc/CCLayerTreeHostImpl.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/CCLayerTreeHostCommon.cpp
diff --git a/cc/CCLayerTreeHostCommon.cpp b/cc/CCLayerTreeHostCommon.cpp
index b5257e0f4961d2331dfd462752612ce8dbe7c4c0..141b3ffd172a8912bafe758e604579bd71c1ca02 100644
--- a/cc/CCLayerTreeHostCommon.cpp
+++ b/cc/CCLayerTreeHostCommon.cpp
@@ -341,7 +341,7 @@ void setupRootLayerAndSurfaceForRecursion(LayerType* rootLayer, LayerList& rende
rootLayer->createRenderSurface();
rootLayer->renderSurface()->setContentRect(IntRect(IntPoint::zero(), deviceViewportSize));
- rootLayer->renderSurface()->clearLayerList();
+ rootLayer->renderSurface()->clearLayerLists();
ASSERT(renderSurfaceLayerList.isEmpty());
renderSurfaceLayerList.append(rootLayer);
@@ -528,7 +528,7 @@ static void calculateDrawTransformsInternal(LayerType* layer, LayerType* rootLay
layer->createRenderSurface();
RenderSurfaceType* renderSurface = layer->renderSurface();
- renderSurface->clearLayerList();
+ renderSurface->clearLayerLists();
// The origin of the new surface is the upper left corner of the layer.
renderSurface->setDrawTransform(drawTransform);
@@ -697,7 +697,7 @@ static void calculateDrawTransformsInternal(LayerType* layer, LayerType* rootLay
clippedContentRect.setHeight(std::min(clippedContentRect.height(), maxTextureSize));
if (clippedContentRect.isEmpty())
- renderSurface->clearLayerList();
+ renderSurface->clearLayerLists();
renderSurface->setContentRect(clippedContentRect);
renderSurface->setScreenSpaceTransform(layer->screenSpaceTransform());
@@ -753,7 +753,8 @@ static void calculateDrawTransformsInternal(LayerType* layer, LayerType* rootLay
else
drawableContentRectOfSubtree = localDrawableContentRectOfSubtree;
- return;
+ if (layer->hasContributingDelegatedRenderPasses())
+ layer->renderTarget()->renderSurface()->addContributingDelegatedRenderPassLayer(layer);
}
// FIXME: Instead of using the following function to set visibility rects on a second
« no previous file with comments | « cc/CCLayerImpl.h ('k') | cc/CCLayerTreeHostImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698