Get windowless plugins working when accelerated compositing is turned on.

content/plugin/webplugin_proxy.cc

 // 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.
 
 #include "content/plugin/webplugin_proxy.h"
 
 #include "build/build_config.h"
 
 #include "base/bind.h"
 #include "base/lazy_instance.h"
@@ skipping 49 matching lines @@
     int route_id,
     const GURL& page_url,
     int host_render_view_routing_id)
     : channel_(channel),
       route_id_(route_id),
       window_npobject_(NULL),
       plugin_element_(NULL),
       delegate_(NULL),
       waiting_for_paint_(false),
       page_url_(page_url),
-      transparent_(false),
       windowless_buffer_index_(0),
       host_render_view_routing_id_(host_render_view_routing_id),
       ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
 #if defined(USE_X11)
   windowless_shm_pixmaps_[0] = None;
   windowless_shm_pixmaps_[1] = None;
   use_shm_pixmap_ = false;
 
   // If the X server supports SHM pixmaps
   // and the color depth and masks match,
@@ skipping 274 matching lines @@
   // (since the plugin can make a synchronous call during paint event handling),
   // in which case we don't want to try to restore later. Not an owning ref
   // since owning the ref without owning the shared backing memory doesn't make
   // sense, so this should only be used for pointer comparisons.
   CGContextRef saved_context_weak = windowless_context();
   // We also save the buffer index for the comparison because if we flip buffers
   // but haven't reallocated them then we do need to restore the context because
   // it is going to continue to be used.
   int saved_index = windowless_buffer_index_;
 
-  if (background_context_.get()) {
-    base::mac::ScopedCFTypeRef<CGImageRef> image(
-        CGBitmapContextCreateImage(background_context_));
-    CGRect source_rect = rect.ToCGRect();
-    // Flip the rect we use to pull from the canvas, since it's upside-down.
-    source_rect.origin.y = CGImageGetHeight(image) - rect.y() - rect.height();
-    base::mac::ScopedCFTypeRef<CGImageRef> sub_image(
-        CGImageCreateWithImageInRect(image, source_rect));
-    CGContextDrawImage(windowless_context(), rect.ToCGRect(), sub_image);
-  } else if (transparent_) {
-    CGContextClearRect(windowless_context(), rect.ToCGRect());
-  }
   CGContextClipToRect(windowless_context(), rect.ToCGRect());
   // TODO(caryclark): This is a temporary workaround to allow the Darwin / Skia
   // port to share code with the Darwin / CG port. All ports will eventually use
   // the common code below.
   delegate_->CGPaint(windowless_context(), rect);
   if (windowless_contexts_[saved_index].get() == saved_context_weak)
     CGContextRestoreGState(windowless_contexts_[saved_index]);
 #else
   // See above comment about windowless_context_ changing.
   // http::/crbug.com/139462
   skia::PlatformCanvas* saved_canvas = windowless_canvas();
   SkAutoRef local_ref(saved_canvas);
 #if defined(USE_X11)
   scoped_refptr<SharedTransportDIB> local_dib_ref(
       windowless_dibs_[windowless_buffer_index_]);
 #endif
 
   saved_canvas->save();
 
   // The given clip rect is relative to the plugin coordinate system.
   SkRect sk_rect = { SkIntToScalar(rect.x()),
                      SkIntToScalar(rect.y()),
                      SkIntToScalar(rect.right()),
                      SkIntToScalar(rect.bottom()) };
   saved_canvas->clipRect(sk_rect);
 
