[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
commit-queue at webkit.org
commit-queue at webkit.org
Wed Dec 22 11:42:48 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 63d05d9e600c9f99db5619c2dbcd2f0bdbd49a09
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Aug 4 19:56:17 2010 +0000
2010-08-04 François Sausset <sausset at 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 François Sausset <sausset at 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):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64668 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 6e21182..2c993a4 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2010-08-04 François Sausset <sausset at 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 at igalia.com>
Reviewed by Jeremy Orlow.
diff --git a/LayoutTests/mathml/presentation/style.xhtml b/LayoutTests/mathml/presentation/style.xhtml
new file mode 100644
index 0000000..b756631
--- /dev/null
+++ b/LayoutTests/mathml/presentation/style.xhtml
@@ -0,0 +1,15 @@
+<html xmlns='http://www.w3.org/1999/xhtml'>
+<head>
+<title>Styled Math Elements</title>
+<style type="text/css">
+math {
+ overflow: auto;
+}
+</style>
+</head>
+<body>
+<p>
+<math xmlns='http://www.w3.org/1998/Math/MathML'><mi>x</mi><mo>+</mo><mn>1</mn></math>
+</p>
+</body>
+</html>
diff --git a/LayoutTests/platform/mac/mathml/presentation/style-expected.checksum b/LayoutTests/platform/mac/mathml/presentation/style-expected.checksum
new file mode 100644
index 0000000..7eaed53
--- /dev/null
+++ b/LayoutTests/platform/mac/mathml/presentation/style-expected.checksum
@@ -0,0 +1 @@
+69ec8704adcae519e65bab550eca524b
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/mathml/presentation/style-expected.png b/LayoutTests/platform/mac/mathml/presentation/style-expected.png
new file mode 100644
index 0000000..bd43f1d
Binary files /dev/null and b/LayoutTests/platform/mac/mathml/presentation/style-expected.png differ
diff --git a/LayoutTests/platform/mac/mathml/presentation/style-expected.txt b/LayoutTests/platform/mac/mathml/presentation/style-expected.txt
new file mode 100644
index 0000000..1229728
--- /dev/null
+++ b/LayoutTests/platform/mac/mathml/presentation/style-expected.txt
@@ -0,0 +1,19 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x51
+ RenderBlock {html} at (0,0) size 800x51
+ RenderBody {body} at (8,16) size 784x19
+ RenderBlock {p} at (0,0) size 784x19
+ RenderText {#text} at (0,0) size 0x0
+layer at (8,16) size 26x19
+ RenderBlock {math} at (0,0) size 26x19
+ RenderInline {mi} at (0,0) size 7x16
+ RenderText {#text} at (1,3) size 7x16
+ text run at (1,3) width 7: "x"
+ RenderBlock {mo} at (8,3) size 9x16
+ RenderBlock {mo} at (0,0) size 9x16
+ RenderText {mo} at (0,0) size 9x16
+ text run at (0,0) width 9: "+"
+ RenderInline {mn} at (0,0) size 8x16
+ RenderText {#text} at (17,3) size 8x16
+ text run at (17,3) width 8: "1"
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index bff0980..b1af845 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2010-08-04 François Sausset <sausset at 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 at google.com>
Reviewed by Nate Chapin.
diff --git a/WebCore/mathml/MathMLInlineContainerElement.cpp b/WebCore/mathml/MathMLInlineContainerElement.cpp
index efc9f8c..5a557d0 100644
--- a/WebCore/mathml/MathMLInlineContainerElement.cpp
+++ b/WebCore/mathml/MathMLInlineContainerElement.cpp
@@ -53,33 +53,30 @@ PassRefPtr<MathMLInlineContainerElement> MathMLInlineContainerElement::create(co
return adoptRef(new MathMLInlineContainerElement(tagName, document));
}
-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);
}
}
diff --git a/WebCore/mathml/MathMLMathElement.cpp b/WebCore/mathml/MathMLMathElement.cpp
index 1b6b18d..6c5c3c6 100644
--- a/WebCore/mathml/MathMLMathElement.cpp
+++ b/WebCore/mathml/MathMLMathElement.cpp
@@ -44,11 +44,9 @@ PassRefPtr<MathMLMathElement> MathMLMathElement::create(const QualifiedName& tag
return adoptRef(new MathMLMathElement(tagName, document));
}
-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);
}
}
diff --git a/WebCore/mathml/MathMLTextElement.cpp b/WebCore/mathml/MathMLTextElement.cpp
index 4135d6c..8f830cb 100644
--- a/WebCore/mathml/MathMLTextElement.cpp
+++ b/WebCore/mathml/MathMLTextElement.cpp
@@ -49,11 +49,8 @@ PassRefPtr<MathMLTextElement> MathMLTextElement::create(const QualifiedName& tag
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);
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list