Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #import "ios/web/web_state/ui/crw_wk_web_view_web_controller.h" | 5 #import "ios/web/web_state/ui/crw_wk_web_view_web_controller.h" |
| 6 | 6 |
| 7 #import <WebKit/WebKit.h> | 7 #import <WebKit/WebKit.h> |
| 8 #include <stddef.h> | 8 #include <stddef.h> |
| 9 | 9 |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 570 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 581 } | 581 } |
| 582 | 582 |
| 583 - (void)willLoadCurrentURLInWebView { | 583 - (void)willLoadCurrentURLInWebView { |
| 584 // TODO(stuartmorgan): Get a WKWebView version of the request ID verification | 584 // TODO(stuartmorgan): Get a WKWebView version of the request ID verification |
| 585 // code working for debug builds. | 585 // code working for debug builds. |
| 586 } | 586 } |
| 587 | 587 |
| 588 - (void)loadRequestForCurrentNavigationItem { | 588 - (void)loadRequestForCurrentNavigationItem { |
| 589 DCHECK(self.webView && !self.nativeController); | 589 DCHECK(self.webView && !self.nativeController); |
| 590 DCHECK([self currentSessionEntry]); | 590 DCHECK([self currentSessionEntry]); |
| 591 DCHECK(CGRectGetWidth(self.webView.frame) > 0.0); | |
|
shreyasv1
2016/02/09 22:58:18
DCHECK_GE?
kkhorimoto
2016/02/10 00:08:36
Done.
| |
| 592 DCHECK(CGRectGetHeight(self.webView.frame) > 0.0); | |
|
stuartmorgan
2016/02/09 23:00:51
CGRectIsNull?
Also, a brief comment here explaini
kkhorimoto
2016/02/10 00:08:36
CGRectIsNull specifically checks against {{Inf, In
| |
| 591 | 593 |
| 592 web::WKBackForwardListItemHolder* holder = | 594 web::WKBackForwardListItemHolder* holder = |
| 593 [self currentBackForwardListItemHolder]; | 595 [self currentBackForwardListItemHolder]; |
| 594 BOOL isFormResubmission = | 596 BOOL isFormResubmission = |
| 595 (holder->navigation_type() == WKNavigationTypeFormResubmitted || | 597 (holder->navigation_type() == WKNavigationTypeFormResubmitted || |
| 596 holder->navigation_type() == WKNavigationTypeFormSubmitted); | 598 holder->navigation_type() == WKNavigationTypeFormSubmitted); |
| 597 web::NavigationItemImpl* currentItem = | 599 web::NavigationItemImpl* currentItem = |
| 598 [self currentSessionEntry].navigationItemImpl; | 600 [self currentSessionEntry].navigationItemImpl; |
| 599 NSData* POSTData = currentItem->GetPostData(); | 601 NSData* POSTData = currentItem->GetPostData(); |
| 600 NSMutableURLRequest* request = [self requestForCurrentNavigationItem]; | 602 NSMutableURLRequest* request = [self requestForCurrentNavigationItem]; |
| (...skipping 1452 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2053 runJavaScriptTextInputPanelWithPrompt:prompt | 2055 runJavaScriptTextInputPanelWithPrompt:prompt |
| 2054 defaultText:defaultText | 2056 defaultText:defaultText |
| 2055 requestURL:requestURL | 2057 requestURL:requestURL |
| 2056 completionHandler:completionHandler]; | 2058 completionHandler:completionHandler]; |
| 2057 } else if (completionHandler) { | 2059 } else if (completionHandler) { |
| 2058 completionHandler(nil); | 2060 completionHandler(nil); |
| 2059 } | 2061 } |
| 2060 } | 2062 } |
| 2061 | 2063 |
| 2062 @end | 2064 @end |
| OLD | NEW |