Skip to content

Commit 58b7f63

Browse files
author
sunxd
committed
Revert "cc: Enable composited border-radius scrolling."
This reverts commit 06adb5e. Reason for revert: Composited border-radius scrolling triggers two regression bugs: 1) crbug.com/740720, it results in high memory usage probably due to mask tiling not saving enough memory; 2) crbug.com/745114, compositor's scroll snapping can sometimes result in blurry text. Original change's description: > cc: Enable composited border-radius scrolling. > > Enable composited border-radius scrolling as mask tiling is implemented. > We'll revert this CL if anything breaks. > > Bug: 567293, 567296 > Cq-Include-Trybots: master.tryserver.chromium.linux:linux_layout_tests_slimming_paint_v2 > Change-Id: I70bea4c542e00d244a597d1a36857dd120fc96cd > Reviewed-on: https://chromium-review.googlesource.com/543397 > Commit-Queue: Xianda Sun <[email protected]> > Reviewed-by: Chris Harrelson <[email protected]> > Reviewed-by: Robert Flack <[email protected]> > Cr-Commit-Position: refs/heads/master@{#485040} [email protected], [email protected], [email protected], [email protected], [email protected], [email protected] (cherry picked from commit 2397e78) Bug: 567293, 567296, 740720, 745114 Change-Id: Ia185a9ce4310aeaff0175f0e9f0a9080dccf22e5 Cq-Include-Trybots: master.tryserver.chromium.linux:linux_layout_tests_slimming_paint_v2 Reviewed-on: https://chromium-review.googlesource.com/585227 Commit-Queue: Chris Harrelson <[email protected]> Reviewed-by: Chris Harrelson <[email protected]> Reviewed-by: Xianda Sun <[email protected]> Cr-Original-Commit-Position: refs/heads/master@{#489477} Reviewed-on: https://chromium-review.googlesource.com/586949 Cr-Commit-Position: refs/branch-heads/3163@{#61} Cr-Branched-From: ff259ba-refs/heads/master@{#488528}
1 parent 87fcab7 commit 58b7f63

File tree

24 files changed

+60
-31
lines changed

24 files changed

+60
-31
lines changed

‎third_party/WebKit/LayoutTests/compositing/overflow/respect-clip-for-non-composited-scrollers-when-prefering-compositing-over-lcd-text-expected.html‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
<!DOCTYPE HTML>
2+
<style>
3+
#scroller {
4+
width: 100px;
5+
height: 100px;
6+
border: 1px solid black;
7+
overflow: scroll;
8+
border-radius: 1px;
9+
}
10+
11+
#scrolled {
12+
width: 60px;
13+
height: 300px;
14+
border: 1px solid black;
15+
background: papayawhip;
16+
}
17+
18+
#composited {
19+
width: 10px;
20+
height: 10px;
21+
will-change: transform;
22+
background: green;
23+
border: 2px solid orange;
24+
}
25+
</style>
26+
<div id="scroller">
27+
<div id="scrolled"></div>
28+
<div id="composited"></div>
29+
</div>
30+
<script>
31+
if (window.internals)
32+
internals.settings.setPreferCompositingToLCDTextEnabled(false);
33+
</script>

‎third_party/WebKit/LayoutTests/compositing/overflow/respect-clip-for-non-composited-scrollers-when-prefering-compositing-over-lcd-text-expected.png‎

-2.89 KB
Binary file not shown.

‎third_party/WebKit/LayoutTests/compositing/overflow/respect-clip-for-non-composited-scrollers-when-prefering-compositing-over-lcd-text-expected.txt‎

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎third_party/WebKit/LayoutTests/compositing/overflow/scroller-with-border-radius-expected.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
No border radius (should be using composited scrolling): Pass.
2-
Has border radius (should also be using composited scrolling): Pass.
2+
Has border radius (should not be using composited scrolling): Pass.
33

‎third_party/WebKit/LayoutTests/compositing/overflow/scroller-with-border-radius.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,11 @@
4949
document.getElementById("scroller").style.borderRadius = '5px';
5050
requestAnimationFrame(function() {
5151
if (window.internals) {
52-
result += "Has border radius (should also be using composited scrolling): ";
52+
result += "Has border radius (should not be using composited scrolling): ";
5353
if (!isUsingCompositedScrolling(JSON.parse(window.internals.layerTreeAsText(document))))
54-
result += "Fail.\n";
54+
result += "Pass.\n";
5555
else
56-
result += "Pass.\n"
56+
result += "Fail.\n"
5757
}
5858

5959
if (window.testRunner) {

‎third_party/WebKit/LayoutTests/flag-specific/enable-slimming-paint-v2/compositing/overflow/respect-clip-for-non-composited-scrollers-when-prefering-compositing-over-lcd-text-expected.png‎

-2.89 KB
Binary file not shown.

‎third_party/WebKit/LayoutTests/platform/linux/compositing/overflow/nested-border-radius-clipping-expected.png‎

63 Bytes
Loading

‎third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/compositing/overflow/nested-border-radius-clipping-expected.png‎

-11.5 KB
Binary file not shown.

‎third_party/WebKit/LayoutTests/platform/linux/virtual/prefer_compositing_to_lcd_text/compositing/overflow/nested-border-radius-clipping-expected.png‎

63 Bytes
Loading

‎third_party/WebKit/LayoutTests/platform/mac-mac10.9/scrollbars/border-box-rect-clips-scrollbars-expected.png‎

13 Bytes
Loading

0 commit comments

Comments
 (0)