Re-enabling support for compositing core animation plugins as disabling them currently leaves Flash…

content/plugin/webplugin_accelerated_surface_proxy_mac.cc

 // Copyright (c) 2011 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.
 
 #import <OpenGL/OpenGL.h>
 
 #include "content/plugin/webplugin_accelerated_surface_proxy_mac.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "content/plugin/webplugin_proxy.h"
 #include "ui/base/ui_base_switches.h"
 #include "ui/gfx/surface/accelerated_surface_mac.h"
 #include "ui/gfx/surface/io_surface_support_mac.h"
 #include "ui/gfx/surface/transport_dib.h"
 
 WebPluginAcceleratedSurfaceProxy* WebPluginAcceleratedSurfaceProxy::Create(
     WebPluginProxy* plugin_proxy,
     gfx::GpuPreference gpu_preference) {
-  // Temporarily turning off accelerated plugin compositing
-  bool composited = false && !CommandLine::ForCurrentProcess()->HasSwitch(
+  bool composited = !CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kDisableCompositedCoreAnimationPlugins);
 
   // Require IOSurface support for drawing Core Animation plugins.
   if (composited && !IOSurfaceSupport::Initialize())
     return NULL;
 
   AcceleratedSurface* surface = new AcceleratedSurface;
   // It's possible for OpenGL to fail to initialize (e.g., if an incompatible
   // mode is forced via flags), so handle that gracefully.
   if (!surface->Initialize(NULL, true, gpu_preference)) {
@@ skipping 81 matching lines @@
     return;
 
   surface_->SwapBuffers();
   if (composited_) {
     plugin_proxy_->AcceleratedPluginSwappedIOSurface();
   } else {
     plugin_proxy_->AcceleratedFrameBuffersDidSwap(
         window_handle_, surface_->GetSurfaceId());
   }
 }