summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwangxianzhu@chromium.org <wangxianzhu@chromium.org>2014-11-27 11:50:28 +0000
committerwangxianzhu@chromium.org <wangxianzhu@chromium.org>2014-11-27 11:50:28 +0000
commitabd9c08e4e5ea178d4c4a10b8fd67e3bfa0a210c (patch)
treebb64573f186c7f5779903c37ed22de0a392050dc
parentad1efd5ea70411a743c923e5cdd053b3ef8c2ec2 (diff)
downloadchromium_src-abd9c08e4e5ea178d4c4a10b8fd67e3bfa0a210c.zip
chromium_src-abd9c08e4e5ea178d4c4a10b8fd67e3bfa0a210c.tar.gz
chromium_src-abd9c08e4e5ea178d4c4a10b8fd67e3bfa0a210c.tar.bz2
Auto-rebaseline for r186099
http://src.chromium.org/viewvc/blink?view=revision&revision=186099 BUG=248894 TBR=dw.im@samsung.com Review URL: https://codereview.chromium.org/742363003 git-svn-id: svn://svn.chromium.org/blink/trunk@186111 bbb929c8-8fbe-4397-9dbb-9b2b20218538
-rw-r--r--third_party/WebKit/LayoutTests/TestExpectations2
-rw-r--r--third_party/WebKit/LayoutTests/platform/mac/fast/css3-text/css3-text-justify/text-justify-8bits-expected.txt60
-rw-r--r--third_party/WebKit/LayoutTests/platform/win-xp/fast/css3-text/css3-text-justify/text-justify-8bits-expected.pngbin0 -> 11019 bytes
-rw-r--r--third_party/WebKit/LayoutTests/platform/win-xp/fast/css3-text/css3-text-justify/text-justify-8bits-expected.txt60
-rw-r--r--third_party/WebKit/LayoutTests/platform/win/fast/css3-text/css3-text-justify/text-justify-8bits-expected.pngbin0 -> 11145 bytes
-rw-r--r--third_party/WebKit/LayoutTests/platform/win/fast/css3-text/css3-text-justify/text-justify-8bits-expected.txt60
6 files changed, 180 insertions, 2 deletions
diff --git a/third_party/WebKit/LayoutTests/TestExpectations b/third_party/WebKit/LayoutTests/TestExpectations
index 44e2e13..b711b12 100644
--- a/third_party/WebKit/LayoutTests/TestExpectations
+++ b/third_party/WebKit/LayoutTests/TestExpectations
@@ -1406,5 +1406,3 @@ crbug.com/435525 [ Mac Debug ] svg/W3C-SVG-1.1/struct-frag-02-t.svg [ NeedsManua
crbug.com/436436 fast/dom/HTMLImageElement/image-srcset-w-onerror.html [ Pass Failure ]
crbug.com/364225 virtual/gpu/fast/canvas/canvas-composite-text-alpha.html [ Pass Slow Timeout ]
-
-crbug.com/248894 fast/css3-text/css3-text-justify/text-justify-8bits.html [ NeedsRebaseline ]
diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/css3-text/css3-text-justify/text-justify-8bits-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/fast/css3-text/css3-text-justify/text-justify-8bits-expected.txt
new file mode 100644
index 0000000..5b43dca
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/css3-text/css3-text-justify/text-justify-8bits-expected.txt
@@ -0,0 +1,60 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x384
+ RenderBlock {HTML} at (0,0) size 800x384
+ RenderBody {BODY} at (8,8) size 784x368
+ RenderBlock {DIV} at (0,0) size 784x48
+ RenderText {#text} at (0,0) size 352x16
+ text run at (0,0) width 352: "Test all of the values of text-justify for 8bits characters"
+ RenderBR {BR} at (351,0) size 1x16
+ RenderText {#text} at (0,16) size 623x16
+ text run at (0,16) width 623: "This test checks that all of the values for text-justify property works properly for 8bits characters."
+ RenderBR {BR} at (622,16) size 1x16
+ RenderText {#text} at (0,32) size 463x16
+ text run at (0,32) width 463: "Every block has been set as 'text-align: justify' and 'text-align-last: start'."
+ RenderBlock (anonymous) at (0,48) size 784x32
+ RenderBR {BR} at (0,0) size 0x16
+ RenderInline {B} at (0,0) size 115x16
+ RenderText {#text} at (0,16) size 115x16
+ text run at (0,16) width 115: "text-justify: auto"
+ RenderBR {BR} at (114,16) size 1x16
+ RenderBlock {DIV} at (0,80) size 302x44 [border: (1px solid #000000)]
+ RenderText {#text} at (1,1) size 300x42
+ text run at (1,1) width 300: "Lorem ipsum dolor sit amet, consectetuer"
+ text run at (1,15) width 300: "adipiscing elit. Aenean commodo ligula"
+ text run at (1,29) width 80: "eget dolor."
+ RenderBlock (anonymous) at (0,124) size 784x32
+ RenderBR {BR} at (0,0) size 0x16
+ RenderInline {B} at (0,0) size 117x16
+ RenderText {#text} at (0,16) size 117x16
+ text run at (0,16) width 117: "text-justify: none"
+ RenderBR {BR} at (116,16) size 1x16
+ RenderBlock {DIV} at (0,156) size 302x44 [border: (1px solid #000000)]
+ RenderText {#text} at (1,1) size 289x42
+ text run at (1,1) width 289: "Lorem ipsum dolor sit amet, consectetuer"
+ text run at (1,15) width 274: "adipiscing elit. Aenean commodo ligula"
+ text run at (1,29) width 80: "eget dolor."
+ RenderBlock (anonymous) at (0,200) size 784x32
+ RenderBR {BR} at (0,0) size 0x16
+ RenderInline {B} at (0,0) size 158x16
+ RenderText {#text} at (0,16) size 158x16
+ text run at (0,16) width 158: "text-justify: inter-word"
+ RenderBR {BR} at (157,16) size 1x16
+ RenderBlock {DIV} at (0,232) size 302x44 [border: (1px solid #000000)]
+ RenderText {#text} at (1,1) size 300x42
+ text run at (1,1) width 300: "Lorem ipsum dolor sit amet, consectetuer"
+ text run at (1,15) width 300: "adipiscing elit. Aenean commodo ligula"
+ text run at (1,29) width 80: "eget dolor."
+ RenderBlock (anonymous) at (0,276) size 784x32
+ RenderBR {BR} at (0,0) size 0x16
+ RenderInline {B} at (0,0) size 151x16
+ RenderText {#text} at (0,16) size 151x16
+ text run at (0,16) width 151: "text-justify: distribute"
+ RenderBR {BR} at (150,16) size 1x16
+ RenderBlock {DIV} at (0,308) size 302x44 [border: (1px solid #000000)]
+ RenderText {#text} at (1,1) size 300x42
+ text run at (1,1) width 300: "Lorem ipsum dolor sit amet, consectetuer"
+ text run at (1,15) width 300: "adipiscing elit. Aenean commodo ligula"
+ text run at (1,29) width 80: "eget dolor."
+ RenderBlock (anonymous) at (0,352) size 784x16
+ RenderBR {BR} at (0,0) size 0x16
diff --git a/third_party/WebKit/LayoutTests/platform/win-xp/fast/css3-text/css3-text-justify/text-justify-8bits-expected.png b/third_party/WebKit/LayoutTests/platform/win-xp/fast/css3-text/css3-text-justify/text-justify-8bits-expected.png
new file mode 100644
index 0000000..f19ffd6
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win-xp/fast/css3-text/css3-text-justify/text-justify-8bits-expected.png
Binary files differ
diff --git a/third_party/WebKit/LayoutTests/platform/win-xp/fast/css3-text/css3-text-justify/text-justify-8bits-expected.txt b/third_party/WebKit/LayoutTests/platform/win-xp/fast/css3-text/css3-text-justify/text-justify-8bits-expected.txt
new file mode 100644
index 0000000..c3ddfc2
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win-xp/fast/css3-text/css3-text-justify/text-justify-8bits-expected.txt
@@ -0,0 +1,60 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x444
+ RenderBlock {HTML} at (0,0) size 800x444
+ RenderBody {BODY} at (8,8) size 784x428
+ RenderBlock {DIV} at (0,0) size 784x60
+ RenderText {#text} at (0,0) size 325x19
+ text run at (0,0) width 325: "Test all of the values of text-justify for 8bits characters"
+ RenderBR {BR} at (325,0) size 0x19
+ RenderText {#text} at (0,20) size 583x19
+ text run at (0,20) width 583: "This test checks that all of the values for text-justify property works properly for 8bits characters."
+ RenderBR {BR} at (583,20) size 0x19
+ RenderText {#text} at (0,40) size 429x19
+ text run at (0,40) width 429: "Every block has been set as 'text-align: justify' and 'text-align-last: start'."
+ RenderBlock (anonymous) at (0,60) size 784x40
+ RenderBR {BR} at (0,0) size 0x19
+ RenderInline {B} at (0,0) size 110x19
+ RenderText {#text} at (0,20) size 110x19
+ text run at (0,20) width 110: "text-justify: auto"
+ RenderBR {BR} at (110,20) size 0x19
+ RenderBlock {DIV} at (0,100) size 302x47 [border: (1px solid #000000)]
+ RenderText {#text} at (1,1) size 300x45
+ text run at (1,1) width 300: "Lorem ipsum dolor sit amet, consectetuer"
+ text run at (1,16) width 300: "adipiscing elit. Aenean commodo ligula"
+ text run at (1,31) width 77: "eget dolor."
+ RenderBlock (anonymous) at (0,147) size 784x40
+ RenderBR {BR} at (0,0) size 0x19
+ RenderInline {B} at (0,0) size 113x19
+ RenderText {#text} at (0,20) size 113x19
+ text run at (0,20) width 113: "text-justify: none"
+ RenderBR {BR} at (113,20) size 0x19
+ RenderBlock {DIV} at (0,187) size 302x47 [border: (1px solid #000000)]
+ RenderText {#text} at (1,1) size 280x45
+ text run at (1,1) width 280: "Lorem ipsum dolor sit amet, consectetuer"
+ text run at (1,16) width 266: "adipiscing elit. Aenean commodo ligula"
+ text run at (1,31) width 77: "eget dolor."
+ RenderBlock (anonymous) at (0,234) size 784x40
+ RenderBR {BR} at (0,0) size 0x19
+ RenderInline {B} at (0,0) size 149x19
+ RenderText {#text} at (0,20) size 149x19
+ text run at (0,20) width 149: "text-justify: inter-word"
+ RenderBR {BR} at (149,20) size 0x19
+ RenderBlock {DIV} at (0,274) size 302x47 [border: (1px solid #000000)]
+ RenderText {#text} at (1,1) size 300x45
+ text run at (1,1) width 300: "Lorem ipsum dolor sit amet, consectetuer"
+ text run at (1,16) width 300: "adipiscing elit. Aenean commodo ligula"
+ text run at (1,31) width 77: "eget dolor."
+ RenderBlock (anonymous) at (0,321) size 784x40
+ RenderBR {BR} at (0,0) size 0x19
+ RenderInline {B} at (0,0) size 144x19
+ RenderText {#text} at (0,20) size 144x19
+ text run at (0,20) width 144: "text-justify: distribute"
+ RenderBR {BR} at (144,20) size 0x19
+ RenderBlock {DIV} at (0,361) size 302x47 [border: (1px solid #000000)]
+ RenderText {#text} at (1,1) size 300x45
+ text run at (1,1) width 300: "Lorem ipsum dolor sit amet, consectetuer"
+ text run at (1,16) width 300: "adipiscing elit. Aenean commodo ligula"
+ text run at (1,31) width 77: "eget dolor."
+ RenderBlock (anonymous) at (0,408) size 784x20
+ RenderBR {BR} at (0,0) size 0x19
diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/css3-text/css3-text-justify/text-justify-8bits-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/css3-text/css3-text-justify/text-justify-8bits-expected.png
new file mode 100644
index 0000000..918a7f6
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/css3-text/css3-text-justify/text-justify-8bits-expected.png
Binary files differ
diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/css3-text/css3-text-justify/text-justify-8bits-expected.txt b/third_party/WebKit/LayoutTests/platform/win/fast/css3-text/css3-text-justify/text-justify-8bits-expected.txt
new file mode 100644
index 0000000..0c096ba
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/css3-text/css3-text-justify/text-justify-8bits-expected.txt
@@ -0,0 +1,60 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x420
+ RenderBlock {HTML} at (0,0) size 800x420
+ RenderBody {BODY} at (8,8) size 784x404
+ RenderBlock {DIV} at (0,0) size 784x54
+ RenderText {#text} at (0,0) size 352x17
+ text run at (0,0) width 352: "Test all of the values of text-justify for 8bits characters"
+ RenderBR {BR} at (351,0) size 1x17
+ RenderText {#text} at (0,18) size 623x17
+ text run at (0,18) width 623: "This test checks that all of the values for text-justify property works properly for 8bits characters."
+ RenderBR {BR} at (622,18) size 1x17
+ RenderText {#text} at (0,36) size 463x17
+ text run at (0,36) width 463: "Every block has been set as 'text-align: justify' and 'text-align-last: start'."
+ RenderBlock (anonymous) at (0,54) size 784x36
+ RenderBR {BR} at (0,0) size 0x17
+ RenderInline {B} at (0,0) size 115x17
+ RenderText {#text} at (0,18) size 115x17
+ text run at (0,18) width 115: "text-justify: auto"
+ RenderBR {BR} at (114,18) size 1x17
+ RenderBlock {DIV} at (0,90) size 302x47 [border: (1px solid #000000)]
+ RenderText {#text} at (1,1) size 300x45
+ text run at (1,1) width 300: "Lorem ipsum dolor sit amet, consectetuer"
+ text run at (1,16) width 300: "adipiscing elit. Aenean commodo ligula"
+ text run at (1,31) width 77: "eget dolor."
+ RenderBlock (anonymous) at (0,137) size 784x36
+ RenderBR {BR} at (0,0) size 0x17
+ RenderInline {B} at (0,0) size 117x17
+ RenderText {#text} at (0,18) size 117x17
+ text run at (0,18) width 117: "text-justify: none"
+ RenderBR {BR} at (116,18) size 1x17
+ RenderBlock {DIV} at (0,173) size 302x47 [border: (1px solid #000000)]
+ RenderText {#text} at (1,1) size 280x45
+ text run at (1,1) width 280: "Lorem ipsum dolor sit amet, consectetuer"
+ text run at (1,16) width 266: "adipiscing elit. Aenean commodo ligula"
+ text run at (1,31) width 77: "eget dolor."
+ RenderBlock (anonymous) at (0,220) size 784x36
+ RenderBR {BR} at (0,0) size 0x17
+ RenderInline {B} at (0,0) size 158x17
+ RenderText {#text} at (0,18) size 158x17
+ text run at (0,18) width 158: "text-justify: inter-word"
+ RenderBR {BR} at (157,18) size 1x17
+ RenderBlock {DIV} at (0,256) size 302x47 [border: (1px solid #000000)]
+ RenderText {#text} at (1,1) size 300x45
+ text run at (1,1) width 300: "Lorem ipsum dolor sit amet, consectetuer"
+ text run at (1,16) width 300: "adipiscing elit. Aenean commodo ligula"
+ text run at (1,31) width 77: "eget dolor."
+ RenderBlock (anonymous) at (0,303) size 784x36
+ RenderBR {BR} at (0,0) size 0x17
+ RenderInline {B} at (0,0) size 151x17
+ RenderText {#text} at (0,18) size 151x17
+ text run at (0,18) width 151: "text-justify: distribute"
+ RenderBR {BR} at (150,18) size 1x17
+ RenderBlock {DIV} at (0,339) size 302x47 [border: (1px solid #000000)]
+ RenderText {#text} at (1,1) size 300x45
+ text run at (1,1) width 300: "Lorem ipsum dolor sit amet, consectetuer"
+ text run at (1,16) width 300: "adipiscing elit. Aenean commodo ligula"
+ text run at (1,31) width 77: "eget dolor."
+ RenderBlock (anonymous) at (0,386) size 784x18
+ RenderBR {BR} at (0,0) size 0x17