Convert some fast/regions pixel tests to reftests
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 24 Feb 2012 11:25:18 +0000 (11:25 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 24 Feb 2012 11:25:18 +0000 (11:25 +0000)
https://bugs.webkit.org/show_bug.cgi?id=78906

Patch by Flex Mobile <rhauck@adobe.com> on 2012-02-24
Reviewed by Hajime Morita.

* fast/regions/float-pushed-width-change-expected.html: Added.
* fast/regions/float-pushed-width-change.html:
* platform/chromium/test_expectations.txt:
* platform/efl/fast/regions/float-pushed-width-change-expected.png: Removed.
* platform/efl/fast/regions/float-pushed-width-change-expected.txt: Removed.
* platform/mac/fast/regions/float-pushed-width-change-expected.png: Removed.
* platform/mac/fast/regions/float-pushed-width-change-expected.txt: Removed.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@108766 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/ChangeLog
LayoutTests/fast/regions/float-pushed-width-change-expected.html [new file with mode: 0755]
LayoutTests/fast/regions/float-pushed-width-change.html [changed mode: 0644->0755]
LayoutTests/platform/chromium/test_expectations.txt
LayoutTests/platform/efl/fast/regions/float-pushed-width-change-expected.png [deleted file]
LayoutTests/platform/efl/fast/regions/float-pushed-width-change-expected.txt [deleted file]
LayoutTests/platform/mac/fast/regions/float-pushed-width-change-expected.png [deleted file]
LayoutTests/platform/mac/fast/regions/float-pushed-width-change-expected.txt [deleted file]

index f453034..159342c 100644 (file)
@@ -1,3 +1,18 @@
+2012-02-24  Flex Mobile  <rhauck@adobe.com>
+
+        Convert some fast/regions pixel tests to reftests
+        https://bugs.webkit.org/show_bug.cgi?id=78906
+
+        Reviewed by Hajime Morita.
+
+        * fast/regions/float-pushed-width-change-expected.html: Added.
+        * fast/regions/float-pushed-width-change.html:
+        * platform/chromium/test_expectations.txt:
+        * platform/efl/fast/regions/float-pushed-width-change-expected.png: Removed.
+        * platform/efl/fast/regions/float-pushed-width-change-expected.txt: Removed.
+        * platform/mac/fast/regions/float-pushed-width-change-expected.png: Removed.
+        * platform/mac/fast/regions/float-pushed-width-change-expected.txt: Removed.
+
 2012-02-24  Dale Curtis  <dalecurtis@chromium.org>
 
         [Chromium] video-referer.html fails
diff --git a/LayoutTests/fast/regions/float-pushed-width-change-expected.html b/LayoutTests/fast/regions/float-pushed-width-change-expected.html
new file mode 100755 (executable)
index 0000000..42d857f
--- /dev/null
@@ -0,0 +1,78 @@
+<!doctype html>
+
+ <style>
+
+    @font-face {
+        font-family: webkit-ahem;
+        font-style: normal;
+        src: url(../../resources/Ahem.ttf);
+    }
+   
+    #float1 {
+        float: left;
+        position:fixed;
+        width: 150px;
+        height: 102px;
+        background-color:green;
+        z-index:-1;
+    }
+    
+    #float2 {
+        float:right;
+        width:200px;
+        height:30px;
+        background-color:orange
+    }
+
+    #region1, #region2, #region3 {
+        border: 1px solid black;
+    }
+    #region1 {
+        width: 170px;
+        height: 80px;
+        padding: 5px;
+    }
+    
+    #region2 {
+        width: 390px;
+        height: 89px;
+        padding-top:1px;
+        padding-left:5px;
+        padding-right:5px;
+    }
+    
+    #region3 {
+        width: 385px;
+        height: 80px;
+        padding-left:5px;
+        padding-right:10px;
+        padding-bottom:10px;
+    }
+       
+       p.flow1 {
+               clear:both;
+               margin-bottom: 0px;
+       }
+
+       p.flow2 {
+               margin-top: 0.5px;
+       }
+       
+</style>
+
+<p>In the example below, the green float should be at the top of the first region and on the left. It should spill into region two.
+The orange float should be on the right at the top of region two.</p>
+
+<div id="region1">
+     <p><img id="float1"></p>
+</div>
+<div id="region2">
+    <img id="float2">
+    <p class="flow1">This line of text should not get out of the region. This line of text should not get out of the region.</p>
+</div>
+<div id="region3">
+<p class="flow2">This line of text should not get out of the region. This line of text should not get out of the region.</p>
+<p>This line of text should not get out of the region.</p>
+</div>
+
old mode 100644 (file)
new mode 100755 (executable)
index dbe8be1..1e871b6
@@ -1,9 +1,15 @@
 <!doctype html>
 
  <style>
+
+   @font-face {
+        font-family: webkit-ahem;
+        font-style: normal;
+        src: url(../../resources/Ahem.ttf);
+    }
+
     #content {
         -webkit-flow-into: flow1;
-        text-align: justify;
         padding: 5px;
     }
   
@@ -48,8 +54,10 @@ The orange float should be on the right at the top of region two.</p>
 <div id="content">
     <div id="first-box">
         <div id="second-box">
-            <p><img id="float1"><img id="float2">This line of text  should not get out of the  region. This line of text should not get out of the region. This line of text should not get out of the region. This line of text should not get out of the region.</p>
-            <p>This line of text should not get out of the region..</p>
+            <p><img id="float1"><img id="float2">
+            <p>This line of text should not get out of the region. This line of text should not get out of the region.</p>
+           <p>This line of text should not get out of the region. This line of text should not get out of the region.</p>
+            <p>This line of text should not get out of the region.</p>
             
         </div>
     </div>
@@ -59,4 +67,4 @@ The orange float should be on the right at the top of region two.</p>
     <div id="region1"></div>
     <div id="region2"></div>
     <div id="region3"></div>
-</div>
+</div>
\ No newline at end of file
index e35bbb8..8bdffd7 100644 (file)
@@ -2997,7 +2997,6 @@ BUGWK74219 : fast/regions/positioned-objects-block-static-spanning-regions.html
 
 // Need to evaluate and update regions and exclusions tests.
 BUGWK74137 : fast/regions/bottom-overflow-out-of-first-region.html = PASS FAIL MISSING
-BUGWK74137 : fast/regions/float-pushed-width-change.html = PASS FAIL MISSING
 BUGWK74137 : fast/regions/floats-basic-in-variable-width-regions.html = PASS FAIL MISSING
 BUGWK74137 : fast/regions/flow-content-basic-vertical-rl.html = PASS FAIL MISSING
 BUGWK74137 : fast/regions/flow-content-basic-vertical.html = PASS FAIL MISSING
