Modified: trunk/LayoutTests/ChangeLog (126265 => 126266)
--- trunk/LayoutTests/ChangeLog 2012-08-22 05:46:33 UTC (rev 126265)
+++ trunk/LayoutTests/ChangeLog 2012-08-22 06:43:53 UTC (rev 126266)
@@ -2,6 +2,16 @@
[Chromium] Unreviewed gardening.
+ Restore expected results for Chromium after r126219. See
+ https://bugs.webkit.org/show_bug.cgi?id=94672 .
+
+ * platform/chromium/fast/text/emphasis-combined-text-expected.png: Added.
+ * platform/chromium/fast/text/emphasis-combined-text-expected.txt: Added.
+
+2012-08-21 Dominic Cooney <[email protected]>
+
+ [Chromium] Unreviewed gardening.
+
Rebaseline tests after http://trac.webkit.org/changeset/126183 .
These are the same results as platform/mac-lion, which until
r126183 where the results of platform/mac. So this is "reverting"
Added: trunk/LayoutTests/platform/chromium/fast/text/emphasis-combined-text-expected.txt (0 => 126266)
--- trunk/LayoutTests/platform/chromium/fast/text/emphasis-combined-text-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/chromium/fast/text/emphasis-combined-text-expected.txt 2012-08-22 06:43:53 UTC (rev 126266)
@@ -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 744x584
+ RenderBlock {P} at (0,0) size 84x584
+ RenderInline {SPAN} at (0,0) size 48x194
+ RenderText {#text} at (24,0) size 48x97
+ text run at (24,0) width 97: "\x{6587}\x{5B57}"
+ RenderInline {SPAN} at (0,0) size 48x49
+ RenderCombineText {#text} at (24,96) size 48x49
+ text run at (24,96) width 48: "\x{FFFC}"
+ RenderText {#text} at (24,144) size 48x50
+ text run at (24,144) width 49: "\x{5E74}"
+ RenderText {#text} at (0,0) size 0x0
+ RenderBlock {P} at (132,0) size 84x584
+ RenderInline {SPAN} at (0,0) size 48x194
+ RenderText {#text} at (24,0) size 48x97
+ text run at (24,0) width 97: "\x{6587}\x{5B57}"
+ RenderInline {SPAN} at (0,0) size 48x49
+ RenderCombineText {#text} at (24,96) size 48x49
+ text run at (24,96) width 48: "\x{FFFC}"
+ RenderText {#text} at (24,144) size 48x50
+ text run at (24,144) width 49: "\x{5E74}"
+ RenderText {#text} at (0,0) size 0x0
+ RenderBlock {P} at (264,0) size 84x584
+ RenderInline {SPAN} at (0,0) size 48x194
+ RenderText {#text} at (24,0) size 48x97
+ text run at (24,0) width 97: "\x{6587}\x{5B57}"
+ RenderInline {SPAN} at (0,0) size 48x49
+ RenderCombineText {#text} at (24,96) size 48x49
+ text run at (24,96) width 48: "\x{FFFC}"
+ RenderText {#text} at (24,144) size 48x50
+ text run at (24,144) width 49: "\x{5E74}"
+ RenderText {#text} at (0,0) size 0x0