Eliminate remaining WebCore dependencies from webplugin_impl.cc...

chrome/renderer/render_view.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/renderer/render_view.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 70 matching lines @@
 #include "webkit/glue/media/simple_data_source.h"
 #include "webkit/glue/password_form.h"
 #include "webkit/glue/plugins/plugin_list.h"
 #include "webkit/glue/searchable_form_data.h"
 #include "webkit/glue/webaccessibilitymanager_impl.h"
 #include "webkit/glue/webdevtoolsagent_delegate.h"
 #include "webkit/glue/webdropdata.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/glue/webmediaplayer_impl.h"
 #include "webkit/glue/webplugin_delegate.h"
+#include "webkit/glue/webplugin_impl.h"
 #include "webkit/glue/webview.h"
 
 #if defined(OS_WIN)
 // TODO(port): these files are currently Windows only because they concern:
 //   * theming
 #include "base/gfx/native_theme.h"
 #endif
 
 using base::Time;
 using base::TimeDelta;
@@ skipping 83 matching lines @@
     : RenderWidget(render_thread, true),
       enabled_bindings_(0),
       target_url_status_(TARGET_NONE),
       is_loading_(false),
       navigation_gesture_(NavigationGestureUnknown),
       page_id_(-1),
       last_page_id_sent_to_browser_(-1),
       last_indexed_page_id_(-1),
       opened_by_user_gesture_(true),
       ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)),
