Revert 111040 - Reland 110355 - Use shared D3D9 texture to transport the compositor's backing buf...

content/browser/renderer_host/render_widget_host_view_win.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_win.h"
 
 #include <algorithm>
 
-#include "base/bind.h"
 #include "base/command_line.h"
 #include "base/i18n/rtl.h"
 #include "base/metrics/histogram.h"
 #include "base/process_util.h"
 #include "base/threading/thread.h"
 #include "base/win/scoped_comptr.h"
 #include "base/win/scoped_gdi_object.h"
 #include "base/win/win_util.h"
 #include "base/win/windows_version.h"
 #include "base/win/wrapped_window_proc.h"
 #include "content/browser/accessibility/browser_accessibility_manager.h"
 #include "content/browser/accessibility/browser_accessibility_state.h"
 #include "content/browser/accessibility/browser_accessibility_win.h"
-#include "content/browser/gpu/gpu_process_host.h"
-#include "content/browser/gpu/gpu_process_host_ui_shim.h"
 #include "content/browser/plugin_process_host.h"
 #include "content/browser/renderer_host/backing_store.h"
 #include "content/browser/renderer_host/backing_store_win.h"
 #include "content/browser/renderer_host/render_process_host_impl.h"
 #include "content/browser/renderer_host/render_widget_host.h"
-#include "content/common/gpu/gpu_messages.h"
 #include "content/common/plugin_messages.h"
 #include "content/common/view_messages.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/native_web_keyboard_event.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/page_zoom.h"
 #include "skia/ext/skia_utils_win.h"
@@ skipping 10 matching lines @@
 #include "ui/gfx/canvas_skia.h"
 #include "ui/gfx/gdi_util.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/screen.h"
 #include "webkit/glue/webaccessibility.h"
 #include "webkit/glue/webcursor.h"
 #include "webkit/plugins/npapi/plugin_constants_win.h"
 #include "webkit/plugins/npapi/webplugin.h"
 #include "webkit/plugins/npapi/webplugin_delegate_impl.h"
 
-#pragma comment(lib, "d3d9.lib")
-
 using base::TimeDelta;
 using base::TimeTicks;
 using content::BrowserThread;
 using ui::ViewProp;
 using WebKit::WebInputEvent;
 using WebKit::WebInputEventFactory;
 using WebKit::WebMouseEvent;
 using WebKit::WebTextDirection;
 using webkit::npapi::WebPluginGeometry;
 
@@ skipping 129 matching lines @@
       case WM_MBUTTONDOWN:
         ::SendMessage(GetParent(window), message, wparam, lparam);
         return 0;
       default:
         break;
     }
   }
   return ::DefWindowProc(window, message, wparam, lparam);
 }
 
-void SendToGpuProcessHost(int gpu_host_id, IPC::Message* message) {
-  GpuProcessHost* gpu_process_host = GpuProcessHost::FromID(gpu_host_id);
-  if (!gpu_process_host) {
-    delete message;
-    return;
-  }
-
-  gpu_process_host->Send(message);
-}
-
-void PostTaskOnIOThread(const tracked_objects::Location& from_here,
-                        base::Closure task) {
-  BrowserThread::PostTask(BrowserThread::IO, FROM_HERE, task);
-}
-
 bool DecodeZoomGesture(HWND hwnd, const GESTUREINFO& gi,
                        content::PageZoom* zoom,
                        POINT* zoom_center) {
   static long start = 0;
   static POINT zoom_first;
 
   if (gi.dwFlags == GF_BEGIN) {
     start = gi.ullArguments;
     zoom_first.x = gi.ptsLocation.x;
     zoom_first.y = gi.ptsLocation.y;
@@ skipping 115 matching lines @@
       touch_state_(this) {
   render_widget_host_->SetView(this);
   registrar_.Add(this,
                  content::NOTIFICATION_RENDERER_PROCESS_TERMINATED,
                  content::NotificationService::AllBrowserContextsAndSources());
 }
 
 RenderWidgetHostViewWin::~RenderWidgetHostViewWin() {
   UnlockMouse();
   ResetTooltip();
-
-  if (accelerated_surface_)
-    accelerated_surface_->Destroy();
 }
 
 void RenderWidgetHostViewWin::CreateWnd(HWND parent) {
   // ATL function to create the window.
   Create(parent);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // RenderWidgetHostViewWin, RenderWidgetHostView implementation:
 
@@ skipping 1598 matching lines @@
     return 0;
   case WM_PAINT:
     PaintCompositorHostWindow(hWnd);
     return 0;
   default:
     return DefWindowProc(hWnd, message, wParam, lParam);
   }
 }
 
 void RenderWidgetHostViewWin::ScheduleComposite() {
-  // If we have a previous frame then present it immediately. Otherwise request
-  // a new frame be composited.
-  if (accelerated_surface_.get()) {
-    accelerated_surface_->Present();
-  } else {
-    if (render_widget_host_)
-      render_widget_host_->ScheduleComposite();
-  }
+  if (render_widget_host_)
+    render_widget_host_->ScheduleComposite();
 }
 
 // Creates a HWND within the RenderWidgetHostView that will serve as a host
 // for a HWND that the GPU process will create. The host window is used
 // to Z-position the GPU's window relative to other plugin windows.
 gfx::PluginWindowHandle RenderWidgetHostViewWin::GetCompositingSurface() {
   // If the window has been created, don't recreate it a second time
   if (compositor_host_window_)
     return compositor_host_window_;
 
@@ skipping 75 matching lines @@
       else
         next = compositor_host_window_;
       ::SetWindowPos(plugin_windows[i], next, 0, 0, 0, 0,
           SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE);
     }
   } else {
     hide_compositor_window_at_next_paint_ = true;
   }
 }
 
-void RenderWidgetHostViewWin::AcceleratedSurfaceBuffersSwapped(
-    const GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params& params,
-    int gpu_host_id) {
-  if (!accelerated_surface_.get() && compositor_host_window_) {
-    accelerated_surface_ = new AcceleratedSurface(compositor_host_window_);
-    accelerated_surface_->Initialize();
-  }
-
-  base::Closure acknowledge_task =
-      base::Bind(SendToGpuProcessHost,
-                 gpu_host_id,
-                 new AcceleratedSurfaceMsg_BuffersSwappedACK(params.route_id));
-
-  accelerated_surface_->AsyncPresentAndAcknowledge(
-      params.size,
-      params.surface_id,
-      base::Bind(PostTaskOnIOThread,
-                 FROM_HERE,
-                 acknowledge_task));
-}
-
 void RenderWidgetHostViewWin::SetAccessibilityFocus(int acc_obj_id) {
   if (!render_widget_host_)
     return;
 
   render_widget_host_->AccessibilitySetFocus(acc_obj_id);
 }
 
 void RenderWidgetHostViewWin::AccessibilityDoDefaultAction(int acc_obj_id) {
   if (!render_widget_host_)
     return;
@@ skipping 363 matching lines @@
 
   size_t offset = selection_range_.GetMin() - selection_text_offset_;
   memcpy(reinterpret_cast<char*>(reconv) + sizeof(RECONVERTSTRING),
          selection_text_.c_str() + offset, len * sizeof(WCHAR));
 
   // According to Microsft API document, IMR_RECONVERTSTRING and
   // IMR_DOCUMENTFEED should return reconv, but some applications return
   // need_size.
   return reinterpret_cast<LRESULT>(reconv);
 }