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

Unified Diff: cc/CCThreadedTest.h

Issue 10905231: Enable cc_unittests in component build (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: mark WebThreadImplForMessageLoop ctor/dtor as exported 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 55840ed99d257f1c6908fda054f81f4d9fe47c88..8dc43939cf10eb873642fca9fe0ad0dd212c50c2 100644
--- a/cc/CCThreadedTest.h
+++ b/cc/CCThreadedTest.h
@@ -50,7 +50,6 @@ public:
class TimeoutTask;
class BeginTask;
-class EndTestTask;
class MockCCLayerTreeHostClient : public WebCore::CCLayerTreeHostClient {
};
@@ -87,7 +86,6 @@ public:
void timeout();
void clearTimeout() { m_timeoutTask = 0; }
- void clearEndTestTask() { m_endTestTask = 0; }
WebCore::CCLayerTreeHost* layerTreeHost() { return m_layerTreeHost.get(); }
@@ -98,19 +96,18 @@ protected:
virtual void scheduleComposite();
- static void onEndTest(void* self);
+ void realEndTest();
- static void dispatchSetNeedsAnimate(void* self);
- static void dispatchAddInstantAnimation(void* self);
- static void dispatchAddAnimation(void* self);
- static void dispatchSetNeedsAnimateAndCommit(void* self);
- static void dispatchSetNeedsCommit(void* self);
- static void dispatchAcquireLayerTextures(void* self);
- static void dispatchSetNeedsRedraw(void* self);
- static void dispatchSetVisible(void* self);
- static void dispatchSetInvisible(void* self);
- static void dispatchComposite(void* self);
- static void dispatchDidAddAnimation(void* self);
+ void dispatchSetNeedsAnimate();
+ void dispatchAddInstantAnimation();
+ void dispatchAddAnimation();
+ void dispatchSetNeedsAnimateAndCommit();
+ void dispatchSetNeedsCommit();
+ void dispatchAcquireLayerTextures();
+ void dispatchSetNeedsRedraw();
+ void dispatchSetVisible(bool);
+ void dispatchComposite();
+ void dispatchDidAddAnimation();
virtual void runTest(bool threaded);
WebKit::WebThread* webThread() const { return m_webThread.get(); }
@@ -119,6 +116,9 @@ protected:
OwnPtr<MockCCLayerTreeHostClient> m_client;
OwnPtr<WebCore::CCLayerTreeHost> m_layerTreeHost;
+protected:
+ RefPtr<WebCore::CCScopedThreadProxy> m_mainThreadProxy;
+
private:
bool m_beginning;
bool m_endWhenBeginReturns;
@@ -128,10 +128,8 @@ private:
bool m_started;
OwnPtr<WebKit::WebThread> m_webThread;
- RefPtr<WebCore::CCScopedThreadProxy> m_mainThreadProxy;
TimeoutTask* m_timeoutTask;
BeginTask* m_beginTask;
- EndTestTask* m_endTestTask;
};
class CCThreadedTestThreadOnly : public CCThreadedTest {
« 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