Revert of Remove a bunch of NPAPI quirks and related support code

content/renderer/npapi/webplugin_delegate_proxy.h

 // Copyright (c) 2012 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.
 
 #ifndef CONTENT_RENDERER_NPAPI_WEBPLUGIN_DELEGATE_PROXY_H_
 #define CONTENT_RENDERER_NPAPI_WEBPLUGIN_DELEGATE_PROXY_H_
 
 #include <stdint.h>
 
 #include <string>
@@ skipping 62 matching lines @@
   struct _NPP* GetPluginNPP() override;
   bool GetFormValue(base::string16* value) override;
   void SetFocus(bool focused) override;
   bool HandleInputEvent(const blink::WebInputEvent& event,
                         WebCursor::CursorInfo* cursor) override;
   int GetProcessId() override;
 
   // Informs the plugin that its containing content view has gained or lost
   // first responder status.
   virtual void SetContentAreaFocus(bool has_focus);
+#if defined(OS_WIN)
+  // Informs the plugin that plugin IME has updated its status.
+  virtual void ImeCompositionUpdated(
+      const base::string16& text,
+      const std::vector<int>& clauses,
+      const std::vector<int>& target,
+      int cursor_position,
+      int plugin_id);
+  // Informs the plugin that plugin IME has completed.
+  // If |text| is empty, composition was cancelled.
+  virtual void ImeCompositionCompleted(const base::string16& text,
+                                       int plugin_id);
+#endif
 #if defined(OS_MACOSX)
   // Informs the plugin that its enclosing window has gained or lost focus.
   virtual void SetWindowFocus(bool window_has_focus);
   // Informs the plugin that its container (window/tab) has changed visibility.
   virtual void SetContainerVisibility(bool is_visible);
   // Informs the plugin that its enclosing window's frame has changed.
   virtual void WindowFrameChanged(gfx::Rect window_frame, gfx::Rect view_frame);
   // Informs the plugin that plugin IME has completed.
   // If |text| is empty, composition was cancelled.
   virtual void ImeCompositionCompleted(const base::string16& text,
@@ skipping 43 matching lines @@
 #if defined(OS_MACOSX)
   void OnFocusChanged(bool focused);
   void OnStartIme();
   // Accelerated (Core Animation) plugin implementation.
   void OnAcceleratedPluginEnabledRendering();
   void OnAcceleratedPluginAllocatedIOSurface(int32_t width,
                                              int32_t height,
                                              uint32_t surface_id);
   void OnAcceleratedPluginSwappedIOSurface();
 #endif
+#if defined(OS_WIN)
+  void OnSetWindowlessData(HANDLE modal_loop_pump_messages_event_handle,
+                           gfx::NativeViewId dummy_activation_window);
+  void OnNotifyIMEStatus(const int input_mode, const gfx::Rect& caret_rect);
+#endif
   // Helper function that sends the UpdateGeometry message.
   void SendUpdateGeometry(bool bitmaps_changed);
 
   // Copies the given rectangle from the back-buffer transport_stores_ bitmap to
   // the front-buffer transport_stores_ bitmap.
   void CopyFromBackBufferToFrontBuffer(const gfx::Rect& rect);
 
   // Updates the front-buffer with the given rectangle from the back-buffer,
   // either by copying the rectangle or flipping the buffers.
   void UpdateFrontBuffer(const gfx::Rect& rect, bool allow_buffer_flipping);
@@ skipping 45 matching lines @@
   // Returns true if we should update the plugin geometry synchronously.
   bool UseSynchronousGeometryUpdates();
 #endif
 
   base::WeakPtr<RenderViewImpl> render_view_;
   RenderFrameImpl* render_frame_;
   WebPluginImpl* plugin_;
   bool uses_shared_bitmaps_;
 #if defined(OS_MACOSX)
   bool uses_compositor_;
+#elif defined(OS_WIN)
+  // Used for windowless plugins so that keyboard activation works.
+  gfx::NativeViewId dummy_activation_window_;
 #endif
   scoped_refptr<PluginChannelHost> channel_host_;
   std::string mime_type_;
   int instance_id_;
   WebPluginInfo info_;
 
   gfx::Rect plugin_rect_;
   gfx::Rect clip_rect_;
 
   NPObject* npobject_;
 
   // Dummy NPP used to uniquely identify this plugin.
   scoped_ptr<NPP_t> npp_;
 
+  // Event passed in by the plugin process and is used to decide if messages
+  // need to be pumped in the NPP_HandleEvent sync call.
+  scoped_ptr<base::WaitableEvent> modal_loop_pump_messages_event_;
+
   // Bitmap for crashed plugin
   SkBitmap* sad_plugin_;
 
   // True if we got an invalidate from the plugin and are waiting for a paint.
   bool invalidate_pending_;
 
   // If the plugin is transparent or not.
   bool transparent_;
 
   // The index in the transport_stores_ array of the current front buffer
@@ skipping 10 matching lines @@
 
   // The url of the main frame hosting the plugin.
   GURL page_url_;
 
   DISALLOW_COPY_AND_ASSIGN(WebPluginDelegateProxy);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_NPAPI_WEBPLUGIN_DELEGATE_PROXY_H_