Implement NavigationThrottle::BLOCK_REQUEST_AND_COLLAPSE.

content/browser/frame_host/navigation_handle_impl.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/frame_host/navigation_handle_impl.h"
 
 #include <iterator>
 
 #include "base/logging.h"
 #include "content/browser/appcache/appcache_navigation_handle.h"
@@ skipping 353 matching lines @@
     RunCompleteCallback(result);
   }
 }
 
 void NavigationHandleImpl::CancelDeferredNavigation(
     NavigationThrottle::ThrottleCheckResult result) {
   DCHECK(state_ == DEFERRING_START ||
          state_ == DEFERRING_REDIRECT ||
          state_ == DEFERRING_RESPONSE);
   DCHECK(result == NavigationThrottle::CANCEL_AND_IGNORE ||
-         result == NavigationThrottle::CANCEL);
+         result == NavigationThrottle::CANCEL ||
+         result == NavigationThrottle::BLOCK_REQUEST_AND_COLLAPSE);
+  DCHECK(result != NavigationThrottle::BLOCK_REQUEST_AND_COLLAPSE ||
+         state_ == DEFERRING_START ||
+         (state_ == DEFERRING_REDIRECT && IsBrowserSideNavigationEnabled()));
+
+  if (result == NavigationThrottle::BLOCK_REQUEST_AND_COLLAPSE)
+    frame_tree_node_->SetCollapsed(true);
+
   TRACE_EVENT_ASYNC_STEP_INTO0("navigation", "NavigationHandle", this,
                                "CancelDeferredNavigation");
   state_ = CANCELING;
   RunCompleteCallback(result);
 }
 
 void NavigationHandleImpl::RegisterThrottleForTesting(
     std::unique_ptr<NavigationThrottle> navigation_throttle) {
   throttles_.push_back(std::move(navigation_throttle));
 }
@@ skipping 331 matching lines @@
   // count it as an error page.
   if (params.base_url.spec() == kUnreachableWebDataURL ||
       net_error_code_ != net::OK) {
     TRACE_EVENT_ASYNC_STEP_INTO0("navigation", "NavigationHandle", this,
                                  "DidCommitNavigation: error page");
     state_ = DID_COMMIT_ERROR_PAGE;
   } else {
     TRACE_EVENT_ASYNC_STEP_INTO0("navigation", "NavigationHandle", this,
                                  "DidCommitNavigation");
     state_ = DID_COMMIT;
+
+    // Getting this far means that the navigation was not blocked, and neither
+    // is this the error page navigation following a blocked navigation. Ensure
+    // the frame owner element is no longer collapsed as a result of a prior
+    // navigation having been blocked with BLOCK_REQUEST_AND_COLLAPSE.
+    if (!frame_tree_node()->IsMainFrame()) {
+      // Collapsed frames show an error page with |kUnreachableWebDataURL|, so a

[dcheng, 2017/05/10 06:59:46]

Nit: "show" seems like a slight misnomer, as the frame is collapsed and has no
layout tree associated with it.

[engedy, 2017/05/15 13:35:51]

Done.

+      // same-document navigation should not be possible.
+      DCHECK(!is_same_page_ || !frame_tree_node()->is_collapsed());
+      frame_tree_node()->SetCollapsed(false);
+    }
   }
 }
 
 void NavigationHandleImpl::Transfer() {
   DCHECK(!IsBrowserSideNavigationEnabled());
   // This is an actual transfer. Inform the NavigationResourceThrottle. This
   // will allow to mark the URLRequest as transferring. When it is marked as
   // transferring, the URLRequest can no longer be cancelled by its original
   // RenderFrame. Instead it will persist until being picked up by the transfer
   // RenderFrame, even if the original RenderFrame is destroyed.
@@ skipping 12 matching lines @@
     NavigationThrottle::ThrottleCheckResult result =
         throttles_[i]->WillStartRequest();
     TRACE_EVENT_ASYNC_STEP_INTO0(
         "navigation", "NavigationHandle", this,
         base::StringPrintf("CheckWillStartRequest: %s: %d",
                            throttles_[i]->GetNameForLogging(), result));
     switch (result) {
       case NavigationThrottle::PROCEED:
         continue;
 
+      case NavigationThrottle::BLOCK_REQUEST_AND_COLLAPSE:
+        frame_tree_node_->SetCollapsed(true);  // Fall through.
       case NavigationThrottle::BLOCK_REQUEST:
       case NavigationThrottle::CANCEL:
       case NavigationThrottle::CANCEL_AND_IGNORE:
         state_ = CANCELING;
         return result;
 
       case NavigationThrottle::DEFER:
         state_ = DEFERRING_START;
         next_index_ = i + 1;
         return result;
@@ skipping 18 matching lines @@
     NavigationThrottle::ThrottleCheckResult result =
         throttles_[i]->WillRedirectRequest();
     TRACE_EVENT_ASYNC_STEP_INTO0(
         "navigation", "NavigationHandle", this,
         base::StringPrintf("CheckWillRedirectRequest: %s: %d",
                            throttles_[i]->GetNameForLogging(), result));
     switch (result) {
       case NavigationThrottle::PROCEED:
         continue;
 
+      case NavigationThrottle::BLOCK_REQUEST_AND_COLLAPSE:
+        frame_tree_node_->SetCollapsed(true);  // Fall through.
       case NavigationThrottle::BLOCK_REQUEST:
         CHECK(IsBrowserSideNavigationEnabled())
-            << "BLOCK_REQUEST must not be used on redirect without PlzNavigate";
+            << "BLOCK_REQUEST and BLOCK_REQUEST_AND_COLLAPSE must not be used "
+               "on redirect without PlzNavigate";
       case NavigationThrottle::CANCEL:
       case NavigationThrottle::CANCEL_AND_IGNORE:
         state_ = CANCELING;
         return result;
 
       case NavigationThrottle::DEFER:
         state_ = DEFERRING_REDIRECT;
         next_index_ = i + 1;
         return result;
 
@@ skipping 33 matching lines @@
       case NavigationThrottle::BLOCK_RESPONSE:
         state_ = CANCELING;
         return result;
 
       case NavigationThrottle::DEFER:
         state_ = DEFERRING_RESPONSE;
         next_index_ = i + 1;
         return result;
 
       case NavigationThrottle::BLOCK_REQUEST:
+      case NavigationThrottle::BLOCK_REQUEST_AND_COLLAPSE:
         NOTREACHED();
     }
   }
   next_index_ = 0;
   state_ = WILL_PROCESS_RESPONSE;
 
   return NavigationThrottle::PROCEED;
 }
 
 bool NavigationHandleImpl::MaybeTransferAndProceed() {
@@ skipping 185 matching lines @@
     if (node->current_url().EqualsIgnoringRef(url_)) {
       if (found_self_reference)
         return true;
       found_self_reference = true;
     }
   }
   return false;
 }
 
 }  // namespace content