Navigation transitions: Plumb data from the outgoing renderer to the incoming renderer

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 1496 matching lines @@
 
 void ContentViewCoreImpl::SetHasPendingNavigationTransitionForTesting(
     JNIEnv* env,
     jobject obj) {
   RenderFrameHost* frame = static_cast<WebContentsImpl*>(GetWebContents())->
       GetMainFrame();
   BrowserThread::PostTask(
       BrowserThread::IO,
       FROM_HERE,
       base::Bind(
-          &TransitionRequestManager::SetHasPendingTransitionRequest,
+          &TransitionRequestManager::AddPendingTransitionRequestData,
           base::Unretained(TransitionRequestManager::GetInstance()),
           frame->GetProcess()->GetID(),
           frame->GetRoutingID(),
-          true));
+          "*", "", ""));
 }
 
 jint ContentViewCoreImpl::GetCurrentRenderProcessId(JNIEnv* env, jobject obj) {
   return GetRenderProcessIdFromRenderViewHost(
       web_contents_->GetRenderViewHost());
 }
 
 void ContentViewCoreImpl::SetBackgroundOpaque(JNIEnv* env, jobject jobj,
     jboolean opaque) {
   if (GetRenderWidgetHostViewAndroid())
     GetRenderWidgetHostViewAndroid()->SetBackgroundOpaque(opaque);
 }
 
+void ContentViewCoreImpl::SetupTransitionView(
+    JNIEnv* env, jobject jobj, jstring markup) {
+  if (!GetWebContents()) return;
+  GetWebContents()->GetMainFrame()->Send(new FrameMsg_SetupTransitionView(
+      GetWebContents()->GetMainFrame()->GetRoutingID(),
+      ConvertJavaStringToUTF8(env, markup)));
+}
+
+void ContentViewCoreImpl::BeginExitTransition(
+    JNIEnv* env, jobject jobj, jstring css_selector) {
+  if (!GetWebContents()) return;
+  GetWebContents()->GetMainFrame()->Send(new FrameMsg_BeginExitTransition(
+      GetWebContents()->GetMainFrame()->GetRoutingID(),
+      ConvertJavaStringToUTF8(env, css_selector)));
+}
+
 void ContentViewCoreImpl::RequestTextSurroundingSelection(
     int max_length,
     const base::Callback<
         void(const base::string16& content, int start_offset, int end_offset)>&
         callback) {
   DCHECK(!callback.is_null());
   RenderFrameHost* focused_frame = web_contents_->GetFocusedFrame();
   if (!focused_frame)
     return;
   if (GetRenderWidgetHostViewAndroid()) {
     GetRenderWidgetHostViewAndroid()->SetTextSurroundingSelectionCallback(
         callback);
     focused_frame->Send(new FrameMsg_TextSurroundingSelectionRequest(
         focused_frame->GetRoutingID(), max_length));
   }
 }
 
 void ContentViewCoreImpl::DidDeferAfterResponseStarted(
-    const scoped_refptr<net::HttpResponseHeaders>& headers,
-    const GURL& url) {
+    const TransitionLayerData& transition_data) {
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj(java_ref_.get(env));
   if (obj.is_null())
     return;
 
   std::vector<GURL> entering_stylesheets;
   std::string transition_color;
-  if (headers) {
+  if (transition_data.response_headers) {
     TransitionRequestManager::ParseTransitionStylesheetsFromHeaders(
-        headers, entering_stylesheets, url);
+        transition_data.response_headers, entering_stylesheets,
+        transition_data.request_url);
 
-    headers->EnumerateHeader(
+    transition_data.response_headers->EnumerateHeader(
         NULL, "X-Transition-Entering-Color", &transition_color);
   }
 
+  ScopedJavaLocalRef<jstring> jstring_markup(ConvertUTF8ToJavaString(
+      env, transition_data.markup));
+
+  ScopedJavaLocalRef<jstring> jstring_css_selector(ConvertUTF8ToJavaString(
+      env, transition_data.css_selector));
+
   ScopedJavaLocalRef<jstring> jstring_transition_color(ConvertUTF8ToJavaString(
       env, transition_color));
 
   Java_ContentViewCore_didDeferAfterResponseStarted(
-      env, obj.obj(), jstring_transition_color.obj());
+      env, obj.obj(), jstring_markup.obj(), jstring_css_selector.obj(),
+      jstring_transition_color.obj());
 
   std::vector<GURL>::const_iterator iter = entering_stylesheets.begin();
   for (; iter != entering_stylesheets.end(); ++iter) {
     ScopedJavaLocalRef<jstring> jstring_url(ConvertUTF8ToJavaString(
         env, iter->spec()));
     Java_ContentViewCore_addEnteringStylesheetToTransition(
         env, obj.obj(), jstring_url.obj());
   }
 }
 
@@ skipping 52 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