Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(296)

Unified Diff: ios/web/web_state/ui/crw_web_controller.mm

Issue 2295053003: [ios] Implemented LoadHtml w/o using data:// URLs. (Closed)
Patch Set: Addressed review comments Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ios/web/web_state/ui/crw_web_controller.h ('k') | ios/web/web_state/ui/crw_web_controller_unittest.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/web/web_state/ui/crw_web_controller.mm
diff --git a/ios/web/web_state/ui/crw_web_controller.mm b/ios/web/web_state/ui/crw_web_controller.mm
index 0960224271346d774722efe5cafe0ab5dd7a4710..e7fe4f3c9eb05ce6788928bf465f04c870a81dd1 100644
--- a/ios/web/web_state/ui/crw_web_controller.mm
+++ b/ios/web/web_state/ui/crw_web_controller.mm
@@ -4767,8 +4767,9 @@ const NSTimeInterval kSnapshotOverlayTransition = 0.5;
// Remove the transient content view.
[self clearTransientContentView];
- DLOG_IF(WARNING, !_webView) << "_webView null while trying to load HTML";
_loadPhase = web::LOAD_REQUESTED;
+ [self ensureWebViewCreated];
+ DCHECK(_webView) << "_webView null while trying to load HTML";
[_webView loadHTMLString:HTML baseURL:net::NSURLWithGURL(URL)];
}
@@ -4975,13 +4976,6 @@ const NSTimeInterval kSnapshotOverlayTransition = 0.5;
}
}
- if (!allowLoad && action.targetFrame.isMainFrame) {
- // WKWebView will stop this navigation without calling any further
- // callbacks, so change load phase to loaded now.
- _loadPhase = web::PAGE_LOADED;
- _webStateImpl->SetIsLoading(false);
- }
-
decisionHandler(allowLoad ? WKNavigationActionPolicyAllow
: WKNavigationActionPolicyCancel);
}
« no previous file with comments | « ios/web/web_state/ui/crw_web_controller.h ('k') | ios/web/web_state/ui/crw_web_controller_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698