Changeset 148658 in webkit

Timestamp:

Apr 17, 2013 9:25:46 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[css3-text] Rendering -webkit-hanging value for text-indent from css3-text
​https://bugs.webkit.org/show_bug.cgi?id=114663

Patch by Jaehun Lim <​ljaehun.lim@samsung.com> on 2013-04-17
Reviewed by Beth Dakin.

This patch is the rendering part to support hanging value for text-indent.
"hanging" means "Inverts which lines are affected."
It's prefixed and guarded by CSS3_TEXT flag.

Spec: ​http://dev.w3.org/csswg/css-text/#text-indent

Source/WebCore:

Test: fast/css3-text/css3-text-indent/text-indent-each-line-hanging.html

• rendering/RenderBlockLineLayout.cpp:

(WebCore::requiresIndent): Inverted the return value when "-webkit-hanging" is applied.

LayoutTests:

Renamed and updated the existing testcases.

• fast/css3-text/css3-text-indent/text-indent-each-line-hanging-expected.html: Renamed from LayoutTests/fast/css3-text/css3-text-indent/text-indent-each-line-expected.html
• fast/css3-text/css3-text-indent/text-indent-each-line-hanging.html: Renamed from LayoutTests/fast/css3-text/css3-text-indent/text-indent-each-line.html.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/css3-text/css3-text-indent/text-indent-each-line-expected.html (deleted)
• LayoutTests/fast/css3-text/css3-text-indent/text-indent-each-line-hanging-expected.html (added)
• LayoutTests/fast/css3-text/css3-text-indent/text-indent-each-line-hanging.html (moved) (moved from trunk/LayoutTests/fast/css3-text/css3-text-indent/text-indent-each-line.html) (3 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBlockLineLayout.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-04-17  Jaehun Lim  <ljaehun.lim@samsung.com>
+
+        [css3-text] Rendering -webkit-hanging value for text-indent from css3-text
+        https://bugs.webkit.org/show_bug.cgi?id=114663
+
+        Reviewed by Beth Dakin.
+
+        This patch is the rendering part to support hanging value for text-indent.
+        "hanging" means "Inverts which lines are affected."
+        It's prefixed and guarded by CSS3_TEXT flag.
+
+        Spec: http://dev.w3.org/csswg/css-text/#text-indent
+
+        Renamed and updated the existing testcases.
+       
+        * fast/css3-text/css3-text-indent/text-indent-each-line-hanging-expected.html: Renamed from LayoutTests/fast/css3-text/css3-text-indent/text-indent-each-line-expected.html
+        * fast/css3-text/css3-text-indent/text-indent-each-line-hanging.html: Renamed from LayoutTests/fast/css3-text/css3-text-indent/text-indent-each-line.html.
+
 2013-04-17  James Craig  <james@cookiecrook.com>
 

trunk/LayoutTests/fast/css3-text/css3-text-indent/text-indent-each-line-hanging.html

@@ -5 +5 @@
     div { width:80px; font: 10px Ahem; background-color:lightgray; }
     .normal { text-indent: 4em; }
-    .eachline { width:80px; text-indent: 4em -webkit-each-line; }
+    .eachline { text-indent: 4em -webkit-each-line; }
+    .hanging { text-indent: 4em -webkit-hanging; }
+    .eachlinehanging { text-indent: 4em -webkit-each-line -webkit-hanging; }
     .indent { color: blue; }
     </style>
@@ -17 +19 @@
 <!-- normal text-indent -->
 <div class="normal">
-<span class="indent">xxxx</span><br>xxxx<br>xxxx
+<span class="indent">xxxx</span> xxxx<br>xxxx
 </div>
 <br>
@@ -34 +36 @@
 <span class="indent">xxxx</span> xxxx<br><span class="indent">xxxx</span>
 </div>
+<br>
+<!-- normal text-indent with -webkit-hanging -->
+<div class="hanging">
+xxxx <span class="indent">xxxx</span><br><span class="indent">xxxx</span>
+</div>
+<br>
+<!-- -webkit-each-line and -webkit-hanging with a soft wrap break -->
+<div class="eachlinehanging">
+xxxx <span class="indent">xxxx</span> <span class="indent">xxxx</span>
+</div>
+<br>
+<!-- -webkit-each-line and -webkit-hanging with a forced line break -->
+<div class="eachlinehanging">
+xxxx<br>xxxx<br>xxxx
+</div>
+<br>
+<!-- -webkit-each-line and -webkit-hanging with a soft wrap break and a forced line break -->
+<div class="eachlinehanging">
+xxxx <span class="indent">xxxx</span><br>xxxx
+</div>
 </body>
 </html>

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-04-17  Jaehun Lim  <ljaehun.lim@samsung.com>
+
+        [css3-text] Rendering -webkit-hanging value for text-indent from css3-text
+        https://bugs.webkit.org/show_bug.cgi?id=114663
+
+        Reviewed by Beth Dakin.
+
+        This patch is the rendering part to support hanging value for text-indent.
+        "hanging" means "Inverts which lines are affected."
+        It's prefixed and guarded by CSS3_TEXT flag.
+
+        Spec: http://dev.w3.org/csswg/css-text/#text-indent
+
+        Test: fast/css3-text/css3-text-indent/text-indent-each-line-hanging.html
+
+        * rendering/RenderBlockLineLayout.cpp:
+        (WebCore::requiresIndent): Inverted the return value when "-webkit-hanging" is applied.
+
 2013-04-17  James Craig  <james@cookiecrook.com>
 

trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp

@@ -996 +996 @@
 static IndentTextOrNot requiresIndent(bool isFirstLine, bool isAfterHardLineBreak, RenderStyle* style)
 {
+    IndentTextOrNot shouldIndentText = DoNotIndentText;
     if (isFirstLine)
-        return IndentText;
+        shouldIndentText = IndentText;
 #if ENABLE(CSS3_TEXT)
-    if (isAfterHardLineBreak && style->textIndentLine() == TextIndentEachLine) 
-        return IndentText;
+    else if (isAfterHardLineBreak && style->textIndentLine() == TextIndentEachLine) 
+        shouldIndentText = IndentText;
+
+    if (style->textIndentType() == TextIndentHanging)
+        shouldIndentText = shouldIndentText == IndentText ? DoNotIndentText : IndentText;
 #else
     UNUSED_PARAM(isAfterHardLineBreak);
     UNUSED_PARAM(style);
 #endif
-    return DoNotIndentText;
+    return shouldIndentText;
 }