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

Unified Diff: cc/CCRenderPass.cpp

Issue 10898023: Update cc snapshot to WK r126941 (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: rebased Created 8 years, 4 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/CCRenderPass.h ('k') | cc/CCRenderSurface.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/CCRenderPass.cpp
diff --git a/cc/CCRenderPass.cpp b/cc/CCRenderPass.cpp
index 2ab855ffbaf337884b02b1272694d379775cf765..9990f2e3ee36ab21f080ea12bdb83c6525e29762 100644
--- a/cc/CCRenderPass.cpp
+++ b/cc/CCRenderPass.cpp
@@ -32,31 +32,27 @@ CCRenderPass::CCRenderPass(int id, IntRect outputRect, const WebKit::WebTransfor
ASSERT(id > 0);
}
-void CCRenderPass::appendQuadsForLayer(CCLayerImpl* layer, CCOcclusionTrackerImpl* occlusionTracker, bool& hadMissingTiles)
+void CCRenderPass::appendQuadsForLayer(CCLayerImpl* layer, CCOcclusionTrackerImpl* occlusionTracker, CCAppendQuadsData& appendQuadsData)
{
const bool forSurface = false;
CCQuadCuller quadCuller(m_quadList, m_sharedQuadStateList, layer, occlusionTracker, layer->hasDebugBorders(), forSurface);
- layer->appendQuads(quadCuller, hadMissingTiles);
-
- m_hasOcclusionFromOutsideTargetSurface |= quadCuller.hasOcclusionFromOutsideTargetSurface();
+ layer->appendQuads(quadCuller, appendQuadsData);
}
-void CCRenderPass::appendQuadsForRenderSurfaceLayer(CCLayerImpl* layer, const CCRenderPass* contributingRenderPass, CCOcclusionTrackerImpl* occlusionTracker)
+void CCRenderPass::appendQuadsForRenderSurfaceLayer(CCLayerImpl* layer, const CCRenderPass* contributingRenderPass, CCOcclusionTrackerImpl* occlusionTracker, CCAppendQuadsData& appendQuadsData)
{
const bool forSurface = true;
CCQuadCuller quadCuller(m_quadList, m_sharedQuadStateList, layer, occlusionTracker, layer->hasDebugBorders(), forSurface);
bool isReplica = false;
- layer->renderSurface()->appendQuads(quadCuller, isReplica, contributingRenderPass->id());
+ layer->renderSurface()->appendQuads(quadCuller, appendQuadsData, isReplica, contributingRenderPass->id());
// Add replica after the surface so that it appears below the surface.
if (layer->hasReplica()) {
isReplica = true;
- layer->renderSurface()->appendQuads(quadCuller, isReplica, contributingRenderPass->id());
+ layer->renderSurface()->appendQuads(quadCuller, appendQuadsData, isReplica, contributingRenderPass->id());
}
-
- m_hasOcclusionFromOutsideTargetSurface |= quadCuller.hasOcclusionFromOutsideTargetSurface();
}
void CCRenderPass::appendQuadsToFillScreen(CCLayerImpl* rootLayer, SkColor screenBackgroundColor, const CCOcclusionTrackerImpl& occlusionTracker)
« no previous file with comments | « cc/CCRenderPass.h ('k') | cc/CCRenderSurface.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698