Diff
Modified: trunk/LayoutTests/ChangeLog (107018 => 107019)
--- trunk/LayoutTests/ChangeLog 2012-02-08 01:37:55 UTC (rev 107018)
+++ trunk/LayoutTests/ChangeLog 2012-02-08 01:49:27 UTC (rev 107019)
@@ -1,3 +1,17 @@
+2012-02-07 David Barton <dbar...@mathscribe.com>
+
+ Remove extraneous MathML code before bug 52444 fix
+ https://bugs.webkit.org/show_bug.cgi?id=78034
+
+ Reviewed by Eric Seidel.
+
+ The rendering of the scrollbar in row-expected.png was flaky, presumably due to a test
+ environment timing issue, so I removed it.
+
+ * mathml/presentation/row.xhtml:
+ * platform/mac/mathml/presentation/row-expected.png:
+ * platform/mac/mathml/presentation/row-expected.txt:
+
2012-02-07 Ami Fischman <fisch...@chromium.org>
Override expected-failure mac-leopard/media/media-blocked-by-beforeload-expected.txt with copy of expected-success expectation, for chromium-mac-leopard.
Modified: trunk/LayoutTests/mathml/presentation/row.xhtml (107018 => 107019)
--- trunk/LayoutTests/mathml/presentation/row.xhtml 2012-02-08 01:37:55 UTC (rev 107018)
+++ trunk/LayoutTests/mathml/presentation/row.xhtml 2012-02-08 01:49:27 UTC (rev 107019)
@@ -5,6 +5,9 @@
mo {
background-color: rgb(200,200,200);
}
+body {
+ overflow: hidden;
+}
</style>
</head>
<body>
Modified: trunk/LayoutTests/platform/mac/mathml/presentation/row-expected.png
(Binary files differ)
Modified: trunk/LayoutTests/platform/mac/mathml/presentation/row-expected.txt (107018 => 107019)
--- trunk/LayoutTests/platform/mac/mathml/presentation/row-expected.txt 2012-02-08 01:37:55 UTC (rev 107018)
+++ trunk/LayoutTests/platform/mac/mathml/presentation/row-expected.txt 2012-02-08 01:49:27 UTC (rev 107019)
@@ -1,9 +1,9 @@
-layer at (0,0) size 785x614
- RenderView at (0,0) size 785x600
-layer at (0,0) size 785x614
- RenderBlock {html} at (0,0) size 785x614
- RenderBody {body} at (8,16) size 769x582
- RenderBlock {p} at (0,0) size 769x19
+layer at (0,0) size 800x614
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x614
+ RenderBlock {html} at (0,0) size 800x614
+ RenderBody {body} at (8,16) size 784x582
+ RenderBlock {p} at (0,0) size 784x19
RenderMathMLMath {math} at (0,3) size 27x16
RenderInline {mi} at (0,0) size 7x16
RenderText {#text} at (1,0) size 7x16
@@ -16,7 +16,7 @@
RenderText {#text} at (18,0) size 8x16
text run at (18,0) width 8: "1"
RenderText {#text} at (0,0) size 0x0
- RenderBlock {p} at (0,35) size 769x21
+ RenderBlock {p} at (0,35) size 784x21
RenderText {#text} at (0,2) size 40x18
text run at (0,2) width 40: "16px: "
RenderMathMLMath {math} at (40,0) size 45x21
@@ -94,7 +94,7 @@
text run at (6,5) width 7: "x"
RenderBlock {div} at (13,5) size 16x16 [bgcolor=#00FF00]
RenderText {#text} at (0,0) size 0x0
- RenderBlock {p} at (0,72) size 769x36
+ RenderBlock {p} at (0,72) size 784x36
RenderText {#text} at (0,8) size 40x18
text run at (0,8) width 40: "24px: "
RenderMathMLMath {math} at (40,0) size 49x36
@@ -145,7 +145,7 @@
text run at (11,11) width 7: "x"
RenderBlock {div} at (18,5) size 24x24 [bgcolor=#00FF00]
RenderText {#text} at (0,0) size 0x0
- RenderBlock {p} at (0,124) size 769x50
+ RenderBlock {p} at (0,124) size 784x50
RenderText {#text} at (0,19) size 40x18
text run at (0,19) width 40: "32px: "
RenderMathMLMath {math} at (40,0) size 57x50
@@ -196,7 +196,7 @@
text run at (11,22) width 7: "x"
RenderBlock {div} at (18,11) size 32x32 [bgcolor=#00FF00]
RenderText {#text} at (0,0) size 0x0
- RenderBlock {p} at (0,190) size 769x80
+ RenderBlock {p} at (0,190) size 784x80
RenderText {#text} at (0,41) size 40x18
text run at (0,41) width 40: "48px: "
RenderMathMLMath {math} at (40,0) size 73x80
@@ -247,7 +247,7 @@
text run at (11,44) width 7: "x"
RenderBlock {div} at (18,22) size 48x48 [bgcolor=#00FF00]
RenderText {#text} at (0,0) size 0x0
- RenderBlock {p} at (0,286) size 769x215
+ RenderBlock {p} at (0,286) size 784x215
RenderText {#text} at (0,140) size 48x18
text run at (0,140) width 48: "120px: "
RenderMathMLMath {math} at (48,0) size 73x215
@@ -298,7 +298,7 @@
text run at (11,143) width 7: "x"
RenderBlock {div} at (18,73) size 48x120 [bgcolor=#00FF00]
RenderText {#text} at (0,0) size 0x0
- RenderBlock {p} at (0,517) size 769x65
+ RenderBlock {p} at (0,517) size 784x65
RenderMathMLMath {math} at (0,0) size 156x65
RenderMathMLRow {mrow} at (1,0) size 154x65
RenderMathMLOperator {mo} at (0,16) size 6x49 [bgcolor=#C8C8C8]
Modified: trunk/Source/WebCore/ChangeLog (107018 => 107019)
--- trunk/Source/WebCore/ChangeLog 2012-02-08 01:37:55 UTC (rev 107018)
+++ trunk/Source/WebCore/ChangeLog 2012-02-08 01:49:27 UTC (rev 107019)
@@ -1,3 +1,41 @@
+2012-02-07 David Barton <dbar...@mathscribe.com>
+
+ Remove extraneous MathML code before bug 52444 fix
+ https://bugs.webkit.org/show_bug.cgi?id=78034
+
+ Reviewed by Eric Seidel.
+
+ Per Darin Adler, I am breaking up the patch fixing bug 52444 into smaller pieces.
+ This patch removes a couple unused functions, some extra blank lines, unused #include
+ directives, etc., and adds a very few WebKit-standard changes to these files.
+
+ No new tests.
+
+ * rendering/mathml/RenderMathMLBlock.cpp:
+ (WebCore):
+ * rendering/mathml/RenderMathMLBlock.h:
+ (WebCore::RenderMathMLBlock::getBoxModelObjectHeight):
+ - changed to a static member function since 'this' is unused;
+ removed redundant non-const version
+ (WebCore::RenderMathMLBlock::getBoxModelObjectWidth):
+ - changed to a static member function since 'this' is unused;
+ removed redundant non-const version
+ (WebCore):
+ * rendering/mathml/RenderMathMLFraction.cpp:
+ * rendering/mathml/RenderMathMLMath.cpp:
+ * rendering/mathml/RenderMathMLMath.h:
+ * rendering/mathml/RenderMathMLOperator.h:
+ (WebCore):
+ * rendering/mathml/RenderMathMLRoot.cpp:
+ * rendering/mathml/RenderMathMLRow.cpp:
+ * rendering/mathml/RenderMathMLRow.h:
+ * rendering/mathml/RenderMathMLSquareRoot.cpp:
+ * rendering/mathml/RenderMathMLSquareRoot.h:
+ * rendering/mathml/RenderMathMLSubSup.cpp:
+ * rendering/mathml/RenderMathMLSubSup.h:
+ * rendering/mathml/RenderMathMLUnderOver.cpp:
+ * rendering/mathml/RenderMathMLUnderOver.h:
+
2012-02-07 David Reveman <reve...@chromium.org>
[Chromium] REGRESSION(r101854): Causing large amounts of unnecessary repainting.
Modified: trunk/Source/WebCore/rendering/mathml/RenderMathMLBlock.cpp (107018 => 107019)
--- trunk/Source/WebCore/rendering/mathml/RenderMathMLBlock.cpp 2012-02-08 01:37:55 UTC (rev 107018)
+++ trunk/Source/WebCore/rendering/mathml/RenderMathMLBlock.cpp 2012-02-08 01:49:27 UTC (rev 107019)
@@ -109,7 +109,6 @@
}
#endif // ENABLE(DEBUG_MATH_LAYOUT)
-
}
#endif
Modified: trunk/Source/WebCore/rendering/mathml/RenderMathMLBlock.h (107018 => 107019)
--- trunk/Source/WebCore/rendering/mathml/RenderMathMLBlock.h 2012-02-08 01:37:55 UTC (rev 107018)
+++ trunk/Source/WebCore/rendering/mathml/RenderMathMLBlock.h 2012-02-08 01:49:27 UTC (rev 107019)
@@ -52,36 +52,18 @@
#endif
protected:
- int getBoxModelObjectHeight(RenderObject* object)
+ static LayoutUnit getBoxModelObjectHeight(const RenderObject* object)
{
if (object && object->isBoxModelObject()) {
- RenderBoxModelObject* box = toRenderBoxModelObject(object);
- return box->offsetHeight();
- }
-
- return 0;
- }
- int getBoxModelObjectHeight(const RenderObject* object)
- {
- if (object && object->isBoxModelObject()) {
const RenderBoxModelObject* box = toRenderBoxModelObject(object);
return box->offsetHeight();
}
return 0;
}
- int getBoxModelObjectWidth(RenderObject* object)
+ static LayoutUnit getBoxModelObjectWidth(const RenderObject* object)
{
if (object && object->isBoxModelObject()) {
- RenderBoxModelObject* box = toRenderBoxModelObject(object);
- return box->offsetWidth();
- }
-
- return 0;
- }
- int getBoxModelObjectWidth(const RenderObject* object)
- {
- if (object && object->isBoxModelObject()) {
const RenderBoxModelObject* box = toRenderBoxModelObject(object);
return box->offsetWidth();
}
@@ -106,8 +88,10 @@
return static_cast<const RenderMathMLBlock*>(object);
}
+// This will catch anyone doing an unnecessary cast.
+void toRenderMathMLBlock(const RenderMathMLBlock*);
+
}
-
#endif // ENABLE(MATHML)
#endif // RenderMathMLBlock_h
Modified: trunk/Source/WebCore/rendering/mathml/RenderMathMLFraction.cpp (107018 => 107019)
--- trunk/Source/WebCore/rendering/mathml/RenderMathMLFraction.cpp 2012-02-08 01:37:55 UTC (rev 107018)
+++ trunk/Source/WebCore/rendering/mathml/RenderMathMLFraction.cpp 2012-02-08 01:49:27 UTC (rev 107019)
@@ -182,5 +182,4 @@
}
-
#endif // ENABLE(MATHML)
Modified: trunk/Source/WebCore/rendering/mathml/RenderMathMLMath.cpp (107018 => 107019)
--- trunk/Source/WebCore/rendering/mathml/RenderMathMLMath.cpp 2012-02-08 01:37:55 UTC (rev 107018)
+++ trunk/Source/WebCore/rendering/mathml/RenderMathMLMath.cpp 2012-02-08 01:49:27 UTC (rev 107019)
@@ -43,4 +43,3 @@
}
#endif // ENABLE(MATHML)
-
Modified: trunk/Source/WebCore/rendering/mathml/RenderMathMLMath.h (107018 => 107019)
--- trunk/Source/WebCore/rendering/mathml/RenderMathMLMath.h 2012-02-08 01:37:55 UTC (rev 107018)
+++ trunk/Source/WebCore/rendering/mathml/RenderMathMLMath.h 2012-02-08 01:49:27 UTC (rev 107019)
@@ -43,6 +43,5 @@
}
-
#endif // ENABLE(MATHML)
#endif // RenderMathMLMath_h
Modified: trunk/Source/WebCore/rendering/mathml/RenderMathMLOperator.h (107018 => 107019)
--- trunk/Source/WebCore/rendering/mathml/RenderMathMLOperator.h 2012-02-08 01:37:55 UTC (rev 107018)
+++ trunk/Source/WebCore/rendering/mathml/RenderMathMLOperator.h 2012-02-08 01:49:27 UTC (rev 107019)
@@ -68,6 +68,9 @@
return static_cast<const RenderMathMLOperator*>(block);
}
+// This will catch anyone doing an unnecessary cast.
+void toRenderMathMLOperator(const RenderMathMLOperator*);
+
inline UChar convertHyphenMinusToMinusSign(UChar glyph)
{
// When rendered as a mathematical operator, minus glyph should be larger.
Modified: trunk/Source/WebCore/rendering/mathml/RenderMathMLRoot.cpp (107018 => 107019)
--- trunk/Source/WebCore/rendering/mathml/RenderMathMLRoot.cpp 2012-02-08 01:37:55 UTC (rev 107018)
+++ trunk/Source/WebCore/rendering/mathml/RenderMathMLRoot.cpp 2012-02-08 01:49:27 UTC (rev 107019)
@@ -252,5 +252,3 @@
}
#endif // ENABLE(MATHML)
-
-
Modified: trunk/Source/WebCore/rendering/mathml/RenderMathMLRow.cpp (107018 => 107019)
--- trunk/Source/WebCore/rendering/mathml/RenderMathMLRow.cpp 2012-02-08 01:37:55 UTC (rev 107018)
+++ trunk/Source/WebCore/rendering/mathml/RenderMathMLRow.cpp 2012-02-08 01:49:27 UTC (rev 107019)
@@ -133,4 +133,3 @@
}
#endif // ENABLE(MATHML)
-
Modified: trunk/Source/WebCore/rendering/mathml/RenderMathMLRow.h (107018 => 107019)
--- trunk/Source/WebCore/rendering/mathml/RenderMathMLRow.h 2012-02-08 01:37:55 UTC (rev 107018)
+++ trunk/Source/WebCore/rendering/mathml/RenderMathMLRow.h 2012-02-08 01:49:27 UTC (rev 107019)
@@ -48,6 +48,5 @@
}
-
#endif // ENABLE(MATHML)
#endif // RenderMathMLRow_h
Modified: trunk/Source/WebCore/rendering/mathml/RenderMathMLSquareRoot.cpp (107018 => 107019)
--- trunk/Source/WebCore/rendering/mathml/RenderMathMLSquareRoot.cpp 2012-02-08 01:37:55 UTC (rev 107018)
+++ trunk/Source/WebCore/rendering/mathml/RenderMathMLSquareRoot.cpp 2012-02-08 01:49:27 UTC (rev 107019)
@@ -189,5 +189,3 @@
}
#endif // ENABLE(MATHML)
-
-
Modified: trunk/Source/WebCore/rendering/mathml/RenderMathMLSquareRoot.h (107018 => 107019)
--- trunk/Source/WebCore/rendering/mathml/RenderMathMLSquareRoot.h 2012-02-08 01:37:55 UTC (rev 107018)
+++ trunk/Source/WebCore/rendering/mathml/RenderMathMLSquareRoot.h 2012-02-08 01:49:27 UTC (rev 107019)
@@ -48,6 +48,3 @@
#endif // ENABLE(MATHML)
#endif // RenderMathMLSquareRoot_h
-
-
-
Modified: trunk/Source/WebCore/rendering/mathml/RenderMathMLSubSup.cpp (107018 => 107019)
--- trunk/Source/WebCore/rendering/mathml/RenderMathMLSubSup.cpp 2012-02-08 01:37:55 UTC (rev 107018)
+++ trunk/Source/WebCore/rendering/mathml/RenderMathMLSubSup.cpp 2012-02-08 01:49:27 UTC (rev 107019)
@@ -29,14 +29,7 @@
#include "RenderMathMLSubSup.h"
-#include "FontSelector.h"
#include "MathMLNames.h"
-#include "RenderInline.h"
-#include "RenderTable.h"
-#include "RenderTableCell.h"
-#include "RenderTableRow.h"
-#include "RenderTableSection.h"
-#include "RenderText.h"
namespace WebCore {
Modified: trunk/Source/WebCore/rendering/mathml/RenderMathMLSubSup.h (107018 => 107019)
--- trunk/Source/WebCore/rendering/mathml/RenderMathMLSubSup.h 2012-02-08 01:37:55 UTC (rev 107018)
+++ trunk/Source/WebCore/rendering/mathml/RenderMathMLSubSup.h 2012-02-08 01:49:27 UTC (rev 107019)
@@ -23,14 +23,12 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-
#ifndef RenderMathMLSubSup_h
#define RenderMathMLSubSup_h
#if ENABLE(MATHML)
#include "RenderMathMLBlock.h"
-#include "RenderTable.h"
namespace WebCore {
Modified: trunk/Source/WebCore/rendering/mathml/RenderMathMLUnderOver.cpp (107018 => 107019)
--- trunk/Source/WebCore/rendering/mathml/RenderMathMLUnderOver.cpp 2012-02-08 01:37:55 UTC (rev 107018)
+++ trunk/Source/WebCore/rendering/mathml/RenderMathMLUnderOver.cpp 2012-02-08 01:49:27 UTC (rev 107019)
@@ -292,5 +292,4 @@
}
-
#endif // ENABLE(MATHML)
Modified: trunk/Source/WebCore/rendering/mathml/RenderMathMLUnderOver.h (107018 => 107019)
--- trunk/Source/WebCore/rendering/mathml/RenderMathMLUnderOver.h 2012-02-08 01:37:55 UTC (rev 107018)
+++ trunk/Source/WebCore/rendering/mathml/RenderMathMLUnderOver.h 2012-02-08 01:49:27 UTC (rev 107019)
@@ -23,7 +23,6 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-
#ifndef RenderMathMLUnderOver_h
#define RenderMathMLUnderOver_h
