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

Unified Diff: Source/web/tests/ScrollingCoordinatorChromiumTest.cpp

Issue 59063003: Don't coerce pointers to compositor layer mappings to booleans. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Respond to reviewer feedback. Created 7 years, 1 month 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
« Source/web/LinkHighlight.cpp ('K') | « Source/web/LinkHighlight.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/web/tests/ScrollingCoordinatorChromiumTest.cpp
diff --git a/Source/web/tests/ScrollingCoordinatorChromiumTest.cpp b/Source/web/tests/ScrollingCoordinatorChromiumTest.cpp
index ae2061832638bcd0730d47ef975682a232cc12aa..3882ccc21ce731f2ff035268d5c093d563eb3c1a 100644
--- a/Source/web/tests/ScrollingCoordinatorChromiumTest.cpp
+++ b/Source/web/tests/ScrollingCoordinatorChromiumTest.cpp
@@ -160,9 +160,9 @@ static WebLayer* webLayerFromElement(Element* element)
RenderLayer* layer = toRenderBoxModelObject(renderer)->layer();
if (!layer)
return 0;
- CompositedLayerMapping* compositedLayerMapping = layer->compositedLayerMapping();
- if (!compositedLayerMapping)
+ if (!layer->hasCompositedLayerMapping())
return 0;
+ CompositedLayerMappingPtr compositedLayerMapping = layer->compositedLayerMapping();
GraphicsLayer* graphicsLayer = compositedLayerMapping->mainGraphicsLayer();
if (!graphicsLayer)
return 0;
@@ -306,7 +306,7 @@ TEST_F(ScrollingCoordinatorChromiumTest, overflowScrolling)
ASSERT_TRUE(box->usesCompositedScrolling());
ASSERT_EQ(PaintsIntoOwnBacking, box->layer()->compositingState());
- CompositedLayerMapping* compositedLayerMapping = box->layer()->compositedLayerMapping();
+ CompositedLayerMappingPtr compositedLayerMapping = box->layer()->compositedLayerMapping();
ASSERT_TRUE(compositedLayerMapping->hasScrollingLayer());
ASSERT(compositedLayerMapping->scrollingContentsLayer());
@@ -346,7 +346,7 @@ TEST_F(ScrollingCoordinatorChromiumTest, overflowHidden)
ASSERT_TRUE(box->usesCompositedScrolling());
ASSERT_EQ(PaintsIntoOwnBacking, box->layer()->compositingState());
- CompositedLayerMapping* compositedLayerMapping = box->layer()->compositedLayerMapping();
+ CompositedLayerMappingPtr compositedLayerMapping = box->layer()->compositedLayerMapping();
ASSERT_TRUE(compositedLayerMapping->hasScrollingLayer());
ASSERT(compositedLayerMapping->scrollingContentsLayer());
« Source/web/LinkHighlight.cpp ('K') | « Source/web/LinkHighlight.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698