| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ui/views/view.h" | 5 #include "ui/views/view.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <map> | 9 #include <map> |
| 10 #include <memory> | 10 #include <memory> |
| (...skipping 21 matching lines...) Expand all Loading... |
| 32 #include "ui/events/scoped_target_handler.h" | 32 #include "ui/events/scoped_target_handler.h" |
| 33 #include "ui/gfx/canvas.h" | 33 #include "ui/gfx/canvas.h" |
| 34 #include "ui/gfx/path.h" | 34 #include "ui/gfx/path.h" |
| 35 #include "ui/gfx/transform.h" | 35 #include "ui/gfx/transform.h" |
| 36 #include "ui/native_theme/native_theme.h" | 36 #include "ui/native_theme/native_theme.h" |
| 37 #include "ui/strings/grit/ui_strings.h" | 37 #include "ui/strings/grit/ui_strings.h" |
| 38 #include "ui/views/background.h" | 38 #include "ui/views/background.h" |
| 39 #include "ui/views/controls/native/native_view_host.h" | 39 #include "ui/views/controls/native/native_view_host.h" |
| 40 #include "ui/views/controls/scroll_view.h" | 40 #include "ui/views/controls/scroll_view.h" |
| 41 #include "ui/views/controls/textfield/textfield.h" | 41 #include "ui/views/controls/textfield/textfield.h" |
| 42 #include "ui/views/devtools_observer.h" |
| 42 #include "ui/views/focus/view_storage.h" | 43 #include "ui/views/focus/view_storage.h" |
| 43 #include "ui/views/test/views_test_base.h" | 44 #include "ui/views/test/views_test_base.h" |
| 44 #include "ui/views/widget/native_widget.h" | 45 #include "ui/views/widget/native_widget.h" |
| 45 #include "ui/views/widget/root_view.h" | 46 #include "ui/views/widget/root_view.h" |
| 46 #include "ui/views/window/dialog_client_view.h" | 47 #include "ui/views/window/dialog_client_view.h" |
| 47 #include "ui/views/window/dialog_delegate.h" | 48 #include "ui/views/window/dialog_delegate.h" |
| 48 | 49 |
| 49 using base::ASCIIToUTF16; | 50 using base::ASCIIToUTF16; |
| 50 | 51 |
| 51 namespace { | 52 namespace { |
| (...skipping 4518 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4570 params.bounds = gfx::Rect(50, 50, 350, 350); | 4571 params.bounds = gfx::Rect(50, 50, 350, 350); |
| 4571 widget.Init(params); | 4572 widget.Init(params); |
| 4572 | 4573 |
| 4573 AddViewWithChildLayer(widget.GetRootView()); | 4574 AddViewWithChildLayer(widget.GetRootView()); |
| 4574 ViewThatAddsViewInOnNativeThemeChanged* v = | 4575 ViewThatAddsViewInOnNativeThemeChanged* v = |
| 4575 new ViewThatAddsViewInOnNativeThemeChanged; | 4576 new ViewThatAddsViewInOnNativeThemeChanged; |
| 4576 widget.GetRootView()->AddChildView(v); | 4577 widget.GetRootView()->AddChildView(v); |
| 4577 EXPECT_TRUE(v->on_native_theme_changed_called()); | 4578 EXPECT_TRUE(v->on_native_theme_changed_called()); |
| 4578 } | 4579 } |
| 4579 | 4580 |
| 4581 //////////////////////////////////////////////////////////////////////////////// |
| 4582 // DevTools observer tests. |
| 4583 //////////////////////////////////////////////////////////////////////////////// |
| 4584 |
| 4585 class DevToolsObserverTest : public ViewTest, public DevToolsObserver { |
| 4586 public: |
| 4587 DevToolsObserverTest() |
| 4588 : view_visibility_changed_(nullptr), |
| 4589 view_enabled_changed_(nullptr), |
| 4590 view_bounds_changed_(nullptr), |
| 4591 view_reordered_(nullptr) {} |
| 4592 |
| 4593 ~DevToolsObserverTest() override {} |
| 4594 |
| 4595 void OnViewHierarchyChanged(View* target, |
| 4596 View* old_parent, |
| 4597 View* new_parent) override { |
| 4598 ViewHierarchyChangedDetails details; |
| 4599 details.target = target; |
| 4600 details.old_parent = old_parent; |
| 4601 details.new_parent = new_parent; |
| 4602 view_hierarchy_changed_details_.push_back(details); |
| 4603 } |
| 4604 |
| 4605 void OnViewVisibilityChanged(View* view, bool visible) override { |
| 4606 view_visibility_changed_ = view; |
| 4607 } |
| 4608 |
| 4609 void OnViewEnabledChanged(View* view, int index) override { |
| 4610 view_enabled_changed_ = view; |
| 4611 } |
| 4612 |
| 4613 void OnViewBoundsChanged(View* view, const gfx::Rect& new_bounds) override { |
| 4614 view_bounds_changed_ = view; |
| 4615 } |
| 4616 |
| 4617 void OnChildViewReordered(View* view, int index) override { |
| 4618 view_reordered_ = view; |
| 4619 } |
| 4620 |
| 4621 bool DidChangeHierarchy(View* target, View* old_parent, View* new_parent) { |
| 4622 for (auto& details : view_hierarchy_changed_details_) { |
| 4623 if (details.target == target && details.old_parent == old_parent && |
| 4624 details.new_parent == new_parent) |
| 4625 return true; |
| 4626 } |
| 4627 return false; |
| 4628 } |
| 4629 |
| 4630 void reset() { |
| 4631 view_hierarchy_changed_details_.clear(); |
| 4632 view_visibility_changed_ = nullptr; |
| 4633 view_enabled_changed_ = nullptr; |
| 4634 view_bounds_changed_ = nullptr; |
| 4635 view_reordered_ = nullptr; |
| 4636 } |
| 4637 |
| 4638 std::unique_ptr<View> NewView() { |
| 4639 auto view = base::MakeUnique<View>(); |
| 4640 view->set_devtools_observer(this); |
| 4641 return view; |
| 4642 } |
| 4643 |
| 4644 int views_hierarchy_changed_times() const { |
| 4645 return static_cast<int>(view_hierarchy_changed_details_.size()); |
| 4646 } |
| 4647 const View* view_visibility_changed() const { |
| 4648 return view_visibility_changed_; |
| 4649 } |
| 4650 const View* view_enabled_changed() const { return view_enabled_changed_; } |
| 4651 const View* view_bounds_changed() const { return view_bounds_changed_; } |
| 4652 const View* view_reordered() const { return view_reordered_; } |
| 4653 |
| 4654 private: |
| 4655 struct ViewHierarchyChangedDetails { |
| 4656 View* target; |
| 4657 View* old_parent; |
| 4658 View* new_parent; |
| 4659 }; |
| 4660 std::vector<ViewHierarchyChangedDetails> view_hierarchy_changed_details_; |
| 4661 View* view_visibility_changed_; |
| 4662 View* view_enabled_changed_; |
| 4663 View* view_bounds_changed_; |
| 4664 View* view_reordered_; |
| 4665 }; |
| 4666 |
| 4667 TEST_F(DevToolsObserverTest, DevToolsObserverViewHierarchyChanged) { |
| 4668 std::unique_ptr<View> parent1 = NewView(); |
| 4669 std::unique_ptr<View> parent2 = NewView(); |
| 4670 std::unique_ptr<View> child_view = NewView(); |
| 4671 |
| 4672 parent1->AddChildView(child_view.get()); |
| 4673 EXPECT_EQ(1, views_hierarchy_changed_times()); |
| 4674 EXPECT_TRUE(DidChangeHierarchy(child_view.get(), nullptr, parent1.get())); |
| 4675 reset(); |
| 4676 |
| 4677 // Removed from parent1, added to parent2 |
| 4678 parent2->AddChildView(child_view.get()); |
| 4679 EXPECT_EQ(2, views_hierarchy_changed_times()); |
| 4680 EXPECT_TRUE(DidChangeHierarchy(child_view.get(), parent1.get(), nullptr)); |
| 4681 EXPECT_TRUE(DidChangeHierarchy(child_view.get(), nullptr, parent2.get())); |
| 4682 |
| 4683 reset(); |
| 4684 |
| 4685 parent2->RemoveChildView(child_view.get()); |
| 4686 EXPECT_EQ(1, views_hierarchy_changed_times()); |
| 4687 EXPECT_TRUE(DidChangeHierarchy(child_view.get(), parent2.get(), nullptr)); |
| 4688 } |
| 4689 |
| 4690 TEST_F(DevToolsObserverTest, DevToolsObserverViewVisibilityChanged) { |
| 4691 std::unique_ptr<View> view = NewView(); |
| 4692 view->SetVisible(false); |
| 4693 EXPECT_EQ(view.get(), view_visibility_changed()); |
| 4694 } |
| 4695 |
| 4696 TEST_F(DevToolsObserverTest, DevToolsObserverViewEnabledChanged) { |
| 4697 std::unique_ptr<View> view = NewView(); |
| 4698 view->SetEnabled(false); |
| 4699 EXPECT_EQ(view.get(), view_enabled_changed()); |
| 4700 } |
| 4701 |
| 4702 TEST_F(DevToolsObserverTest, DevToolsObserverViewBoundsChanged) { |
| 4703 std::unique_ptr<View> view = NewView(); |
| 4704 view->SetBounds(2, 2, 2, 2); |
| 4705 EXPECT_EQ(view.get(), view_bounds_changed()); |
| 4706 |
| 4707 reset(); |
| 4708 |
| 4709 view->SetBoundsRect(gfx::Rect(1, 1, 1, 1)); |
| 4710 EXPECT_EQ(view.get(), view_bounds_changed()); |
| 4711 } |
| 4712 |
| 4713 TEST_F(DevToolsObserverTest, DevToolsObserverChildViewReordered) { |
| 4714 std::unique_ptr<View> view = NewView(); |
| 4715 std::unique_ptr<View> child_view = NewView(); |
| 4716 std::unique_ptr<View> child_view2 = NewView(); |
| 4717 view->AddChildView(child_view.get()); |
| 4718 view->AddChildView(child_view2.get()); |
| 4719 view->ReorderChildView(child_view2.get(), 0); |
| 4720 EXPECT_EQ(child_view2.get(), view_reordered()); |
| 4721 } |
| 4722 |
| 4580 } // namespace views | 4723 } // namespace views |
| OLD | NEW |