Title: [132424] trunk
- Revision
- 132424
- Author
- dbar...@mathscribe.com
- Date
- 2012-10-24 16:49:54 -0700 (Wed, 24 Oct 2012)
Log Message
MathML tests trigger font cache assertions in debug bots
https://bugs.webkit.org/show_bug.cgi?id=100268
Reviewed by Eric Seidel.
Source/WebCore:
Add a FontCachePurgePreventer to fix this.
Tested by existing tests.
* rendering/mathml/RenderMathMLOperator.cpp:
(WebCore::RenderMathMLOperator::updateFromElement):
LayoutTests:
* platform/chromium/TestExpectations:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (132423 => 132424)
--- trunk/LayoutTests/ChangeLog 2012-10-24 23:46:23 UTC (rev 132423)
+++ trunk/LayoutTests/ChangeLog 2012-10-24 23:49:54 UTC (rev 132424)
@@ -1,3 +1,12 @@
+2012-10-24 David Barton <dbar...@mathscribe.com>
+
+ MathML tests trigger font cache assertions in debug bots
+ https://bugs.webkit.org/show_bug.cgi?id=100268
+
+ Reviewed by Eric Seidel.
+
+ * platform/chromium/TestExpectations:
+
2012-10-24 Tommy Widenflycht <tom...@google.com>
MediaStream API: Make sure all RTCPeerConnection events are dispatched asynchronously
Modified: trunk/LayoutTests/platform/chromium/TestExpectations (132423 => 132424)
--- trunk/LayoutTests/platform/chromium/TestExpectations 2012-10-24 23:46:23 UTC (rev 132423)
+++ trunk/LayoutTests/platform/chromium/TestExpectations 2012-10-24 23:49:54 UTC (rev 132424)
@@ -1991,11 +1991,6 @@
webkit.org/b/97390 [ Mac ] mathml/presentation/msubsup-base-changed.xhtml [ ImageOnlyFailure Pass ]
# Once chromium decides to definitely enable MathML, we can delete the old platform/chromium baseline for this:
webkit.org/b/96960 http/tests/xmlviewer/dumpAsText/mathml.xml [ Pass Failure ]
-# Some mathml tests are flaky crashers on Mac Debug bots
-webkit.org/b/100268 [ Mac Debug ] mathml/presentation/row.xhtml [ Pass Crash ]
-webkit.org/b/100268 [ Mac Debug ] mathml/presentation/mo-stretch.html [ Pass Crash ]
-webkit.org/b/100268 [ Mac Debug ] mathml/presentation/mroot-pref-width.html [ Pass Crash ]
-webkit.org/b/100268 [ Mac Debug ] mathml/presentation/style-changed.html [ Pass Crash ]
# WebKit update 48796:48820
# Test #9 throws an exception.
Modified: trunk/Source/WebCore/ChangeLog (132423 => 132424)
--- trunk/Source/WebCore/ChangeLog 2012-10-24 23:46:23 UTC (rev 132423)
+++ trunk/Source/WebCore/ChangeLog 2012-10-24 23:49:54 UTC (rev 132424)
@@ -1,3 +1,17 @@
+2012-10-24 David Barton <dbar...@mathscribe.com>
+
+ MathML tests trigger font cache assertions in debug bots
+ https://bugs.webkit.org/show_bug.cgi?id=100268
+
+ Reviewed by Eric Seidel.
+
+ Add a FontCachePurgePreventer to fix this.
+
+ Tested by existing tests.
+
+ * rendering/mathml/RenderMathMLOperator.cpp:
+ (WebCore::RenderMathMLOperator::updateFromElement):
+
2012-10-24 Tim Horton <timothy_hor...@apple.com>
Update main frame scroll position immediately for programmatic scrolls
Modified: trunk/Source/WebCore/rendering/mathml/RenderMathMLOperator.cpp (132423 => 132424)
--- trunk/Source/WebCore/rendering/mathml/RenderMathMLOperator.cpp 2012-10-24 23:46:23 UTC (rev 132423)
+++ trunk/Source/WebCore/rendering/mathml/RenderMathMLOperator.cpp 2012-10-24 23:49:54 UTC (rev 132424)
@@ -30,6 +30,7 @@
#include "RenderMathMLOperator.h"
+#include "FontCache.h"
#include "FontSelector.h"
#include "MathMLNames.h"
#include "RenderText.h"
@@ -185,6 +186,9 @@
int middleGlyphHeight = 0;
if (shouldStack) {
partsData = &stretchyCharacters[index];
+
+ FontCachePurgePreventer fontCachePurgePreventer;
+
topGlyphHeight = glyphHeightForCharacter(partsData->topGlyph);
extensionGlyphHeight = glyphHeightForCharacter(partsData->extensionGlyph) - 1;
bottomGlyphHeight = glyphHeightForCharacter(partsData->bottomGlyph);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
