| Index: cc/proxy.h
|
| diff --git a/cc/proxy.h b/cc/proxy.h
|
| index cae128e51abf826733da2dbdfb149470fa899d41..b7720ccb133043822d430bceb938a169446d35de 100644
|
| --- a/cc/proxy.h
|
| +++ b/cc/proxy.h
|
| @@ -10,27 +10,27 @@
|
|
|
| namespace cc {
|
|
|
| -class CCThread;
|
| +class Thread;
|
| class IntRect;
|
| class IntSize;
|
| -struct CCRenderingStats;
|
| +struct RenderingStats;
|
| struct RendererCapabilities;
|
|
|
| // Abstract class responsible for proxying commands from the main-thread side of
|
| // the compositor over to the compositor implementation.
|
| -class CCProxy {
|
| +class Proxy {
|
| public:
|
| - static void setMainThread(CCThread*);
|
| - static CCThread* mainThread();
|
| + static void setMainThread(Thread*);
|
| + static Thread* mainThread();
|
|
|
| static bool hasImplThread();
|
| - static void setImplThread(CCThread*);
|
| - static CCThread* implThread();
|
| + static void setImplThread(Thread*);
|
| + static Thread* implThread();
|
|
|
| // Returns 0 if the current thread is neither the main thread nor the impl thread.
|
| - static CCThread* currentThread();
|
| + static Thread* currentThread();
|
|
|
| - virtual ~CCProxy();
|
| + virtual ~Proxy();
|
|
|
| virtual bool compositeAndReadback(void *pixels, const IntRect&) = 0;
|
|
|
| @@ -56,7 +56,7 @@ public:
|
| // reinitialized.
|
| virtual bool recreateContext() = 0;
|
|
|
| - virtual void renderingStats(CCRenderingStats*) = 0;
|
| + virtual void renderingStats(RenderingStats*) = 0;
|
|
|
| virtual const RendererCapabilities& rendererCapabilities() const = 0;
|
|
|
| @@ -96,12 +96,12 @@ public:
|
| #endif
|
|
|
| protected:
|
| - CCProxy();
|
| + Proxy();
|
| friend class DebugScopedSetImplThread;
|
| friend class DebugScopedSetMainThreadBlocked;
|
|
|
| private:
|
| - DISALLOW_COPY_AND_ASSIGN(CCProxy);
|
| + DISALLOW_COPY_AND_ASSIGN(Proxy);
|
| };
|
|
|
| class DebugScopedSetMainThreadBlocked {
|
| @@ -109,15 +109,15 @@ public:
|
| DebugScopedSetMainThreadBlocked()
|
| {
|
| #if !ASSERT_DISABLED
|
| - ASSERT(!CCProxy::isMainThreadBlocked());
|
| - CCProxy::setMainThreadBlocked(true);
|
| + ASSERT(!Proxy::isMainThreadBlocked());
|
| + Proxy::setMainThreadBlocked(true);
|
| #endif
|
| }
|
| ~DebugScopedSetMainThreadBlocked()
|
| {
|
| #if !ASSERT_DISABLED
|
| - ASSERT(CCProxy::isMainThreadBlocked());
|
| - CCProxy::setMainThreadBlocked(false);
|
| + ASSERT(Proxy::isMainThreadBlocked());
|
| + Proxy::setMainThreadBlocked(false);
|
| #endif
|
| }
|
| };
|
|
|