Remove Navigation Transitions from Chromium

content/browser/loader/cross_site_resource_handler.cc

 // Copyright (c) 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/loader/cross_site_resource_handler.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "content/browser/appcache/appcache_interceptor.h"
 #include "content/browser/child_process_security_policy_impl.h"
 #include "content/browser/frame_host/cross_site_transferring_request.h"
 #include "content/browser/frame_host/render_frame_host_impl.h"
 #include "content/browser/loader/resource_dispatcher_host_impl.h"
 #include "content/browser/loader/resource_request_info_impl.h"
 #include "content/browser/site_instance_impl.h"
-#include "content/browser/transition_request_manager.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/global_request_id.h"
 #include "content/public/browser/resource_controller.h"
 #include "content/public/browser/site_instance.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/resource_response.h"
 #include "content/public/common/url_constants.h"
 #include "net/http/http_response_headers.h"
 #include "net/url_request/url_request.h"
@@ skipping 49 matching lines @@
         params.global_request_id, cross_site_transferring_request.Pass(),
         params.transfer_url_chain, params.referrer,
         params.page_transition, params.should_replace_current_entry);
   } else if (leak_requests_for_testing_ && cross_site_transferring_request) {
     // Some unit tests expect requests to be leaked in this case, so they can
     // pass them along manually.
     cross_site_transferring_request->ReleaseRequest();
   }
 }
 
-void OnDeferredAfterResponseStartedHelper(
-    const GlobalRequestID& global_request_id,
-    int render_frame_id,
-    const TransitionLayerData& transition_data) {
-  RenderFrameHostImpl* rfh =
-      RenderFrameHostImpl::FromID(global_request_id.child_id, render_frame_id);
-  if (rfh)
-    rfh->OnDeferredAfterResponseStarted(global_request_id, transition_data);
-}
-
 // Returns whether a transfer is needed by doing a check on the UI thread.
 bool CheckNavigationPolicyOnUI(GURL url, int process_id, int render_frame_id) {
   CHECK(base::CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kSitePerProcess));
   RenderFrameHostImpl* rfh =
       RenderFrameHostImpl::FromID(process_id, render_frame_id);
   if (!rfh)
     return false;
 
   // A transfer is not needed if the current SiteInstance doesn't yet have a
@@ skipping 40 matching lines @@
     ResourceResponse* response,
     bool* defer) {
   response_ = response;
   has_started_response_ = true;
 
   // Store this handler on the ExtraRequestInfo, so that RDH can call our
   // ResumeResponse method when we are ready to resume.
   ResourceRequestInfoImpl* info = GetRequestInfo();
   info->set_cross_site_handler(this);
 
-  TransitionLayerData transition_data;
-  bool is_navigation_transition =
-      TransitionRequestManager::GetInstance()->GetPendingTransitionRequest(
-          info->GetChildID(), info->GetRenderFrameID(), request()->url(),
-          &transition_data);
-
-  if (is_navigation_transition) {
-    if (response_.get())
-      transition_data.response_headers = response_->head.headers;
-    transition_data.request_url = request()->url();
-
-    return OnNavigationTransitionResponseStarted(response, defer,
-                                                 transition_data);
-  } else {
-    return OnNormalResponseStarted(response, defer);
-  }
+  return OnNormalResponseStarted(response, defer);
 }
 
 bool CrossSiteResourceHandler::OnNormalResponseStarted(
     ResourceResponse* response,
     bool* defer) {
   // At this point, we know that the response is safe to send back to the
   // renderer: it is not a download, and it has passed the SSL and safe
   // browsing checks.
   // We should not have already started the transition before now.
   DCHECK(!in_cross_site_transition_);
@@ skipping 49 matching lines @@
   // pause to let the UI thread set up the transfer.
   StartCrossSiteTransition(response);
 
   // Defer loading until after the new renderer process has issued a
   // corresponding request.
   *defer = true;
   OnDidDefer();
   return true;
 }
 
-bool CrossSiteResourceHandler::OnNavigationTransitionResponseStarted(
-    ResourceResponse* response,
-    bool* defer,
-    const TransitionLayerData& transition_data) {
-  ResourceRequestInfoImpl* info = GetRequestInfo();
-
-  GlobalRequestID global_id(info->GetChildID(), info->GetRequestID());
-  int render_frame_id = info->GetRenderFrameID();
-  BrowserThread::PostTask(
-      BrowserThread::UI,
-      FROM_HERE,
-      base::Bind(
-          &OnDeferredAfterResponseStartedHelper,
-          global_id,
-          render_frame_id,
-          transition_data));
-
-  *defer = true;
-  OnDidDefer();
-  return true;
-}
-
-void CrossSiteResourceHandler::ResumeResponseDeferredAtStart(int request_id) {
-  bool defer = false;
-  if (!OnNormalResponseStarted(response_.get(), &defer)) {
-    controller()->Cancel();
-  } else if (!defer) {
-    ResumeIfDeferred();
-  }
-}
-
 void CrossSiteResourceHandler::ResumeOrTransfer(bool is_transfer) {
   if (is_transfer) {
     StartCrossSiteTransition(response_.get());
   } else {
     ResumeResponse();
   }
 }
 
 bool CrossSiteResourceHandler::OnReadCompleted(int bytes_read, bool* defer) {
   CHECK(!in_cross_site_transition_);
@@ skipping 144 matching lines @@
     controller()->Resume();
   }
 }
 
 void CrossSiteResourceHandler::OnDidDefer() {
   did_defer_ = true;
   request()->LogBlockedBy("CrossSiteResourceHandler");
 }
 
 }  // namespace content