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

Side by Side Diff: blimp/client/core/render_widget/blimp_document.cc

Issue 2400923002: Move BlimpInputManager to BlimpDocument from BlimpCompositor. (Closed)
Patch Set: Removed unused mock class. Created 4 years, 2 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 #include "blimp/client/core/render_widget/blimp_document.h" 5 #include "blimp/client/core/render_widget/blimp_document.h"
6 6
7 #include "base/threading/thread_task_runner_handle.h"
8 #include "blimp/client/core/compositor/blimp_compositor_dependencies.h"
9 #include "blimp/client/core/input/blimp_input_manager.h"
7 #include "blimp/client/core/render_widget/blimp_document_manager.h" 10 #include "blimp/client/core/render_widget/blimp_document_manager.h"
8 #include "cc/layers/layer.h" 11 #include "cc/layers/layer.h"
9 12
10 namespace blimp { 13 namespace blimp {
11 namespace client { 14 namespace client {
12 15
13 BlimpDocument::BlimpDocument(int document_id, 16 BlimpDocument::BlimpDocument(int document_id,
14 BlimpCompositorDependencies* compositor_deps, 17 BlimpCompositorDependencies* compositor_deps,
15 BlimpDocumentManager* document_manager) 18 BlimpDocumentManager* document_manager)
16 : document_id_(document_id), manager_(document_manager) { 19 : document_id_(document_id), manager_(document_manager) {
17 compositor_ = base::MakeUnique<BlimpCompositor>(compositor_deps, this); 20 compositor_ = base::MakeUnique<BlimpCompositor>(compositor_deps, this);
21
22 scoped_refptr<base::SingleThreadTaskRunner> compositor_task_runner =
23 compositor_deps->GetCompositorTaskRunner();
24
25 DCHECK(!input_manager_);
26 input_manager_ = BlimpInputManager::Create(
27 this, base::ThreadTaskRunnerHandle::Get(), compositor_task_runner,
28 compositor_->GetInputHandler());
18 } 29 }
19 30
20 BlimpDocument::~BlimpDocument() = default; 31 BlimpDocument::~BlimpDocument() {
32 compositor_.reset();
33
34 // Destroy the old input manager state.
35 // It is important to destroy the LayerTreeHost before destroying the input
36 // manager as it has a reference to the cc::InputHandlerClient owned by the
37 // BlimpInputManager.
38 input_manager_.reset();
39 }
21 40
22 BlimpCompositor* BlimpDocument::GetCompositor() { 41 BlimpCompositor* BlimpDocument::GetCompositor() {
23 return compositor_.get(); 42 return compositor_.get();
24 } 43 }
25 44
26 void BlimpDocument::SetCompositorForTest( 45 bool BlimpDocument::OnTouchEvent(const ui::MotionEvent& motion_event) {
27 std::unique_ptr<BlimpCompositor> compositor) { 46 if (input_manager_)
28 compositor_ = std::move(compositor); 47 return input_manager_->OnTouchEvent(motion_event);
48 return false;
29 } 49 }
30 50
31 void BlimpDocument::SendWebGestureEvent( 51 void BlimpDocument::SetCompositorForTest(
32 const blink::WebGestureEvent& gesture_event) { 52 std::unique_ptr<BlimpCompositor> compositor,
33 manager_->SendWebGestureEvent(document_id_, gesture_event); 53 BlimpCompositorDependencies* compositor_deps) {
54 compositor_ = std::move(compositor);
55
56 scoped_refptr<base::SingleThreadTaskRunner> compositor_task_runner =
57 compositor_deps->GetCompositorTaskRunner();
58
59 input_manager_ = BlimpInputManager::Create(
60 this, base::ThreadTaskRunnerHandle::Get(), compositor_task_runner,
61 compositor_->GetInputHandler());
34 } 62 }
35 63
36 void BlimpDocument::SendCompositorMessage( 64 void BlimpDocument::SendCompositorMessage(
37 const cc::proto::CompositorMessage& message) { 65 const cc::proto::CompositorMessage& message) {
38 manager_->SendCompositorMessage(document_id_, message); 66 manager_->SendCompositorMessage(document_id_, message);
39 } 67 }
40 68
69 void BlimpDocument::SendWebGestureEvent(
70 const blink::WebGestureEvent& gesture_event) {
71 manager_->SendWebGestureEvent(document_id_, gesture_event);
72 }
73
41 } // namespace client 74 } // namespace client
42 } // namespace blimp 75 } // namespace blimp
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698