Merge Compositor and CompositorCC

ui/aura/window.cc

 // 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.
 
 #include "ui/aura/window.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/stl_util.h"
@@ skipping 194 matching lines @@
 const gfx::Rect& Window::bounds() const {
   return layer_->bounds();
 }
 
 void Window::SchedulePaintInRect(const gfx::Rect& rect) {
   layer_->SchedulePaint(rect);
   FOR_EACH_OBSERVER(
       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());
   FOR_EACH_OBSERVER(
       WindowObserver, observers_, OnWindowPaintScheduled(this, region));
 }
 
 void Window::SetParent(Window* parent) {
   GetParentForWindow(this, parent)->AddChild(this);
 }
@@ skipping 435 matching lines @@
                                         parent_->children().end(),
                                         this);
   for (++i; i != parent_->children().end(); ++i) {
     if ((*i)->StopsEventPropagation())
       return true;
   }
   return false;
 }
 
 }  // namespace aura