Makes aura::LayoutManager be destroyed before properties

ui/aura/window_unittest.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 <limits.h>
 
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "build/build_config.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/aura/client/capture_client.h"
 #include "ui/aura/client/focus_change_observer.h"
 #include "ui/aura/client/visibility_client.h"
 #include "ui/aura/client/window_tree_client.h"
+#include "ui/aura/layout_manager.h"
 #include "ui/aura/test/aura_test_base.h"
 #include "ui/aura/test/aura_test_utils.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura/test/test_windows.h"
 #include "ui/aura/test/window_test_api.h"
 #include "ui/aura/window_delegate.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/aura/window_observer.h"
 #include "ui/aura/window_property.h"
 #include "ui/aura/window_tree_host.h"
@@ skipping 10 matching lines @@
 #include "ui/events/test/event_generator.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/geometry/vector2d.h"
 #include "ui/gfx/screen.h"
 #include "ui/gfx/skia_util.h"
 
 DECLARE_WINDOW_PROPERTY_TYPE(const char*)
 
 namespace {
 
+enum class DeletionOrder {
+  LAYOUT_MANAGER_FIRST,
+  PROPERTY_FIRST,
+  UNKNOWN,
+};
+
+class DeletionTracker {
+ public:
+  DeletionTracker() {}
+  ~DeletionTracker() {}
+
+  DeletionOrder order() const { return order_; }
+  bool property_deleted() const { return property_deleted_; }
+  bool layout_manager_deleted() const { return layout_manager_deleted_; }
+
+  void PropertyDeleted() {
+    property_deleted_ = true;
+    if (order_ == DeletionOrder::UNKNOWN)
+      order_ = DeletionOrder::PROPERTY_FIRST;
+  }
+
+  void LayoutManagerDeleted() {
+    layout_manager_deleted_ = true;
+    if (order_ == DeletionOrder::UNKNOWN)
+      order_ = DeletionOrder::LAYOUT_MANAGER_FIRST;
+  }
+
+ private:
+  bool property_deleted_ = false;
+  bool layout_manager_deleted_ = false;
+  DeletionOrder order_ = DeletionOrder::UNKNOWN;
+
+  DISALLOW_COPY_AND_ASSIGN(DeletionTracker);
+};
+
+class DeletionTestProperty {
+ public:
+  explicit DeletionTestProperty(DeletionTracker* tracker) : tracker_(tracker) {}
+  ~DeletionTestProperty() { tracker_->PropertyDeleted(); }
+
+ private:
+  DeletionTracker* tracker_;
+
+  DISALLOW_COPY_AND_ASSIGN(DeletionTestProperty);
+};
+
 class TestProperty {
  public:
   TestProperty() {}
   ~TestProperty() {
     last_deleted_ = this;
   }
   static TestProperty* last_deleted() { return last_deleted_; }
 
  private:
   static TestProperty* last_deleted_;
   DISALLOW_COPY_AND_ASSIGN(TestProperty);
 };
 
 TestProperty* TestProperty::last_deleted_ = nullptr;
 
 DEFINE_OWNED_WINDOW_PROPERTY_KEY(TestProperty, kOwnedKey, NULL);
+DEFINE_OWNED_WINDOW_PROPERTY_KEY(DeletionTestProperty,
+                                 kDeletionTestPropertyKey,
+                                 nullptr);
 
 }  // namespace
 
 DECLARE_WINDOW_PROPERTY_TYPE(TestProperty*);
 
+DECLARE_WINDOW_PROPERTY_TYPE(DeletionTestProperty*);
+
 namespace aura {
 namespace test {
 
 class WindowTest : public AuraTestBase {
  public:
   WindowTest() : max_separation_(0) {
   }
 
   void SetUp() override {
     AuraTestBase::SetUp();
@@ skipping 1579 matching lines @@
   EXPECT_EQ(p2, TestProperty::last_deleted());
 
   TestProperty* p3 = new TestProperty();
   w->SetProperty(kOwnedKey, p3);
   EXPECT_EQ(p3, w->GetProperty(kOwnedKey));
   EXPECT_EQ(p2, TestProperty::last_deleted());
   w.reset();
   EXPECT_EQ(p3, TestProperty::last_deleted());
 }
 
+namespace {
+
+class DeletionTestLayoutManager : public LayoutManager {
+ public:
+  explicit DeletionTestLayoutManager(DeletionTracker* tracker)
+      : tracker_(tracker) {}
+  ~DeletionTestLayoutManager() override { tracker_->LayoutManagerDeleted(); }
+
+ private:
+  // LayoutManager:
+  void OnWindowResized() override {}
+  void OnWindowAddedToLayout(Window* child) override {}
+  void OnWillRemoveWindowFromLayout(Window* child) override {}
+  void OnWindowRemovedFromLayout(Window* child) override {}
+  void OnChildWindowVisibilityChanged(Window* child, bool visible) override {}
+  void SetChildBounds(Window* child,
+                      const gfx::Rect& requested_bounds) override {}
+
+  DeletionTracker* tracker_;
+
+  DISALLOW_COPY_AND_ASSIGN(DeletionTestLayoutManager);
+};
+
+}  // namespace
+
+TEST_F(WindowTest, DeleteLayoutManagerBeforeOwnedProps) {
+  DeletionTracker tracker;
+  {
+    Window w(nullptr);
+    w.Init(ui::LAYER_NOT_DRAWN);
+    w.SetLayoutManager(new DeletionTestLayoutManager(&tracker));
+    w.SetProperty(kDeletionTestPropertyKey, new DeletionTestProperty(&tracker));
+  }
+  EXPECT_TRUE(tracker.property_deleted());
+  EXPECT_TRUE(tracker.layout_manager_deleted());
+  EXPECT_EQ(DeletionOrder::LAYOUT_MANAGER_FIRST, tracker.order());
+}
+
 TEST_F(WindowTest, SetBoundsInternalShouldCheckTargetBounds) {
   // We cannot short-circuit animations in this test.
   ui::ScopedAnimationDurationScaleMode test_duration_mode(
       ui::ScopedAnimationDurationScaleMode::NON_ZERO_DURATION);
 
   std::unique_ptr<Window> w1(
       CreateTestWindowWithBounds(gfx::Rect(0, 0, 100, 100), root_window()));
 
   EXPECT_TRUE(w1->layer());
   w1->layer()->GetAnimator()->set_disable_timer_for_test(true);
@@ skipping 1206 matching lines @@
 
   EXPECT_TRUE(animator.get());
   EXPECT_FALSE(animator->is_animating());
   EXPECT_TRUE(observer.animation_completed());
   EXPECT_FALSE(observer.animation_aborted());
   animator->RemoveObserver(&observer);
 }
 
 }  // namespace test
 }  // namespace aura