tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / fast / text / capitalize-empty-generated-string-expected.txt

diff --git a/LayoutTests/platform/efl/fast/text/capitalize-empty-generated-string-expected.txt b/LayoutTests/platform/efl/fast/text/capitalize-empty-generated-string-expected.txt
index 86d1c90..1c3bac1 100755 (executable)
--- a/LayoutTests/platform/efl/fast/text/capitalize-empty-generated-string-expected.txt
+++ b/LayoutTests/platform/efl/fast/text/capitalize-empty-generated-string-expected.txt
@@ -2,6 +2,7 @@ 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
+<<<<<<< HEAD
     RenderBody {BODY} at (8,8) size 784x580
       RenderBlock {P} at (0,0) size 784x28
         RenderText {#text} at (0,0) size 131x14
@@ -49,3 +50,52 @@ layer at (0,0) size 800x600
             text run at (67,0) width 46: "should be"
         RenderText {#text} at (113,0) size 67x14
           text run at (113,0) width 67: " Lorem Ipsum"
+=======
+    RenderBody {BODY} at (8,8) size 784x576
+      RenderBlock {P} at (0,0) size 784x38
+        RenderText {#text} at (0,0) size 172x19
+          text run at (0,0) width 172: "This is a regression test for "
+        RenderInline {I} at (0,0) size 769x38
+          RenderInline {A} at (0,0) size 348x19 [color=#0000EE]
+            RenderText {#text} at (172,0) size 348x19
+              text run at (172,0) width 348: "http://bugzilla.opendarwin.org/show_bug.cgi?id=9432"
+          RenderText {#text} at (520,0) size 769x38
+            text run at (520,0) width 4: " "
+            text run at (524,0) width 245: "REGRESSION: crash in capitalization"
+            text run at (0,19) width 273: "code due to empty-string generated content"
+        RenderText {#text} at (273,19) size 4x19
+          text run at (273,19) width 4: "."
+      RenderBlock {HR} at (0,54) size 784x2 [border: (1px inset #000000)]
+      RenderBlock {P} at (0,72) size 784x19
+        RenderInline {SPAN} at (0,0) size 85x19
+          RenderText {#text} at (0,0) size 46x19
+            text run at (0,0) width 46: "Lorem "
+          RenderInline {SPAN} at (0,0) size 39x19
+            RenderInline (generated) at (0,0) size 0x0
+              RenderText at (0,0) size 0x0
+            RenderText {#text} at (46,0) size 39x19
+              text run at (46,0) width 39: "Ipsum"
+        RenderText {#text} at (85,0) size 4x19
+          text run at (85,0) width 4: " "
+        RenderInline {I} at (0,0) size 61x19
+          RenderText {#text} at (89,0) size 61x19
+            text run at (89,0) width 61: "should be"
+        RenderText {#text} at (150,0) size 89x19
+          text run at (150,0) width 89: " Lorem Ipsum"
+      RenderBlock {P} at (0,107) size 784x19
+        RenderInline {SPAN} at (0,0) size 85x19
+          RenderText {#text} at (0,0) size 23x19
+            text run at (0,0) width 23: "Lor"
+          RenderInline {SPAN} at (0,0) size 62x19
+            RenderInline (generated) at (0,0) size 0x0
+              RenderText at (0,0) size 0x0
+            RenderText {#text} at (23,0) size 62x19
+              text run at (23,0) width 62: "em Ipsum"
+        RenderText {#text} at (85,0) size 4x19
+          text run at (85,0) width 4: " "
+        RenderInline {I} at (0,0) size 61x19
+          RenderText {#text} at (89,0) size 61x19
+            text run at (89,0) width 61: "should be"
+        RenderText {#text} at (150,0) size 89x19
+          text run at (150,0) width 89: " Lorem Ipsum"
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d