Skip to content

GitLab

T
tangled
Commit c765a859 authored by smcgruer's avatar smcgruer Committed by Commit bot
Browse files
Options

Revert "Disable local background equivalence when we have a box shadow due to painting bug." 

This reverts commit a12e7a00.

BUG=646464

TEST=Visit http://output.jsbin.com/vucefi, confirm that both boxes have
box shadows and the first box has sub-pixel AA text

Review-Url: https://codereview.chromium.org/2561183002
Cr-Commit-Position: refs/heads/master@{#438020}
parent 6140d6c6
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 886 deletions
third_party/WebKit/LayoutTests/compositing/overflow/scrollbar-layer-placement-expected.txt
View file @ c765a859
......@@ -29,6 +29,7 @@
{
"name": "Scrolling Contents Layer",
"bounds": [220, 236],
"contentsOpaque": true,
"drawsContent": true
},
{
......@@ -64,6 +65,7 @@
{
"name": "Scrolling Contents Layer",
"bounds": [220, 236],
"contentsOpaque": true,
"drawsContent": true
},
{
......@@ -113,6 +115,7 @@
{
"name": "Scrolling Contents Layer",
"bounds": [220, 236],
"contentsOpaque": true,
"drawsContent": true
},
{
......@@ -178,6 +181,7 @@
{
"name": "Scrolling Contents Layer",
"bounds": [220, 236],
"contentsOpaque": true,
"drawsContent": true
},
{
......
third_party/WebKit/LayoutTests/platform/android/compositing/overflow/scrollbar-layer-placement-expected.txt deleted 100644 → 0
View file @ 6140d6c6
{
"name": "Content Root Layer",
"bounds": [800, 600],
"children": [
{
"name": "LayoutView #document",
"bounds": [800, 600],
"contentsOpaque": true,
"drawsContent": true,
"children": [
{
"name": "LayoutBlockFlow (positioned) DIV class='outer A'",
"position": [6, 6],
"bounds": [340, 282],
"drawsContent": true,
"children": [
{
"name": "LayoutBlockFlow (relative positioned) DIV class='scroller'",
"position": [32, 32],
"bounds": [278, 218],
"shouldFlattenTransform": false,
"drawsContent": true,
"backgroundColor": "#FFFFFF",
"children": [
{
"name": "Scrolling Layer",
"position": [29, 29],
"bounds": [220, 160],
"shouldFlattenTransform": false,
"children": [
{
"name": "Scrolling Contents Layer",
"bounds": [220, 236],
"drawsContent": true
}
]
},
{
"name": "Overflow Controls Host Layer",
"position": [24, 24],
"bounds": [230, 170],
"children": [
{
"name": "Vertical Scrollbar Layer",
"position": [218, 5],
"bounds": [7, 160]
}
]
}
]
}
]
},
{
"name": "LayoutBlockFlow (positioned) DIV class='outer B'",
"position": [355, 6],
"bounds": [340, 282],
"drawsContent": true,
"children": [
{
"name": "LayoutBlockFlow DIV class='scroller'",
"position": [32, 32],
"bounds": [278, 218],
"shouldFlattenTransform": false,
"drawsContent": true,
"backgroundColor": "#FFFFFF",
"children": [
{
"name": "Scrolling Layer",
"position": [29, 29],
"bounds": [220, 160],
"shouldFlattenTransform": false,
"children": [
{
"name": "Scrolling Contents Layer",
"bounds": [220, 236],
"drawsContent": true
}
]
}
]
},
{
"name": "LayoutBlockFlow (relative positioned) DIV class='content'",
"position": [73, 73],
"bounds": [196, 212],
"contentsOpaque": true,
"drawsContent": true,
"backgroundColor": "#DDDDDD"
},
{
"name": "Overflow Controls Host Layer",
"position": [56, 56],
"bounds": [230, 170],
"children": [
{
"name": "Vertical Scrollbar Layer",
"position": [218, 5],
"bounds": [7, 160]
}
]
}
]
},
{
"name": "LayoutBlockFlow (positioned) DIV class='outer C'",
"position": [6, 297],
"bounds": [340, 282],
"drawsContent": true,
"children": [
{
"name": "Ancestor Clipping Layer",
"position": [40, 40],
"bounds": [260, 100],
"shouldFlattenTransform": false,
"children": [
{
"name": "LayoutBlockFlow DIV class='scroller'",
"position": [-9, -9],
"bounds": [278, 218],
"shouldFlattenTransform": false,
"drawsContent": true,
"backgroundColor": "#FFFFFF",
"children": [
{
"name": "Scrolling Layer",
"position": [29, 29],
"bounds": [220, 160],
"shouldFlattenTransform": false,
"children": [
{
"name": "Scrolling Contents Layer",
"bounds": [220, 236],
"drawsContent": true
}
]
}
]
}
]
},
{
"name": "LayoutBlockFlow (relative positioned) DIV class='content'",
"position": [72, 72],
"bounds": [196, 212],
"contentsOpaque": true,
"drawsContent": true,
"backgroundColor": "#DDDDDD"
},
{
"name": "Overflow Controls Ancestor Clipping Layer",
"position": [40, 40],
"bounds": [260, 100],
"children": [
{
"name": "Overflow Controls Host Layer",
"position": [15, 15],
"bounds": [230, 170],
"children": [
{
"name": "Vertical Scrollbar Layer",
"position": [218, 5],
"bounds": [7, 160]
}
]
}
]
}
]
},
{
"name": "LayoutBlockFlow (positioned) DIV class='outer D'",
"position": [355, 297],
"bounds": [340, 282],
"drawsContent": true,
"children": [
{
"name": "LayoutBlockFlow (relative positioned) DIV class='clipper'",
"position": [24, 24],
"bounds": [292, 200],
"drawsContent": true,
"children": [
{
"name": "Child Containment Layer",
"position": [10, 10],
"bounds": [272, 180],
"children": [
{
"name": "Ancestor Clipping Layer",
"position": [6, 6],
"bounds": [260, 100],
"shouldFlattenTransform": false,
"children": [
{
"name": "LayoutBlockFlow DIV class='scroller'",
"position": [-9, -9],
"bounds": [278, 218],
"shouldFlattenTransform": false,
"drawsContent": true,
"backgroundColor": "#FFFFFF",
"children": [
{
"name": "Scrolling Layer",
"position": [29, 29],
"bounds": [220, 160],
"shouldFlattenTransform": false,
"children": [
{
"name": "Scrolling Contents Layer",
"bounds": [220, 236],
"drawsContent": true
}
]
}
]
}
]
}
]
}
]
},
{
"name": "LayoutBlockFlow (relative positioned) DIV class='content'",
"position": [72, 72],
"bounds": [196, 212],
"contentsOpaque": true,
"drawsContent": true,
"backgroundColor": "#DDDDDD"
},
{
"name": "Overflow Controls Ancestor Clipping Layer",
"position": [40, 40],
"bounds": [260, 100],
"children": [
{
"name": "Overflow Controls Host Layer",
"position": [15, 15],
"bounds": [230, 170],
"children": [
{
"name": "Vertical Scrollbar Layer",
"position": [218, 5],
"bounds": [7, 160]
}
]
}
]
}
]
}
]
}
]
}
third_party/WebKit/LayoutTests/platform/mac-mac10.10/virtual/prefer_compositing_to_lcd_text/compositing/overflow/scrollbar-layer-placement-expected.txt deleted 100644 → 0
View file @ 6140d6c6
{
"layers": [
{
"name": "LayoutView #document",
"bounds": [800, 600],
"contentsOpaque": true,
"drawsContent": true
},
{
"name": "LayoutBlockFlow (positioned) DIV class='outer A'",
"position": [6, 6],
"bounds": [340, 282],
"drawsContent": true
},
{
"name": "LayoutBlockFlow (relative positioned) DIV class='scroller'",
"position": [32, 32],
"bounds": [278, 218],
"shouldFlattenTransform": false,
"drawsContent": true,
"backgroundColor": "#FFFFFF"
},
{
"name": "Scrolling Layer",
"position": [29, 29],
"bounds": [220, 160],
"shouldFlattenTransform": false
},
{
"name": "Scrolling Contents Layer",
"bounds": [220, 236],
"drawsContent": true
},
{
"name": "Overflow Controls Host Layer",
"position": [24, 24],
"bounds": [230, 170]
},
{
"name": "Vertical Scrollbar Layer",
"position": [218, 5],
"bounds": [7, 160]
},
{
"name": "LayoutBlockFlow (positioned) DIV class='outer B'",
"position": [355, 6],
"bounds": [340, 282],
"drawsContent": true
},
{
"name": "LayoutBlockFlow DIV class='scroller'",
"position": [32, 32],
"bounds": [278, 218],
"shouldFlattenTransform": false,
"drawsContent": true,
"backgroundColor": "#FFFFFF"
},
{
"name": "Scrolling Layer",
"position": [29, 29],
"bounds": [220, 160],
"shouldFlattenTransform": false
},
{
"name": "Scrolling Contents Layer",
"bounds": [220, 236],
"drawsContent": true
},
{
"name": "LayoutBlockFlow (relative positioned) DIV class='content'",
"position": [73, 73],
"bounds": [196, 212],
"contentsOpaque": true,
"drawsContent": true,
"backgroundColor": "#DDDDDD"
},
{
"name": "Overflow Controls Host Layer",
"position": [56, 56],
"bounds": [230, 170]
},
{
"name": "Vertical Scrollbar Layer",
"position": [218, 5],
"bounds": [7, 160]
},
{
"name": "LayoutBlockFlow (positioned) DIV class='outer C'",
"position": [6, 297],
"bounds": [340, 282],
"drawsContent": true
},
{
"name": "Ancestor Clipping Layer",
"position": [40, 40],
"bounds": [260, 100],
"shouldFlattenTransform": false
},
{
"name": "LayoutBlockFlow DIV class='scroller'",
"position": [-9, -9],
"bounds": [278, 218],
"shouldFlattenTransform": false,
"drawsContent": true,
"backgroundColor": "#FFFFFF"
},
{
"name": "Scrolling Layer",
"position": [29, 29],
"bounds": [220, 160],
"shouldFlattenTransform": false
},
{
"name": "Scrolling Contents Layer",
"bounds": [220, 236],
"drawsContent": true
},
{
"name": "LayoutBlockFlow (relative positioned) DIV class='content'",
"position": [72, 72],
"bounds": [196, 212],
"contentsOpaque": true,
"drawsContent": true,
"backgroundColor": "#DDDDDD"
},
{
"name": "Overflow Controls Ancestor Clipping Layer",
"position": [40, 40],
"bounds": [260, 100]
},
{
"name": "Overflow Controls Host Layer",
"position": [15, 15],
"bounds": [230, 170]
},
{
"name": "Vertical Scrollbar Layer",
"position": [218, 5],
"bounds": [7, 160]
},
{
"name": "LayoutBlockFlow (positioned) DIV class='outer D'",
"position": [355, 297],
"bounds": [340, 282],
"drawsContent": true
},
{
"name": "LayoutBlockFlow (relative positioned) DIV class='clipper'",
"position": [24, 24],
"bounds": [292, 200],
"drawsContent": true
},
{
"name": "Child Containment Layer",
"position": [10, 10],
"bounds": [272, 180]
},
{
"name": "Ancestor Clipping Layer",
"position": [6, 6],
"bounds": [260, 100],
"shouldFlattenTransform": false
},
{
"name": "LayoutBlockFlow DIV class='scroller'",
"position": [-9, -9],
"bounds": [278, 218],
"shouldFlattenTransform": false,
"drawsContent": true,
"backgroundColor": "#FFFFFF"
},
{
"name": "Scrolling Layer",
"position": [29, 29],
"bounds": [220, 160],
"shouldFlattenTransform": false
},
{
"name": "Scrolling Contents Layer",
"bounds": [220, 236],
"drawsContent": true
},
{
"name": "LayoutBlockFlow (relative positioned) DIV class='content'",
"position": [72, 72],
"bounds": [196, 212],
"contentsOpaque": true,
"drawsContent": true,
"backgroundColor": "#DDDDDD"
},
{
"name": "Overflow Controls Ancestor Clipping Layer",
"position": [40, 40],
"bounds": [260, 100]
},
{
"name": "Overflow Controls Host Layer",
"position": [15, 15],
"bounds": [230, 170]
},
{
"name": "Vertical Scrollbar Layer",
"position": [218, 5],
"bounds": [7, 160]
}
]
}
third_party/WebKit/LayoutTests/platform/mac-retina/virtual/prefer_compositing_to_lcd_text/compositing/overflow/scrollbar-layer-placement-expected.txt deleted 100644 → 0
View file @ 6140d6c6
{
"layers": [
{
"name": "LayoutView #document",
"bounds": [800, 600],
"contentsOpaque": true,
"drawsContent": true
},
{
"name": "LayoutBlockFlow (positioned) DIV class='outer A'",
"position": [6, 6],
"bounds": [340, 282],
"drawsContent": true
},
{
"name": "LayoutBlockFlow (relative positioned) DIV class='scroller'",
"position": [32, 32],
"bounds": [278, 218],
"shouldFlattenTransform": false,
"drawsContent": true,
"backgroundColor": "#FFFFFF"
},
{
"name": "Scrolling Layer",
"position": [29, 29],
"bounds": [220, 160],
"shouldFlattenTransform": false
},
{
"name": "Scrolling Contents Layer",
"bounds": [220, 236],
"drawsContent": true
},
{
"name": "Overflow Controls Host Layer",
"position": [24, 24],
"bounds": [230, 170]
},
{
"name": "Vertical Scrollbar Layer",
"position": [218, 5],
"bounds": [7, 160]
},
{
"name": "LayoutBlockFlow (positioned) DIV class='outer B'",
"position": [355, 6],
"bounds": [340, 282],
"drawsContent": true
},
{
"name": "LayoutBlockFlow DIV class='scroller'",
"position": [32, 32],
"bounds": [278, 218],
"shouldFlattenTransform": false,
"drawsContent": true,
"backgroundColor": "#FFFFFF"
},
{
"name": "Scrolling Layer",
"position": [29, 29],
"bounds": [220, 160],
"shouldFlattenTransform": false
},
{
"name": "Scrolling Contents Layer",
"bounds": [220, 236],
"drawsContent": true
},
{
"name": "LayoutBlockFlow (relative positioned) DIV class='content'",
"position": [73, 73],
"bounds": [196, 212],
"contentsOpaque": true,
"drawsContent": true,
"backgroundColor": "#DDDDDD"
},
{
"name": "Overflow Controls Host Layer",
"position": [56, 56],
"bounds": [230, 170]
},
{
"name": "Vertical Scrollbar Layer",
"position": [218, 5],
"bounds": [7, 160]
},
{
"name": "LayoutBlockFlow (positioned) DIV class='outer C'",
"position": [6, 297],
"bounds": [340, 282],
"drawsContent": true
},
{
"name": "Ancestor Clipping Layer",
"position": [40, 40],
"bounds": [260, 100],
"shouldFlattenTransform": false
},
{
"name": "LayoutBlockFlow DIV class='scroller'",
"position": [-9, -9],
"bounds": [278, 218],
"shouldFlattenTransform": false,
"drawsContent": true,
"backgroundColor": "#FFFFFF"
},
{
"name": "Scrolling Layer",
"position": [29, 29],
"bounds": [220, 160],
"shouldFlattenTransform": false
},
{
"name": "Scrolling Contents Layer",
"bounds": [220, 236],
"drawsContent": true
},
{
"name": "LayoutBlockFlow (relative positioned) DIV class='content'",
"position": [72, 72],
"bounds": [196, 212],
"contentsOpaque": true,
"drawsContent": true,
"backgroundColor": "#DDDDDD"
},
{
"name": "Overflow Controls Ancestor Clipping Layer",
"position": [40, 40],
"bounds": [260, 100]
},
{
"name": "Overflow Controls Host Layer",
"position": [15, 15],
"bounds": [230, 170]
},
{
"name": "Vertical Scrollbar Layer",
"position": [218, 5],
"bounds": [7, 160]
},
{
"name": "LayoutBlockFlow (positioned) DIV class='outer D'",
"position": [355, 297],
"bounds": [340, 282],
"drawsContent": true
},
{
"name": "LayoutBlockFlow (relative positioned) DIV class='clipper'",
"position": [24, 24],
"bounds": [292, 200],
"drawsContent": true
},
{
"name": "Child Containment Layer",
"position": [10, 10],
"bounds": [272, 180]
},
{
"name": "Ancestor Clipping Layer",
"position": [6, 6],
"bounds": [260, 100],
"shouldFlattenTransform": false
},
{
"name": "LayoutBlockFlow DIV class='scroller'",
"position": [-9, -9],
"bounds": [278, 218],
"shouldFlattenTransform": false,
"drawsContent": true,
"backgroundColor": "#FFFFFF"
},
{
"name": "Scrolling Layer",
"position": [29, 29],
"bounds": [220, 160],
"shouldFlattenTransform": false
},
{
"name": "Scrolling Contents Layer",
"bounds": [220, 236],
"drawsContent": true
},
{
"name": "LayoutBlockFlow (relative positioned) DIV class='content'",
"position": [72, 72],
"bounds": [196, 212],
"contentsOpaque": true,
"drawsContent": true,
"backgroundColor": "#DDDDDD"
},
{
"name": "Overflow Controls Ancestor Clipping Layer",
"position": [40, 40],
"bounds": [260, 100]
},
{
"name": "Overflow Controls Host Layer",
"position": [15, 15],
"bounds": [230, 170]
},
{
"name": "Vertical Scrollbar Layer",
"position": [218, 5],
"bounds": [7, 160]
}
]
}
third_party/WebKit/LayoutTests/platform/win/virtual/prefer_compositing_to_lcd_text/compositing/overflow/scrollbar-layer-placement-expected.txt deleted 100644 → 0
View file @ 6140d6c6
{
"layers": [
{
"name": "LayoutView #document",
"bounds": [800, 600],
"contentsOpaque": true,
"drawsContent": true
},
{
"name": "LayoutBlockFlow (positioned) DIV class='outer A'",
"position": [6, 6],
"bounds": [340, 282],
"drawsContent": true
},
{
"name": "LayoutBlockFlow (relative positioned) DIV class='scroller'",
"position": [32, 32],
"bounds": [278, 218],
"shouldFlattenTransform": false,
"drawsContent": true,
"backgroundColor": "#FFFFFF"
},
{
"name": "Scrolling Layer",
"position": [29, 29],
"bounds": [220, 160],
"shouldFlattenTransform": false
},
{
"name": "Scrolling Contents Layer",
"bounds": [220, 236],
"drawsContent": true
},
{
"name": "Overflow Controls Host Layer",
"position": [24, 24],
"bounds": [230, 170]
},
{
"name": "Vertical Scrollbar Layer",
"position": [218, 5],
"bounds": [7, 160]
},
{
"name": "LayoutBlockFlow (positioned) DIV class='outer B'",
"position": [355, 6],
"bounds": [340, 282],
"drawsContent": true
},
{
"name": "LayoutBlockFlow DIV class='scroller'",
"position": [32, 32],
"bounds": [278, 218],
"shouldFlattenTransform": false,
"drawsContent": true,
"backgroundColor": "#FFFFFF"
},
{
"name": "Scrolling Layer",
"position": [29, 29],
"bounds": [220, 160],
"shouldFlattenTransform": false
},
{
"name": "Scrolling Contents Layer",
"bounds": [220, 236],
"drawsContent": true
},
{
"name": "LayoutBlockFlow (relative positioned) DIV class='content'",
"position": [73, 73],
"bounds": [196, 212],
"contentsOpaque": true,
"drawsContent": true,
"backgroundColor": "#DDDDDD"
},
{
"name": "Overflow Controls Host Layer",
"position": [56, 56],
"bounds": [230, 170]
},
{
"name": "Vertical Scrollbar Layer",
"position": [218, 5],
"bounds": [7, 160]
},
{
"name": "LayoutBlockFlow (positioned) DIV class='outer C'",
"position": [6, 297],
"bounds": [340, 282],
"drawsContent": true
},
{
"name": "Ancestor Clipping Layer",
"position": [40, 40],
"bounds": [260, 100],
"shouldFlattenTransform": false
},
{
"name": "LayoutBlockFlow DIV class='scroller'",
"position": [-9, -9],
"bounds": [278, 218],
"shouldFlattenTransform": false,
"drawsContent": true,
"backgroundColor": "#FFFFFF"
},
{
"name": "Scrolling Layer",
"position": [29, 29],
"bounds": [220, 160],
"shouldFlattenTransform": false
},
{
"name": "Scrolling Contents Layer",
"bounds": [220, 236],
"drawsContent": true
},
{
"name": "LayoutBlockFlow (relative positioned) DIV class='content'",
"position": [72, 72],
"bounds": [196, 212],
"contentsOpaque": true,
"drawsContent": true,
"backgroundColor": "#DDDDDD"
},
{
"name": "Overflow Controls Ancestor Clipping Layer",
"position": [40, 40],
"bounds": [260, 100]
},
{
"name": "Overflow Controls Host Layer",
"position": [15, 15],
"bounds": [230, 170]
},
{
"name": "Vertical Scrollbar Layer",
"position": [218, 5],
"bounds": [7, 160]
},
{
"name": "LayoutBlockFlow (positioned) DIV class='outer D'",
"position": [355, 297],
"bounds": [340, 282],
"drawsContent": true
},
{
"name": "LayoutBlockFlow (relative positioned) DIV class='clipper'",
"position": [24, 24],
"bounds": [292, 200],
"drawsContent": true
},
{
"name": "Child Containment Layer",
"position": [10, 10],
"bounds": [272, 180]
},
{
"name": "Ancestor Clipping Layer",
"position": [6, 6],
"bounds": [260, 100],
"shouldFlattenTransform": false
},
{
"name": "LayoutBlockFlow DIV class='scroller'",
"position": [-9, -9],
"bounds": [278, 218],
"shouldFlattenTransform": false,
"drawsContent": true,
"backgroundColor": "#FFFFFF"
},
{
"name": "Scrolling Layer",
"position": [29, 29],
"bounds": [220, 160],
"shouldFlattenTransform": false
},
{
"name": "Scrolling Contents Layer",
"bounds": [220, 236],
"drawsContent": true
},
{
"name": "LayoutBlockFlow (relative positioned) DIV class='content'",
"position": [72, 72],
"bounds": [196, 212],
"contentsOpaque": true,
"drawsContent": true,
"backgroundColor": "#DDDDDD"
},
{
"name": "Overflow Controls Ancestor Clipping Layer",
"position": [40, 40],
"bounds": [260, 100]
},
{
"name": "Overflow Controls Host Layer",
"position": [15, 15],
"bounds": [230, 170]
},
{
"name": "Vertical Scrollbar Layer",
"position": [218, 5],
"bounds": [7, 160]
}
]
}
third_party/WebKit/Source/core/layout/LayoutBoxModelObject.cpp
View file @ c765a859
......@@ -129,12 +129,6 @@ BackgroundPaintLocation LayoutBoxModelObject::backgroundPaintLocation() const {
if (!style()->hasAutoClip())
return BackgroundPaintInGraphicsLayer;
// TODO(flackr): Remove this when box shadows are still painted correctly when
// painting into the composited scrolling contents layer.
// https://crbug.com/646464
if (style()->boxShadow())
return BackgroundPaintInGraphicsLayer;
// Assume optimistically that the background can be painted in the scrolling
// contents until we find otherwise.
BackgroundPaintLocation paintLocation = BackgroundPaintInScrollingContents;
......
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