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

Unified Diff: content/browser/media/android/dialog_surface_activity_mapper.cc

Issue 2178973004: DialogSurfaceManager implementation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: removed whitespace changes Created 4 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 side-by-side diff with in-line comments
Download patch
Index: content/browser/media/android/dialog_surface_activity_mapper.cc
diff --git a/content/browser/media/android/dialog_surface_activity_mapper.cc b/content/browser/media/android/dialog_surface_activity_mapper.cc
new file mode 100644
index 0000000000000000000000000000000000000000..93b8c95e303d853f5f3c14690b6f8e3ea80346f7
--- /dev/null
+++ b/content/browser/media/android/dialog_surface_activity_mapper.cc
@@ -0,0 +1,87 @@
+// Copyright 2016 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "content/browser/media/android/dialog_surface_activity_mapper.h"
+
+#include "base/android/unguessable_token_android.h"
+#include "base/lazy_instance.h"
+#include "base/threading/thread_task_runner_handle.h"
+#include "base/unguessable_token.h"
+// TODO(liberato): browser_media_player_manager only does this if !USE_AURA
+#include "content/browser/android/content_view_core_impl.h"
+#include "content/browser/frame_host/render_frame_host_impl.h"
+#include "content/public/browser/render_process_host.h"
+#include "content/public/browser/web_contents.h"
+#include "jni/DialogSurfaceActivityMapper_jni.h"
+
+static base::android::ScopedJavaGlobalRef<jobject> GetContentViewCore(
boliu 2016/11/14 16:39:24 anonymous namespace over static
liberato (no reviews please) 2016/12/20 17:16:38 Done.
+ const base::UnguessableToken& frame_token) {
+ DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
+
+ base::android::ScopedJavaGlobalRef<jobject> nullref;
boliu 2016/11/14 16:39:24 nit: return nullptr works I think
liberato (no reviews please) 2016/12/20 17:16:38 didn't know that. thanks!
+
+ // TODO(liberato): use |frame_token| to look up the RenderFrameHostImpl, and
+ // use that to get the ContentViewCore.
+ // When CVC is removed, we'll get this from the WindowAndroid.
+
+ // Get the frame from the id.
+ content::RenderFrameHostImpl* frame = nullptr;
+ // A separate CL adds content::RenderFrameHostImpl::FromFrameToken.
+ if (!frame) {
+ DVLOG(1) << "Cannot find frame for token " << frame_token;
+ return nullref;
+ }
+
+ content::WebContents* web_contents =
+ content::WebContents::FromRenderFrameHost(frame);
+ if (!web_contents) {
+ DVLOG(1) << "Cannot find web_contents for token " << frame_token;
+ return nullref;
+ }
+
+ content::ContentViewCore* cvc =
+ content::ContentViewCoreImpl::FromWebContents(web_contents);
+ if (!cvc) {
+ DVLOG(1) << "Cannot find cvc for token " << frame_token;
+ return nullref;
+ }
+
+ return base::android::ScopedJavaGlobalRef<jobject>(cvc->GetJavaObject());
+}
+
+static void PostContentViewCore(
+ const base::android::ScopedJavaGlobalRef<jobject>& frame_token_java,
+ const base::android::ScopedJavaGlobalRef<jobject>& mapper,
+ const base::android::ScopedJavaGlobalRef<jobject>& holder) {
+ JNIEnv* env = base::android::AttachCurrentThread();
+ base::UnguessableToken frame_token =
+ base::android::UnguessableTokenAndroid::FromJavaUnguessableToken(
+ env, frame_token_java);
+ base::android::ScopedJavaGlobalRef<jobject> cvc =
+ GetContentViewCore(frame_token);
+ content::Java_DialogSurfaceActivityMapper_onContentViewCore(
+ env, mapper.obj(), holder.obj(), cvc.obj());
+}
+
+namespace content {
+
+static void CallBackWithContentViewCore(
+ JNIEnv* env,
+ const base::android::JavaParamRef<jclass>& jcaller,
+ const base::android::JavaParamRef<jobject>& frame_token,
+ const base::android::JavaParamRef<jobject>& mapper,
+ const base::android::JavaParamRef<jobject>& holder) {
+ content::BrowserThread::PostTask(
+ content::BrowserThread::UI, FROM_HERE,
+ base::Bind(PostContentViewCore,
+ base::android::ScopedJavaGlobalRef<jobject>(frame_token),
+ base::android::ScopedJavaGlobalRef<jobject>(mapper),
+ base::android::ScopedJavaGlobalRef<jobject>(holder)));
+}
+
+bool RegisterDialogSurfaceActivityMapper(JNIEnv* env) {
+ return RegisterNativesImpl(env);
+}
+
+} // namespace content

Powered by Google App Engine
This is Rietveld 408576698