Changeset 94024 in webkit

Timestamp:

Aug 29, 2011, 3:52:36 PM (15 years ago)

Author:

mdelaney@apple.com

Message:

[CG] ImageBufferCG should handle IOSurface allocation failure gracefully
​https://bugs.webkit.org/show_bug.cgi?id=67099

Reviewed by Simon Fraser.

No new tests. Testing the "fallback to old path" behavior is not easily testable.

• platform/graphics/cg/ImageBufferCG.cpp: Rearranged backing store creation to fall back to old path if IOSurface creation path fails.

(WebCore::ImageBuffer::ImageBuffer):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/cg/ImageBufferCG.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-08-29  Matthew Delaney  <mdelaney@apple.com>
+
+        [CG] ImageBufferCG should handle IOSurface allocation failure gracefully
+        https://bugs.webkit.org/show_bug.cgi?id=67099
+
+        Reviewed by Simon Fraser.
+
+        No new tests. Testing the "fallback to old path" behavior is not easily testable.
+
+        * platform/graphics/cg/ImageBufferCG.cpp: Rearranged backing store creation to fall back to
+          old path if IOSurface creation path fails.
+        (WebCore::ImageBuffer::ImageBuffer):
+
 2011-08-29  Cary Clark  <caryclark@google.com>
 

trunk/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp

@@ -138 +138 @@
 
     RetainPtr<CGContextRef> cgContext;
+    if (m_accelerateRendering) {
+#if USE(IOSURFACE_CANVAS_BACKING_STORE)
+        m_data.m_surface = createIOSurface(size);
+        cgContext.adoptCF(wkIOSurfaceContextCreate(m_data.m_surface.get(), size.width(), size.height(), m_data.m_colorSpace));
+#endif
+        if (!cgContext)
+            m_accelerateRendering = false; // If allocation fails, fall back to non-accelerated path.
+    }
+
     if (!m_accelerateRendering) {
         if (!tryFastCalloc(size.height(), bytesPerRow).getValue(m_data.m_data))
@@ -147 +156 @@
         // Create a live image that wraps the data.
         m_data.m_dataProvider.adoptCF(CGDataProviderCreateWithData(0, m_data.m_data, dataSize, releaseImageData));
-    } else {
-#if USE(IOSURFACE_CANVAS_BACKING_STORE)
-        m_data.m_surface = createIOSurface(size);
-        cgContext.adoptCF(wkIOSurfaceContextCreate(m_data.m_surface.get(), size.width(), size.height(), m_data.m_colorSpace));
-#else
-        m_accelerateRendering = false; // Force to false on older platforms
-#endif
     }