summaryrefslogtreecommitdiffstats
path: root/third_party/WebKit/LayoutTests/platform/win/compositing
diff options
context:
space:
mode:
authorwangxianzhu@chromium.org <wangxianzhu@chromium.org>2014-09-16 21:28:44 +0000
committerwangxianzhu@chromium.org <wangxianzhu@chromium.org>2014-09-16 21:28:44 +0000
commit3c532da04bddcac2c394426cd299173f42b2c56b (patch)
tree607e656a73c66c02c99699d6d9643966c56c404d /third_party/WebKit/LayoutTests/platform/win/compositing
parentc0021a54492fd5a27962d49d7f176b8ae59e4cbf (diff)
downloadchromium_src-3c532da04bddcac2c394426cd299173f42b2c56b.zip
chromium_src-3c532da04bddcac2c394426cd299173f42b2c56b.tar.gz
chromium_src-3c532da04bddcac2c394426cd299173f42b2c56b.tar.bz2
Auto-rebaseline for r182077
http://src.chromium.org/viewvc/blink?view=revision&revision=182077 BUG=390125 TBR=aberent@chromium.org Review URL: https://codereview.chromium.org/561273005 git-svn-id: svn://svn.chromium.org/blink/trunk@182103 bbb929c8-8fbe-4397-9dbb-9b2b20218538
Diffstat (limited to 'third_party/WebKit/LayoutTests/platform/win/compositing')
-rw-r--r--third_party/WebKit/LayoutTests/platform/win/compositing/geometry/video-fixed-scrolling-expected.txt5
-rw-r--r--third_party/WebKit/LayoutTests/platform/win/compositing/geometry/video-opacity-overlay-expected.txt5
-rw-r--r--third_party/WebKit/LayoutTests/platform/win/compositing/layers-inside-overflow-scroll-expected.txt5
-rw-r--r--third_party/WebKit/LayoutTests/platform/win/compositing/overflow/overflow-compositing-descendant-expected.txt5
-rw-r--r--third_party/WebKit/LayoutTests/platform/win/compositing/overflow/scroll-ancestor-update-expected.txt5
-rw-r--r--third_party/WebKit/LayoutTests/platform/win/compositing/reflections/load-video-in-reflection-expected.txt5
-rw-r--r--third_party/WebKit/LayoutTests/platform/win/compositing/self-painting-layers-expected.txt5
-rw-r--r--third_party/WebKit/LayoutTests/platform/win/compositing/video-frame-size-change-expected.txt10
-rw-r--r--third_party/WebKit/LayoutTests/platform/win/compositing/video/video-poster-expected.txt13
9 files changed, 56 insertions, 2 deletions
diff --git a/third_party/WebKit/LayoutTests/platform/win/compositing/geometry/video-fixed-scrolling-expected.txt b/third_party/WebKit/LayoutTests/platform/win/compositing/geometry/video-fixed-scrolling-expected.txt
index 5ce7dc9..b2ae2b8 100644
--- a/third_party/WebKit/LayoutTests/platform/win/compositing/geometry/video-fixed-scrolling-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/compositing/geometry/video-fixed-scrolling-expected.txt
@@ -10,6 +10,11 @@ layer at (0,0) size 785x1016
text run at (0,0) width 453: "The blue bar should be in front of the video, and at the top of the page."
layer at (8,88) size 400x300
RenderVideo {VIDEO} at (0,80) size 400x300
+layer at (8,88) size 400x300
+ RenderFlexibleBox {DIV} at (0,0) size 400x300
+ RenderBlock {DIV} at (0,265) size 400x35
+layer at (8,88) size 400x265
+ RenderFlexibleBox {DIV} at (0,0) size 400x265
layer at (0,50) size 500x60
RenderBlock (positioned) {DIV} at (0,0) size 500x60 [bgcolor=#0000FFCC]
scrolled to 0,50
diff --git a/third_party/WebKit/LayoutTests/platform/win/compositing/geometry/video-opacity-overlay-expected.txt b/third_party/WebKit/LayoutTests/platform/win/compositing/geometry/video-opacity-overlay-expected.txt
index 0dd132f..7a1ff29 100644
--- a/third_party/WebKit/LayoutTests/platform/win/compositing/geometry/video-opacity-overlay-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/compositing/geometry/video-opacity-overlay-expected.txt
@@ -12,6 +12,11 @@ layer at (8,50) size 402x302
RenderText {#text} at (0,0) size 0x0
layer at (9,51) size 400x300
RenderVideo {VIDEO} at (0,0) size 400x300
+layer at (9,51) size 400x300
+ RenderFlexibleBox {DIV} at (0,0) size 400x300
+ RenderBlock {DIV} at (0,265) size 400x35
+layer at (9,51) size 400x265
+ RenderFlexibleBox {DIV} at (0,0) size 400x265
layer at (9,355) size 10x10 transparent
RenderBlock {DIV} at (1,305) size 10x10 [bgcolor=#008000]
layer at (9,291) size 400x60
diff --git a/third_party/WebKit/LayoutTests/platform/win/compositing/layers-inside-overflow-scroll-expected.txt b/third_party/WebKit/LayoutTests/platform/win/compositing/layers-inside-overflow-scroll-expected.txt
index fc1b3ac..317328b 100644
--- a/third_party/WebKit/LayoutTests/platform/win/compositing/layers-inside-overflow-scroll-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/compositing/layers-inside-overflow-scroll-expected.txt
@@ -13,3 +13,8 @@ layer at (19,51) size 300x200
layer at (18,266) size 302x152 clip at (19,267) size 285x150 scrollY 100 scrollHeight 500
RenderBlock {DIV} at (10,250) size 302x152 [border: (1px solid #000000)]
RenderBlock {DIV} at (1,1) size 285x500
+layer at (19,51) size 300x200
+ RenderFlexibleBox {DIV} at (0,0) size 300x200
+ RenderBlock {DIV} at (0,165) size 300x35
+layer at (19,51) size 300x165
+ RenderFlexibleBox {DIV} at (0,0) size 300x165
diff --git a/third_party/WebKit/LayoutTests/platform/win/compositing/overflow/overflow-compositing-descendant-expected.txt b/third_party/WebKit/LayoutTests/platform/win/compositing/overflow/overflow-compositing-descendant-expected.txt
index de27c1d..facc6b3 100644
--- a/third_party/WebKit/LayoutTests/platform/win/compositing/overflow/overflow-compositing-descendant-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/compositing/overflow/overflow-compositing-descendant-expected.txt
@@ -13,5 +13,10 @@ layer at (8,50) size 132x222 clip at (9,51) size 130x220 scrollHeight 224
RenderBlock {DIV} at (11,115) size 100x100 [bgcolor=#FF0000]
layer at (19,61) size 100x100
RenderVideo {VIDEO} at (0,0) size 100x100 [bgcolor=#000000]
+layer at (19,61) size 100x100
+ RenderFlexibleBox {DIV} at (0,0) size 100x100
+ RenderBlock {DIV} at (0,65) size 100x35
+layer at (19,61) size 100x65
+ RenderFlexibleBox {DIV} at (0,0) size 100x65
layer at (19,165) size 100x100
RenderBlock (relative positioned) {DIV} at (11,115) size 100x100 [bgcolor=#008000]
diff --git a/third_party/WebKit/LayoutTests/platform/win/compositing/overflow/scroll-ancestor-update-expected.txt b/third_party/WebKit/LayoutTests/platform/win/compositing/overflow/scroll-ancestor-update-expected.txt
index 936dbb4..83f2530 100644
--- a/third_party/WebKit/LayoutTests/platform/win/compositing/overflow/scroll-ancestor-update-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/compositing/overflow/scroll-ancestor-update-expected.txt
@@ -20,3 +20,8 @@ layer at (50,50) size 202x202 clip at (51,51) size 185x200 scrollY 50 scrollHeig
RenderBlock {DIV} at (1,51) size 185x500
layer at (51,51) size 100x100
RenderBlock (relative positioned) {DIV} at (0,0) size 100x100 [bgcolor=#008000]
+layer at (0,0) size 100x100
+ RenderFlexibleBox {DIV} at (0,0) size 100x100
+ RenderBlock {DIV} at (0,65) size 100x35
+layer at (0,0) size 100x65
+ RenderFlexibleBox {DIV} at (0,0) size 100x65
diff --git a/third_party/WebKit/LayoutTests/platform/win/compositing/reflections/load-video-in-reflection-expected.txt b/third_party/WebKit/LayoutTests/platform/win/compositing/reflections/load-video-in-reflection-expected.txt
index 82d28b5..0eda5ee 100644
--- a/third_party/WebKit/LayoutTests/platform/win/compositing/reflections/load-video-in-reflection-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/compositing/reflections/load-video-in-reflection-expected.txt
@@ -11,3 +11,8 @@ layer at (8,50) size 300x292
RenderText {#text} at (0,0) size 0x0
layer at (8,50) size 352x288
RenderVideo {VIDEO} at (0,0) size 352x288 [bgcolor=#FF0000]
+layer at (8,50) size 352x288
+ RenderFlexibleBox {DIV} at (0,0) size 352x288
+ RenderBlock {DIV} at (0,253) size 352x35
+layer at (8,50) size 352x253
+ RenderFlexibleBox {DIV} at (0,0) size 352x253
diff --git a/third_party/WebKit/LayoutTests/platform/win/compositing/self-painting-layers-expected.txt b/third_party/WebKit/LayoutTests/platform/win/compositing/self-painting-layers-expected.txt
index d933538..862fbc7 100644
--- a/third_party/WebKit/LayoutTests/platform/win/compositing/self-painting-layers-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/compositing/self-painting-layers-expected.txt
@@ -21,3 +21,8 @@ layer at (18,266) size 302x152 clip at (19,267) size 285x150 scrollY 24 scrollHe
RenderBR {BR} at (47,54) size 1x36
RenderText {#text} at (0,102) size 64x36
text run at (0,102) width 64: "here."
+layer at (19,51) size 300x200
+ RenderFlexibleBox {DIV} at (0,0) size 300x200
+ RenderBlock {DIV} at (0,165) size 300x35
+layer at (19,51) size 300x165
+ RenderFlexibleBox {DIV} at (0,0) size 300x165
diff --git a/third_party/WebKit/LayoutTests/platform/win/compositing/video-frame-size-change-expected.txt b/third_party/WebKit/LayoutTests/platform/win/compositing/video-frame-size-change-expected.txt
index 22c7c6b..5c5f389 100644
--- a/third_party/WebKit/LayoutTests/platform/win/compositing/video-frame-size-change-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/compositing/video-frame-size-change-expected.txt
@@ -15,3 +15,13 @@ layer at (8,50) size 320x180
RenderVideo {VIDEO} at (0,0) size 320x180
layer at (332,50) size 320x180
RenderVideo {VIDEO} at (324,0) size 320x180
+layer at (8,50) size 320x180
+ RenderFlexibleBox {DIV} at (0,0) size 320x180
+ RenderBlock {DIV} at (0,145) size 320x35
+layer at (8,50) size 320x145
+ RenderFlexibleBox {DIV} at (0,0) size 320x145
+layer at (332,50) size 320x180
+ RenderFlexibleBox {DIV} at (0,0) size 320x180
+ RenderBlock {DIV} at (0,145) size 320x35
+layer at (332,50) size 320x145
+ RenderFlexibleBox {DIV} at (0,0) size 320x145
diff --git a/third_party/WebKit/LayoutTests/platform/win/compositing/video/video-poster-expected.txt b/third_party/WebKit/LayoutTests/platform/win/compositing/video/video-poster-expected.txt
index 54613c6..a2839c7 100644
--- a/third_party/WebKit/LayoutTests/platform/win/compositing/video/video-poster-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/compositing/video/video-poster-expected.txt
@@ -37,8 +37,17 @@ Case: Displaying movie
"drawsContent": true,
"children": [
{
- "position": [8, 8],
- "bounds": [352, 288]
+ "children": [
+ {
+ "position": [8, 8],
+ "bounds": [352, 288]
+ },
+ {
+ "position": [8, 8],
+ "bounds": [352, 288],
+ "drawsContent": true
+ }
+ ]
}
]
}