Introduce content::RenderWidgetHostViewPort (in content/port/browser).

content/browser/gpu/gpu_process_host_ui_shim.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/browser/gpu/gpu_process_host_ui_shim.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/debug/trace_event.h"
 #include "base/id_map.h"
 #include "base/lazy_instance.h"
 #include "base/process_util.h"
 #include "content/browser/gpu/gpu_data_manager_impl.h"
 #include "content/browser/gpu/gpu_process_host.h"
 #include "content/browser/gpu/gpu_surface_tracker.h"
 #include "content/browser/renderer_host/render_process_host_impl.h"
 #include "content/browser/renderer_host/render_view_host.h"
-#include "content/browser/renderer_host/render_widget_host_view.h"
 #include "content/common/gpu/gpu_messages.h"
+#include "content/port/browser/render_widget_host_view_port.h"
 #include "content/public/browser/browser_thread.h"
 
 #if defined(TOOLKIT_USES_GTK)
 // These two #includes need to come after gpu_messages.h.
 #include "ui/base/x/x11_util.h"
 #include "ui/gfx/size.h"
 #include <gdk/gdk.h>   // NOLINT
 #include <gdk/gdkx.h>  // NOLINT
 #endif
 
 using content::BrowserThread;
+using content::RenderWidgetHostViewPort;
 
 namespace {
 
 // One of the linux specific headers defines this as a macro.
 #ifdef DestroyAll
 #undef DestroyAll
 #endif
 
 base::LazyInstance<IDMap<GpuProcessHostUIShim> > g_hosts_by_id =
     LAZY_INSTANCE_INITIALIZER;
@@ skipping 25 matching lines @@
   }
 
   void Cancel() { cancelled_ = true; }
 
  private:
   int host_id_;
   scoped_ptr<IPC::Message> msg_;
   bool cancelled_;
 };
 
-RenderWidgetHostViewBase* GetRenderWidgetHostViewFromSurfaceID(
+RenderWidgetHostViewPort* GetRenderWidgetHostViewFromSurfaceID(
     int surface_id) {
   int render_process_id = 0;
   int render_widget_id = 0;
   if (!GpuSurfaceTracker::Get()->GetRenderWidgetIDForSurface(
         surface_id, &render_process_id, &render_widget_id))
     return NULL;
 
   content::RenderProcessHost* process =
       content::RenderProcessHost::FromID(render_process_id);
   if (!process)
     return NULL;
 
   RenderWidgetHost* host = static_cast<RenderWidgetHost*>(
       process->GetListenerByID(render_widget_id));
-  return host ? RenderWidgetHostViewBase::FromRWHV(host->view()) : NULL;
+  return host ? RenderWidgetHostViewPort::FromRWHV(host->view()) : NULL;
 }
 
 }  // namespace
 
 void RouteToGpuProcessHostUIShimTask(int host_id, const IPC::Message& msg) {
   GpuProcessHostUIShim* ui_shim = GpuProcessHostUIShim::FromID(host_id);
   if (ui_shim)
     ui_shim->OnMessageReceived(msg);
 }
 
