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

Side by Side Diff: ios/web/web_state/ui/crw_web_controller_container_view.mm

Issue 2616633003: Fix crash in StaticHTMLNativeContent when deallocating WKWebView on iOS9 (Closed)
Patch Set: no dismiss -> close call Created 3 years, 11 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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_web_controller_container_view.h" 5 #import "ios/web/web_state/ui/crw_web_controller_container_view.h"
6 6
7 #import "base/ios/weak_nsobject.h" 7 #import "base/ios/weak_nsobject.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #import "base/mac/scoped_nsobject.h" 9 #import "base/mac/scoped_nsobject.h"
10 #import "ios/web/public/web_state/ui/crw_content_view.h" 10 #import "ios/web/public/web_state/ui/crw_content_view.h"
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 NOTREACHED(); 139 NOTREACHED();
140 return nil; 140 return nil;
141 } 141 }
142 142
143 - (instancetype)initWithFrame:(CGRect)frame { 143 - (instancetype)initWithFrame:(CGRect)frame {
144 NOTREACHED(); 144 NOTREACHED();
145 return nil; 145 return nil;
146 } 146 }
147 147
148 - (void)dealloc { 148 - (void)dealloc {
149 if ([_nativeController respondsToSelector:@selector(willBeDismissed)]) {
150 [_nativeController willBeDismissed];
Eugene But (OOO till 7-30) 2017/01/04 21:24:38 Calling |willBeDismissed| from dealloc does not se
Olivier 2017/01/06 10:03:24 Done.
151 }
149 self.contentViewProxy.contentView = nil; 152 self.contentViewProxy.contentView = nil;
150 [super dealloc]; 153 [super dealloc];
151 } 154 }
152 155
153 #pragma mark Accessors 156 #pragma mark Accessors
154 157
155 - (CRWWebViewContentView*)webViewContentView { 158 - (CRWWebViewContentView*)webViewContentView {
156 return _webViewContentView.get(); 159 return _webViewContentView.get();
157 } 160 }
158 161
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
338 else 341 else
339 self.toolbarContainerView = nil; 342 self.toolbarContainerView = nil;
340 } 343 }
341 344
342 - (void)removeAllToolbars { 345 - (void)removeAllToolbars {
343 // Resetting the property will remove the toolbars from the hierarchy. 346 // Resetting the property will remove the toolbars from the hierarchy.
344 self.toolbarContainerView = nil; 347 self.toolbarContainerView = nil;
345 } 348 }
346 349
347 @end 350 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698