Changeset 174677 in webkit

Timestamp:

Oct 14, 2014, 2:53:59 AM (12 years ago)

Author:

alex

Message:

Changes in the stretchy attribute do not update rendering
​https://bugs.webkit.org/show_bug.cgi?id=136883

Reviewed by Darin Adler.

Source/WebCore:

Test: mathml/presentation/mo-stretch-update.html

We need to relayout when a change in the stretchy attribute
happens.

• mathml/MathMLTextElement.cpp:

(WebCore::MathMLTextElement::parseAttribute): Parse the
modifications of the stretchy attribute.

• mathml/MathMLTextElement.h:
• rendering/mathml/RenderMathMLOperator.cpp:

(WebCore::RenderMathMLOperator::setOperatorFlagAndScheduleLayoutIfNeeded):
Add function that receives the value instead of looking for it and
checks if the change should schedule a layout.
(WebCore::RenderMathMLOperator::setOperatorFlagFromAttribute):
(WebCore::RenderMathMLOperator::setOperatorFlagFromAttributeValue):
Add function that receives the value instead of looking for it.

• rendering/mathml/RenderMathMLOperator.h:

LayoutTests:

The test updates the stretchy value in a timeout.

• mathml/presentation/mo-stretch-update-expected.html: Added.
• mathml/presentation/mo-stretch-update.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/mathml/MathMLTextElement.cpp (modified) (1 diff)
• Source/WebCore/mathml/MathMLTextElement.h (modified) (2 diffs)
• Source/WebCore/rendering/mathml/RenderMathMLOperator.cpp (modified) (1 diff)
• Source/WebCore/rendering/mathml/RenderMathMLOperator.h (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2014-10-14  Alejandro G. Castro  <alex@igalia.com>
+
+        Changes in the stretchy attribute do not update rendering
+        https://bugs.webkit.org/show_bug.cgi?id=136883
+
+        Reviewed by Darin Adler.
+
+        The test updates the stretchy value in a timeout.
+
+        * mathml/presentation/mo-stretch-update-expected.html: Added.
+        * mathml/presentation/mo-stretch-update.html: Added.
+
 2014-10-14  Andrzej Badowski  <a.badowski@samsung.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-10-14  Alejandro G. Castro  <alex@igalia.com>
+
+        Changes in the stretchy attribute do not update rendering
+        https://bugs.webkit.org/show_bug.cgi?id=136883
+
+        Reviewed by Darin Adler.
+
+        Test: mathml/presentation/mo-stretch-update.html
+
+        We need to relayout when a change in the stretchy attribute
+        happens.
+
+        * mathml/MathMLTextElement.cpp:
+        (WebCore::MathMLTextElement::parseAttribute): Parse the
+        modifications of the stretchy attribute.
+        * mathml/MathMLTextElement.h:
+        * rendering/mathml/RenderMathMLOperator.cpp:
+        (WebCore::RenderMathMLOperator::setOperatorFlagAndScheduleLayoutIfNeeded):
+        Add function that receives the value instead of looking for it and
+        checks if the change should schedule a layout.
+        (WebCore::RenderMathMLOperator::setOperatorFlagFromAttribute):
+        (WebCore::RenderMathMLOperator::setOperatorFlagFromAttributeValue):
+        Add function that receives the value instead of looking for it.
+        * rendering/mathml/RenderMathMLOperator.h:
+
 2014-10-14  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/mathml/MathMLTextElement.cpp

@@ -65 +65 @@
 }
 
+void MathMLTextElement::parseAttribute(const QualifiedName& name, const AtomicString& value)
+{
+    if (name == stretchyAttr) {
+        if (is<RenderMathMLOperator>(renderer()))
+            downcast<RenderMathMLOperator>(*renderer()).setOperatorFlagAndScheduleLayoutIfNeeded(MathMLOperatorDictionary::Stretchy, value);
+        return;
+    }
+
+    MathMLElement::parseAttribute(name, value);
+}
+
 RenderPtr<RenderElement> MathMLTextElement::createElementRenderer(PassRef<RenderStyle> style)
 {

trunk/Source/WebCore/mathml/MathMLTextElement.h

@@ -33 +33 @@
 namespace WebCore {
     
-class MathMLTextElement : public MathMLElement {
+class MathMLTextElement final : public MathMLElement {
 public:
     static PassRefPtr<MathMLTextElement> create(const QualifiedName& tagName, Document&);
@@ -47 +47 @@
 
     virtual void childrenChanged(const ChildChange&) override;
+    virtual void parseAttribute(const QualifiedName&, const AtomicString&) override;
 };
     

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

@@ -1158 +1158 @@
 }
 
+void RenderMathMLOperator::setOperatorFlagAndScheduleLayoutIfNeeded(MathMLOperatorDictionary::Flag flag, const AtomicString& attributeValue)
+{
+    unsigned short oldOperatorFlags = m_operatorFlags;
+
+    setOperatorFlagFromAttributeValue(flag, attributeValue);
+
+    if (oldOperatorFlags != m_operatorFlags)
+        setNeedsLayoutAndPrefWidthsRecalc();
+}
+
 void RenderMathMLOperator::setOperatorFlagFromAttribute(MathMLOperatorDictionary::Flag flag, const QualifiedName& name)
 {
+    setOperatorFlagFromAttributeValue(flag, element().fastGetAttribute(name));
+}
+
+void RenderMathMLOperator::setOperatorFlagFromAttributeValue(MathMLOperatorDictionary::Flag flag, const AtomicString& attributeValue)
+{
     ASSERT(!isAnonymous());
-    const AtomicString& attributeValue = element().fastGetAttribute(name);
+
     if (attributeValue == "true")
         m_operatorFlags |= flag;

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

@@ -80 +80 @@
     void updateTokenContent() override final;
     void updateOperatorProperties();
+    void setOperatorFlagAndScheduleLayoutIfNeeded(MathMLOperatorDictionary::Flag, const AtomicString& attributeValue);
 
 protected:
@@ -187 +188 @@
 
     void setOperatorFlagFromAttribute(MathMLOperatorDictionary::Flag, const QualifiedName&);
+    void setOperatorFlagFromAttributeValue(MathMLOperatorDictionary::Flag, const AtomicString& attributeValue);
     void setOperatorPropertiesFromOpDictEntry(const MathMLOperatorDictionary::Entry*);
     virtual void SetOperatorProperties();