Do not navigate on loading iframes in StaticHTMLViewController.

ios/chrome/browser/ui/static_content/static_html_view_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.
 
 #include "ios/chrome/browser/ui/static_content/static_html_view_controller.h"
 
 #include <WebKit/WebKit.h>
 
 #include <stdlib.h>
 
@@ skipping 66 matching lines @@
   id<CRWNativeContentDelegate> delegate_;  // weak
 
   // The loader to navigate from the page.
   id<UrlLoader> loader_;  // weak
 }
 
 // Returns the URL of the static page to display.
 - (NSURL*)resourceURL;
 // Ensures that webView_ has been created, creating it if necessary.
 - (void)ensureWebViewCreated;
-// Determines if the page load should begin based on the current |resourceURL|.
-- (BOOL)shouldStartLoadWithRequest:(NSURLRequest*)request;
+// Determines if the page load should begin based on the current |resourceURL|
+// and the navigation type |type|.
+- (BOOL)shouldStartLoadWithRequest:(NSURLRequest*)request
+                              type:(WKNavigationType)type;

[Eugene But (OOO till 7-30), 2016/12/22 16:21:56]

nit: s/type/navigationType:

[Olivier, 2016/12/22 16:42:59]

Done.

[Eugene But (OOO till 7-30), 2016/12/22 17:37:51]

Sorry I meant words before arguments (s/type:/navigationType:) but I guess you
won't need this anymore :)

 @end
 
 @implementation StaticHtmlViewController
 
 - (instancetype)initWithResource:(NSString*)resource
                     browserState:(web::BrowserState*)browserState {
   DCHECK(resource);
   DCHECK(browserState);
   if ((self = [super init])) {
     resource_.reset([resource copy]);
@@ skipping 93 matching lines @@
   [[self scrollView] setScrollEnabled:enabled];
 }
 
 #pragma mark -
 #pragma mark WKNavigationDelegate implementation
 
 - (void)webView:(WKWebView*)webView
     decidePolicyForNavigationAction:(WKNavigationAction*)navigationAction
                     decisionHandler:
                         (void (^)(WKNavigationActionPolicy))decisionHandler {
-  decisionHandler([self shouldStartLoadWithRequest:navigationAction.request]
-                      ? WKNavigationActionPolicyAllow
-                      : WKNavigationActionPolicyCancel);
+  decisionHandler(
+      [self shouldStartLoadWithRequest:navigationAction.request
+                                  type:navigationAction.navigationType]
+          ? WKNavigationActionPolicyAllow
+          : WKNavigationActionPolicyCancel);
 }
 
 #pragma mark -
 #pragma mark KVO callback
 
 - (void)observeValueForKeyPath:(NSString*)keyPath
                       ofObject:(id)object
                         change:(NSDictionary*)change
                        context:(void*)context {
   DCHECK([keyPath isEqualToString:@"title"]);
   if ([delegate_ respondsToSelector:@selector(nativeContent:titleDidChange:)]) {
     // WKWebView's |title| changes to nil when its web process crashes.
     if ([webView_ title])
       [delegate_ nativeContent:self titleDidChange:[webView_ title]];
   }
 }
 
 #pragma mark -
 #pragma mark Private
 
-- (BOOL)shouldStartLoadWithRequest:(NSURLRequest*)request {
+- (BOOL)shouldStartLoadWithRequest:(NSURLRequest*)request
+                              type:(WKNavigationType)type {
   // Only allow displaying the URL which correspond to the authorized resource.
   if ([[request URL] isEqual:[self resourceURL]])
     return YES;
 
-  // All other URLs will be loaded by our UrlLoader if we have one.
-  if (loader_) {
+  // All other navigation URLs will be loaded by our UrlLoader if we have one.

[Eugene But (OOO till 7-30), 2016/12/22 16:21:56]

nit: Please avoid "we" in the comments (go/avoidwe)

[Olivier, 2016/12/22 16:42:59]

I did not add the we :)
Removed.

+  // If type is |WKNavigationTypeOther|, the URL corresponds to an external

[Eugene But (OOO till 7-30), 2016/12/22 16:21:56]

What does "external resource mean"? I think WKNavigationTypeOther can represent
regular link clicks:
https://cs.chromium.org/chromium/src/ios/web/web_state/ui/crw_web_controller....

[Olivier, 2016/12/22 16:42:59]

Clicking on regular link is WKNavigationTypeLinkActivated
https://developer.apple.com/reference/webkit/wknavigationtype/wknavigationtyp...

I can add another check like 
[_webView isLoading]

I checked and the element causing the navigation is an iframe. Updated the
comment.

+  // resource and should not be loaded at all.
+  if (loader_ && type != WKNavigationTypeOther) {
     dispatch_async(dispatch_get_main_queue(), ^{
       [loader_ loadURL:net::GURLWithNSURL([request URL])
                    referrer:referrer_
                  transition:ui::PAGE_TRANSITION_LINK
           rendererInitiated:YES];
     });
   }
   return NO;
 }
 
@@ skipping 45 matching lines @@
         allowingReadAccessToURL:resourcesRootDirectory_];
   } else {
     NSURL* resourceURL = [self resourceURL];
     [generator_ generateHtml:^(NSString* HTML) {
       [webView loadHTMLString:HTML baseURL:resourceURL];
     }];
   }
 }
 
 @end