Make RenderView call the plugin through WebKit::WebPlugin (instead of casting...

chrome/renderer/render_view.cc

 // Copyright (c) 2010 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 1109 matching lines @@
     return;
 
   webview()->focusedFrame()->executeCommand(WebString::fromUTF8("Cut"));
   UserMetricsRecordAction("Cut");
 }
 
 void RenderView::OnCopy() {
   if (!webview())
     return;
 
-  if (webview()->mainFrame()->document().isPluginDocument()) {
-    webkit_glue::WebPluginDelegate* delegate = GetDelegateForPluginDocument();
-    delegate->Copy();
-    return;
-  }
-
   webview()->focusedFrame()->executeCommand(WebString::fromUTF8("Copy"));
   UserMetricsRecordAction("Copy");
 }
 
 #if defined(OS_MACOSX)
 void RenderView::OnCopyToFindPboard() {
   if (!webview())
     return;
 
   // Since the find pasteboard supports only plain text, this can be simpler
@@ skipping 2333 matching lines @@
       NOTREACHED() << "unknown ErrorPageType";
   }
 
   // OK, build the final url to return.
   GURL::Replacements link_doctor_params;
   link_doctor_params.SetQueryStr(params);
   GURL url = alternate_error_page_url_.ReplaceComponents(link_doctor_params);
   return url;
 }
 
-webkit_glue::WebPluginDelegate* RenderView::GetDelegateForPluginDocument() {
-  WebPlugin* plugin =
-      webview()->mainFrame()->document().to<WebPluginDocument>().plugin();
-  return static_cast<webkit_glue::WebPluginImpl*>(plugin)->delegate();
+WebKit::WebPlugin* RenderView::GetWebPluginFromPluginDocument() {
+  return webview()->mainFrame()->document().to<WebPluginDocument>().plugin();
 }
 
 void RenderView::OnFind(int request_id, const string16& search_text,
                         const WebFindOptions& options) {
   WebFrame* main_frame = webview()->mainFrame();
 
   if (main_frame->document().isPluginDocument()) {
-    webkit_glue::WebPluginDelegate* delegate = GetDelegateForPluginDocument();
+#if defined(WEBPLUGIN_HAS_FIND_INTERFACE)
     if (options.findNext) {
       // Just navigate back/forward.
-      delegate->SelectFindResult(options.forward);
+      GetWebPluginFromPluginDocument()->selectFindResult(options.forward);
     } else {
-      if (delegate->SupportsFind()) {
-        delegate->StartFind(UTF16ToUTF8(search_text),
-                            options.matchCase,
-                            request_id);
+      if (GetWebPluginFromPluginDocument()->supportsFind()) {
+        GetWebPluginFromPluginDocument()->startFind(
+            search_text, options.matchCase, request_id);
       } else {
         ReportNoFindInPageResults(request_id);
       }
     }
+#endif
     return;
   }
 
   WebFrame* frame_after_main = main_frame->traverseNext(true);
   WebFrame* focused_frame = webview()->focusedFrame();
   WebFrame* search_frame = focused_frame;  // start searching focused frame.
 
   bool multi_frame = (frame_after_main != main_frame);
 
   // If we have multiple frames, we don't want to wrap the search within the
@@ skipping 92 matching lines @@
   }
 }
 
 void RenderView::OnStopFinding(const ViewMsg_StopFinding_Params& params) {
   WebView* view = webview();
   if (!view)
     return;
 
   WebDocument doc = view->mainFrame()->document();
   if (doc.isPluginDocument()) {
-    GetDelegateForPluginDocument()->StopFind();
+#if defined(WEBPLUGIN_HAS_FIND_INTERFACE)
+    GetWebPluginFromPluginDocument()->stopFind();
+#endif
     return;
   }
 
   bool clear_selection =
       params.action == ViewMsg_StopFinding_Params::kClearSelection;
   if (clear_selection)
     view->focusedFrame()->executeCommand(WebString::fromUTF8("Unselect"));
 
   WebFrame* frame = view->mainFrame();
   while (frame) {
@@ skipping 38 matching lines @@
 void RenderView::ClearBlockedContentSettings() {
   for (size_t i = 0; i < arraysize(content_blocked_); ++i)
     content_blocked_[i] = false;
 }
 
 void RenderView::OnZoom(PageZoom::Function function) {
   if (!webview())  // Not sure if this can happen, but no harm in being safe.
     return;
 
   webview()->hidePopups();
-  // Should we be saving zoom levels for plugins?  It's not clear, so for now
-  // don't.
-  if (webview()->mainFrame()->document().isPluginDocument()) {
-    webkit_glue::WebPluginDelegate* delegate = GetDelegateForPluginDocument();
-    int zoom;
-    if (function == PageZoom::RESET) {
-      zoom = 0;
-    } else if (function == PageZoom::ZOOM_OUT) {
-      zoom = -1;
-    } else if (function == PageZoom::ZOOM_IN) {
-      zoom = 1;
-    } else {
-      NOTREACHED();
-      return;
-    }
-    delegate->Zoom(zoom);
-    return;
-  }
 
   int zoom_level = webview()->zoomLevel();
   int new_zoom_level = webview()->setZoomLevel(false,
       (function == PageZoom::RESET) ? 0 : (zoom_level + function));
 
   // Tell the browser which url got zoomed so it can update the saved values.
   Send(new ViewHostMsg_DidZoomURL(
       GURL(webview()->mainFrame()->url()), new_zoom_level));
 }
 
@@ skipping 1558 matching lines @@
   webkit_glue::FormData form;
   const WebInputElement element = node.toConst<WebInputElement>();
   if (!form_manager_.FindFormWithFormControlElement(
           element, FormManager::REQUIRE_NONE, &form))
     return;
 
   autofill_action_ = action;
   Send(new ViewHostMsg_FillAutoFillFormData(
       routing_id_, autofill_query_id_, form, value, label));
 }