Chromium Code Reviews| 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 c15eb0c28b87b3c90437e3146c956e359006209b..201c95cf06fbeeee80c7d92e8bdf8fd5c6a5b5f0 100644 |
| --- a/ios/web/web_state/ui/crw_web_controller.mm |
| +++ b/ios/web/web_state/ui/crw_web_controller.mm |
| @@ -1803,7 +1803,9 @@ const NSTimeInterval kSnapshotOverlayTransition = 0.5; |
| DCHECK(!(transition & ui::PAGE_TRANSITION_FORWARD_BACK)); |
| // This method is allowed to handle reload only for transient items, which |
|
Eugene But (OOO till 7-30)
2017/03/21 15:48:19
Could you please merge your comment into existing
Olivier
2017/03/21 16:41:31
Done.
|
| // is essentially loading the same URL again. |
| - DCHECK(!(transition & ui::PAGE_TRANSITION_RELOAD) || |
| + // If the web controller was displaying a native content, the native content |
| + // can trigger a reload. |
| + DCHECK(self.nativeController || !(transition & ui::PAGE_TRANSITION_RELOAD) || |
| self.navigationManagerImpl->GetTransientItem()); |
| BOOL initialNavigation = NO; |