diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-10 03:08:05 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-10 03:08:05 +0000 |
| commit | 4f15bb568f02c479ba56b40e3f17210414163d96 (patch) | |
| tree | a1e0540cf16ed8c03dab17a015eb8d88ab32eb43 /content/plugin/webplugin_proxy.h | |
| parent | 5d047becad4bb3eda071d0e940e721a2e42e1bed (diff) | |
| download | chromium_src-4f15bb568f02c479ba56b40e3f17210414163d96.zip chromium_src-4f15bb568f02c479ba56b40e3f17210414163d96.tar.gz chromium_src-4f15bb568f02c479ba56b40e3f17210414163d96.tar.bz2 | |
Get windowless plugins working when accelerated compositing is turned on by copying the buffers using skia instead of OS specific ways that need the platform device.
Also remove the code that kept the background buffer in sync with plugins since it's not necessary anymore. Looks like Flash and Silverlight support this correctly now.
Review URL: https://codereview.chromium.org/11361170
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167042 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/plugin/webplugin_proxy.h')
| -rw-r--r-- | content/plugin/webplugin_proxy.h | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/content/plugin/webplugin_proxy.h b/content/plugin/webplugin_proxy.h index 81bdf86..a51dc75 100644 --- a/content/plugin/webplugin_proxy.h +++ b/content/plugin/webplugin_proxy.h @@ -119,9 +119,7 @@ class WebPluginProxy : public webkit::npapi::WebPlugin { 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; @@ -240,7 +238,6 @@ class WebPluginProxy : public webkit::npapi::WebPlugin { // 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) @@ -279,21 +276,16 @@ class WebPluginProxy : public webkit::npapi::WebPlugin { // 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. |