tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / fast / forms / range / slider-thumb-shared-style-expected.txt

diff --git a/LayoutTests/platform/efl/fast/forms/range/slider-thumb-shared-style-expected.txt b/LayoutTests/platform/efl/fast/forms/range/slider-thumb-shared-style-expected.txt
index 57aa88a..e4cec80 100755 (executable)
--- a/LayoutTests/platform/efl/fast/forms/range/slider-thumb-shared-style-expected.txt
+++ b/LayoutTests/platform/efl/fast/forms/range/slider-thumb-shared-style-expected.txt
@@ -3,6 +3,7 @@ layer at (0,0) size 800x600
 layer at (0,0) size 800x600
   RenderBlock {HTML} at (0,0) size 800x600
     RenderBody {BODY} at (8,8) size 784x584
+<<<<<<< HEAD
       RenderBlock {P} at (0,0) size 784x14
         RenderText {#text} at (0,0) size 40x14
           text run at (0,0) width 40: "Test for "
@@ -19,6 +20,24 @@ layer at (0,0) size 800x600
         RenderText {#text} at (0,0) size 213x14
           text run at (0,0) width 213: "The first slider\x{2019}s thumb should be on the left."
       RenderBlock {DIV} at (0,52) size 784x30
+=======
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 53x19
+          text run at (0,0) width 53: "Test for "
+        RenderInline {I} at (0,0) size 709x19
+          RenderInline {A} at (0,0) size 301x19 [color=#0000EE]
+            RenderText {#text} at (53,0) size 301x19
+              text run at (53,0) width 301: "http://bugs.webkit.org/show_bug.cgi?id=13800"
+          RenderText {#text} at (354,0) size 408x19
+            text run at (354,0) width 4: " "
+            text run at (358,0) width 404: "REGRESSION: Moving a slider moves another unrelated slider"
+        RenderText {#text} at (762,0) size 4x19
+          text run at (762,0) width 4: "."
+      RenderBlock {P} at (0,35) size 784x19
+        RenderText {#text} at (0,0) size 282x19
+          text run at (0,0) width 282: "The first slider\x{2019}s thumb should be on the left."
+      RenderBlock {DIV} at (0,70) size 784x30
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
         RenderSlider {INPUT} at (2,2) size 129x11 [bgcolor=#FFFFFF]
           RenderDeprecatedFlexibleBox {DIV} at (0,0) size 129x11
             RenderBlock {DIV} at (0,0) size 117x12
@@ -29,7 +48,13 @@ layer at (0,0) size 800x600
             RenderBlock {DIV} at (0,0) size 117x12
             RenderBlock {DIV} at (117,0) size 12x12
         RenderText {#text} at (0,0) size 0x0
+<<<<<<< HEAD
 layer at (10,62) size 12x12
   RenderBlock (relative positioned) {DIV} at (0,0) size 12x12
 layer at (127,77) size 12x12
+=======
+layer at (10,80) size 12x12
+  RenderBlock (relative positioned) {DIV} at (0,0) size 12x12
+layer at (127,95) size 12x12
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
   RenderBlock (relative positioned) {DIV} at (0,0) size 12x12