Get rid of gpu_messages.h include in chrome by having the RenderWidgetHostView implementation ask...

content/browser/renderer_host/render_widget_host_view_aura.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.
 
 #include "content/browser/renderer_host/render_widget_host_view_aura.h"
 
 #include "base/logging.h"
 #include "content/browser/renderer_host/backing_store_skia.h"
 #include "content/browser/renderer_host/render_widget_host.h"
 #include "content/browser/renderer_host/web_input_event_aura.h"
 #include "content/public/browser/native_web_keyboard_event.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScreenInfo.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/desktop.h"
 #include "ui/aura/event.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_types.h"
 #include "ui/base/hit_test.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/compositor/layer.h"
 #include "ui/gfx/screen.h"
 
 #if defined(UI_COMPOSITOR_IMAGE_TRANSPORT)
 #include "base/bind.h"
-#include "content/browser/gpu/gpu_process_host_ui_shim.h"
 #include "content/browser/renderer_host/accelerated_surface_container_linux.h"
-#include "content/common/gpu/gpu_messages.h"
 #include "ui/gfx/gl/gl_bindings.h"
 #endif
 
 using WebKit::WebTouchEvent;
 
 namespace {
 
-#if defined(UI_COMPOSITOR_IMAGE_TRANSPORT)
-void AcknowledgeSwapBuffers(int32 route_id, int gpu_host_id) {
-  // It's possible that gpu_host_id is no longer valid at this point (like if
-  // gpu process was restarted after a crash).  SendToGpuHost handles this.
-  GpuProcessHostUIShim::SendToGpuHost(gpu_host_id,
-      new AcceleratedSurfaceMsg_BuffersSwappedACK(route_id));
-}
-#endif
-
 ui::TouchStatus DecideTouchStatus(const WebKit::WebTouchEvent& event,
                                   WebKit::WebTouchPoint* point) {
   if (event.type == WebKit::WebInputEvent::TouchStart &&
       event.touchesLength == 1)
     return ui::TOUCH_STATUS_START;
 
   if (event.type == WebKit::WebInputEvent::TouchMove && point == NULL)
     return ui::TOUCH_STATUS_CONTINUE;
 
   if (event.type == WebKit::WebInputEvent::TouchEnd &&
@@ skipping 249 matching lines @@
 
 void RenderWidgetHostViewAura::AcceleratedSurfaceBuffersSwapped(
       uint64 surface_id,
       int32 route_id,
       int gpu_host_id) {
   window_->layer()->SetExternalTexture(
       accelerated_surface_containers_[surface_id]->GetTexture());
   glFlush();
 
   if (!window_->layer()->GetCompositor()) {
-    // We have no compositor, so we have no way to display the surface
-    AcknowledgeSwapBuffers(route_id, gpu_host_id);  // Must still send the ACK
+    // We have no compositor, so we have no way to display the surface.
+    // Must still send the ACK.
+    host_->AcknowledgeSwapBuffers(route_id, gpu_host_id);
   } else {
     window_->layer()->ScheduleDraw();
 
     // Add sending an ACK to the list of things to do OnCompositingEnded
     on_compositing_ended_callbacks_.push_back(
-        base::Bind(AcknowledgeSwapBuffers, route_id, gpu_host_id));
+        base::Bind(&RenderWidgetHost::AcknowledgeSwapBuffers,
+                   base::Unretained(host_), route_id, gpu_host_id));
     ui::Compositor* compositor = window_->layer()->GetCompositor();
     if (!compositor->HasObserver(this))
       compositor->AddObserver(this);
   }
 }
 
 void RenderWidgetHostViewAura::AcceleratedSurfaceRelease(uint64 surface_id) {
   accelerated_surface_containers_.erase(surface_id);
 }
 #endif
@@ skipping 211 matching lines @@
 // static
 void RenderWidgetHostView::GetDefaultScreenInfo(
     WebKit::WebScreenInfo* results) {
   const gfx::Size size = gfx::Screen::GetPrimaryMonitorSize();
   results->rect = WebKit::WebRect(0, 0, size.width(), size.height());
   results->availableRect = results->rect;
   // TODO(derat): Don't hardcode this?
   results->depth = 24;
   results->depthPerComponent = 8;
 }