Skip to content

GitLab

T
tangled
Commit d0f785e2 authored by szager's avatar szager Committed by Commit bot
Browse files
Options

RootLayerScrolling: Fix PaintControllerPaintTestForSlimmingPaintV2 

Adjust expectations, and parameterize test for RLS.

BUG=490942
R=skobes@chromium.org,pdr@chromium.org
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:linux_layout_tests_slimming_paint_v2

Review-Url: https://codereview.chromium.org/2575663002
Cr-Commit-Position: refs/heads/master@{#438684}
parent ab21ef67
Hide whitespace changes
Inline Side-by-side
Showing with 77 additions and 36 deletions
third_party/WebKit/Source/core/paint/PaintControllerPaintTest.cpp
View file @ d0f785e2
......@@ -21,6 +21,10 @@ INSTANTIATE_TEST_CASE_P(All,
PaintControllerPaintTestForSlimmingPaintV1AndV2,
::testing::Bool());
INSTANTIATE_TEST_CASE_P(All,
PaintControllerPaintTestForSlimmingPaintV2,
::testing::Bool());
TEST_P(PaintControllerPaintTestForSlimmingPaintV1AndV2,
FullDocumentPaintingWithCaret) {
setBodyInnerHTML(
......@@ -171,7 +175,7 @@ TEST_P(PaintControllerPaintTestForSlimmingPaintV1AndV2, InlineRelayout) {
}
}
TEST_F(PaintControllerPaintTestForSlimmingPaintV2, ChunkIdClientCacheFlag) {
TEST_P(PaintControllerPaintTestForSlimmingPaintV2, ChunkIdClientCacheFlag) {
setBodyInnerHTML(
"<div id='div' style='width: 200px; height: 200px; opacity: 0.5'>"
" <div style='width: 100px; height: 100px; background-color: "
......@@ -185,29 +189,48 @@ TEST_F(PaintControllerPaintTestForSlimmingPaintV2, ChunkIdClientCacheFlag) {
LayoutBlock& div = *toLayoutBlock(getLayoutObjectByElementId("div"));
LayoutObject& subDiv = *div.firstChild();
LayoutObject& subDiv2 = *subDiv.nextSibling();
EXPECT_DISPLAY_LIST(
rootPaintController().getDisplayItemList(), 11,
TestDisplayItem(layoutView(),
DisplayItem::kClipFrameToVisibleContentRect),
TestDisplayItem(*layoutView().layer(), DisplayItem::kSubsequence),
TestDisplayItem(layoutView(), documentBackgroundType),
TestDisplayItem(htmlLayer, DisplayItem::kSubsequence),
TestDisplayItem(div, DisplayItem::kBeginCompositing),
TestDisplayItem(subDiv, backgroundType),
TestDisplayItem(subDiv2, backgroundType),
TestDisplayItem(div, DisplayItem::kEndCompositing),
TestDisplayItem(htmlLayer, DisplayItem::kEndSubsequence),
TestDisplayItem(*layoutView().layer(), DisplayItem::kEndSubsequence),
TestDisplayItem(layoutView(),
DisplayItem::clipTypeToEndClipType(
DisplayItem::kClipFrameToVisibleContentRect)));
if (RuntimeEnabledFeatures::rootLayerScrollingEnabled()) {
EXPECT_DISPLAY_LIST(
rootPaintController().getDisplayItemList(), 9,
TestDisplayItem(*layoutView().layer(), DisplayItem::kSubsequence),
TestDisplayItem(layoutView(), documentBackgroundType),
TestDisplayItem(htmlLayer, DisplayItem::kSubsequence),
TestDisplayItem(div, DisplayItem::kBeginCompositing),
TestDisplayItem(subDiv, backgroundType),
TestDisplayItem(subDiv2, backgroundType),
TestDisplayItem(div, DisplayItem::kEndCompositing),
TestDisplayItem(htmlLayer, DisplayItem::kEndSubsequence),
TestDisplayItem(*layoutView().layer(), DisplayItem::kEndSubsequence));
} else {
EXPECT_DISPLAY_LIST(
rootPaintController().getDisplayItemList(), 11,
TestDisplayItem(layoutView(),
DisplayItem::kClipFrameToVisibleContentRect),
TestDisplayItem(*layoutView().layer(), DisplayItem::kSubsequence),
TestDisplayItem(layoutView(), documentBackgroundType),
TestDisplayItem(htmlLayer, DisplayItem::kSubsequence),
TestDisplayItem(div, DisplayItem::kBeginCompositing),
TestDisplayItem(subDiv, backgroundType),
TestDisplayItem(subDiv2, backgroundType),
TestDisplayItem(div, DisplayItem::kEndCompositing),
TestDisplayItem(htmlLayer, DisplayItem::kEndSubsequence),
TestDisplayItem(*layoutView().layer(), DisplayItem::kEndSubsequence),
TestDisplayItem(layoutView(),
DisplayItem::clipTypeToEndClipType(
DisplayItem::kClipFrameToVisibleContentRect)));
}
const PaintChunk& backgroundChunk = rootPaintController().paintChunks()[0];
EXPECT_TRUE(backgroundChunk.properties.propertyTreeState.scroll()->isRoot());
const EffectPaintPropertyNode* effectNode = div.paintProperties()->effect();
EXPECT_EQ(0.5f, effectNode->opacity());
const PaintChunk& chunk = rootPaintController().paintChunks()[1];
// When RLS is enabled, an additional paint chunk will be created for the
// LayoutView's layer.
unsigned divChunkIndex =
RuntimeEnabledFeatures::rootLayerScrollingEnabled() ? 2 : 1;
const PaintChunk& chunk = rootPaintController().paintChunks()[divChunkIndex];
EXPECT_EQ(*div.layer(), chunk.id->client);
EXPECT_EQ(effectNode, chunk.properties.propertyTreeState.effect());
......@@ -219,7 +242,7 @@ TEST_F(PaintControllerPaintTestForSlimmingPaintV2, ChunkIdClientCacheFlag) {
EXPECT_TRUE(rootPaintController().clientCacheIsValid(subDiv));
}
TEST_F(PaintControllerPaintTestForSlimmingPaintV2, CompositingFold) {
TEST_P(PaintControllerPaintTestForSlimmingPaintV2, CompositingFold) {
setBodyInnerHTML(
"<div id='div' style='width: 200px; height: 200px; opacity: 0.5'>"
" <div style='width: 100px; height: 100px; background-color: "
......@@ -231,21 +254,36 @@ TEST_F(PaintControllerPaintTestForSlimmingPaintV2, CompositingFold) {
LayoutBlock& div = *toLayoutBlock(getLayoutObjectByElementId("div"));
LayoutObject& subDiv = *div.firstChild();
EXPECT_DISPLAY_LIST(
rootPaintController().getDisplayItemList(), 8,
TestDisplayItem(layoutView(),
DisplayItem::kClipFrameToVisibleContentRect),
TestDisplayItem(*layoutView().layer(), DisplayItem::kSubsequence),
TestDisplayItem(layoutView(), documentBackgroundType),
TestDisplayItem(htmlLayer, DisplayItem::kSubsequence),
// The begin and end compositing display items have been folded into this
// one.
TestDisplayItem(subDiv, backgroundType),
TestDisplayItem(htmlLayer, DisplayItem::kEndSubsequence),
TestDisplayItem(*layoutView().layer(), DisplayItem::kEndSubsequence),
TestDisplayItem(layoutView(),
DisplayItem::clipTypeToEndClipType(
DisplayItem::kClipFrameToVisibleContentRect)));
if (RuntimeEnabledFeatures::rootLayerScrollingEnabled()) {
EXPECT_DISPLAY_LIST(
rootPaintController().getDisplayItemList(), 6,
TestDisplayItem(*layoutView().layer(), DisplayItem::kSubsequence),
TestDisplayItem(layoutView(), documentBackgroundType),
TestDisplayItem(htmlLayer, DisplayItem::kSubsequence),
// The begin and end compositing display items have been folded into
// this
// one.
TestDisplayItem(subDiv, backgroundType),
TestDisplayItem(htmlLayer, DisplayItem::kEndSubsequence),
TestDisplayItem(*layoutView().layer(), DisplayItem::kEndSubsequence));
} else {
EXPECT_DISPLAY_LIST(
rootPaintController().getDisplayItemList(), 8,
TestDisplayItem(layoutView(),
DisplayItem::kClipFrameToVisibleContentRect),
TestDisplayItem(*layoutView().layer(), DisplayItem::kSubsequence),
TestDisplayItem(layoutView(), documentBackgroundType),
TestDisplayItem(htmlLayer, DisplayItem::kSubsequence),
// The begin and end compositing display items have been folded into
// this
// one.
TestDisplayItem(subDiv, backgroundType),
TestDisplayItem(htmlLayer, DisplayItem::kEndSubsequence),
TestDisplayItem(*layoutView().layer(), DisplayItem::kEndSubsequence),
TestDisplayItem(layoutView(),
DisplayItem::clipTypeToEndClipType(
DisplayItem::kClipFrameToVisibleContentRect)));
}
}
} // namespace blink
third_party/WebKit/Source/core/paint/PaintControllerPaintTest.h
View file @ d0f785e2
......@@ -88,10 +88,13 @@ class PaintControllerPaintTest : public PaintControllerPaintTestBase {
};
class PaintControllerPaintTestForSlimmingPaintV2
: public PaintControllerPaintTestBase {
: public PaintControllerPaintTestBase,
public testing::WithParamInterface<bool>,
private ScopedRootLayerScrollingForTest {
public:
PaintControllerPaintTestForSlimmingPaintV2()
: PaintControllerPaintTestBase(true) {}
: PaintControllerPaintTestBase(true),
ScopedRootLayerScrollingForTest(GetParam()) {}
};
class PaintControllerPaintTestForSlimmingPaintV1AndV2
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment