Title: [153053] trunk/LayoutTests
Revision
153053
Author
[email protected]
Date
2013-07-23 09:43:10 -0700 (Tue, 23 Jul 2013)

Log Message

[Qt] REGRESSION(r152906) Modified fast/shapes/shape-inside/shape-inside-overflow.html ref test fails.
https://bugs.webkit.org/show_bug.cgi?id=118964

Reviewed by Andreas Kling.

I modified the test to use Ahem font. Now it's working well on Qt as well.

* fast/shapes/shape-inside/shape-inside-overflow-expected.html:
* fast/shapes/shape-inside/shape-inside-overflow.html:

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (153052 => 153053)


--- trunk/LayoutTests/ChangeLog	2013-07-23 15:36:05 UTC (rev 153052)
+++ trunk/LayoutTests/ChangeLog	2013-07-23 16:43:10 UTC (rev 153053)
@@ -1,3 +1,15 @@
+2013-07-23  Zoltan Horvath  <[email protected]>
+
+        [Qt] REGRESSION(r152906) Modified fast/shapes/shape-inside/shape-inside-overflow.html ref test fails.
+        https://bugs.webkit.org/show_bug.cgi?id=118964
+
+        Reviewed by Andreas Kling.
+
+        I modified the test to use Ahem font. Now it's working well on Qt as well.
+
+        * fast/shapes/shape-inside/shape-inside-overflow-expected.html:
+        * fast/shapes/shape-inside/shape-inside-overflow.html:
+
 2013-07-23  Mario Sanchez Prada  <[email protected]>
 
         [GTK] Unreviewed gardening. Added expectations for flaky tests.

Modified: trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-overflow-expected.html (153052 => 153053)


--- trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-overflow-expected.html	2013-07-23 15:36:05 UTC (rev 153052)
+++ trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-overflow-expected.html	2013-07-23 16:43:10 UTC (rev 153053)
@@ -4,28 +4,28 @@
 <style>
     #container {
         position: relative;
+        font: 20px Ahem, sans-serif;
+        line-height: 20px;
         width: 200px;
         height: 200px;
-        line-height: 20px;
         border: 2px solid blue;
     }
     #shape-inside {
         margin-top: -2px;
-        margin-left: 48px;
+        padding-top: 1px;
+        margin-left: 49px;
         width: 100px;
-        height: 50px;
-        border: 2px solid green;
+        height: 49px;
+        border: 1px solid green;
     }
-    #overflow { margin-top: -2px; }
 </style>
 </head>
 <body>
     <div id="container">
-        <div id="shape-inside">This text should wrap</div>
-        <div id="overflow">
-            inside the green rectangle, and overflow should wrap
-            inside the blue rectangle.
-        </div>
+        <div id="shape-inside">X X X X X X</div>
+        <div>X X X X X X</div>
     </div>
+    <p>Requires Ahem font. The content should wrap inside the green rectangle, and the overflow should wrap inside the blue rectangle.</p>
+
 </body>
 </html>

Modified: trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-overflow.html (153052 => 153053)


--- trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-overflow.html	2013-07-23 15:36:05 UTC (rev 153052)
+++ trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-overflow.html	2013-07-23 16:43:10 UTC (rev 153053)
@@ -7,32 +7,31 @@
 </script>
 <style>
     #container {
+        font: 20px Ahem, sans-serif;
+        line-height: 20px;
         position: relative;
         width: 200px;
         height: 200px;
-        line-height: 20px;
         border: 2px solid blue;
     }
-    #shape-inside {
-        -webkit-shape-inside: rectangle(50px, 0px, 100px, 50px);
-    }
+    #shape-inside { -webkit-shape-inside: rectangle(50px, 0px, 100px, 50px); }
     #border {
         position: absolute;
-        left: 48px;
+        left: 49px;
         width: 100px;
         height: 50px;
         margin-top: -2px;
-        border: 2px solid green;
+        border: 1px solid green;
     }
 </style>
 </head>
 <body>
     <div id="container">
-        <div id="border"></div>
         <div id="shape-inside">
-            This text should wrap inside the green rectangle, and overflow should wrap
-            inside the blue rectangle.
+        <div id="border"></div>
+            X X X X X X X X X X X X
         </div>
     </div>
+    <p>Requires Ahem font. The content should wrap inside the green rectangle, and the overflow should wrap inside the blue rectangle.</p>
 </body>
 </html>

Modified: trunk/LayoutTests/platform/qt/TestExpectations (153052 => 153053)


--- trunk/LayoutTests/platform/qt/TestExpectations	2013-07-23 15:36:05 UTC (rev 153052)
+++ trunk/LayoutTests/platform/qt/TestExpectations	2013-07-23 16:43:10 UTC (rev 153053)
@@ -1924,9 +1924,6 @@
 # [Qt] fast/repaint/fixed-right-bottom-in-page-scale.html test flaky on Debug build and caused regression on the following tests after r118238. 
 webkit.org/b/118238 [ Debug ] fast/repaint/fixed-right-bottom-in-page-scale.html [ Skip ]
 
-# [Qt] REGRESSION(r152906) Modified fast/shapes/shape-inside/shape-inside-overflow.html ref test fails.
-webkit.org/b/118964 fast/shapes/shape-inside/shape-inside-overflow.html [ Skip ]
-
 # ============================================================================= #
 # failing security tests
 # ============================================================================= #
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to