More refactoring for WebPlugin.

This CL eliminates direct calls to WebPluginDelegate::DidFinishLoadWithReason
from WebFrameLoaderClient.

This CL also moves WebDataSourceImpl into webkit/api/src.  That change was
needed so that WebPluginContainerImpl can add a WebPluginLoadObserver to it,
which WebFrameLoaderClient uses to communicate back to the WebPlugin upon
completion of the frame load.

WebViewDelegate::DidFinishLoadWithReason is modified to include url and
notify_data parameters, eliminating the URLRequestRouted method.  This is done
so that we can support overlapping NPN_GetURLNotify targetting different
frames.

WebPluginContainer grows an executeScriptURL method to deal with javascript:
URLs.

NOTE: I'm working on some UI tests to better cover the case of overlapping
NPN_GetURLNotify calls.

R=jam
BUG=10036
TEST=none yet

Review URL: http://codereview.chromium.org/174514

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24655 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 2 deletions

diff --git a/webkit/glue/webframeloaderclient_impl.h b/webkit/glue/webframeloaderclient_impl.h
index 95cef30..a623187 100644
--- a/webkit/glue/webframeloaderclient_impl.h
+++ b/webkit/glue/webframeloaderclient_impl.h
@@ -6,6 +6,7 @@
 #define WEBKIT_GLUE_WEBFRAMELOADERCLIENT_IMPL_H_
 
 #include "FrameLoaderClient.h"
+#include <wtf/PassOwnPtr.h>
 #include <wtf/RefPtr.h>
 
 #include "googleurl/src/gurl.h"
@@ -16,6 +17,7 @@ class WebFrameImpl;
 
 namespace WebKit {
 class WebPluginContainerImpl;
+class WebPluginLoadObserver;
 }
 
 class WebFrameLoaderClient : public WebCore::FrameLoaderClient {
@@ -186,8 +188,8 @@ class WebFrameLoaderClient : public WebCore::FrameLoaderClient {
       const WTF::Vector<WebCore::String>& paramNames,
       const WTF::Vector<WebCore::String>& paramValues);
 
-  virtual WebCore::ObjectContentType objectContentType(const WebCore::KURL& url,
-                                              const WebCore::String& mimeType);
+  virtual WebCore::ObjectContentType objectContentType(
+      const WebCore::KURL& url, const WebCore::String& mimeType);
   virtual WebCore::String overrideMediaType() const;
 
   virtual void didPerformFirstNavigation() const;
@@ -210,6 +212,8 @@ class WebFrameLoaderClient : public WebCore::FrameLoaderClient {
   // Called when a dummy back-forward navigation is intercepted.
   void HandleBackForwardNavigation(const GURL&);
 
+  PassOwnPtr<WebKit::WebPluginLoadObserver> GetPluginLoadObserver();
+
   // The WebFrame that owns this object and manages its lifetime. Therefore,
   // the web frame object is guaranteed to exist.
   WebFrameImpl* webframe_;