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

Unified Diff: content/browser/android/dialog_overlay_operations_impl.cc

Issue 2765443004: AndroidOverlay implementation using Dialog. (Closed)
Patch Set: rebased onto gpu_surface_tracker Created 3 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 side-by-side diff with in-line comments
Download patch
Index: content/browser/android/dialog_overlay_operations_impl.cc
diff --git a/content/browser/android/dialog_overlay_operations_impl.cc b/content/browser/android/dialog_overlay_operations_impl.cc
new file mode 100644
index 0000000000000000000000000000000000000000..d08b0c97eef8b10c8b25ff3931db46d06d477cfa
--- /dev/null
+++ b/content/browser/android/dialog_overlay_operations_impl.cc
@@ -0,0 +1,159 @@
+// Copyright 2017 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/android/dialog_overlay_operations_impl.h"
+
+#include "content/public/browser/web_contents.h"
+#include "gpu/ipc/common/gpu_surface_tracker.h"
+#include "jni/DialogOverlayOperationsImpl_jni.h"
+#include "ui/android/window_android.h"
+
+using base::android::AttachCurrentThread;
+using base::android::JavaParamRef;
+using base::android::ScopedJavaLocalRef;
+
+namespace content {
+
+// static
+bool DialogOverlayOperationsImpl::RegisterDialogOverlayOperationsImpl(
+ JNIEnv* env) {
+ return RegisterNativesImpl(env);
+}
+
+static jlong RegisterForTokens(JNIEnv* env,
+ const JavaParamRef<jobject>& obj,
+ jlong high,
+ jlong low) {
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
+ return reinterpret_cast<jlong>(new DialogOverlayOperationsImpl(
+ obj, base::UnguessableToken::Deserialize(high, low)));
+}
+
+static void UnregisterForTokens(
+ JNIEnv* env,
+ const base::android::JavaParamRef<jclass>& jcaller,
+ jlong handle) {
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
+
+ DialogOverlayOperationsImpl* impl =
+ reinterpret_cast<DialogOverlayOperationsImpl*>(handle);
+ if (!impl)
boliu 2017/04/22 00:22:43 check redundant with java side one
liberato (no reviews please) 2017/04/24 22:19:41 Done.
+ return;
+
+ // Make sure that no tokens are sent after this, even though destruction will
+ // be deferred.
+ impl->UnregisterForTokensIfNeeded();
+
+ // We delete soon since this might be part of an onDismissed callback.
+ BrowserThread::DeleteSoon(BrowserThread::UI, FROM_HERE, impl);
+}
+
+DialogOverlayOperationsImpl::DialogOverlayOperationsImpl(
+ const JavaParamRef<jobject>& receiver,
+ const base::UnguessableToken& token)
+ : receiver_(receiver), token_(token), cvc_(nullptr) {
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
+ cvc_ = GetContentViewCore();
+
+ // If there's no CVC, then just post a null token immediately.
+ if (!cvc_) {
+ JNIEnv* env = AttachCurrentThread();
+ Java_DialogOverlayOperationsImpl_onDismissed(env, receiver_.obj());
+ return;
+ }
+
+ cvc_->AddObserver(this);
+
+ // Also send the initial token, since we'll only get changes.
+ if (ui::WindowAndroid* window = cvc_->GetWindowAndroid()) {
+ ScopedJavaLocalRef<jobject> token = window->GetWindowToken();
+ if (!token.is_null()) {
+ JNIEnv* env = AttachCurrentThread();
+ Java_DialogOverlayOperationsImpl_onWindowToken(env, receiver_.obj(),
+ token);
+ }
+ }
+}
+
+DialogOverlayOperationsImpl::~DialogOverlayOperationsImpl() {
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
+ UnregisterForTokensIfNeeded();
boliu 2017/04/22 00:22:42 DCHECK(!cvc_) instead?
liberato (no reviews please) 2017/04/24 22:19:41 Done.
+}
+
+void DialogOverlayOperationsImpl::UnregisterForTokensIfNeeded() {
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
+ if (!cvc_)
+ return;
+
+ cvc_->RemoveObserver(this);
+ cvc_ = nullptr;
+}
+
+void DialogOverlayOperationsImpl::OnContentViewCoreDestroyed() {
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
+ cvc_ = nullptr;
+
+ JNIEnv* env = AttachCurrentThread();
+ Java_DialogOverlayOperationsImpl_onDismissed(env, receiver_.obj());
+}
+
+void DialogOverlayOperationsImpl::OnAttachedToWindow() {
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
+ JNIEnv* env = AttachCurrentThread();
+
+ ScopedJavaLocalRef<jobject> token;
+
+ if (ui::WindowAndroid* window = cvc_->GetWindowAndroid())
+ token = window->GetWindowToken();
+
+ Java_DialogOverlayOperationsImpl_onWindowToken(env, receiver_.obj(), token);
+}
+
+void DialogOverlayOperationsImpl::OnDetachedFromWindow() {
+ JNIEnv* env = AttachCurrentThread();
+ Java_DialogOverlayOperationsImpl_onWindowToken(env, receiver_.obj(), nullptr);
+}
+
+ContentViewCoreImpl* DialogOverlayOperationsImpl::GetContentViewCore() {
+ // Get the frame from the token.
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
+ content::RenderFrameHost* frame =
+ content::RenderFrameHostImpl::FromOverlayRoutingToken(token_);
+ if (!frame) {
+ DVLOG(1) << "Cannot find frame host for token " << token_;
+ return nullptr;
+ }
+
+ content::WebContents* web_contents =
+ content::WebContents::FromRenderFrameHost(frame);
+ DCHECK(web_contents);
+
+ content::ContentViewCoreImpl* cvc =
+ content::ContentViewCoreImpl::FromWebContents(web_contents);
+ if (!cvc) {
+ DVLOG(1) << "Cannot find cvc for token " << token_;
+ return nullptr;
+ }
+
+ return cvc;
+}
+
+static jint RegisterSurface(JNIEnv* env,
+ const base::android::JavaParamRef<jclass>& jcaller,
+ const JavaParamRef<jobject>& surface) {
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
+ return gpu::GpuSurfaceTracker::Get()->AddSurfaceForNativeWidget(
+ gpu::GpuSurfaceTracker::SurfaceRecord(gfx::kNullAcceleratedWidget,
+ surface.obj()));
+}
+
+static void UnregisterSurface(
+ JNIEnv* env,
+ const base::android::JavaParamRef<jclass>& jcaller,
+ jint surface_id) {
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
+ gpu::GpuSurfaceTracker::Get()->RemoveSurface(surface_id);
+}
+
+} // namespace content

Powered by Google App Engine
This is Rietveld 408576698