Changeset 94982 in webkit

Timestamp:

Sep 12, 2011 3:19:37 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

[chromium] Prevent a crash when tearing down an ImageBuffer that was not successfully initialized.
​https://bugs.webkit.org/show_bug.cgi?id=67944

Patch by Jeff Timanus <​twiz@chromium.org> on 2011-09-12
Reviewed by Stephen White.

• platform/graphics/skia/ImageBufferSkia.cpp:

(WebCore::ImageBuffer::~ImageBuffer):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/skia/ImageBufferSkia.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-09-12  Jeff Timanus  <twiz@chromium.org>
+
+        [chromium]  Prevent a crash when tearing down an ImageBuffer that was not successfully initialized.
+        https://bugs.webkit.org/show_bug.cgi?id=67944
+
+        Reviewed by Stephen White.
+        
+        * platform/graphics/skia/ImageBufferSkia.cpp:
+        (WebCore::ImageBuffer::~ImageBuffer):
+
 2011-09-12  Michael Saboff  <msaboff@apple.com>
 

trunk/Source/WebCore/platform/graphics/skia/ImageBufferSkia.cpp

@@ -117 +117 @@
 ImageBuffer::~ImageBuffer()
 {
-    // This is so that the SkGpuDevice destructor has the correct context.
-    m_context->platformContext()->makeGrContextCurrent();
+    if (m_context && m_context->platformContext()) {
+        // This is so that the SkGpuDevice destructor has the correct context.
+        m_context->platformContext()->makeGrContextCurrent();
+    }
 }