Merge 145319

Source/WebKit/chromium/src/WebHelperPluginImpl.h

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 24 matching lines @@
 #include <wtf/OwnPtr.h>
 #include <wtf/RefCounted.h>
 
 namespace WebCore {
 class Page;
 }
 
 namespace WebKit {
 
 class HelperPluginChromeClient;
+class WebDocument;
+class WebFrame;
 class WebViewImpl;
 class WebWidgetClient;
 
 // Hosts a simple page that instantiates a plugin using an <object> tag.
 // The widget is offscreen, and the plugin will not receive painting, resize, etc. events.
 class WebHelperPluginImpl : public WebHelperPlugin,
                             public RefCounted<WebHelperPluginImpl> {
     WTF_MAKE_NONCOPYABLE(WebHelperPluginImpl);
     WTF_MAKE_FAST_ALLOCATED;
 
 public:
     virtual ~WebHelperPluginImpl();
-    bool initialize(WebViewImpl*, const String& pluginType);
+    bool initialize(const String& pluginType, const WebDocument& hostDocument, WebViewImpl*);
     void closeHelperPlugin();
 
     // WebHelperPlugin methods:
     virtual void initializeFrame(WebFrameClient*) OVERRIDE;
     virtual WebPlugin* getPlugin() OVERRIDE;
 
 private:
     explicit WebHelperPluginImpl(WebWidgetClient*);
-    bool initializePage(WebKit::WebViewImpl*, const String& pluginType);
+    bool initializePage(const String& pluginType, const WebDocument& hostDocument);
     void destoryPage();
 
     // WebWidget methods:
     virtual void setCompositorSurfaceReady() OVERRIDE;
     virtual void composite(bool) OVERRIDE;
     virtual void layout() OVERRIDE;
     virtual void setFocus(bool) OVERRIDE;
     virtual void close() OVERRIDE;
 
     WebWidgetClient* m_widgetClient;
     WebViewImpl* m_webView;
     OwnPtr<WebCore::Page> m_page;
     OwnPtr<HelperPluginChromeClient> m_chromeClient;
 
     friend class WebHelperPlugin;
     friend class HelperPluginChromeClient;
 };
 
 } // namespace WebKit
 
 #endif // WebHelperPluginImpl_h