Skip to content

GitLab

T
tangled
Commit 94a0c238 authored by trchen@chromium.org's avatar trchen@chromium.org
Browse files
Options

Non-composited scrolling div should invalidate when it has descendant paints to its backing 

This CL fixes a bug that non-composited scrolling div forgets to invalidate
because the div believed all its descandants are composited, when actually
some descendants paints to ancestor backing although composited.

BUG=401047

Review URL: https://codereview.chromium.org/460883002

git-svn-id: svn://svn.chromium.org/blink/trunk@180309 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent 2f124b2c
Hide whitespace changes
Inline Side-by-side
Showing with 116 additions and 8 deletions
third_party/WebKit/LayoutTests/compositing/layer-creation/should-invoke-deferred-compositing-expected.txt
View file @ 94a0c238
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
"bounds": [200, 200], "bounds": [200, 200],
"drawsContent": true, "drawsContent": true,
"repaintRects": [ "repaintRects": [
[0, 0, 200, 200],
[0, 0, 200, 200], [0, 0, 200, 200],
[0, 0, 200, 200] [0, 0, 200, 200]
] ]
......
third_party/WebKit/LayoutTests/compositing/squashing/invalidate-when-leaving-squashed-layer-expected.txt
View file @ 94a0c238
...@@ -32,7 +32,6 @@ ...@@ -32,7 +32,6 @@
"drawsContent": true, "drawsContent": true,
"backgroundColor": "#ADD8E6", "backgroundColor": "#ADD8E6",
"repaintRects": [ "repaintRects": [
[0, 0, 200, 200],
[0, 0, 200, 200], [0, 0, 200, 200],
[0, 0, 200, 200] [0, 0, 200, 200]
] ]
......
third_party/WebKit/LayoutTests/compositing/squashing/squash-above-fixed-1-expected.txt
View file @ 94a0c238
...@@ -70,7 +70,6 @@ CASE 2, scrolling y to 80, new layers will be squashed, so things repaint: ...@@ -70,7 +70,6 @@ CASE 2, scrolling y to 80, new layers will be squashed, so things repaint:
"drawsContent": true, "drawsContent": true,
"backgroundColor": "#00FFFF", "backgroundColor": "#00FFFF",
"repaintRects": [ "repaintRects": [
[0, 0, 200, 100],
[0, 0, 200, 100] [0, 0, 200, 100]
] ]
}, },
...@@ -158,7 +157,6 @@ CASE 4, scrolling y to 170 new layers will be squashed, so things repaint: ...@@ -158,7 +157,6 @@ CASE 4, scrolling y to 170 new layers will be squashed, so things repaint:
"drawsContent": true, "drawsContent": true,
"backgroundColor": "#00FF00", "backgroundColor": "#00FF00",
"repaintRects": [ "repaintRects": [
[0, 0, 200, 100],
[0, 0, 200, 100] [0, 0, 200, 100]
] ]
}, },
......
third_party/WebKit/LayoutTests/fast/scrolling/non-composited-scrolling-repaint-local-background-expected.html 0 → 100644
View file @ 94a0c238
<!DOCTYPE html>
<style>
#container {
overflow: scroll;
width: 400px;
height: 300px;
background: linear-gradient(black, white);
background-attachment: local;
}
#bloat {
height: 1000px;
}
</style>
<div id="container">
<div id="bloat"></div>
</div>
<script>
document.getElementById('container').scrollTop = 1000;
</script>
third_party/WebKit/LayoutTests/fast/scrolling/non-composited-scrolling-repaint-local-background.html 0 → 100644
View file @ 94a0c238
<!DOCTYPE html>
<style>
#container {
overflow: scroll;
width: 400px;
height: 300px;
background: linear-gradient(black, white);
background-attachment: local;
}
#bloat {
height: 1000px;
transform: translateZ(0);
}
</style>
<div id="container">
<div id="bloat"></div>
</div>
<script>
if (window.testRunner) {
testRunner.waitUntilDone();
testRunner.displayAsyncThen(function() {
document.getElementById('container').scrollTop = 1000;
testRunner.notifyDone();
});
}
</script>
third_party/WebKit/LayoutTests/fast/scrolling/non-composited-scrolling-repaint-to-ancestor-backing-expected.html 0 → 100644
View file @ 94a0c238
<!DOCTYPE html>
<style>
#container {
overflow: scroll;
width: 400px;
height: 300px;
}
#clipping {
height: 1000px;
}
#clipped {
height: 10px;
border: solid 1px black;
}
</style>
<div id="container">
<div id="clipping">
<div>Lorem ipsum</div>
<div id="clipped"></div>
</div>
</div>
<script>
document.getElementById('container').scrollTop = 1000;
</script>
third_party/WebKit/LayoutTests/fast/scrolling/non-composited-scrolling-repaint-to-ancestor-backing.html 0 → 100644
View file @ 94a0c238
<!DOCTYPE html>
<style>
#container {
overflow: scroll;
width: 400px;
height: 300px;
}
#clipping {
overflow: hidden;
height: 1000px;
position: relative;
z-index: 0;
}
#clipped {
height: 10px;
border: solid 1px black;
transform: translateZ(0);
}
</style>
<div id="container">
<div id="clipping">
<div>Lorem ipsum</div>
<div id="clipped"></div>
</div>
</div>
<script>
if (window.testRunner) {
testRunner.waitUntilDone();
testRunner.displayAsyncThen(function() {
document.getElementById('container').scrollTop = 1000;
testRunner.notifyDone();
});
}
</script>
third_party/WebKit/LayoutTests/virtual/softwarecompositing/squashing/invalidate-when-leaving-squashed-layer-expected.txt
View file @ 94a0c238
...@@ -32,7 +32,6 @@ ...@@ -32,7 +32,6 @@
"drawsContent": true, "drawsContent": true,
"backgroundColor": "#ADD8E6", "backgroundColor": "#ADD8E6",
"repaintRects": [ "repaintRects": [
[0, 0, 200, 200],
[0, 0, 200, 200], [0, 0, 200, 200],
[0, 0, 200, 200] [0, 0, 200, 200]
] ]
......
third_party/WebKit/Source/core/rendering/RenderLayer.cpp
View file @ 94a0c238
...@@ -629,7 +629,7 @@ void RenderLayer::updateScrollingStateAfterCompositingChange() ...@@ -629,7 +629,7 @@ void RenderLayer::updateScrollingStateAfterCompositingChange()
m_hasNonCompositedChild = false; m_hasNonCompositedChild = false;
for (RenderLayer* child = firstChild(); child; child = child->nextSibling()) { for (RenderLayer* child = firstChild(); child; child = child->nextSibling()) {
if (child->compositingState() == NotComposited) { if (child->compositingState() == NotComposited || child->compositingState() == HasOwnBackingButPaintsIntoAncestor) {
m_hasNonCompositedChild = true; m_hasNonCompositedChild = true;
return; return;
} }
......
third_party/WebKit/Source/core/rendering/RenderLayerScrollableArea.cpp
View file @ 94a0c238
...@@ -388,7 +388,8 @@ void RenderLayerScrollableArea::setScrollOffset(const IntPoint& newScrollOffset) ...@@ -388,7 +388,8 @@ void RenderLayerScrollableArea::setScrollOffset(const IntPoint& newScrollOffset)
bool onlyScrolledCompositedLayers = scrollsOverflow() bool onlyScrolledCompositedLayers = scrollsOverflow()
&& !layer()->hasVisibleNonLayerContent() && !layer()->hasVisibleNonLayerContent()
&& !layer()->hasNonCompositedChild() && !layer()->hasNonCompositedChild()
&& !layer()->hasBlockSelectionGapBounds(); && !layer()->hasBlockSelectionGapBounds()
&& box().style()->backgroundLayers().attachment() != LocalBackgroundAttachment;
if (usesCompositedScrolling() || onlyScrolledCompositedLayers) if (usesCompositedScrolling() || onlyScrolledCompositedLayers)
requiresRepaint = false; requiresRepaint = false;
......
third_party/WebKit/Source/core/rendering/compositing/CompositedLayerMapping.cpp
View file @ 94a0c238
...@@ -161,8 +161,8 @@ CompositedLayerMapping::CompositedLayerMapping(RenderLayer& layer) ...@@ -161,8 +161,8 @@ CompositedLayerMapping::CompositedLayerMapping(RenderLayer& layer)
: m_owningLayer(layer) : m_owningLayer(layer)
, m_pendingUpdateScope(GraphicsLayerUpdateNone) , m_pendingUpdateScope(GraphicsLayerUpdateNone)
, m_isMainFrameRenderViewLayer(false) , m_isMainFrameRenderViewLayer(false)
, m_requiresOwnBackingStoreForIntrinsicReasons(true) , m_requiresOwnBackingStoreForIntrinsicReasons(false)
, m_requiresOwnBackingStoreForAncestorReasons(true) , m_requiresOwnBackingStoreForAncestorReasons(false)
, m_backgroundLayerPaintsFixedRootBackground(false) , m_backgroundLayerPaintsFixedRootBackground(false)
, m_scrollingContentsAreEmpty(false) , m_scrollingContentsAreEmpty(false)
{ {
......
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