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

Unified Diff: cc/layer_tree_host_impl_unittest.cc

Issue 11048044: cc: Switch to Chromium DCHECKs and LOGs (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: remove-rebased-asserts 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/layer_tree_host_impl_unittest.cc
diff --git a/cc/layer_tree_host_impl_unittest.cc b/cc/layer_tree_host_impl_unittest.cc
index 9220e64faafee672d1c20e1cc9498698c8b92930..f1f2747886cedd30c70b07626f885ff5a5de0d12 100644
--- a/cc/layer_tree_host_impl_unittest.cc
+++ b/cc/layer_tree_host_impl_unittest.cc
@@ -475,7 +475,7 @@ TEST_P(CCLayerTreeHostImplTest, implPinchZoom)
initializeRendererAndDrawFrame();
CCLayerImpl* scrollLayer = m_hostImpl->rootScrollLayer();
- ASSERT(scrollLayer);
+ DCHECK(scrollLayer);
const float minPageScale = 1, maxPageScale = 4;
const WebTransformationMatrix identityScaleTransform;
@@ -528,7 +528,7 @@ TEST_P(CCLayerTreeHostImplTest, pinchGesture)
initializeRendererAndDrawFrame();
CCLayerImpl* scrollLayer = m_hostImpl->rootScrollLayer();
- ASSERT(scrollLayer);
+ DCHECK(scrollLayer);
const float minPageScale = CCSettings::pageScalePinchZoomEnabled() ? 1 : 0.5;
const float maxPageScale = 4;
@@ -615,7 +615,7 @@ TEST_P(CCLayerTreeHostImplTest, pageScaleAnimation)
initializeRendererAndDrawFrame();
CCLayerImpl* scrollLayer = m_hostImpl->rootScrollLayer();
- ASSERT(scrollLayer);
+ DCHECK(scrollLayer);
const float minPageScale = CCSettings::pageScalePinchZoomEnabled() ? 1 : 0.5;
const float maxPageScale = 4;
@@ -667,7 +667,7 @@ TEST_P(CCLayerTreeHostImplTest, inhibitScrollAndPageScaleUpdatesWhilePinchZoomin
initializeRendererAndDrawFrame();
CCLayerImpl* scrollLayer = m_hostImpl->rootScrollLayer();
- ASSERT(scrollLayer);
+ DCHECK(scrollLayer);
const float minPageScale = CCSettings::pageScalePinchZoomEnabled() ? 1 : 0.5;
const float maxPageScale = 4;
@@ -736,7 +736,7 @@ TEST_P(CCLayerTreeHostImplTest, inhibitScrollAndPageScaleUpdatesWhileAnimatingPa
initializeRendererAndDrawFrame();
CCLayerImpl* scrollLayer = m_hostImpl->rootScrollLayer();
- ASSERT(scrollLayer);
+ DCHECK(scrollLayer);
const float minPageScale = CCSettings::pageScalePinchZoomEnabled() ? 1 : 0.5;
const float maxPageScale = 4;
@@ -2601,7 +2601,7 @@ public:
void createResources(CCResourceProvider* provider)
{
- ASSERT(provider);
+ DCHECK(provider);
int pool = 0;
IntSize size(10, 10);
GC3Denum format = GraphicsContext3D::RGBA;

Powered by Google App Engine
This is Rietveld 408576698