Changeset 57969 in webkit

Timestamp:

Apr 21, 2010 5:22:57 AM (14 years ago)

Author:

eric@webkit.org

Message:

2010-04-21 Avi Drissman <​avi@chromium.org>

Reviewed by Simon Fraser.

JPG images fail to print in Chromium
​https://bugs.webkit.org/show_bug.cgi?id=37796

Image sources of JPG data with final=false fail to draw into PDF contexts even if later updated (<rdar://problem/7874035>). Therefore, destroy and re-create the image source when the final data arrives.

• platform/graphics/cg/ImageSourceCG.cpp: (WebCore::ImageSource::setData):

Location:

trunk/WebCore

Files:

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

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-04-21  Avi Drissman  <avi@chromium.org>
+
+        Reviewed by Simon Fraser.
+
+        JPG images fail to print in Chromium
+        https://bugs.webkit.org/show_bug.cgi?id=37796
+
+        Image sources of JPG data with final=false fail to draw into PDF contexts even if later updated (<rdar://problem/7874035>). Therefore, destroy and re-create the image source when the final data arrives.
+
+        * platform/graphics/cg/ImageSourceCG.cpp:
+        (WebCore::ImageSource::setData):
+
 2010-04-21  Marcus Bulach  <bulach@chromium.org>
 

trunk/WebCore/platform/graphics/cg/ImageSourceCG.cpp

@@ -120 +120 @@
 void ImageSource::setData(SharedBuffer* data, bool allDataReceived)
 {
+#if PLATFORM(MAC)
     if (!m_decoder)
-        m_decoder = CGImageSourceCreateIncremental(NULL);
-#if PLATFORM(MAC)
+        m_decoder = CGImageSourceCreateIncremental(0);
     // On Mac the NSData inside the SharedBuffer can be secretly appended to without the SharedBuffer's knowledge.  We use SharedBuffer's ability
     // to wrap itself inside CFData to get around this, ensuring that ImageIO is really looking at the SharedBuffer.
@@ -128 +128 @@
     CGImageSourceUpdateData(m_decoder, cfData.get(), allDataReceived);
 #else
+    if (!m_decoder) {
+        m_decoder = CGImageSourceCreateIncremental(0);
+    } else if (allDataReceived) {
+        // 10.6 bug workaround: image sources with final=false fail to draw into PDF contexts, so re-create image source
+        // when data is complete. <rdar://problem/7874035> (<http://openradar.appspot.com/7874035>)
+        CFRelease(m_decoder);
+        m_decoder = CGImageSourceCreateIncremental(0);
+    }
     // Create a CGDataProvider to wrap the SharedBuffer.
     data->ref();