[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

senorblanco at chromium.org senorblanco at chromium.org
Wed Dec 22 13:53:18 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 3c948bf752f0446729f4b80208492fffca121b02
Author: senorblanco at chromium.org <senorblanco at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Sep 28 21:49:00 2010 +0000

    2010-09-28  Stephen White  <senorblanco at chromium.org>
    
            Unreviewed; new test baselines.
    
            [CHROMIUM] New chromium baselines post-r68334.
    
            * platform/chromium-linux/fast/text/basic/014-expected.checksum:
            * platform/chromium-linux/fast/text/basic/014-expected.png:
            * platform/chromium-linux/fast/text/basic/014-expected.txt: Added.
            * platform/chromium-linux/fast/text/capitalize-boundaries-expected.checksum:
            * platform/chromium-linux/fast/text/capitalize-boundaries-expected.png:
            * platform/chromium-linux/fast/text/capitalize-boundaries-expected.txt:
            * platform/chromium-linux/fast/text/midword-break-after-breakable-char-expected.checksum:
            * platform/chromium-linux/fast/text/midword-break-after-breakable-char-expected.png:
            * platform/chromium-linux/fast/text/softHyphen-expected.txt: Added.
            * platform/chromium-linux/fast/text/word-break-soft-hyphen-expected.txt: Added.
            * platform/chromium-mac/fast/text/basic/014-expected.checksum: Added.
            * platform/chromium-mac/fast/text/midword-break-after-breakable-char-expected.checksum: Added.
            * platform/chromium-mac/fast/text/midword-break-after-breakable-char-expected.png: Added.
            * platform/chromium-mac/fast/text/word-break-soft-hyphen-expected.checksum: Added.
            * platform/chromium-win/fast/text/basic/014-expected.checksum:
            * platform/chromium-win/fast/text/basic/014-expected.png:
            * platform/chromium-win/fast/text/basic/014-expected.txt:
            * platform/chromium-win/fast/text/midword-break-after-breakable-char-expected.checksum:
            * platform/chromium-win/fast/text/midword-break-after-breakable-char-expected.png:
            * platform/chromium-win/fast/text/midword-break-after-breakable-char-expected.txt:
            * platform/chromium-win/fast/text/softHyphen-expected.txt:
            * platform/chromium-win/fast/text/word-break-soft-hyphen-expected.txt:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68565 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 9aae902..2058601 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,32 @@
+2010-09-28  Stephen White  <senorblanco at chromium.org>
+
+        Unreviewed; new test baselines.
+
+        [CHROMIUM] New chromium baselines post-r68334.
+
+        * platform/chromium-linux/fast/text/basic/014-expected.checksum:
+        * platform/chromium-linux/fast/text/basic/014-expected.png:
+        * platform/chromium-linux/fast/text/basic/014-expected.txt: Added.
+        * platform/chromium-linux/fast/text/capitalize-boundaries-expected.checksum:
+        * platform/chromium-linux/fast/text/capitalize-boundaries-expected.png:
+        * platform/chromium-linux/fast/text/capitalize-boundaries-expected.txt:
+        * platform/chromium-linux/fast/text/midword-break-after-breakable-char-expected.checksum:
+        * platform/chromium-linux/fast/text/midword-break-after-breakable-char-expected.png:
+        * platform/chromium-linux/fast/text/softHyphen-expected.txt: Added.
+        * platform/chromium-linux/fast/text/word-break-soft-hyphen-expected.txt: Added.
+        * platform/chromium-mac/fast/text/basic/014-expected.checksum: Added.
+        * platform/chromium-mac/fast/text/midword-break-after-breakable-char-expected.checksum: Added.
+        * platform/chromium-mac/fast/text/midword-break-after-breakable-char-expected.png: Added.
+        * platform/chromium-mac/fast/text/word-break-soft-hyphen-expected.checksum: Added.
+        * platform/chromium-win/fast/text/basic/014-expected.checksum:
+        * platform/chromium-win/fast/text/basic/014-expected.png:
+        * platform/chromium-win/fast/text/basic/014-expected.txt:
+        * platform/chromium-win/fast/text/midword-break-after-breakable-char-expected.checksum:
+        * platform/chromium-win/fast/text/midword-break-after-breakable-char-expected.png:
+        * platform/chromium-win/fast/text/midword-break-after-breakable-char-expected.txt:
+        * platform/chromium-win/fast/text/softHyphen-expected.txt:
+        * platform/chromium-win/fast/text/word-break-soft-hyphen-expected.txt:
+
 2010-09-28  David Hyatt  <hyatt at apple.com>
 
         Reviewed by Sam Weinig.
diff --git a/LayoutTests/platform/chromium-linux/fast/text/basic/014-expected.checksum b/LayoutTests/platform/chromium-linux/fast/text/basic/014-expected.checksum
index 8c10693..813fa7e 100644
--- a/LayoutTests/platform/chromium-linux/fast/text/basic/014-expected.checksum
+++ b/LayoutTests/platform/chromium-linux/fast/text/basic/014-expected.checksum
@@ -1 +1 @@
-39988cf91977aaa4785ebd2fe090ed96
\ No newline at end of file
+a17272d82f6f46bfbac00951d2a0831d
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-linux/fast/text/basic/014-expected.png b/LayoutTests/platform/chromium-linux/fast/text/basic/014-expected.png
index b913ff0..b7afed7 100644
Binary files a/LayoutTests/platform/chromium-linux/fast/text/basic/014-expected.png and b/LayoutTests/platform/chromium-linux/fast/text/basic/014-expected.png differ
diff --git a/LayoutTests/platform/chromium-linux/fast/text/basic/014-expected.txt b/LayoutTests/platform/chromium-linux/fast/text/basic/014-expected.txt
new file mode 100644
index 0000000..ccb2d4c
--- /dev/null
+++ b/LayoutTests/platform/chromium-linux/fast/text/basic/014-expected.txt
@@ -0,0 +1,35 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+  RenderBlock {HTML} at (0,0) size 800x600
+    RenderBody {BODY} at (8,8) size 784x576
+      RenderBlock {DIV} at (0,0) size 396x208 [border: (2px solid #FF0000)]
+        RenderBlock {P} at (2,18) size 392x40
+          RenderText {#text} at (0,0) size 378x39
+            text run at (0,0) width 378: "I\x{2019}m told this is the longest word in the English language: anti\x{AD}dis\x{AD}"
+            text run at (0,20) width 133: "est\x{AD}ab\x{AD}lish\x{AD}ment\x{AD}arian\x{AD}ism."
+        RenderBlock {P} at (2,74) size 392x40
+          RenderText {#text} at (0,0) size 378x39
+            text run at (0,0) width 378: "I\x{2019}m told this is the longest word in the English language: anti\x{AD}dis\x{AD}"
+            text run at (0,20) width 133: "est\x{AD}ab\x{AD}lish\x{AD}ment\x{AD}arian\x{AD}ism."
+        RenderBlock {P} at (2,130) size 392x60
+          RenderText {#text} at (0,0) size 378x39
+            text run at (0,0) width 378: "I\x{2019}m told this is the longest word in the English language: anti\x{AD}dis\x{AD}"
+            text run at (0,20) width 32: "est\x{AD}ab\x{AD}"
+          RenderBR {BR} at (32,35) size 0x0
+          RenderText {#text} at (0,40) size 101x19
+            text run at (0,40) width 101: "lish\x{AD}ment\x{AD}arian\x{AD}ism."
+      RenderBlock {P} at (0,224) size 784x0
+      RenderBlock (floating) {DIV} at (0,224) size 509x148 [border: (2px solid #FF0000)]
+        RenderBlock {P} at (2,18) size 505x20
+          RenderText {#text} at (0,0) size 505x19
+            text run at (0,0) width 505: "I\x{2019}m told this is the longest word in the English language: anti\x{AD}dis\x{AD}est\x{AD}ab\x{AD}lish\x{AD}ment\x{AD}arian\x{AD}ism."
+        RenderBlock {P} at (2,54) size 505x20
+          RenderText {#text} at (0,0) size 505x19
+            text run at (0,0) width 505: "I\x{2019}m told this is the longest word in the English language: anti\x{AD}dis\x{AD}est\x{AD}ab\x{AD}lish\x{AD}ment\x{AD}arian\x{AD}ism."
+        RenderBlock {P} at (2,90) size 505x40
+          RenderText {#text} at (0,0) size 404x19
+            text run at (0,0) width 404: "I\x{2019}m told this is the longest word in the English language: anti\x{AD}dis\x{AD}est\x{AD}ab\x{AD}"
+          RenderBR {BR} at (404,15) size 0x0
+          RenderText {#text} at (0,20) size 101x19
+            text run at (0,20) width 101: "lish\x{AD}ment\x{AD}arian\x{AD}ism."
diff --git a/LayoutTests/platform/chromium-linux/fast/text/capitalize-boundaries-expected.checksum b/LayoutTests/platform/chromium-linux/fast/text/capitalize-boundaries-expected.checksum
index f32a0fc..6b27a49 100644
--- a/LayoutTests/platform/chromium-linux/fast/text/capitalize-boundaries-expected.checksum
+++ b/LayoutTests/platform/chromium-linux/fast/text/capitalize-boundaries-expected.checksum
@@ -1 +1 @@
-e0f63203072079bfb48e246475e664d7
\ No newline at end of file
+dafb54a922ffc5e2c35ff86c74950847
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-linux/fast/text/capitalize-boundaries-expected.png b/LayoutTests/platform/chromium-linux/fast/text/capitalize-boundaries-expected.png
index 6d9657b..eb8d0b3 100644
Binary files a/LayoutTests/platform/chromium-linux/fast/text/capitalize-boundaries-expected.png and b/LayoutTests/platform/chromium-linux/fast/text/capitalize-boundaries-expected.png differ
diff --git a/LayoutTests/platform/chromium-linux/fast/text/capitalize-boundaries-expected.txt b/LayoutTests/platform/chromium-linux/fast/text/capitalize-boundaries-expected.txt
index cf6cc3c..392c903 100644
--- a/LayoutTests/platform/chromium-linux/fast/text/capitalize-boundaries-expected.txt
+++ b/LayoutTests/platform/chromium-linux/fast/text/capitalize-boundaries-expected.txt
@@ -29,60 +29,9 @@ layer at (0,0) size 785x1289
                 text run at (2,2) width 49: "generic"
             RenderTableCell {TD} at (57,2) size 710x64 [border: (1px solid #EEEEEE)] [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (2,2) size 703x59
-                text run at (2,2) width 14: "lip"
-                text run at (16,2) width 49: "smackin"
-                text run at (65,2) width 29: "thirst"
-                text run at (94,2) width 53: "quenchin"
-                text run at (147,2) width 52: "acetastin"
-                text run at (199,2) width 54: "motivatin"
-                text run at (253,2) width 31: "good"
-                text run at (284,2) width 37: "buzzin"
-                text run at (321,2) width 26: "cool"
-                text run at (347,2) width 32: "talkin"
-                text run at (379,2) width 24: "high"
-                text run at (403,2) width 39: "walkin"
-                text run at (442,2) width 21: "fast"
-                text run at (463,2) width 23: "livin"
-                text run at (486,2) width 26: "ever"
-                text run at (512,2) width 27: "givin"
-                text run at (539,2) width 26: "cool"
-                text run at (565,2) width 29: "fizzin"
-                text run at (594,2) width 14: "lip"
-                text run at (608,2) width 49: "smackin"
-                text run at (657,2) width 35: "thirst\x{AD}"
-                text run at (2,22) width 53: "quenchin"
-                text run at (55,22) width 52: "acetastin"
-                text run at (107,22) width 54: "motivatin"
-                text run at (161,22) width 31: "good"
-                text run at (192,22) width 37: "buzzin"
-                text run at (229,22) width 26: "cool"
-                text run at (255,22) width 32: "talkin"
-                text run at (287,22) width 24: "high"
-                text run at (311,22) width 39: "walkin"
-                text run at (350,22) width 21: "fast"
-                text run at (371,22) width 23: "livin"
-                text run at (394,22) width 26: "ever"
-                text run at (420,22) width 27: "givin"
-                text run at (447,22) width 26: "cool"
-                text run at (473,22) width 29: "fizzin"
-                text run at (502,22) width 14: "lip"
-                text run at (516,22) width 49: "smackin"
-                text run at (565,22) width 29: "thirst"
-                text run at (594,22) width 53: "quenchin"
-                text run at (647,22) width 58: "acetastin\x{AD}"
-                text run at (2,42) width 54: "motivatin"
-                text run at (56,42) width 31: "good"
-                text run at (87,42) width 37: "buzzin"
-                text run at (124,42) width 26: "cool"
-                text run at (150,42) width 32: "talkin"
-                text run at (182,42) width 24: "high"
-                text run at (206,42) width 39: "walkin"
-                text run at (245,42) width 21: "fast"
-                text run at (266,42) width 23: "livin"
-                text run at (289,42) width 26: "ever"
-                text run at (315,42) width 27: "givin"
-                text run at (342,42) width 26: "cool"
-                text run at (368,42) width 29: "fizzin"
+                text run at (2,2) width 690: "lip\x{AD}smackin\x{AD}thirst\x{AD}quenchin\x{AD}acetastin\x{AD}motivatin\x{AD}good\x{AD}buzzin\x{AD}cool\x{AD}talkin\x{AD}high\x{AD}walkin\x{AD}fast\x{AD}livin\x{AD}ever\x{AD}givin\x{AD}cool\x{AD}fizzin\x{AD}lip\x{AD}smackin\x{AD}thirst\x{AD}"
+                text run at (2,22) width 703: "quenchin\x{AD}acetastin\x{AD}motivatin\x{AD}good\x{AD}buzzin\x{AD}cool\x{AD}talkin\x{AD}high\x{AD}walkin\x{AD}fast\x{AD}livin\x{AD}ever\x{AD}givin\x{AD}cool\x{AD}fizzin\x{AD}lip\x{AD}smackin\x{AD}thirst\x{AD}quenchin\x{AD}acetastin\x{AD}"
+                text run at (2,42) width 395: "motivatin\x{AD}good\x{AD}buzzin\x{AD}cool\x{AD}talkin\x{AD}high\x{AD}walkin\x{AD}fast\x{AD}livin\x{AD}ever\x{AD}givin\x{AD}cool\x{AD}fizzin"
           RenderTableRow {TR} at (0,68) size 769x24
             RenderTableCell {TH} at (2,68) size 53x24 [bgcolor=#F8F8F8] [border: (1px solid #EEEEEE)] [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (19,2) size 15x19
@@ -189,60 +138,9 @@ layer at (0,0) size 785x1289
                 text run at (2,2) width 49: "generic"
             RenderTableCell {TD} at (57,2) size 710x64 [border: (1px solid #EEEEEE)] [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (2,2) size 703x59
-                text run at (2,2) width 20: "Lip"
-                text run at (22,2) width 49: "smackin"
-                text run at (71,2) width 29: "thirst"
-                text run at (100,2) width 53: "quenchin"
-                text run at (153,2) width 52: "acetastin"
-                text run at (205,2) width 54: "motivatin"
-                text run at (259,2) width 31: "good"
-                text run at (290,2) width 37: "buzzin"
-                text run at (327,2) width 26: "cool"
-                text run at (353,2) width 32: "talkin"
-                text run at (385,2) width 24: "high"
-                text run at (409,2) width 39: "walkin"
-                text run at (448,2) width 21: "fast"
-                text run at (469,2) width 23: "livin"
-                text run at (492,2) width 26: "ever"
-                text run at (518,2) width 27: "givin"
-                text run at (545,2) width 26: "cool"
-                text run at (571,2) width 29: "fizzin"
-                text run at (600,2) width 14: "lip"
-                text run at (614,2) width 49: "smackin"
-                text run at (663,2) width 35: "thirst\x{AD}"
-                text run at (2,22) width 53: "quenchin"
-                text run at (55,22) width 52: "acetastin"
-                text run at (107,22) width 54: "motivatin"
-                text run at (161,22) width 31: "good"
-                text run at (192,22) width 37: "buzzin"
-                text run at (229,22) width 26: "cool"
-                text run at (255,22) width 32: "talkin"
-                text run at (287,22) width 24: "high"
-                text run at (311,22) width 39: "walkin"
-                text run at (350,22) width 21: "fast"
-                text run at (371,22) width 23: "livin"
-                text run at (394,22) width 26: "ever"
-                text run at (420,22) width 27: "givin"
-                text run at (447,22) width 26: "cool"
-                text run at (473,22) width 29: "fizzin"
-                text run at (502,22) width 14: "lip"
-                text run at (516,22) width 49: "smackin"
-                text run at (565,22) width 29: "thirst"
-                text run at (594,22) width 53: "quenchin"
-                text run at (647,22) width 58: "acetastin\x{AD}"
-                text run at (2,42) width 54: "motivatin"
-                text run at (56,42) width 31: "good"
-                text run at (87,42) width 37: "buzzin"
-                text run at (124,42) width 26: "cool"
-                text run at (150,42) width 32: "talkin"
-                text run at (182,42) width 24: "high"
-                text run at (206,42) width 39: "walkin"
-                text run at (245,42) width 21: "fast"
-                text run at (266,42) width 23: "livin"
-                text run at (289,42) width 26: "ever"
-                text run at (315,42) width 27: "givin"
-                text run at (342,42) width 26: "cool"
-                text run at (368,42) width 29: "fizzin"
+                text run at (2,2) width 696: "Lip\x{AD}smackin\x{AD}thirst\x{AD}quenchin\x{AD}acetastin\x{AD}motivatin\x{AD}good\x{AD}buzzin\x{AD}cool\x{AD}talkin\x{AD}high\x{AD}walkin\x{AD}fast\x{AD}livin\x{AD}ever\x{AD}givin\x{AD}cool\x{AD}fizzin\x{AD}lip\x{AD}smackin\x{AD}thirst\x{AD}"
+                text run at (2,22) width 703: "quenchin\x{AD}acetastin\x{AD}motivatin\x{AD}good\x{AD}buzzin\x{AD}cool\x{AD}talkin\x{AD}high\x{AD}walkin\x{AD}fast\x{AD}livin\x{AD}ever\x{AD}givin\x{AD}cool\x{AD}fizzin\x{AD}lip\x{AD}smackin\x{AD}thirst\x{AD}quenchin\x{AD}acetastin\x{AD}"
+                text run at (2,42) width 395: "motivatin\x{AD}good\x{AD}buzzin\x{AD}cool\x{AD}talkin\x{AD}high\x{AD}walkin\x{AD}fast\x{AD}livin\x{AD}ever\x{AD}givin\x{AD}cool\x{AD}fizzin"
           RenderTableRow {TR} at (0,68) size 769x24
             RenderTableCell {TH} at (2,68) size 53x24 [bgcolor=#F8F8F8] [border: (1px solid #EEEEEE)] [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (19,2) size 15x19
@@ -333,60 +231,9 @@ layer at (0,0) size 785x1289
                 text run at (2,2) width 49: "generic"
             RenderTableCell {TD} at (57,2) size 710x64 [border: (1px solid #EEEEEE)] [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (2,2) size 703x59
-                text run at (2,2) width 20: "Lip"
-                text run at (22,2) width 49: "smackin"
-                text run at (71,2) width 29: "thirst"
-                text run at (100,2) width 53: "quenchin"
-                text run at (153,2) width 52: "acetastin"
-                text run at (205,2) width 54: "motivatin"
-                text run at (259,2) width 31: "good"
-                text run at (290,2) width 37: "buzzin"
-                text run at (327,2) width 26: "cool"
-                text run at (353,2) width 32: "talkin"
-                text run at (385,2) width 24: "high"
-                text run at (409,2) width 39: "walkin"
-                text run at (448,2) width 21: "fast"
-                text run at (469,2) width 23: "livin"
-                text run at (492,2) width 26: "ever"
-                text run at (518,2) width 27: "givin"
-                text run at (545,2) width 26: "cool"
-                text run at (571,2) width 29: "fizzin"
-                text run at (600,2) width 14: "lip"
-                text run at (614,2) width 49: "smackin"
-                text run at (663,2) width 35: "thirst\x{AD}"
-                text run at (2,22) width 53: "quenchin"
-                text run at (55,22) width 52: "acetastin"
-                text run at (107,22) width 54: "motivatin"
-                text run at (161,22) width 31: "good"
-                text run at (192,22) width 37: "buzzin"
-                text run at (229,22) width 26: "cool"
-                text run at (255,22) width 32: "talkin"
-                text run at (287,22) width 24: "high"
-                text run at (311,22) width 39: "walkin"
-                text run at (350,22) width 21: "fast"
-                text run at (371,22) width 23: "livin"
-                text run at (394,22) width 26: "ever"
-                text run at (420,22) width 27: "givin"
-                text run at (447,22) width 26: "cool"
-                text run at (473,22) width 29: "fizzin"
-                text run at (502,22) width 14: "lip"
-                text run at (516,22) width 49: "smackin"
-                text run at (565,22) width 29: "thirst"
-                text run at (594,22) width 53: "quenchin"
-                text run at (647,22) width 58: "acetastin\x{AD}"
-                text run at (2,42) width 54: "motivatin"
-                text run at (56,42) width 31: "good"
-                text run at (87,42) width 37: "buzzin"
-                text run at (124,42) width 26: "cool"
-                text run at (150,42) width 32: "talkin"
-                text run at (182,42) width 24: "high"
-                text run at (206,42) width 39: "walkin"
-                text run at (245,42) width 21: "fast"
-                text run at (266,42) width 23: "livin"
-                text run at (289,42) width 26: "ever"
-                text run at (315,42) width 27: "givin"
-                text run at (342,42) width 26: "cool"
-                text run at (368,42) width 29: "fizzin"
+                text run at (2,2) width 696: "Lip\x{AD}smackin\x{AD}thirst\x{AD}quenchin\x{AD}acetastin\x{AD}motivatin\x{AD}good\x{AD}buzzin\x{AD}cool\x{AD}talkin\x{AD}high\x{AD}walkin\x{AD}fast\x{AD}livin\x{AD}ever\x{AD}givin\x{AD}cool\x{AD}fizzin\x{AD}lip\x{AD}smackin\x{AD}thirst\x{AD}"
+                text run at (2,22) width 703: "quenchin\x{AD}acetastin\x{AD}motivatin\x{AD}good\x{AD}buzzin\x{AD}cool\x{AD}talkin\x{AD}high\x{AD}walkin\x{AD}fast\x{AD}livin\x{AD}ever\x{AD}givin\x{AD}cool\x{AD}fizzin\x{AD}lip\x{AD}smackin\x{AD}thirst\x{AD}quenchin\x{AD}acetastin\x{AD}"
+                text run at (2,42) width 395: "motivatin\x{AD}good\x{AD}buzzin\x{AD}cool\x{AD}talkin\x{AD}high\x{AD}walkin\x{AD}fast\x{AD}livin\x{AD}ever\x{AD}givin\x{AD}cool\x{AD}fizzin"
           RenderTableRow {TR} at (0,68) size 769x24
             RenderTableCell {TH} at (2,68) size 53x24 [bgcolor=#F8F8F8] [border: (1px solid #EEEEEE)] [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (19,2) size 15x19
diff --git a/LayoutTests/platform/chromium-linux/fast/text/midword-break-after-breakable-char-expected.checksum b/LayoutTests/platform/chromium-linux/fast/text/midword-break-after-breakable-char-expected.checksum
index e401a30..894a538 100644
--- a/LayoutTests/platform/chromium-linux/fast/text/midword-break-after-breakable-char-expected.checksum
+++ b/LayoutTests/platform/chromium-linux/fast/text/midword-break-after-breakable-char-expected.checksum
@@ -1 +1 @@
-9172a956acde8bacd0edf4b3d6dad6fb
\ No newline at end of file
+471587d7e74d48c6058ce0ff2014cbdb
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-linux/fast/text/midword-break-after-breakable-char-expected.png b/LayoutTests/platform/chromium-linux/fast/text/midword-break-after-breakable-char-expected.png
index 53f583a..b22f9ea 100644
Binary files a/LayoutTests/platform/chromium-linux/fast/text/midword-break-after-breakable-char-expected.png and b/LayoutTests/platform/chromium-linux/fast/text/midword-break-after-breakable-char-expected.png differ
diff --git a/LayoutTests/platform/chromium-linux/fast/text/softHyphen-expected.txt b/LayoutTests/platform/chromium-linux/fast/text/softHyphen-expected.txt
new file mode 100644
index 0000000..b5c1224
--- /dev/null
+++ b/LayoutTests/platform/chromium-linux/fast/text/softHyphen-expected.txt
@@ -0,0 +1,168 @@
+layer at (0,0) size 785x1050
+  RenderView at (0,0) size 785x600
+layer at (0,0) size 785x1050
+  RenderBlock {HTML} at (0,0) size 785x1050
+    RenderBody {BODY} at (8,16) size 769x1018
+      RenderBlock {P} at (0,0) size 769x20
+        RenderText {#text} at (0,0) size 403x19
+          text run at (0,0) width 403: "In all of the following, there should not be a hyphen before \x{201C}lorem\x{201D}."
+      RenderBlock {P} at (0,36) size 769x20
+        RenderText {#text} at (0,0) size 19x19
+          text run at (0,0) width 19: "Do"
+        RenderBlock (floating) {SPAN} at (756,0) size 13x22 [border: (1px solid #FF0000)]
+          RenderText {#text} at (1,1) size 11x19
+            text run at (1,1) width 11: "X"
+        RenderText {#text} at (19,0) size 73x19
+          text run at (19,0) width 73: "\x{AD}lorem ipsum"
+      RenderBlock {P} at (0,72) size 769x20
+        RenderBlock (floating) {SPAN} at (756,0) size 13x22 [border: (1px solid #FF0000)]
+          RenderText {#text} at (1,1) size 11x19
+            text run at (1,1) width 11: "X"
+        RenderText {#text} at (0,0) size 73x19
+          text run at (0,0) width 73: "lorem ipsum"
+      RenderBlock {P} at (0,108) size 769x22
+        RenderText {#text} at (0,1) size 19x19
+          text run at (0,1) width 19: "Do"
+        RenderText {#text} at (32,1) size 73x19
+          text run at (32,1) width 73: "\x{AD}lorem ipsum"
+      RenderBlock {P} at (0,146) size 769x20
+        RenderText {#text} at (0,0) size 19x19
+          text run at (0,0) width 19: "Do"
+        RenderText {#text} at (19,0) size 73x19
+          text run at (19,0) width 73: "\x{AD}lorem ipsum"
+      RenderBlock (anonymous) at (0,182) size 769x20
+        RenderText {#text} at (0,0) size 19x19
+          text run at (0,0) width 19: "Do"
+      RenderBlock {P} at (0,218) size 769x20
+        RenderText {#text} at (0,0) size 73x19
+          text run at (0,0) width 73: "lorem ipsum"
+      RenderBlock {P} at (0,254) size 769x40
+        RenderText {#text} at (0,0) size 19x19
+          text run at (0,0) width 19: "Do"
+        RenderBR {BR} at (19,15) size 0x0
+        RenderText {#text} at (0,20) size 73x19
+          text run at (0,20) width 73: "lorem ipsum"
+      RenderBlock {P} at (0,310) size 769x20
+        RenderText {#text} at (0,0) size 19x19
+          text run at (0,0) width 19: "Do"
+        RenderInline {SPAN} at (0,0) size 34x19
+          RenderText {#text} at (19,0) size 34x19
+            text run at (19,0) width 34: "\x{AD}lorem"
+        RenderText {#text} at (53,0) size 39x19
+          text run at (53,0) width 39: " ipsum"
+      RenderBlock {P} at (0,346) size 769x20
+        RenderText {#text} at (0,0) size 11x19
+          text run at (0,0) width 11: "D"
+        RenderInline {SPAN} at (0,0) size 8x19
+          RenderText {#text} at (11,0) size 8x19
+            text run at (11,0) width 8: "o"
+        RenderText {#text} at (19,0) size 73x19
+          text run at (19,0) width 73: "\x{AD}lorem ipsum"
+      RenderBlock {P} at (0,382) size 769x20
+        RenderText {#text} at (0,0) size 23x19
+          text run at (0,0) width 23: "Do "
+        RenderInline {SPAN} at (0,0) size 34x19
+          RenderText {#text} at (23,0) size 34x19
+            text run at (23,0) width 34: "\x{AD}lorem"
+        RenderText {#text} at (57,0) size 39x19
+          text run at (57,0) width 39: " ipsum"
+      RenderBlock {P} at (0,418) size 769x20
+        RenderText {#text} at (0,0) size 11x19
+          text run at (0,0) width 11: "D"
+        RenderInline {SPAN} at (0,0) size 12x19
+          RenderText {#text} at (11,0) size 12x19
+            text run at (11,0) width 12: "o "
+        RenderText {#text} at (23,0) size 73x19
+          text run at (23,0) width 73: "\x{AD}lorem ipsum"
+      RenderBlock {P} at (0,454) size 769x20
+        RenderText {#text} at (0,0) size 23x19
+          text run at (0,0) width 23: "Do "
+        RenderInline {SPAN} at (0,0) size 34x19
+          RenderText {#text} at (23,0) size 34x19
+            text run at (23,0) width 34: "\x{AD}lorem"
+        RenderText {#text} at (57,0) size 39x19
+          text run at (57,0) width 39: " ipsum"
+      RenderBlock {P} at (0,490) size 769x20
+        RenderText {#text} at (0,0) size 11x19
+          text run at (0,0) width 11: "D"
+        RenderInline {SPAN} at (0,0) size 12x19
+          RenderText {#text} at (11,0) size 12x19
+            text run at (11,0) width 12: "o "
+        RenderText {#text} at (23,0) size 73x19
+          text run at (23,0) width 73: "\x{AD}lorem ipsum"
+      RenderBlock {P} at (0,526) size 769x20
+        RenderText {#text} at (0,0) size 61x19
+          text run at (0,0) width 61: "Do \x{AD} lorem"
+      RenderBlock {P} at (0,562) size 769x20
+        RenderText {#text} at (0,0) size 57x19
+          text run at (0,0) width 57: "Do\x{AD} \x{AD}lorem"
+      RenderBlock {P} at (0,598) size 769x20
+        RenderText {#text} at (0,0) size 57x19
+          text run at (0,0) width 23: "Do "
+          text run at (23,0) width 34: "\x{AD}lorem"
+      RenderBlock {P} at (0,634) size 769x20
+        RenderText {#text} at (0,0) size 57x19
+          text run at (0,0) width 23: "Do\x{AD} "
+          text run at (23,0) width 34: "lorem"
+      RenderBlock {P} at (0,670) size 769x20
+        RenderText {#text} at (0,0) size 61x19
+          text run at (0,0) width 27: "Do \x{AD} "
+          text run at (27,0) width 34: "lorem"
+      RenderBlock {P} at (0,706) size 769x20
+        RenderText {#text} at (0,0) size 61x19
+          text run at (0,0) width 23: "Do "
+          text run at (23,0) width 38: "\x{AD} lorem"
+      RenderBlock {P} at (0,742) size 769x20
+        RenderText {#text} at (0,0) size 19x19
+          text run at (0,0) width 19: "Do"
+        RenderInline {SPAN} at (0,0) size 0x19
+        RenderText {#text} at (19,0) size 73x19
+          text run at (19,0) width 73: "\x{AD}lorem ipsum"
+      RenderBlock {P} at (0,778) size 769x20
+        RenderText {#text} at (0,0) size 92x19
+          text run at (0,0) width 92: "Do\x{AD}\x{AD}lorem ipsum"
+      RenderBlock {P} at (0,814) size 769x20
+        RenderInline {SPAN} at (0,0) size 19x19
+          RenderText {#text} at (0,0) size 19x19
+            text run at (0,0) width 19: "Do\x{AD}"
+        RenderText {#text} at (19,0) size 73x19
+          text run at (19,0) width 73: "\x{AD}lorem ipsum"
+      RenderBlock {P} at (0,850) size 769x20
+        RenderText {#text} at (0,0) size 19x19
+          text run at (0,0) width 19: "Do\x{AD}"
+        RenderInline {SPAN} at (0,0) size 73x19
+          RenderText {#text} at (19,0) size 73x19
+            text run at (19,0) width 73: "\x{AD}lorem ipsum"
+      RenderBlock {P} at (0,886) size 769x20
+        RenderInline {SPAN} at (0,0) size 19x19
+          RenderText {#text} at (0,0) size 19x19
+            text run at (0,0) width 19: "Do\x{AD}\x{AD}"
+        RenderText {#text} at (19,0) size 73x19
+          text run at (19,0) width 73: "lorem ipsum"
+      RenderBlock {P} at (0,922) size 769x20
+        RenderText {#text} at (0,0) size 230x19
+          text run at (0,0) width 230: "The following pair should be the same:"
+      RenderBlock {P} at (0,958) size 769x22
+        RenderText {#text} at (0,1) size 15x19
+          text run at (0,1) width 15: "W"
+        RenderBlock {SPAN} at (15,0) size 13x22 [border: (1px solid #FF0000)]
+          RenderText {#text} at (1,1) size 11x19
+            text run at (1,1) width 11: "X"
+        RenderText {#text} at (28,1) size 11x19
+          text run at (28,1) width 11: "Y"
+      RenderBlock {P} at (0,996) size 769x22
+        RenderText {#text} at (0,1) size 15x19
+          text run at (0,1) width 15: "W"
+        RenderBlock {SPAN} at (15,0) size 13x22 [border: (1px solid #FF0000)]
+          RenderText {#text} at (1,1) size 11x19
+            text run at (1,1) width 11: "X"
+        RenderText {#text} at (28,1) size 11x19
+          text run at (28,1) width 11: "Y"
+layer at (27,124) size 13x22
+  RenderBlock (relative positioned) {SPAN} at (19,0) size 13x22 [border: (1px solid #FF0000)]
+    RenderText {#text} at (1,1) size 11x19
+      text run at (1,1) width 11: "X"
+layer at (772,162) size 13x22
+  RenderBlock (positioned) {SPAN} at (772,162) size 13x22 [border: (1px solid #FF0000)]
+    RenderText {#text} at (1,1) size 11x19
+      text run at (1,1) width 11: "X"
diff --git a/LayoutTests/platform/chromium-linux/fast/text/word-break-soft-hyphen-expected.txt b/LayoutTests/platform/chromium-linux/fast/text/word-break-soft-hyphen-expected.txt
new file mode 100644
index 0000000..b749f4a
--- /dev/null
+++ b/LayoutTests/platform/chromium-linux/fast/text/word-break-soft-hyphen-expected.txt
@@ -0,0 +1,25 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+  RenderBlock {HTML} at (0,0) size 800x600
+    RenderBody {BODY} at (8,8) size 784x576
+      RenderBlock {P} at (0,0) size 784x40
+        RenderText {#text} at (0,0) size 51x19
+          text run at (0,0) width 51: "Test for "
+        RenderInline {I} at (0,0) size 755x39
+          RenderInline {A} at (0,0) size 305x19 [color=#0000EE]
+            RenderText {#text} at (51,0) size 305x19
+              text run at (51,0) width 305: "http://bugs.webkit.org/show_bug.cgi?id=15367"
+          RenderText {#text} at (356,0) size 755x39
+            text run at (356,0) width 4: " "
+            text run at (360,0) width 395: "Assertion failure inspecting a document including soft hyphen"
+            text run at (0,20) width 76: "code (0xad)"
+        RenderText {#text} at (76,20) size 4x19
+          text run at (76,20) width 4: "."
+      RenderBlock {P} at (0,56) size 784x20
+        RenderText {#text} at (0,0) size 459x19
+          text run at (0,0) width 459: "The following text should not wrap and the border should fit tightly around it."
+layer at (8,100) size 109x26
+  RenderBlock (positioned) {DIV} at (8,100) size 109x26 [border: (3px solid #000000)]
+    RenderText {#text} at (3,3) size 103x19
+      text run at (3,3) width 103: "Two soft\x{AD}hyp\x{AD}hens"
diff --git a/LayoutTests/platform/chromium-mac/fast/text/basic/014-expected.checksum b/LayoutTests/platform/chromium-mac/fast/text/basic/014-expected.checksum
new file mode 100644
index 0000000..8ac8af2
--- /dev/null
+++ b/LayoutTests/platform/chromium-mac/fast/text/basic/014-expected.checksum
@@ -0,0 +1 @@
+1e80f89e749a56abdb85bf71e20a3638
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-mac/fast/text/midword-break-after-breakable-char-expected.checksum b/LayoutTests/platform/chromium-mac/fast/text/midword-break-after-breakable-char-expected.checksum
new file mode 100644
index 0000000..beda8ae
--- /dev/null
+++ b/LayoutTests/platform/chromium-mac/fast/text/midword-break-after-breakable-char-expected.checksum
@@ -0,0 +1 @@
+650299925ddd5603be9a8b40e59504a7
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-mac/fast/text/midword-break-after-breakable-char-expected.png b/LayoutTests/platform/chromium-mac/fast/text/midword-break-after-breakable-char-expected.png
new file mode 100644
index 0000000..c41d82f
Binary files /dev/null and b/LayoutTests/platform/chromium-mac/fast/text/midword-break-after-breakable-char-expected.png differ
diff --git a/LayoutTests/platform/chromium-mac/fast/text/word-break-soft-hyphen-expected.checksum b/LayoutTests/platform/chromium-mac/fast/text/word-break-soft-hyphen-expected.checksum
new file mode 100644
index 0000000..aec61be
--- /dev/null
+++ b/LayoutTests/platform/chromium-mac/fast/text/word-break-soft-hyphen-expected.checksum
@@ -0,0 +1 @@
+e7739a90dbfcbb67565e68b33ebc270c
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-win/fast/text/basic/014-expected.checksum b/LayoutTests/platform/chromium-win/fast/text/basic/014-expected.checksum
index 190669c..8c48257 100644
--- a/LayoutTests/platform/chromium-win/fast/text/basic/014-expected.checksum
+++ b/LayoutTests/platform/chromium-win/fast/text/basic/014-expected.checksum
@@ -1 +1 @@
-96a73e22ac2d84cc0c33dfd706e1ee9b
\ No newline at end of file
+395a68c31d458cf0228adc3e509b78c8
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-win/fast/text/basic/014-expected.png b/LayoutTests/platform/chromium-win/fast/text/basic/014-expected.png
index 6e9eaa9..3bd4844 100644
Binary files a/LayoutTests/platform/chromium-win/fast/text/basic/014-expected.png and b/LayoutTests/platform/chromium-win/fast/text/basic/014-expected.png differ
diff --git a/LayoutTests/platform/chromium-win/fast/text/basic/014-expected.txt b/LayoutTests/platform/chromium-win/fast/text/basic/014-expected.txt
index f9349fc..ee86c8a 100644
--- a/LayoutTests/platform/chromium-win/fast/text/basic/014-expected.txt
+++ b/LayoutTests/platform/chromium-win/fast/text/basic/014-expected.txt
@@ -5,68 +5,31 @@ layer at (0,0) size 800x600
     RenderBody {BODY} at (8,8) size 784x576
       RenderBlock {DIV} at (0,0) size 396x208 [border: (2px solid #FF0000)]
         RenderBlock {P} at (2,18) size 392x40
-          RenderText {#text} at (0,0) size 378x39
-            text run at (0,0) width 355: "I\x{2019}m told this is the longest word in the English language: anti"
-            text run at (355,0) width 23: "dis\x{AD}"
-            text run at (0,20) width 17: "est"
-            text run at (17,20) width 15: "ab"
-            text run at (32,20) width 19: "lish"
-            text run at (51,20) width 29: "ment"
-            text run at (80,20) width 29: "arian"
-            text run at (109,20) width 24: "ism."
+          RenderText {#text} at (0,0) size 377x39
+            text run at (0,0) width 377: "I\x{2019}m told this is the longest word in the English language: anti\x{AD}dis\x{AD}"
+            text run at (0,20) width 133: "est\x{AD}ab\x{AD}lish\x{AD}ment\x{AD}arian\x{AD}ism."
         RenderBlock {P} at (2,74) size 392x40
-          RenderText {#text} at (0,0) size 378x39
-            text run at (0,0) width 355: "I\x{2019}m told this is the longest word in the English language: anti"
-            text run at (355,0) width 23: "dis\x{AD}"
-            text run at (0,20) width 17: "est"
-            text run at (17,20) width 15: "ab"
-            text run at (32,20) width 19: "lish"
-            text run at (51,20) width 29: "ment"
-            text run at (80,20) width 29: "arian"
-            text run at (109,20) width 24: "ism."
+          RenderText {#text} at (0,0) size 377x39
+            text run at (0,0) width 377: "I\x{2019}m told this is the longest word in the English language: anti\x{AD}dis\x{AD}"
+            text run at (0,20) width 133: "est\x{AD}ab\x{AD}lish\x{AD}ment\x{AD}arian\x{AD}ism."
         RenderBlock {P} at (2,130) size 392x60
-          RenderText {#text} at (0,0) size 378x39
-            text run at (0,0) width 355: "I\x{2019}m told this is the longest word in the English language: anti"
-            text run at (355,0) width 23: "dis\x{AD}"
-            text run at (0,20) width 17: "est"
-            text run at (17,20) width 15: "ab"
+          RenderText {#text} at (0,0) size 377x39
+            text run at (0,0) width 377: "I\x{2019}m told this is the longest word in the English language: anti\x{AD}dis\x{AD}"
+            text run at (0,20) width 32: "est\x{AD}ab\x{AD}"
           RenderBR {BR} at (32,35) size 0x0
           RenderText {#text} at (0,40) size 101x19
-            text run at (0,40) width 19: "lish"
-            text run at (19,40) width 29: "ment"
-            text run at (48,40) width 29: "arian"
-            text run at (77,40) width 24: "ism."
+            text run at (0,40) width 101: "lish\x{AD}ment\x{AD}arian\x{AD}ism."
       RenderBlock {P} at (0,224) size 784x0
       RenderBlock (floating) {DIV} at (0,224) size 509x148 [border: (2px solid #FF0000)]
         RenderBlock {P} at (2,18) size 505x20
           RenderText {#text} at (0,0) size 505x19
-            text run at (0,0) width 355: "I\x{2019}m told this is the longest word in the English language: anti"
-            text run at (355,0) width 17: "dis"
-            text run at (372,0) width 17: "est"
-            text run at (389,0) width 15: "ab"
-            text run at (404,0) width 19: "lish"
-            text run at (423,0) width 29: "ment"
-            text run at (452,0) width 29: "arian"
-            text run at (481,0) width 24: "ism."
+            text run at (0,0) width 505: "I\x{2019}m told this is the longest word in the English language: anti\x{AD}dis\x{AD}est\x{AD}ab\x{AD}lish\x{AD}ment\x{AD}arian\x{AD}ism."
         RenderBlock {P} at (2,54) size 505x20
           RenderText {#text} at (0,0) size 505x19
-            text run at (0,0) width 355: "I\x{2019}m told this is the longest word in the English language: anti"
-            text run at (355,0) width 17: "dis"
-            text run at (372,0) width 17: "est"
-            text run at (389,0) width 15: "ab"
-            text run at (404,0) width 19: "lish"
-            text run at (423,0) width 29: "ment"
-            text run at (452,0) width 29: "arian"
-            text run at (481,0) width 24: "ism."
+            text run at (0,0) width 505: "I\x{2019}m told this is the longest word in the English language: anti\x{AD}dis\x{AD}est\x{AD}ab\x{AD}lish\x{AD}ment\x{AD}arian\x{AD}ism."
         RenderBlock {P} at (2,90) size 505x40
           RenderText {#text} at (0,0) size 404x19
-            text run at (0,0) width 355: "I\x{2019}m told this is the longest word in the English language: anti"
-            text run at (355,0) width 17: "dis"
-            text run at (372,0) width 17: "est"
-            text run at (389,0) width 15: "ab"
+            text run at (0,0) width 404: "I\x{2019}m told this is the longest word in the English language: anti\x{AD}dis\x{AD}est\x{AD}ab\x{AD}"
           RenderBR {BR} at (404,15) size 0x0
           RenderText {#text} at (0,20) size 101x19
-            text run at (0,20) width 19: "lish"
-            text run at (19,20) width 29: "ment"
-            text run at (48,20) width 29: "arian"
-            text run at (77,20) width 24: "ism."
+            text run at (0,20) width 101: "lish\x{AD}ment\x{AD}arian\x{AD}ism."
diff --git a/LayoutTests/platform/chromium-win/fast/text/midword-break-after-breakable-char-expected.checksum b/LayoutTests/platform/chromium-win/fast/text/midword-break-after-breakable-char-expected.checksum
index 468d91c..3b0fe32 100644
--- a/LayoutTests/platform/chromium-win/fast/text/midword-break-after-breakable-char-expected.checksum
+++ b/LayoutTests/platform/chromium-win/fast/text/midword-break-after-breakable-char-expected.checksum
@@ -1 +1 @@
-fc636fdb96e3799d9c6bfb2e1f0c8e80
\ No newline at end of file
+1330bd0f1115169a56ea59286ebfea2b
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-win/fast/text/midword-break-after-breakable-char-expected.png b/LayoutTests/platform/chromium-win/fast/text/midword-break-after-breakable-char-expected.png
index 9208183..2a38ce1 100644
Binary files a/LayoutTests/platform/chromium-win/fast/text/midword-break-after-breakable-char-expected.png and b/LayoutTests/platform/chromium-win/fast/text/midword-break-after-breakable-char-expected.png differ
diff --git a/LayoutTests/platform/chromium-win/fast/text/midword-break-after-breakable-char-expected.txt b/LayoutTests/platform/chromium-win/fast/text/midword-break-after-breakable-char-expected.txt
index c64cacc..6d91245 100644
--- a/LayoutTests/platform/chromium-win/fast/text/midword-break-after-breakable-char-expected.txt
+++ b/LayoutTests/platform/chromium-win/fast/text/midword-break-after-breakable-char-expected.txt
@@ -31,7 +31,7 @@ layer at (0,0) size 800x600
           text run at (0,60) width 295: "Quisqueeunullanonnisimolestieaccumsan.Etiamtell"
           text run at (0,80) width 165: "usurna,laoreetac,laoreetnon"
           text run at (0,100) width 294: "suscipitsed,sapien.Phasellusvehicula,sematposuer"
-          text run at (0,120) width 193: "evehicula,auguenibhmolestienisl\x{AD}"
+          text run at (0,120) width 192: "evehicula,auguenibhmolestienisl\x{AD}"
           text run at (0,140) width 298: "necullamcorperlacusantevulputatepede.Nasceturri"
           text run at (0,160) width 69: "diculusmus."
       RenderBlock (floating) {DIV} at (312,152) size 300x180 [bgcolor=#FFFFE0]
diff --git a/LayoutTests/platform/chromium-win/fast/text/softHyphen-expected.txt b/LayoutTests/platform/chromium-win/fast/text/softHyphen-expected.txt
index 2e834d4..b5c1224 100644
--- a/LayoutTests/platform/chromium-win/fast/text/softHyphen-expected.txt
+++ b/LayoutTests/platform/chromium-win/fast/text/softHyphen-expected.txt
@@ -13,7 +13,7 @@ layer at (0,0) size 785x1050
           RenderText {#text} at (1,1) size 11x19
             text run at (1,1) width 11: "X"
         RenderText {#text} at (19,0) size 73x19
-          text run at (19,0) width 73: "lorem ipsum"
+          text run at (19,0) width 73: "\x{AD}lorem ipsum"
       RenderBlock {P} at (0,72) size 769x20
         RenderBlock (floating) {SPAN} at (756,0) size 13x22 [border: (1px solid #FF0000)]
           RenderText {#text} at (1,1) size 11x19
@@ -24,12 +24,12 @@ layer at (0,0) size 785x1050
         RenderText {#text} at (0,1) size 19x19
           text run at (0,1) width 19: "Do"
         RenderText {#text} at (32,1) size 73x19
-          text run at (32,1) width 73: "lorem ipsum"
+          text run at (32,1) width 73: "\x{AD}lorem ipsum"
       RenderBlock {P} at (0,146) size 769x20
         RenderText {#text} at (0,0) size 19x19
           text run at (0,0) width 19: "Do"
         RenderText {#text} at (19,0) size 73x19
-          text run at (19,0) width 73: "lorem ipsum"
+          text run at (19,0) width 73: "\x{AD}lorem ipsum"
       RenderBlock (anonymous) at (0,182) size 769x20
         RenderText {#text} at (0,0) size 19x19
           text run at (0,0) width 19: "Do"
@@ -47,7 +47,7 @@ layer at (0,0) size 785x1050
           text run at (0,0) width 19: "Do"
         RenderInline {SPAN} at (0,0) size 34x19
           RenderText {#text} at (19,0) size 34x19
-            text run at (19,0) width 34: "lorem"
+            text run at (19,0) width 34: "\x{AD}lorem"
         RenderText {#text} at (53,0) size 39x19
           text run at (53,0) width 39: " ipsum"
       RenderBlock {P} at (0,346) size 769x20
@@ -57,13 +57,13 @@ layer at (0,0) size 785x1050
           RenderText {#text} at (11,0) size 8x19
             text run at (11,0) width 8: "o"
         RenderText {#text} at (19,0) size 73x19
-          text run at (19,0) width 73: "lorem ipsum"
+          text run at (19,0) width 73: "\x{AD}lorem ipsum"
       RenderBlock {P} at (0,382) size 769x20
         RenderText {#text} at (0,0) size 23x19
           text run at (0,0) width 23: "Do "
         RenderInline {SPAN} at (0,0) size 34x19
           RenderText {#text} at (23,0) size 34x19
-            text run at (23,0) width 34: "lorem"
+            text run at (23,0) width 34: "\x{AD}lorem"
         RenderText {#text} at (57,0) size 39x19
           text run at (57,0) width 39: " ipsum"
       RenderBlock {P} at (0,418) size 769x20
@@ -73,13 +73,13 @@ layer at (0,0) size 785x1050
           RenderText {#text} at (11,0) size 12x19
             text run at (11,0) width 12: "o "
         RenderText {#text} at (23,0) size 73x19
-          text run at (23,0) width 73: "lorem ipsum"
+          text run at (23,0) width 73: "\x{AD}lorem ipsum"
       RenderBlock {P} at (0,454) size 769x20
         RenderText {#text} at (0,0) size 23x19
           text run at (0,0) width 23: "Do "
         RenderInline {SPAN} at (0,0) size 34x19
           RenderText {#text} at (23,0) size 34x19
-            text run at (23,0) width 34: "lorem"
+            text run at (23,0) width 34: "\x{AD}lorem"
         RenderText {#text} at (57,0) size 39x19
           text run at (57,0) width 39: " ipsum"
       RenderBlock {P} at (0,490) size 769x20
@@ -89,60 +89,54 @@ layer at (0,0) size 785x1050
           RenderText {#text} at (11,0) size 12x19
             text run at (11,0) width 12: "o "
         RenderText {#text} at (23,0) size 73x19
-          text run at (23,0) width 73: "lorem ipsum"
+          text run at (23,0) width 73: "\x{AD}lorem ipsum"
       RenderBlock {P} at (0,526) size 769x20
         RenderText {#text} at (0,0) size 61x19
-          text run at (0,0) width 23: "Do "
-          text run at (23,0) width 38: " lorem"
+          text run at (0,0) width 61: "Do \x{AD} lorem"
       RenderBlock {P} at (0,562) size 769x20
         RenderText {#text} at (0,0) size 57x19
-          text run at (0,0) width 19: "Do"
-          text run at (19,0) width 4: " "
-          text run at (23,0) width 34: "lorem"
+          text run at (0,0) width 57: "Do\x{AD} \x{AD}lorem"
       RenderBlock {P} at (0,598) size 769x20
         RenderText {#text} at (0,0) size 57x19
           text run at (0,0) width 23: "Do "
-          text run at (23,0) width 34: "lorem"
+          text run at (23,0) width 34: "\x{AD}lorem"
       RenderBlock {P} at (0,634) size 769x20
         RenderText {#text} at (0,0) size 57x19
-          text run at (0,0) width 19: "Do"
-          text run at (19,0) width 4: " "
+          text run at (0,0) width 23: "Do\x{AD} "
           text run at (23,0) width 34: "lorem"
       RenderBlock {P} at (0,670) size 769x20
         RenderText {#text} at (0,0) size 61x19
-          text run at (0,0) width 23: "Do "
-          text run at (23,0) width 4: " "
+          text run at (0,0) width 27: "Do \x{AD} "
           text run at (27,0) width 34: "lorem"
       RenderBlock {P} at (0,706) size 769x20
-        RenderText {#text} at (0,0) size 57x19
+        RenderText {#text} at (0,0) size 61x19
           text run at (0,0) width 23: "Do "
-          text run at (23,0) width 34: "lorem"
+          text run at (23,0) width 38: "\x{AD} lorem"
       RenderBlock {P} at (0,742) size 769x20
         RenderText {#text} at (0,0) size 19x19
           text run at (0,0) width 19: "Do"
         RenderInline {SPAN} at (0,0) size 0x19
         RenderText {#text} at (19,0) size 73x19
-          text run at (19,0) width 73: "lorem ipsum"
+          text run at (19,0) width 73: "\x{AD}lorem ipsum"
       RenderBlock {P} at (0,778) size 769x20
         RenderText {#text} at (0,0) size 92x19
-          text run at (0,0) width 19: "Do"
-          text run at (19,0) width 73: "lorem ipsum"
+          text run at (0,0) width 92: "Do\x{AD}\x{AD}lorem ipsum"
       RenderBlock {P} at (0,814) size 769x20
         RenderInline {SPAN} at (0,0) size 19x19
           RenderText {#text} at (0,0) size 19x19
-            text run at (0,0) width 19: "Do"
+            text run at (0,0) width 19: "Do\x{AD}"
         RenderText {#text} at (19,0) size 73x19
-          text run at (19,0) width 73: "lorem ipsum"
+          text run at (19,0) width 73: "\x{AD}lorem ipsum"
       RenderBlock {P} at (0,850) size 769x20
         RenderText {#text} at (0,0) size 19x19
-          text run at (0,0) width 19: "Do"
+          text run at (0,0) width 19: "Do\x{AD}"
         RenderInline {SPAN} at (0,0) size 73x19
           RenderText {#text} at (19,0) size 73x19
-            text run at (19,0) width 73: "lorem ipsum"
+            text run at (19,0) width 73: "\x{AD}lorem ipsum"
       RenderBlock {P} at (0,886) size 769x20
         RenderInline {SPAN} at (0,0) size 19x19
           RenderText {#text} at (0,0) size 19x19
-            text run at (0,0) width 19: "Do"
+            text run at (0,0) width 19: "Do\x{AD}\x{AD}"
         RenderText {#text} at (19,0) size 73x19
           text run at (19,0) width 73: "lorem ipsum"
       RenderBlock {P} at (0,922) size 769x20
diff --git a/LayoutTests/platform/chromium-win/fast/text/word-break-soft-hyphen-expected.txt b/LayoutTests/platform/chromium-win/fast/text/word-break-soft-hyphen-expected.txt
index 7619c10..b749f4a 100644
--- a/LayoutTests/platform/chromium-win/fast/text/word-break-soft-hyphen-expected.txt
+++ b/LayoutTests/platform/chromium-win/fast/text/word-break-soft-hyphen-expected.txt
@@ -22,6 +22,4 @@ layer at (0,0) size 800x600
 layer at (8,100) size 109x26
   RenderBlock (positioned) {DIV} at (8,100) size 109x26 [border: (3px solid #000000)]
     RenderText {#text} at (3,3) size 103x19
-      text run at (3,3) width 54: "Two soft"
-      text run at (57,3) width 22: "hyp"
-      text run at (79,3) width 27: "hens"
+      text run at (3,3) width 103: "Two soft\x{AD}hyp\x{AD}hens"

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list