Index: cc/CCLayerTreeHostImplTest.cpp |
diff --git a/cc/CCLayerTreeHostImplTest.cpp b/cc/CCLayerTreeHostImplTest.cpp |
index a17209ca219b682db3917efef43d132f2d1abeb1..a2dbadf79e314d40ec1a47224b310c28d552b064 100644 |
--- a/cc/CCLayerTreeHostImplTest.cpp |
+++ b/cc/CCLayerTreeHostImplTest.cpp |
@@ -477,7 +477,7 @@ TEST_P(CCLayerTreeHostImplTest, implPinchZoom) |
initializeRendererAndDrawFrame(); |
CCLayerImpl* scrollLayer = m_hostImpl->rootScrollLayer(); |
- ASSERT(scrollLayer); |
+ DCHECK(scrollLayer); |
const float minPageScale = 1, maxPageScale = 4; |
const WebTransformationMatrix identityScaleTransform; |
@@ -530,7 +530,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; |
@@ -617,7 +617,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; |
@@ -669,7 +669,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; |
@@ -738,7 +738,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; |
@@ -2598,7 +2598,7 @@ public: |
void createResources(CCResourceProvider* provider) |
{ |
- ASSERT(provider); |
+ DCHECK(provider); |
int pool = 0; |
IntSize size(10, 10); |
GC3Denum format = GraphicsContext3D::RGBA; |