-      first_default_plugin_(NULL),
       devtools_agent_(NULL),
       devtools_client_(NULL),
       history_back_list_count_(0),
       history_forward_list_count_(0),
       has_unload_listener_(false),
       decrement_shared_popup_at_destruction_(false),
       form_field_autofill_request_id_(0),
       popup_notification_visible_(false),
       delay_seconds_for_form_state_sync_(kDefaultDelaySecondsForFormStateSync),
       preferred_width_(0),
       send_preferred_width_changes_(false),
       determine_page_text_after_loading_stops_(false),
       view_type_(ViewType::INVALID),
       browser_window_id_(-1),
       last_top_level_navigation_page_id_(-1),
       webkit_preferences_(webkit_preferences) {
   Singleton<RenderViewSet>()->render_view_set_.insert(this);
 }
 
 RenderView::~RenderView() {
   Singleton<RenderViewSet>()->render_view_set_.erase(this);
   if (decrement_shared_popup_at_destruction_)
     shared_popup_counter_->data--;
 
-  // Clear any back-pointers that might still be held by plugins.
-  PluginDelegateList::iterator it = plugin_delegates_.begin();
-  while (it != plugin_delegates_.end()) {
-    (*it)->DropRenderView();
-    it = plugin_delegates_.erase(it);
-  }
-
   render_thread_->RemoveFilter(audio_message_filter_);
 }
 
 /*static*/
 RenderView* RenderView::Create(
     RenderThreadBase* render_thread,
     gfx::NativeViewId parent_hwnd,
     base::WaitableEvent* modal_dialog_event,
     int32 opener_id,
     const RendererPreferences& renderer_prefs,
@@ skipping 13 matching lines @@
 
 /*static*/
 void RenderView::SetNextPageID(int32 next_page_id) {
   // This method should only be called during process startup, and the given
   // page id had better not exceed our current next page id!
   DCHECK_EQ(next_page_id_, 1);
   DCHECK(next_page_id >= next_page_id_);
   next_page_id_ = next_page_id;
 }
 
-void RenderView::PluginDestroyed(WebPluginDelegateProxy* proxy) {
-  PluginDelegateList::iterator it =
-      std::find(plugin_delegates_.begin(), plugin_delegates_.end(), proxy);
-  DCHECK(it != plugin_delegates_.end());
-  plugin_delegates_.erase(it);
-  // If the plugin is deleted, we need to clear our reference in case user
-  // clicks the info bar to install. Unfortunately we are getting
-  // PluginDestroyed in single process mode. However, that is not a huge
-  // concern.
-  if (proxy == first_default_plugin_)
-    first_default_plugin_ = NULL;
-}
-
 void RenderView::PluginCrashed(base::ProcessId pid,
                                const FilePath& plugin_path) {
   Send(new ViewHostMsg_CrashedPlugin(routing_id_, pid, plugin_path));
 }
 
-
 void RenderView::JSOutOfMemory() {
   Send(new ViewHostMsg_JSOutOfMemory(routing_id_));
 }
 
 void RenderView::Init(gfx::NativeViewId parent_hwnd,
                       base::WaitableEvent* modal_dialog_event,
                       int32 opener_id,
                       const RendererPreferences& renderer_prefs,
                       SharedRenderViewCounter* counter,
                       int32 routing_id) {
@@ skipping 775 matching lines @@
 
 void RenderView::DidStartLoading(WebView* webview) {
   if (is_loading_) {
     DLOG(WARNING) << "DidStartLoading called while loading";
     return;
   }
 
   is_loading_ = true;
   // Clear the pointer so that we can assign it only when there is an unknown
   // plugin on a page.
-  first_default_plugin_ = NULL;
+  first_default_plugin_.reset();
 
   Send(new ViewHostMsg_DidStartLoading(routing_id_));
 }
 
 void RenderView::DidStopLoading(WebView* webview) {
   if (!is_loading_) {
     DLOG(WARNING) << "DidStopLoading called while not loading";
     return;
   }
 
@@ skipping 693 matching lines @@
     return;
 
   webview()->AutofillSuggestionsForNode(node_id, suggestions,
                                         default_suggestion_index);
 }
 
 void RenderView::OnPopupNotificationVisibilityChanged(bool visible) {
   popup_notification_visible_ = visible;
 }
 
-void RenderView::ShowModalHTMLDialog(const GURL& url, int width, int height,
-                                     const std::string& json_arguments,
-                                     std::string* json_retval) {
-  IPC::SyncMessage* msg = new ViewHostMsg_ShowModalHTMLDialog(
-      routing_id_, url, width, height, json_arguments, json_retval);
-
-  msg->set_pump_messages_event(modal_dialog_event_.get());
-  Send(msg);
-}
-
 uint32 RenderView::GetCPBrowsingContext() {
   uint32 context = 0;
   Send(new ViewHostMsg_GetCPBrowsingContext(&context));
   return context;
 }
 
 // Tell the browser to display a destination link.
 void RenderView::UpdateTargetURL(WebView* webview, const GURL& url) {
   if (url != target_url_) {
     if (target_url_status_ == TARGET_INFLIGHT ||
@@ skipping 97 matching lines @@
 
 WebWidget* RenderView::CreatePopupWidgetWithInfo(WebView* webview,
                                                  const WebPopupMenuInfo& info) {
   RenderWidget* widget = RenderWidget::Create(routing_id_,
                                               render_thread_,
                                               true);
   widget->ConfigureAsExternalPopupMenu(info);
   return widget->webwidget();
 }
 
-WebPluginDelegate* RenderView::CreatePluginDelegate(
-    WebView* webview,
-    const GURL& url,
-    const std::string& mime_type,
-    const std::string& clsid,
-    std::string* actual_mime_type) {
-  if (!PluginChannelHost::IsListening())
-    return NULL;
-
-  GURL policy_url;
-  if (webview->GetMainFrame())
-    policy_url = webview->GetMainFrame()->url();
-
-  FilePath path;
-  render_thread_->Send(
-      new ViewHostMsg_GetPluginPath(url, policy_url, mime_type, clsid, &path,
-                                    actual_mime_type));
-  if (path.value().empty())
-    return NULL;
-
-  std::string mime_type_to_use;
-  if (!actual_mime_type->empty())
-    mime_type_to_use = *actual_mime_type;
-  else
-    mime_type_to_use = mime_type;
-
-  if (RenderProcess::current()->in_process_plugins()) {
-#if defined(OS_WIN)  // In-proc plugins aren't supported on Linux or Mac.
-    return WebPluginDelegate::Create(path,
-                                     mime_type_to_use,
-                                     gfx::NativeViewFromId(host_window_));
-#else
-    NOTIMPLEMENTED();
-    return NULL;
-#endif
-  }
-
-  WebPluginDelegateProxy* proxy =
-      WebPluginDelegateProxy::Create(url, mime_type_to_use, clsid, this);
-  if (!proxy)
-    return NULL;
-
-  plugin_delegates_.push_back(proxy);
-
-  return proxy;
+WebKit::WebPlugin* RenderView::CreatePlugin(
+    WebFrame* frame, const WebKit::WebPluginParams& params) {
+  return new webkit_glue::WebPluginImpl(frame, params, AsWeakPtr());
 }
 
 WebKit::WebMediaPlayer* RenderView::CreateWebMediaPlayer(
     WebKit::WebMediaPlayerClient* client) {
   scoped_refptr<media::FilterFactoryCollection> factory =
       new media::FilterFactoryCollection();
   // Add in any custom filter factories first.
   const CommandLine* cmd_line = CommandLine::ForCurrentProcess();
   if (!cmd_line->HasSwitch(switches::kDisableAudio)) {
     // Add the chrome specific audio renderer.
@@ skipping 17 matching lines @@
         webkit_glue::BufferedDataSource::CreateFactory(MessageLoop::current(),
                                                        bridge_factory));
   } else {
     factory->AddFactory(
         webkit_glue::SimpleDataSource::CreateFactory(MessageLoop::current(),
                                                      bridge_factory));
   }
   return new webkit_glue::WebMediaPlayerImpl(client, factory);
 }
 
-void RenderView::OnMissingPluginStatus(WebPluginDelegate* delegate,
-                                       int status) {
+void RenderView::OnMissingPluginStatus(
+    WebPluginDelegateProxy* delegate,
+    int status) {
 #if defined(OS_WIN)
-  if (first_default_plugin_ == NULL) {
+  if (!first_default_plugin_) {
     // Show the InfoBar for the first available plugin.
     if (status == default_plugin::MISSING_PLUGIN_AVAILABLE) {
-      first_default_plugin_ = delegate;
+      first_default_plugin_ = delegate->AsWeakPtr();
       Send(new ViewHostMsg_MissingPluginStatus(routing_id_, status));
     }
   } else {
     // Closes the InfoBar if user clicks on the plugin (instead of the InfoBar)
     // to start the download/install.
     if (status == default_plugin::MISSING_PLUGIN_USER_STARTED_DOWNLOAD) {
       Send(new ViewHostMsg_MissingPluginStatus(routing_id_, status));
     }
   }
 #else
@@ skipping 67 matching lines @@
 
 void RenderView::runModal() {
   DCHECK(did_show_) << "should already have shown the view";
 
   IPC::SyncMessage* msg = new ViewHostMsg_RunModal(routing_id_);
 
   msg->set_pump_messages_event(modal_dialog_event_.get());
   Send(msg);
 }
 
+webkit_glue::WebPluginDelegate* RenderView::CreatePluginDelegate(
+    const GURL& url,
+    const std::string& mime_type,
+    const std::string& clsid,
+    std::string* actual_mime_type) {
+  if (!PluginChannelHost::IsListening())
+    return NULL;
+
+  GURL policy_url;
+  WebFrame* main_frame = webview()->GetMainFrame();
+  if (main_frame)
+    policy_url = main_frame->url();
+
+  FilePath path;
+  render_thread_->Send(
+      new ViewHostMsg_GetPluginPath(url, policy_url, mime_type, clsid, &path,
+                                    actual_mime_type));
+  if (path.value().empty())
+    return NULL;
+
+  const std::string* mime_type_to_use;
+  if (!actual_mime_type->empty())
+    mime_type_to_use = actual_mime_type;
+  else
+    mime_type_to_use = &mime_type;
+
+  if (RenderProcess::current()->in_process_plugins()) {
+#if defined(OS_WIN)  // In-proc plugins aren't supported on Linux or Mac.
+    return webkit_glue::WebPluginDelegate::Create(
+        path, *mime_type_to_use, gfx::NativeViewFromId(host_window_));
+#else
+    NOTIMPLEMENTED();
+    return NULL;
+#endif
+  }
+
+  return WebPluginDelegateProxy::Create(
+      url, *mime_type_to_use, clsid, AsWeakPtr());
+}
+
+void RenderView::CreatedPluginWindow(gfx::PluginWindowHandle window) {
+#if defined(OS_LINUX)
+  RenderThread::current()->Send(new ViewHostMsg_CreatePluginContainer(
+      routing_id(), window));
+#endif
+}
+
+void RenderView::WillDestroyPluginWindow(gfx::PluginWindowHandle window) {
+#if defined(OS_LINUX)
+  RenderThread::current()->Send(new ViewHostMsg_DestroyPluginContainer(
+      routing_id(), window));
+#endif
+  CleanupWindowInPluginMoves(window);
+}
+
+void RenderView::DidMovePlugin(const webkit_glue::WebPluginGeometry& move) {
+  SchedulePluginMove(move);
+}
+
+void RenderView::DidStartLoadingForPlugin() {
+  // TODO(darin): Make is_loading_ be a counter!
+  DidStartLoading(webview());
+}
+
+void RenderView::DidStopLoadingForPlugin() {
+  // TODO(darin): Make is_loading_ be a counter!
+  DidStopLoading(webview());
+}
+
+void RenderView::ShowModalHTMLDialogForPlugin(
+    const GURL& url,
+    const gfx::Size& size,
+    const std::string& json_arguments,
+    std::string* json_retval) {
+  IPC::SyncMessage* msg = new ViewHostMsg_ShowModalHTMLDialog(
+      routing_id_, url, size.width(), size.height(), json_arguments,
+      json_retval);
+
+  msg->set_pump_messages_event(modal_dialog_event_.get());
+  Send(msg);
+}
+
 void RenderView::SyncNavigationState() {
   if (!webview())
     return;
 
   const WebHistoryItem& item = webview()->GetMainFrame()->currentHistoryItem();
   if (item.isNull())
     return;
 
   Send(new ViewHostMsg_UpdateState(
       routing_id_, page_id_, webkit_glue::HistoryItemToString(item)));
@@ skipping 635 matching lines @@
   webkit_preferences_ = prefs;
   webkit_preferences_.Apply(webview());
 }
 
 void RenderView::OnSetAltErrorPageURL(const GURL& url) {
   alternate_error_page_url_ = url;
 }
 
 void RenderView::OnInstallMissingPlugin() {
   // This could happen when the first default plugin is deleted.
-  if (first_default_plugin_ == NULL)
-    return;
-  first_default_plugin_->InstallMissingPlugin();
+  if (first_default_plugin_)
+    first_default_plugin_->InstallMissingPlugin();
 }
 
 void RenderView::OnFileChooserResponse(
     const std::vector<FilePath>& file_names) {
   // This could happen if we navigated to a different page before the user
   // closed the chooser.
   if (!file_chooser_.get())
     return;
 
   file_chooser_->OnFileChoose(file_names);
@@ skipping 532 matching lines @@
   // occurred.
   if (acc_obj_id >= 0)
     Send(new ViewHostMsg_AccessibilityFocusChange(routing_id_, acc_obj_id));
 
 #else  // defined(OS_WIN)
   // TODO(port): accessibility not yet implemented
   NOTIMPLEMENTED();
 #endif
 }
 
-void RenderView::DidMovePlugin(const WebPluginGeometry& move) {
-  SchedulePluginMove(move);
-}
-
-void RenderView::CreatedPluginWindow(gfx::PluginWindowHandle window) {
-#if defined(OS_LINUX)
-  RenderThread::current()->Send(new ViewHostMsg_CreatePluginContainer(
-      routing_id(), window));
-#endif
-}
-
-void RenderView::WillDestroyPluginWindow(gfx::PluginWindowHandle window) {
-#if defined(OS_LINUX)
-  RenderThread::current()->Send(new ViewHostMsg_DestroyPluginContainer(
-      routing_id(), window));
-#endif
-  CleanupWindowInPluginMoves(window);
-}
-
 void RenderView::SendPasswordForms(WebFrame* frame) {
   WebVector<WebForm> forms;
   frame->forms(forms);
 
   std::vector<PasswordForm> password_forms;
   for (size_t i = 0; i < forms.size(); ++i) {
     const WebForm& form = forms[i];
 
     // Respect autocomplete=off.
     if (form.isAutoCompleteEnabled()) {
       scoped_ptr<PasswordForm> password_form(
           PasswordFormDomManager::CreatePasswordForm(form));
       if (password_form.get())
         password_forms.push_back(*password_form);
     }
   }
 
   if (!password_forms.empty())
     Send(new ViewHostMsg_PasswordFormsSeen(routing_id_, password_forms));
 }
 
 void RenderView::Print(WebFrame* frame, bool script_initiated) {
   DCHECK(frame);
   if (print_helper_.get() == NULL) {
     print_helper_.reset(new PrintWebViewHelper(this));
   }
   print_helper_->Print(frame, script_initiated);
 }