Changeset 64668 in webkit

Timestamp:

Aug 4, 2010 12:56:17 PM (14 years ago)

Author:

commit-queue@webkit.org

Message:

2010-08-04 François Sausset <François Sausset>

Reviewed by Kenneth Rohde Christiansen.

Regression test: overflow: auto; on a math element was a cause of crash.
​https://bugs.webkit.org/show_bug.cgi?id=42894

• mathml/presentation/style.xhtml: Added.
• platform/mac/mathml/presentation/style-expected.checksum: Added.
• platform/mac/mathml/presentation/style-expected.png: Added.
• platform/mac/mathml/presentation/style-expected.txt: Added.

2010-08-04 François Sausset <François Sausset>

Reviewed by Kenneth Rohde Christiansen.

Remove unnecessary calls to setStyle() in MathML code that made RenderLayer crash.
​https://bugs.webkit.org/show_bug.cgi?id=42894

Test: mathml/presentation/style.xhtml

• mathml/MathMLInlineContainerElement.cpp: (WebCore::MathMLInlineContainerElement::createRenderer):
• mathml/MathMLMathElement.cpp: (WebCore::MathMLMathElement::createRenderer):
• mathml/MathMLTextElement.cpp: (WebCore::MathMLTextElement::createRenderer):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/mathml/presentation/style.xhtml (added)
• LayoutTests/platform/mac/mathml/presentation/style-expected.checksum (added)
• LayoutTests/platform/mac/mathml/presentation/style-expected.png (added)
• LayoutTests/platform/mac/mathml/presentation/style-expected.txt (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/mathml/MathMLInlineContainerElement.cpp (modified) (1 diff)
• WebCore/mathml/MathMLMathElement.cpp (modified) (1 diff)
• WebCore/mathml/MathMLTextElement.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-08-04  François Sausset  <sausset@gmail.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Regression test: overflow: auto; on a math element was a cause of crash.
+        https://bugs.webkit.org/show_bug.cgi?id=42894
+
+        * mathml/presentation/style.xhtml: Added.
+        * platform/mac/mathml/presentation/style-expected.checksum: Added.
+        * platform/mac/mathml/presentation/style-expected.png: Added.
+        * platform/mac/mathml/presentation/style-expected.txt: Added.
+
 2010-08-04  Mario Sanchez Prada  <msanchez@igalia.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-08-04  François Sausset  <sausset@gmail.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Remove unnecessary calls to setStyle() in MathML code that made RenderLayer crash.
+        https://bugs.webkit.org/show_bug.cgi?id=42894
+
+        Test: mathml/presentation/style.xhtml
+
+        * mathml/MathMLInlineContainerElement.cpp:
+        (WebCore::MathMLInlineContainerElement::createRenderer):
+        * mathml/MathMLMathElement.cpp:
+        (WebCore::MathMLMathElement::createRenderer):
+        * mathml/MathMLTextElement.cpp:
+        (WebCore::MathMLTextElement::createRenderer):
+
 2010-08-03  Kenneth Russell  <kbr@google.com>
 

trunk/WebCore/mathml/MathMLInlineContainerElement.cpp

@@ -54 +54 @@
 }
 
-RenderObject* MathMLInlineContainerElement::createRenderer(RenderArena* arena, RenderStyle* style)
+RenderObject* MathMLInlineContainerElement::createRenderer(RenderArena* arena, RenderStyle*)
 {
-    RenderObject* object;
     if (hasLocalName(MathMLNames::mrowTag))
-        object = new (arena) RenderMathMLRow(this);
+        return new (arena) RenderMathMLRow(this);
     else if (hasLocalName(MathMLNames::msubTag))
-        object = new (arena) RenderMathMLSubSup(this);
+        return new (arena) RenderMathMLSubSup(this);
     else if (hasLocalName(MathMLNames::msupTag))
-        object = new (arena) RenderMathMLSubSup(this);
+        return new (arena) RenderMathMLSubSup(this);
     else if (hasLocalName(MathMLNames::msubsupTag))
-        object = new (arena) RenderMathMLSubSup(this);
+        return new (arena) RenderMathMLSubSup(this);
     else if (hasLocalName(MathMLNames::moverTag))
-        object = new (arena) RenderMathMLUnderOver(this);
+        return new (arena) RenderMathMLUnderOver(this);
     else if (hasLocalName(MathMLNames::munderTag))
-        object = new (arena) RenderMathMLUnderOver(this);
+        return new (arena) RenderMathMLUnderOver(this);
     else if (hasLocalName(MathMLNames::munderoverTag))
-        object = new (arena) RenderMathMLUnderOver(this);
+        return new (arena) RenderMathMLUnderOver(this);
     else if (hasLocalName(MathMLNames::mfracTag))
-        object = new (arena) RenderMathMLFraction(this);
+        return new (arena) RenderMathMLFraction(this);
     else if (hasLocalName(MathMLNames::msqrtTag))
-        object = new (arena) RenderMathMLSquareRoot(this);
+        return new (arena) RenderMathMLSquareRoot(this);
     else if (hasLocalName(MathMLNames::mrootTag))
-        object = new (arena) RenderMathMLRoot(this);
+        return new (arena) RenderMathMLRoot(this);
     else
-        object = new (arena) RenderMathMLBlock(this);
-    object->setStyle(style);
-    return object;
+        return new (arena) RenderMathMLBlock(this);
 }
 

trunk/WebCore/mathml/MathMLMathElement.cpp

@@ -45 +45 @@
 }
 
-RenderObject* MathMLMathElement::createRenderer(RenderArena* arena, RenderStyle* style)
+RenderObject* MathMLMathElement::createRenderer(RenderArena* arena, RenderStyle*)
 {
-    RenderMathMLMath* renderer = new (arena) RenderMathMLMath(this);
-    renderer->setStyle(style);
-    return renderer;
+    return new (arena) RenderMathMLMath(this);
 }
 

trunk/WebCore/mathml/MathMLTextElement.cpp

@@ -50 +50 @@
 RenderObject* MathMLTextElement::createRenderer(RenderArena* arena, RenderStyle* style)
 {
-    if (hasLocalName(MathMLNames::moTag)) {
-        RenderObject* object = new (arena) RenderMathMLOperator(this);
-        object->setStyle(style);
-        return object;
-    }
+    if (hasLocalName(MathMLNames::moTag))
+        return new (arena) RenderMathMLOperator(this);
 
     return MathMLElement::createRenderer(arena, style);