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

Unified Diff: cc/CCThreadedTest.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/CCThreadProxy.cpp ('k') | cc/CCThreadedTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/CCThreadedTest.h
diff --git a/cc/CCThreadedTest.h b/cc/CCThreadedTest.h
index d9e43914b8feea9b108e3fa9f96e7a30f7d18597..53e6fe0488774ec204b09006a81a06aca2670e47 100644
--- a/cc/CCThreadedTest.h
+++ b/cc/CCThreadedTest.h
@@ -28,7 +28,7 @@ class TestHooks : public WebKit::WebAnimationDelegate {
public:
virtual void beginCommitOnCCThread(cc::CCLayerTreeHostImpl*) { }
virtual void commitCompleteOnCCThread(cc::CCLayerTreeHostImpl*) { }
- virtual bool prepareToDrawOnCCThread(cc::CCLayerTreeHostImpl*) { return true; }
+ virtual bool prepareToDrawOnCCThread(cc::CCLayerTreeHostImpl*);
virtual void drawLayersOnCCThread(cc::CCLayerTreeHostImpl*) { }
virtual void animateLayers(cc::CCLayerTreeHostImpl*, double monotonicTime) { }
virtual void willAnimateLayers(cc::CCLayerTreeHostImpl*, double monotonicTime) { }
@@ -66,6 +66,8 @@ class MockCCLayerTreeHostClient : public cc::CCLayerTreeHostClient {
// ending the test is an asynchronous process.
class CCThreadedTest : public testing::Test, public TestHooks {
public:
+ virtual ~CCThreadedTest();
+
virtual void afterTest() = 0;
virtual void beginTest() = 0;
@@ -94,7 +96,7 @@ protected:
virtual void initializeSettings(cc::CCLayerTreeSettings&) { }
- virtual void scheduleComposite();
+ virtual void scheduleComposite() OVERRIDE;
void realEndTest();
@@ -145,18 +147,18 @@ class MockLayerTreeHostImpl : public cc::CCLayerTreeHostImpl {
public:
static PassOwnPtr<MockLayerTreeHostImpl> create(TestHooks*, const cc::CCLayerTreeSettings&, cc::CCLayerTreeHostImplClient*);
- virtual void beginCommit();
- virtual void commitComplete();
- virtual bool prepareToDraw(FrameData&);
- virtual void drawLayers(const FrameData&);
+ virtual void beginCommit() OVERRIDE;
+ virtual void commitComplete() OVERRIDE;
+ virtual bool prepareToDraw(FrameData&) OVERRIDE;
+ virtual void drawLayers(const FrameData&) OVERRIDE;
// Make these public.
typedef Vector<cc::CCLayerImpl*> CCLayerList;
using CCLayerTreeHostImpl::calculateRenderSurfaceLayerList;
protected:
- virtual void animateLayers(double monotonicTime, double wallClockTime);
- virtual base::TimeDelta lowFrequencyAnimationInterval() const;
+ virtual void animateLayers(double monotonicTime, double wallClockTime) OVERRIDE;
+ virtual base::TimeDelta lowFrequencyAnimationInterval() const OVERRIDE;
private:
MockLayerTreeHostImpl(TestHooks*, const cc::CCLayerTreeSettings&, cc::CCLayerTreeHostImplClient*);
@@ -167,6 +169,7 @@ private:
class CompositorFakeWebGraphicsContext3DWithTextureTracking : public WebKit::CompositorFakeWebGraphicsContext3D {
public:
static PassOwnPtr<CompositorFakeWebGraphicsContext3DWithTextureTracking> create(Attributes);
+ virtual ~CompositorFakeWebGraphicsContext3DWithTextureTracking();
virtual WebKit::WebGLId createTexture();
« no previous file with comments | « cc/CCThreadProxy.cpp ('k') | cc/CCThreadedTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698