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

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

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
« no previous file with comments | « ui/views/animation/test/ink_drop_host_view_test_api.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #include "ui/views/animation/test/ink_drop_host_view_test_api.h" 5 #include "ui/views/animation/test/ink_drop_host_view_test_api.h"
6 6
7 namespace views { 7 namespace views {
8 namespace test { 8 namespace test {
9 9
10 InkDropHostViewTestApi::InkDropHostViewTestApi(InkDropHostView* host_view) 10 InkDropHostViewTestApi::InkDropHostViewTestApi(InkDropHostView* host_view)
11 : host_view_(host_view) {} 11 : host_view_(host_view) {}
12 12
13 InkDropHostViewTestApi::~InkDropHostViewTestApi() {} 13 InkDropHostViewTestApi::~InkDropHostViewTestApi() {}
14 14
15 void InkDropHostViewTestApi::SetHasInkDrop(bool has_an_ink_drop) {
16 host_view_->SetHasInkDrop(has_an_ink_drop);
17 }
18
15 void InkDropHostViewTestApi::SetInkDrop(std::unique_ptr<InkDrop> ink_drop) { 19 void InkDropHostViewTestApi::SetInkDrop(std::unique_ptr<InkDrop> ink_drop) {
16 host_view_->SetHasInkDrop(true); 20 host_view_->SetHasInkDrop(true);
17 host_view_->ink_drop_ = std::move(ink_drop); 21 host_view_->ink_drop_ = std::move(ink_drop);
18 } 22 }
19 23
24 bool InkDropHostViewTestApi::HasGestureHandler() const {
25 return host_view_->gesture_handler_ != nullptr;
26 }
27
20 gfx::Point InkDropHostViewTestApi::GetInkDropCenterBasedOnLastEvent() const { 28 gfx::Point InkDropHostViewTestApi::GetInkDropCenterBasedOnLastEvent() const {
21 return host_view_->GetInkDropCenterBasedOnLastEvent(); 29 return host_view_->GetInkDropCenterBasedOnLastEvent();
22 } 30 }
23 31
24 void InkDropHostViewTestApi::AnimateInkDrop(InkDropState state, 32 void InkDropHostViewTestApi::AnimateInkDrop(InkDropState state,
25 const ui::LocatedEvent* event) { 33 const ui::LocatedEvent* event) {
26 host_view_->AnimateInkDrop(state, event); 34 host_view_->AnimateInkDrop(state, event);
27 } 35 }
28 36
29 } // namespace test 37 } // namespace test
30 } // namespace views 38 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/animation/test/ink_drop_host_view_test_api.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698