Index: third_party/WebKit/Source/core/layout/compositing/CompositedLayerMappingTest.cpp |
diff --git a/third_party/WebKit/Source/core/layout/compositing/CompositedLayerMappingTest.cpp b/third_party/WebKit/Source/core/layout/compositing/CompositedLayerMappingTest.cpp |
index 22b69f679c0e5f21ec526f9ac6e97a7168158c83..5971fd67237a19c97e75ba5e5c9ae0c05545c8c4 100644 |
--- a/third_party/WebKit/Source/core/layout/compositing/CompositedLayerMappingTest.cpp |
+++ b/third_party/WebKit/Source/core/layout/compositing/CompositedLayerMappingTest.cpp |
@@ -837,6 +837,45 @@ TEST_P(CompositedLayerMappingTest, |
} |
TEST_P(CompositedLayerMappingTest, |
+ DecorationLayerCreatedAndDestroyedInCompositedScrolling) { |
flackr
2016/11/16 21:14:20
You should probably also test that we don't create
yigu
2016/11/17 15:53:15
Test added.
|
+ setBodyInnerHTML( |
+ "<style>" |
+ "#scroller { overflow: scroll; height: 200px; width: 200px; background: " |
+ "white local content-box; outline: 1px solid blue;}" |
+ "#scrolled { height: 300px; }" |
+ "</style>" |
+ "<div id=\"parent\">" |
+ " <div id=\"scroller\"><div id=\"scrolled\"></div></div>" |
+ "</div>"); |
+ document().view()->updateAllLifecyclePhases(); |
+ |
+ Element* scroller = document().getElementById("scroller"); |
+ PaintLayer* paintLayer = |
+ toLayoutBoxModelObject(scroller->layoutObject())->layer(); |
+ ASSERT_TRUE(paintLayer); |
+ |
+ CompositedLayerMapping* mapping = paintLayer->compositedLayerMapping(); |
+ EXPECT_FALSE(mapping->decorationLayer()); |
+ |
+ // The decoration layer is created when compositing. |
+ scroller->setAttribute(HTMLNames::styleAttr, "outline-offset: -2px;"); |
+ document().view()->updateAllLifecyclePhases(); |
+ paintLayer = toLayoutBoxModelObject(scroller->layoutObject())->layer(); |
+ ASSERT_TRUE(paintLayer); |
+ |
+ mapping = paintLayer->compositedLayerMapping(); |
+ EXPECT_TRUE(mapping->decorationLayer()); |
+ |
+ // The decoration layer is destroyed when not compositing. |
+ scroller->removeAttribute(HTMLNames::styleAttr); |
+ document().view()->updateAllLifecyclePhases(); |
+ paintLayer = toLayoutBoxModelObject(scroller->layoutObject())->layer(); |
+ ASSERT_TRUE(paintLayer); |
+ |
+ mapping = paintLayer->compositedLayerMapping(); |
+ EXPECT_FALSE(mapping->decorationLayer()); |
+} |
flackr
2016/11/16 21:14:20
nit: Blank line between tests.
yigu
2016/11/17 15:53:15
Done.
|
+TEST_P(CompositedLayerMappingTest, |
BackgroundPaintedIntoGraphicsLayerIfNotCompositedScrolling) { |
document().frame()->settings()->setPreferCompositingToLCDTextEnabled(true); |
setBodyInnerHTML( |