-  // Setup the background.
-  if (background_canvas_.get() && background_canvas_.get()->getDevice()) {
-    // When a background canvas is given, we're in transparent mode. This means
-    // the plugin wants to have the image of the page in the canvas it's drawing
-    // into (which is windowless_canvases_) so it can do blending. So we copy
-    // the background bitmap into the windowless canvas.
-    const SkBitmap& background_bitmap =
-        skia::GetTopDevice(*background_canvas_)->accessBitmap(false);
-    saved_canvas->drawBitmap(background_bitmap, 0, 0);
-  } else {
-    // In non-transparent mode, the plugin doesn't care what's underneath, so we
-    // can just give it black.
-    SkPaint black_fill_paint;
-    black_fill_paint.setARGB(0xFF, 0x00, 0x00, 0x00);
-    saved_canvas->drawPaint(black_fill_paint);
-  }
+  // Fill a transparent value so that if the plugin supports transparency that
+  // will work.
+  saved_canvas->drawColor(SkColorSetARGB(0, 0, 0, 0), SkXfermode::kSrc_Mode);
 
   // Bring the windowless canvas into the window coordinate system, which is
   // how the plugin expects to draw (since the windowless API was originally
   // designed just for scribbling over the web page).
   saved_canvas->translate(SkIntToScalar(-delegate_->GetRect().x()),
                           SkIntToScalar(-delegate_->GetRect().y()));
 
   // Before we send the invalidate, paint so that renderer uses the updated
   // bitmap.
   delegate_->Paint(saved_canvas, offset_rect);
 
   saved_canvas->restore();
 #endif
 }
 
 void WebPluginProxy::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) {
   gfx::Rect old = delegate_->GetRect();
   gfx::Rect old_clip_rect = delegate_->GetClipRect();
-  transparent_ = transparent;
 
   // Update the buffers before doing anything that could call into plugin code,
   // so that we don't process buffer changes out of order if plugins make
   // synchronous calls that lead to nested UpdateGeometry calls.
   if (TransportDIB::is_valid_handle(windowless_buffer0)) {
     // The plugin's rect changed, so now we have new buffers to draw into.
     SetWindowlessBuffers(windowless_buffer0,
                          windowless_buffer1,
-                         background_buffer,
                          window_rect);
   }
 
   DCHECK(0 <= windowless_buffer_index && windowless_buffer_index <= 1);
   windowless_buffer_index_ = windowless_buffer_index;
 #if defined(USE_X11)
   delegate_->SetWindowlessShmPixmap(windowless_shm_pixmap());
 #endif
 
 #if defined(OS_MACOSX)
@@ skipping 25 matching lines @@
           dib_handle)) {
     canvas->reset(NULL);
   }
   // The canvas does not own the section so we need to close it now.
   CloseHandle(dib_handle);
 }
 
 void WebPluginProxy::SetWindowlessBuffers(
     const TransportDIB::Handle& windowless_buffer0,
     const TransportDIB::Handle& windowless_buffer1,
-    const TransportDIB::Handle& background_buffer,
     const gfx::Rect& window_rect) {
   CreateCanvasFromHandle(windowless_buffer0,
                          window_rect,
                          &windowless_canvases_[0]);
   if (!windowless_canvases_[0].get()) {
     windowless_canvases_[1].reset(NULL);
-    background_canvas_.reset(NULL);
     return;
   }
   CreateCanvasFromHandle(windowless_buffer1,
                          window_rect,
                          &windowless_canvases_[1]);
   if (!windowless_canvases_[1].get()) {
     windowless_canvases_[0].reset(NULL);
-    background_canvas_.reset(NULL);
     return;
   }
-
-  if (background_buffer) {
-    CreateCanvasFromHandle(background_buffer,
-                           window_rect,
-                           &background_canvas_);
-    if (!background_canvas_.get()) {
-      windowless_canvases_[0].reset(NULL);
-      windowless_canvases_[1].reset(NULL);
-      return;
-    }
-  }
 }
 
 #elif defined(OS_MACOSX)
 
 void WebPluginProxy::CreateDIBAndCGContextFromHandle(
     const TransportDIB::Handle& dib_handle,
     const gfx::Rect& window_rect,
     scoped_ptr<TransportDIB>* dib_out,
     base::mac::ScopedCFTypeRef<CGContextRef>* cg_context_out) {
   // Convert the shared memory handle to a handle that works in our process,
@@ skipping 12 matching lines @@
     CGContextTranslateCTM(cg_context, 0, window_rect.height());
     CGContextScaleCTM(cg_context, 1, -1);
   }
   dib_out->reset(dib);
   cg_context_out->reset(cg_context);
 }
 
 void WebPluginProxy::SetWindowlessBuffers(
     const TransportDIB::Handle& windowless_buffer0,
     const TransportDIB::Handle& windowless_buffer1,
-    const TransportDIB::Handle& background_buffer,
     const gfx::Rect& window_rect) {
   CreateDIBAndCGContextFromHandle(windowless_buffer0,
                                   window_rect,
                                   &windowless_dibs_[0],
                                   &windowless_contexts_[0]);
   CreateDIBAndCGContextFromHandle(windowless_buffer1,
                                   window_rect,
                                   &windowless_dibs_[1],
                                   &windowless_contexts_[1]);
-  CreateDIBAndCGContextFromHandle(background_buffer,
-                                  window_rect,
-                                  &background_dib_,
-                                  &background_context_);
 }
 
 #elif defined(USE_X11)
 
 void WebPluginProxy::CreateDIBAndCanvasFromHandle(
     const TransportDIB::Handle& dib_handle,
     const gfx::Rect& window_rect,
     scoped_refptr<SharedTransportDIB>* dib_out,
     SkAutoTUnref<skia::PlatformCanvas>* canvas) {
   TransportDIB* dib = TransportDIB::Map(dib_handle);
@@ skipping 26 matching lines @@
                                    NULL, &shminfo,
                                    window_rect.width(), window_rect.height(),
                                    DefaultDepth(display,
                                                 DefaultScreen(display)));
   }
 }
 
 void WebPluginProxy::SetWindowlessBuffers(
     const TransportDIB::Handle& windowless_buffer0,
     const TransportDIB::Handle& windowless_buffer1,
-    const TransportDIB::Handle& background_buffer,
     const gfx::Rect& window_rect) {
   CreateDIBAndCanvasFromHandle(windowless_buffer0,
                                window_rect,
                                &windowless_dibs_[0],
                                &windowless_canvases_[0]);
   CreateDIBAndCanvasFromHandle(windowless_buffer1,
                                window_rect,
                                &windowless_dibs_[1],
                                &windowless_canvases_[1]);
-  CreateDIBAndCanvasFromHandle(background_buffer,
-                               window_rect,
-                               &background_dib_,
-                               &background_canvas_);
 
   // If SHM pixmaps support is available, create SHM pixmaps to pass to the
   // delegate for windowless plugin painting.
   if (delegate_->IsWindowless() && use_shm_pixmap_) {
     CreateShmPixmapFromDIB(windowless_dibs_[0]->dib(),
                            window_rect,
                            &windowless_shm_pixmaps_[0]);
     CreateShmPixmapFromDIB(windowless_dibs_[1]->dib(),
                            window_rect,
                            &windowless_shm_pixmaps_[1]);
   }
 }
 
 #elif defined(OS_ANDROID)
 
 void WebPluginProxy::SetWindowlessBuffers(
     const TransportDIB::Handle& windowless_buffer0,
     const TransportDIB::Handle& windowless_buffer1,
-    const TransportDIB::Handle& background_buffer,
     const gfx::Rect& window_rect) {
   NOTIMPLEMENTED();
 }
 
 #endif
 
 void WebPluginProxy::CancelDocumentLoad() {
   Send(new PluginHostMsg_CancelDocumentLoad(route_id_));
 }
 
@@ skipping 119 matching lines @@
   int input_type;
   gfx::Rect caret_rect;
   if (!delegate_->GetIMEStatus(&input_type, &caret_rect))
     return;
 
   Send(new PluginHostMsg_NotifyIMEStatus(route_id_, input_type, caret_rect));
 }
 #endif
 
 }  // namespace content