Title: [172607] trunk/Source/WebCore
- Revision
- 172607
- Author
- zol...@webkit.org
- Date
- 2014-08-14 14:36:40 -0700 (Thu, 14 Aug 2014)
Log Message
[CSS3-Text] Cosmetics on RenderBlockFlow::textAlignmentForLine
https://bugs.webkit.org/show_bug.cgi?id=135940
Reviewed by Darin Adler.
Processing the not CSS3_TEXT case first, and removing an extra whitespace after r172524.
* rendering/RenderBlockLineLayout.cpp:
(WebCore::RenderBlockFlow::textAlignmentForLine):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (172606 => 172607)
--- trunk/Source/WebCore/ChangeLog 2014-08-14 21:34:36 UTC (rev 172606)
+++ trunk/Source/WebCore/ChangeLog 2014-08-14 21:36:40 UTC (rev 172607)
@@ -1,3 +1,15 @@
+2014-08-14 Zoltan Horvath <zol...@webkit.org>
+
+ [CSS3-Text] Cosmetics on RenderBlockFlow::textAlignmentForLine
+ https://bugs.webkit.org/show_bug.cgi?id=135940
+
+ Reviewed by Darin Adler.
+
+ Processing the not CSS3_TEXT case first, and removing an extra whitespace after r172524.
+
+ * rendering/RenderBlockLineLayout.cpp:
+ (WebCore::RenderBlockFlow::textAlignmentForLine):
+
2014-08-14 Martin Hock <mh...@apple.com>
IndexedDB should respect SchemeRegistry's database access setting.
Modified: trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp (172606 => 172607)
--- trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp 2014-08-14 21:34:36 UTC (rev 172606)
+++ trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp 2014-08-14 21:36:40 UTC (rev 172607)
@@ -350,14 +350,16 @@
ETextAlign alignment = style().textAlign();
#if ENABLE(CSS3_TEXT)
TextJustify textJustify = style().textJustify();
- if (alignment == JUSTIFY && textJustify == TextJustifyNone)
+ if (alignment == JUSTIFY && textJustify == TextJustifyNone)
return style().direction() == LTR ? LEFT : RIGHT;
#endif
if (endsWithSoftBreak)
return alignment;
-#if ENABLE(CSS3_TEXT)
+#if !ENABLE(CSS3_TEXT)
+ return (alignment == JUSTIFY) ? TASTART : alignment;
+#else
if (alignment != JUSTIFY)
return alignment;
@@ -381,8 +383,6 @@
return TASTART;
}
return alignment;
-#else
- return (alignment == JUSTIFY) ? TASTART : alignment;
#endif
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
