Enable accelerated WebKit compositor for Aura.

content/common/gpu/gpu_command_buffer_stub.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.
 
 #if defined(ENABLE_GPU)
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/shared_memory.h"
 #include "build/build_config.h"
 #include "content/common/gpu/gpu_channel.h"
 #include "content/common/gpu/gpu_channel_manager.h"
 #include "content/common/gpu/gpu_command_buffer_stub.h"
 #include "content/common/gpu/gpu_messages.h"
 #include "content/common/gpu/gpu_watchdog.h"
 #include "gpu/command_buffer/common/constants.h"
 #include "ui/gfx/gl/gl_switches.h"
 
-#if defined(OS_MACOSX) || defined(TOUCH_UI)
+#if defined(OS_MACOSX) || defined(UI_COMPOSITOR_IMAGE_TRANSPORT)
 #include "content/common/gpu/image_transport_surface.h"
 #endif
 
 GpuCommandBufferStub::GpuCommandBufferStub(
     GpuChannel* channel,
     GpuCommandBufferStub* share_group,
     gfx::PluginWindowHandle handle,
     const gfx::Size& size,
     const gpu::gles2::DisallowedFeatures& disallowed_features,
     const std::string& allowed_extensions,
@@ skipping 139 matching lines @@
 
   decoder_.reset(::gpu::gles2::GLES2Decoder::Create(context_group_.get()));
 
   scheduler_.reset(new gpu::GpuScheduler(command_buffer_.get(),
                                          decoder_.get(),
                                          NULL));
 
   decoder_->set_engine(scheduler_.get());
 
   if (handle_) {
-#if defined(TOUCH_UI) || defined(OS_MACOSX)
+#if defined(OS_MACOSX) || defined(UI_COMPOSITOR_IMAGE_TRANSPORT)
     if (software_) {
       OnInitializeFailed(reply_message);
       return;
     }
 
     surface_ = ImageTransportSurface::CreateSurface(
         channel_->gpu_channel_manager(),
         render_view_id_,
         renderer_id_,
         route_id_,
@@ skipping 43 matching lines @@
       NewCallback(scheduler_.get(),
                   &gpu::GpuScheduler::PutChanged));
   command_buffer_->SetParseErrorCallback(
       NewCallback(this, &GpuCommandBufferStub::OnParseError));
   scheduler_->SetScheduledCallback(
       NewCallback(channel_, &GpuChannel::OnScheduled));
 
   // On platforms that use an ImageTransportSurface, the surface
   // handles co-ordinating the resize with the browser process. The
   // surface sets it's own resize callback, so we shouldn't do it here.
-#if !defined(TOUCH_UI) && !defined(OS_MACOSX)
+#if !defined(OS_MACOSX) && !defined(UI_COMPOSITOR_IMAGE_TRANSPORT)
   if (handle_ != gfx::kNullPluginWindow) {
     decoder_->SetResizeCallback(
         NewCallback(this, &GpuCommandBufferStub::OnResize));
   }
 #endif
 
   if (watchdog_) {
     scheduler_->SetCommandProcessedCallback(
         NewCallback(this, &GpuCommandBufferStub::OnCommandProcessed));
   }
@@ skipping 156 matching lines @@
 
 void GpuCommandBufferStub::OnCommandProcessed() {
   if (watchdog_)
     watchdog_->CheckArmed();
 }
 
 void GpuCommandBufferStub::OnResize(gfx::Size size) {
   if (handle_ == gfx::kNullPluginWindow)
     return;
 
-#if defined(TOOLKIT_USES_GTK) && !defined(TOUCH_UI) || defined(OS_WIN)
+#if defined(TOOLKIT_USES_GTK) && !defined(UI_COMPOSITOR_IMAGE_TRANSPORT) || \
+    defined(OS_WIN)
   GpuChannelManager* gpu_channel_manager = channel_->gpu_channel_manager();
 
   // On Windows, Linux, we need to coordinate resizing of onscreen
   // contexts with the resizing of the actual OS-level window. We do this by
   // sending a resize message to the browser process and descheduling the
   // context until the ViewResized message comes back in reply.
   // Send the resize message if needed
   gpu_channel_manager->Send(
       new GpuHostMsg_ResizeView(renderer_id_,
                                 render_view_id_,
                                 route_id_,
                                 size));
 
   scheduler_->SetScheduled(false);
-#endif  // defined(TOOLKIT_USES_GTK) && !defined(TOUCH_UI) || defined(OS_WIN)
+#endif
 }
 
 void GpuCommandBufferStub::ViewResized() {
-#if defined(TOOLKIT_USES_GTK) && !defined(TOUCH_UI) || defined(OS_WIN)
+#if defined(TOOLKIT_USES_GTK) && !defined(UI_COMPOSITOR_IMAGE_TRANSPORT) || \
+    defined(OS_WIN)
   DCHECK(handle_ != gfx::kNullPluginWindow);
   scheduler_->SetScheduled(true);
 #endif
 
 #if defined(OS_WIN)
   // Recreate the view surface to match the window size. Swap chains do not
   // automatically resize with window size with D3D.
   context_->ReleaseCurrent(surface_.get());
   if (surface_.get()) {
     surface_->Destroy();
     surface_->Initialize();
     SetSwapInterval();
   }
 #endif
 }
 
 void GpuCommandBufferStub::ReportState() {
   gpu::CommandBuffer::State state = command_buffer_->GetState();
   if (state.error == gpu::error::kLostContext &&
       gfx::GLContext::LosesAllContextsOnContextLost()) {
     channel_->LoseAllContexts();
   } else {
     IPC::Message* msg = new GpuCommandBufferMsg_UpdateState(route_id_, state);
     msg->set_unblock(true);
     Send(msg);
   }
 }
 
 void GpuCommandBufferStub::SetSwapInterval() {
-#if !defined(OS_MACOSX) && !defined(TOUCH_UI)
+#if !defined(OS_MACOSX) && !defined(UI_COMPOSITOR_IMAGE_TRANSPORT)
   // Set up swap interval for onscreen contexts.
   if (!surface_->IsOffscreen()) {
     decoder_->MakeCurrent();
     if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableGpuVsync))
       context_->SetSwapInterval(0);
     else
       context_->SetSwapInterval(1);
   }
 #endif
 }
@@ skipping 10 matching lines @@
   channel_->AddRoute(decoder_route_id, decoder);
   decoder->Initialize(profile, reply_message);
 }
 
 void GpuCommandBufferStub::OnDestroyVideoDecoder(int decoder_route_id) {
   channel_->RemoveRoute(decoder_route_id);
   video_decoders_.Remove(decoder_route_id);
 }
 
 #endif  // defined(ENABLE_GPU)