Changeset 184380 in webkit

Timestamp:

May 15, 2015, 4:59:25 AM (10 years ago)

Author:

Carlos Garcia Campos

Message:

Merge r184219 - REGRESSION(r175617): Some text doesn't render on internationalculinarycenter.com
​https://bugs.webkit.org/show_bug.cgi?id=144917
rdar://problem/20545878

Reviewed by Andreas Kling.

This patch ensures that text stroke width value is taken into account while
calculating visual overflow for simple line layout.
Ceiling the text stroke width value matches the normal text layout behaviour.

Source/WebCore:

Test: fast/text/simple-line-layout-text-stroke-width.html

• rendering/SimpleLineLayoutFunctions.cpp:

(WebCore::SimpleLineLayout::paintFlow):
(WebCore::SimpleLineLayout::collectFlowOverflow):

LayoutTests:

• fast/text/simple-line-layout-text-stroke-width-expected.txt: Added.
• fast/text/simple-line-layout-text-stroke-width.html: Added.

Location:

releases/WebKitGTK/webkit-2.8

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/text/simple-line-layout-text-stroke-width-expected.txt (added)
• LayoutTests/fast/text/simple-line-layout-text-stroke-width.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/SimpleLineLayoutFunctions.cpp (modified) (2 diffs)

releases/WebKitGTK/webkit-2.8/LayoutTests/ChangeLog

@@ +1 @@
+2015-05-12  Zalan Bujtas  <zalan@apple.com>
+
+        REGRESSION(r175617): Some text doesn't render on internationalculinarycenter.com
+        https://bugs.webkit.org/show_bug.cgi?id=144917
+        rdar://problem/20545878
+
+        Reviewed by Andreas Kling.
+
+        This patch ensures that text stroke width value is taken into account while
+        calculating visual overflow for simple line layout.
+        Ceiling the text stroke width value matches the normal text layout behaviour.
+
+        * fast/text/simple-line-layout-text-stroke-width-expected.txt: Added.
+        * fast/text/simple-line-layout-text-stroke-width.html: Added.
+
 2015-05-11  Chris Fleizach  <cfleizach@apple.com>
 

releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog

@@ +1 @@
+2015-05-12  Zalan Bujtas  <zalan@apple.com>
+
+        REGRESSION(r175617): Some text doesn't render on internationalculinarycenter.com
+        https://bugs.webkit.org/show_bug.cgi?id=144917
+        rdar://problem/20545878
+
+        Reviewed by Andreas Kling.
+
+        This patch ensures that text stroke width value is taken into account while
+        calculating visual overflow for simple line layout.
+        Ceiling the text stroke width value matches the normal text layout behaviour.
+
+        Test: fast/text/simple-line-layout-text-stroke-width.html
+
+        * rendering/SimpleLineLayoutFunctions.cpp:
+        (WebCore::SimpleLineLayout::paintFlow):
+        (WebCore::SimpleLineLayout::collectFlowOverflow):
+
 2015-05-12  Carlos Garcia Campos  <cgarcia@igalia.com>
 

releases/WebKitGTK/webkit-2.8/Source/WebCore/rendering/SimpleLineLayoutFunctions.cpp

@@ -80 +80 @@
 
     auto resolver = runResolver(flow, layout);
+    float strokeOverflow = ceilf(flow.style().textStrokeWidth());
     for (const auto& run : resolver.rangeForRect(paintRect)) {
-        if (!run.rect().intersects(paintRect))
+        FloatRect rect = run.rect();
+        rect.inflate(strokeOverflow);
+        if (!rect.intersects(paintRect))
             continue;
         TextRun textRun(run.text());
@@ -128 +131 @@
 {
     auto resolver = lineResolver(flow, layout);
+    float strokeOverflow = ceilf(flow.style().textStrokeWidth());
     for (auto it = resolver.begin(), end = resolver.end(); it != end; ++it) {
         auto rect = *it;
+        rect.inflate(strokeOverflow);
         flow.addLayoutOverflow(rect);
         flow.addVisualOverflow(rect);