aura: fix fullscreen pepper flash

content/browser/gpu/gpu_process_host_ui_shim.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/gpu/gpu_process_host_ui_shim.h"
 
 #include <algorithm>
 
 #include "base/debug/trace_event.h"
 #include "base/id_map.h"
@@ skipping 63 matching lines @@
   }
 
   void Cancel() { cancelled_ = true; }
 
  private:
   int host_id_;
   scoped_ptr<IPC::Message> msg_;
   bool cancelled_;
 };
 
+RenderWidgetHostView* GetRenderWidgetHostViewFromID(int render_process_id,
+                                                    int render_widget_id) {
+  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 ? host->view() : NULL;
+}
+
 }  // namespace
 
 RouteToGpuProcessHostUIShimTask::RouteToGpuProcessHostUIShimTask(
     int host_id,
     const IPC::Message& msg)
   : host_id_(host_id),
     msg_(msg) {
 }
 
 RouteToGpuProcessHostUIShimTask::~RouteToGpuProcessHostUIShimTask() {
@@ skipping 129 matching lines @@
                                         int32 render_view_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));
 
-  RenderViewHost* host = RenderViewHost::FromID(renderer_id, render_view_id);
-  if (!host)
-    return;
-
-  RenderWidgetHostView* view = host->view();
+  RenderWidgetHostView* view = GetRenderWidgetHostViewFromID(renderer_id,
+                                                             render_view_id);
   if (!view)
     return;
 
   gfx::PluginWindowHandle handle = 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)
   GdkWindow* window = reinterpret_cast<GdkWindow*>(
@@ skipping 22 matching lines @@
 
 void GpuProcessHostUIShim::OnAcceleratedSurfaceNew(
     const GpuHostMsg_AcceleratedSurfaceNew_Params& params) {
   ScopedSendOnIOThread delayed_send(
       host_id_,
       new AcceleratedSurfaceMsg_NewACK(
           params.route_id,
           params.surface_id,
           TransportDIB::DefaultHandleValue()));
 
-  RenderViewHost* host = RenderViewHost::FromID(params.renderer_id,
-                                                params.render_view_id);
-  if (!host)
-    return;
-
-  RenderWidgetHostView* view = host->view();
+  RenderWidgetHostView* view = GetRenderWidgetHostViewFromID(
+      params.renderer_id, params.render_view_id);
   if (!view)
     return;
 
   uint64 surface_id = params.surface_id;
   TransportDIB::Handle surface_handle = TransportDIB::DefaultHandleValue();
 
 #if defined(OS_MACOSX)
   if (params.create_transport_dib) {
     scoped_ptr<base::SharedMemory> shared_memory(new base::SharedMemory());
     if (shared_memory->CreateAnonymous(params.width * params.height * 4)) {
@@ skipping 33 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));
 
-  RenderViewHost* host = RenderViewHost::FromID(params.renderer_id,
-                                                params.render_view_id);
-  if (!host)
-    return;
-
-  RenderWidgetHostView* view = host->view();
+  RenderWidgetHostView* view = GetRenderWidgetHostViewFromID(
+      params.renderer_id, params.render_view_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));
 
-  RenderViewHost* host = RenderViewHost::FromID(params.renderer_id,
-                                                params.render_view_id);
-  if (!host)
-    return;
-
-  RenderWidgetHostView* view = host->view();
+  RenderWidgetHostView* view = GetRenderWidgetHostViewFromID(
+      params.renderer_id, params.render_view_id);
   if (!view)
     return;
 
   delayed_send.Cancel();
 
   // View must send ACK message after next composite.
   view->AcceleratedSurfacePostSubBuffer(params, host_id_);
 }
 
 #if defined(UI_COMPOSITOR_IMAGE_TRANSPORT)
 
 void GpuProcessHostUIShim::OnAcceleratedSurfaceRelease(
     const GpuHostMsg_AcceleratedSurfaceRelease_Params& params) {
-  RenderViewHost* host = RenderViewHost::FromID(params.renderer_id,
-                                                params.render_view_id);
-  if (!host)
-    return;
-  RenderWidgetHostView* view = host->view();
+  RenderWidgetHostView* view = GetRenderWidgetHostViewFromID(
+      params.renderer_id, params.render_view_id);
   if (!view)
     return;
   view->AcceleratedSurfaceRelease(params.identifier);
 }
 
 #endif