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

Unified Diff: cc/CCQuadCuller.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/CCQuadCuller.h ('k') | cc/CCQuadCullerTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/CCQuadCuller.cpp
diff --git a/cc/CCQuadCuller.cpp b/cc/CCQuadCuller.cpp
index 3197f113ec0ad6fc3730e200cedbdf415afc89d0..d8f1133acb85c5b276784abadd179d1ccb57f521 100644
--- a/cc/CCQuadCuller.cpp
+++ b/cc/CCQuadCuller.cpp
@@ -8,6 +8,7 @@
#include "CCQuadCuller.h"
+#include "CCAppendQuadsData.h"
#include "CCDebugBorderDrawQuad.h"
#include "CCLayerImpl.h"
#include "CCOcclusionTracker.h"
@@ -35,7 +36,6 @@ CCQuadCuller::CCQuadCuller(CCQuadList& quadList, CCSharedQuadStateList& sharedQu
, m_occlusionTracker(occlusionTracker)
, m_showCullingWithDebugBorderQuads(showCullingWithDebugBorderQuads)
, m_forSurface(forSurface)
- , m_hasOcclusionFromOutsideTargetSurface(false)
{
}
@@ -72,7 +72,7 @@ static inline bool appendQuadInternal(PassOwnPtr<CCDrawQuad> passDrawQuad, const
return keepQuad;
}
-bool CCQuadCuller::append(PassOwnPtr<CCDrawQuad> passDrawQuad)
+bool CCQuadCuller::append(PassOwnPtr<CCDrawQuad> passDrawQuad, CCAppendQuadsData& appendQuadsData)
{
ASSERT(passDrawQuad->sharedQuadState() == m_currentSharedQuadState);
ASSERT(passDrawQuad->sharedQuadStateId() == m_currentSharedQuadState->id);
@@ -86,7 +86,8 @@ bool CCQuadCuller::append(PassOwnPtr<CCDrawQuad> passDrawQuad)
culledRect = m_occlusionTracker->unoccludedContributingSurfaceContentRect(m_layer, false, passDrawQuad->quadRect(), &hasOcclusionFromOutsideTargetSurface);
else
culledRect = m_occlusionTracker->unoccludedContentRect(m_layer, passDrawQuad->quadRect(), &hasOcclusionFromOutsideTargetSurface);
- m_hasOcclusionFromOutsideTargetSurface |= hasOcclusionFromOutsideTargetSurface;
+
+ appendQuadsData.hadOcclusionFromOutsideTargetSurface |= hasOcclusionFromOutsideTargetSurface;
return appendQuadInternal(passDrawQuad, culledRect, m_quadList, *m_occlusionTracker, m_showCullingWithDebugBorderQuads);
}
« no previous file with comments | « cc/CCQuadCuller.h ('k') | cc/CCQuadCullerTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698