Revert "Create only a single LegacyRenderWidgetHostHWND per WebContentsViewAura."

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 49 matching lines @@
 #include "ui/base/dragdrop/os_exchange_data.h"
 #include "ui/base/hit_test.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/events/event.h"
 #include "ui/events/event_utils.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_png_rep.h"
 #include "ui/gfx/image/image_skia.h"
-#include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/screen.h"
 #include "ui/wm/public/drag_drop_client.h"
 #include "ui/wm/public/drag_drop_delegate.h"
 
-#if defined(OS_WIN)
-#include "content/browser/accessibility/browser_accessibility_manager.h"
-#include "content/browser/accessibility/browser_accessibility_win.h"
-#include "ui/base/win/hidden_window.h"
-#endif
-
 namespace content {
 WebContentsView* CreateWebContentsView(
     WebContentsImpl* web_contents,
     WebContentsViewDelegate* delegate,
     RenderViewHostDelegateView** render_view_host_delegate_view) {
   WebContentsViewAura* rv = new WebContentsViewAura(web_contents, delegate);
   *render_view_host_delegate_view = rv;
   return rv;
 }
 
@@ skipping 549 matching lines @@
       host_window_ = NULL;
     }
   }
 
   void OnWindowAddedToRootWindow(aura::Window* window) override {
     if (window == view_->window_) {
       window->GetHost()->AddObserver(this);
 #if defined(OS_WIN)
       if (!window->GetRootWindow()->HasObserver(this))
         window->GetRootWindow()->AddObserver(this);
-      if (view_->legacy_hwnd_) {
-        view_->legacy_hwnd_->UpdateParent(
-            window->GetHost()->GetAcceleratedWidget());
-      }
 #endif
     }
   }
 
   void OnWindowRemovingFromRootWindow(aura::Window* window,
                                       aura::Window* new_root) override {
     if (window == view_->window_) {
       window->GetHost()->RemoveObserver(this);
 #if defined(OS_WIN)
       window->GetRootWindow()->RemoveObserver(this);
 
       const aura::Window::Windows& root_children =
           window->GetRootWindow()->children();
       for (size_t i = 0; i < root_children.size(); ++i) {
         if (root_children[i] != view_->window_ &&
             root_children[i] != host_window_) {
           root_children[i]->RemoveObserver(this);
         }
       }
-
-      if (view_->legacy_hwnd_)
-        view_->legacy_hwnd_->UpdateParent(ui::GetHiddenWindow());
 #endif
     }
   }
 
   // Overridden WindowTreeHostObserver:
   void OnHostMoved(const aura::WindowTreeHost* host,
                    const gfx::Point& new_origin) override {
     TRACE_EVENT1("ui",
                  "WebContentsViewAura::WindowObserver::OnHostMoved",
                  "new_origin", new_origin.ToString());
@@ skipping 51 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(WindowObserver);
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 // WebContentsViewAura, public:
 
 WebContentsViewAura::WebContentsViewAura(
     WebContentsImpl* web_contents,
     WebContentsViewDelegate* delegate)
-    : WebContentsObserver(web_contents),
-      web_contents_(web_contents),
+    : web_contents_(web_contents),
       delegate_(delegate),
       current_drag_op_(blink::WebDragOperationNone),
       drag_dest_delegate_(NULL),
       current_rvh_for_drag_(NULL),
       overscroll_change_brightness_(false),
       current_overscroll_gesture_(OVERSCROLL_NONE),
       completed_overscroll_gesture_(OVERSCROLL_NONE),
       touch_editable_(TouchEditableImplAura::Create()),
       is_or_was_visible_(false) {
 }
@@ skipping 265 matching lines @@
 
 void WebContentsViewAura::GetContainerBounds(gfx::Rect *out) const {
   *out = window_->GetBoundsInScreen();
 }
 
 void WebContentsViewAura::SizeContents(const gfx::Size& size) {
   gfx::Rect bounds = window_->bounds();
   if (bounds.size() != size) {
     bounds.set_size(size);
     window_->SetBounds(bounds);
-#if defined(OS_WIN)
-    if (legacy_hwnd_)
-      legacy_hwnd_->SetBounds(window_->GetBoundsInRootWindow());
-#endif
   } else {
     // Our size matches what we want but the renderers size may not match.
     // Pretend we were resized so that the renderers size is updated too.
     SizeChangedCommon(size);
   }
 }
 
 void WebContentsViewAura::Focus() {
   if (web_contents_->GetInterstitialPage()) {
     web_contents_->GetInterstitialPage()->Focus();
@@ skipping 76 matching lines @@
   // 1) guests do not support NPAPI plugins.
   // 2) guests' window bounds are supposed to come from its embedder.
   if (!BrowserPluginGuest::IsGuest(web_contents_))
     window_observer_.reset(new WindowObserver(this));
 
   // delegate_->GetDragDestDelegate() creates a new delegate on every call.
   // Hence, we save a reference to it locally. Similar model is used on other
   // platforms as well.
   if (delegate_)
     drag_dest_delegate_ = delegate_->GetDragDestDelegate();
-
-#if defined(OS_WIN)
-  if (context && context->GetHost()) {
-    HWND parent_hwnd = context->GetHost()->GetAcceleratedWidget();
-    CHECK(parent_hwnd);
-    legacy_hwnd_.reset(LegacyRenderWidgetHostHWND::Create(parent_hwnd, this));
-  }
-#endif
 }
 
 RenderWidgetHostViewBase* WebContentsViewAura::CreateViewForWidget(
     RenderWidgetHost* render_widget_host, bool is_guest_view_hack) {
   if (render_widget_host->GetView()) {
     // During testing, the view will already be set up in most cases to the
     // test view, so we don't want to clobber it with a real one. To verify that
     // this actually is happening (and somebody isn't accidentally creating the
     // view twice), we check for the RVH Factory, which will be set when we're
     // making special ones (which go along with the special views).
@@ skipping 20 matching lines @@
   // We listen to drag drop events in the newly created view's window.
   aura::client::SetDragDropDelegate(view->GetNativeView(), this);
 
   if (view->overscroll_controller() &&
       (!web_contents_->GetDelegate() ||
        web_contents_->GetDelegate()->CanOverscrollContent())) {
     InstallOverscrollControllerDelegate(view);
   }
 
   AttachTouchEditableToRenderView();
-
-#if defined(OS_WIN)
-  if (legacy_hwnd_)
-    view->SetLegacyRenderWidgetHostHWND(legacy_hwnd_.get());
-#endif
-
   return view;
 }
 
 RenderWidgetHostViewBase* WebContentsViewAura::CreateViewForPopupWidget(
     RenderWidgetHost* render_widget_host) {
-  RenderWidgetHostViewAura* view =
-      new RenderWidgetHostViewAura(render_widget_host, false);
-#if defined(OS_WIN)
-  if (legacy_hwnd_)
-    view->SetLegacyRenderWidgetHostHWND(legacy_hwnd_.get());
-#endif
-  return view;
+  return new RenderWidgetHostViewAura(render_widget_host, false);
 }
 
 void WebContentsViewAura::SetPageTitle(const base::string16& title) {
   window_->SetTitle(title);
 }
 
 void WebContentsViewAura::RenderViewCreated(RenderViewHost* host) {
 }
 
 void WebContentsViewAura::RenderViewSwappedIn(RenderViewHost* host) {
@@ skipping 255 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 154 matching lines @@
   web_contents_->GetRenderViewHost()->DragTargetDrop(
       event.location(),
       gfx::Screen::GetScreenFor(GetNativeView())->GetCursorScreenPoint(),
       ConvertAuraEventFlagsToWebInputEventModifiers(event.flags()));
   if (drag_dest_delegate_)
     drag_dest_delegate_->OnDrop();
   current_drop_data_.reset();
   return ConvertFromWeb(current_drag_op_);
 }
 
-void WebContentsViewAura::RenderProcessGone(base::TerminationStatus status) {
-#if defined(OS_WIN)
-  UpdateLegacyHwndVisibility();
-#endif
-}
-
 void WebContentsViewAura::OnWindowVisibilityChanged(aura::Window* window,
                                                     bool visible) {
   // Ignore any visibility changes in the hierarchy below.
   if (window != window_.get() && window_->Contains(window))
     return;
 
   UpdateWebContentsVisibility(visible);
 }
 
 void WebContentsViewAura::UpdateWebContentsVisibility(bool visible) {
@@ skipping 10 matching lines @@
     }
     return;
   }
   if (visible) {
     if (!web_contents_->should_normally_be_visible())
       web_contents_->WasShown();
   } else {
     if (web_contents_->should_normally_be_visible())
       web_contents_->WasHidden();
   }
-
-#if defined(OS_WIN)
-  UpdateLegacyHwndVisibility();
-#endif
 }
 
-#if defined(OS_WIN)
-void WebContentsViewAura::UpdateLegacyHwndVisibility() {
-  if (!legacy_hwnd_)
-    return;
-
-  bool visible = (window_->IsVisible() &&
-                  web_contents_->GetRenderWidgetHostView());
-
-  if (visible && GetNativeView() && GetNativeView()->GetHost()) {
-    legacy_hwnd_->UpdateParent(
-        GetNativeView()->GetHost()->GetAcceleratedWidget());
-    legacy_hwnd_->SetBounds(window_->GetBoundsInRootWindow());
-    legacy_hwnd_->Show();
-  } else {
-    // We reparent the legacy Chrome_RenderWidgetHostHWND window to the global
-    // hidden window on the same lines as Windowed plugin windows.
-    legacy_hwnd_->UpdateParent(ui::GetHiddenWindow());
-    legacy_hwnd_->Hide();
-  }
-}
-
-gfx::NativeViewAccessible
-WebContentsViewAura::GetNativeViewAccessible() {
-  BrowserAccessibilityManager* manager =
-      web_contents_->GetRootBrowserAccessibilityManager();
-  if (!manager)
-    return nullptr;
-
-  return manager->GetRoot()->ToBrowserAccessibilityWin();
-}
-#endif
-
 }  // namespace content