Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(83)

Side by Side Diff: ui/views/animation/test/ink_drop_host_view_test_api.h

Issue 2096003002: Fix crash when InkDropHostView::SetHasInkDrop() is called multiple times (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added test Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 #ifndef UI_VIEWS_ANIMATION_TEST_INK_DROP_HOST_VIEW_TEST_API_H_ 5 #ifndef UI_VIEWS_ANIMATION_TEST_INK_DROP_HOST_VIEW_TEST_API_H_
6 #define UI_VIEWS_ANIMATION_TEST_INK_DROP_HOST_VIEW_TEST_API_H_ 6 #define UI_VIEWS_ANIMATION_TEST_INK_DROP_HOST_VIEW_TEST_API_H_
7 7
8 #include <memory> 8 #include <memory>
9 #include <vector> 9 #include <vector>
10 10
11 #include "base/macros.h" 11 #include "base/macros.h"
12 #include "ui/views/animation/ink_drop.h" 12 #include "ui/views/animation/ink_drop.h"
13 #include "ui/views/animation/ink_drop_host_view.h" 13 #include "ui/views/animation/ink_drop_host_view.h"
14 14
15 namespace views { 15 namespace views {
16 namespace test { 16 namespace test {
17 17
18 // Test API to provide internal access to an InkDropHostView instance. 18 // Test API to provide internal access to an InkDropHostView instance.
19 class InkDropHostViewTestApi { 19 class InkDropHostViewTestApi {
20 public: 20 public:
21 explicit InkDropHostViewTestApi(InkDropHostView* host_view); 21 explicit InkDropHostViewTestApi(InkDropHostView* host_view);
22 ~InkDropHostViewTestApi(); 22 ~InkDropHostViewTestApi();
23 23
24 void SetHasInkDrop(bool has_an_ink_drop);
25
24 void SetInkDrop(std::unique_ptr<InkDrop> ink_drop); 26 void SetInkDrop(std::unique_ptr<InkDrop> ink_drop);
25 InkDrop* ink_drop() { return host_view_->ink_drop(); } 27 InkDrop* ink_drop() { return host_view_->ink_drop(); }
26 28
29 bool HasGestureHandler() const;
30
27 // Wrapper for InkDropHostView::GetInkDropCenterBasedOnLastEvent(). 31 // Wrapper for InkDropHostView::GetInkDropCenterBasedOnLastEvent().
28 gfx::Point GetInkDropCenterBasedOnLastEvent() const; 32 gfx::Point GetInkDropCenterBasedOnLastEvent() const;
29 33
30 // Wrapper for InkDropHostView::AnimateInkDrop(). 34 // Wrapper for InkDropHostView::AnimateInkDrop().
31 void AnimateInkDrop(InkDropState state, const ui::LocatedEvent* event); 35 void AnimateInkDrop(InkDropState state, const ui::LocatedEvent* event);
32 36
33 private: 37 private:
34 // The InkDropHostView to provide internal access to. 38 // The InkDropHostView to provide internal access to.
35 InkDropHostView* host_view_; 39 InkDropHostView* host_view_;
36 40
37 DISALLOW_COPY_AND_ASSIGN(InkDropHostViewTestApi); 41 DISALLOW_COPY_AND_ASSIGN(InkDropHostViewTestApi);
38 }; 42 };
39 43
40 } // namespace test 44 } // namespace test
41 } // namespace views 45 } // namespace views
42 46
43 #endif // UI_VIEWS_ANIMATION_TEST_INK_DROP_HOST_VIEW_TEST_API_H_ 47 #endif // UI_VIEWS_ANIMATION_TEST_INK_DROP_HOST_VIEW_TEST_API_H_
OLDNEW
« no previous file with comments | « ui/views/animation/ink_drop_host_view_unittest.cc ('k') | ui/views/animation/test/ink_drop_host_view_test_api.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698