Title: [124212] trunk/Source/WebCore
Revision
124212
Author
[email protected]
Date
2012-07-31 09:08:56 -0700 (Tue, 31 Jul 2012)

Log Message

Regression(r124135): SVG tests crashing on ports using Cairo
https://bugs.webkit.org/show_bug.cgi?id=92752

Patch by Thiago Marcos P. Santos <[email protected]> on 2012-07-31
Reviewed by Martin Robinson.

* platform/graphics/cairo/PathCairo.cpp:
(WebCore::Path::operator=):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (124211 => 124212)


--- trunk/Source/WebCore/ChangeLog	2012-07-31 16:05:11 UTC (rev 124211)
+++ trunk/Source/WebCore/ChangeLog	2012-07-31 16:08:56 UTC (rev 124212)
@@ -1,3 +1,13 @@
+2012-07-31  Thiago Marcos P. Santos  <[email protected]>
+
+        Regression(r124135): SVG tests crashing on ports using Cairo
+        https://bugs.webkit.org/show_bug.cgi?id=92752
+
+        Reviewed by Martin Robinson.
+
+        * platform/graphics/cairo/PathCairo.cpp:
+        (WebCore::Path::operator=):
+
 2012-07-31  Sheriff Bot  <[email protected]>
 
         Unreviewed, rolling out r124208.

Modified: trunk/Source/WebCore/platform/graphics/cairo/PathCairo.cpp (124211 => 124212)


--- trunk/Source/WebCore/platform/graphics/cairo/PathCairo.cpp	2012-07-31 16:05:11 UTC (rev 124211)
+++ trunk/Source/WebCore/platform/graphics/cairo/PathCairo.cpp	2012-07-31 16:08:56 UTC (rev 124212)
@@ -73,10 +73,18 @@
     if (&other == this)
         return *this;
 
-    clear();
-    cairo_t* cr = ensurePlatformPath()->context();
-    OwnPtr<cairo_path_t> pathCopy = adoptPtr(cairo_copy_path(other.platformPath()->context()));
-    cairo_append_path(cr, pathCopy.get());
+    if (other.isNull()) {
+        if (m_path) {
+            delete m_path;
+            m_path = 0;
+        }
+    } else {
+        clear();
+        cairo_t* cr = ensurePlatformPath()->context();
+        OwnPtr<cairo_path_t> pathCopy = adoptPtr(cairo_copy_path(other.platformPath()->context()));
+        cairo_append_path(cr, pathCopy.get());
+    }
+
     return *this;
 }
 
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to