Merge to M40: Make sure Legacy HWND is created and has proper bounds on bounds change.

content/browser/web_contents/web_contents_view_aura.cc

 // Copyright (c) 2012 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.
 
 #include "content/browser/web_contents/web_contents_view_aura.h"
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
 #include "base/files/file_util.h"
 #include "base/metrics/histogram.h"
@@ skipping 1453 matching lines @@
   for (size_t i = 0; i < window_->children().size(); i++) {
     if (window_->children()[i]->GetProperty(
             aura::client::kConstrainedWindowKey)) {
       gfx::Rect bounds = window_->children()[i]->bounds();
       bounds.set_origin(
           gfx::Point((new_bounds.width() - bounds.width()) / 2,
                      (new_bounds.height() - bounds.height()) / 2));
       window_->children()[i]->SetBounds(bounds);
     }
   }
+
+#if defined(OS_WIN)
+  if (!legacy_hwnd_ && window_ && window_->GetHost()) {
+    HWND parent_hwnd = window_->GetHost()->GetAcceleratedWidget();
+    CHECK(parent_hwnd);
+    legacy_hwnd_.reset(LegacyRenderWidgetHostHWND::Create(parent_hwnd, this));
+  }
+
+  if (legacy_hwnd_)
+    legacy_hwnd_->SetBounds(window_->GetBoundsInRootWindow());
+#endif
 }
 
 gfx::NativeCursor WebContentsViewAura::GetCursor(const gfx::Point& point) {
   return gfx::kNullCursor;
 }
 
 int WebContentsViewAura::GetNonClientComponent(const gfx::Point& point) const {
   return HTCLIENT;
 }
 
@@ skipping 216 matching lines @@
   BrowserAccessibilityManager* manager =
       web_contents_->GetRootBrowserAccessibilityManager();
   if (!manager)
     return nullptr;
 
   return manager->GetRoot()->ToBrowserAccessibilityWin();
 }
 #endif
 
 }  // namespace content