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

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: Rebasing TOT! 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 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 : context_provider_(context_provider), 91 : context_provider_(context_provider),
92 gl_in_process_context_(gl_in_process_context) { 92 gl_in_process_context_(gl_in_process_context) {
93 context_provider_->BindToCurrentThread(); 93 context_provider_->BindToCurrentThread();
94 } 94 }
95 95
96 scoped_refptr<gfx::SurfaceTexture> GetSurfaceTexture( 96 scoped_refptr<gfx::SurfaceTexture> GetSurfaceTexture(
97 uint32 stream_id) override { 97 uint32 stream_id) override {
98 return gl_in_process_context_->GetSurfaceTexture(stream_id); 98 return gl_in_process_context_->GetSurfaceTexture(stream_id);
99 } 99 }
100 100
101 uint32 CreateStreamTexture(uint32 texture_id) override {
102 return gl_in_process_context_->CreateStreamTexture(texture_id);
103 }
104
101 gpu::gles2::GLES2Interface* ContextGL() override { 105 gpu::gles2::GLES2Interface* ContextGL() override {
102 return context_provider_->ContextGL(); 106 return context_provider_->ContextGL();
103 } 107 }
104 108
105 void AddObserver(StreamTextureFactoryContextObserver* obs) override { 109 void AddObserver(StreamTextureFactoryContextObserver* obs) override {
106 observer_list_.AddObserver(obs); 110 observer_list_.AddObserver(obs);
107 } 111 }
108 112
109 void RemoveObserver(StreamTextureFactoryContextObserver* obs) override { 113 void RemoveObserver(StreamTextureFactoryContextObserver* obs) override {
110 observer_list_.RemoveObserver(obs); 114 observer_list_.RemoveObserver(obs);
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
240 return video_context_provider_; 244 return video_context_provider_;
241 } 245 }
242 246
243 void SynchronousCompositorFactoryImpl::SetDeferredGpuService( 247 void SynchronousCompositorFactoryImpl::SetDeferredGpuService(
244 scoped_refptr<gpu::InProcessCommandBuffer::Service> service) { 248 scoped_refptr<gpu::InProcessCommandBuffer::Service> service) {
245 DCHECK(!android_view_service_.get()); 249 DCHECK(!android_view_service_.get());
246 android_view_service_ = service; 250 android_view_service_ = service;
247 } 251 }
248 252
249 } // namespace content 253 } // namespace content
OLDNEW
« no previous file with comments | « components/mus/gles2/command_buffer_local.cc ('k') | content/common/gpu/client/command_buffer_proxy_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698