Title: [104224] branches/safari-534.54-branch/Source/WebKit2
Diff
Modified: branches/safari-534.54-branch/Source/WebKit2/ChangeLog (104223 => 104224)
--- branches/safari-534.54-branch/Source/WebKit2/ChangeLog 2012-01-05 22:35:53 UTC (rev 104223)
+++ branches/safari-534.54-branch/Source/WebKit2/ChangeLog 2012-01-05 22:37:35 UTC (rev 104224)
@@ -1,5 +1,26 @@
2011-1-5 Lucas Forschler <[email protected]>
+ Merge 98781
+
+ 2011-10-28 Jeff Miller <[email protected]>
+
+ 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-1-5 Lucas Forschler <[email protected]>
+
Merge 98513
2011-10-26 Jeff Miller <[email protected]>
Modified: branches/safari-534.54-branch/Source/WebKit2/UIProcess/mac/WebContextMac.mm (104223 => 104224)
--- branches/safari-534.54-branch/Source/WebKit2/UIProcess/mac/WebContextMac.mm 2012-01-05 22:35:53 UTC (rev 104223)
+++ branches/safari-534.54-branch/Source/WebKit2/UIProcess/mac/WebContextMac.mm 2012-01-05 22:37:35 UTC (rev 104224)
@@ -69,9 +69,11 @@
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());
if (!cachePath)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
