ios/web/web_state/ui/crw_wk_web_view_web_controller.mm - Issue 1874903003: Reversed WebState <-> CRWWebController ownership.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1874903003: Reversed WebState <-> CRWWebController ownership. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Merged with origin/master Created 4 years, 8 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:

Index: ios/web/web_state/ui/crw_wk_web_view_web_controller.mm

diff --git a/ios/web/web_state/ui/crw_wk_web_view_web_controller.mm b/ios/web/web_state/ui/crw_wk_web_view_web_controller.mm

index 5a11c53df831ab027c60a02910d112361a386ed5..8dbe992ac3b17682cc6dd01fc3f49bc1fba61686 100644

--- a/ios/web/web_state/ui/crw_wk_web_view_web_controller.mm

+++ b/ios/web/web_state/ui/crw_wk_web_view_web_controller.mm

@@ -186,11 +186,11 @@

#pragma mark CRWWebController public methods

-- (instancetype)initWithWebState:(std::unique_ptr<web::WebStateImpl>)webState {

- DCHECK(webState);

- web::BrowserState* browserState = webState->GetBrowserState();

- self = [super initWithWebState:std::move(webState)];

+- (instancetype)initWithWebState:(web::WebStateImpl*)webState {

+ self = [super initWithWebState:webState];

if (self) {

+ DCHECK(webState);

+ web::BrowserState* browserState = webState->GetBrowserState();

_certVerificationController.reset([[CRWCertVerificationController alloc]

initWithBrowserState:browserState]);

_certVerificationErrors.reset(