Changeset 98513 in webkit

Timestamp:

Oct 26, 2011, 1:19:14 PM (15 years ago)

Author:

jeffm@apple.com

Message:

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

If WebKitOmitPDFSupport pref is set, disable both the new "plug-in" for subframes and the PDFKit-based support for the main frame only.

Reviewed by Alexey Proskuryakov.

• UIProcess/WebContext.cpp:

(WebKit::WebContext::getPlugins): Don't register built-in PDF plugin if WebKitOmitPDFSupport pref is set.

• UIProcess/WebContext.h: Added omitPDFSupport().

• UIProcess/WebFrameProxy.cpp:

(WebKit::WebFrameProxy::canShowMIMEType): Don't show PDFs if WebKitOmitPDFSupport is set.

• UIProcess/mac/WebContextMac.mm:

(WebKit::WebContext::omitPDFSupport): Added.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/WebContext.cpp (modified) (1 diff)
• UIProcess/WebContext.h (modified) (1 diff)
• UIProcess/WebFrameProxy.cpp (modified) (1 diff)
• UIProcess/mac/WebContextMac.mm (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-10-26  Jeff Miller  <jeffm@apple.com>
+
+        WebKit2 should respect secret WebKitOmitPDFSupport preference on the Mac
+        https://bugs.webkit.org/show_bug.cgi?id=70943
+        
+        If WebKitOmitPDFSupport pref is set, disable both the new "plug-in" for subframes and the PDFKit-based support for the main frame only.
+
+        Reviewed by Alexey Proskuryakov.
+
+        * UIProcess/WebContext.cpp:
+        (WebKit::WebContext::getPlugins): Don't register built-in PDF plugin if WebKitOmitPDFSupport pref is set.
+        
+        * UIProcess/WebContext.h: Added omitPDFSupport().
+        
+        * UIProcess/WebFrameProxy.cpp:
+        (WebKit::WebFrameProxy::canShowMIMEType): Don't show PDFs if WebKitOmitPDFSupport is set.
+        
+        * UIProcess/mac/WebContextMac.mm:
+        (WebKit::WebContext::omitPDFSupport): Added.
+
 2011-10-26  Sam Weinig  <sam@webkit.org>
 

trunk/Source/WebKit2/UIProcess/WebContext.cpp

@@ -569 +569 @@
 #if PLATFORM(MAC)
     // Add built-in PDF last, so that it's not used when a real plug-in is installed.
-    pluginInfos.append(BuiltInPDFView::pluginInfo());
+    if (!omitPDFSupport())
+        pluginInfos.append(BuiltInPDFView::pluginInfo());
 #endif
 }

trunk/Source/WebKit2/UIProcess/WebContext.h

@@ -185 +185 @@
     void garbageCollectJavaScriptObjects();
 
+#if PLATFORM(MAC)
+    static bool omitPDFSupport();
+#endif
+
 private:
     WebContext(ProcessModel, const String& injectedBundlePath);

trunk/Source/WebKit2/UIProcess/WebFrameProxy.cpp

@@ -112 +112 @@
     // On Mac, we can show PDFs.
     if (!mimeType.isEmpty())
-        return WebContext::pdfAndPostScriptMIMETypes().contains(mimeType);
+        return WebContext::pdfAndPostScriptMIMETypes().contains(mimeType) && !WebContext::omitPDFSupport();
 #endif
 

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

@@ -140 +140 @@
 }
 
+bool WebContext::omitPDFSupport()
+{
+    // Since this is a "secret default" we don't bother registering it.
+    return [[NSUserDefaults standardUserDefaults] boolForKey:@"WebKitOmitPDFSupport"];
+}
+
 } // namespace WebKit