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

Side by Side Diff: gpu/command_buffer/service/stream_texture_manager_in_process_android.cc

Issue 549253003: gpu: Allow CopyTexImage to be called with StreamTextures and GLImageSync. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: stream_texture_android.cc too Created 6 years, 3 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "gpu/command_buffer/service/stream_texture_manager_in_process_android.h " 5 #include "gpu/command_buffer/service/stream_texture_manager_in_process_android.h "
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "gpu/command_buffer/service/texture_manager.h" 9 #include "gpu/command_buffer/service/texture_manager.h"
10 #include "ui/gfx/size.h" 10 #include "ui/gfx/size.h"
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 bool GLImageImpl::BindTexImage(unsigned target) { 67 bool GLImageImpl::BindTexImage(unsigned target) {
68 NOTREACHED(); 68 NOTREACHED();
69 return false; 69 return false;
70 } 70 }
71 71
72 void GLImageImpl::ReleaseTexImage(unsigned target) { 72 void GLImageImpl::ReleaseTexImage(unsigned target) {
73 NOTREACHED(); 73 NOTREACHED();
74 } 74 }
75 75
76 bool GLImageImpl::CopyTexImage(unsigned target) { 76 bool GLImageImpl::CopyTexImage(unsigned target) {
77 NOTREACHED();
78 return false; 77 return false;
79 } 78 }
80 79
81 void GLImageImpl::WillUseTexImage() { 80 void GLImageImpl::WillUseTexImage() {
82 surface_texture_->UpdateTexImage(); 81 surface_texture_->UpdateTexImage();
83 } 82 }
84 83
85 bool GLImageImpl::ScheduleOverlayPlane(gfx::AcceleratedWidget widget, 84 bool GLImageImpl::ScheduleOverlayPlane(gfx::AcceleratedWidget widget,
86 int z_order, 85 int z_order,
87 gfx::OverlayTransform transform, 86 gfx::OverlayTransform transform,
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
162 StreamTextureManagerInProcess::GetSurfaceTexture(uint32 stream_id) { 161 StreamTextureManagerInProcess::GetSurfaceTexture(uint32 stream_id) {
163 base::AutoLock lock(map_lock_); 162 base::AutoLock lock(map_lock_);
164 TextureMap::const_iterator it = textures_.find(stream_id); 163 TextureMap::const_iterator it = textures_.find(stream_id);
165 if (it != textures_.end()) 164 if (it != textures_.end())
166 return it->second; 165 return it->second;
167 166
168 return NULL; 167 return NULL;
169 } 168 }
170 169
171 } // namespace gpu 170 } // namespace gpu
OLDNEW
« no previous file with comments | « content/common/gpu/stream_texture_android.cc ('k') | gpu/command_buffer/service/texture_definition.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698