Remove hack that allowed plug-ins to always take over certain image formats

https://bugs.webkit.org/show_bug.cgi?id=149972

Reviewed by Tim Horton.

This hack was added 8 years ago to allow a certain plug-in to show multi-page TIFF images on uspto.gov.
We now support said TIFFs natively, and the plug-in has been discontinued so it's safe to get rid of this.

* loader/SubframeLoader.cpp:
(WebCore::SubframeLoader::shouldUsePlugin): Deleted.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@190826 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index aba108f..ac14a37 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2015-10-09  Anders Carlsson  <andersca@apple.com>
+
+        Remove hack that allowed plug-ins to always take over certain image formats
+        https://bugs.webkit.org/show_bug.cgi?id=149972
+
+        Reviewed by Tim Horton.
+
+        This hack was added 8 years ago to allow a certain plug-in to show multi-page TIFF images on uspto.gov. 
+        We now support said TIFFs natively, and the plug-in has been discontinued so it's safe to get rid of this.
+
+        * loader/SubframeLoader.cpp:
+        (WebCore::SubframeLoader::shouldUsePlugin): Deleted.
+
 2015-10-09  Simon Fraser  <simon.fraser@apple.com>
 
         Garbage texture data with composited table row

diff --git a/Source/WebCore/loader/SubframeLoader.cpp b/Source/WebCore/loader/SubframeLoader.cpp
index 3fd6edc..7efcbec 100644 (file)
--- a/Source/WebCore/loader/SubframeLoader.cpp
+++ b/Source/WebCore/loader/SubframeLoader.cpp
@@ -374,14 +374,6 @@ bool SubframeLoader::shouldUsePlugin(const URL& url, const String& mimeType, boo
         return true;
     }
 
-    // Allow other plug-ins to win over QuickTime because if the user has installed a plug-in that
-    // can handle TIFF (which QuickTime can also handle) they probably intended to override QT.
-    if (m_frame.page() && (mimeType == "image/tiff" || mimeType == "image/tif" || mimeType == "image/x-tiff")) {
-        String pluginName = m_frame.page()->pluginData().pluginNameForWebVisibleMimeType(mimeType);
-        if (!pluginName.isEmpty() && !pluginName.contains("QuickTime", false)) 
-            return true;
-    }
-        
     ObjectContentType objectType = m_frame.loader().client().objectContentType(url, mimeType, shouldPreferPlugInsForImages);
     // If an object's content can't be handled and it has no fallback, let
     // it be handled as a plugin to show the broken plugin icon.