diff --git a/LayoutTests/platform/efl/fast/regions/float-pushed-width-change-expected.png b/LayoutTests/platform/efl/fast/regions/float-pushed-width-change-expected.png
deleted file mode 100644 (file)
index bd0623b..0000000
Binary files a/LayoutTests/platform/efl/fast/regions/float-pushed-width-change-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/efl/fast/regions/float-pushed-width-change-expected.txt b/LayoutTests/platform/efl/fast/regions/float-pushed-width-change-expected.txt
deleted file mode 100644 (file)
index 9d8d3dc..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x352
-  RenderBlock {HTML} at (0,0) size 800x352
-    RenderBody {BODY} at (8,16) size 784x328
-      RenderBlock {P} at (0,0) size 784x36
-        RenderText {#text} at (0,0) size 764x37
-          text run at (0,0) width 764: "In the example below, the green float should be at the top of the first region and on the left. It should spill into region two."
-          text run at (0,18) width 400: "The orange float should be on the right at the top of region two."
-      RenderBlock {DIV} at (0,52) size 784x276
-        RenderRegion {DIV} at (0,0) size 182x92 [border: (1px solid #000000)]
-        RenderRegion {DIV} at (0,92) size 402x92 [border: (1px solid #000000)]
-        RenderRegion {DIV} at (0,184) size 402x92 [border: (1px solid #000000)]
-Flow Threads
-  Thread with flow-name 'flow1'
-    layer at (0,0) size 400x270
-      RenderFlowThread at (0,0) size 400x270
-        RenderBlock {DIV} at (0,0) size 400x253
-          RenderBlock {DIV} at (5,21) size 390x211
-            RenderBlock {DIV} at (0,0) size 390x211
-              RenderBlock {P} at (0,0) size 390x177
-                RenderImage {IMG} at (0,0) size 150x100 [bgcolor=#008000]
-                RenderImage {IMG} at (190,70) size 200x30 [bgcolor=#FFA500]
-                RenderText {#text} at (0,100) size 390x78
-                  text run at (0,100) width 106: "This line of text "
-                  text run at (106,100) width 161: "should not get out of the "
-                  text run at (267,100) width 123: "region. This line of"
-                  text run at (0,118) width 390: "text should not get out of the region. This line of text should"
-                  text run at (0,136) width 390: "not get out of the region. This line of text should not get out"
-                  text run at (0,159) width 84: "of the region."
-              RenderBlock {P} at (0,193) size 390x18
-                RenderText {#text} at (0,0) size 308x19
-                  text run at (0,0) width 308: "This line of text should not get out of the region.."
-  Regions for flow 'flow1'
-    RenderRegion {DIV} #region1
-    RenderRegion {DIV} #region2
-    RenderRegion {DIV} #region3
diff --git a/LayoutTests/platform/mac/fast/regions/float-pushed-width-change-expected.png b/LayoutTests/platform/mac/fast/regions/float-pushed-width-change-expected.png
deleted file mode 100644 (file)
index 261d7b6..0000000
Binary files a/LayoutTests/platform/mac/fast/regions/float-pushed-width-change-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/fast/regions/float-pushed-width-change-expected.txt b/LayoutTests/platform/mac/fast/regions/float-pushed-width-change-expected.txt
deleted file mode 100644 (file)
index 6158b3b..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x352
-  RenderBlock {HTML} at (0,0) size 800x352
-    RenderBody {BODY} at (8,16) size 784x328
-      RenderBlock {P} at (0,0) size 784x36
-        RenderText {#text} at (0,0) size 764x36
-          text run at (0,0) width 764: "In the example below, the green float should be at the top of the first region and on the left. It should spill into region two."
-          text run at (0,18) width 400: "The orange float should be on the right at the top of region two."
-      RenderBlock {DIV} at (0,52) size 784x276
-        RenderRegion {DIV} at (0,0) size 182x92 [border: (1px solid #000000)]
-        RenderRegion {DIV} at (0,92) size 402x92 [border: (1px solid #000000)]
-        RenderRegion {DIV} at (0,184) size 402x92 [border: (1px solid #000000)]
-Flow Threads
-  Thread with flow-name 'flow1'
-    layer at (0,0) size 400x270
-      RenderFlowThread at (0,0) size 400x270
-        RenderBlock {DIV} at (0,0) size 400x253
-          RenderBlock {DIV} at (5,21) size 390x211
-            RenderBlock {DIV} at (0,0) size 390x211
-              RenderBlock {P} at (0,0) size 390x177
-                RenderImage {IMG} at (0,0) size 150x100 [bgcolor=#008000]
-                RenderImage {IMG} at (190,70) size 200x30 [bgcolor=#FFA500]
-                RenderText {#text} at (0,100) size 390x77
-                  text run at (0,100) width 106: "This line of text "
-                  text run at (106,100) width 161: "should not get out of the "
-                  text run at (267,100) width 123: "region. This line of"
-                  text run at (0,118) width 390: "text should not get out of the region. This line of text should"
-                  text run at (0,136) width 390: "not get out of the region. This line of text should not get out"
-                  text run at (0,159) width 84: "of the region."
-              RenderBlock {P} at (0,193) size 390x18
-                RenderText {#text} at (0,0) size 308x18
-                  text run at (0,0) width 308: "This line of text should not get out of the region.."
-  Regions for flow 'flow1'
-    RenderRegion {DIV} #region1
-    RenderRegion {DIV} #region2
-    RenderRegion {DIV} #region3