Added web::NavigationContext::GetPageTransition.

ios/web/web_state/ui/crw_web_controller.mm

 // Copyright 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.
 
 #import "ios/web/web_state/ui/crw_web_controller.h"
 
 #import <WebKit/WebKit.h>
 
 #import <objc/runtime.h>
 #include <stddef.h>
@@ skipping 1322 matching lines @@
   // advance and use that instead. https://crbug.com/227769.
   return web::Referrer(GURL(base::SysNSStringToUTF8(referrerString)),
                        web::ReferrerPolicyAlways);
 }
 
 - (void)pushStateWithPageURL:(const GURL&)pageURL
                  stateObject:(NSString*)stateObject
                   transition:(ui::PageTransition)transition {
   std::unique_ptr<web::NavigationContextImpl> context =
       web::NavigationContextImpl::CreateNavigationContext(_webStateImpl,
-                                                          pageURL);
+                                                          pageURL, transition);
   _webStateImpl->OnNavigationStarted(context.get());
   [[self sessionController] pushNewItemWithURL:pageURL
                                    stateObject:stateObject
                                     transition:transition];
   context->SetIsSameDocument(true);
   _webStateImpl->OnNavigationFinished(context.get());
   self.userInteractionRegistered = NO;
 }
 
 - (void)replaceStateWithPageURL:(const GURL&)pageURL
                     stateObject:(NSString*)stateObject {
   std::unique_ptr<web::NavigationContextImpl> context =
-      web::NavigationContextImpl::CreateNavigationContext(_webStateImpl,
-                                                          pageURL);
+      web::NavigationContextImpl::CreateNavigationContext(
+          _webStateImpl, pageURL,
+          ui::PageTransition::PAGE_TRANSITION_CLIENT_REDIRECT);
   _webStateImpl->OnNavigationStarted(context.get());
   [[self sessionController] updateCurrentItemWithURL:pageURL
                                          stateObject:stateObject];
   context->SetIsSameDocument(true);
   _webStateImpl->OnNavigationFinished(context.get());
 }
 
 - (void)setDocumentURL:(const GURL&)newURL {
   if (newURL != _documentURL && newURL.is_valid()) {
     _documentURL = newURL;
@@ skipping 154 matching lines @@
     // Typically on PAGE_TRANSITION_CLIENT_REDIRECT.
     [[self sessionController] updatePendingItem:requestURL];
   } else {
     // A new session history entry needs to be created.
     self.navigationManagerImpl->AddPendingItem(
         requestURL, referrer, transition,
         web::NavigationInitiationType::RENDERER_INITIATED,
         web::NavigationManager::UserAgentOverrideOption::INHERIT);
   }
   std::unique_ptr<web::NavigationContextImpl> context =
-      web::NavigationContextImpl::CreateNavigationContext(_webStateImpl,
-                                                          requestURL);
+      web::NavigationContextImpl::CreateNavigationContext(
+          _webStateImpl, requestURL, transition);
 
   web::NavigationItem* item = self.navigationManagerImpl->GetPendingItem();
   // TODO(crbug.com/676129): AddPendingItem does not always create a pending
   // item. Remove this workaround once the bug is fixed.
   if (!item) {
     item = self.navigationManagerImpl->GetLastCommittedItem();
   }
   context->SetNavigationItemUniqueID(item->GetUniqueID());
   _webStateImpl->SetIsLoading(true);
   _webStateImpl->OnNavigationStarted(context.get());
@@ skipping 311 matching lines @@
   BOOL initialNavigation = !self.currentNavItem;
 
   web::NavigationInitiationType navigationInitiationType =
       params.is_renderer_initiated
           ? web::NavigationInitiationType::RENDERER_INITIATED
           : web::NavigationInitiationType::USER_INITIATED;
   self.navigationManagerImpl->AddPendingItem(
       params.url, params.referrer, params.transition_type,
       navigationInitiationType, params.user_agent_override_option);
 
+  // Mark pending item as created from hash change if necessary. This is needed
+  // because window.hashchange message may not arrive on time.
+  web::NavigationItemImpl* pendingItem = self.sessionController.pendingItem;
+  if (pendingItem) {
+    GURL lastCommittedURL = _webStateImpl->GetLastCommittedURL();
+    GURL pendingURL = pendingItem->GetURL();
+    if (lastCommittedURL != pendingURL &&
+        lastCommittedURL.EqualsIgnoringRef(pendingURL)) {
+      pendingItem->SetIsCreatedFromHashChange(true);
+    }
+  }

[kkhorimoto, 2017/05/22 21:13:56]

This change seems to be unrelated to the page transition stuff happening
elsewhere in this CL.  Do you think we should move it to a separate CL in case
one needs to be reverted?  Is there a specific reason you're including it here?

Also, this is a subtle change in functionality.  IsCreatedFromHashChange() is
only used to calculate whether a history navigation occurs within the same
document.  Loads created through this selector will create a new request, which
will load a new document, meaning that technically this new NavigationItem will
not be a same document navigation.  I believe that this will behave correctly
for history traversals, as pages whose URLs differ only in the fragment should
have the same document.  

[Eugene But (OOO till 7-30), 2017/05/22 22:04:28]

This was needed to make sure that hash change navigation is always marked as
IsCreatedFromHashChange w/o relying to timing from window.hashchange. Otherwise
same document navigations (like going back) will not always report correct page
transition causing tests to be flaky. 

I agree that the change should be in a separate CL:
https://codereview.chromium.org/2898633003

+
   web::NavigationItemImpl* addedItem = self.currentNavItem;
   DCHECK(addedItem);
   if (params.extra_headers)
     addedItem->AddHttpRequestHeaders(params.extra_headers);
   if (params.post_data) {
     DCHECK([addedItem->GetHttpRequestHeaders() objectForKey:@"Content-Type"])
         << "Post data should have an associated content type";
     addedItem->SetPostData(params.post_data);
     addedItem->SetShouldSkipRepostFormConfirmation(true);
   }
@@ skipping 2282 matching lines @@
   // Web View should not be created for App Specific URLs.
   if (!web::GetWebClient()->IsAppSpecificURL(URL)) {
     [self ensureWebViewCreated];
     DCHECK(_webView) << "_webView null while trying to load HTML";
   }
   WKNavigation* navigation =
       [_webView loadHTMLString:HTML baseURL:net::NSURLWithGURL(URL)];
   [_navigationStates setState:web::WKNavigationState::REQUESTED
                 forNavigation:navigation];
   std::unique_ptr<web::NavigationContextImpl> context;
+  const ui::PageTransition loadHTMLTransition =
+      ui::PageTransition::PAGE_TRANSITION_TYPED;
   if (_webStateImpl->HasWebUI()) {
     // WebUI uses |loadHTML:forURL:| to feed the content to web view. This
     // should not be treated as a navigation, but WKNavigationDelegate callbacks
     // still expect a valid context.
-    context =
-        web::NavigationContextImpl::CreateNavigationContext(_webStateImpl, URL);
+    context = web::NavigationContextImpl::CreateNavigationContext(
+        _webStateImpl, URL, loadHTMLTransition);
   } else {
-    context = [self
-        registerLoadRequestForURL:URL
-                         referrer:web::Referrer()
-                       transition:ui::PageTransition::PAGE_TRANSITION_TYPED];
+    context = [self registerLoadRequestForURL:URL
+                                     referrer:web::Referrer()
+                                   transition:loadHTMLTransition];
   }
   [_navigationStates setContext:std::move(context) forNavigation:navigation];
 }
 
 - (void)loadHTML:(NSString*)HTML forAppSpecificURL:(const GURL&)URL {
   CHECK(web::GetWebClient()->IsAppSpecificURL(URL));
   [self loadHTML:HTML forURL:URL];
 }
 
 - (void)loadHTMLForCurrentURL:(NSString*)HTML {
@@ skipping 1032 matching lines @@
 - (NSUInteger)observerCount {
   DCHECK_EQ(_observerBridges.size(), [_observers count]);
   return [_observers count];
 }
 
 - (NSString*)referrerFromNavigationAction:(WKNavigationAction*)action {
   return [action.request valueForHTTPHeaderField:kReferrerHeaderName];
 }
 
 @end