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

webkit/glue/plugins/webplugin_delegate_impl_mac.mm

 // 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.
 
 #import <Cocoa/Cocoa.h>
 #import <QuartzCore/QuartzCore.h>
 
-#include "webkit/plugins/npapi/webplugin_delegate_impl.h"
+#include "webkit/glue/plugins/webplugin_delegate_impl.h"
 
 #include <string>
 #include <unistd.h>
 #include <set>
 
 #include "base/file_util.h"
 #include "base/message_loop.h"
 #include "base/metrics/stats_counters.h"
 #include "base/scoped_ptr.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/sys_string_conversions.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebInputEvent.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_stream_url.h"
+#include "webkit/glue/plugins/plugin_web_event_converter_mac.h"
+#include "webkit/glue/plugins/webplugin.h"
+#include "webkit/glue/plugins/webplugin_accelerated_surface_mac.h"
 #include "webkit/glue/webkit_glue.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_stream_url.h"
-#include "webkit/plugins/npapi/plugin_web_event_converter_mac.h"
-#include "webkit/plugins/npapi/webplugin.h"
-#include "webkit/plugins/npapi/webplugin_accelerated_surface_mac.h"
 
 #ifndef NP_NO_CARBON
-#include "webkit/plugins/npapi/carbon_plugin_window_tracker_mac.h"
+#include "webkit/glue/plugins/carbon_plugin_window_tracker_mac.h"
 #endif
 
 #ifndef NP_NO_QUICKDRAW
-#include "webkit/plugins/npapi/quickdraw_drawing_manager_mac.h"
+#include "webkit/glue/plugins/quickdraw_drawing_manager_mac.h"
 #endif
 
+using webkit_glue::WebPlugin;
+using webkit_glue::WebPluginDelegate;
+using webkit_glue::WebPluginResourceClient;
 using WebKit::WebCursorInfo;
 using WebKit::WebKeyboardEvent;
 using WebKit::WebInputEvent;
 using WebKit::WebMouseEvent;
 using WebKit::WebMouseWheelEvent;
 
+const int kCoreAnimationRedrawPeriodMs = 10;  // 100 Hz
+
 // Important implementation notes: The Mac definition of NPAPI, particularly
 // the distinction between windowed and windowless modes, differs from the
 // Windows and Linux definitions.  Most of those differences are
 // accomodated by the WebPluginDelegate class.
 
-namespace webkit {
-namespace npapi {
-
 namespace {
 
-const int kCoreAnimationRedrawPeriodMs = 10;  // 100 Hz
-
 WebPluginDelegateImpl* g_active_delegate;
 
 // Helper to simplify correct usage of g_active_delegate.  Instantiating will
 // set the active delegate to |delegate| for the lifetime of the object, then
 // NULL when it goes out of scope.
 class ScopedActiveDelegate {
- public:
+public:
   explicit ScopedActiveDelegate(WebPluginDelegateImpl* delegate) {
     g_active_delegate = delegate;
   }
   ~ScopedActiveDelegate() {
     g_active_delegate = NULL;
   }
-
- private:
+private:
   DISALLOW_COPY_AND_ASSIGN(ScopedActiveDelegate);
 };
 
 #ifndef NP_NO_CARBON
 // Timer periods for sending idle events to Carbon plugins. The visible value
 // (50Hz) matches both Safari and Firefox. The hidden value (8Hz) matches
 // Firefox; according to https://bugzilla.mozilla.org/show_bug.cgi?id=525533
 // going lower than that causes issues.
 const int kVisibleIdlePeriodMs = 20;     // (50Hz)
 const int kHiddenIdlePeriodMs = 125;  // (8Hz)
@@ skipping 160 matching lines @@
   return WebInputEvent::LeftButtonDown |
          WebInputEvent::RightButtonDown |
          WebInputEvent::MiddleButtonDown;
 }
 
 #pragma mark -
 #pragma mark Core WebPluginDelegate implementation
 
 WebPluginDelegateImpl::WebPluginDelegateImpl(
     gfx::PluginWindowHandle containing_view,
-    PluginInstance *instance)
+    NPAPI::PluginInstance *instance)
     : windowed_handle_(NULL),
       // all Mac plugins are "windowless" in the Windows/X11 sense
       windowless_(true),
       plugin_(NULL),
       instance_(instance),
       parent_(containing_view),
       quirks_(0),
       buffer_context_(NULL),
       layer_(nil),
       surface_(NULL),
@@ skipping 299 matching lines @@
     // If we add a page capture mode at the WebKit layer (like the plugin
     // capture mode that handles drags starting inside) this can be removed.
     bool drag_related = external_drag_tracker_->EventIsRelatedToDrag(event);
     external_drag_tracker_->UpdateDragStateFromEvent(event);
     if (drag_related) {
       if (event.type == WebInputEvent::MouseUp &&
           !external_drag_tracker_->IsDragInProgress()) {
         // When an external drag ends, we need to synthesize a MouseEntered.
         NPCocoaEvent enter_event = *(static_cast<NPCocoaEvent*>(plugin_event));
         enter_event.type = NPCocoaEventMouseEntered;
-        ScopedCurrentPluginEvent event_scope(instance(), &enter_event);
+        NPAPI::ScopedCurrentPluginEvent event_scope(instance(), &enter_event);
         instance()->NPP_HandleEvent(&enter_event);
       }
       return false;
     }
   }
 
   // Send the plugin the event.
-  scoped_ptr<ScopedCurrentPluginEvent> event_scope(NULL);
+  scoped_ptr<NPAPI::ScopedCurrentPluginEvent> event_scope(NULL);
   if (instance()->event_model() == NPEventModelCocoa) {
-    event_scope.reset(new ScopedCurrentPluginEvent(
+    event_scope.reset(new NPAPI::ScopedCurrentPluginEvent(
         instance(), static_cast<NPCocoaEvent*>(plugin_event)));
   }
   int16_t handle_response = instance()->NPP_HandleEvent(plugin_event);
   bool handled = handle_response != kNPEventNotHandled;
 
   if (handled && event.type == WebInputEvent::KeyDown) {
     // Update IME state as requested by the plugin.
     SetImeEnabled(handle_response == kNPEventStartIME);
   }
 
@@ skipping 544 matching lines @@
     return;
   }
 
   qd_manager_->SetFastPathEnabled(enabled);
   qd_port_.port = qd_manager_->port();
   WindowlessSetWindow();
   // Send a paint event so that the new buffer gets updated immediately.
   WindowlessPaint(buffer_context_, clip_rect_);
 }
 #endif  // !NP_NO_QUICKDRAW
-
-}  // namespace npapi
-}  // namespace webkit