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

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

Issue 1385883002: Leave CreateStreamTexture route id out of the GL interface. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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 "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/observer_list.h" 8 #include "base/observer_list.h"
9 #include "base/sys_info.h" 9 #include "base/sys_info.h"
10 #include "base/thread_task_runner_handle.h" 10 #include "base/thread_task_runner_handle.h"
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 : context_provider_(context_provider), 92 : context_provider_(context_provider),
93 gl_in_process_context_(gl_in_process_context) { 93 gl_in_process_context_(gl_in_process_context) {
94 context_provider_->BindToCurrentThread(); 94 context_provider_->BindToCurrentThread();
95 } 95 }
96 96
97 scoped_refptr<gfx::SurfaceTexture> GetSurfaceTexture( 97 scoped_refptr<gfx::SurfaceTexture> GetSurfaceTexture(
98 uint32 stream_id) override { 98 uint32 stream_id) override {
99 return gl_in_process_context_->GetSurfaceTexture(stream_id); 99 return gl_in_process_context_->GetSurfaceTexture(stream_id);
100 } 100 }
101 101
102 uint32 CreateStreamTexture(uint32 texture_id) {
no sievers 2015/10/27 16:58:56 nit: override
sivag 2015/11/05 09:42:50 Done.
103 return gl_in_process_context_->CreateStreamTexture(texture_id);
104 }
105
102 gpu::gles2::GLES2Interface* ContextGL() override { 106 gpu::gles2::GLES2Interface* ContextGL() override {
103 return context_provider_->ContextGL(); 107 return context_provider_->ContextGL();
104 } 108 }
105 109
106 void AddObserver(StreamTextureFactoryContextObserver* obs) override { 110 void AddObserver(StreamTextureFactoryContextObserver* obs) override {
107 observer_list_.AddObserver(obs); 111 observer_list_.AddObserver(obs);
108 } 112 }
109 113
110 void RemoveObserver(StreamTextureFactoryContextObserver* obs) override { 114 void RemoveObserver(StreamTextureFactoryContextObserver* obs) override {
111 observer_list_.RemoveObserver(obs); 115 observer_list_.RemoveObserver(obs);
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
248 } 252 }
249 253
250 base::Thread* SynchronousCompositorFactoryImpl::CreateInProcessGpuThread( 254 base::Thread* SynchronousCompositorFactoryImpl::CreateInProcessGpuThread(
251 const InProcessChildThreadParams& params) { 255 const InProcessChildThreadParams& params) {
252 DCHECK(android_view_service_.get()); 256 DCHECK(android_view_service_.get());
253 return new InProcessGpuThread(params, 257 return new InProcessGpuThread(params,
254 android_view_service_->sync_point_manager()); 258 android_view_service_->sync_point_manager());
255 } 259 }
256 260
257 } // namespace content 261 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698