Changeset 79891 in webkit

Timestamp:

Feb 28, 2011 12:03:47 PM (13 years ago)

Author:

andersca@apple.com

Message:

2011-02-28 Anders Carlsson <​andersca@apple.com>

Reviewed by Dan Bernstein.

PDFViewController should hold a reference to the PDF data
​https://bugs.webkit.org/show_bug.cgi?id=55394

• UIProcess/API/mac/PDFViewController.h:
• UIProcess/API/mac/PDFViewController.mm: (WebKit::PDFViewController::setPDFDocumentData):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/mac/PDFViewController.h (modified) (1 diff)
• UIProcess/API/mac/PDFViewController.mm (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-02-28  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        PDFViewController should hold a reference to the PDF data
+        https://bugs.webkit.org/show_bug.cgi?id=55394
+
+        * UIProcess/API/mac/PDFViewController.h:
+        * UIProcess/API/mac/PDFViewController.mm:
+        (WebKit::PDFViewController::setPDFDocumentData):
+
 2011-02-28  Sam Weinig  <sam@webkit.org>
 

trunk/Source/WebKit2/UIProcess/API/mac/PDFViewController.h

@@ -66 +66 @@
 
     WKView* m_wkView;
+
     RetainPtr<WKPDFView> m_wkPDFView;
     PDFView* m_pdfView;
+
+    RetainPtr<NSString> m_suggestedFilename;
+    RetainPtr<CFDataRef> m_pdfData;
 };
 

trunk/Source/WebKit2/UIProcess/API/mac/PDFViewController.mm

@@ -234 +234 @@
 void PDFViewController::setPDFDocumentData(const String& mimeType, const String& suggestedFilename, const CoreIPC::DataReference& dataReference)
 {
-    RetainPtr<CFDataRef> data;
-    
     if (equalIgnoringCase(mimeType, "application/postscript")) {
-        data = convertPostScriptDataSourceToPDF(dataReference);
-        if (!data)
+        m_pdfData = convertPostScriptDataSourceToPDF(dataReference);
+        if (!m_pdfData)
             return;
     } else {
         // Make sure to copy the data.
-        data.adoptCF(CFDataCreate(0, dataReference.data(), dataReference.size()));
-    }
-
-    RetainPtr<PDFDocument> pdfDocument(AdoptNS, [[pdfDocumentClass() alloc] initWithData:(NSData *)data.get()]);
+        m_pdfData.adoptCF(CFDataCreate(0, dataReference.data(), dataReference.size()));
+    }
+
+    m_suggestedFilename = suggestedFilename;
+
+    RetainPtr<PDFDocument> pdfDocument(AdoptNS, [[pdfDocumentClass() alloc] initWithData:(NSData *)m_pdfData.get()]);
     [m_wkPDFView.get() setDocument:pdfDocument.get()];
 }