Remove COMPOSITOR_2 flag, old compositor code.

views/view.h

 // 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.
 
 #ifndef VIEWS_VIEW_H_
 #define VIEWS_VIEW_H_
 #pragma once
 
 #include <algorithm>
 #include <map>
@@ skipping 984 matching lines @@
 
   // Override to paint a border not specified by SetBorder().
   virtual void OnPaintBorder(gfx::Canvas* canvas);
 
   // Override to paint a focus border (usually a dotted rectangle) around
   // relevant contents.
   virtual void OnPaintFocusBorder(gfx::Canvas* canvas);
 
   // Accelerated painting ------------------------------------------------------
 
-#if !defined(COMPOSITOR_2)
-
-  // Performs accelerated painting using the compositor.
-  virtual void PaintComposite(ui::Compositor* compositor);
-#else
-
   // Invoked from SchedulePaintInRect. Invokes SchedulePaintInternal on the
   // parent. This does not mark the texture as dirty. It's assumed the caller
   // has done this. You should not need to invoke this, use SchedulePaint or
   // SchedulePaintInRect instead.
   virtual void SchedulePaintInternal(const gfx::Rect& r);
 
   // If our texture is out of date invokes Paint() with a canvas that is then
   // copied to the texture. If the texture is not out of date recursively
   // descends in case any children needed their textures updated.
   //
   // This is invoked internally by Widget and painting code.
   void PaintToTexture(const gfx::Rect& dirty_rect);
 
   // Instructs the compositor to show our texture and all children textures.
   // Invokes OnWillCompositeTexture() for any views that have textures.
   //
   // This is invoked internally by Widget and painting code.
   void PaintComposite();
 
   // Invoked from |PaintComposite| if this view has a texture and before the
   // texture is rendered by the compositor.
   virtual void OnWillCompositeTexture();
-#endif
 
   // Returns true if this view should paint using a texture.
   virtual bool ShouldPaintToTexture() const;
 
   // Returns the Compositor.
   virtual const ui::Compositor* GetCompositor() const;
   virtual ui::Compositor* GetCompositor();
 
   // Input ---------------------------------------------------------------------
 
@@ skipping 178 matching lines @@
   bool ConvertPointForAncestor(const View* ancestor, gfx::Point* point) const;
 
   // Convert a point in the ancestor's coordinate system to the view's
   // coordinate system using necessary transformations. Returns whether the
   // point was successfully from the ancestor's coordinate system to the view's
   // coordinate system.
   bool ConvertPointFromAncestor(const View* ancestor, gfx::Point* point) const;
 
   // Accelerated painting ------------------------------------------------------
 
-#if defined(COMPOSITOR_2)
   // Marks the texture this view draws into as dirty.
   void MarkTextureDirty();
-#endif
 
   // Releases the texture of this and recurses through all children.
   void ResetTexture();
 
   // Input ---------------------------------------------------------------------
 
   // RootView invokes these. These in turn invoke the appropriate OnMouseXXX
   // method. If a drag is detected, DoDrag is invoked.
   bool ProcessMousePressed(const MouseEvent& event, DragInfo* drop_info);
   bool ProcessMouseDragged(const MouseEvent& event, DragInfo* drop_info);
@@ skipping 131 matching lines @@
 
   // RTL painting --------------------------------------------------------------
 
   // Indicates whether or not the gfx::Canvas object passed to View::Paint()
   // is going to be flipped horizontally (using the appropriate transform) on
   // right-to-left locales for this View.
   bool flip_canvas_on_paint_for_rtl_ui_;
 
   // Accelerated painting ------------------------------------------------------
 
-#if !defined(COMPOSITOR_2)
-  // Each transformed view will maintain its own canvas.
-  scoped_ptr<gfx::Canvas> canvas_;
-
-  // Texture ID used for accelerated painting.
-  // TODO(sadrul): This will eventually be replaced by an abstract texture
-  //               object.
-  ui::TextureID texture_id_;
-#else
   scoped_ptr<ui::Texture> texture_;
 
   // If not empty and Paint() is invoked, the canvas is created with the
   // specified size.
   // TODO(sky): this should be passed in.
   gfx::Rect texture_clip_rect_;
-#endif
 
   // Is the texture out of date?
   bool texture_needs_updating_;
 
   // Should we paint to a texture? See description above setter for details.
   bool paint_to_texture_;
 
   // Accelerators --------------------------------------------------------------
 
   // true if when we were added to hierarchy we were without focus manager
@@ skipping 39 matching lines @@
   // The Windows-specific accessibility implementation for this View.
   scoped_refptr<NativeViewAccessibilityWin> native_view_accessibility_win_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(View);
 };
 
 }  // namespace views
 
 #endif  // VIEWS_VIEW_H_