Merge 186446

webkit/plugins/npapi/webplugin_delegate_impl.h

Index: webkit/plugins/npapi/webplugin_delegate_impl.h
===================================================================
--- webkit/plugins/npapi/webplugin_delegate_impl.h	(revision 186976)
+++ webkit/plugins/npapi/webplugin_delegate_impl.h	(working copy)
@@ -135,7 +135,9 @@
       unsigned long resource_id, int range_request_id) OVERRIDE;
   // End of WebPluginDelegate implementation.
 
-  bool IsWindowless() const { return windowless_ ; }
+  gfx::PluginWindowHandle windowed_handle() const { return windowed_handle_; }
+  bool IsWindowless() const { return windowless_; }
+  PluginInstance* instance() { return instance_.get(); }
   gfx::Rect GetRect() const { return window_rect_; }
   gfx::Rect GetClipRect() const { return clip_rect_; }
 
@@ -198,10 +200,6 @@
   void CGPaint(CGContextRef context, const gfx::Rect& rect);
 #endif  // OS_MACOSX && !USE_AURA
 
-  gfx::PluginWindowHandle windowed_handle() const {
-    return windowed_handle_;
-  }
-
 #if defined(OS_MACOSX)
   // Allow setting a "fake" window handle to associate this plug-in with
   // an IOSurface in the browser. Used for accelerated drawing surfaces.
@@ -296,8 +294,6 @@
   bool PlatformHandleInputEvent(const WebKit::WebInputEvent& event,
                                 WebKit::WebCursorInfo* cursor_info);
 
-  PluginInstance* instance() { return instance_.get(); }
-
   // Closes down and destroys our plugin instance.
   void DestroyInstance();