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

Unified Diff: cc/test/MockCCQuadCuller.h

Issue 10947047: Fix remaining cc files to compile with Clang (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix FakeCCDelayBasedTimeSource 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/test/FakeCCLayerTreeHostClient.cpp ('k') | cc/test/MockCCQuadCuller.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/test/MockCCQuadCuller.h
diff --git a/cc/test/MockCCQuadCuller.h b/cc/test/MockCCQuadCuller.h
index 6edfe0845132853bc25e9a0b3ce02e5a65121866..54e64256c09df7b77fb4e374aa7a8acc85044f66 100644
--- a/cc/test/MockCCQuadCuller.h
+++ b/cc/test/MockCCQuadCuller.h
@@ -7,6 +7,7 @@
#include "CCDrawQuad.h"
#include "CCQuadSink.h"
+#include "CCRenderPass.h"
#include "IntRect.h"
#include <wtf/PassOwnPtr.h>
@@ -14,35 +15,14 @@ namespace cc {
class MockCCQuadCuller : public CCQuadSink {
public:
- MockCCQuadCuller()
- : m_activeQuadList(m_quadListStorage)
- , m_activeSharedQuadStateList(m_sharedQuadStateStorage)
- { }
-
- explicit MockCCQuadCuller(CCQuadList& externalQuadList, CCSharedQuadStateList& externalSharedQuadStateList)
- : m_activeQuadList(externalQuadList)
- , m_activeSharedQuadStateList(externalSharedQuadStateList)
- { }
-
- virtual bool append(PassOwnPtr<CCDrawQuad> newQuad, CCAppendQuadsData&) OVERRIDE
- {
- OwnPtr<CCDrawQuad> drawQuad = newQuad;
- if (!drawQuad->quadRect().isEmpty()) {
- m_activeQuadList.append(drawQuad.release());
- return true;
- }
- return false;
- }
-
- virtual CCSharedQuadState* useSharedQuadState(PassOwnPtr<CCSharedQuadState> passSharedQuadState) OVERRIDE
- {
- OwnPtr<CCSharedQuadState> sharedQuadState(passSharedQuadState);
- sharedQuadState->id = m_activeSharedQuadStateList.size();
-
- CCSharedQuadState* rawPtr = sharedQuadState.get();
- m_activeSharedQuadStateList.append(sharedQuadState.release());
- return rawPtr;
- }
+ MockCCQuadCuller();
+ virtual ~MockCCQuadCuller();
+
+ MockCCQuadCuller(CCQuadList& externalQuadList, CCSharedQuadStateList& externalSharedQuadStateList);
+
+ virtual bool append(PassOwnPtr<CCDrawQuad> newQuad, CCAppendQuadsData&) OVERRIDE;
+
+ virtual CCSharedQuadState* useSharedQuadState(PassOwnPtr<CCSharedQuadState> passSharedQuadState) OVERRIDE;
const CCQuadList& quadList() const { return m_activeQuadList; };
const CCSharedQuadStateList& sharedQuadStateList() const { return m_activeSharedQuadStateList; };
« no previous file with comments | « cc/test/FakeCCLayerTreeHostClient.cpp ('k') | cc/test/MockCCQuadCuller.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698