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

Unified Diff: cc/layer_impl.h

Issue 11196014: Revert "cc: Switch to Chromium DCHECKs LOGs" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 2 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/layer_animation_controller.cc ('k') | cc/layer_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layer_impl.h
diff --git a/cc/layer_impl.h b/cc/layer_impl.h
index b2b598862cdfdd4f4aff932ecf3d889ecb1dfaff..01ab13a63cb6536b72fa16948ba1a852f49acc86 100644
--- a/cc/layer_impl.h
+++ b/cc/layer_impl.h
@@ -6,7 +6,6 @@
#define CCLayerImpl_h
#include "base/memory/scoped_ptr.h"
-#include "cc/dcheck.h"
#include "cc/scoped_ptr_vector.h"
#include "CCInputHandler.h"
#include "CCLayerAnimationController.h"
@@ -161,7 +160,7 @@ public:
bool drawOpacityIsAnimating() const { return m_drawOpacityIsAnimating; }
void setDrawOpacityIsAnimating(bool drawOpacityIsAnimating) { m_drawOpacityIsAnimating = drawOpacityIsAnimating; }
- CCLayerImpl* renderTarget() const { DCHECK(!m_renderTarget || m_renderTarget->renderSurface()); return m_renderTarget; }
+ CCLayerImpl* renderTarget() const { ASSERT(!m_renderTarget || m_renderTarget->renderSurface()); return m_renderTarget; }
void setRenderTarget(CCLayerImpl* target) { m_renderTarget = target; }
void setBounds(const IntSize&);
@@ -368,7 +367,7 @@ private:
bool m_drawTransformIsAnimating;
bool m_screenSpaceTransformIsAnimating;
-#if CC_DCHECK_ENABLED()
+#ifndef NDEBUG
bool m_betweenWillDrawAndDidDraw;
#endif
« no previous file with comments | « cc/layer_animation_controller.cc ('k') | cc/layer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698