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

Side by Side Diff: ui/gl/android/surface_texture.cc

Issue 1998723002: Move code in ui/gl/* from gfx:: to gl:: (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 6 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
« no previous file with comments | « ui/gl/android/surface_texture.h ('k') | ui/gl/android/surface_texture_listener.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "ui/gl/android/surface_texture.h" 5 #include "ui/gl/android/surface_texture.h"
6 6
7 #include <android/native_window_jni.h> 7 #include <android/native_window_jni.h>
8 8
9 #include "base/android/jni_android.h" 9 #include "base/android/jni_android.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "jni/SurfaceTexturePlatformWrapper_jni.h" 11 #include "jni/SurfaceTexturePlatformWrapper_jni.h"
12 #include "ui/gl/android/scoped_java_surface.h" 12 #include "ui/gl/android/scoped_java_surface.h"
13 #include "ui/gl/android/surface_texture_listener.h" 13 #include "ui/gl/android/surface_texture_listener.h"
14 #include "ui/gl/gl_bindings.h" 14 #include "ui/gl/gl_bindings.h"
15 15
16 namespace gfx { 16 namespace gl {
17 17
18 scoped_refptr<SurfaceTexture> SurfaceTexture::Create(int texture_id) { 18 scoped_refptr<SurfaceTexture> SurfaceTexture::Create(int texture_id) {
19 JNIEnv* env = base::android::AttachCurrentThread(); 19 JNIEnv* env = base::android::AttachCurrentThread();
20 return new SurfaceTexture( 20 return new SurfaceTexture(
21 Java_SurfaceTexturePlatformWrapper_create(env, texture_id)); 21 Java_SurfaceTexturePlatformWrapper_create(env, texture_id));
22 } 22 }
23 23
24 SurfaceTexture::SurfaceTexture( 24 SurfaceTexture::SurfaceTexture(
25 const base::android::ScopedJavaLocalRef<jobject>& j_surface_texture) { 25 const base::android::ScopedJavaLocalRef<jobject>& j_surface_texture) {
26 j_surface_texture_.Reset(j_surface_texture); 26 j_surface_texture_.Reset(j_surface_texture);
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 base::android::ScopedJavaLocalFrame scoped_local_reference_frame(env); 93 base::android::ScopedJavaLocalFrame scoped_local_reference_frame(env);
94 ANativeWindow* native_window = ANativeWindow_fromSurface( 94 ANativeWindow* native_window = ANativeWindow_fromSurface(
95 env, surface.j_surface().obj()); 95 env, surface.j_surface().obj());
96 return native_window; 96 return native_window;
97 } 97 }
98 98
99 bool SurfaceTexture::RegisterSurfaceTexture(JNIEnv* env) { 99 bool SurfaceTexture::RegisterSurfaceTexture(JNIEnv* env) {
100 return RegisterNativesImpl(env); 100 return RegisterNativesImpl(env);
101 } 101 }
102 102
103 } // namespace gfx 103 } // namespace gl
OLDNEW
« no previous file with comments | « ui/gl/android/surface_texture.h ('k') | ui/gl/android/surface_texture_listener.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698