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

Side by Side Diff: content/browser/android/web_contents_observer_android.cc

Issue 304763002: Trust the renderer's same-document navigation flag if it is a same-origin nav. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: isNavigationInPage->isFragmentNavigation, with caveat on the name Created 6 years, 6 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/android/web_contents_observer_android.h" 5 #include "content/browser/android/web_contents_observer_android.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include <jni.h> 9 #include <jni.h>
10 10
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 const LoadCommittedDetails& details, 122 const LoadCommittedDetails& details,
123 const FrameNavigateParams& params) { 123 const FrameNavigateParams& params) {
124 JNIEnv* env = AttachCurrentThread(); 124 JNIEnv* env = AttachCurrentThread();
125 ScopedJavaLocalRef<jobject> obj(weak_java_observer_.get(env)); 125 ScopedJavaLocalRef<jobject> obj(weak_java_observer_.get(env));
126 if (obj.is_null()) 126 if (obj.is_null())
127 return; 127 return;
128 ScopedJavaLocalRef<jstring> jstring_url( 128 ScopedJavaLocalRef<jstring> jstring_url(
129 ConvertUTF8ToJavaString(env, params.url.spec())); 129 ConvertUTF8ToJavaString(env, params.url.spec()));
130 ScopedJavaLocalRef<jstring> jstring_base_url( 130 ScopedJavaLocalRef<jstring> jstring_base_url(
131 ConvertUTF8ToJavaString(env, params.base_url.spec())); 131 ConvertUTF8ToJavaString(env, params.base_url.spec()));
132
132 // See http://crbug.com/251330 for why it's determined this way. 133 // See http://crbug.com/251330 for why it's determined this way.
133 bool in_page_navigation = 134 url::Replacements<char> replacements;
134 details.type == NAVIGATION_TYPE_IN_PAGE || details.is_in_page; 135 replacements.ClearRef();
136 bool urls_same_ignoring_fragment =
137 params.url.ReplaceComponents(replacements) ==
138 details.previous_url.ReplaceComponents(replacements);
139
140 // is_fragment_navigation is indicative of the intent of this variable.
141 // However, there isn't sufficient information here to determine whether this
142 // is actually a fragment navigation, or a history API navigation to a URL
143 // that would also be valid for a fragment navigation.
144 bool is_fragment_navigation = urls_same_ignoring_fragment &&
145 (details.type == NAVIGATION_TYPE_IN_PAGE || details.is_in_page);
135 Java_WebContentsObserverAndroid_didNavigateMainFrame( 146 Java_WebContentsObserverAndroid_didNavigateMainFrame(
136 env, obj.obj(), jstring_url.obj(), jstring_base_url.obj(), 147 env, obj.obj(), jstring_url.obj(), jstring_base_url.obj(),
137 details.is_navigation_to_different_page(), in_page_navigation); 148 details.is_navigation_to_different_page(), is_fragment_navigation);
138 } 149 }
139 150
140 void WebContentsObserverAndroid::DidNavigateAnyFrame( 151 void WebContentsObserverAndroid::DidNavigateAnyFrame(
141 const LoadCommittedDetails& details, 152 const LoadCommittedDetails& details,
142 const FrameNavigateParams& params) { 153 const FrameNavigateParams& params) {
143 JNIEnv* env = AttachCurrentThread(); 154 JNIEnv* env = AttachCurrentThread();
144 ScopedJavaLocalRef<jobject> obj(weak_java_observer_.get(env)); 155 ScopedJavaLocalRef<jobject> obj(weak_java_observer_.get(env));
145 if (obj.is_null()) 156 if (obj.is_null())
146 return; 157 return;
147 ScopedJavaLocalRef<jstring> jstring_url( 158 ScopedJavaLocalRef<jstring> jstring_url(
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
278 if (obj.is_null()) 289 if (obj.is_null())
279 return; 290 return;
280 Java_WebContentsObserverAndroid_didFirstVisuallyNonEmptyPaint( 291 Java_WebContentsObserverAndroid_didFirstVisuallyNonEmptyPaint(
281 env, obj.obj()); 292 env, obj.obj());
282 } 293 }
283 294
284 bool RegisterWebContentsObserverAndroid(JNIEnv* env) { 295 bool RegisterWebContentsObserverAndroid(JNIEnv* env) {
285 return RegisterNativesImpl(env); 296 return RegisterNativesImpl(env);
286 } 297 }
287 } // namespace content 298 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698