Fix painting glitch with text and NPAPI plugins. This was a regression from r167042. The problem wa…

webkit/plugins/npapi/webplugin_delegate_impl.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 WEBKIT_PLUGINS_NPAPI_WEBPLUGIN_DELEGATE_IMPL_H_
 #define WEBKIT_PLUGINS_NPAPI_WEBPLUGIN_DELEGATE_IMPL_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 117 matching lines @@
                                         uint32 last_modified) OVERRIDE;
   virtual void DidReceiveManualData(const char* buffer, int length) OVERRIDE;
   virtual void DidFinishManualLoading() OVERRIDE;
   virtual void DidManualLoadFail() OVERRIDE;
   virtual WebPluginResourceClient* CreateResourceClient(
       unsigned long resource_id, const GURL& url, int notify_id) OVERRIDE;
   virtual WebPluginResourceClient* CreateSeekableResourceClient(
       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_; }
 
   // Returns the path for the library implementing this plugin.
   base::FilePath GetPluginPath();
 
   // Returns a combination of PluginQuirks.
   int GetQuirks() const { return quirks_; }
 
   // Informs the plugin that the view it is in has gained or lost focus.
@@ skipping 42 matching lines @@
   // Indicates that the windowless plugins will draw directly to the window
   // context instead of a buffer context.
   void SetNoBufferContext();
 
   // TODO(caryclark): This is a temporary workaround to allow the Darwin / Skia
   // port to share code with the Darwin / CG port. Later, this will be removed
   // and all callers will use the Paint defined above.
   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.
   void set_windowed_handle(gfx::PluginWindowHandle handle);
 #endif
 
 #if defined(USE_X11)
   void SetWindowlessShmPixmap(XID shm_pixmap) {
     windowless_shm_pixmap_ = shm_pixmap;
   }
@@ skipping 74 matching lines @@
   bool PlatformSetPluginHasFocus(bool focused);
 
   //-----------------------------------------
   // used for windowed and windowless plugins
 
   // Does platform-specific event handling. Arguments and return are identical
   // to HandleInputEvent.
   bool PlatformHandleInputEvent(const WebKit::WebInputEvent& event,
                                 WebKit::WebCursorInfo* cursor_info);
 
-  PluginInstance* instance() { return instance_.get(); }
-
   // Closes down and destroys our plugin instance.
   void DestroyInstance();
 
 
   // used for windowed plugins
   // Note: on Mac OS X, the only time the windowed handle is non-zero
   // is the case of accelerated rendering, which uses a fake window handle to
   // identify itself back to the browser. It still performs all of its
   // work offscreen.
   gfx::PluginWindowHandle windowed_handle_;
@@ skipping 197 matching lines @@
   // True if NPP_New did not return an error.
   bool creation_succeeded_;
 
   DISALLOW_COPY_AND_ASSIGN(WebPluginDelegateImpl);
 };
 
 }  // namespace npapi
 }  // namespace webkit
 
 #endif  // WEBKIT_PLUGINS_NPAPI_WEBPLUGIN_DELEGATE_IMPL_H_