OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 "remoting/client/jni/jni_gl_display_handler.h" | 5 #include "remoting/client/jni/jni_gl_display_handler.h" |
6 | 6 |
7 #include <android/native_window_jni.h> | 7 #include <android/native_window_jni.h> |
8 #include <array> | 8 #include <array> |
9 | 9 |
10 #include "base/android/jni_android.h" | 10 #include "base/android/jni_android.h" |
(...skipping 28 matching lines...) Expand all Loading... |
39 } | 39 } |
40 | 40 |
41 void JniGlDisplayHandler::InitializeClient( | 41 void JniGlDisplayHandler::InitializeClient( |
42 const base::android::JavaRef<jobject>& java_client) { | 42 const base::android::JavaRef<jobject>& java_client) { |
43 return Java_GlDisplay_initializeClient(base::android::AttachCurrentThread(), | 43 return Java_GlDisplay_initializeClient(base::android::AttachCurrentThread(), |
44 java_display_, java_client); | 44 java_display_, java_client); |
45 } | 45 } |
46 | 46 |
47 std::unique_ptr<protocol::CursorShapeStub> | 47 std::unique_ptr<protocol::CursorShapeStub> |
48 JniGlDisplayHandler::CreateCursorShapeStub() { | 48 JniGlDisplayHandler::CreateCursorShapeStub() { |
49 return base::WrapUnique( | 49 return base::MakeUnique<CursorShapeStubProxy>( |
50 new CursorShapeStubProxy(weak_ptr_, runtime_->display_task_runner())); | 50 weak_ptr_, runtime_->display_task_runner()); |
51 } | 51 } |
52 | 52 |
53 std::unique_ptr<protocol::VideoRenderer> | 53 std::unique_ptr<protocol::VideoRenderer> |
54 JniGlDisplayHandler::CreateVideoRenderer() { | 54 JniGlDisplayHandler::CreateVideoRenderer() { |
55 DCHECK(runtime_->ui_task_runner()->BelongsToCurrentThread()); | 55 DCHECK(runtime_->ui_task_runner()->BelongsToCurrentThread()); |
56 DCHECK(!frame_consumer_); | 56 DCHECK(!frame_consumer_); |
57 std::unique_ptr<DualBufferFrameConsumer> consumer = | 57 std::unique_ptr<DualBufferFrameConsumer> consumer = |
58 base::WrapUnique(new DualBufferFrameConsumer( | 58 base::MakeUnique<DualBufferFrameConsumer>( |
59 base::Bind(&GlRenderer::OnFrameReceived, renderer_.GetWeakPtr()), | 59 base::Bind(&GlRenderer::OnFrameReceived, renderer_.GetWeakPtr()), |
60 runtime_->display_task_runner(), | 60 runtime_->display_task_runner(), |
61 protocol::FrameConsumer::PixelFormat::FORMAT_RGBA)); | 61 protocol::FrameConsumer::PixelFormat::FORMAT_RGBA); |
62 frame_consumer_ = consumer->GetWeakPtr(); | 62 frame_consumer_ = consumer->GetWeakPtr(); |
63 return base::WrapUnique(new SoftwareVideoRenderer(std::move(consumer))); | 63 return base::MakeUnique<SoftwareVideoRenderer>(std::move(consumer)); |
64 } | 64 } |
65 | 65 |
66 // static | 66 // static |
67 bool JniGlDisplayHandler::RegisterJni(JNIEnv* env) { | 67 bool JniGlDisplayHandler::RegisterJni(JNIEnv* env) { |
68 return RegisterNativesImpl(env); | 68 return RegisterNativesImpl(env); |
69 } | 69 } |
70 | 70 |
71 void JniGlDisplayHandler::OnSurfaceCreated( | 71 void JniGlDisplayHandler::OnSurfaceCreated( |
72 JNIEnv* env, | 72 JNIEnv* env, |
73 const base::android::JavaParamRef<jobject>& caller, | 73 const base::android::JavaParamRef<jobject>& caller, |
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
199 // static | 199 // static |
200 void JniGlDisplayHandler::ChangeCanvasSizeOnUiThread( | 200 void JniGlDisplayHandler::ChangeCanvasSizeOnUiThread( |
201 base::android::ScopedJavaGlobalRef<jobject> java_display, | 201 base::android::ScopedJavaGlobalRef<jobject> java_display, |
202 int width, | 202 int width, |
203 int height) { | 203 int height) { |
204 JNIEnv* env = base::android::AttachCurrentThread(); | 204 JNIEnv* env = base::android::AttachCurrentThread(); |
205 Java_GlDisplay_changeCanvasSize(env, java_display, width, height); | 205 Java_GlDisplay_changeCanvasSize(env, java_display, width, height); |
206 } | 206 } |
207 | 207 |
208 } // namespace remoting | 208 } // namespace remoting |
OLD | NEW |