Delete non-CoreAnimation code in RWHVMac

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 <list>
 #include <map>
@@ skipping 352 matching lines @@
 
   const std::string& selected_text() const { return selected_text_; }
 
   // Update the IOSurface to be drawn and call setNeedsDisplay on
   // |cocoa_view_|.
   void CompositorSwapBuffers(uint64 surface_handle,
                              const gfx::Size& size,
                              float scale_factor,
                              const std::vector<ui::LatencyInfo>& latency_info);
 
-  // Draw the IOSurface by making its context current to this view.
-  void DrawIOSurfaceWithoutCoreAnimation();
-
   // Called when a GPU error is detected. Posts a task to destroy all
   // compositing state.
   void GotAcceleratedCompositingError();
 
   // Sets the overlay view, which should be drawn in the same IOSurface
   // atop of this view, if both views are drawing accelerated content.
   // Overlay is stored as a weak ptr.
   void SetOverlayView(RenderWidgetHostViewMac* overlay,
                       const gfx::Point& offset);
 
@@ skipping 26 matching lines @@
 
   WebContents* GetWebContents();
 
   // These member variables should be private, but the associated ObjC class
   // needs access to them and can't be made a friend.
 
   // The associated Model.  Can be NULL if Destroy() is called when
   // someone (other than superview) has retained |cocoa_view_|.
   RenderWidgetHostImpl* render_widget_host_;
 
-  // Whether last rendered frame was accelerated.
-  bool last_frame_was_accelerated_;
-
-  // The time at which this view started displaying white pixels as a result of
-  // not having anything to paint (empty backing store from renderer). This
-  // value returns true for is_null() if we are not recording whiteout times.
-  base::TimeTicks whiteout_start_time_;
-
-  // The time it took after this view was selected for it to be fully painted.
-  base::TimeTicks web_contents_switch_paint_time_;
-
   // Current text input type.
   ui::TextInputType text_input_type_;
   bool can_compose_inline_;
 
   // The background CoreAnimation layer which is hosted by |cocoa_view_|.
   // The compositing or software layers will be added as sublayers to this.
   base::scoped_nsobject<CALayer> background_layer_;
 
   // The CoreAnimation layer for software compositing. This should be NULL
   // when software compositing is not in use.
@@ skipping 12 matching lines @@
 
   // This lock is taken when the browser compositor produces a frame, and is
   // released when that frame is displayed. It is by this mechanism that the
   // browser compositor can exert GPU backpressure on the renderer compositor.
   scoped_refptr<ui::CompositorLock> browser_compositor_lock_;
   bool browser_compositor_damaged_during_lock_;
 
   // This holds the current software compositing framebuffer, if any.
   scoped_ptr<SoftwareFrameManager> software_frame_manager_;
 
-  // Whether to allow overlapping views.
-  bool allow_overlapping_views_;
-
-  // Whether to use the CoreAnimation path to draw content.
-  bool use_core_animation_;
-
   // Latency info to send back when the next frame appears on the
   // screen.
   std::vector<ui::LatencyInfo> pending_latency_info_;
 
   // When taking a screenshot when using CoreAnimation, add a delay of
   // a few frames to ensure that the contents have reached the screen
   // before reporting latency info.
   uint32 pending_latency_info_delay_;
   base::WeakPtrFactory<RenderWidgetHostViewMac>
       pending_latency_info_delay_weak_ptr_factory_;
@@ skipping 84 matching lines @@
   void DestroySoftwareLayer();
 
   bool EnsureCompositedIOSurface() WARN_UNUSED_RESULT;
   void EnsureCompositedIOSurfaceLayer();
   enum DestroyCompositedIOSurfaceLayerBehavior {
     kLeaveLayerInHierarchy,
     kRemoveLayerFromHierarchy,
   };
   void DestroyCompositedIOSurfaceLayer(
       DestroyCompositedIOSurfaceLayerBehavior destroy_layer_behavior);
-  enum DestroyContextBehavior {
-    kLeaveContextBoundToView,
-    kDestroyContext,
-  };
-  void DestroyCompositedIOSurfaceAndLayer(
-      DestroyContextBehavior destroy_context_behavior);
+  void DestroyCompositedIOSurfaceAndLayer();
 
   void DestroyCompositingStateOnError();
 
-  // Unbind the GL context (if any) that is bound to |cocoa_view_|.
-  void ClearBoundContextDrawable();
-
   // Called when a GPU SwapBuffers is received.
   void GotAcceleratedFrame();
 
   // Called when a software DIB is received.
   void GotSoftwareFrame();
 
   // IPC message handlers.
   void OnPluginFocusChanged(bool focused, int plugin_id);
   void OnStartPluginIme();
   void OnDidChangeScrollbarsForMainFrame(bool has_horizontal_scrollbar,
@@ skipping 36 matching lines @@
   base::scoped_nsobject<NSWindow> pepper_fullscreen_window_;
   base::scoped_nsobject<FullscreenWindowManager> fullscreen_window_manager_;
   // Our parent host view, if this is fullscreen.  NULL otherwise.
   RenderWidgetHostViewMac* fullscreen_parent_host_view_;
 
   // The overlay view which is rendered above this one in the same
   // accelerated IOSurface.
   // Overlay view has |underlay_view_| set to this view.
   base::WeakPtr<RenderWidgetHostViewMac> overlay_view_;
 
-  // Offset at which overlay view should be rendered.
-  gfx::Point overlay_view_offset_;
-
   // The underlay view which this view is rendered above in the same
   // accelerated IOSurface.
   // Underlay view has |overlay_view_| set to this view.
   base::WeakPtr<RenderWidgetHostViewMac> underlay_view_;
 
-  // Set to true when |underlay_view_| has drawn this view. After that point,
-  // this view should not draw again until |underlay_view_| is changed.
-  bool underlay_view_has_drawn_;
-
   // Factory used to safely reference overlay view set in SetOverlayView.
   base::WeakPtrFactory<RenderWidgetHostViewMac>
       overlay_view_weak_factory_;
 
   // Display link for getting vsync info.
   scoped_refptr<DisplayLinkMac> display_link_;
 
   // The current composition character range and its bounds.
   gfx::Range composition_range_;
   std::vector<gfx::Rect> composition_bounds_;
 
   // The current caret bounds.
   gfx::Rect caret_rect_;
 
   // Subscriber that listens to frame presentation events.
   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_