Changeset 190826 in webkit

Timestamp:

Oct 9, 2015 3:48:39 PM (9 years ago)

Author:

andersca@apple.com

Message:

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.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/SubframeLoader.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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>
 

trunk/Source/WebCore/loader/SubframeLoader.cpp

@@ -375 +375 @@
     }
 
-    // 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