Changeset 25124 in webkit

Timestamp:

Aug 17, 2007 1:42:38 AM (17 years ago)

Author:

oliver

Message:

LayoutTests:

Reviewed by Maciej.

Simple test to ensure we don't crash when creating a pattern

• fast/canvas/create-pattern-does-not-crash-expected.txt: Added.
• fast/canvas/create-pattern-does-not-crash.html: Added.

WebCore:

Reviewed by Maciej.

​http://bugs.webkit.org/show_bug.cgi?id=14189
<rdar://problem/5319511> REPRODUCIBLE CRASH: Canvas createPattern(canvas, ...) crashes on Windows (14189)

Ensure that we actually retain the CG pattern correctly.

Credit to Philip Taylor <​excors@gmail.com> for finding the cause of this.

• html/CanvasPattern.cpp: (WebCore::CanvasPattern::~CanvasPattern): (WebCore::CanvasPattern::createPattern):
• html/CanvasPattern.h: (WebCore::CanvasPattern::platformImage):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/canvas/create-pattern-does-not-crash-expected.txt (added)
• LayoutTests/fast/canvas/create-pattern-does-not-crash.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/html/CanvasPattern.cpp (modified) (2 diffs)
• WebCore/html/CanvasPattern.h (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2007-08-17  Oliver Hunt  <oliver@apple.com>
+
+        Reviewed by Maciej.
+
+        Simple test to ensure we don't crash when creating a pattern
+
+        * fast/canvas/create-pattern-does-not-crash-expected.txt: Added.
+        * fast/canvas/create-pattern-does-not-crash.html: Added.
+
 2007-08-16  Justin Garcia  <justin.garcia@apple.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-08-17  Oliver Hunt  <oliver@apple.com>
+
+        Reviewed by Maciej.
+
+        http://bugs.webkit.org/show_bug.cgi?id=14189
+        <rdar://problem/5319511> REPRODUCIBLE CRASH: Canvas createPattern(canvas, ...) crashes on Windows (14189)
+
+        Ensure that we actually retain the CG pattern correctly.
+
+        Credit to Philip Taylor <excors@gmail.com> for finding the cause of this.
+
+        * html/CanvasPattern.cpp:
+        (WebCore::CanvasPattern::~CanvasPattern):
+        (WebCore::CanvasPattern::createPattern):
+        * html/CanvasPattern.h:
+        (WebCore::CanvasPattern::platformImage):
+
 2007-08-16  Geoffrey Garen  <ggaren@apple.com>
 

trunk/WebCore/html/CanvasPattern.cpp

@@ -92 +92 @@
 CanvasPattern::~CanvasPattern()
 {
-#if PLATFORM(CG)
-    CGImageRelease(m_platformImage);
-#endif
     if (m_cachedImage)
         m_cachedImage->deref(this);
@@ -143 +140 @@
     rect.origin.y = 0;
     if (m_platformImage) {
-        rect.size.width = CGImageGetWidth(m_platformImage);
-        rect.size.height = CGImageGetHeight(m_platformImage);
+        rect.size.width = CGImageGetWidth(m_platformImage.get());
+        rect.size.height = CGImageGetHeight(m_platformImage.get());
     } else {
         if (!m_cachedImage)

trunk/WebCore/html/CanvasPattern.h

@@ -31 +31 @@
 
 #if PLATFORM(CG)
+#include <wtf/RetainPtr.h>
 #include <ApplicationServices/ApplicationServices.h>
 #endif
@@ -52 +53 @@
 
 #if PLATFORM(CG)
-        CGImageRef platformImage() const { return m_platformImage; }
+        CGImageRef platformImage() const { return m_platformImage.get(); }
 #endif
         CachedImage* cachedImage() const { return m_cachedImage; }
@@ -62 +63 @@
     private:
 #if PLATFORM(CG)
-        const CGImageRef m_platformImage;
+        const RetainPtr<CGImageRef> m_platformImage;
 #endif
         CachedImage* const m_cachedImage;