Changeset 149450 in webkit

Timestamp:

May 1, 2013 1:37:04 PM (11 years ago)

Author:

enrica@apple.com

Message:

Incorrect layout for blocks containing ideographs with -webkit-linebox-contain: glyphs, font, inline-box.
​https://bugs.webkit.org/show_bug.cgi?id=115478.

Reviewed by Dave Hyatt.

Source/WebCore:

Test: fast/block/lineboxcontain/block-with-ideographs.xhtml

When computing ascent and descent we need to take into account
the baseline type. RootInlineBox::ascentAndDescentForBox failed
to do that in few cases.

• rendering/RootInlineBox.cpp:

(WebCore::RootInlineBox::ascentAndDescentForBox):

LayoutTests:

• fast/block/lineboxcontain/block-with-ideographs.xhtml: Added.
• platform/mac/fast/block/lineboxcontain/block-with-ideographs-expected.txt: Added.
• platform/mac/fast/block/lineboxcontain/block-with-ideographs-expected.png : Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/block/lineboxcontain/block-with-ideographs.xhtml (added)
• LayoutTests/platform/mac/fast/block/lineboxcontain/block-with-ideographs-expected.png (added)
• LayoutTests/platform/mac/fast/block/lineboxcontain/block-with-ideographs-expected.txt (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RootInlineBox.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-05-01  Enrica Casucci  <enrica@apple.com>
+
+        Incorrect layout for blocks containing ideographs with -webkit-linebox-contain: glyphs, font, inline-box.
+        https://bugs.webkit.org/show_bug.cgi?id=115478.
+
+        Reviewed by Dave Hyatt.
+
+        * fast/block/lineboxcontain/block-with-ideographs.xhtml: Added.
+        * platform/mac/fast/block/lineboxcontain/block-with-ideographs-expected.txt: Added.
+        * platform/mac/fast/block/lineboxcontain/block-with-ideographs-expected.png : Added.
+
 2013-05-01  Per-Erik Brodin  <per-erik.brodin@ericsson.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-05-01  Enrica Casucci  <enrica@apple.com>
+
+        Incorrect layout for blocks containing ideographs with -webkit-linebox-contain: glyphs, font, inline-box.
+        https://bugs.webkit.org/show_bug.cgi?id=115478.
+
+        Reviewed by Dave Hyatt.
+
+        Test: fast/block/lineboxcontain/block-with-ideographs.xhtml
+
+        When computing ascent and descent we need to take into account
+        the baseline type. RootInlineBox::ascentAndDescentForBox failed
+        to do that in few cases.
+
+        * rendering/RootInlineBox.cpp:
+        (WebCore::RootInlineBox::ascentAndDescentForBox):
+
 2013-05-01  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebCore/rendering/RootInlineBox.cpp

@@ -844 +844 @@
     
     if (includeFontForBox(box) && !setUsedFont) {
-        int fontAscent = box->renderer()->style(isFirstLineStyle())->fontMetrics().ascent();
-        int fontDescent = box->renderer()->style(isFirstLineStyle())->fontMetrics().descent();
+        int fontAscent = box->renderer()->style(isFirstLineStyle())->fontMetrics().ascent(baselineType());
+        int fontDescent = box->renderer()->style(isFirstLineStyle())->fontMetrics().descent(baselineType());
         setAscentAndDescent(ascent, descent, fontAscent, fontDescent, ascentDescentSet);
         affectsAscent = fontAscent - box->logicalTop() > 0;
@@ -855 +855 @@
         affectsAscent = glyphOverflow->top - box->logicalTop() > 0;
         affectsDescent = glyphOverflow->bottom + box->logicalTop() > 0; 
-        glyphOverflow->top = min(glyphOverflow->top, max(0, glyphOverflow->top - box->renderer()->style(isFirstLineStyle())->fontMetrics().ascent()));
-        glyphOverflow->bottom = min(glyphOverflow->bottom, max(0, glyphOverflow->bottom - box->renderer()->style(isFirstLineStyle())->fontMetrics().descent()));
+        glyphOverflow->top = min(glyphOverflow->top, max(0, glyphOverflow->top - box->renderer()->style(isFirstLineStyle())->fontMetrics().ascent(baselineType())));
+        glyphOverflow->bottom = min(glyphOverflow->bottom, max(0, glyphOverflow->bottom - box->renderer()->style(isFirstLineStyle())->fontMetrics().descent(baselineType())));
     }
 
     if (includeMarginForBox(box)) {
-        LayoutUnit ascentWithMargin = box->renderer()->style(isFirstLineStyle())->fontMetrics().ascent();
-        LayoutUnit descentWithMargin = box->renderer()->style(isFirstLineStyle())->fontMetrics().descent();
+        LayoutUnit ascentWithMargin = box->renderer()->style(isFirstLineStyle())->fontMetrics().ascent(baselineType());
+        LayoutUnit descentWithMargin = box->renderer()->style(isFirstLineStyle())->fontMetrics().descent(baselineType());
         if (box->parent() && !box->renderer()->isText()) {
             ascentWithMargin += box->boxModelObject()->borderBefore() + box->boxModelObject()->paddingBefore() + box->boxModelObject()->marginBefore();