Changeset 86516 in webkit

Timestamp:

May 15, 2011 5:53:59 PM (13 years ago)

Author:

andersca@apple.com

Message:

2011-05-15 Anders Carlsson <​andersca@apple.com>

Reviewed by Geoffrey Garen.

Pass the document URL and toplevel document URL when creating a plug-in
​https://bugs.webkit.org/show_bug.cgi?id=60863

This is the first of a series of patches intended to reduce the IPC traffic
during plug-in instantiation.

• WebProcess/Plugins/Plugin.cpp: (WebKit::Plugin::Parameters::encode): Encode the URLs.

(WebKit::Plugin::Parameters::decode):
Decode the URLs.

• WebProcess/Plugins/Plugin.h: Add the document and toplevel document URLs.

• WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp: (WebKit::WebFrameLoaderClient::createPlugin): Initialize the document and toplevel document URLs.

Location:

trunk/Source/WebKit2

Files:

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

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-05-15  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Geoffrey Garen.
+
+        Pass the document URL and toplevel document URL when creating a plug-in
+        https://bugs.webkit.org/show_bug.cgi?id=60863
+
+        This is the first of a series of patches intended to reduce the IPC traffic
+        during plug-in instantiation.
+
+        * WebProcess/Plugins/Plugin.cpp:
+        (WebKit::Plugin::Parameters::encode):
+        Encode the URLs.
+
+        (WebKit::Plugin::Parameters::decode):
+        Decode the URLs.
+
+        * WebProcess/Plugins/Plugin.h:
+        Add the document and toplevel document URLs.
+
+        * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+        (WebKit::WebFrameLoaderClient::createPlugin):
+        Initialize the document and toplevel document URLs.
+
 2011-05-13  Oliver Hunt  <oliver@apple.com>
 

trunk/Source/WebKit2/WebProcess/Plugins/Plugin.cpp

@@ -40 +40 @@
     encoder->encode(mimeType);
     encoder->encode(loadManually);
+    encoder->encode(documentURL);
+    encoder->encode(toplevelDocumentURL);
 }
 
@@ -57 +59 @@
         return false;
     if (!decoder->decode(parameters.loadManually))
+        return false;
+    if (!decoder->decode(parameters.documentURL))
+        return false;
+    if (!decoder->decode(parameters.toplevelDocumentURL))
         return false;
 

trunk/Source/WebKit2/WebProcess/Plugins/Plugin.h

@@ -61 +61 @@
         String mimeType;
         bool loadManually;
+
+        // The URL of the document that the plug-in is in.
+        String documentURL;
+
+        // The URL of the document in the main frame. Will be null if the document the plug-in
+        // doesn't have access to the main frame document.
+        String toplevelDocumentURL;
 
         void encode(CoreIPC::ArgumentEncoder*) const;

trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp

@@ -1199 +1199 @@
 }
 
+static String documentURL(Frame* frame)
+{
+    const KURL& url = frame->document()->url();
+    return url.hasPath() ? url.prettyURL() : url.prettyURL() + "/";
+}
+
 PassRefPtr<Widget> WebFrameLoaderClient::createPlugin(const IntSize&, HTMLPlugInElement* pluginElement, const KURL& url, const Vector<String>& paramNames, const Vector<String>& paramValues, const String& mimeType, bool loadManually)
 {
@@ -1212 +1218 @@
     parameters.mimeType = mimeType;
     parameters.loadManually = loadManually;
+    parameters.documentURL = documentURL(m_frame->coreFrame());
+
+    Frame* mainFrame = webPage->mainFrame()->coreFrame();
+    if (m_frame->coreFrame() == mainFrame)
+        parameters.toplevelDocumentURL = parameters.documentURL;
+    else if (m_frame->coreFrame()->document()->securityOrigin()->canAccess(mainFrame->document()->securityOrigin())) {
+        // We only want to set the toplevel document URL if the plug-in has access to it.
+        parameters.toplevelDocumentURL = documentURL(mainFrame);
+    }
 
     // <rdar://problem/8440903>: AppleConnect has a bug where it does not