Changeset 98781 in webkit

Timestamp:

Oct 28, 2011, 4:35:08 PM (15 years ago)

Author:

jeffm@apple.com

Message:

More work on WebKit2 should respect WebKitOmitPDFSupport preference on the Mac
​https://bugs.webkit.org/show_bug.cgi?id=71156

Don't include PDF and PostScript types in the set of MIME types with custom representations
when initializing the web process if WebKitOmitPDFSupport is set.

I believe the previous patch r98513 was actually sufficient to prevent PDFs from being
shown inline when this preference was set, but to be complete we should exclude the MIME
types here as well.

Reviewed by Alexey Proskuryakov.

• UIProcess/mac/WebContextMac.mm:

(WebKit::WebContext::platformInitializeWebProcess):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/mac/WebContextMac.mm (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-10-28  Jeff Miller  <jeffm@apple.com>
+
+        More work on WebKit2 should respect WebKitOmitPDFSupport preference on the Mac
+        https://bugs.webkit.org/show_bug.cgi?id=71156
+        
+        Don't include PDF and PostScript types in the set of MIME types with custom representations
+        when initializing the web process if WebKitOmitPDFSupport is set.
+        
+        I believe the previous patch r98513 was actually sufficient to prevent PDFs from being
+        shown inline when this preference was set, but to be complete we should exclude the MIME
+        types here as well.
+
+        Reviewed by Alexey Proskuryakov.
+
+        * UIProcess/mac/WebContextMac.mm:
+        (WebKit::WebContext::platformInitializeWebProcess):
+
 2011-10-28  John Sullivan  <sullivan@apple.com>
 

trunk/Source/WebKit2/UIProcess/mac/WebContextMac.mm

@@ -70 +70 @@
 void WebContext::platformInitializeWebProcess(WebProcessCreationParameters& parameters)
 {
-    // We want to use a PDF view in the UI process for PDF MIME types.
-    HashSet<String, CaseFoldingHash> mimeType = pdfAndPostScriptMIMETypes();
-    parameters.mimeTypesWithCustomRepresentation.appendRange(mimeType.begin(), mimeType.end());
+    if (!omitPDFSupport()) {
+        // We want to use a PDF view in the UI process for PDF MIME types.
+        HashSet<String, CaseFoldingHash> mimeType = pdfAndPostScriptMIMETypes();
+        parameters.mimeTypesWithCustomRepresentation.appendRange(mimeType.begin(), mimeType.end());
+    }
 
     RetainPtr<CFStringRef> cachePath(AdoptCF, WKCopyFoundationCacheDirectory());