Merge Compositor and CompositorCC

ui/aura/window.cc

Index: ui/aura/window.cc
diff --git a/ui/aura/window.cc b/ui/aura/window.cc
index adfa82fb429edf800db1fb5b83af5f9e5e554123..93743d671960c995123c1661e04cdfbc71d2224f 100644
--- a/ui/aura/window.cc
+++ b/ui/aura/window.cc
@@ -212,17 +212,6 @@ void Window::SchedulePaintInRect(const gfx::Rect& rect) {
       WindowObserver, observers_, OnWindowPaintScheduled(this, rect));
 }
 
-void Window::SetCanvas(const SkCanvas& canvas, const gfx::Point& origin) {
-  // TODO: figure out how this is going to work when animating the layer. In
-  // particular if we're animating the size then the underlying Texture is going
-  // to be unhappy if we try to set a texture on a size bigger than the size of
-  // the texture.
-  layer_->SetCanvas(canvas, origin);
-  gfx::Rect region(gfx::Point(), bounds().size());
-  FOR_EACH_OBSERVER(
-      WindowObserver, observers_, OnWindowPaintScheduled(this, region));
-}
-
 void Window::SetExternalTexture(ui::Texture* texture) {
   layer_->SetExternalTexture(texture);
   gfx::Rect region(gfx::Point(), bounds().size());