Skip to content

GitLab

T
tangled
Commit 200aa55b authored by Xianzhu Wang's avatar Xianzhu Wang Committed by Commit Bot
Browse files
Options

Use display item id for the paint chunk forced by the display item 

This will make the paint chunk id more meaningful and stable.

Change-Id: I5aaacc183c2c359fcfe8b44e3ac17c1a00f9d4da
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1912637
Commit-Queue: Xianzhu Wang <wangxianzhu@chromium.org>
Reviewed-by: default avatarPhilip Rogers <pdr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#715038}
parent 3ee2017d
Hide whitespace changes
Inline Side-by-side
Showing with 15 additions and 43 deletions
third_party/blink/renderer/core/paint/view_painter_test.cc
View file @ 200aa55b
......@@ -145,8 +145,7 @@ TEST_P(ViewPainterScrollHitTestTest, DocumentBackgroundWithScroll) {
ElementsAre(
IsPaintChunk(
0, 1,
PaintChunk::Id(*GetLayoutView().Layer(),
DisplayItem::kLayerChunkBackground),
PaintChunk::Id(GetLayoutView(), DisplayItem::kScrollHitTest),
GetLayoutView().FirstFragment().LocalBorderBoxProperties(),
scroll_hit_test_data),
IsPaintChunk(1, 2,
......@@ -206,8 +205,7 @@ TEST_P(ViewPainterScrollHitTestTest, FrameScrollHitTestProperties) {
ElementsAre(
IsPaintChunk(
0, 1,
PaintChunk::Id(*GetLayoutView().Layer(),
DisplayItem::kLayerChunkBackground),
PaintChunk::Id(GetLayoutView(), DisplayItem::kScrollHitTest),
GetLayoutView().FirstFragment().LocalBorderBoxProperties(),
scroll_hit_test_data),
IsPaintChunk(1, 2,
......
third_party/blink/renderer/platform/graphics/paint/paint_chunker.cc
View file @ 200aa55b
......@@ -55,8 +55,10 @@ bool PaintChunker::IncrementDisplayItemIndex(const DisplayItem& item) {
bool item_forces_new_chunk =
item.IsForeignLayer() || item.IsScrollHitTest() || item.IsScrollbar();
if (item_forces_new_chunk)
if (item_forces_new_chunk) {
force_new_chunk_ = true;
next_chunk_id_.emplace(item.GetId());
}
size_t new_chunk_begin_index;
if (chunks_.IsEmpty()) {
......
third_party/blink/renderer/platform/graphics/paint/paint_chunker_test.cc
View file @ 200aa55b
......@@ -259,6 +259,7 @@ TEST_F(PaintChunkerTest, CreatesSeparateChunksWhenRequested) {
TestChunkerDisplayItem after_i2(client_, DisplayItemType(10));
chunker.IncrementDisplayItemIndex(after_i2);
chunker.IncrementDisplayItemIndex(TestChunkerDisplayItem(client_));
chunker.UpdateCurrentPaintChunkProperties(id0, DefaultPaintChunkProperties());
chunker.IncrementDisplayItemIndex(i3);
EXPECT_THAT(
......
third_party/blink/web_tests/FlagExpectations/composite-after-paint
View file @ 200aa55b
......@@ -265,6 +265,7 @@ crbug.com/931486 paint/invalidation/line-flow-with-floats-7.html [ Failure ]
crbug.com/931486 paint/invalidation/line-flow-with-floats-8.html [ Failure ]
crbug.com/931486 paint/invalidation/line-flow-with-floats-9.html [ Failure ]
crbug.com/931486 paint/invalidation/flexbox/scrollbars-changed.html [ Failure ]
crbug.com/931486 paint/invalidation/scroll/composited-add-resizer.html [ Failure ]
crbug.com/931486 paint/invalidation/scroll/composited-iframe-scroll-repaint.html [ Failure ]
crbug.com/931486 paint/invalidation/scroll/overflow-scroll-composited-non-stacking-child.html [ Failure ]
crbug.com/931486 paint/invalidation/scroll/overflow-scroll-delete.html [ Failure ]
......
third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/forms/select-option-background-color-expected.txt
View file @ 200aa55b
......@@ -6,16 +6,6 @@
"contentsOpaque": true,
"backgroundColor": "#FFFFFF",
"paintInvalidations": [
{
"object": "LayoutListBox SELECT",
"rect": [14, 37, 15, 68],
"reason": "chunk disappeared"
},
{
"object": "VerticalScrollbar",
"rect": [14, 37, 15, 68],
"reason": "chunk appeared"
},
{
"object": "LayoutBlockFlow OPTION id='option'",
"rect": [1, 37, 13, 17],
......
third_party/blink/web_tests/platform/linux/paint/float/float-under-inline-self-painting-change-expected.txt
View file @ 200aa55b
......@@ -11,11 +11,6 @@
"rect": [8, 8, 306, 306],
"reason": "chunk appeared"
},
{
"object": "LayoutTextControl (floating) TEXTAREA id='target'",
"rect": [8, 8, 306, 306],
"reason": "chunk appeared"
},
{
"object": "LayoutTextControl (floating) TEXTAREA id='target'",
"rect": [8, 8, 306, 306],
......@@ -29,7 +24,7 @@
{
"object": "LayoutTextControl (floating) TEXTAREA id='target'",
"rect": [8, 8, 306, 306],
"reason": "chunk disappeared"
"reason": "paint property change"
},
{
"object": "LayoutTextControl (floating) TEXTAREA id='target'",
......
third_party/blink/web_tests/platform/mac-mac10.10/paint/float/float-under-inline-self-painting-change-expected.txt
View file @ 200aa55b
......@@ -11,11 +11,6 @@
"rect": [8, 8, 306, 306],
"reason": "chunk appeared"
},
{
"object": "LayoutTextControl (floating) TEXTAREA id='target'",
"rect": [8, 8, 306, 306],
"reason": "chunk appeared"
},
{
"object": "LayoutTextControl (floating) TEXTAREA id='target'",
"rect": [8, 8, 306, 306],
......@@ -29,7 +24,7 @@
{
"object": "LayoutTextControl (floating) TEXTAREA id='target'",
"rect": [8, 8, 306, 306],
"reason": "chunk disappeared"
"reason": "paint property change"
},
{
"object": "LayoutTextControl (floating) TEXTAREA id='target'",
......
third_party/blink/web_tests/platform/mac/paint/float/float-under-inline-self-painting-change-expected.txt
View file @ 200aa55b
......@@ -11,11 +11,6 @@
"rect": [8, 8, 306, 306],
"reason": "chunk appeared"
},
{
"object": "LayoutTextControl (floating) TEXTAREA id='target'",
"rect": [8, 8, 306, 306],
"reason": "chunk appeared"
},
{
"object": "LayoutTextControl (floating) TEXTAREA id='target'",
"rect": [8, 8, 306, 306],
......@@ -29,7 +24,7 @@
{
"object": "LayoutTextControl (floating) TEXTAREA id='target'",
"rect": [8, 8, 306, 306],
"reason": "chunk disappeared"
"reason": "paint property change"
},
{
"object": "LayoutTextControl (floating) TEXTAREA id='target'",
......
third_party/blink/web_tests/platform/mac/paint/invalidation/forms/textarea-caret-expected.txt
View file @ 200aa55b
......@@ -29,7 +29,7 @@
{
"object": "LayoutTextControl TEXTAREA id='editor'",
"rect": [5, 5, 167, 44],
"reason": "chunk appeared"
"reason": "paint property change"
},
{
"object": "LayoutTextControl TEXTAREA id='editor'",
......@@ -44,7 +44,7 @@
{
"object": "LayoutTextControl TEXTAREA id='editor'",
"rect": [8, 8, 161, 38],
"reason": "chunk disappeared"
"reason": "paint property change"
},
{
"object": "LayoutTextControl TEXTAREA id='editor'",
......
third_party/blink/web_tests/platform/win/paint/float/float-under-inline-self-painting-change-expected.txt
View file @ 200aa55b
......@@ -11,11 +11,6 @@
"rect": [8, 8, 306, 306],
"reason": "chunk appeared"
},
{
"object": "LayoutTextControl (floating) TEXTAREA id='target'",
"rect": [8, 8, 306, 306],
"reason": "chunk appeared"
},
{
"object": "LayoutTextControl (floating) TEXTAREA id='target'",
"rect": [8, 8, 306, 306],
......@@ -29,7 +24,7 @@
{
"object": "LayoutTextControl (floating) TEXTAREA id='target'",
"rect": [8, 8, 306, 306],
"reason": "chunk disappeared"
"reason": "paint property change"
},
{
"object": "LayoutTextControl (floating) TEXTAREA id='target'",
......
third_party/blink/web_tests/platform/win/paint/invalidation/forms/textarea-caret-expected.txt
View file @ 200aa55b
......@@ -29,7 +29,7 @@
{
"object": "LayoutTextControl TEXTAREA id='editor'",
"rect": [7, 7, 183, 40],
"reason": "chunk appeared"
"reason": "paint property change"
},
{
"object": "LayoutTextControl TEXTAREA id='editor'",
......@@ -44,7 +44,7 @@
{
"object": "LayoutTextControl TEXTAREA id='editor'",
"rect": [8, 8, 181, 38],
"reason": "chunk disappeared"
"reason": "paint property change"
},
{
"object": "LayoutTextControl TEXTAREA id='editor'",
......
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