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

chrome/renderer/webplugin_delegate_pepper.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.
 
 #define PEPPER_APIS_ENABLED 1
 
 #include "chrome/renderer/webplugin_delegate_pepper.h"
 
 #include <string>
 #include <vector>
@@ skipping 37 matching lines @@
 #include "third_party/npapi/bindings/npapi_extensions.h"
 #include "third_party/npapi/bindings/npapi_extensions_private.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebCursorInfo.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebInputEvent.h"
 #include "webkit/glue/plugins/plugin_constants_win.h"
 #include "webkit/glue/plugins/plugin_instance.h"
 #include "webkit/glue/plugins/plugin_lib.h"
 #include "webkit/glue/plugins/plugin_list.h"
 #include "webkit/glue/plugins/plugin_host.h"
 #include "webkit/glue/plugins/plugin_stream_url.h"
-#include "webkit/glue/scoped_clipboard_writer_glue.h"
 #include "webkit/glue/webkit_glue.h"
 
 #if defined(ENABLE_GPU)
 #include "webkit/glue/plugins/plugin_constants_win.h"
 #endif
 
 using gpu::Buffer;
 using webkit_glue::WebPlugin;
 using webkit_glue::WebPluginDelegate;
 using webkit_glue::WebPluginResourceClient;
@@ skipping 246 matching lines @@
 WebPluginResourceClient* WebPluginDelegatePepper::CreateResourceClient(
     unsigned long resource_id, const GURL& url, int notify_id) {
   return instance()->CreateStream(resource_id, url, std::string(), notify_id);
 }
 
 WebPluginResourceClient* WebPluginDelegatePepper::CreateSeekableResourceClient(
     unsigned long resource_id, int range_request_id) {
   return instance()->GetRangeRequest(range_request_id);
 }
 
-void WebPluginDelegatePepper::StartFind(const std::string& search_text,
+void WebPluginDelegatePepper::StartFind(const string16& search_text,
                                         bool case_sensitive,
                                         int identifier) {
   find_identifier_ = identifier;
   GetFindExtensions()->startFind(
-      instance()->npp(), search_text.c_str(), case_sensitive);
+      instance()->npp(), UTF16ToUTF8(search_text).c_str(), case_sensitive);
 }
 
 void WebPluginDelegatePepper::SelectFindResult(bool forward) {
   GetFindExtensions()->selectFindResult(instance()->npp(), forward);
 }
 
 void WebPluginDelegatePepper::StopFind() {
   find_identifier_ = -1;
   GetFindExtensions()->stopFind(instance()->npp());
 }
@@ skipping 154 matching lines @@
 NPFontExtensions g_font_extensions = {
   NPMatchFontWithFallback,
   GetFontTable,
   NPDestroyFont
 };
 
 NPFontExtensions* WebPluginDelegatePepper::GetFontExtensions() {
   return &g_font_extensions;
 }
 
-void WebPluginDelegatePepper::Zoom(int factor) {
+void WebPluginDelegatePepper::SetZoomFactor(float scale, bool text_only) {
   NPPExtensions* extensions = NULL;
   instance()->NPP_GetValue(NPPVPepperExtensions, &extensions);
   if (extensions && extensions->zoom)
-    extensions->zoom(instance()->npp(), factor);
+    extensions->zoom(instance()->npp(), scale, text_only);
 }
 
-void WebPluginDelegatePepper::Copy() {
-  ScopedClipboardWriterGlue scw(webkit_glue::ClipboardGetClipboard());
-  string16 text = GetSelectedText(true);
-  if (!text.empty()) {
-    // Got html data.
-    scw.WriteHTML(text, std::string());
-    return;
-  }
-
-  text = GetSelectedText(false);
-  if (!text.empty())
-    scw.WriteText(text);
+bool WebPluginDelegatePepper::HasSelection() const {
+  return !GetSelectedText(false).empty();
 }
 
-string16 WebPluginDelegatePepper::GetSelectedText() {
+string16 WebPluginDelegatePepper::GetSelectionAsText() const {
   return GetSelectedText(false);
 }
 
-string16 WebPluginDelegatePepper::GetSelectedText(bool html) {
+string16 WebPluginDelegatePepper::GetSelectionAsMarkup() const {
+  return GetSelectedText(true);
+}
+
+string16 WebPluginDelegatePepper::GetSelectedText(bool html) const {
   NPPExtensions* extensions = NULL;
-  instance()->NPP_GetValue(NPPVPepperExtensions, &extensions);
+  instance_->NPP_GetValue(NPPVPepperExtensions, &extensions);
   if (!extensions || !extensions->getSelection)
     return string16();
 
   void* text;
   NPSelectionType type = html ? NPSelectionTypeHTML : NPSelectionTypePlainText;
-  NPP npp = instance()->npp();
+  NPP npp = instance_->npp();
   if (extensions->getSelection(npp, &type, &text) != NPERR_NO_ERROR)
     return string16();
 
   string16 rv = UTF8ToUTF16(static_cast<char*>(text));
   NPAPI::PluginHost::Singleton()->host_functions()->memfree(text);
   return rv;
 }
 
 NPError WebPluginDelegatePepper::Device2DQueryCapability(int32 capability,
                                                          int32* value) {
@@ skipping 987 matching lines @@
   npevent->u.wheel.deltaX = mouse_wheel_event->deltaX;
   npevent->u.wheel.deltaY = mouse_wheel_event->deltaY;
   npevent->u.wheel.wheelTicksX = mouse_wheel_event->wheelTicksX;
   npevent->u.wheel.wheelTicksY = mouse_wheel_event->wheelTicksY;
   npevent->u.wheel.scrollByPage = mouse_wheel_event->scrollByPage;
 }
 }  // namespace
 
 bool WebPluginDelegatePepper::HandleInputEvent(const WebInputEvent& event,
                                                WebCursorInfo* cursor_info) {
-  if (event.type == WebInputEvent::KeyDown) {
-    const WebKeyboardEvent* key_event =
-        reinterpret_cast<const WebKeyboardEvent*>(&event);
-#if defined(OS_MACOSX)
-    if (key_event->modifiers == NPEventModifier_MetaKey &&
-#else
-    if (key_event->modifiers == NPEventModifier_ControlKey &&
-#endif
-        key_event->windowsKeyCode == base::VKEY_C) {
-      Copy();
-      return true;
-    }
-  }
-
   NPPepperEvent npevent;
 
   npevent.type = ConvertEventTypes(event.type);
   npevent.size = sizeof(npevent);
   npevent.timeStampSeconds = event.timeStampSeconds;
   switch (npevent.type) {
     case NPEventType_Undefined:
       return false;
     case NPEventType_MouseDown:
     case NPEventType_MouseUp:
@@ skipping 202 matching lines @@
   bounds.origin.x = dest_rect.x();
   bounds.origin.y = canvas_height - dest_rect.y() - dest_rect.height();
   bounds.size.width = dest_rect.width();
   bounds.size.height = dest_rect.height();
 
   CGContextDrawImage(canvas, bounds, image);
   CGContextRestoreGState(canvas);
 }
 #endif  // defined(OS_MACOSX)