Title: [120706] trunk
- Revision
- 120706
- Author
- [email protected]
- Date
- 2012-06-19 05:59:39 -0700 (Tue, 19 Jun 2012)
Log Message
[GTK] Assert failure in svg/batik/text/textDecoration.svg,textEffect3.svg for 64bit Debug bot
https://bugs.webkit.org/show_bug.cgi?id=89104
Patch by Dominik Röttsches <[email protected]> on 2012-06-19
Reviewed by Nikolas Zimmermann.
Source/WebCore:
Adding SVGInline to assertion to fix assertion failure. Same assertion was hit on Chromium.
Covered by existing tests
svg/batik/text/textDecoration.svg
svg/batik/text/textEffect3.svg
where the assertion failure was hit.
* rendering/svg/RenderSVGResourceContainer.cpp:
(WebCore::RenderSVGResourceContainer::shouldTransformOnTextPainting):
LayoutTests:
Removing CRASH expectations after assertion failure is now fixed.
* platform/chromium/TestExpectations:
* platform/gtk/TestExpectations:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (120705 => 120706)
--- trunk/LayoutTests/ChangeLog 2012-06-19 11:43:37 UTC (rev 120705)
+++ trunk/LayoutTests/ChangeLog 2012-06-19 12:59:39 UTC (rev 120706)
@@ -1,3 +1,15 @@
+2012-06-19 Dominik Röttsches <[email protected]>
+
+ [GTK] Assert failure in svg/batik/text/textDecoration.svg,textEffect3.svg for 64bit Debug bot
+ https://bugs.webkit.org/show_bug.cgi?id=89104
+
+ Reviewed by Nikolas Zimmermann.
+
+ Removing CRASH expectations after assertion failure is now fixed.
+
+ * platform/chromium/TestExpectations:
+ * platform/gtk/TestExpectations:
+
2012-06-19 Taiju Tsuiki <[email protected]>
Web Inspector: FileSystem tree should hide uninitialized FileSystem
Modified: trunk/LayoutTests/platform/chromium/TestExpectations (120705 => 120706)
--- trunk/LayoutTests/platform/chromium/TestExpectations 2012-06-19 11:43:37 UTC (rev 120705)
+++ trunk/LayoutTests/platform/chromium/TestExpectations 2012-06-19 12:59:39 UTC (rev 120706)
@@ -1196,9 +1196,6 @@
BUGWK60118 MAC : svg/dom/SVGScriptElement/script-set-href.svg = PASS TEXT
-BUGWK64966 DEBUG : svg/batik/text/textDecoration.svg = CRASH
-BUGWK64966 DEBUG : svg/batik/text/textEffect3.svg = CRASH
-
// Introduced due to BUGWK53512, fails under Skia right now
BUGWK65939 : svg/custom/getBBox-path.svg = TEXT
Modified: trunk/LayoutTests/platform/gtk/TestExpectations (120705 => 120706)
--- trunk/LayoutTests/platform/gtk/TestExpectations 2012-06-19 11:43:37 UTC (rev 120705)
+++ trunk/LayoutTests/platform/gtk/TestExpectations 2012-06-19 12:59:39 UTC (rev 120706)
@@ -354,9 +354,6 @@
BUGWK86176 DEBUG : ietestcenter/css3/valuesandunits/units-000.htm = CRASH
-BUGWK89104 DEBUG : svg/batik/text/textDecoration.svg = CRASH
-BUGWK89104 DEBUG : svg/batik/text/textEffect3.svg = CRASH
-
BUGWK89188 RELEASE : storage/websql/quota-tracking.html = CRASH PASS
//////////////////////////////////////////////////////////////////////////////////////////
Modified: trunk/Source/WebCore/ChangeLog (120705 => 120706)
--- trunk/Source/WebCore/ChangeLog 2012-06-19 11:43:37 UTC (rev 120705)
+++ trunk/Source/WebCore/ChangeLog 2012-06-19 12:59:39 UTC (rev 120706)
@@ -1,3 +1,20 @@
+2012-06-19 Dominik Röttsches <[email protected]>
+
+ [GTK] Assert failure in svg/batik/text/textDecoration.svg,textEffect3.svg for 64bit Debug bot
+ https://bugs.webkit.org/show_bug.cgi?id=89104
+
+ Reviewed by Nikolas Zimmermann.
+
+ Adding SVGInline to assertion to fix assertion failure. Same assertion was hit on Chromium.
+
+ Covered by existing tests
+ svg/batik/text/textDecoration.svg
+ svg/batik/text/textEffect3.svg
+ where the assertion failure was hit.
+
+ * rendering/svg/RenderSVGResourceContainer.cpp:
+ (WebCore::RenderSVGResourceContainer::shouldTransformOnTextPainting):
+
2012-06-19 Csaba Osztrogonác <[email protected]>
[Qt] Buildfix for newer Qt5, use QPointer instead of the deprecated QWeakPointer.
Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourceContainer.cpp (120705 => 120706)
--- trunk/Source/WebCore/rendering/svg/RenderSVGResourceContainer.cpp 2012-06-19 11:43:37 UTC (rev 120705)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResourceContainer.cpp 2012-06-19 12:59:39 UTC (rev 120706)
@@ -178,7 +178,8 @@
UNUSED_PARAM(resourceTransform);
return false;
#else
- ASSERT(object->isSVGText() || object->isSVGTextPath());
+ // This method should only be called for RenderObjects that deal with text rendering. Cmp. RenderObject.h's is*() methods.
+ ASSERT(object->isSVGText() || object->isSVGTextPath() || object->isSVGInline());
// In text drawing, the scaling part of the graphics context CTM is removed, compare SVGInlineTextBox::paintTextWithShadows.
// So, we use that scaling factor here, too, and then push it down to pattern or gradient space
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
