Skip to content

GitLab

T
tangled
Commit 206bdc85 authored by Xianzhu Wang's avatar Xianzhu Wang Committed by Commit Bot
Browse files
Options

Fix false-positives of under-invalidation checking in layout tests 

In the following few cases we intentionally allow under-invalidations in
cached subsequences:
- offscreen image animation
- media buffered range

We intentionally don't update each time the contents change to improve
performance or avoid complex implementation of real time change
notification.

Now allow cache skipping in cached subsequences.

Enable under-invalidation checking for tests that would have reported
under-invalidation with the checking enabled.

This also helps clusterfuzz not to trigger under-invaldiation checking
failures when it creates a test for the above cases.

Bug: 769729
Cq-Include-Trybots: master.tryserver.chromium.linux:linux_layout_tests_slimming_paint_v2
Change-Id: I2149e9d2304dbad5d7486c822d5452c5dba237fe
Reviewed-on: https://chromium-review.googlesource.com/690851
Commit-Queue: Xianzhu Wang <wangxianzhu@chromium.org>
Reviewed-by: default avatarChris Harrelson <chrishtr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#505281}
parent 2eb8bf2d
Hide whitespace changes
Inline Side-by-side
Showing with 47 additions and 282 deletions
third_party/WebKit/LayoutTests/FlagExpectations/enable-slimming-paint-v2
View file @ 206bdc85
......@@ -1116,6 +1116,7 @@ Bug(none) paint/invalidation/compositing/iframe-inside-squashed-layer.html [ Fai
Bug(none) paint/invalidation/compositing/overlap-test-with-filter.html [ Failure ]
Bug(none) paint/invalidation/compositing/should-not-repaint-composited-descendants.html [ Failure ]
Bug(none) paint/invalidation/filter-repaint-accelerated-child-with-filter-child.html [ Failure ]
Bug(none) paint/invalidation/video-paint-invalidation.html [ Failure ]
# Need to support partial invalidation for some changes.
crbug.com/732612 paint/invalidation/canvas-composite-repaint-by-all-imagesource.html [ Failure ]
......@@ -1297,7 +1298,6 @@ crbug.com/768102 compositing/overflow/reparented-overlay-scrollbars-should-respe
crbug.com/644358 fast/css3-text/css3-text-decoration/repaint/repaint-text-decoration-style.html [ Failure ]
crbug.com/644358 paint/invalidation/svg/image-with-clip-path.svg [ Failure ]
crbug.com/644358 paint/invalidation/video-paint-invalidation.html [ Crash ]
Bug(none) compositing/layer-creation/main-thread-scrolling-for-non-composited-fixed-position-if-overflow-hidden.html [ Failure ]
Bug(none) compositing/layer-creation/main-thread-scrolling-for-non-composited-fixed-position.html [ Failure ]
......
third_party/WebKit/LayoutTests/TestExpectations
View file @ 206bdc85
......@@ -1534,7 +1534,6 @@ crbug.com/605059 [ Retina ] fast/text/international/rtl-negative-letter-spacing.
crbug.com/610464 [ Linux Win7 Debug ] http/tests/devtools/components/throttler.html [ Failure Pass ]
crbug.com/667560 [ Linux Win7 Debug ] virtual/mojo-loading/http/tests/devtools/components/throttler.html [ Failure Pass ]
crbug.com/654477 paint/invalidation/video-paint-invalidation.html [ Failure Crash ]
crbug.com/654477 [ Win ] compositing/video/video-controls-layer-creation.html [ Pass Failure ]
crbug.com/654477 fast/hidpi/video-controls-in-hidpi.html [ Failure ]
crbug.com/654477 fast/layers/video-layer.html [ Failure ]
......
third_party/WebKit/LayoutTests/media/media-document-audio-repaint.html
View file @ 206bdc85
<script src="../resources/run-after-layout-and-paint.js"></script>
<script>
// Disable under-invalidation checking because we allow short period of
// under-invalidation of buffered ranges.
if (window.internals)
internals.runtimeFlags.paintUnderInvalidationCheckingEnabled = false;
if (window.testRunner)
testRunner.waitUntilDone();
......@@ -38,4 +33,4 @@
<iframe src="content/silence.wav" id="fr" width=380 height=330 onload="frameLoaded()"></iframe>
<script>// To produce the same layout as before iframe was moved down to avoid rebaselines of different platforms.
// https://bugs.webkit.org/show_bug.cgi?id=54942
</script>
\ No newline at end of file
</script>
third_party/WebKit/LayoutTests/paint/invalidation/animated-gif-offscreen.html
View file @ 206bdc85
......@@ -7,11 +7,6 @@
<script>
window.testIsAsync = true;
// Disable under-invalidation checking because the "under-invalidation" of
// offscreen gif animation is intentional.
if (window.internals)
internals.runtimeFlags.paintUnderInvalidationCheckingEnabled = false;
function repaintTest() {
if (window.internals)
internals.advanceImageAnimation(targetImage);
......@@ -30,4 +25,4 @@ onload = function() {
targetImage.onload = targetImageOnload;
targetImage.src = "../../fast/backgrounds/resources/red-green-animated.gif";
}
</script>
\ No newline at end of file
</script>
third_party/WebKit/LayoutTests/paint/invalidation/animated-gif-transformed-offscreen.html
View file @ 206bdc85
......@@ -7,11 +7,6 @@
<script>
window.testIsAsync = true;
// Disable under-invalidation checking because the "under-invalidation" of
// offscreen gif animation is intentional.
if (window.internals)
internals.runtimeFlags.paintUnderInvalidationCheckingEnabled = false;
function repaintTest() {
if (window.internals)
internals.advanceImageAnimation(targetImage);
......@@ -29,4 +24,4 @@ window.onload = function() {
targetImage.onload = targetImageOnload;
targetImage.src="../../fast/backgrounds/resources/red-green-animated.gif";
}
</script>
\ No newline at end of file
</script>
third_party/WebKit/LayoutTests/paint/invalidation/animated-png-offscreen.html
View file @ 206bdc85
......@@ -7,11 +7,6 @@
<script>
window.testIsAsync = true;
// Disable under-invalidation checking because the "under-invalidation" of
// offscreen apng animation is intentional.
if (window.internals)
internals.runtimeFlags.paintUnderInvalidationCheckingEnabled = false;
function repaintTest() {
if (window.internals)
internals.advanceImageAnimation(targetImage);
......
third_party/WebKit/LayoutTests/paint/invalidation/animated-webp-offscreen.html
View file @ 206bdc85
......@@ -7,11 +7,6 @@
<script>
window.testIsAsync = true;
// Disable under-invalidation checking because the "under-invalidation" of
// offscreen webp animation is intentional.
if (window.internals)
internals.runtimeFlags.paintUnderInvalidationCheckingEnabled = false;
function repaintTest() {
if (window.internals)
internals.advanceImageAnimation(targetImage);
......
third_party/WebKit/LayoutTests/paint/invalidation/svg/animated-svg-as-image-background-offscreen.html
View file @ 206bdc85
......@@ -3,11 +3,6 @@
<script>
window.testIsAsync = true;
// Disable under-invalidation checking because the "under-invalidation" of
// offscreen SVG animation is intentional.
if (window.internals)
internals.runtimeFlags.paintUnderInvalidationCheckingEnabled = false;
function repaintTest() {
if (window.internals)
internals.advanceImageAnimation(testTarget);
......
third_party/WebKit/LayoutTests/paint/invalidation/svg/animated-svg-as-image-offscreen.html
View file @ 206bdc85
......@@ -3,11 +3,6 @@
<script>
window.testIsAsync = true;
// Disable under-invalidation checking because the "under-invalidation" of
// offscreen SVG animation is intentional.
if (window.internals)
internals.runtimeFlags.paintUnderInvalidationCheckingEnabled = false;
function repaintTest() {
if (window.internals)
internals.advanceImageAnimation(targetImage);
......
third_party/WebKit/LayoutTests/paint/invalidation/svg/animated-svg-as-image-transformed-offscreen.html
View file @ 206bdc85
......@@ -3,11 +3,6 @@
<script>
window.testIsAsync = true;
// Disable under-invalidation checking because the "under-invalidation" of
// offscreen SVG animation is intentional.
if (window.internals)
internals.runtimeFlags.paintUnderInvalidationCheckingEnabled = false;
function repaintTest() {
if (window.internals)
internals.advanceImageAnimation(targetImage);
......
third_party/WebKit/LayoutTests/paint/invalidation/video-mute-repaint.html
View file @ 206bdc85
......@@ -10,11 +10,6 @@
</video>
<script>
// Disable under-invalidation checking because we allow short period of
// under-invalidation of buffered ranges.
if (window.internals)
internals.runtimeFlags.paintUnderInvalidationCheckingEnabled = false;
window.testIsAsync = true;
var video = document.getElementById("v");
......
third_party/WebKit/LayoutTests/paint/invalidation/video-unmute-repaint.html
View file @ 206bdc85
......@@ -12,11 +12,6 @@
<p>This tests that we repaint the mute button when we change the volume</p>
<script>
// Disable under-invalidation checking because we allow short period of
// under-invalidation of buffered ranges.
if (window.internals)
internals.runtimeFlags.paintUnderInvalidationCheckingEnabled = false;
window.testIsAsync = true;
var video = document.getElementById("v");
......
third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/video-paint-invalidation-expected.txt deleted 100644 → 0
View file @ 2eb8bf2d
{
"layers": [
{
"name": "LayoutView #document",
"bounds": [800, 600],
"contentsOpaque": true,
"drawsContent": true
},
{
"name": "LayoutVideo VIDEO id='video'",
"position": [8, 8],
"bounds": [320, 240]
},
{
"name": "Squashing Containment Layer",
"shouldFlattenTransform": false
},
{
"name": "LayoutFlexibleBox (relative positioned) DIV",
"position": [8, 8],
"bounds": [320, 240],
"drawsContent": true
},
{
"name": "Squashing Layer (first squashed layer: LayoutFlexibleBox (relative positioned) DIV)",
"position": [8, 8],
"bounds": [320, 240],
"drawsContent": true
}
],
"objectPaintInvalidations": [
{
"object": "LayoutVideo VIDEO id='video'",
"reason": "full"
}
]
}
third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/video-paint-invalidation-expected.txt deleted 100644 → 0
View file @ 2eb8bf2d
{
"bounds": [800, 600],
"children": [
{
"bounds": [800, 600],
"contentsOpaque": true,
"drawsContent": true,
"children": [
{
"position": [8, 8],
"bounds": [320, 240]
},
{
"shouldFlattenTransform": false,
"children": [
{
"position": [8, 8],
"bounds": [320, 240],
"drawsContent": true
},
{
"position": [8, 8],
"bounds": [320, 240],
"drawsContent": true,
"paintInvalidations": [
{
"object": "LayoutSlider INPUT",
"rect": [108, 223, 70, 2],
"reason": "full"
},
{
"object": "LayoutFlexibleBox DIV",
"rect": [108, 223, 69, 2],
"reason": "forced by layout"
},
{
"object": "LayoutBlockFlow DIV id='thumb'",
"rect": [90, 208, 37, 32],
"reason": "full"
},
{
"object": "LayoutBlockFlow DIV id='thumb'",
"rect": [159, 208, 36, 32],
"reason": "full"
},
{
"object": "LayoutButton INPUT",
"rect": [195, 208, 32, 32],
"reason": "full"
},
{
"object": "LayoutButton INPUT",
"rect": [0, 208, 32, 32],
"reason": "full"
},
{
"object": "LayoutSlider INPUT",
"rect": [245, 223, 25, 2],
"reason": "full"
},
{
"object": "LayoutBlockFlow (anonymous)",
"rect": [32, 208, 24, 23],
"reason": "invalidate paint rectangle"
},
{
"object": "LayoutText #text",
"rect": [32, 217, 24, 14],
"reason": "full"
},
{
"object": "InlineTextBox ''",
"reason": "full"
},
{
"object": "InlineTextBox '0:00'",
"reason": "full"
},
{
"object": "RootInlineBox",
"reason": "full"
}
]
}
]
}
]
}
]
}
third_party/WebKit/LayoutTests/platform/win7/paint/invalidation/video-paint-invalidation-expected.txt deleted 100644 → 0
View file @ 2eb8bf2d
{
"bounds": [800, 600],
"children": [
{
"bounds": [800, 600],
"contentsOpaque": true,
"drawsContent": true,
"children": [
{
"position": [8, 8],
"bounds": [320, 240]
},
{
"shouldFlattenTransform": false,
"children": [
{
"position": [8, 8],
"bounds": [320, 240],
"drawsContent": true
},
{
"position": [8, 8],
"bounds": [320, 240],
"drawsContent": true,
"paintInvalidations": [
{
"object": "LayoutFlexibleBox DIV",
"rect": [96, 223, 81, 2],
"reason": "forced by layout"
},
{
"object": "LayoutSlider INPUT",
"rect": [96, 223, 81, 2],
"reason": "full"
},
{
"object": "LayoutBlockFlow DIV id='thumb'",
"rect": [159, 208, 36, 32],
"reason": "full"
},
{
"object": "LayoutBlockFlow DIV id='thumb'",
"rect": [78, 208, 36, 32],
"reason": "full"
},
{
"object": "LayoutButton INPUT",
"rect": [195, 208, 32, 32],
"reason": "full"
},
{
"object": "LayoutButton INPUT",
"rect": [0, 208, 32, 32],
"reason": "full"
},
{
"object": "LayoutSlider INPUT",
"rect": [245, 223, 25, 2],
"reason": "full"
},
{
"object": "LayoutBlockFlow (anonymous)",
"rect": [32, 208, 18, 23],
"reason": "invalidate paint rectangle"
},
{
"object": "LayoutText #text",
"rect": [32, 217, 18, 14],
"reason": "full"
},
{
"object": "InlineTextBox ''",
"reason": "full"
},
{
"object": "InlineTextBox '0:00'",
"reason": "full"
},
{
"object": "RootInlineBox",
"reason": "full"
}
]
}
]
}
]
}
]
}
third_party/WebKit/Source/platform/graphics/paint/PaintController.cpp
View file @ 206bdc85
......@@ -977,10 +977,7 @@ void PaintController::ShowUnderInvalidationError(
#else
LOG(ERROR) << "Run debug build to get more details.";
#endif
LOG(ERROR) << "See http://crbug.com/619103. For media layout tests, this "
"could fail due to change in buffered range. In that case, set "
"internals.runtimeFlags.paintUnderInvalidationCheckingEnabled "
"to false in layout test.";
LOG(ERROR) << "See http://crbug.com/619103.";
#ifndef NDEBUG
const PaintRecord* new_record = nullptr;
......@@ -1033,6 +1030,13 @@ void PaintController::CheckUnderInvalidation() {
return;
const DisplayItem& new_item = new_display_item_list_.Last();
if (new_item.SkippedCache()) {
// We allow cache skipping and temporary under-invalidation in cached
// subsequences. See the usage of DisplayItemCacheSkipper in BoxPainter.
under_invalidation_checking_begin_ = under_invalidation_checking_end_;
return;
}
size_t old_item_index = under_invalidation_checking_begin_ +
skipped_probable_under_invalidation_count_;
DisplayItem* old_item =
......
third_party/WebKit/Source/platform/graphics/paint/PaintControllerTest.cpp
View file @ 206bdc85
......@@ -11,6 +11,7 @@
#include "platform/graphics/paint/ClipPathRecorder.h"
#include "platform/graphics/paint/ClipRecorder.h"
#include "platform/graphics/paint/CompositingRecorder.h"
#include "platform/graphics/paint/DisplayItemCacheSkipper.h"
#include "platform/graphics/paint/DrawingDisplayItem.h"
#include "platform/graphics/paint/DrawingRecorder.h"
#include "platform/graphics/paint/SubsequenceRecorder.h"
......@@ -2074,7 +2075,10 @@ TEST_P(PaintControllerTest, PartialSkipCache) {
.GetPaintRecord());
}
TEST_F(PaintControllerTestBase, OptimizeNoopPairs) {
TEST_P(PaintControllerTest, OptimizeNoopPairs) {
if (RuntimeEnabledFeatures::SlimmingPaintV175Enabled())
return;
FakeDisplayItemClient first("first");
FakeDisplayItemClient second("second");
FakeDisplayItemClient third("third");
......@@ -2128,7 +2132,7 @@ TEST_F(PaintControllerTestBase, OptimizeNoopPairs) {
TestControllerDisplayItem(third, kBackgroundDrawingType));
}
TEST_F(PaintControllerTestBase, SmallPaintControllerHasOnePaintChunk) {
TEST_P(PaintControllerTest, SmallPaintControllerHasOnePaintChunk) {
ScopedSlimmingPaintV2ForTest enable_s_pv2(true);
FakeDisplayItemClient client("test client");
......@@ -2168,7 +2172,7 @@ void DrawPath(GraphicsContext& context,
context.DrawPath(path, flags);
}
TEST_F(PaintControllerTestBase, BeginAndEndFrame) {
TEST_P(PaintControllerTest, BeginAndEndFrame) {
class FakeFrame {};
// PaintController should have one null frame in the stack since beginning.
......@@ -2443,6 +2447,30 @@ class PaintControllerUnderInvalidationTest
}
GetPaintController().CommitNewDisplayItems();
}
void TestSkipCacheInSubsequence() {
FakeDisplayItemClient container("container");
FakeDisplayItemClient content("content");
GraphicsContext context(GetPaintController());
{
SubsequenceRecorder r(context, container);
DisplayItemCacheSkipper cache_skipper(context);
DrawRect(context, content, kBackgroundDrawingType,
FloatRect(100, 100, 300, 300));
}
GetPaintController().CommitNewDisplayItems();
{
EXPECT_FALSE(SubsequenceRecorder::UseCachedSubsequenceIfPossible(
context, container));
SubsequenceRecorder r(context, container);
DisplayItemCacheSkipper cache_skipper(context);
DrawRect(context, content, kBackgroundDrawingType,
FloatRect(200, 200, 400, 400));
}
GetPaintController().CommitNewDisplayItems();
}
};
TEST_F(PaintControllerUnderInvalidationTest, ChangeDrawing) {
......@@ -2496,6 +2524,10 @@ TEST_F(PaintControllerUnderInvalidationTest, SubsequenceBecomesEmpty) {
EXPECT_DEATH(TestSubsequenceBecomesEmpty(), "");
}
TEST_F(PaintControllerUnderInvalidationTest, SkipCacheInSubsequence) {
TestSkipCacheInSubsequence();
}
#endif // defined(GTEST_HAS_DEATH_TEST) && !defined(OS_ANDROID)
} // namespace blink
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