X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=LayoutTests%2Fplatform%2Fefl%2Ffast%2Frepaint%2Fbugzilla-6388-expected.txt;h=fb1aa64a3f091b1133e443b66c31792cb053f869;hb=b96e33af77ac7d81a666d5aa202235b793aeeb21;hp=ae2d943c18fc12f0771e1d49f7492391e1f16137;hpb=2632619e54bc9f41ccea7c574710fe213e49212d;p=framework%2Fweb%2Fwebkit-efl.git

diff --git a/LayoutTests/platform/efl/fast/repaint/bugzilla-6388-expected.txt b/LayoutTests/platform/efl/fast/repaint/bugzilla-6388-expected.txt
index ae2d943..fb1aa64 100755
--- a/LayoutTests/platform/efl/fast/repaint/bugzilla-6388-expected.txt
+++ b/LayoutTests/platform/efl/fast/repaint/bugzilla-6388-expected.txt
@@ -1,5 +1,6 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x224
   RenderBlock {HTML} at (0,0) size 800x224
     RenderBody {BODY} at (8,12) size 784x204
@@ -33,5 +34,40 @@ layer at (0,0) size 800x224
 layer at (8,102) size 100x100
   RenderBlock (relative positioned) {DIV} at (0,90) size 100x100
 layer at (-92,102) size 200x100 backgroundClip at (8,102) size 100x100 clip at (8,102) size 100x100 outlineClip at (8,102) size 100x100
+=======
+layer at (0,0) size 800x260
+  RenderBlock {HTML} at (0,0) size 800x260
+    RenderBody {BODY} at (8,16) size 784x236
+      RenderBlock {P} at (0,0) size 784x19
+        RenderInline {B} at (0,0) size 62x19
+          RenderText {#text} at (0,0) size 62x19
+            text run at (0,0) width 62: "BUG ID:"
+        RenderText {#text} at (62,0) size 4x19
+          text run at (62,0) width 4: " "
+        RenderInline {A} at (0,0) size 117x19 [color=#0000EE]
+          RenderText {#text} at (66,0) size 117x19
+            text run at (66,0) width 117: "Bugzilla bug 6388"
+        RenderText {#text} at (183,0) size 491x19
+          text run at (183,0) width 491: " REGRESSION: Incomplete repaint when dragging the map on Google maps"
+      RenderBlock {P} at (0,35) size 784x25 [bgcolor=#98FB98]
+        RenderInline {B} at (0,0) size 91x19
+          RenderText {#text} at (3,3) size 91x19
+            text run at (3,3) width 91: "TEST PASS:"
+        RenderText {#text} at (94,3) size 241x19
+          text run at (94,3) width 4: " "
+          text run at (98,3) width 237: "The blue square will change to green."
+      RenderBlock {P} at (0,76) size 784x25 [bgcolor=#FF3300]
+        RenderInline {B} at (0,0) size 90x19
+          RenderText {#text} at (3,3) size 90x19
+            text run at (3,3) width 90: "TEST FAIL:"
+        RenderText {#text} at (93,3) size 279x19
+          text run at (93,3) width 4: " "
+          text run at (97,3) width 275: "The blue square will NOT change to green."
+      RenderBlock (anonymous) at (0,217) size 784x19
+        RenderBR {BR} at (0,0) size 0x19
+layer at (8,133) size 100x100
+  RenderBlock (relative positioned) {DIV} at (0,117) size 100x100
+layer at (-92,133) size 200x100 backgroundClip at (8,133) size 100x100 clip at (8,133) size 100x100 outlineClip at (8,133) size 100x100
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
   RenderBlock (positioned) {DIV} at (0,0) size 200x100 [bgcolor=#008000]
     RenderBlock {DIV} at (0,0) size 100x100 [bgcolor=#0000FF]