Skip to content

GitLab

T
tangled
Commit b6f6dab6 authored by wangxianzhu's avatar wangxianzhu Committed by Commit bot
Browse files
Options

Fix under-invalidation of media slider thumb when network state changes 

When we invalidate a media control, we need to invalidate the whole
subtree because not only the top-level layout object but also the
descendants may paint differently.

BUG=645225
TEST=paint/invalidation/video-play-no-source-under-invalidation.html

Review-Url: https://codereview.chromium.org/2343713003
Cr-Commit-Position: refs/heads/master@{#418750}
parent acc8ce6a
Hide whitespace changes
Inline Side-by-side
Showing with 58 additions and 164 deletions
third_party/WebKit/LayoutTests/media/media-audio-no-spurious-repaints-expected.txt deleted 100644 → 0
View file @ acc8ce6a
CONSOLE MESSAGE: line 29: FAIL! An unexpected number of repaints occurred; expected 3 to 4 with rects of [8, 8, 300, 150]. Actual layer tree: {
"name": "Content Root Layer",
"bounds": [800, 600],
"children": [
{
"name": "LayoutView #document",
"bounds": [800, 600],
"contentsOpaque": true,
"drawsContent": true,
"paintInvalidations": [
{
"object": "LayoutVideo VIDEO",
"rect": [8, 8, 300, 150],
"reason": "full"
},
{
"object": "LayoutVideo VIDEO",
"rect": [8, 8, 300, 150],
"reason": "full"
},
{
"object": "LayoutVideo VIDEO",
"rect": [8, 8, 300, 150],
"reason": "style change"
}
]
}
],
"objectPaintInvalidations": [
{
"object": "LayoutVideo VIDEO",
"reason": "full"
},
{
"object": "LayoutVideo VIDEO",
"reason": "style change"
},
{
"object": "LayoutVideo VIDEO",
"reason": "full"
}
]
}
This is a testharness.js-based test.
FAIL Verifies there are no spurious repaints for audio in a video tag. Cannot read property 'length' of undefined
Harness: the test ran to completion.
third_party/WebKit/LayoutTests/media/media-audio-no-spurious-repaints.html → third_party/WebKit/LayoutTests/paint/invalidation/media-audio-no-spurious-repaints.html
View file @ b6f6dab6
<!doctype html>
<title>Verifies there are no spurious repaints for audio in a video tag.</title>
<script src="../resources/testharness.js"></script>
<script src="../resources/testharnessreport.js"></script>
<script src="../../resources/testharness.js"></script>
<script src="../../resources/testharnessreport.js"></script>
<video></video>
<script>
async_test(function(t) {
......@@ -15,7 +15,7 @@ async_test(function(t) {
video.addEventListener('ended', t.step_func(function() {
var layerTree = internals.layerTreeAsText(
document, internals.LAYER_TREE_INCLUDES_PAINT_INVALIDATIONS);
var repaintRects = JSON.parse(layerTree).children[0].repaintRects;
var paintInvalidations = JSON.parse(layerTree).children[0].paintInvalidations;
internals.stopTrackingRepaints(document);
// Manually verify the number of repaints instead of using a repaint
......@@ -32,13 +32,13 @@ async_test(function(t) {
' Actual layer tree: ' + layerTree);
});
assert_between_inclusive(repaintRects.length, minExpected, maxExpected);
for (var i = 0; i < repaintRects.length; ++i)
assert_array_equals(repaintRects[i], expectedRect);
assert_between_inclusive(paintInvalidations.length, minExpected, maxExpected);
for (var i = 0; i < paintInvalidations.length; ++i)
assert_array_equals(paintInvalidations[i].rect, expectedRect);
t.done();
}), false);
video.src = 'content/silence.wav';
video.src = '../../media/content/silence.wav';
});
</script>
third_party/WebKit/LayoutTests/paint/invalidation/video-mute-repaint-expected.txt
View file @ b6f6dab6
......@@ -29,30 +29,35 @@
"bounds": [700, 525],
"drawsContent": true,
"paintInvalidations": [
{
"object": "LayoutBlockFlow DIV id='track'",
"rect": [562, 485, 106, 48],
"reason": "subtree"
},
{
"object": "LayoutFlexibleBox DIV",
"rect": [580, 508, 70, 2],
"reason": "forced by layout"
"reason": "subtree"
},
{
"object": "LayoutSlider INPUT",
"rect": [580, 508, 70, 2],
"reason": "full"
"reason": "subtree"
},
{
"object": "LayoutBlockFlow DIV id='thumb'",
"rect": [632, 485, 36, 48],
"reason": "full"
"reason": "subtree"
},
{
"object": "LayoutBlockFlow DIV id='thumb'",
"rect": [562, 485, 36, 48],
"reason": "full"
"reason": "subtree"
},
{
"object": "LayoutButton INPUT",
"rect": [530, 493, 32, 32],
"reason": "full"
"reason": "subtree"
}
]
}
......@@ -68,19 +73,23 @@
},
{
"object": "LayoutButton INPUT",
"reason": "full"
"reason": "subtree"
},
{
"object": "LayoutSlider INPUT",
"reason": "full"
"reason": "subtree"
},
{
"object": "LayoutFlexibleBox DIV",
"reason": "forced by layout"
"reason": "subtree"
},
{
"object": "LayoutBlockFlow DIV id='track'",
"reason": "subtree"
},
{
"object": "LayoutBlockFlow DIV id='thumb'",
"reason": "full"
"reason": "subtree"
}
]
}
......
third_party/WebKit/LayoutTests/paint/invalidation/video-play-no-source-under-invalidation-expected.txt 0 → 100644
View file @ b6f6dab6
Tests playing video with invalid source with paintUnderInvalidationChecking enabled. Passes if no under-invalidation reported.
third_party/WebKit/LayoutTests/paint/invalidation/video-play-no-source-under-invalidation.html 0 → 100644
View file @ b6f6dab6
<!DOCTYPE html>
<script>
if (window.testRunner)
testRunner.dumpAsText();
if (window.internals)
internals.runtimeFlags.paintUnderInvalidationCheckingEnabled = true;
</script>
Tests playing video with invalid source with paintUnderInvalidationChecking enabled.
Passes if no under-invalidation reported.<br>
<video controls="">
<source src="does-not-exist.webm">
</video>
third_party/WebKit/LayoutTests/paint/invalidation/video-unmute-repaint-expected.txt
View file @ b6f6dab6
......@@ -29,30 +29,35 @@
"bounds": [700, 525],
"drawsContent": true,
"paintInvalidations": [
{
"object": "LayoutBlockFlow DIV id='track'",
"rect": [562, 485, 106, 48],
"reason": "subtree"
},
{
"object": "LayoutFlexibleBox DIV",
"rect": [580, 508, 70, 2],
"reason": "forced by layout"
"reason": "subtree"
},
{
"object": "LayoutSlider INPUT",
"rect": [580, 508, 70, 2],
"reason": "full"
"reason": "subtree"
},
{
"object": "LayoutBlockFlow DIV id='thumb'",
"rect": [597, 485, 36, 48],
"reason": "full"
"reason": "subtree"
},
{
"object": "LayoutBlockFlow DIV id='thumb'",
"rect": [562, 485, 36, 48],
"reason": "full"
"reason": "subtree"
},
{
"object": "LayoutButton INPUT",
"rect": [530, 493, 32, 32],
"reason": "full"
"reason": "subtree"
}
]
}
......@@ -68,19 +73,23 @@
},
{
"object": "LayoutButton INPUT",
"reason": "full"
"reason": "subtree"
},
{
"object": "LayoutSlider INPUT",
"reason": "full"
"reason": "subtree"
},
{
"object": "LayoutFlexibleBox DIV",
"reason": "forced by layout"
"reason": "subtree"
},
{
"object": "LayoutBlockFlow DIV id='track'",
"reason": "subtree"
},
{
"object": "LayoutBlockFlow DIV id='thumb'",
"reason": "full"
"reason": "subtree"
}
]
}
......
third_party/WebKit/LayoutTests/platform/android/paint/invalidation/video-mute-repaint-expected.txt deleted 100644 → 0
View file @ acc8ce6a
{
"bounds": [800, 600],
"children": [
{
"bounds": [800, 600],
"contentsOpaque": true,
"drawsContent": true,
"children": [
{
"position": [8, 8],
"bounds": [700, 525]
},
{
"shouldFlattenTransform": false,
"children": [
{
"position": [8, 8],
"bounds": [700, 525],
"drawsContent": true
},
{
"position": [8, 8],
"bounds": [700, 520],
"drawsContent": true,
"repaintRects": [
[628, 492, 24, 25],
[570, 492, 89, 25],
[570, 492, 89, 25],
[570, 492, 24, 25],
[535, 489, 35, 31]
],
"paintInvalidationClients": [
"LayoutButton INPUT",
"LayoutSlider INPUT",
"LayoutFlexibleBox DIV",
"LayoutBlockFlow DIV id='thumb'"
]
}
]
}
]
}
]
}
third_party/WebKit/LayoutTests/platform/android/paint/invalidation/video-unmute-repaint-expected.txt deleted 100644 → 0
View file @ acc8ce6a
{
"bounds": [800, 600],
"children": [
{
"bounds": [800, 600],
"contentsOpaque": true,
"drawsContent": true,
"children": [
{
"position": [8, 8],
"bounds": [700, 525]
},
{
"shouldFlattenTransform": false,
"children": [
{
"position": [8, 8],
"bounds": [700, 525],
"drawsContent": true
},
{
"position": [8, 8],
"bounds": [700, 520],
"drawsContent": true,
"repaintRects": [
[599, 492, 24, 25],
[570, 492, 89, 25],
[570, 492, 89, 25],
[570, 492, 24, 25],
[535, 489, 35, 31]
],
"paintInvalidationClients": [
"LayoutButton INPUT",
"LayoutSlider INPUT",
"LayoutFlexibleBox DIV",
"LayoutBlockFlow DIV id='thumb'"
]
}
]
}
]
}
]
}
third_party/WebKit/Source/core/html/shadow/MediaControls.cpp
View file @ b6f6dab6
......@@ -825,7 +825,7 @@ void MediaControls::invalidate(Element* element)
return;
if (LayoutObject* layoutObject = element->layoutObject())
layoutObject->setShouldDoFullPaintInvalidation();
layoutObject->setShouldDoFullPaintInvalidationIncludingNonCompositingDescendants();
}
void MediaControls::networkStateChanged()
......
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