summaryrefslogtreecommitdiffstats
path: root/third_party/WebKit/LayoutTests/platform/win/compositing
diff options
context:
space:
mode:
authorpdr@chromium.org <pdr@chromium.org>2015-04-24 16:25:37 +0000
committerpdr@chromium.org <pdr@chromium.org>2015-04-24 16:25:37 +0000
commit55be3525ecda92436c0e8ddff643f978ce11fde8 (patch)
tree4816deb91e6de86409d8adcd3acd773ebfb9617e /third_party/WebKit/LayoutTests/platform/win/compositing
parent8044a9f58c9b870ba33db2587c20d10359bafb2c (diff)
downloadchromium_src-55be3525ecda92436c0e8ddff643f978ce11fde8.zip
chromium_src-55be3525ecda92436c0e8ddff643f978ce11fde8.tar.gz
chromium_src-55be3525ecda92436c0e8ddff643f978ce11fde8.tar.bz2
Auto-rebaseline for r194315
http://src.chromium.org/viewvc/blink?view=revision&revision=194315 BUG=463967 TBR=dsinclair@chromium.org Review URL: https://codereview.chromium.org/1088513007 git-svn-id: svn://svn.chromium.org/blink/trunk@194407 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.txt4
-rw-r--r--third_party/WebKit/LayoutTests/platform/win/compositing/geometry/video-opacity-overlay-expected.txt4
-rw-r--r--third_party/WebKit/LayoutTests/platform/win/compositing/layers-inside-overflow-scroll-expected.txt4
-rw-r--r--third_party/WebKit/LayoutTests/platform/win/compositing/overflow/overflow-compositing-descendant-expected.txt4
-rw-r--r--third_party/WebKit/LayoutTests/platform/win/compositing/overflow/scroll-ancestor-update-expected.txt4
-rw-r--r--third_party/WebKit/LayoutTests/platform/win/compositing/reflections/load-video-in-reflection-expected.txt4
-rw-r--r--third_party/WebKit/LayoutTests/platform/win/compositing/self-painting-layers-expected.txt4
-rw-r--r--third_party/WebKit/LayoutTests/platform/win/compositing/video-frame-size-change-expected.txt8
8 files changed, 18 insertions, 18 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 c41a5e5..4a32cdf 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
@@ -11,10 +11,10 @@ layer at (0,0) size 785x1016 backgroundClip at (0,0) size 785x600 clip at (0,0)
layer at (8,88) size 400x300
LayoutVideo {VIDEO} at (0,80) size 400x300
layer at (8,88) size 400x300
- LayoutFlexibleBox {DIV} at (0,0) size 400x300
+ LayoutFlexibleBox (relative positioned) {DIV} at (0,0) size 400x300
LayoutBlockFlow {DIV} at (0,265) size 400x35
layer at (8,88) size 400x265
- LayoutFlexibleBox {DIV} at (0,0) size 400x265
+ LayoutFlexibleBox (relative positioned) {DIV} at (0,0) size 400x265
layer at (0,50) size 500x60
LayoutBlockFlow (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 043c3e7..e4ca448 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
@@ -13,10 +13,10 @@ layer at (8,50) size 402x302
layer at (9,51) size 400x300
LayoutVideo {VIDEO} at (0,0) size 400x300
layer at (9,51) size 400x300
- LayoutFlexibleBox {DIV} at (0,0) size 400x300
+ LayoutFlexibleBox (relative positioned) {DIV} at (0,0) size 400x300
LayoutBlockFlow {DIV} at (0,265) size 400x35
layer at (9,51) size 400x265
- LayoutFlexibleBox {DIV} at (0,0) size 400x265
+ LayoutFlexibleBox (relative positioned) {DIV} at (0,0) size 400x265
layer at (9,355) size 10x10 transparent
LayoutBlockFlow {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 4a1be05..856afda 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
@@ -14,9 +14,9 @@ layer at (18,266) size 302x152 clip at (19,267) size 285x150 scrollY 100.00 scro
LayoutBlockFlow {DIV} at (10,250) size 302x152 [border: (1px solid #000000)]
LayoutBlockFlow {DIV} at (1,1) size 285x500
layer at (19,51) size 300x200
- LayoutFlexibleBox {DIV} at (0,0) size 300x200
+ LayoutFlexibleBox (relative positioned) {DIV} at (0,0) size 300x200
LayoutBlockFlow {DIV} at (0,165) size 300x35
layer at (19,51) size 300x165
- LayoutFlexibleBox {DIV} at (0,0) size 300x165
+ LayoutFlexibleBox (relative positioned) {DIV} at (0,0) size 300x165
layer at (19,167) size 100x100 backgroundClip at (19,267) size 285x150 clip at (19,267) size 285x150 outlineClip at (19,267) size 285x150
LayoutBlockFlow {DIV} at (0,0) size 100x100 [bgcolor=#FF0000]
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 6e19163..05ecd78 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
@@ -14,9 +14,9 @@ layer at (8,50) size 132x222 clip at (9,51) size 130x220 scrollHeight 224
layer at (19,61) size 100x100
LayoutVideo {VIDEO} at (0,0) size 100x100 [bgcolor=#000000]
layer at (19,61) size 100x100
- LayoutFlexibleBox {DIV} at (0,0) size 100x100
+ LayoutFlexibleBox (relative positioned) {DIV} at (0,0) size 100x100
LayoutBlockFlow {DIV} at (0,65) size 100x35
layer at (19,61) size 100x65
- LayoutFlexibleBox {DIV} at (0,0) size 100x65
+ LayoutFlexibleBox (relative positioned) {DIV} at (0,0) size 100x65
layer at (19,165) size 100x100
LayoutBlockFlow (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 c7ef9e6..2465e15 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
@@ -21,7 +21,7 @@ layer at (50,50) size 202x202 clip at (51,51) size 185x200 scrollY 50.00 scrollH
layer at (51,51) size 100x100
LayoutBlockFlow (relative positioned) {DIV} at (0,0) size 100x100 [bgcolor=#008000]
layer at (0,0) size 100x100
- LayoutFlexibleBox {DIV} at (0,0) size 100x100
+ LayoutFlexibleBox (relative positioned) {DIV} at (0,0) size 100x100
LayoutBlockFlow {DIV} at (0,65) size 100x35
layer at (0,0) size 100x65
- LayoutFlexibleBox {DIV} at (0,0) size 100x65
+ LayoutFlexibleBox (relative positioned) {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 193373c..65890cb 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
@@ -12,7 +12,7 @@ layer at (8,50) size 300x292
layer at (8,50) size 352x288
LayoutVideo {VIDEO} at (0,0) size 352x288 [bgcolor=#FF0000]
layer at (8,50) size 352x288
- LayoutFlexibleBox {DIV} at (0,0) size 352x288
+ LayoutFlexibleBox (relative positioned) {DIV} at (0,0) size 352x288
LayoutBlockFlow {DIV} at (0,253) size 352x35
layer at (8,50) size 352x253
- LayoutFlexibleBox {DIV} at (0,0) size 352x253
+ LayoutFlexibleBox (relative positioned) {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 2ae4ffd..fc4192b 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
@@ -22,7 +22,7 @@ layer at (18,266) size 302x152 clip at (19,267) size 285x150 scrollY 24.00 scrol
LayoutText {#text} at (0,102) size 64x36
text run at (0,102) width 64: "here."
layer at (19,51) size 300x200
- LayoutFlexibleBox {DIV} at (0,0) size 300x200
+ LayoutFlexibleBox (relative positioned) {DIV} at (0,0) size 300x200
LayoutBlockFlow {DIV} at (0,165) size 300x35
layer at (19,51) size 300x165
- LayoutFlexibleBox {DIV} at (0,0) size 300x165
+ LayoutFlexibleBox (relative positioned) {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 d33cc03..0db1fea 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
@@ -16,12 +16,12 @@ layer at (8,50) size 320x180
layer at (332,50) size 320x180
LayoutVideo {VIDEO} at (324,0) size 320x180
layer at (8,50) size 320x180
- LayoutFlexibleBox {DIV} at (0,0) size 320x180
+ LayoutFlexibleBox (relative positioned) {DIV} at (0,0) size 320x180
LayoutBlockFlow {DIV} at (0,145) size 320x35
layer at (8,50) size 320x145
- LayoutFlexibleBox {DIV} at (0,0) size 320x145
+ LayoutFlexibleBox (relative positioned) {DIV} at (0,0) size 320x145
layer at (332,50) size 320x180
- LayoutFlexibleBox {DIV} at (0,0) size 320x180
+ LayoutFlexibleBox (relative positioned) {DIV} at (0,0) size 320x180
LayoutBlockFlow {DIV} at (0,145) size 320x35
layer at (332,50) size 320x145
- LayoutFlexibleBox {DIV} at (0,0) size 320x145
+ LayoutFlexibleBox (relative positioned) {DIV} at (0,0) size 320x145