Title: [99856] trunk
Revision
99856
Author
[email protected]
Date
2011-11-10 07:42:19 -0800 (Thu, 10 Nov 2011)

Log Message

2011-11-10  Nikolas Zimmermann  <[email protected]>

        [GTK] svg/as-image/svg-image-change-content-size.xhtml crashes
        https://bugs.webkit.org/show_bug.cgi?id=71932

        Reviewed by Philippe Normand.

        * platform/gtk/Skipped: Unskip test.

2011-11-10  Nikolas Zimmermann  <[email protected]>

        [GTK] svg/as-image/svg-image-change-content-size.xhtml crashes
        https://bugs.webkit.org/show_bug.cgi?id=71932

        Reviewed by Philippe Normand.

        Null check m_page in drawSVGToImageBuffer(), just like all others methods do.
        As drawSVGToImageBuffer() is fired from a timer, it may get into this state under certain conditions, as seen on the 64bit gtk bot.

        * svg/graphics/SVGImage.cpp:
        (WebCore::SVGImage::drawSVGToImageBuffer):

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (99855 => 99856)


--- trunk/LayoutTests/ChangeLog	2011-11-10 15:40:37 UTC (rev 99855)
+++ trunk/LayoutTests/ChangeLog	2011-11-10 15:42:19 UTC (rev 99856)
@@ -1,5 +1,14 @@
 2011-11-10  Nikolas Zimmermann  <[email protected]>
 
+        [GTK] svg/as-image/svg-image-change-content-size.xhtml crashes
+        https://bugs.webkit.org/show_bug.cgi?id=71932
+
+        Reviewed by Philippe Normand.
+
+        * platform/gtk/Skipped: Unskip test.
+
+2011-11-10  Nikolas Zimmermann  <[email protected]>
+
         Move unit resolving for all resources to rendering/
         https://bugs.webkit.org/show_bug.cgi?id=72011
 

Modified: trunk/LayoutTests/platform/gtk/Skipped (99855 => 99856)


--- trunk/LayoutTests/platform/gtk/Skipped	2011-11-10 15:40:37 UTC (rev 99855)
+++ trunk/LayoutTests/platform/gtk/Skipped	2011-11-10 15:42:19 UTC (rev 99856)
@@ -159,9 +159,6 @@
 fast/css/webkit-mask-crash-fieldset-legend.html
 fast/css/webkit-mask-crash-table.html
 
-# https://bugs.webkit.org/show_bug.cgi?id=71932
-svg/as-image/svg-image-change-content-size.xhtml
-
 ###############################################################################
 # EXPECTED FAILURES
 ###############################################################################

Modified: trunk/Source/WebCore/ChangeLog (99855 => 99856)


--- trunk/Source/WebCore/ChangeLog	2011-11-10 15:40:37 UTC (rev 99855)
+++ trunk/Source/WebCore/ChangeLog	2011-11-10 15:42:19 UTC (rev 99856)
@@ -1,5 +1,18 @@
 2011-11-10  Nikolas Zimmermann  <[email protected]>
 
+        [GTK] svg/as-image/svg-image-change-content-size.xhtml crashes
+        https://bugs.webkit.org/show_bug.cgi?id=71932
+
+        Reviewed by Philippe Normand.
+
+        Null check m_page in drawSVGToImageBuffer(), just like all others methods do.
+        As drawSVGToImageBuffer() is fired from a timer, it may get into this state under certain conditions, as seen on the 64bit gtk bot.
+
+        * svg/graphics/SVGImage.cpp:
+        (WebCore::SVGImage::drawSVGToImageBuffer):
+
+2011-11-10  Nikolas Zimmermann  <[email protected]>
+
         Not reviewed. Rolling out part of r99854, which didn't belong there.
 
         * svg/graphics/SVGImage.cpp:

Modified: trunk/Source/WebCore/svg/graphics/SVGImage.cpp (99855 => 99856)


--- trunk/Source/WebCore/svg/graphics/SVGImage.cpp	2011-11-10 15:40:37 UTC (rev 99855)
+++ trunk/Source/WebCore/svg/graphics/SVGImage.cpp	2011-11-10 15:42:19 UTC (rev 99856)
@@ -158,6 +158,9 @@
     ASSERT(buffer);
     ASSERT(!size.isEmpty());
 
+    if (!m_page)
+        return;
+
     Frame* frame = m_page->mainFrame();
     SVGSVGElement* rootElement = static_cast<SVGDocument*>(frame->document())->rootElement();
     if (!rootElement)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to