[Android WebView] AwContentsClient.shouldCreate window callback part 2.

android_webview/native/aw_contents.cc

 // Copyright (c) 2012 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 "android_webview/native/aw_contents.h"
 
 #include "android_webview/browser/aw_browser_main_parts.h"
 #include "android_webview/browser/net_disk_cache_remover.h"
 #include "android_webview/browser/renderer_host/aw_render_view_host_ext.h"
+#include "android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.h"
 #include "android_webview/common/aw_hit_test_data.h"
 #include "android_webview/native/aw_browser_dependency_factory.h"
 #include "android_webview/native/aw_contents_io_thread_client_impl.h"
 #include "android_webview/native/aw_web_contents_delegate.h"
 #include "android_webview/native/state_serializer.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/pickle.h"
 #include "base/supports_user_data.h"
 #include "content/components/navigation_interception/intercept_navigation_delegate.h"
 #include "content/public/browser/android/content_view_core.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/cert_store.h"
 #include "content/public/browser/navigation_entry.h"
+#include "content/public/browser/render_process_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/ssl_status.h"
 #include "jni/AwContents_jni.h"
 #include "net/base/x509_certificate.h"
 
 using base::android::AttachCurrentThread;
 using base::android::ConvertJavaStringToUTF16;
 using base::android::ConvertJavaStringToUTF8;
 using base::android::ConvertUTF16ToJavaString;
 using base::android::ConvertUTF8ToJavaString;
@@ skipping 82 matching lines @@
                        bool private_browsing)
     : java_ref_(env, obj),
       web_contents_delegate_(
           new AwWebContentsDelegate(env, web_contents_delegate)),
       view_visible_(false),
       compositor_visible_(false),
       is_composite_pending_(false) {
   android_webview::AwBrowserDependencyFactory* dependency_factory =
       android_webview::AwBrowserDependencyFactory::GetInstance();
 
-  web_contents_.reset(dependency_factory->CreateWebContents(private_browsing));
+  SetWebContents(dependency_factory->CreateWebContents(private_browsing));

[joth, 2012/11/29 21:02:33]

I think it will be clearer to move all this to java. Suggest:

TODO(joth): rather than create and set the WebContents here, expose the factory
method to java side and have that orchestrate the construction order

[benm (inactive), 2012/11/30 12:54:18]

Done.

+}
 
-  DCHECK(!AwContents::FromWebContents(web_contents_.get()));
+void AwContents::SetWebContents(content::WebContents* web_contents) {
+  web_contents_.reset(web_contents);
   web_contents_->SetUserData(kAwContentsUserDataKey,
                              new AwContentsUserData(this));
 
   web_contents_->SetDelegate(web_contents_delegate_.get());
   render_view_host_ext_.reset(new AwRenderViewHostExt(web_contents_.get()));
   if (UseCompositorDirectDraw()) {
     compositor_.reset(content::Compositor::Create(this));
   } else {
     LOG(WARNING) << "Running on unsupported device: using null Compositor";
     compositor_.reset(new NullCompositor);
   }
 }
 
+void AwContents::SetWebContents(JNIEnv* env, jobject obj, jint new_wc) {
+  SetWebContents(reinterpret_cast<content::WebContents*>(new_wc));
+}
+
 AwContents::~AwContents() {
   DCHECK(AwContents::FromWebContents(web_contents_.get()) == this);
   web_contents_->RemoveUserData(kAwContentsUserDataKey);
   if (find_helper_.get())
     find_helper_->SetListener(NULL);
 }
 
 void AwContents::DrawGL(AwDrawGLInfo* draw_info) {
   // TODO(joth): Use the |draw_info| parameters.
   DLOG(INFO) << "Unimplemented AwContents::DrawGL params"
@@ skipping 140 matching lines @@
   ScopedJavaLocalRef<jstring> jrealm = ConvertUTF8ToJavaString(env, realm);
   Java_AwContents_onReceivedHttpAuthRequest(env, java_ref_.get(env).obj(),
                                             handler.obj(), jhost.obj(),
                                             jrealm.obj());
 }
 
 void AwContents::SetIoThreadClient(JNIEnv* env, jobject obj, jobject client) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   AwContentsIoThreadClientImpl::Associate(
       web_contents_.get(), ScopedJavaLocalRef<jobject>(env, client));
+  int child_id = web_contents_->GetRenderProcessHost()->GetID();
+  int route_id = web_contents_->GetRoutingID();
+  AwResourceDispatcherHostDelegate::OnIoThreadClientReady(child_id, route_id);
 }
 
 void AwContents::SetInterceptNavigationDelegate(JNIEnv* env,
                                                 jobject obj,
                                                 jobject delegate) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   InterceptNavigationDelegate::Associate(
       web_contents_.get(),
       make_scoped_ptr(new InterceptNavigationDelegate(env, delegate)));
 }
@@ skipping 190 matching lines @@
   std::vector<uint8> state_vector;
   base::android::JavaByteArrayToByteVector(env, state, &state_vector);
 
   Pickle pickle(reinterpret_cast<const char*>(state_vector.begin()),
                 state_vector.size());
   PickleIterator iterator(pickle);
 
   return RestoreFromPickle(&iterator, web_contents_.get());
 }
 
+void AwContents::SetPendingWebContentsForPopup(
+    scoped_ptr<content::WebContents> pending) {
+  if (pending_contents_.get()) {
+    // TODO(benm): Support holding multiple pop up window requests.
+    LOG(WARNING) << "Blocking popup window creation as an outstanding "
+                 << "popup window is still pending.";
+    return;

[joth, 2012/11/29 21:02:33]

This will delete |pending|. Snag is both AwWebContentsDelegate and
WebContentsImpl may call methods on it after this method returns. So I think we
need
MessageLoop::current()->DeleteSoon(pending.release());

[benm (inactive), 2012/11/30 12:54:18]

Good point.

+  }
+  pending_contents_ = pending.Pass();
+}
+
+jint AwContents::ReleasePopupWebContents(JNIEnv* env, jobject obj) {
+  return reinterpret_cast<jint>(pending_contents_.release());
+}
+
 }  // namespace android_webview