Changeset 89727 in webkit

Timestamp:

Jun 24, 2011, 7:12:10 PM (14 years ago)

Author:

Lucas Forschler

Message:

89706.

Location:

branches/safari-534-branch/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (modified) (2 diffs)
• WebProcess/WebProcess.cpp (modified) (1 diff)
• WebProcess/WebProcess.h (modified) (2 diffs)

branches/safari-534-branch/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-06-24  Lucas Forschler  <lforschler@apple.com>
+
+    Merged 89706.
+
+    2011-06-24  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Kevin Decker.
+
+        Not possible for plug-ins to override the internal PDF viewer
+        https://bugs.webkit.org/show_bug.cgi?id=63356
+        <rdar://problem/9673382>
+
+        * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+        (WebKit::WebFrameLoaderClient::transitionToCommittedFromCachedFrame):
+        (WebKit::WebFrameLoaderClient::transitionToCommittedForNewPage):
+        Pass the entire resource response to shouldUseCustomRepresentationForResponse.
+
+        * WebProcess/WebProcess.cpp:
+        (WebKit::canPluginHandleResponse):
+        Ask for the plug-in path for a plug-in that can handle the given resource response.
+        If we fail to send the message, or if the path comes back empty, we assume that there's no plug-in
+        that can handle it.
+
+        (WebKit::WebProcess::shouldUseCustomRepresentationForResponse):
+        If the response MIME type is in the m_mimeTypesWithCustomRepresentations map, check if there's
+        a plug-in that can handle the given response. If that is the case, it should have precedence over
+        the custom representation.
+
+        * WebProcess/WebProcess.h:
+        Rename shouldUseCustomRepresentationForMIMEType to shouldUseCustomRepresentationForResponse.
+
 2011-06-22  Lucas Forschler  <lforschler@apple.com>
 

branches/safari-534-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp

@@ -1105 +1105 @@
     bool isMainFrame = webPage->mainFrame() == m_frame;
     
-    const String& mimeType = m_frame->coreFrame()->loader()->documentLoader()->response().mimeType();
-    m_frameHasCustomRepresentation = isMainFrame && WebProcess::shared().shouldUseCustomRepresentationForMIMEType(mimeType);
+    const ResourceResponse& response = m_frame->coreFrame()->loader()->documentLoader()->response();
+    m_frameHasCustomRepresentation = isMainFrame && WebProcess::shared().shouldUseCustomRepresentationForResponse(response);
 }
 
@@ -1128 +1128 @@
     m_frame->coreFrame()->view()->setActualVisibleContentRect(IntRect(IntPoint::zero(), currentVisibleContentSize));
 #else
-    const String& mimeType = m_frame->coreFrame()->loader()->documentLoader()->response().mimeType();
-    m_frameHasCustomRepresentation = isMainFrame && WebProcess::shared().shouldUseCustomRepresentationForMIMEType(mimeType);
+    const ResourceResponse& response = m_frame->coreFrame()->loader()->documentLoader()->response();
+    m_frameHasCustomRepresentation = isMainFrame && WebProcess::shared().shouldUseCustomRepresentationForResponse(response);
 
     m_frame->coreFrame()->createView(webPage->size(), backgroundColor, false, IntSize(), false);

branches/safari-534-branch/Source/WebKit2/WebProcess/WebProcess.cpp

@@ -723 +723 @@
 }
 
+static bool canPluginHandleResponse(const ResourceResponse& response)
+{
+    String pluginPath;
+
+    if (!WebProcess::shared().connection()->sendSync(Messages::WebContext::GetPluginPath(response.mimeType(), response.url().string()), Messages::WebContext::GetPluginPath::Reply(pluginPath), 0))
+        return false;
+
+    return !pluginPath.isEmpty();
+}
+
+bool WebProcess::shouldUseCustomRepresentationForResponse(const ResourceResponse& response) const
+{
+    if (!m_mimeTypesWithCustomRepresentations.contains(response.mimeType()))
+        return false;
+
+    // If a plug-in exists that claims to support this response, it should take precedence over the custom representation.
+    return !canPluginHandleResponse(response);
+}
+
 void WebProcess::clearResourceCaches(ResourceCachesToClear resourceCachesToClear)
 {

branches/safari-534-branch/Source/WebKit2/WebProcess/WebProcess.h

@@ -55 +55 @@
     class PageGroup;
     class ResourceRequest;
+    class ResourceResponse;
 }
 
@@ -112 +113 @@
 #endif
 
-    bool shouldUseCustomRepresentationForMIMEType(const String& mimeType) const { return m_mimeTypesWithCustomRepresentations.contains(mimeType); }
+    bool shouldUseCustomRepresentationForResponse(const WebCore::ResourceResponse&) const;
 
     // Text Checking