Index: cc/single_thread_proxy.cc |
diff --git a/cc/single_thread_proxy.cc b/cc/single_thread_proxy.cc |
index 9f61e79f618d49c45eb5bb55e1a6c4585bb4bd02..b932058a69aae307e1ac9cd66374cd1bb061743b 100644 |
--- a/cc/single_thread_proxy.cc |
+++ b/cc/single_thread_proxy.cc |
@@ -16,39 +16,39 @@ |
namespace cc { |
-scoped_ptr<CCProxy> CCSingleThreadProxy::create(CCLayerTreeHost* layerTreeHost) |
+scoped_ptr<Proxy> SingleThreadProxy::create(LayerTreeHost* layerTreeHost) |
{ |
- return make_scoped_ptr(new CCSingleThreadProxy(layerTreeHost)).PassAs<CCProxy>(); |
+ return make_scoped_ptr(new SingleThreadProxy(layerTreeHost)).PassAs<Proxy>(); |
} |
-CCSingleThreadProxy::CCSingleThreadProxy(CCLayerTreeHost* layerTreeHost) |
+SingleThreadProxy::SingleThreadProxy(LayerTreeHost* layerTreeHost) |
: m_layerTreeHost(layerTreeHost) |
, m_contextLost(false) |
, m_rendererInitialized(false) |
, m_nextFrameIsNewlyCommittedFrame(false) |
, m_totalCommitCount(0) |
{ |
- TRACE_EVENT0("cc", "CCSingleThreadProxy::CCSingleThreadProxy"); |
- ASSERT(CCProxy::isMainThread()); |
+ TRACE_EVENT0("cc", "SingleThreadProxy::SingleThreadProxy"); |
+ ASSERT(Proxy::isMainThread()); |
} |
-void CCSingleThreadProxy::start() |
+void SingleThreadProxy::start() |
{ |
DebugScopedSetImplThread impl; |
m_layerTreeHostImpl = m_layerTreeHost->createLayerTreeHostImpl(this); |
} |
-CCSingleThreadProxy::~CCSingleThreadProxy() |
+SingleThreadProxy::~SingleThreadProxy() |
{ |
- TRACE_EVENT0("cc", "CCSingleThreadProxy::~CCSingleThreadProxy"); |
- ASSERT(CCProxy::isMainThread()); |
+ TRACE_EVENT0("cc", "SingleThreadProxy::~SingleThreadProxy"); |
+ ASSERT(Proxy::isMainThread()); |
ASSERT(!m_layerTreeHostImpl.get() && !m_layerTreeHost); // make sure stop() got called. |
} |
-bool CCSingleThreadProxy::compositeAndReadback(void *pixels, const IntRect& rect) |
+bool SingleThreadProxy::compositeAndReadback(void *pixels, const IntRect& rect) |
{ |
- TRACE_EVENT0("cc", "CCSingleThreadProxy::compositeAndReadback"); |
- ASSERT(CCProxy::isMainThread()); |
+ TRACE_EVENT0("cc", "SingleThreadProxy::compositeAndReadback"); |
+ ASSERT(Proxy::isMainThread()); |
if (!commitAndComposite()) |
return false; |
@@ -64,50 +64,50 @@ bool CCSingleThreadProxy::compositeAndReadback(void *pixels, const IntRect& rect |
return true; |
} |
-void CCSingleThreadProxy::startPageScaleAnimation(const IntSize& targetPosition, bool useAnchor, float scale, double duration) |
+void SingleThreadProxy::startPageScaleAnimation(const IntSize& targetPosition, bool useAnchor, float scale, double duration) |
{ |
m_layerTreeHostImpl->startPageScaleAnimation(targetPosition, useAnchor, scale, monotonicallyIncreasingTime(), duration); |
} |
-void CCSingleThreadProxy::finishAllRendering() |
+void SingleThreadProxy::finishAllRendering() |
{ |
- ASSERT(CCProxy::isMainThread()); |
+ ASSERT(Proxy::isMainThread()); |
{ |
DebugScopedSetImplThread impl; |
m_layerTreeHostImpl->finishAllRendering(); |
} |
} |
-bool CCSingleThreadProxy::isStarted() const |
+bool SingleThreadProxy::isStarted() const |
{ |
- ASSERT(CCProxy::isMainThread()); |
+ ASSERT(Proxy::isMainThread()); |
return m_layerTreeHostImpl.get(); |
} |
-bool CCSingleThreadProxy::initializeContext() |
+bool SingleThreadProxy::initializeContext() |
{ |
- ASSERT(CCProxy::isMainThread()); |
- scoped_ptr<CCGraphicsContext> context = m_layerTreeHost->createContext(); |
+ ASSERT(Proxy::isMainThread()); |
+ scoped_ptr<GraphicsContext> context = m_layerTreeHost->createContext(); |
if (!context.get()) |
return false; |
m_contextBeforeInitialization = context.Pass(); |
return true; |
} |
-void CCSingleThreadProxy::setSurfaceReady() |
+void SingleThreadProxy::setSurfaceReady() |
{ |
// Scheduling is controlled by the embedder in the single thread case, so nothing to do. |
} |
-void CCSingleThreadProxy::setVisible(bool visible) |
+void SingleThreadProxy::setVisible(bool visible) |
{ |
DebugScopedSetImplThread impl; |
m_layerTreeHostImpl->setVisible(visible); |
} |
-bool CCSingleThreadProxy::initializeRenderer() |
+bool SingleThreadProxy::initializeRenderer() |
{ |
- ASSERT(CCProxy::isMainThread()); |
+ ASSERT(Proxy::isMainThread()); |
ASSERT(m_contextBeforeInitialization.get()); |
{ |
DebugScopedSetImplThread impl; |
@@ -121,13 +121,13 @@ bool CCSingleThreadProxy::initializeRenderer() |
} |
} |
-bool CCSingleThreadProxy::recreateContext() |
+bool SingleThreadProxy::recreateContext() |
{ |
- TRACE_EVENT0("cc", "CCSingleThreadProxy::recreateContext"); |
- ASSERT(CCProxy::isMainThread()); |
+ TRACE_EVENT0("cc", "SingleThreadProxy::recreateContext"); |
+ ASSERT(Proxy::isMainThread()); |
ASSERT(m_contextLost); |
- scoped_ptr<CCGraphicsContext> context = m_layerTreeHost->createContext(); |
+ scoped_ptr<GraphicsContext> context = m_layerTreeHost->createContext(); |
if (!context.get()) |
return false; |
@@ -149,36 +149,36 @@ bool CCSingleThreadProxy::recreateContext() |
return initialized; |
} |
-void CCSingleThreadProxy::renderingStats(CCRenderingStats* stats) |
+void SingleThreadProxy::renderingStats(RenderingStats* stats) |
{ |
stats->totalCommitTimeInSeconds = m_totalCommitTime.InSecondsF(); |
stats->totalCommitCount = m_totalCommitCount; |
m_layerTreeHostImpl->renderingStats(stats); |
} |
-const RendererCapabilities& CCSingleThreadProxy::rendererCapabilities() const |
+const RendererCapabilities& SingleThreadProxy::rendererCapabilities() const |
{ |
ASSERT(m_rendererInitialized); |
// Note: this gets called during the commit by the "impl" thread |
return m_RendererCapabilitiesForMainThread; |
} |
-void CCSingleThreadProxy::loseContext() |
+void SingleThreadProxy::loseContext() |
{ |
- ASSERT(CCProxy::isMainThread()); |
+ ASSERT(Proxy::isMainThread()); |
m_layerTreeHost->didLoseContext(); |
m_contextLost = true; |
} |
-void CCSingleThreadProxy::setNeedsAnimate() |
+void SingleThreadProxy::setNeedsAnimate() |
{ |
- // CCThread-only feature |
+ // Thread-only feature |
ASSERT_NOT_REACHED(); |
} |
-void CCSingleThreadProxy::doCommit(scoped_ptr<CCTextureUpdateQueue> queue) |
+void SingleThreadProxy::doCommit(scoped_ptr<TextureUpdateQueue> queue) |
{ |
- ASSERT(CCProxy::isMainThread()); |
+ ASSERT(Proxy::isMainThread()); |
// Commit immediately |
{ |
DebugScopedSetMainThreadBlocked mainThreadBlocked; |
@@ -190,10 +190,10 @@ void CCSingleThreadProxy::doCommit(scoped_ptr<CCTextureUpdateQueue> queue) |
m_layerTreeHost->contentsTextureManager()->pushTexturePrioritiesToBackings(); |
m_layerTreeHost->beginCommitOnImplThread(m_layerTreeHostImpl.get()); |
- scoped_ptr<CCTextureUpdateController> updateController = |
- CCTextureUpdateController::create( |
+ scoped_ptr<TextureUpdateController> updateController = |
+ TextureUpdateController::create( |
NULL, |
- CCProxy::mainThread(), |
+ Proxy::mainThread(), |
queue.Pass(), |
m_layerTreeHostImpl->resourceProvider(), |
m_layerTreeHostImpl->resourceProvider()->textureUploader()); |
@@ -206,7 +206,7 @@ void CCSingleThreadProxy::doCommit(scoped_ptr<CCTextureUpdateQueue> queue) |
#if !ASSERT_DISABLED |
// In the single-threaded case, the scroll deltas should never be |
// touched on the impl layer tree. |
- scoped_ptr<CCScrollAndScaleSet> scrollInfo = m_layerTreeHostImpl->processScrollDeltas(); |
+ scoped_ptr<ScrollAndScaleSet> scrollInfo = m_layerTreeHostImpl->processScrollDeltas(); |
ASSERT(!scrollInfo->scrolls.size()); |
#endif |
@@ -218,13 +218,13 @@ void CCSingleThreadProxy::doCommit(scoped_ptr<CCTextureUpdateQueue> queue) |
m_nextFrameIsNewlyCommittedFrame = true; |
} |
-void CCSingleThreadProxy::setNeedsCommit() |
+void SingleThreadProxy::setNeedsCommit() |
{ |
- ASSERT(CCProxy::isMainThread()); |
+ ASSERT(Proxy::isMainThread()); |
m_layerTreeHost->scheduleComposite(); |
} |
-void CCSingleThreadProxy::setNeedsRedraw() |
+void SingleThreadProxy::setNeedsRedraw() |
{ |
// FIXME: Once we move render_widget scheduling into this class, we can |
// treat redraw requests more efficiently than commitAndRedraw requests. |
@@ -232,24 +232,24 @@ void CCSingleThreadProxy::setNeedsRedraw() |
setNeedsCommit(); |
} |
-bool CCSingleThreadProxy::commitRequested() const |
+bool SingleThreadProxy::commitRequested() const |
{ |
return false; |
} |
-void CCSingleThreadProxy::didAddAnimation() |
+void SingleThreadProxy::didAddAnimation() |
{ |
} |
-size_t CCSingleThreadProxy::maxPartialTextureUpdates() const |
+size_t SingleThreadProxy::maxPartialTextureUpdates() const |
{ |
return std::numeric_limits<size_t>::max(); |
} |
-void CCSingleThreadProxy::stop() |
+void SingleThreadProxy::stop() |
{ |
- TRACE_EVENT0("cc", "CCSingleThreadProxy::stop"); |
- ASSERT(CCProxy::isMainThread()); |
+ TRACE_EVENT0("cc", "SingleThreadProxy::stop"); |
+ ASSERT(Proxy::isMainThread()); |
{ |
DebugScopedSetMainThreadBlocked mainThreadBlocked; |
DebugScopedSetImplThread impl; |
@@ -261,24 +261,24 @@ void CCSingleThreadProxy::stop() |
m_layerTreeHost = 0; |
} |
-void CCSingleThreadProxy::setNeedsRedrawOnImplThread() |
+void SingleThreadProxy::setNeedsRedrawOnImplThread() |
{ |
m_layerTreeHost->scheduleComposite(); |
} |
-void CCSingleThreadProxy::setNeedsCommitOnImplThread() |
+void SingleThreadProxy::setNeedsCommitOnImplThread() |
{ |
m_layerTreeHost->scheduleComposite(); |
} |
-void CCSingleThreadProxy::postAnimationEventsToMainThreadOnImplThread(scoped_ptr<CCAnimationEventsVector> events, double wallClockTime) |
+void SingleThreadProxy::postAnimationEventsToMainThreadOnImplThread(scoped_ptr<AnimationEventsVector> events, double wallClockTime) |
{ |
- ASSERT(CCProxy::isImplThread()); |
+ ASSERT(Proxy::isImplThread()); |
DebugScopedSetMainThread main; |
m_layerTreeHost->setAnimationEvents(events.Pass(), wallClockTime); |
} |
-bool CCSingleThreadProxy::reduceContentsTextureMemoryOnImplThread(size_t limitBytes) |
+bool SingleThreadProxy::reduceContentsTextureMemoryOnImplThread(size_t limitBytes) |
{ |
ASSERT(isImplThread()); |
if (!m_layerTreeHost->contentsTextureManager()) |
@@ -288,7 +288,7 @@ bool CCSingleThreadProxy::reduceContentsTextureMemoryOnImplThread(size_t limitBy |
} |
// Called by the legacy scheduling path (e.g. where render_widget does the scheduling) |
-void CCSingleThreadProxy::compositeImmediately() |
+void SingleThreadProxy::compositeImmediately() |
{ |
if (commitAndComposite()) { |
m_layerTreeHostImpl->swapBuffers(); |
@@ -296,7 +296,7 @@ void CCSingleThreadProxy::compositeImmediately() |
} |
} |
-void CCSingleThreadProxy::forceSerializeOnSwapBuffers() |
+void SingleThreadProxy::forceSerializeOnSwapBuffers() |
{ |
{ |
DebugScopedSetImplThread impl; |
@@ -305,27 +305,27 @@ void CCSingleThreadProxy::forceSerializeOnSwapBuffers() |
} |
} |
-void CCSingleThreadProxy::onSwapBuffersCompleteOnImplThread() |
+void SingleThreadProxy::onSwapBuffersCompleteOnImplThread() |
{ |
ASSERT_NOT_REACHED(); |
} |
-bool CCSingleThreadProxy::commitAndComposite() |
+bool SingleThreadProxy::commitAndComposite() |
{ |
- ASSERT(CCProxy::isMainThread()); |
+ ASSERT(Proxy::isMainThread()); |
if (!m_layerTreeHost->initializeRendererIfNeeded()) |
return false; |
// Unlink any texture backings that were deleted |
- CCPrioritizedTextureManager::BackingList evictedContentsTexturesBackings; |
+ PrioritizedTextureManager::BackingList evictedContentsTexturesBackings; |
{ |
DebugScopedSetImplThread implThread; |
m_layerTreeHost->contentsTextureManager()->getEvictedBackings(evictedContentsTexturesBackings); |
} |
m_layerTreeHost->contentsTextureManager()->unlinkEvictedBackings(evictedContentsTexturesBackings); |
- scoped_ptr<CCTextureUpdateQueue> queue = make_scoped_ptr(new CCTextureUpdateQueue); |
+ scoped_ptr<TextureUpdateQueue> queue = make_scoped_ptr(new TextureUpdateQueue); |
m_layerTreeHost->updateLayers(*(queue.get()), m_layerTreeHostImpl->memoryAllocationLimitBytes()); |
if (m_layerTreeHostImpl->contentsTexturesPurged()) |
@@ -338,7 +338,7 @@ bool CCSingleThreadProxy::commitAndComposite() |
return result; |
} |
-bool CCSingleThreadProxy::doComposite() |
+bool SingleThreadProxy::doComposite() |
{ |
ASSERT(!m_contextLost); |
{ |
@@ -357,7 +357,7 @@ bool CCSingleThreadProxy::doComposite() |
if (!m_layerTreeHostImpl->canDraw()) |
return false; |
- CCLayerTreeHostImpl::FrameData frame; |
+ LayerTreeHostImpl::FrameData frame; |
m_layerTreeHostImpl->prepareToDraw(frame); |
m_layerTreeHostImpl->drawLayers(frame); |
m_layerTreeHostImpl->didDrawAllLayers(frame); |
@@ -372,7 +372,7 @@ bool CCSingleThreadProxy::doComposite() |
return true; |
} |
-void CCSingleThreadProxy::didSwapFrame() |
+void SingleThreadProxy::didSwapFrame() |
{ |
if (m_nextFrameIsNewlyCommittedFrame) { |
m_nextFrameIsNewlyCommittedFrame = false; |