Navigation transitions: Place transition page in same process as destination page.

content/browser/android/content_view_core_impl.cc

 // Copyright 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 "content/browser/android/content_view_core_impl.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
@@ skipping 831 matching lines @@
     jint load_url_type,
     jint transition_type,
     jstring j_referrer_url,
     jint referrer_policy,
     jint ua_override_option,
     jstring extra_headers,
     jbyteArray post_data,
     jstring base_url_for_data_url,
     jstring virtual_url_for_data_url,
     jboolean can_load_local_resources,
-    jboolean is_renderer_initiated) {
+    jboolean is_renderer_initiated,
+    jstring virtual_url_for_transition) {
   DCHECK(url);
   NavigationController::LoadURLParams params(
       GURL(ConvertJavaStringToUTF8(env, url)));
 
   params.load_type = static_cast<NavigationController::LoadURLType>(
       load_url_type);
   params.transition_type = PageTransitionFromInt(transition_type);
   params.override_user_agent =
       static_cast<NavigationController::UserAgentOverrideOption>(
           ua_override_option);
@@ skipping 18 matching lines @@
         GURL(ConvertJavaStringToUTF8(env, virtual_url_for_data_url));
   }
 
   params.can_load_local_resources = can_load_local_resources;
   if (j_referrer_url) {
     params.referrer = content::Referrer(
         GURL(ConvertJavaStringToUTF8(env, j_referrer_url)),
         static_cast<blink::WebReferrerPolicy>(referrer_policy));
   }
 
+  if (virtual_url_for_transition) {
+    params.virtual_url_for_transition =
+        GURL(ConvertJavaStringToUTF8(env, virtual_url_for_transition));
+  }
+
   params.is_renderer_initiated = is_renderer_initiated;
 
   LoadUrl(params);
 }
 
 ScopedJavaLocalRef<jstring> ContentViewCoreImpl::GetURL(
     JNIEnv* env, jobject) const {
   return ConvertUTF8ToJavaString(env, GetWebContents()->GetURL().spec());
 }
 
@@ skipping 739 matching lines @@
   if (!focused_frame)
     return;
   if (GetRenderWidgetHostViewAndroid()) {
     GetRenderWidgetHostViewAndroid()->SetTextSurroundingSelectionCallback(
         callback);
     focused_frame->Send(new FrameMsg_TextSurroundingSelectionRequest(
         focused_frame->GetRoutingID(), max_length));
   }
 }
 
-void ContentViewCoreImpl::DidDeferAfterResponseStarted() {
+void ContentViewCoreImpl::DidDeferAfterResponseStarted(
+    const GURL& transition_url) {
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj(java_ref_.get(env));
   if (obj.is_null())
     return;
-  Java_ContentViewCore_didDeferAfterResponseStarted(env, obj.obj());
+
+  ScopedJavaLocalRef<jstring> jstring_token(
+      ConvertUTF8ToJavaString(env, transition_url.spec()));
+
+  Java_ContentViewCore_didDeferAfterResponseStarted(env,
+                                                    obj.obj(),
+                                                    jstring_token.obj());
 }
 
 bool ContentViewCoreImpl::WillHandleDeferAfterResponseStarted() {
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
   if (obj.is_null())
     return false;
 
   return Java_ContentViewCore_willHandleDeferAfterResponseStarted(env,
                                                                   obj.obj());
@@ skipping 33 matching lines @@
       reinterpret_cast<ui::WindowAndroid*>(window_android),
       retained_objects_set);
   return reinterpret_cast<intptr_t>(view);
 }
 
 bool RegisterContentViewCore(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace content