Makes View::RecreateLayer() and Window::RecreateLayer() the same

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/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "ui/aura/client/capture_client.h"
 #include "ui/aura/client/cursor_client.h"
 #include "ui/aura/client/event_client.h"
 #include "ui/aura/client/focus_client.h"
 #include "ui/aura/client/screen_position_client.h"
 #include "ui/aura/client/visibility_client.h"
 #include "ui/aura/client/window_stacking_client.h"
 #include "ui/aura/env.h"
 #include "ui/aura/layout_manager.h"
 #include "ui/aura/window_delegate.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/aura/window_observer.h"
 #include "ui/aura/window_tracker.h"
 #include "ui/aura/window_tree_host.h"
+#include "ui/compositor/clone_layer.h"
 #include "ui/compositor/compositor.h"
 #include "ui/compositor/layer.h"
 #include "ui/events/event_target_iterator.h"
 #include "ui/gfx/animation/multi_animation.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/path.h"
 #include "ui/gfx/scoped_canvas.h"
 #include "ui/gfx/screen.h"
 
 namespace aura {
@@ skipping 230 matching lines @@
     SetLayer(new ui::Layer(WindowLayerTypeToUILayerType(window_layer_type)));
     layer()->SetVisible(false);
     layer()->set_delegate(this);
     UpdateLayerName(name_);
     layer()->SetFillsBoundsOpaquely(!transparent_);
   }
 
   Env::GetInstance()->NotifyWindowInitialized(this);
 }
 
-// TODO(sky): move to match new position.
-scoped_ptr<ui::Layer> Window::RecreateLayer() {
-  // Disconnect the old layer, but don't delete it.
-  scoped_ptr<ui::Layer> old_layer(AcquireLayer());
-  if (!old_layer)
-    return old_layer.Pass();
-
-  old_layer->set_delegate(NULL);
-
-  const gfx::Rect layer_bounds(old_layer->bounds());
-  SetLayer(new ui::Layer(old_layer->type()));
-  layer()->SetVisible(old_layer->visible());
-  layer()->set_scale_content(old_layer->scale_content());
-  layer()->SetBounds(layer_bounds);
-  layer()->set_delegate(this);
-  layer()->SetMasksToBounds(old_layer->GetMasksToBounds());
-
-  if (delegate_)
-    delegate_->DidRecreateLayer(old_layer.get(), layer());
-
-  UpdateLayerName(name_);
-  layer()->SetFillsBoundsOpaquely(!transparent_);
-  // Install new layer as a sibling of the old layer, stacked below it.
-  if (old_layer->parent()) {
-    old_layer->parent()->Add(layer());
-    old_layer->parent()->StackBelow(layer(), old_layer.get());
-  }
-  // Migrate all the child layers over to the new layer. Copy the list because
-  // the items are removed during iteration.
-  std::vector<ui::Layer*> children_copy = old_layer->children();
-  for (std::vector<ui::Layer*>::const_iterator it = children_copy.begin();
-       it != children_copy.end();
-       ++it) {
-    ui::Layer* child = *it;
-    layer()->Add(child);
-  }
-  return old_layer.Pass();
-}
-
 void Window::SetType(ui::wm::WindowType type) {
   // Cannot change type after the window is initialized.
   DCHECK(!layer());
   type_ = type;
 }
 
 void Window::SetName(const std::string& name) {
   name_ = name;
 
   if (layer())
@@ skipping 455 matching lines @@
 }
 
 void Window::OnDeviceScaleFactorChanged(float device_scale_factor) {
   ScopedCursorHider hider(this);
   if (IsRootWindow())
     host_->OnDeviceScaleFactorChanged(device_scale_factor);
   if (delegate_)
     delegate_->OnDeviceScaleFactorChanged(device_scale_factor);
 }
 
+scoped_ptr<ui::Layer> Window::RecreateLayer() {
+  scoped_ptr<ui::Layer> old_layer(ui::CloneLayer(this));
+  if (!old_layer)
+    return old_layer.Pass();
+
+  if (delegate_)
+    delegate_->DidRecreateLayer(old_layer.get(), layer());
+
+  return old_layer.Pass();
+}
+
 #if !defined(NDEBUG)
 std::string Window::GetDebugInfo() const {
   return base::StringPrintf(
       "%s<%d> bounds(%d, %d, %d, %d) %s %s opacity=%.1f",
       name().empty() ? "Unknown" : name().c_str(), id(),
       bounds().x(), bounds().y(), bounds().width(), bounds().height(),
       visible_ ? "WindowVisible" : "WindowHidden",
       layer() ?
           (layer()->GetTargetVisibility() ? "LayerVisible" : "LayerHidden") :
           "NoLayer",
@@ skipping 641 matching lines @@
       return window;
     if (offset)
       *offset += window->bounds().OffsetFromOrigin();
   }
   if (offset)
     *offset = gfx::Vector2d();
   return NULL;
 }
 
 }  // namespace aura