Merge Compositor and CompositorCC

ui/gfx/compositor/layer.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 UI_GFX_COMPOSITOR_LAYER_H_
 #define UI_GFX_COMPOSITOR_LAYER_H_
 #pragma once
 
 #include <string>
 #include <vector>
@@ skipping 153 matching lines @@
   void set_name(const std::string& name) { name_ = name; }
 
   const ui::Texture* texture() const { return texture_.get(); }
 
   // Assigns a new external texture.  |texture| can be NULL to disable external
   // updates.
   // TODO(beng): This can be removed from the API when we are in a
   //             single-compositor world.
   void SetExternalTexture(ui::Texture* texture);
 
-  // Resets the canvas of the texture.  May only be called for LAYER_TEXTURED.
-  void SetCanvas(const SkCanvas& canvas, const gfx::Point& origin);
-
   // Sets the layer's fill color.  May only be called for LAYER_SOLID_COLOR.
   void SetColor(SkColor color);
 
   // Adds |invalid_rect| to the Layer's pending invalid rect and calls
   // ScheduleDraw().
   void SchedulePaint(const gfx::Rect& invalid_rect);
 
   // Schedules a redraw of the layer tree at the compositor.
   void ScheduleDraw();
 
@@ skipping 94 matching lines @@
   WebKit::WebLayer web_layer_;
   bool web_layer_is_accelerated_;
   bool show_debug_borders_;
 
   DISALLOW_COPY_AND_ASSIGN(Layer);
 };
 
 }  // namespace ui
 
 #endif  // UI_GFX_COMPOSITOR_LAYER_H_