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

Side by Side Diff: android_webview/native/external_video_surface_container_impl.h

Issue 1067023005: Null check ContentViewCore::GetJavaObject (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix chromecast build Created 5 years, 8 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 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 #ifndef ANDROID_WEBVIEW_NATIVE_EXTERNAL_VIDEO_SURFACE_CONTAINER_IMPL_H_ 5 #ifndef ANDROID_WEBVIEW_NATIVE_EXTERNAL_VIDEO_SURFACE_CONTAINER_IMPL_H_
6 #define ANDROID_WEBVIEW_NATIVE_EXTERNAL_VIDEO_SURFACE_CONTAINER_IMPL_H_ 6 #define ANDROID_WEBVIEW_NATIVE_EXTERNAL_VIDEO_SURFACE_CONTAINER_IMPL_H_
7 7
8 #include <jni.h> 8 #include <jni.h>
9 9
10 #include "base/android/scoped_java_ref.h" 10 #include "base/android/scoped_java_ref.h"
11 #include "base/callback.h" 11 #include "base/callback.h"
12 #include "base/compiler_specific.h" 12 #include "base/compiler_specific.h"
13 #include "content/public/browser/android/external_video_surface_container.h" 13 #include "content/public/browser/android/external_video_surface_container.h"
14 14
15 namespace android_webview { 15 namespace android_webview {
16 16
17 class ExternalVideoSurfaceContainerImpl 17 class ExternalVideoSurfaceContainerImpl
18 : public content::ExternalVideoSurfaceContainer { 18 : public content::ExternalVideoSurfaceContainer {
19 public: 19 public:
20 typedef base::Callback<void(int, jobject)> SurfaceCreatedCB; 20 typedef base::Callback<void(int, jobject)> SurfaceCreatedCB;
21 typedef base::Callback<void(int)> SurfaceDestroyedCB; 21 typedef base::Callback<void(int)> SurfaceDestroyedCB;
22 22
23 ExternalVideoSurfaceContainerImpl(content::WebContents* contents); 23 static ExternalVideoSurfaceContainerImpl* Create(
24 content::WebContents* web_contents);
24 25
25 // ExternalVideoSurfaceContainer implementation. 26 // ExternalVideoSurfaceContainer implementation.
26 void RequestExternalVideoSurface( 27 void RequestExternalVideoSurface(
27 int player_id, 28 int player_id,
28 const SurfaceCreatedCB& surface_created_cb, 29 const SurfaceCreatedCB& surface_created_cb,
29 const SurfaceDestroyedCB& surface_destroyed_cb) override; 30 const SurfaceDestroyedCB& surface_destroyed_cb) override;
30 int GetCurrentPlayerId() override; 31 int GetCurrentPlayerId() override;
31 void ReleaseExternalVideoSurface(int player_id) override; 32 void ReleaseExternalVideoSurface(int player_id) override;
32 void OnFrameInfoUpdated() override; 33 void OnFrameInfoUpdated() override;
33 void OnExternalVideoSurfacePositionChanged(int player_id, 34 void OnExternalVideoSurfacePositionChanged(int player_id,
34 const gfx::RectF& rect) override; 35 const gfx::RectF& rect) override;
35 36
36 // Methods called from Java. 37 // Methods called from Java.
37 void SurfaceCreated( 38 void SurfaceCreated(
38 JNIEnv* env, jobject obj, jint player_id, jobject jsurface); 39 JNIEnv* env, jobject obj, jint player_id, jobject jsurface);
39 void SurfaceDestroyed(JNIEnv* env, jobject obj, jint player_id); 40 void SurfaceDestroyed(JNIEnv* env, jobject obj, jint player_id);
40 41
41 private: 42 private:
43 explicit ExternalVideoSurfaceContainerImpl(
44 base::android::ScopedJavaLocalRef<jobject> java_content_view_core);
42 ~ExternalVideoSurfaceContainerImpl() override; 45 ~ExternalVideoSurfaceContainerImpl() override;
43 46
44 base::android::ScopedJavaGlobalRef<jobject> jobject_; 47 base::android::ScopedJavaGlobalRef<jobject> jobject_;
45 48
46 SurfaceCreatedCB surface_created_cb_; 49 SurfaceCreatedCB surface_created_cb_;
47 SurfaceDestroyedCB surface_destroyed_cb_; 50 SurfaceDestroyedCB surface_destroyed_cb_;
48 51
49 DISALLOW_COPY_AND_ASSIGN(ExternalVideoSurfaceContainerImpl); 52 DISALLOW_COPY_AND_ASSIGN(ExternalVideoSurfaceContainerImpl);
50 }; 53 };
51 54
52 bool RegisterExternalVideoSurfaceContainer(JNIEnv* env); 55 bool RegisterExternalVideoSurfaceContainer(JNIEnv* env);
53 56
54 } // namespace android_webview 57 } // namespace android_webview
55 58
56 #endif // ANDROID_WEBVIEW_NATIVE_EXTERNAL_VIDEO_SURFACE_CONTAINER_IMPL_H_ 59 #endif // ANDROID_WEBVIEW_NATIVE_EXTERNAL_VIDEO_SURFACE_CONTAINER_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698