Store and use last base URL between DidStart / DidStopLoading

content/browser/android/web_contents_observer_proxy.cc

 // Copyright 2015 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/web_contents_observer_proxy.h"
 
 #include <string>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
@@ skipping 75 matching lines @@
   Java_WebContentsObserverProxy_didFinishNavigation(
       env, obj.obj(), navigation_handle->IsInMainFrame(),
       navigation_handle->IsErrorPage(), navigation_handle->HasCommitted());
 }
 
 void WebContentsObserverProxy::DidStartLoading() {
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj(java_observer_);
   ScopedJavaLocalRef<jstring> jstring_url(
       ConvertUTF8ToJavaString(env, web_contents()->GetVisibleURL().spec()));
+  if (auto entry = web_contents()->GetController().GetPendingEntry()) {

[boliu, 2016/03/14 18:34:04]

auto* ? Actually style guide doesn't really say anything about that..

[mnaganov (inactive), 2016/03/14 20:10:57]

I don't think it makes any difference here.

+    base_url_of_last_started_data_url_ = entry->GetBaseURLForDataURL();
+  }
   Java_WebContentsObserverProxy_didStartLoading(env, obj.obj(),
                                                 jstring_url.obj());
 }
 
 void WebContentsObserverProxy::DidStopLoading() {
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj(java_observer_);
   std::string url_string = web_contents()->GetLastCommittedURL().spec();
   SetToBaseURLForDataURLIfNeeded(&url_string);
+  base_url_of_last_started_data_url_ = GURL::EmptyGURL();
   ScopedJavaLocalRef<jstring> jstring_url(ConvertUTF8ToJavaString(
       env, url_string));
   Java_WebContentsObserverProxy_didStopLoading(env, obj.obj(),
                                                jstring_url.obj());
 }
 
 void WebContentsObserverProxy::DidFailProvisionalLoad(
     RenderFrameHost* render_frame_host,
     const GURL& validated_url,
     int error_code,
@@ skipping 99 matching lines @@
       env, obj.obj(), render_frame_host->GetRoutingID(),
       !render_frame_host->GetParent(), jstring_url.obj(), transition_type);
 }
 
 void WebContentsObserverProxy::DidFinishLoad(RenderFrameHost* render_frame_host,
                                              const GURL& validated_url) {
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj(java_observer_);
 
   std::string url_string = validated_url.spec();
   SetToBaseURLForDataURLIfNeeded(&url_string);

[boliu, 2016/03/14 18:34:04]

so iiuc DidFinishLoad is actually fired *between* DidStartLoading and
DidStopLoading? That should live in a comment somewhere imo

[mnaganov (inactive), 2016/03/14 20:10:57]

For a long time actually. See the description of
https://codereview.chromium.org/1432083004. This is documented by the code of
AwWebContentsObserver.java. 

[boliu, 2016/03/14 20:24:53]

I mean that comment should live around where base_url_of_last_started_data_url_,
or maybe in SetToBaseURLForDataURLIfNeeded. Not totally obvious that this
affects DidFinishLoad as well.

[mnaganov (inactive), 2016/03/14 20:28:51]

Done.

 
   ScopedJavaLocalRef<jstring> jstring_url(
       ConvertUTF8ToJavaString(env, url_string));
   Java_WebContentsObserverProxy_didFinishLoad(
       env, obj.obj(), render_frame_host->GetRoutingID(), jstring_url.obj(),
       !render_frame_host->GetParent());
 }
 
 void WebContentsObserverProxy::DocumentLoadedInFrame(
     RenderFrameHost* render_frame_host) {
@@ skipping 75 matching lines @@
 
   Java_WebContentsObserverProxy_mediaSessionStateChanged(
       env, obj.obj(), is_controllable, is_suspended);
 }
 
 void WebContentsObserverProxy::SetToBaseURLForDataURLIfNeeded(
     std::string* url) {
   NavigationEntry* entry =
       web_contents()->GetController().GetLastCommittedEntry();
   // Note that GetBaseURLForDataURL is only used by the Android WebView.
-  if (entry && !entry->GetBaseURLForDataURL().is_empty())
+  if (entry && !entry->GetBaseURLForDataURL().is_empty()) {
     *url = entry->GetBaseURLForDataURL().possibly_invalid_spec();
+  } else if (!base_url_of_last_started_data_url_.is_empty()) {
+    // NavigationController can lose the pending entry and recreate it without
+    // a base URL if there has been a loadUrl("javascript:...") after
+    // loadDataWithBaseUrl.
+    *url = base_url_of_last_started_data_url_.possibly_invalid_spec();
+  }
 }
 
 bool RegisterWebContentsObserverProxy(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 }  // namespace content