Revert 281866 "Mac ÜC: Make resize smooth"

trunk/src/content/browser/renderer_host/render_widget_helper.h

 // 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.
 
 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HELPER_H_
 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HELPER_H_
 
 #include <deque>
 #include <map>
 
@@ skipping 12 matching lines @@
 #include "ui/surface/transport_dib.h"
 
 namespace IPC {
 class Message;
 }
 
 namespace base {
 class TimeDelta;
 }
 
-struct ViewHostMsg_CompositorSurfaceBuffersSwapped_Params;
+struct GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params;
 struct ViewHostMsg_CreateWindow_Params;
 struct ViewMsg_SwapOut_Params;
 
 namespace content {
 class GpuProcessHost;
 class ResourceDispatcherHostImpl;
 class SessionStorageNamespace;
 
 // Instantiated per RenderProcessHost to provide various optimizations on
 // behalf of a RenderWidgetHost.  This class bridges between the IO thread
@@ skipping 86 matching lines @@
   // for documentation.
   void ResumeDeferredNavigation(const GlobalRequestID& request_id);
   void ResumeResponseDeferredAtStart(const GlobalRequestID& request_id);
   bool WaitForBackingStoreMsg(int render_widget_id,
                               const base::TimeDelta& max_delay,
                               IPC::Message* msg);
   // Called to resume the requests for a view after it's ready. The view was
   // created by CreateNewWindow which initially blocked the requests.
   void ResumeRequestsForView(int route_id);
 
-#if defined(OS_MACOSX)
-  // Associate an NSView with a render process and widget, so that browser
-  // compositor swaps can come through during resize.
-  static void SetRenderWidgetIDForWidget(gfx::AcceleratedWidget native_widget,
-                                         int render_process_id,
-                                         int render_widget_id);
-  static void ResetRenderWidgetIDForWidget(
-      gfx::AcceleratedWidget native_widget);
-
-  // Display a new frame to an NSView.
-  static void OnNativeSurfaceBuffersSwappedOnUIThread(
-      const ViewHostMsg_CompositorSurfaceBuffersSwapped_Params& params);
-#endif
-
   // IO THREAD ONLY -----------------------------------------------------------
 
   // Called on the IO thread when a BackingStore message is received.
   void DidReceiveBackingStoreMsg(const IPC::Message& msg);
 
   void CreateNewWindow(
       const ViewHostMsg_CreateWindow_Params& params,
       bool no_javascript_access,
       base::ProcessHandle render_process,
       int* route_id,
@@ skipping 14 matching lines @@
   // the resulting TransportDIB.
   void AllocTransportDIB(uint32 size,
                          bool cache_in_browser,
                          TransportDIB::Handle* result);
 
   // Called on the IO thread to handle the freeing of a transport DIB
   void FreeTransportDIB(TransportDIB::Id dib_id);
 #endif
 
 #if defined(OS_MACOSX)
-  // Retrieve the render process and widget that was associated with an NSView.
-  static bool GetRenderWidgetIDForWidget(gfx::AcceleratedWidget native_widget,
-                                         int* render_process_id,
-                                         int* render_widget_id);
+  static void OnNativeSurfaceBuffersSwappedOnIOThread(
+      GpuProcessHost* gpu_process_host,
+      const GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params& params);
 #endif
 
  private:
   // A class used to proxy a paint message.  PaintMsgProxy objects are created
   // on the IO thread and destroyed on the UI thread.
   class BackingStoreMsgProxy;
   friend class BackingStoreMsgProxy;
   friend class base::RefCountedThreadSafe<RenderWidgetHelper>;
   friend struct BrowserThread::DeleteOnThread<BrowserThread::IO>;
   friend class base::DeleteHelper<RenderWidgetHelper>;
@@ skipping 63 matching lines @@
   base::AtomicSequenceNumber next_routing_id_;
 
   ResourceDispatcherHostImpl* resource_dispatcher_host_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderWidgetHelper);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HELPER_H_