[CSSRegions] Change fast/regions/webkit-flow-inlines-inside-regions-b…

…ounds[-vertical] tests to make them platform independent https://bugs.webkit.org/show_bug.cgi?id=115851 Patch by Radu Stavila <stavila@adobe.com> on 2013-05-09 Reviewed by Antti Koivisto. Modified tests to make them platform independent by using Ahem and no font smoothing. * fast/regions/webkit-flow-inlines-inside-regions-bounds-expected.html: * fast/regions/webkit-flow-inlines-inside-regions-bounds-vertical-expected.html: * fast/regions/webkit-flow-inlines-inside-regions-bounds-vertical.html: * fast/regions/webkit-flow-inlines-inside-regions-bounds.html: Canonical link: https://commits.webkit.org/134263@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@149803 268f45cc-cd09-0410-ab3c-d52691b4dbfc
WebKit · May 9, 2013 · d60b56f · d60b56f
1 parent e9205fc
commit d60b56f
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 17 deletions.
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
@@ -1,3 +1,17 @@
+2013-05-09  Radu Stavila  <stavila@adobe.com>
+
+        [CSSRegions] Change fast/regions/webkit-flow-inlines-inside-regions-bounds[-vertical] tests to make them platform independent
+        https://bugs.webkit.org/show_bug.cgi?id=115851
+
+        Reviewed by Antti Koivisto.
+
+        Modified tests to make them platform independent by using Ahem and no font smoothing.
+
+        * fast/regions/webkit-flow-inlines-inside-regions-bounds-expected.html:
+        * fast/regions/webkit-flow-inlines-inside-regions-bounds-vertical-expected.html:
+        * fast/regions/webkit-flow-inlines-inside-regions-bounds-vertical.html:
+        * fast/regions/webkit-flow-inlines-inside-regions-bounds.html:
+
 2013-05-09  Radu Stavila  <stavila@adobe.com>
 
         [Qt][EFL][GTK] Failing CSS region tests

diff --git a/LayoutTests/fast/regions/webkit-flow-inlines-inside-regions-bounds-expected.html b/LayoutTests/fast/regions/webkit-flow-inlines-inside-regions-bounds-expected.html
@@ -2,13 +2,17 @@
 
  <style>
     .test_paragraph {
-        margin-top: 16px;
+        margin-top: 1em;
+        margin-bottom: 1em;
         text-align: justify;
+        font-family: Ahem;
+        font-size: 10px;
+        -webkit-font-smoothing: none;
     }
 
     /* Created to justify the last line of text in the div */
     #paragraph1:after {
-        content: " ____";
+        content: " ___________________";
         line-height: 0;
         visibility: hidden;
     }
@@ -36,10 +40,10 @@
     #first-paragraph2 {
         margin-top: 0px;
     }
-    
+
     /* Created to justify the last line of text in the div */
-    #second-paragraph2:after {
-        content: " ____";
+    #third-paragraph2:after {
+        content: " ___________________";
         line-height: 0;
         visibility: hidden;
     }
@@ -90,32 +94,32 @@
         border: 1px solid green;
         border-top: none;
         width: 86px;
-        height: 88px;
     }
 </style>
 
 <div id="content">
     <div id="region1">
         <div id="first-box1">
             <div id="second-box1">
-                <div class="test_paragraph" id="paragraph1">This line of text should not get out of the region. This line of text should</div>
+                <div class="test_paragraph" id="paragraph1">This line of text should not get out of the region. This line of text should not get out of the</div>
             </div>
         </div>
     </div>
 
     <div id="region2">
         <div id="first-box2">
             <div id="second-box2">
-                <div class="test_paragraph" id="first-paragraph2">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.</div>
-                <div class="test_paragraph" id="second-paragraph2">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.</div>
+                <div class="test_paragraph" id="first-paragraph2">region. This line of text should not get out of the region. This line of text should not get out of the region.</div>
+                <div class="test_paragraph">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.</div>
+                <div class="test_paragraph" id="third-paragraph2">This line of text should not get out of the region. This line of text should</div>
             </div>
         </div>
     </div>
 
     <div id="region3">
         <div id="first-box3">
             <div id="second-box3">
-                <div class="test_paragraph" id="paragraph3">This line of text should not get out of the region.</div>
+                <div class="test_paragraph" id="paragraph3">not get out of the region.</div>
             </div>
         </div>
     </div>

diff --git a/LayoutTests/fast/regions/webkit-flow-inlines-inside-regions-bounds-vertical-expected.html b/LayoutTests/fast/regions/webkit-flow-inlines-inside-regions-bounds-vertical-expected.html
@@ -4,8 +4,12 @@
     html { -webkit-writing-mode: vertical-lr }
 
     .test_paragraph {
-        margin-left: 16px;
+        margin-left: 1em;
+        margin-right: 1em;
         text-align: justify;
+        font-family: Ahem;
+        font-size: 10px;
+        -webkit-font-smoothing: none;
     }
 
     /* Created to justify the last line of text in the div */
@@ -39,6 +43,13 @@
         margin-left: 0px;
     }
 
+    /* Created to justify the last line of text in the div */
+    #third-paragraph2:after {
+        content: " ____";
+        line-height: 0;
+        visibility: hidden;
+    }
+
     #region2 {
         border: 1px solid black;
         width: 290px;
@@ -84,7 +95,6 @@
         margin-left: -5px;
         border: 1px solid green;
         border-left: none;
-        width: 88px;
         height: 86px;
     }
 </style>
@@ -93,24 +103,25 @@
     <div id="region1">
         <div id="first-box1">
             <div id="second-box1">
-                <div class="test_paragraph"  id="paragraph1">This line of text should not get out of the region. This line of text should not</div>
+                <div class="test_paragraph" id="paragraph1">This line of text should not get out of the region. This line of text should not get</div>
             </div>
         </div>
     </div>
 
     <div id="region2">
         <div id="first-box2">
             <div id="second-box2">
-                <div class="test_paragraph"  id="first-paragraph2">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.</div>
-                <div class="test_paragraph"  id="second-paragraph2">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.</div>
+                <div class="test_paragraph" id="first-paragraph2">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.</div>
+                <div class="test_paragraph">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.</div>
+                <div class="test_paragraph" id="third-paragraph2">This line of text should</div>
             </div>
         </div>
     </div>
 
     <div id="region3">
         <div id="first-box3">
             <div id="second-box3">
-                <div class="test_paragraph" id="paragraph3">This line of text should not get out of the region.</div>
+                <div class="test_paragraph" id="paragraph3">not get out of the region.</div>
             </div>
         </div>
     </div>

diff --git a/LayoutTests/fast/regions/webkit-flow-inlines-inside-regions-bounds-vertical.html b/LayoutTests/fast/regions/webkit-flow-inlines-inside-regions-bounds-vertical.html
@@ -7,6 +7,9 @@
         -webkit-flow-into: flow1;
         text-align: justify;
         padding: 5px;
+        font-family: Ahem;
+        font-size: 10px;
+        -webkit-font-smoothing: none;
     }
 
     #first-box {

diff --git a/LayoutTests/fast/regions/webkit-flow-inlines-inside-regions-bounds.html b/LayoutTests/fast/regions/webkit-flow-inlines-inside-regions-bounds.html
@@ -5,6 +5,9 @@
         -webkit-flow-into: flow1;
         text-align: justify;
         padding: 5px;
+        font-family: Ahem;
+        font-size: 10px;
+        -webkit-font-smoothing: none;
     }
 
     #first-box {
@@ -42,7 +45,7 @@
         <div id="second-box">
             <p>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. 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>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>
 </div>