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

Side by Side Diff: content/browser/android/in_process/synchronous_compositor_factory_impl.cc

Issue 1620053002: sync compositor: Merge input path with chrome (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: review Created 4 years, 9 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "content/browser/android/in_process/synchronous_compositor_factory_impl .h" 5 #include "content/browser/android/in_process/synchronous_compositor_factory_impl .h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 onscreen_context, worker_context, routing_id, 111 onscreen_context, worker_context, routing_id,
112 SynchronousCompositorRegistryInProc::GetInstance(), 112 SynchronousCompositorRegistryInProc::GetInstance(),
113 frame_swap_message_queue)); 113 frame_swap_message_queue));
114 } 114 }
115 115
116 InputHandlerManagerClient* 116 InputHandlerManagerClient*
117 SynchronousCompositorFactoryImpl::GetInputHandlerManagerClient() { 117 SynchronousCompositorFactoryImpl::GetInputHandlerManagerClient() {
118 return synchronous_input_event_filter(); 118 return synchronous_input_event_filter();
119 } 119 }
120 120
121 SynchronousInputHandlerProxyClient*
122 SynchronousCompositorFactoryImpl::GetSynchronousInputHandlerProxyClient() {
123 return synchronous_input_event_filter();
124 }
125
121 scoped_ptr<cc::BeginFrameSource> 126 scoped_ptr<cc::BeginFrameSource>
122 SynchronousCompositorFactoryImpl::CreateExternalBeginFrameSource( 127 SynchronousCompositorFactoryImpl::CreateExternalBeginFrameSource(
123 int routing_id) { 128 int routing_id) {
124 return make_scoped_ptr(new SynchronousCompositorExternalBeginFrameSource( 129 return make_scoped_ptr(new SynchronousCompositorExternalBeginFrameSource(
125 routing_id, SynchronousCompositorRegistryInProc::GetInstance())); 130 routing_id, SynchronousCompositorRegistryInProc::GetInstance()));
126 } 131 }
127 132
128 // SynchronousCompositorStreamTextureFactoryImpl. 133 // SynchronousCompositorStreamTextureFactoryImpl.
129 134
130 class SynchronousCompositorStreamTextureFactoryImpl::VideoContextProvider 135 class SynchronousCompositorStreamTextureFactoryImpl::VideoContextProvider
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
267 DCHECK(!android_view_service_.get()); 272 DCHECK(!android_view_service_.get());
268 android_view_service_ = service; 273 android_view_service_ = service;
269 274
270 if (base::CommandLine::ForCurrentProcess()->HasSwitch( 275 if (base::CommandLine::ForCurrentProcess()->HasSwitch(
271 switches::kSingleProcess)) { 276 switches::kSingleProcess)) {
272 RenderThreadImpl::SetStreamTextureFactory(CreateStreamTextureFactory()); 277 RenderThreadImpl::SetStreamTextureFactory(CreateStreamTextureFactory());
273 } 278 }
274 } 279 }
275 280
276 } // namespace content 281 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698