Merge 186446

content/renderer/webplugin_delegate_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/renderer/webplugin_delegate_proxy.h"
 
 #if defined(TOOLKIT_GTK)
 #include <gtk/gtk.h>
 #elif defined(USE_X11)
 #include <cairo/cairo.h>
@@ skipping 196 matching lines @@
       uses_compositor_(false),
 #elif defined(OS_WIN)
       dummy_activation_window_(NULL),
 #endif
       window_(gfx::kNullPluginWindow),
       mime_type_(mime_type),
       instance_id_(MSG_ROUTING_NONE),
       npobject_(NULL),
       sad_plugin_(NULL),
       invalidate_pending_(false),
+      transparent_(false),
       front_buffer_index_(0),
       page_url_(render_view_->webview()->mainFrame()->document().url()) {
 }
 
 WebPluginDelegateProxy::~WebPluginDelegateProxy() {
   if (npobject_)
     WebBindings::releaseObject(npobject_);
 }
 
 WebPluginDelegateProxy::SharedBitmap::SharedBitmap() {}
@@ skipping 139 matching lines @@
   params.url = url;
   params.page_url = page_url_;
   params.arg_names = arg_names;
   params.arg_values = arg_values;
   params.host_render_view_routing_id = render_view_->routing_id();
   params.load_manually = load_manually;
 
   plugin_ = plugin;
 
   result = false;
-  Send(new PluginMsg_Init(instance_id_, params, &result));
+  Send(new PluginMsg_Init(instance_id_, params, &transparent_, &result));
 
   if (!result)
     LOG(ERROR) << "PluginMsg_Init returned false";
 
   render_view_->RegisterPluginDelegate(this);
 
   return result;
 }
 
 bool WebPluginDelegateProxy::Send(IPC::Message* msg) {
@@ skipping 331 matching lines @@
     // a chance that it will begin repainting the back-buffer before we complete
     // capturing the data. Buffer flipping would increase that risk because
     // geometry update is asynchronous, so we don't want to use buffer flipping
     // here.
     UpdateFrontBuffer(offset_rect, false);
   }
 
   const SkBitmap& bitmap =
       front_buffer_canvas()->getDevice()->accessBitmap(false);
   SkPaint paint;
-  paint.setXfermodeMode(SkXfermode::kSrcATop_Mode);
+  paint.setXfermodeMode(
+      transparent_ ? SkXfermode::kSrcATop_Mode : SkXfermode::kSrc_Mode);
   SkIRect src_rect = gfx::RectToSkIRect(offset_rect);
   canvas->drawBitmapRect(bitmap,
                          &src_rect,
                          gfx::RectToSkRect(rect),
                          &paint);
 
   if (invalidate_pending_) {
     // Only send the PaintAck message if this paint is in response to an
     // invalidate from the plugin, since this message acts as an access token
     // to ensure only one process is using the transport dib at a time.
@@ skipping 566 matching lines @@
 
 void WebPluginDelegateProxy::OnURLRedirectResponse(bool allow,
                                                    int resource_id) {
   if (!plugin_)
     return;
 
   plugin_->URLRedirectResponse(allow, resource_id);
 }
 
 }  // namespace content