diff options
author | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-17 01:25:18 +0000 |
---|---|---|
committer | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-17 01:25:18 +0000 |
commit | e7f87cfba8e6f916dd88359ed9abf6ec6884d65d (patch) | |
tree | 289b3ec335cf58e6924f5a6fccd8e17ea1c6585a /cc/thread_proxy.cc | |
parent | bc3847a1ba39db7adec20aa9e0565f6e868e8480 (diff) | |
download | chromium_src-e7f87cfba8e6f916dd88359ed9abf6ec6884d65d.zip chromium_src-e7f87cfba8e6f916dd88359ed9abf6ec6884d65d.tar.gz chromium_src-e7f87cfba8e6f916dd88359ed9abf6ec6884d65d.tar.bz2 |
Revert "cc: Switch to Chromium DCHECKs LOGs"
This reverts commit 162296. (https://chromiumcodereview.appspot.com/11048044)
TBR=danakj@chromium.org
Review URL: https://codereview.chromium.org/11196014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162297 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/thread_proxy.cc')
-rw-r--r-- | cc/thread_proxy.cc | 140 |
1 files changed, 70 insertions, 70 deletions
diff --git a/cc/thread_proxy.cc b/cc/thread_proxy.cc index 6e76d46..2e1e74d 100644 --- a/cc/thread_proxy.cc +++ b/cc/thread_proxy.cc @@ -56,21 +56,21 @@ CCThreadProxy::CCThreadProxy(CCLayerTreeHost* layerTreeHost) , m_totalCommitCount(0) { TRACE_EVENT0("cc", "CCThreadProxy::CCThreadProxy"); - DCHECK(isMainThread()); + ASSERT(isMainThread()); } CCThreadProxy::~CCThreadProxy() { TRACE_EVENT0("cc", "CCThreadProxy::~CCThreadProxy"); - DCHECK(isMainThread()); - DCHECK(!m_started); + ASSERT(isMainThread()); + ASSERT(!m_started); } bool CCThreadProxy::compositeAndReadback(void *pixels, const IntRect& rect) { TRACE_EVENT0("cc", "CCThreadPRoxy::compositeAndReadback"); - DCHECK(isMainThread()); - DCHECK(m_layerTreeHost); + ASSERT(isMainThread()); + ASSERT(m_layerTreeHost); if (!m_layerTreeHost->initializeRendererIfNeeded()) { TRACE_EVENT0("cc", "compositeAndReadback_EarlyOut_LR_Uninitialized"); @@ -103,8 +103,8 @@ bool CCThreadProxy::compositeAndReadback(void *pixels, const IntRect& rect) void CCThreadProxy::requestReadbackOnImplThread(ReadbackRequest* request) { - DCHECK(CCProxy::isImplThread()); - DCHECK(!m_readbackRequestOnImplThread); + ASSERT(CCProxy::isImplThread()); + ASSERT(!m_readbackRequestOnImplThread); if (!m_layerTreeHostImpl.get()) { request->success = false; request->completion.signal(); @@ -118,20 +118,20 @@ void CCThreadProxy::requestReadbackOnImplThread(ReadbackRequest* request) void CCThreadProxy::startPageScaleAnimation(const IntSize& targetPosition, bool useAnchor, float scale, double duration) { - DCHECK(CCProxy::isMainThread()); + ASSERT(CCProxy::isMainThread()); CCProxy::implThread()->postTask(createCCThreadTask(this, &CCThreadProxy::requestStartPageScaleAnimationOnImplThread, targetPosition, useAnchor, scale, duration)); } void CCThreadProxy::requestStartPageScaleAnimationOnImplThread(IntSize targetPosition, bool useAnchor, float scale, double duration) { - DCHECK(CCProxy::isImplThread()); + ASSERT(CCProxy::isImplThread()); if (m_layerTreeHostImpl.get()) m_layerTreeHostImpl->startPageScaleAnimation(targetPosition, useAnchor, scale, monotonicallyIncreasingTime(), duration); } void CCThreadProxy::finishAllRendering() { - DCHECK(CCProxy::isMainThread()); + ASSERT(CCProxy::isMainThread()); // Make sure all GL drawing is finished on the impl thread. DebugScopedSetMainThreadBlocked mainThreadBlocked; @@ -142,7 +142,7 @@ void CCThreadProxy::finishAllRendering() bool CCThreadProxy::isStarted() const { - DCHECK(CCProxy::isMainThread()); + ASSERT(CCProxy::isMainThread()); return m_started; } @@ -212,7 +212,7 @@ bool CCThreadProxy::initializeRenderer() bool CCThreadProxy::recreateContext() { TRACE_EVENT0("cc", "CCThreadProxy::recreateContext"); - DCHECK(isMainThread()); + ASSERT(isMainThread()); // Try to create the context. scoped_ptr<CCGraphicsContext> context = m_layerTreeHost->createContext(); @@ -243,7 +243,7 @@ bool CCThreadProxy::recreateContext() void CCThreadProxy::renderingStats(CCRenderingStats* stats) { - DCHECK(isMainThread()); + ASSERT(isMainThread()); DebugScopedSetMainThreadBlocked mainThreadBlocked; CCCompletionEvent completion; @@ -258,7 +258,7 @@ void CCThreadProxy::renderingStats(CCRenderingStats* stats) const RendererCapabilities& CCThreadProxy::rendererCapabilities() const { - DCHECK(m_rendererInitialized); + ASSERT(m_rendererInitialized); return m_RendererCapabilitiesMainThreadCopy; } @@ -269,7 +269,7 @@ void CCThreadProxy::loseContext() void CCThreadProxy::setNeedsAnimate() { - DCHECK(isMainThread()); + ASSERT(isMainThread()); if (m_animateRequested) return; @@ -284,7 +284,7 @@ void CCThreadProxy::setNeedsAnimate() void CCThreadProxy::setNeedsCommit() { - DCHECK(isMainThread()); + ASSERT(isMainThread()); if (m_commitRequested) return; TRACE_EVENT0("cc", "CCThreadProxy::setNeedsCommit"); @@ -298,14 +298,14 @@ void CCThreadProxy::setNeedsCommit() void CCThreadProxy::didLoseContextOnImplThread() { - DCHECK(isImplThread()); + ASSERT(isImplThread()); TRACE_EVENT0("cc", "CCThreadProxy::didLoseContextOnImplThread"); m_schedulerOnImplThread->didLoseContext(); } void CCThreadProxy::onSwapBuffersCompleteOnImplThread() { - DCHECK(isImplThread()); + ASSERT(isImplThread()); TRACE_EVENT0("cc", "CCThreadProxy::onSwapBuffersCompleteOnImplThread"); m_schedulerOnImplThread->didSwapBuffersComplete(); m_mainThreadProxy->postTask(createCCThreadTask(this, &CCThreadProxy::didCompleteSwapBuffers)); @@ -313,7 +313,7 @@ void CCThreadProxy::onSwapBuffersCompleteOnImplThread() void CCThreadProxy::onVSyncParametersChanged(double monotonicTimebase, double intervalInSeconds) { - DCHECK(isImplThread()); + ASSERT(isImplThread()); TRACE_EVENT2("cc", "CCThreadProxy::onVSyncParametersChanged", "monotonicTimebase", monotonicTimebase, "intervalInSeconds", intervalInSeconds); base::TimeTicks timebase = base::TimeTicks::FromInternalValue(monotonicTimebase * base::Time::kMicrosecondsPerSecond); base::TimeDelta interval = base::TimeDelta::FromMicroseconds(intervalInSeconds * base::Time::kMicrosecondsPerSecond); @@ -322,21 +322,21 @@ void CCThreadProxy::onVSyncParametersChanged(double monotonicTimebase, double in void CCThreadProxy::onCanDrawStateChanged(bool canDraw) { - DCHECK(isImplThread()); + ASSERT(isImplThread()); TRACE_EVENT1("cc", "CCThreadProxy::onCanDrawStateChanged", "canDraw", canDraw); m_schedulerOnImplThread->setCanDraw(canDraw); } void CCThreadProxy::setNeedsCommitOnImplThread() { - DCHECK(isImplThread()); + ASSERT(isImplThread()); TRACE_EVENT0("cc", "CCThreadProxy::setNeedsCommitOnImplThread"); m_schedulerOnImplThread->setNeedsCommit(); } void CCThreadProxy::setNeedsForcedCommitOnImplThread() { - DCHECK(isImplThread()); + ASSERT(isImplThread()); TRACE_EVENT0("cc", "CCThreadProxy::setNeedsForcedCommitOnImplThread"); m_schedulerOnImplThread->setNeedsCommit(); m_schedulerOnImplThread->setNeedsForcedCommit(); @@ -344,14 +344,14 @@ void CCThreadProxy::setNeedsForcedCommitOnImplThread() void CCThreadProxy::postAnimationEventsToMainThreadOnImplThread(scoped_ptr<CCAnimationEventsVector> events, double wallClockTime) { - DCHECK(isImplThread()); + ASSERT(isImplThread()); TRACE_EVENT0("cc", "CCThreadProxy::postAnimationEventsToMainThreadOnImplThread"); m_mainThreadProxy->postTask(createCCThreadTask(this, &CCThreadProxy::setAnimationEvents, events.release(), wallClockTime)); } void CCThreadProxy::releaseContentsTexturesOnImplThread() { - DCHECK(isImplThread()); + ASSERT(isImplThread()); if (m_layerTreeHost->contentsTextureManager()) m_layerTreeHost->contentsTextureManager()->reduceMemoryOnImplThread(0, m_layerTreeHostImpl->resourceProvider()); @@ -364,7 +364,7 @@ void CCThreadProxy::releaseContentsTexturesOnImplThread() void CCThreadProxy::setNeedsRedraw() { - DCHECK(isMainThread()); + ASSERT(isMainThread()); TRACE_EVENT0("cc", "CCThreadProxy::setNeedsRedraw"); CCProxy::implThread()->postTask(createCCThreadTask(this, &CCThreadProxy::setFullRootLayerDamageOnImplThread)); CCProxy::implThread()->postTask(createCCThreadTask(this, &CCThreadProxy::setNeedsRedrawOnImplThread)); @@ -372,21 +372,21 @@ void CCThreadProxy::setNeedsRedraw() bool CCThreadProxy::commitRequested() const { - DCHECK(isMainThread()); + ASSERT(isMainThread()); return m_commitRequested; } void CCThreadProxy::setNeedsRedrawOnImplThread() { - DCHECK(isImplThread()); + ASSERT(isImplThread()); TRACE_EVENT0("cc", "CCThreadProxy::setNeedsRedrawOnImplThread"); m_schedulerOnImplThread->setNeedsRedraw(); } void CCThreadProxy::start() { - DCHECK(isMainThread()); - DCHECK(CCProxy::implThread()); + ASSERT(isMainThread()); + ASSERT(CCProxy::implThread()); // Create LayerTreeHostImpl. DebugScopedSetMainThreadBlocked mainThreadBlocked; CCCompletionEvent completion; @@ -400,8 +400,8 @@ void CCThreadProxy::start() void CCThreadProxy::stop() { TRACE_EVENT0("cc", "CCThreadProxy::stop"); - DCHECK(isMainThread()); - DCHECK(m_started); + ASSERT(isMainThread()); + ASSERT(m_started); // Synchronously deletes the impl. { @@ -414,7 +414,7 @@ void CCThreadProxy::stop() m_mainThreadProxy->shutdown(); // Stop running tasks posted to us. - DCHECK(!m_layerTreeHostImpl.get()); // verify that the impl deleted. + ASSERT(!m_layerTreeHostImpl.get()); // verify that the impl deleted. m_layerTreeHost = 0; m_started = false; } @@ -438,7 +438,7 @@ void CCThreadProxy::forceSerializeOnSwapBuffersOnImplThread(CCCompletionEvent* c void CCThreadProxy::finishAllRenderingOnImplThread(CCCompletionEvent* completion) { TRACE_EVENT0("cc", "CCThreadProxy::finishAllRenderingOnImplThread"); - DCHECK(isImplThread()); + ASSERT(isImplThread()); m_layerTreeHostImpl->finishAllRendering(); completion->signal(); } @@ -446,7 +446,7 @@ void CCThreadProxy::finishAllRenderingOnImplThread(CCCompletionEvent* completion void CCThreadProxy::forceBeginFrameOnImplThread(CCCompletionEvent* completion) { TRACE_EVENT0("cc", "CCThreadProxy::forceBeginFrameOnImplThread"); - DCHECK(!m_beginFrameCompletionEventOnImplThread); + ASSERT(!m_beginFrameCompletionEventOnImplThread); if (m_schedulerOnImplThread->commitPending()) { completion->signal(); @@ -460,7 +460,7 @@ void CCThreadProxy::forceBeginFrameOnImplThread(CCCompletionEvent* completion) void CCThreadProxy::scheduledActionBeginFrame() { TRACE_EVENT0("cc", "CCThreadProxy::scheduledActionBeginFrame"); - DCHECK(!m_pendingBeginFrameRequest); + ASSERT(!m_pendingBeginFrameRequest); m_pendingBeginFrameRequest = make_scoped_ptr(new BeginFrameAndCommitState()); m_pendingBeginFrameRequest->monotonicFrameBeginTime = monotonicallyIncreasingTime(); m_pendingBeginFrameRequest->scrollInfo = m_layerTreeHostImpl->processScrollDeltas(); @@ -480,7 +480,7 @@ void CCThreadProxy::scheduledActionBeginFrame() void CCThreadProxy::beginFrame() { TRACE_EVENT0("cc", "CCThreadProxy::beginFrame"); - DCHECK(isMainThread()); + ASSERT(isMainThread()); if (!m_layerTreeHost) return; @@ -588,10 +588,10 @@ void CCThreadProxy::beginFrameCompleteOnImplThread(CCCompletionEvent* completion scoped_ptr<CCTextureUpdateQueue> queue(rawQueue); TRACE_EVENT0("cc", "CCThreadProxy::beginFrameCompleteOnImplThread"); - DCHECK(!m_commitCompletionEventOnImplThread); - DCHECK(isImplThread() && isMainThreadBlocked()); - DCHECK(m_schedulerOnImplThread); - DCHECK(m_schedulerOnImplThread->commitPending()); + ASSERT(!m_commitCompletionEventOnImplThread); + ASSERT(isImplThread() && isMainThreadBlocked()); + ASSERT(m_schedulerOnImplThread); + ASSERT(m_schedulerOnImplThread->commitPending()); if (!m_layerTreeHostImpl.get()) { TRACE_EVENT0("cc", "EarlyOut_NoLayerTree"); @@ -620,9 +620,9 @@ void CCThreadProxy::beginFrameCompleteOnImplThread(CCCompletionEvent* completion void CCThreadProxy::beginFrameAbortedOnImplThread() { TRACE_EVENT0("cc", "CCThreadProxy::beginFrameAbortedOnImplThread"); - DCHECK(isImplThread()); - DCHECK(m_schedulerOnImplThread); - DCHECK(m_schedulerOnImplThread->commitPending()); + ASSERT(isImplThread()); + ASSERT(m_schedulerOnImplThread); + ASSERT(m_schedulerOnImplThread->commitPending()); m_schedulerOnImplThread->beginFrameAborted(); } @@ -630,9 +630,9 @@ void CCThreadProxy::beginFrameAbortedOnImplThread() void CCThreadProxy::scheduledActionCommit() { TRACE_EVENT0("cc", "CCThreadProxy::scheduledActionCommit"); - DCHECK(isImplThread()); - DCHECK(m_commitCompletionEventOnImplThread); - DCHECK(m_currentTextureUpdateControllerOnImplThread); + ASSERT(isImplThread()); + ASSERT(m_commitCompletionEventOnImplThread); + ASSERT(m_currentTextureUpdateControllerOnImplThread); // Complete all remaining texture updates. m_currentTextureUpdateControllerOnImplThread->finalize(); @@ -664,7 +664,7 @@ void CCThreadProxy::scheduledActionCommit() void CCThreadProxy::scheduledActionBeginContextRecreation() { - DCHECK(isImplThread()); + ASSERT(isImplThread()); m_mainThreadProxy->postTask(createCCThreadTask(this, &CCThreadProxy::beginContextRecreation)); } @@ -674,12 +674,12 @@ CCScheduledActionDrawAndSwapResult CCThreadProxy::scheduledActionDrawAndSwapInte CCScheduledActionDrawAndSwapResult result; result.didDraw = false; result.didSwap = false; - DCHECK(isImplThread()); - DCHECK(m_layerTreeHostImpl.get()); + ASSERT(isImplThread()); + ASSERT(m_layerTreeHostImpl.get()); if (!m_layerTreeHostImpl.get()) return result; - DCHECK(m_layerTreeHostImpl->renderer()); + ASSERT(m_layerTreeHostImpl->renderer()); if (!m_layerTreeHostImpl->renderer()) return result; @@ -736,7 +736,7 @@ void CCThreadProxy::acquireLayerTextures() // This method will block until the next compositor draw if there is a // previously committed frame that is still undrawn. This is necessary to // ensure that the main thread does not monopolize access to the textures. - DCHECK(isMainThread()); + ASSERT(isMainThread()); if (m_texturesAcquired) return; @@ -752,8 +752,8 @@ void CCThreadProxy::acquireLayerTextures() void CCThreadProxy::acquireLayerTexturesForMainThreadOnImplThread(CCCompletionEvent* completion) { - DCHECK(isImplThread()); - DCHECK(!m_textureAcquisitionCompletionEventOnImplThread); + ASSERT(isImplThread()); + ASSERT(!m_textureAcquisitionCompletionEventOnImplThread); m_textureAcquisitionCompletionEventOnImplThread = completion; m_schedulerOnImplThread->setMainThreadNeedsLayerTextures(); @@ -761,7 +761,7 @@ void CCThreadProxy::acquireLayerTexturesForMainThreadOnImplThread(CCCompletionEv void CCThreadProxy::scheduledActionAcquireLayerTexturesForMainThread() { - DCHECK(m_textureAcquisitionCompletionEventOnImplThread); + ASSERT(m_textureAcquisitionCompletionEventOnImplThread); m_textureAcquisitionCompletionEventOnImplThread->signal(); m_textureAcquisitionCompletionEventOnImplThread = 0; } @@ -786,13 +786,13 @@ void CCThreadProxy::didAnticipatedDrawTimeChange(base::TimeTicks time) void CCThreadProxy::readyToFinalizeTextureUpdates() { - DCHECK(isImplThread()); + ASSERT(isImplThread()); m_schedulerOnImplThread->beginFrameComplete(); } void CCThreadProxy::didCommitAndDrawFrame() { - DCHECK(isMainThread()); + ASSERT(isMainThread()); if (!m_layerTreeHost) return; m_layerTreeHost->didCommitAndDrawFrame(); @@ -800,7 +800,7 @@ void CCThreadProxy::didCommitAndDrawFrame() void CCThreadProxy::didCompleteSwapBuffers() { - DCHECK(isMainThread()); + ASSERT(isMainThread()); if (!m_layerTreeHost) return; m_layerTreeHost->didCompleteSwapBuffers(); @@ -811,7 +811,7 @@ void CCThreadProxy::setAnimationEvents(CCAnimationEventsVector* passed_events, d scoped_ptr<CCAnimationEventsVector> events(make_scoped_ptr(passed_events)); TRACE_EVENT0("cc", "CCThreadProxy::setAnimationEvents"); - DCHECK(isMainThread()); + ASSERT(isMainThread()); if (!m_layerTreeHost) return; m_layerTreeHost->setAnimationEvents(events.Pass(), wallClockTime); @@ -839,8 +839,8 @@ private: void CCThreadProxy::beginContextRecreation() { TRACE_EVENT0("cc", "CCThreadProxy::beginContextRecreation"); - DCHECK(isMainThread()); - DCHECK(!m_contextRecreationTimer); + ASSERT(isMainThread()); + ASSERT(!m_contextRecreationTimer); m_contextRecreationTimer = CCThreadProxyContextRecreationTimer::create(this); m_layerTreeHost->didLoseContext(); m_contextRecreationTimer->startOneShot(contextRecreationTickRate); @@ -848,8 +848,8 @@ void CCThreadProxy::beginContextRecreation() void CCThreadProxy::tryToRecreateContext() { - DCHECK(isMainThread()); - DCHECK(m_layerTreeHost); + ASSERT(isMainThread()); + ASSERT(m_layerTreeHost); CCLayerTreeHost::RecreateResult result = m_layerTreeHost->recreateContext(); if (result == CCLayerTreeHost::RecreateFailedButTryAgain) m_contextRecreationTimer->startOneShot(contextRecreationTickRate); @@ -860,7 +860,7 @@ void CCThreadProxy::tryToRecreateContext() void CCThreadProxy::initializeImplOnImplThread(CCCompletionEvent* completion, CCInputHandler* handler) { TRACE_EVENT0("cc", "CCThreadProxy::initializeImplOnImplThread"); - DCHECK(isImplThread()); + ASSERT(isImplThread()); m_layerTreeHostImpl = m_layerTreeHost->createLayerTreeHostImpl(this); const base::TimeDelta displayRefreshInterval = base::TimeDelta::FromMicroseconds(base::Time::kMicrosecondsPerSecond / 60); scoped_ptr<CCFrameRateController> frameRateController; @@ -881,15 +881,15 @@ void CCThreadProxy::initializeImplOnImplThread(CCCompletionEvent* completion, CC void CCThreadProxy::initializeContextOnImplThread(CCGraphicsContext* context) { TRACE_EVENT0("cc", "CCThreadProxy::initializeContextOnImplThread"); - DCHECK(isImplThread()); + ASSERT(isImplThread()); m_contextBeforeInitializationOnImplThread = scoped_ptr<CCGraphicsContext>(context).Pass(); } void CCThreadProxy::initializeRendererOnImplThread(CCCompletionEvent* completion, bool* initializeSucceeded, RendererCapabilities* capabilities) { TRACE_EVENT0("cc", "CCThreadProxy::initializeRendererOnImplThread"); - DCHECK(isImplThread()); - DCHECK(m_contextBeforeInitializationOnImplThread.get()); + ASSERT(isImplThread()); + ASSERT(m_contextBeforeInitializationOnImplThread.get()); *initializeSucceeded = m_layerTreeHostImpl->initializeRenderer(m_contextBeforeInitializationOnImplThread.Pass()); if (*initializeSucceeded) { *capabilities = m_layerTreeHostImpl->rendererCapabilities(); @@ -903,7 +903,7 @@ void CCThreadProxy::initializeRendererOnImplThread(CCCompletionEvent* completion void CCThreadProxy::layerTreeHostClosedOnImplThread(CCCompletionEvent* completion) { TRACE_EVENT0("cc", "CCThreadProxy::layerTreeHostClosedOnImplThread"); - DCHECK(isImplThread()); + ASSERT(isImplThread()); m_layerTreeHost->deleteContentsTexturesOnImplThread(m_layerTreeHostImpl->resourceProvider()); m_inputHandlerOnImplThread.reset(); m_layerTreeHostImpl.reset(); @@ -913,7 +913,7 @@ void CCThreadProxy::layerTreeHostClosedOnImplThread(CCCompletionEvent* completio void CCThreadProxy::setFullRootLayerDamageOnImplThread() { - DCHECK(isImplThread()); + ASSERT(isImplThread()); m_layerTreeHostImpl->setFullRootLayerDamage(); } @@ -925,7 +925,7 @@ size_t CCThreadProxy::maxPartialTextureUpdates() const void CCThreadProxy::recreateContextOnImplThread(CCCompletionEvent* completion, CCGraphicsContext* contextPtr, bool* recreateSucceeded, RendererCapabilities* capabilities) { TRACE_EVENT0("cc", "CCThreadProxy::recreateContextOnImplThread"); - DCHECK(isImplThread()); + ASSERT(isImplThread()); m_layerTreeHost->deleteContentsTexturesOnImplThread(m_layerTreeHostImpl->resourceProvider()); *recreateSucceeded = m_layerTreeHostImpl->initializeRenderer(scoped_ptr<CCGraphicsContext>(contextPtr).Pass()); if (*recreateSucceeded) { @@ -937,7 +937,7 @@ void CCThreadProxy::recreateContextOnImplThread(CCCompletionEvent* completion, C void CCThreadProxy::renderingStatsOnImplThread(CCCompletionEvent* completion, CCRenderingStats* stats) { - DCHECK(isImplThread()); + ASSERT(isImplThread()); m_layerTreeHostImpl->renderingStats(stats); completion->signal(); } |