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

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: DialogSurfaceManager.java => DialogSurfaceManagerImpl.java and stopped using activity for window to… 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..06a63e67201ae5dfceef0f6c0d8a1a88c15d2a47
--- /dev/null
+++ b/content/browser/media/android/dialog_surface_activity_mapper.cc
@@ -0,0 +1,96 @@
+// 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/lazy_instance.h"
+#include "base/threading/thread_task_runner_handle.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(JNIEnv* env, jint renderer_pid, jint render_frame_id) {
boliu 2016/11/04 00:07:19 we'd like to remove ContentViewCore, and then foll
liberato (no reviews please) 2016/11/11 21:52:35 CVC: once CVC goes away, i'm assuming that a Rende
+ base::android::ScopedJavaGlobalRef<jobject> nullref;
+
+ // Get the id from the handle. On android, the handle is the pid.
+ content::RenderProcessHost::iterator it =
+ content::RenderProcessHost::AllHostsIterator();
boliu 2016/11/04 00:07:19 DCHECK this is on UI thread?
liberato (no reviews please) 2016/11/11 21:52:35 Done.
+ int render_process_id = 0;
+ while (!it.IsAtEnd()) {
+ if (it.GetCurrentValue()->GetHandle() == renderer_pid) {
+ render_process_id = it.GetCurrentValue()->GetID();
+ break;
+ }
+ it.Advance();
+ }
+ if (!render_process_id) {
+ DVLOG(1) << "Cannot find render process for renderer_pid " << renderer_pid;
+ return nullref;
+ }
+
+ // Get the frame from the id.
+ content::RenderFrameHostImpl* frame =
+ content::RenderFrameHostImpl::FromID(render_process_id, render_frame_id);
+ if (!frame) {
+ DVLOG(1) << "Cannot find frame for renderer_pid " << renderer_pid
+ << " render_frame_id " << render_frame_id;
+ return nullref;
+ }
+
+ content::WebContents* web_contents =
+ content::WebContents::FromRenderFrameHost(frame);
+ if (!web_contents) {
+ DVLOG(1) << "Cannot find web_contents for renderer_pid " << renderer_pid
+ << " render_frame_id " << render_frame_id;
+ return nullref;
+ }
+
+ content::ContentViewCore* cvc =
+ content::ContentViewCoreImpl::FromWebContents(web_contents);
+ if (!cvc) {
+ DVLOG(1) << "Cannot find cvc for renderer_pid " << renderer_pid
+ << " render_frame_id " << render_frame_id;
+ return nullref;
+ }
+
+ return base::android::ScopedJavaGlobalRef<jobject>(cvc->GetJavaObject());
+}
+
+static void PostContentViewCore(
+ jint renderer_pid,
+ jint render_frame_id,
+ const base::android::ScopedJavaGlobalRef<jobject>& mapper,
+ const base::android::ScopedJavaGlobalRef<jobject>& holder) {
+ JNIEnv* env = base::android::AttachCurrentThread();
+ base::android::ScopedJavaGlobalRef<jobject> cvc =
+ GetContentViewCore(env, renderer_pid, render_frame_id);
+ Java_DialogSurfaceActivityMapper_onContentViewCore(env, mapper.obj(),
+ holder.obj(), cvc.obj());
+}
+
+static void CallBackWithContentViewCore(
+ JNIEnv* env,
+ const base::android::JavaParamRef<jclass>& jcaller,
+ jint renderer_pid,
+ jint render_frame_id,
+ const base::android::JavaParamRef<jobject>& mapper,
+ const base::android::JavaParamRef<jobject>& holder) {
+ content::BrowserThread::PostTask(
+ content::BrowserThread::UI, FROM_HERE,
+ base::Bind(PostContentViewCore, renderer_pid, render_frame_id,
+ base::android::ScopedJavaGlobalRef<jobject>(mapper),
+ base::android::ScopedJavaGlobalRef<jobject>(holder)));
+}
+
+namespace content {
+
+bool RegisterDialogSurfaceActivityMapper(JNIEnv* env) {
+ return RegisterNativesImpl(env);
+}
+
+} // namespace content

Powered by Google App Engine
This is Rietveld 408576698