Skip to content

GitLab

T
tangled
Commit 06f31934 authored by Victor Miura's avatar Victor Miura Committed by Commit Bot
Browse files
Options

Revert "[PE] Don't ignore clip change not across transform boundary" 

This reverts commit 3b36628a.

Reason for revert: Suspect this broke the build.

Unexpected Failures:
* compositing/geometry/repaint-foreground-layer.html
* compositing/gestures/gesture-tapHighlight-1-iframe-composited-scrolled-clipped.html
* compositing/gestures/gesture-tapHighlight-1-iframe-composited-scrolled-late-noncomposite.html
* compositing/gestures/gesture-tapHighlight-1-iframe-composited-scrolled.html
* compositing/gestures/gesture-tapHighlight-1-iframe-composited.html
* compositing/gestures/gesture-tapHighlight-1-overflow-div-composited-scroll-clip.html
* compositing/gestures/gesture-tapHighlight-1-overflow-div-composited-scrolled.html
* compositing/gestures/gesture-tapHighlight-1-overflow-div-composited.html
* compositing/gestures/gesture-tapHighlight-1-overflow-div-scrolled-late-noncomposite.html
* compositing/gestures/gesture-tapHighlight-2-iframe-composited-inner.html
* compositing/gestures/gesture-tapHighlight-2-iframe-composited-outer.html
* compositing/gestures/gesture-tapHighlight-2-iframe-scrolled-inner-late-composite.html
* compositing/gestures/gesture-tapHighlight-2-overflow-div-composited-inner-scroll-inner.html
* compositing/gestures/gesture-tapHighlight-2-overflow-div-composited-inner-scroll-outer.html
* compositing/gestures/gesture-tapHighlight-2-overflow-div-composited-inner.html
* compositing/gestures/gesture-tapHighlight-2-overflow-div-composited-outer-scroll-inner.html
* compositing/gestures/gesture-tapHighlight-2-overflow-div-composited-outer-scroll-outer.html
* compositing/gestures/gesture-tapHighlight-2-overflow-div-composited-outer.html
* compositing/gestures/gesture-tapHighlight-img-and-text-2.html
* compositing/gestures/gesture-tapHighlight-img-and-text.html
* compositing/gestures/gesture-tapHighlight-pixel-rotated-link.html
* compositing/gestures/gesture-tapHighlight-simple-cancel2.html
* compositing/gestures/gesture-tapHighlight-simple-longPress.html
* compositing/gestures/gesture-tapHighlight-simple-margin.html
* compositing/gestures/gesture-tapHighlight-simple-multi-line.html
* compositing/gestures/gesture-tapHighlight-simple-nested.html
* compositing/gestures/gesture-tapHighlight-simple-scaledX.html
* compositing/gestures/gesture-tapHighlight-simple-scaledY.html
* compositing/gestures/gesture-tapHighlight-simple-window-scroll.html
* compositing/gestures/gesture-tapHighlight-simple.html

Original change's description:
> [PE] Don't ignore clip change not across transform boundary
> 
> If the clip change is caused by the object having transform, we should
> not ignore the clip change because it actually affects descendants.
> 
> Bug: 790560
> Cq-Include-Trybots: master.tryserver.chromium.linux:linux_layout_tests_slimming_paint_v2
> Change-Id: Ifc05835e406eb265717128129c8095f3e52bb864
> Reviewed-on: https://chromium-review.googlesource.com/822919
> Commit-Queue: Xianzhu Wang <wangxianzhu@chromium.org>
> Reviewed-by: Chris Harrelson <chrishtr@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#523653}

TBR=wangxianzhu@chromium.org,trchen@chromium.org,chrishtr@chromium.org

Change-Id: Id760d5784db00715f5f16cd0eeed0cb4e2812688
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 790560
Cq-Include-Trybots: master.tryserver.chromium.linux:linux_layout_tests_slimming_paint_v2
Reviewed-on: https://chromium-review.googlesource.com/822138Reviewed-by: default avatarVictor Miura <vmiura@chromium.org>
Commit-Queue: Victor Miura <vmiura@chromium.org>
Cr-Commit-Position: refs/heads/master@{#523695}
parent 398adf6b
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 33 deletions
third_party/WebKit/LayoutTests/paint/invalidation/clip/clip-with-transform-resize-expected.html deleted 100644 → 0
View file @ 398adf6b
<!DOCTYPE html>
<div id="clip" style="width: 100px; height: 100px; outline: 10px solid black">
ABCDE
</div>
third_party/WebKit/LayoutTests/paint/invalidation/clip/clip-with-transform-resize.html deleted 100644 → 0
View file @ 398adf6b
<!DOCTYPE html>
<style>
div {
isolation: isolate;
}
#clip {
transform: translateZ(0);
outline: 10px solid black;
overflow: hidden;
width: 100px;
height: 10px;
}
</style>
<div id="clip">
<div>
<div>ABCDE</div>
</div>
</div>
<script src="../../../resources/run-after-layout-and-paint.js"></script>
<script>
runAfterLayoutAndPaint(function() {
clip.style.height = '100px';
}, true);
</script>
third_party/WebKit/Source/core/paint/PrePaintTreeWalk.cpp
View file @ 06f31934
...@@ -156,6 +156,10 @@ void PrePaintTreeWalk::InvalidatePaintLayerOptimizationsIfNeeded( ...@@ -156,6 +156,10 @@ void PrePaintTreeWalk::InvalidatePaintLayerOptimizationsIfNeeded(
PaintLayer& paint_layer = *ToLayoutBoxModelObject(object).Layer(); PaintLayer& paint_layer = *ToLayoutBoxModelObject(object).Layer();
// Ignore clips across transform boundaries.
if (object.StyleRef().HasTransform())
context.tree_builder_context->clip_changed = false;
if (!context.tree_builder_context->clip_changed) if (!context.tree_builder_context->clip_changed)
return; return;
...@@ -227,11 +231,6 @@ void PrePaintTreeWalk::Walk(const LayoutObject& object, ...@@ -227,11 +231,6 @@ void PrePaintTreeWalk::Walk(const LayoutObject& object,
PrePaintTreeWalkContext context(parent_context, PrePaintTreeWalkContext context(parent_context,
needs_tree_builder_context_update); needs_tree_builder_context_update);
// Ignore clip changes from ancestor across transform boundaries.
if (object.StyleRef().HasTransform())
context.tree_builder_context->clip_changed = false;
WalkInternal(object, context); WalkInternal(object, context);
for (const LayoutObject* child = object.SlowFirstChild(); child; for (const LayoutObject* child = object.SlowFirstChild(); child;
......
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