Revert 281866 "Mac ÜC: Make resize smooth"

trunk/src/content/browser/renderer_host/render_widget_host_view_mac.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_HOST_VIEW_MAC_H_
 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_
 
 #import <Cocoa/Cocoa.h>
 #include <IOSurface/IOSurfaceAPI.h>
 #include <list>
@@ skipping 424 matching lines @@
   scoped_refptr<CompositingIOSurfaceMac> compositing_iosurface_;
   scoped_refptr<CompositingIOSurfaceContext> compositing_iosurface_context_;
 
   // Delegated frame management and compositior.
   scoped_ptr<DelegatedFrameHost> delegated_frame_host_;
   scoped_ptr<ui::Layer> root_layer_;
 
   // Container for the NSView drawn by the browser compositor.
   scoped_ptr<BrowserCompositorViewMac> browser_compositor_view_;
 
-  // Set when the browser compositor is requested to paint, and unset when the
-  // browser compositor paints in DoBrowserCompositorPendingPaint.
-  bool browser_compositor_has_pending_paint_;
-
   // Placeholder that is allocated while browser_compositor_view_ is NULL,
   // indicating that a BrowserCompositorViewMac may be allocated. This is to
   // help in recycling the internals of BrowserCompositorViewMac.
   scoped_ptr<BrowserCompositorViewPlaceholderMac>
       browser_compositor_view_placeholder_;
 
   // This holds the current software compositing framebuffer, if any.
   scoped_ptr<SoftwareFrameManager> software_frame_manager_;
 
   // Latency info to send back when the next frame appears on the
@@ skipping 55 matching lines @@
   virtual gfx::Size DesiredFrameSize() OVERRIDE;
   virtual float CurrentDeviceScaleFactor() OVERRIDE;
   virtual gfx::Size ConvertViewSizeToPixel(const gfx::Size& size) OVERRIDE;
   virtual DelegatedFrameHost* GetDelegatedFrameHost() const OVERRIDE;
 
   // BrowserCompositorViewMacClient implementation.
   virtual void BrowserCompositorViewFrameSwapped(
       const std::vector<ui::LatencyInfo>& latency_info) OVERRIDE;
   virtual NSView* BrowserCompositorSuperview() OVERRIDE;
   virtual ui::Layer* BrowserCompositorRootLayer() OVERRIDE;
-  virtual bool BrowserCompositorShouldDrawImmediately() OVERRIDE;
 
  private:
   friend class RenderWidgetHostViewMacTest;
 
   struct PendingSwapAck {
     PendingSwapAck(int32 route_id, int gpu_host_id, int32 renderer_id)
         : route_id(route_id),
           gpu_host_id(gpu_host_id),
           renderer_id(renderer_id) {}
     int32 route_id;
     int gpu_host_id;
     int32 renderer_id;
   };
   scoped_ptr<PendingSwapAck> pending_swap_ack_;
   void AddPendingSwapAck(int32 route_id, int gpu_host_id, int32 renderer_id);
 
   // Returns whether this render view is a popup (autocomplete window).
   bool IsPopup() const;
 
   // Shuts down the render_widget_host_.  This is a separate function so we can
   // invoke it from the message loop.
   void ShutdownHost();
 
   void EnsureBrowserCompositorView();
   void DestroyBrowserCompositorView();
-  void DoBrowserCompositorPendingPaint();
 
   void EnsureSoftwareLayer();
   void DestroySoftwareLayer();
 
   bool EnsureCompositedIOSurface() WARN_UNUSED_RESULT;
   void EnsureCompositedIOSurfaceLayer();
   enum DestroyCompositedIOSurfaceLayerBehavior {
     kLeaveLayerInHierarchy,
     kRemoveLayerFromHierarchy,
   };
@@ skipping 21 matching lines @@
   void SendVSyncParametersToRenderer();
 
   // The associated view. This is weak and is inserted into the view hierarchy
   // to own this RenderWidgetHostViewMac object. Set to nil at the start of the
   // destructor.
   RenderWidgetHostViewCocoa* cocoa_view_;
 
   // Indicates if the page is loading.
   bool is_loading_;
 
-  // Indicates if the view is currently stalled waiting for a new frame to come
-  // in.
-  bool is_paused_for_resize_or_repaint_;
-
   // The text to be shown in the tooltip, supplied by the renderer.
   base::string16 tooltip_text_;
 
   // Factory used to safely scope delayed calls to ShutdownHost().
   base::WeakPtrFactory<RenderWidgetHostViewMac> weak_factory_;
 
   // selected text on the renderer.
   std::string selected_text_;
 
   // The window used for popup widgets.
@@ skipping 33 matching lines @@
   scoped_ptr<RenderWidgetHostViewFrameSubscriber> frame_subscriber_;
 
   base::WeakPtrFactory<RenderWidgetHostViewMac>
       software_frame_weak_ptr_factory_;
   DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewMac);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_