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

Unified Diff: cc/CCLayerImpl.h

Issue 11048044: cc: Switch to Chromium DCHECKs and LOGs (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
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
Index: cc/CCLayerImpl.h
diff --git a/cc/CCLayerImpl.h b/cc/CCLayerImpl.h
index 665b000d4bb8783e7a2a50eedb82d8fb3ff27c4d..9a167532d67300f88be0faafc13b10dbb0482d39 100644
--- a/cc/CCLayerImpl.h
+++ b/cc/CCLayerImpl.h
@@ -5,6 +5,8 @@
#ifndef CCLayerImpl_h
#define CCLayerImpl_h
+#include "base/logging.h"
+#include "cc/own_ptr_vector.h"
#include "CCInputHandler.h"
#include "CCLayerAnimationController.h"
#include "CCRenderPass.h"
@@ -15,7 +17,6 @@
#include "IntRect.h"
#include "Region.h"
#include "SkColor.h"
-#include "cc/own_ptr_vector.h"
#include <public/WebFilterOperations.h>
#include <public/WebTransformationMatrix.h>
#include <string>
@@ -162,7 +163,7 @@ public:
bool drawOpacityIsAnimating() const { return m_drawOpacityIsAnimating; }
void setDrawOpacityIsAnimating(bool drawOpacityIsAnimating) { m_drawOpacityIsAnimating = drawOpacityIsAnimating; }
- CCLayerImpl* renderTarget() const { ASSERT(!m_renderTarget || m_renderTarget->renderSurface()); return m_renderTarget; }
+ CCLayerImpl* renderTarget() const { DCHECK(!m_renderTarget || m_renderTarget->renderSurface()); return m_renderTarget; }
void setRenderTarget(CCLayerImpl* target) { m_renderTarget = target; }
void setBounds(const IntSize&);
@@ -369,9 +370,7 @@ private:
bool m_drawTransformIsAnimating;
bool m_screenSpaceTransformIsAnimating;
-#ifndef NDEBUG
bool m_betweenWillDrawAndDidDraw;
-#endif
// Render surface associated with this layer. The layer and its descendants
// will render to this surface.

Powered by Google App Engine
This is Rietveld 408576698