Move NPAPI implementation out of webkit/plugins/npapi and into content.

content/child/npapi/webplugin.h

Index: content/child/npapi/webplugin.h
===================================================================
--- content/child/npapi/webplugin.h	(revision 0)
+++ content/child/npapi/webplugin.h	(working copy)
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_PLUGINS_NPAPI_WEBPLUGIN_H_
-#define WEBKIT_PLUGINS_NPAPI_WEBPLUGIN_H_
+#ifndef CONTENT_CHILD_NPAPI_WEBPLUGIN_H_
+#define CONTENT_CHILD_NPAPI_WEBPLUGIN_H_
 
 #include <string>
 #include <vector>
@@ -12,7 +12,6 @@
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/rect.h"
 #include "ui/gl/gpu_preference.h"
-#include "webkit/plugins/webkit_plugins_export.h"
 
 // TODO(port): this typedef is obviously incorrect on non-Windows
 // platforms, but now a lot of code now accidentally depends on them
@@ -22,43 +21,13 @@
 class GURL;
 struct NPObject;
 
-namespace webkit {
-namespace npapi {
+namespace content {
 
 class WebPluginResourceClient;
 #if defined(OS_MACOSX)
 class WebPluginAcceleratedSurface;
 #endif
 
-// Describes the new location for a plugin window.
-struct WEBKIT_PLUGINS_EXPORT WebPluginGeometry {
-  WebPluginGeometry();
-  ~WebPluginGeometry();
-
-  bool Equals(const WebPluginGeometry& rhs) const;
-
-  // On Windows, this is the plugin window in the plugin process.
-  // On X11, this is the XID of the plugin-side GtkPlug containing the
-  // GtkSocket hosting the actual plugin window.
-  //
-  // On Mac OS X, all of the plugin types are currently "windowless"
-  // (window == 0) except for the special case of the GPU plugin,
-  // which currently performs rendering on behalf of the Pepper 3D API
-  // and WebGL. The GPU plugin uses a simple integer for the
-  // PluginWindowHandle which is used to map to a side data structure
-  // containing information about the plugin. Soon this plugin will be
-  // generalized, at which point this mechanism will be rethought or
-  // removed.
-  gfx::PluginWindowHandle window;
-  gfx::Rect window_rect;
-  // Clip rect (include) and cutouts (excludes), relative to
-  // window_rect origin.
-  gfx::Rect clip_rect;
-  std::vector<gfx::Rect> cutout_rects;
-  bool rects_valid;
-  bool visible;
-};
-
 // The WebKit side of a plugin implementation.  It provides wrappers around
 // operations that need to interact with the frame and other WebCore objects.
 class WebPlugin {
@@ -192,7 +161,6 @@
   virtual void AddRangeRequestResourceId(unsigned long resource_id) { }
 };
 
-}  // namespace npapi
-}  // namespace webkit
+}  // namespace content
 
-#endif  // WEBKIT_PLUGINS_NPAPI_WEBPLUGIN_H_
+#endif  // CONTENT_CHILD_NPAPI_WEBPLUGIN_H_