Get windowless plugins working when accelerated compositing is turned on.

content/plugin/webplugin_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_PLUGIN_WEBPLUGIN_PROXY_H_
 #define CONTENT_PLUGIN_WEBPLUGIN_PROXY_H_
 
 #include <string>
 
 #include "base/hash_tables.h"
@@ skipping 101 matching lines @@
                                 const char* target,
                                 const char* buf,
                                 unsigned int len,
                                 int notify_id,
                                 bool popups_allowed,
                                 bool notify_redirects) OVERRIDE;
   void UpdateGeometry(const gfx::Rect& window_rect,
                       const gfx::Rect& clip_rect,
                       const TransportDIB::Handle& windowless_buffer0,
                       const TransportDIB::Handle& windowless_buffer1,
-                      int windowless_buffer_index,
-                      const TransportDIB::Handle& background_buffer,
-                      bool transparent);
+                      int windowless_buffer_index);
   virtual void CancelDocumentLoad() OVERRIDE;
   virtual void InitiateHTTPRangeRequest(
       const char* url, const char* range_info, int range_request_id) OVERRIDE;
   virtual void SetDeferResourceLoading(unsigned long resource_id,
                                        bool defer) OVERRIDE;
   virtual bool IsOffTheRecord() OVERRIDE;
   virtual void ResourceClientDeleted(
       webkit::npapi::WebPluginResourceClient* resource_client) OVERRIDE;
 
 #if defined(OS_MACOSX)
@@ skipping 98 matching lines @@
 
   static void CreateShmPixmapFromDIB(
       TransportDIB* dib,
       const gfx::Rect& window_rect,
       XID* pixmap_out);
 #endif
 
   // Updates the shared memory sections where windowless plugins paint.
   void SetWindowlessBuffers(const TransportDIB::Handle& windowless_buffer0,
                             const TransportDIB::Handle& windowless_buffer1,
-                            const TransportDIB::Handle& background_buffer,
                             const gfx::Rect& window_rect);
 
 #if defined(OS_MACOSX)
   CGContextRef windowless_context() const {
     return windowless_contexts_[windowless_buffer_index_].get();
   }
 #else
   skia::PlatformCanvas* windowless_canvas() const {
     return windowless_canvases_[windowless_buffer_index_].get();
   }
@@ skipping 18 matching lines @@
   gfx::Rect damaged_rect_;
   bool waiting_for_paint_;
   // The url of the main frame hosting the plugin.
   GURL page_url_;
 
   // Variables used for desynchronized windowless plugin painting. See note in
   // webplugin_delegate_proxy.h for how this works. The two sets of windowless_*
   // fields are for the front-buffer and back-buffer of a buffer flipping system
   // and windowless_buffer_index_ identifies which set we are using as the
   // back-buffer at any given time.
-  bool transparent_;
   int windowless_buffer_index_;
 #if defined(OS_MACOSX)
   scoped_ptr<TransportDIB> windowless_dibs_[2];
-  scoped_ptr<TransportDIB> background_dib_;
   base::mac::ScopedCFTypeRef<CGContextRef> windowless_contexts_[2];
-  base::mac::ScopedCFTypeRef<CGContextRef> background_context_;
   scoped_ptr<WebPluginAcceleratedSurfaceProxy> accelerated_surface_;
 #else
   SkAutoTUnref<skia::PlatformCanvas> windowless_canvases_[2];
-  SkAutoTUnref<skia::PlatformCanvas> background_canvas_;
 
 #if defined(USE_X11)
   scoped_refptr<SharedTransportDIB> windowless_dibs_[2];
-  scoped_refptr<SharedTransportDIB> background_dib_;
   // If we can use SHM pixmaps for windowless plugin painting or not.
   bool use_shm_pixmap_;
   // The SHM pixmaps for windowless plugin painting.
   XID windowless_shm_pixmaps_[2];
 #endif
 
 #endif
 
   // Contains the routing id of the host render view.
   int host_render_view_routing_id_;
 
   base::WeakPtrFactory<WebPluginProxy> weak_factory_;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PLUGIN_WEBPLUGIN_PROXY_H_