third_party/WebKit/LayoutTests/fast/repaint/obscured-background-no-repaint.html - Issue 2242483002: Fix fast/repaint/obscured-background-no-repaint.html

Unified Diff: third_party/WebKit/LayoutTests/fast/repaint/obscured-background-no-repaint.html

Issue 2242483002: Fix fast/repaint/obscured-background-no-repaint.html (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: - Created 4 years, 4 months 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

« no previous file with comments | « third_party/WebKit/LayoutTests/TestExpectations ('k') | third_party/WebKit/LayoutTests/fast/repaint/obscured-background-no-repaint-expected.txt » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/LayoutTests/fast/repaint/obscured-background-no-repaint.html

diff --git a/third_party/WebKit/LayoutTests/fast/repaint/obscured-background-no-repaint.html b/third_party/WebKit/LayoutTests/fast/repaint/obscured-background-no-repaint.html

index d3728103ff1fcabf5e1d74f14f883cdd7d05b0c2..3a9ad4f6b4c2f5337de542da865333a3a09345f8 100644

--- a/third_party/WebKit/LayoutTests/fast/repaint/obscured-background-no-repaint.html

+++ b/third_party/WebKit/LayoutTests/fast/repaint/obscured-background-no-repaint.html

@@ -1,6 +1,5 @@

<html>

<head>

-<script src="../../resources/run-after-layout-and-paint.js"></script>

#test1 div {

height: 100px;

@@ -58,22 +57,22 @@

function finish() {

var layerTree = window.internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_PAINT_INVALIDATIONS);

var invalidations = JSON.parse(layerTree).objectPaintInvalidations;

- // Passes if there is no invalidations,

- // or only invalidations because of background obscuration change.

- // This is because before the delayed image decoder finishes decoding the image,

- // we first assume the image is not opaque. If the image is found actually opaque

- // after decoding, the background obscuration status of covered elements will

- // change and cause paint invalidation.

+ // Passes if there is no invalidations other than imgForAdvanceImageAnimation,

+ // or only invalidations because of background obscuration change.

+ // This is because before the delayed image decoder finishes decoding the image,

+ // we first assume the image is not opaque. If the image is found actually opaque

+ // after decoding, the background obscuration status of covered elements will

+ // change and cause paint invalidation.

var invalidatedObjects = {};

- for (var i = 0; i < invalidations.length; ++i) {

- var object = invalidations[i].object;

- // Paint invalidation of target3 and target4 depends on opaqueness of the foreground image (apple.jpg).

- // Because of delayed image decoding, we may get actual opaqueness of the image after the test is started.

- // Omit paint invalidations so far if we see 'background obscuration change' for these targets.

- if ((object.indexOf('target3') != -1 || object.indexOf('target4') != -1) && invalidations[i].reason == 'background obscuration change')

- delete invalidatedObjects[object];

- else

+ if (invalidations) {

+ for (var i = 0; i < invalidations.length; ++i) {

+ var object = invalidations[i].object;

+ if (object.indexOf('imgForAdvanceImageAnimation') != -1)

+ continue;

+ if ((object.indexOf('target3') != -1 || object.indexOf('target4') != -1) && invalidations[i].reason == 'background obscuration change')

+ continue;

invalidatedObjects[object] = true;

+ }

}

if (Object.keys(invalidatedObjects).length)

@@ -87,10 +86,17 @@

if (!window.testRunner || !window.internals)

return;

- runAfterLayoutAndPaint(function() {

+ // Ensure the deferred decoder has decoded resources/apple.jpg.

+ testRunner.capturePixelsAsyncThen(function() {

internals.startTrackingRepaints(document);

- // Wait a while to let the animated gif advance frames.

- setTimeout(finish, 300);

+ internals.advanceImageAnimation(imgForAdvanceImageAnimation);

+ testRunner.layoutAndPaintAsyncThen(function() {

+ internals.advanceImageAnimation(imgForAdvanceImageAnimation);

+ testRunner.layoutAndPaintAsyncThen(function() {

+ internals.advanceImageAnimation(imgForAdvanceImageAnimation);

+ testRunner.layoutAndPaintAsyncThen(finish);

+ });

});

}

@@ -122,6 +128,7 @@

</a>

</div>

+<img id="imgForAdvanceImageAnimation" src="resources/animated.gif">

</body>

</html>