@@ skipping 135 matching lines @@
 void GpuProcessHostUIShim::OnResizeView(int32 surface_id,
                                         int32 route_id,
                                         gfx::Size size) {
   // Always respond even if the window no longer exists. The GPU process cannot
   // make progress on the resizing command buffer until it receives the
   // response.
   ScopedSendOnIOThread delayed_send(
       host_id_,
       new AcceleratedSurfaceMsg_ResizeViewACK(route_id));
 
-  RenderWidgetHostViewBase* view =
+  RenderWidgetHostViewPort* view =
       GetRenderWidgetHostViewFromSurfaceID(surface_id);
   if (!view)
     return;
 
   gfx::GLSurfaceHandle surface = view->GetCompositingSurface();
 
   // Resize the window synchronously. The GPU process must not issue GL
   // calls on the command buffer until the window is the size it expects it
   // to be.
 #if defined(TOOLKIT_USES_GTK)
@@ skipping 23 matching lines @@
 
 void GpuProcessHostUIShim::OnAcceleratedSurfaceNew(
     const GpuHostMsg_AcceleratedSurfaceNew_Params& params) {
   ScopedSendOnIOThread delayed_send(
       host_id_,
       new AcceleratedSurfaceMsg_NewACK(
           params.route_id,
           params.surface_handle,
           TransportDIB::DefaultHandleValue()));
 
-  RenderWidgetHostViewBase* view = GetRenderWidgetHostViewFromSurfaceID(
+  RenderWidgetHostViewPort* view = GetRenderWidgetHostViewFromSurfaceID(
       params.surface_id);
   if (!view)
     return;
 
   uint64 surface_handle = params.surface_handle;
   TransportDIB::Handle shm_handle = TransportDIB::DefaultHandleValue();
 
 #if defined(OS_MACOSX)
   if (params.create_transport_dib) {
     scoped_ptr<base::SharedMemory> shared_memory(new base::SharedMemory());
@@ skipping 34 matching lines @@
 
 void GpuProcessHostUIShim::OnAcceleratedSurfaceBuffersSwapped(
     const GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params& params) {
   TRACE_EVENT0("renderer",
       "GpuProcessHostUIShim::OnAcceleratedSurfaceBuffersSwapped");
 
   ScopedSendOnIOThread delayed_send(
       host_id_,
       new AcceleratedSurfaceMsg_BuffersSwappedACK(params.route_id));
 
-  RenderWidgetHostViewBase* view = GetRenderWidgetHostViewFromSurfaceID(
+  RenderWidgetHostViewPort* view = GetRenderWidgetHostViewFromSurfaceID(
       params.surface_id);
   if (!view)
     return;
 
   delayed_send.Cancel();
 
   // View must send ACK message after next composite.
   view->AcceleratedSurfaceBuffersSwapped(params, host_id_);
 }
 
 void GpuProcessHostUIShim::OnAcceleratedSurfacePostSubBuffer(
     const GpuHostMsg_AcceleratedSurfacePostSubBuffer_Params& params) {
   TRACE_EVENT0("renderer",
       "GpuProcessHostUIShim::OnAcceleratedSurfacePostSubBuffer");
 
   ScopedSendOnIOThread delayed_send(
       host_id_,
       new AcceleratedSurfaceMsg_PostSubBufferACK(params.route_id));
 
-  RenderWidgetHostViewBase* view =
+  RenderWidgetHostViewPort* view =
       GetRenderWidgetHostViewFromSurfaceID(params.surface_id);
   if (!view)
     return;
 
   delayed_send.Cancel();
 
   // View must send ACK message after next composite.
   view->AcceleratedSurfacePostSubBuffer(params, host_id_);
 }
 
 void GpuProcessHostUIShim::OnAcceleratedSurfaceSuspend(int32 surface_id) {
   TRACE_EVENT0("renderer",
       "GpuProcessHostUIShim::OnAcceleratedSurfaceSuspend");
 
-  RenderWidgetHostViewBase* view =
+  RenderWidgetHostViewPort* view =
       GetRenderWidgetHostViewFromSurfaceID(surface_id);
   if (!view)
     return;
 
   view->AcceleratedSurfaceSuspend();
 }
 
 #if defined(UI_COMPOSITOR_IMAGE_TRANSPORT)
 
 void GpuProcessHostUIShim::OnAcceleratedSurfaceRelease(
     const GpuHostMsg_AcceleratedSurfaceRelease_Params& params) {
-  RenderWidgetHostViewBase* view = GetRenderWidgetHostViewFromSurfaceID(
+  RenderWidgetHostViewPort* view = GetRenderWidgetHostViewFromSurfaceID(
       params.surface_id);
   if (!view)
     return;
   view->AcceleratedSurfaceRelease(params.identifier);
 }
 
 #endif