Changeset 104663 in webkit

Timestamp:

Jan 10, 2012 8:50:17 PM (12 years ago)

Author:

mrowe@apple.com

Message:

REGRESSION (r104377): All pages print blank on Snow Leopard
<​http://webkit.org/b/75879> / <rdar://problem/10674335>

We need to explicitly load PDFKit.framework before using PDFDocument and friends.
On SnowLeopard the framework is not necessarily loaded by anything else before we
print, which would lead to us failing to allocate the PDFDocument that we use for
drawing the content from the web process.

Reviewed by Dan Bernstein.

• UIProcess/API/mac/WKPrintingView.mm:

(pdfKitFrameworkPath): Construct the path to the PDFKit framework.
(classFromPDFKit): Ensure that the PDFKit framework is loaded, and then retrieve the
given class from it.
(pdfAnnotationLinkClass): ASSERT that we found the class.
(pdfDocumentClass): Ditto.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/mac/WKPrintingView.mm (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2012-01-10  Mark Rowe  <mrowe@apple.com>
+
+        REGRESSION (r104377): All pages print blank on Snow Leopard
+        <http://webkit.org/b/75879> / <rdar://problem/10674335>
+
+        We need to explicitly load PDFKit.framework before using PDFDocument and friends.
+        On SnowLeopard the framework is not necessarily loaded by anything else before we
+        print, which would lead to us failing to allocate the PDFDocument that we use for
+        drawing the content from the web process.
+
+        Reviewed by Dan Bernstein.
+
+        * UIProcess/API/mac/WKPrintingView.mm:
+        (pdfKitFrameworkPath): Construct the path to the PDFKit framework.
+        (classFromPDFKit): Ensure that the PDFKit framework is loaded, and then retrieve the
+        given class from it.
+        (pdfAnnotationLinkClass): ASSERT that we found the class.
+        (pdfDocumentClass): Ditto.
+
 2012-01-10  Chris Marrin  <cmarrin@apple.com>
 

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

@@ -412 +412 @@
 }
 
+static NSString *pdfKitFrameworkPath()
+{
+    NSString *systemLibraryPath = [NSSearchPathForDirectoriesInDomains(NSLibraryDirectory, NSSystemDomainMask, NO) objectAtIndex:0];
+    return [systemLibraryPath stringByAppendingPathComponent:@"Frameworks/Quartz.framework/Frameworks/PDFKit.framework"];
+}
+
+static Class classFromPDFKit(NSString *className)
+{
+    static NSBundle *pdfKitBundle = [NSBundle bundleWithPath:pdfKitFrameworkPath()];
+    [pdfKitBundle load];
+    return [pdfKitBundle classNamed:className];
+}
+
 static Class pdfAnnotationLinkClass()
 {
-    static Class pdfAnnotationLinkClass = NSClassFromString(@"PDFAnnotationLink");
+    static Class pdfAnnotationLinkClass = classFromPDFKit(@"PDFAnnotationLink");
+    ASSERT(pdfAnnotationLinkClass);
     return pdfAnnotationLinkClass;
 }
@@ -420 +434 @@
 static Class pdfDocumentClass()
 {
-    static Class pdfDocumentClass = NSClassFromString(@"PDFDocument");
+    static Class pdfDocumentClass = classFromPDFKit(@"PDFDocument");
+    ASSERT(pdfDocumentClass);
     return pdfDocumentClass;
 }