Changeset 165464 in webkit

Timestamp:

Mar 12, 2014 2:49:59 AM (10 years ago)

Author:

fred.wang@free.fr

Message:

Invisible Operators should not add space.
​https://bugs.webkit.org/show_bug.cgi?id=115786

Reviewed by Chris Fleizach.

Source/WebCore:

This change adds special handling for invisible operator to ensure they really behave as empty box. We now ignore their glyph widths and do not paint them.

Test: mathml/presentation/mo-invisible.html

• rendering/mathml/RenderMathMLOperator.cpp:

(WebCore::RenderMathMLOperator::computePreferredLogicalWidths):
(WebCore::RenderMathMLOperator::paint):

• rendering/mathml/RenderMathMLOperator.h:

LayoutTests:

Add a reftest based on the examples of the MathML specification to verify that invisible operators do not add space.

• mathml/presentation/mo-invisible-expected.html: Added.
• mathml/presentation/mo-invisible.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/mathml/presentation/mo-invisible-expected.html (added)
• LayoutTests/mathml/presentation/mo-invisible.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/mathml/RenderMathMLOperator.cpp (modified) (2 diffs)
• Source/WebCore/rendering/mathml/RenderMathMLOperator.h (modified) (1 diff)
• Source/WebCore/rendering/mathml/RenderMathMLRow.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2014-03-12  Frédéric Wang  <fred.wang@free.fr>
+
+        Invisible Operators should not add space.
+        https://bugs.webkit.org/show_bug.cgi?id=115786
+
+        Reviewed by Chris Fleizach.
+
+        Add a reftest based on the examples of the MathML specification to verify that invisible operators do not add space.
+
+        * mathml/presentation/mo-invisible-expected.html: Added.
+        * mathml/presentation/mo-invisible.html: Added.
+
 2014-03-11  Frédéric Wang  <fred.wang@free.fr>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-03-12  Frédéric Wang  <fred.wang@free.fr>
+
+        Invisible Operators should not add space.
+        https://bugs.webkit.org/show_bug.cgi?id=115786
+
+        Reviewed by Chris Fleizach.
+
+        This change adds special handling for invisible operator to ensure they really behave as empty box. We now ignore their glyph widths and do not paint them.
+
+        Test: mathml/presentation/mo-invisible.html
+
+        * rendering/mathml/RenderMathMLOperator.cpp:
+        (WebCore::RenderMathMLOperator::computePreferredLogicalWidths):
+        (WebCore::RenderMathMLOperator::paint):
+        * rendering/mathml/RenderMathMLOperator.h:
+
 2014-03-11  Frédéric Wang  <fred.wang@free.fr>
 

trunk/Source/WebCore/rendering/mathml/RenderMathMLOperator.cpp

@@ -1303 +1303 @@
     if (!allowStretching) {
         RenderMathMLToken::computePreferredLogicalWidths();
+        if (isInvisibleOperator()) {
+            // In some fonts, glyphs for invisible operators have nonzero width. Consequently, we subtract that width here to avoid wide gaps.
+            float glyphWidth = advanceForCharacter(m_operator);
+            ASSERT(glyphWidth <= m_minPreferredLogicalWidth);
+            m_minPreferredLogicalWidth -= glyphWidth;
+            m_maxPreferredLogicalWidth -= glyphWidth;
+        }
         return;
     }
@@ -1530 +1537 @@
 void RenderMathMLOperator::paint(PaintInfo& info, const LayoutPoint& paintOffset)
 {
-    if (info.context->paintingDisabled() || info.phase != PaintPhaseForeground || style().visibility() != VISIBLE)
+    // We skip painting for invisible operators too to avoid some "missing character" glyph to appear if appropriate math fonts are not available.
+    if (info.context->paintingDisabled() || info.phase != PaintPhaseForeground || style().visibility() != VISIBLE || isInvisibleOperator())
         return;
 

trunk/Source/WebCore/rendering/mathml/RenderMathMLOperator.h

@@ -88 +88 @@
     virtual bool isRenderMathMLOperator() const override { return true; }
     bool isFencedOperator() { return isAnonymous(); }
+    // The following operators are invisible: U+2061 FUNCTION APPLICATION, U+2062 INVISIBLE TIMES, U+2063 INVISIBLE SEPARATOR, U+2064 INVISIBLE PLUS.
+    bool isInvisibleOperator() const { return 0x2061 <= m_operator && m_operator <= 0x2064; }
     virtual bool isChildAllowed(const RenderObject&, const RenderStyle&) const override;
     virtual void computePreferredLogicalWidths() override;

trunk/Source/WebCore/rendering/mathml/RenderMathMLRow.cpp

@@ -60 +60 @@
     for (RenderObject* child = firstChild(); child; child = child->nextSibling()) {
         if (child->isRenderMathMLBlock()) {
-            auto renderOperator = toRenderMathMLBlock(child)->unembellishedOperator();
-            if (renderOperator)
+            if (auto renderOperator = toRenderMathMLBlock(child)->unembellishedOperator())
                 renderOperator->updateOperatorProperties();
         }