Adding CRWWebViewContentView as a subview when it is set

ios/web/web_state/ui/crw_web_controller_container_view.mm

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "ios/web/web_state/ui/crw_web_controller_container_view.h"
 
 #include "base/ios/weak_nsobject.h"
 #include "base/logging.h"
 #include "base/mac/scoped_nsobject.h"
 #import "ios/web/public/web_state/ui/crw_content_view.h"
@@ skipping 142 matching lines @@
 #pragma mark Accessors
 
 - (CRWWebViewContentView*)webViewContentView {
   return _webViewContentView.get();
 }
 
 - (void)setWebViewContentView:(CRWWebViewContentView*)webViewContentView {
   if (![_webViewContentView isEqual:webViewContentView]) {
     [_webViewContentView removeFromSuperview];
     _webViewContentView.reset([webViewContentView retain]);
+    if (_webViewContentView) {
+      DCHECK(![_webViewContentView superview]);
+      [self addSubview:_webViewContentView];
+    }
   }
 }
 
 - (id<CRWNativeContent>)nativeController {
   return _nativeController.get();
 }
 
 - (void)setNativeController:(id<CRWNativeContent>)nativeController {
   if (![_nativeController isEqual:nativeController]) {
     base::WeakNSProtocol<id> oldController(_nativeController);
@@ skipping 34 matching lines @@
 - (CGRect)visibleFrame {
   CGFloat headerHeight = [_delegate headerHeightForContainerView:self];
   return UIEdgeInsetsInsetRect(self.bounds,
                                UIEdgeInsetsMake(headerHeight, 0, 0, 0));
 }
 
 #pragma mark Layout
 
 - (void)layoutSubviews {
   [super layoutSubviews];
+  
+  [_webViewContentView setFrame:self.bounds];

[kkhorimoto, 2015/12/16 18:54:17]

Can you use property notation for consistency?  The ivars backing properties
should only really be accessed in accessors (or initializers when setting
default values).

[shreyasv1, 2015/12/16 23:02:05]

Done.

 
-  // webViewcontentView layout.
-  if (self.webViewContentView) {
-    if (!self.webViewContentView.superview)
-      [self addSubview:self.webViewContentView];
-    self.webViewContentView.frame = self.bounds;
-  }
+  // TODO(crbug.com/570114): Move adding of the following subviews to another
+  // place.
 
   // nativeController layout.
   if (self.nativeController) {
     UIView* nativeView = [self.nativeController view];
     if (!nativeView.superview) {
       [self addSubview:nativeView];
       [nativeView setNeedsUpdateConstraints];
     }
     nativeView.frame = self.visibleFrame;
   }
@@ skipping 93 matching lines @@
   else
     self.toolbarContainerView = nil;
 }
 
 - (void)removeAllToolbars {
   // Resetting the property will remove the toolbars from the hierarchy.
   self.toolbarContainerView = nil;
 }
 
 @end