Enable browser plugin compositing by default, but add a flag to disable it.

content/browser/renderer_host/render_widget_host_view_guest.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 "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "content/browser/browser_plugin/browser_plugin_guest.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
@@ skipping 10 matching lines @@
 
 RenderWidgetHostViewGuest::RenderWidgetHostViewGuest(
     RenderWidgetHost* widget_host,
     BrowserPluginGuest* guest,
     RenderWidgetHostView* platform_view)
     : host_(RenderWidgetHostImpl::From(widget_host)),
       guest_(guest),
       is_hidden_(false),
       platform_view_(static_cast<RenderWidgetHostViewPort*>(platform_view)) {
   host_->SetView(this);
-
-  enable_compositing_ = CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kEnableBrowserPluginCompositing);
 }
 
 RenderWidgetHostViewGuest::~RenderWidgetHostViewGuest() {
 }
 
 RenderWidgetHost* RenderWidgetHostViewGuest::GetRenderWidgetHost() const {
   return host_;
 }
 
 void RenderWidgetHostViewGuest::WasShown() {
@@ skipping 52 matching lines @@
   DestroyGuestView();
 }
 
 void RenderWidgetHostViewGuest::SetTooltipText(const string16& tooltip_text) {
   platform_view_->SetTooltipText(tooltip_text);
 }
 
 void RenderWidgetHostViewGuest::AcceleratedSurfaceBuffersSwapped(
     const GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params& params,
     int gpu_host_id) {
-  DCHECK(enable_compositing_);
   // If accelerated surface buffers are getting swapped then we're not using
   // the software path.
   guest_->clear_damage_buffer();
-  if (enable_compositing_) {
-    guest_->SendMessageToEmbedder(
-        new BrowserPluginMsg_BuffersSwapped(
-            guest_->instance_id(),
-            params.size,
-            params.mailbox_name,
-            params.route_id,
-            gpu_host_id));
-  }
+  guest_->SendMessageToEmbedder(
+      new BrowserPluginMsg_BuffersSwapped(
+          guest_->instance_id(),
+          params.size,
+          params.mailbox_name,
+          params.route_id,
+          gpu_host_id));
 }
 
 void RenderWidgetHostViewGuest::AcceleratedSurfacePostSubBuffer(
     const GpuHostMsg_AcceleratedSurfacePostSubBuffer_Params& params,
     int gpu_host_id) {
-  DCHECK(enable_compositing_);
-  if (enable_compositing_) {
-    guest_->SendMessageToEmbedder(
-        new BrowserPluginMsg_BuffersSwapped(
-            guest_->instance_id(),
-            params.surface_size,
-            params.mailbox_name,
-            params.route_id,
-            gpu_host_id));
-  }
+  NOTREACHED();
 }
 
 void RenderWidgetHostViewGuest::SetBounds(const gfx::Rect& rect) {
   platform_view_->SetBounds(rect);
 }
 
 bool RenderWidgetHostViewGuest::OnMessageReceived(const IPC::Message& msg) {
   return platform_view_->OnMessageReceived(msg);
 }
 
@@ skipping 36 matching lines @@
 }
 
 void RenderWidgetHostViewGuest::Blur() {
 }
 
 bool RenderWidgetHostViewGuest::HasFocus() const {
   return false;
 }
 
 bool RenderWidgetHostViewGuest::IsSurfaceAvailableForCopy() const {
-  DCHECK(enable_compositing_);
-  if (enable_compositing_)
-    return true;
-  else
-    return platform_view_->IsSurfaceAvailableForCopy();
+  NOTIMPLEMENTED();
+  return false;
 }
 
 void RenderWidgetHostViewGuest::UpdateCursor(const WebCursor& cursor) {
   platform_view_->UpdateCursor(cursor);
 }
 
 void RenderWidgetHostViewGuest::SetIsLoading(bool is_loading) {
   platform_view_->SetIsLoading(is_loading);
 }
 
@@ skipping 53 matching lines @@
 
 void RenderWidgetHostViewGuest::AcceleratedSurfaceSuspend() {
   NOTREACHED();
 }
 
 void RenderWidgetHostViewGuest::AcceleratedSurfaceRelease() {
 }
 
 bool RenderWidgetHostViewGuest::HasAcceleratedSurface(
       const gfx::Size& desired_size) {
-  DCHECK(enable_compositing_);
-  if (enable_compositing_)
-    return false;
-  else
-    return platform_view_->HasAcceleratedSurface(desired_size);
+  return false;
 }
 
 void RenderWidgetHostViewGuest::SetBackground(const SkBitmap& background) {
   platform_view_->SetBackground(background);
 }
 
 #if defined(OS_WIN) && !defined(USE_AURA)
 void RenderWidgetHostViewGuest::SetClickthroughRegion(SkRegion* region) {
 }
 #endif
@@ skipping 110 matching lines @@
 void RenderWidgetHostViewGuest::WillWmDestroy() {
 }
 #endif
 
 void RenderWidgetHostViewGuest::DestroyGuestView() {
   host_ = NULL;
   MessageLoop::current()->DeleteSoon(FROM_HERE, this);
 }
 
 }  // namespace content