Clean up the way top level navigations are handled in ChromeFrame and reporte...

chrome/renderer/render_view.cc

 // Copyright (c) 2010 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 "chrome/renderer/render_view.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 433 matching lines @@
       enabled_bindings_(0),
       send_preferred_size_changes_(false),
       script_can_close_(true),
       is_loading_(false),
       navigation_gesture_(NavigationGestureUnknown),
       opened_by_user_gesture_(true),
       opener_suppressed_(false),
       page_id_(-1),
       last_page_id_sent_to_browser_(-1),
       last_indexed_page_id_(-1),
-      last_top_level_navigation_page_id_(-1),
       history_list_offset_(-1),
       history_list_length_(0),
       has_unload_listener_(false),
 #if defined(OS_MACOSX)
       has_document_tag_(false),
 #endif
       document_tag_(0),
       cross_origin_access_count_(0),
       same_origin_access_count_(0),
       target_url_status_(TARGET_NONE),
@@ skipping 2052 matching lines @@
     const WebNode&, WebNavigationPolicy default_policy, bool is_redirect) {
   // Webkit is asking whether to navigate to a new URL.
   // This is fine normally, except if we're showing UI from one security
   // context and they're trying to navigate to a different context.
   const GURL& url = request.url();
 
   // If the browser is interested, then give it a chance to look at top level
   // navigations.
   if (renderer_preferences_.browser_handles_top_level_requests &&
       IsNonLocalTopLevelNavigation(url, frame, type)) {
-    last_top_level_navigation_page_id_ = page_id_;
     GURL referrer(request.httpHeaderField(WebString::fromUTF8("Referer")));
     OpenURL(url, referrer, default_policy);
     return WebKit::WebNavigationPolicyIgnore;  // Suppress the load here.
   }
 
   // A content initiated navigation may have originated from a link-click,
   // script, drag-n-drop operation, etc.
   bool is_content_initiated =
       NavigationState::FromDataSource(frame->provisionalDataSource())->
           is_content_initiated();
@@ skipping 2953 matching lines @@
 }
 
 bool RenderView::IsNonLocalTopLevelNavigation(
     const GURL& url, WebKit::WebFrame* frame, WebKit::WebNavigationType type) {
   // Must be a top level frame.
   if (frame->parent() != NULL)
     return false;
 
   // Navigations initiated within Webkit are not sent out to the external host
   // in the following cases.
-  // 1. The url scheme or the frame url scheme is not http/https
-  // 2. The origin of the url and the frame is the same in which case the
+  // 1. The url scheme is not http/https
+  // 2. There is no opener and this is not the first url being opened by this
+  //    RenderView.
+  // 3. The origin of the url and the opener is the same in which case the
   //    opener relationship is maintained.
-  // 3. Anchor navigation within the same page.
   // 4. Reloads/form submits/back forward navigations
   if (!url.SchemeIs("http") && !url.SchemeIs("https"))
     return false;
 
-  GURL frame_url(frame->url());
-  if (!frame_url.SchemeIs("http") && !frame_url.SchemeIs("https"))
-    return false;
-
-  // Skip if navigation is on the same page (using '#').
-  GURL frame_origin = frame_url.GetOrigin();
-  if (url.GetOrigin() != frame_origin || url.ref().empty()) {
-    // The link click could stay on the same page, in cases where it sends some
-    // parameters to the same URL.
-    if (type == WebKit::WebNavigationTypeLinkClicked)
-      return true;
-
-    if (last_top_level_navigation_page_id_ != page_id_ &&
-        // Not interested in reloads.
-        type != WebKit::WebNavigationTypeReload &&
-        type != WebKit::WebNavigationTypeFormSubmitted &&
-        type != WebKit::WebNavigationTypeBackForward) {
-      return true;
-    }
-  }
   // Not interested in reloads.
   if (type != WebKit::WebNavigationTypeReload &&
       type != WebKit::WebNavigationTypeFormSubmitted &&
       type != WebKit::WebNavigationTypeBackForward) {
     // The opener relationship between the new window and the parent allows the
     // new window to script the parent and vice versa. This is not allowed if
     // the origins of the two domains are different. This can be treated as a
     // top level navigation and routed back to the host.
     WebKit::WebFrame* opener = frame->opener();
-    if (opener) {
-      if (url.GetOrigin() != GURL(opener->url()).GetOrigin())
+    if (!opener) {
+      // If this is the first page being loaded by this RenderView instance then
+      // it should stay here.
+      if (page_id_ == -1) {
+        return false;
+      } else {
         return true;
+      }
     }
+
+    if (url.GetOrigin() != GURL(opener->url()).GetOrigin())
+      return true;
   }
   return false;
 }
 
 void RenderView::OnOpenFileSystemRequestComplete(
     int request_id, bool accepted, const string16& name,
     const string16& root_path) {
   PendingOpenFileSystem* request = pending_file_system_requests_.Lookup(
       request_id);
   DCHECK(request);
   if (accepted)
     request->callbacks->didOpenFileSystem(name, root_path);
   else
     request->callbacks->didFail(WebKit::WebFileErrorSecurity);
   request->callbacks = NULL;
   pending_file_system_requests_.Remove(request_id);
 }