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 337 matching lines @@
   if (result != NavigationThrottle::DEFER)
     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);

[alexmos, 2017/04/11 06:00:29]

Please update the comments on CancelDeferredNavigation in navigation_handle.h to
include BLOCK_REQUEST_AND_COLLAPSE

[engedy, 2017/04/11 08:06:16]

Done.

+  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);
+
   state_ = CANCELING;
   RunCompleteCallback(result);
 }
 
 void NavigationHandleImpl::RegisterThrottleForTesting(
     std::unique_ptr<NavigationThrottle> navigation_throttle) {
   throttles_.push_back(std::move(navigation_throttle));
 }
 
 NavigationThrottle::ThrottleCheckResult
@@ skipping 304 matching lines @@
       << "NavigationEntry";
   subframe_entry_committed_ = navigation_entry_committed;
 
   // If an error page reloads, net_error_code might be 200 but we still want to
   // count it as an error page.
   if (params.base_url.spec() == kUnreachableWebDataURL ||
       net_error_code_ != net::OK) {
     state_ = DID_COMMIT_ERROR_PAGE;
   } else {
     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())
+      frame_tree_node()->SetCollapsed(false);
   }
 
   if (url_.SchemeIs(url::kDataScheme) && IsInMainFrame() &&
       IsRendererInitiated()) {
     GetRenderFrameHost()->AddMessageToConsole(
         CONSOLE_MESSAGE_LEVEL_WARNING,
         "Upcoming versions will block content-initiated top frame navigations "
         "to data: URLs. For more information, see https://goo.gl/BaZAea.");
   }
 }
@@ skipping 22 matching lines @@
     switch (result) {
       case NavigationThrottle::PROCEED:
         continue;
 
       case NavigationThrottle::BLOCK_REQUEST:
       case NavigationThrottle::CANCEL:
       case NavigationThrottle::CANCEL_AND_IGNORE:
         state_ = CANCELING;
         return result;
 
+      case NavigationThrottle::BLOCK_REQUEST_AND_COLLAPSE:
+        frame_tree_node_->SetCollapsed(true);
+        state_ = CANCELING;
+        return result;
+
       case NavigationThrottle::DEFER:
         state_ = DEFERRING_START;
         next_index_ = i + 1;
         return result;
 
       case NavigationThrottle::BLOCK_RESPONSE:
         NOTREACHED();
     }
   }
   next_index_ = 0;
   state_ = WILL_SEND_REQUEST;
   return NavigationThrottle::PROCEED;
 }
 
 NavigationThrottle::ThrottleCheckResult
 NavigationHandleImpl::CheckWillRedirectRequest() {
   DCHECK(state_ == WILL_REDIRECT_REQUEST || state_ == DEFERRING_REDIRECT);
   DCHECK(state_ != WILL_REDIRECT_REQUEST || next_index_ == 0);
   DCHECK(state_ != DEFERRING_REDIRECT || next_index_ != 0);
   for (size_t i = next_index_; i < throttles_.size(); ++i) {
     NavigationThrottle::ThrottleCheckResult result =
         throttles_[i]->WillRedirectRequest();
     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 28 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() {
   DCHECK_EQ(WILL_PROCESS_RESPONSE, state_);
@@ skipping 171 matching lines @@
     if (node->current_url().EqualsIgnoringRef(url_)) {
       if (found_self_reference)
         return true;
       found_self_reference = true;
     }
   }
   return false;
 }
 
 }  // namespace content