Revert "Revert 69755 - Move the NPAPI files from webkit/glue/plugins to webkit/plugins/npapi"

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 "gfx/codec/jpeg_codec.h"
 #include "gfx/gdi_util.h"
 #include "printing/units.h"
 #include "skia/ext/vector_platform_device.h"
 #endif
 #include "printing/native_metafile.h"
 #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/webcursor.h"
 #include "webkit/glue/webkit_glue.h"
+#include "webkit/plugins/npapi/plugin_constants_win.h"
+#include "webkit/plugins/npapi/plugin_instance.h"
+#include "webkit/plugins/npapi/plugin_lib.h"
+#include "webkit/plugins/npapi/plugin_list.h"
+#include "webkit/plugins/npapi/plugin_host.h"
+#include "webkit/plugins/npapi/plugin_stream_url.h"
 
 #if defined(ENABLE_GPU)
-#include "webkit/glue/plugins/plugin_constants_win.h"
+#include "webkit/plugins/npapi/plugin_constants_win.h"
 #endif
 
 #if defined(ENABLE_GPU)
 using gpu::Buffer;
 #endif
 
-using webkit_glue::WebPlugin;
-using webkit_glue::WebPluginDelegate;
-using webkit_glue::WebPluginResourceClient;
+using webkit::npapi::WebPlugin;
+using webkit::npapi::WebPluginDelegate;
+using webkit::npapi::WebPluginResourceClient;
 using WebKit::WebCursorInfo;
 using WebKit::WebKeyboardEvent;
 using WebKit::WebInputEvent;
 using WebKit::WebMouseEvent;
 using WebKit::WebMouseWheelEvent;
 
 namespace {
 
 // Implementation artifacts for a context
 struct Device2DImpl {
@@ skipping 19 matching lines @@
     const unsigned char* pdf_buffer, int buffer_size, int page_number, HDC dc,
     int dpi_x, int dpi_y, int bounds_origin_x, int bounds_origin_y,
     int bounds_width, int bounds_height, bool fit_to_bounds,
     bool stretch_to_bounds, bool keep_aspect_ratio, bool center_in_bounds);
 #endif  // defined(OS_WIN)
 
 WebPluginDelegatePepper* WebPluginDelegatePepper::Create(
     const FilePath& filename,
     const std::string& mime_type,
     const base::WeakPtr<RenderView>& render_view) {
-  scoped_refptr<NPAPI::PluginLib> plugin_lib(
-      NPAPI::PluginLib::CreatePluginLib(filename));
+  scoped_refptr<webkit::npapi::PluginLib> plugin_lib(
+      webkit::npapi::PluginLib::CreatePluginLib(filename));
   if (plugin_lib.get() == NULL)
     return NULL;
 
   NPError err = plugin_lib->NP_Initialize();
   if (err != NPERR_NO_ERROR)
     return NULL;
 
-  scoped_refptr<NPAPI::PluginInstance> instance(
+  scoped_refptr<webkit::npapi::PluginInstance> instance(
       plugin_lib->CreateInstance(mime_type));
   return new WebPluginDelegatePepper(render_view,
                                      instance.get());
 }
 
 void WebPluginDelegatePepper::didChooseFile(
     const WebKit::WebVector<WebKit::WebString>& file_names) {
   if (file_names.isEmpty()) {
     current_choose_file_callback_(NULL, 0, current_choose_file_user_data_);
   } else {
@@ skipping 400 matching lines @@
   if (!extensions || !extensions->getSelection)
     return string16();
 
   void* text;
   NPSelectionType type = html ? NPSelectionTypeHTML : NPSelectionTypePlainText;
   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);
+  webkit::npapi::PluginHost::Singleton()->host_functions()->memfree(text);
   return rv;
 }
 
 NPError WebPluginDelegatePepper::Device2DQueryCapability(int32 capability,
                                                          int32* value) {
   return NPERR_GENERIC_ERROR;
 }
 
 NPError WebPluginDelegatePepper::Device2DQueryConfig(
     const NPDeviceContext2DConfig* request,
@@ skipping 115 matching lines @@
   if (!context)
     return NPERR_GENERIC_ERROR;
 
 #if defined(ENABLE_GPU)
   // Check to see if the GPU plugin is already initialized and fail if so.
   if (nested_delegate_)
     return NPERR_GENERIC_ERROR;
 
   // Create an instance of the GPU plugin that is responsible for 3D
   // rendering.
-  nested_delegate_ = new WebPluginDelegateProxy(kGPUPluginMimeType,
-                                                render_view_);
+  nested_delegate_ = new WebPluginDelegateProxy(
+      "application/vnd.google.chrome.gpu-plugin", render_view_);
 
   // TODO(apatrick): should the GPU plugin be attached to plugin_?
   if (nested_delegate_->Initialize(GURL(),
                                    std::vector<std::string>(),
                                    std::vector<std::string>(),
                                    plugin_,
                                    false)) {
     plugin_->SetAcceptsInputEvents(true);
 
     // Ensure the window has the correct size before initializing the
@@ skipping 568 matching lines @@
   // scaling up that will happen in the browser.
   XFORM xform = {0};
   xform.eM11 = xform.eM22 = kPointsPerInch / current_printer_dpi_;
   ModifyWorldTransform(dc, &xform, MWT_LEFTMULTIPLY);
 
   ret = render_proc(pdf_output, output_size, 0, dc, current_printer_dpi_,
                     current_printer_dpi_, 0, 0, size_in_pixels.width(),
                     size_in_pixels.height(), true, false, true, true);
 #endif  // defined(OS_WIN)
 
-  NPAPI::PluginHost::Singleton()->host_functions()->memfree(pdf_output);
+  webkit::npapi::PluginHost::Singleton()->host_functions()->memfree(
+      pdf_output);
   return ret;
 }
 
 bool WebPluginDelegatePepper::PrintPage(int page_number,
                                         WebKit::WebCanvas* canvas) {
   NPPPrintExtensions* print_extensions = GetPrintExtensions();
   if (!print_extensions)
     return false;
 
   // First try and use vector print.
@@ skipping 87 matching lines @@
 #if defined(OS_MACOSX)
   last_printed_page_ = SkBitmap();
 #elif defined(OS_LINUX)
   num_pages_ = 0;
   pdf_output_done_ = false;
 #endif  // defined(OS_LINUX)
 }
 
 WebPluginDelegatePepper::WebPluginDelegatePepper(
     const base::WeakPtr<RenderView>& render_view,
-    NPAPI::PluginInstance *instance)
+    webkit::npapi::PluginInstance *instance)
     : render_view_(render_view),
       plugin_(NULL),
       instance_(instance),
       nested_delegate_(NULL),
       current_printer_dpi_(-1),
 #if defined (OS_LINUX)
       num_pages_(0),
       pdf_output_done_(false),
 #endif  // (OS_LINUX)
 #if defined(ENABLE_GPU)
@@ skipping 237 matching lines @@
     const gfx::Rect& clip_rect) {
   // Inform the browser about the location of the plugin on the page.
   // It appears that initially the plugin does not get laid out correctly --
   // possibly due to lazy creation of the nested delegate.
   if (!nested_delegate_ ||
       !nested_delegate_->GetPluginWindowHandle() ||
       !render_view_) {
     return;
   }
 
-  webkit_glue::WebPluginGeometry geom;
+  webkit::npapi::WebPluginGeometry geom;
   geom.window = nested_delegate_->GetPluginWindowHandle();
   geom.window_rect = window_rect;
   geom.clip_rect = clip_rect;
   // Rects_valid must be true for this to work in the Gtk port;
   // hopefully not having the cutout rects will not cause incorrect
   // clipping.
   geom.rects_valid = true;
   geom.visible = true;
   render_view_->DidMovePlugin(geom);
 }
@@ skipping 110 matching lines @@
   CGRect bounds;
   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)