Revert of Implement NativeViewHostAura::InstallClip.

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/file_util.h"
 #include "base/metrics/histogram.h"
@@ skipping 459 matching lines @@
   return web_input_event_modifiers;
 }
 
 }  // namespace
 
 class WebContentsViewAura::WindowObserver
     : public aura::WindowObserver, public aura::WindowTreeHostObserver {
  public:
   explicit WindowObserver(WebContentsViewAura* view)
       : view_(view),
-        host_window_(NULL) {
+        parent_(NULL) {
     view_->window_->AddObserver(this);
 
 #if defined(OS_WIN)
     if (view_->window_->GetRootWindow())
       view_->window_->GetRootWindow()->AddObserver(this);
 #endif
   }
 
   virtual ~WindowObserver() {
     view_->window_->RemoveObserver(this);
     if (view_->window_->GetHost())
       view_->window_->GetHost()->RemoveObserver(this);
-    if (host_window_)
-      host_window_->RemoveObserver(this);
+    if (parent_)
+      parent_->RemoveObserver(this);
+
 #if defined(OS_WIN)
-    if (host_window_) {
-      const aura::Window::Windows& children = host_window_->children();
+    if (parent_) {
+      const aura::Window::Windows& children = parent_->children();
       for (size_t i = 0; i < children.size(); ++i)
         children[i]->RemoveObserver(this);
     }
 
     aura::Window* root_window = view_->window_->GetRootWindow();
     if (root_window) {
       root_window->RemoveObserver(this);
       const aura::Window::Windows& root_children = root_window->children();
       for (size_t i = 0; i < root_children.size(); ++i)
         root_children[i]->RemoveObserver(this);
     }
 #endif
   }
 
   // Overridden from aura::WindowObserver:
 #if defined(OS_WIN)
   // Constrained windows are added as children of the parent's parent's view
   // which may overlap with windowed NPAPI plugins. In that case, tell the RWHV
   // so that it can update the plugins' cutout rects accordingly.
   // Note: this is hard coding how Chrome layer adds its dialogs. Since NPAPI is
   // going to be deprecated in a year, this is ok for now. The test for this is
   // PrintPreviewTest.WindowedNPAPIPluginHidden.
   virtual void OnWindowAdded(aura::Window* new_window) OVERRIDE {
-    if (!new_window->Contains(view_->window_.get())) {
+    if (new_window != view_->window_) {
       // Skip the case when the parent moves to the root window.
-      if (new_window != host_window_) {
+      if (new_window != parent_) {
         // Observe sibling windows of the WebContents, or children of the root
         // window.
-        if (new_window->parent() == host_window_ ||
+        if (new_window->parent() == parent_ ||
             new_window->parent() == view_->window_->GetRootWindow()) {
           new_window->AddObserver(this);
         }
       }
     }
 
-    if (new_window->parent() == host_window_) {
+    if (new_window->parent() == parent_) {
       UpdateConstrainedWindows(NULL);
     }
   }
 
   virtual void OnWillRemoveWindow(aura::Window* window) OVERRIDE {
     if (window == view_->window_)
       return;
 
     window->RemoveObserver(this);
     UpdateConstrainedWindows(window);
   }
 
   virtual void OnWindowVisibilityChanged(aura::Window* window,
                                          bool visible) OVERRIDE {
     if (window == view_->window_ ||
-        window->parent() == host_window_ ||
+        window->parent() == parent_ ||
         window->parent() == view_->window_->GetRootWindow()) {
       UpdateConstrainedWindows(NULL);
     }
   }
 #endif
 
   virtual void OnWindowParentChanged(aura::Window* window,
                                      aura::Window* parent) OVERRIDE {
     if (window != view_->window_)
       return;
-
-    aura::Window* host_window =
-        window->GetProperty(aura::client::kHostWindowKey);
-    if (!host_window)
-      host_window = parent;
-
-    if (host_window_)
-      host_window_->RemoveObserver(this);
+    if (parent_)
+      parent_->RemoveObserver(this);
 
 #if defined(OS_WIN)
-    if (host_window_) {
-      const aura::Window::Windows& children = host_window_->children();
+    if (parent_) {
+      const aura::Window::Windows& children = parent_->children();
       for (size_t i = 0; i < children.size(); ++i)
         children[i]->RemoveObserver(this);
 
       RenderWidgetHostViewAura* view = ToRenderWidgetHostViewAura(
           view_->web_contents_->GetRenderWidgetHostView());
       if (view)
         view->UpdateConstrainedWindowRects(std::vector<gfx::Rect>());
     }
 
     // When we get parented to the root window, the code below will watch the
-    // host window, aka root window. Since we already watch the root window on
+    // parent, aka root window. Since we already watch the root window on
     // Windows, unregister first so that the debug check doesn't fire.
-    if (host_window && host_window == window->GetRootWindow())
-      host_window->RemoveObserver(this);
+    if (parent && parent == window->GetRootWindow())
+      parent->RemoveObserver(this);
 
     // We need to undo the above if we were parented to the root window and then
     // got parented to another window. At that point, the code before the ifdef
     // would have stopped watching the root window.
     if (window->GetRootWindow() &&
-        host_window != window->GetRootWindow() &&
+        parent != window->GetRootWindow() &&
         !window->GetRootWindow()->HasObserver(this)) {
       window->GetRootWindow()->AddObserver(this);
     }
 #endif
 
-    host_window_ = host_window;
-    if (host_window) {
-      host_window->AddObserver(this);
+    parent_ = parent;
+    if (parent) {
+      parent->AddObserver(this);
 #if defined(OS_WIN)
-      if (host_window != window->GetRootWindow()) {
-        const aura::Window::Windows& children = host_window->children();
+      if (parent != window->GetRootWindow()) {
+        const aura::Window::Windows& children = parent->children();
         for (size_t i = 0; i < children.size(); ++i) {
-          if (!children[i]->Contains(view_->window_.get()))
+          if (children[i] != view_->window_)
             children[i]->AddObserver(this);
         }
       }
 #endif
     }
   }
 
   virtual void OnWindowBoundsChanged(aura::Window* window,
                                      const gfx::Rect& old_bounds,
                                      const gfx::Rect& new_bounds) OVERRIDE {
-    if (window == host_window_ || window == view_->window_) {
+    if (window == parent_ || window == view_->window_) {
       SendScreenRects();
       if (view_->touch_editable_)
         view_->touch_editable_->UpdateEditingController();
 #if defined(OS_WIN)
     } else {
       UpdateConstrainedWindows(NULL);
 #endif
     }
   }
 
@@ skipping 10 matching lines @@
   virtual 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_) {
+        if (root_children[i] != view_->window_ && root_children[i] != parent_)
           root_children[i]->RemoveObserver(this);
-        }
       }
 #endif
     }
   }
 
   // Overridden WindowTreeHostObserver:
   virtual void OnHostMoved(const aura::WindowTreeHost* host,
                            const gfx::Point& new_origin) OVERRIDE {
     TRACE_EVENT1("ui",
                  "WebContentsViewAura::WindowObserver::OnHostMoved",
@@ skipping 10 matching lines @@
   }
 
 #if defined(OS_WIN)
   void UpdateConstrainedWindows(aura::Window* exclude) {
     RenderWidgetHostViewAura* view = ToRenderWidgetHostViewAura(
         view_->web_contents_->GetRenderWidgetHostView());
     if (!view)
       return;
 
     std::vector<gfx::Rect> constrained_windows;
-    if (host_window_) {
-      const aura::Window::Windows& children = host_window_->children();
+    if (parent_) {
+      const aura::Window::Windows& children = parent_->children();
       for (size_t i = 0; i < children.size(); ++i) {
-        if (!children[i]->Contains(view_->window_.get()) &&
+        if (children[i] != view_->window_ &&
             children[i] != exclude &&
             children[i]->IsVisible()) {
           constrained_windows.push_back(children[i]->GetBoundsInRootWindow());
         }
       }
     }
 
     aura::Window* root_window = view_->window_->GetRootWindow();
     const aura::Window::Windows& root_children = root_window->children();
     if (root_window) {
       for (size_t i = 0; i < root_children.size(); ++i) {
         if (root_children[i]->IsVisible() &&
             !root_children[i]->Contains(view_->window_.get())) {
           constrained_windows.push_back(
               root_children[i]->GetBoundsInRootWindow());
         }
       }
     }
 
     view->UpdateConstrainedWindowRects(constrained_windows);
   }
 #endif
 
   WebContentsViewAura* view_;
 
-  // The parent window that hosts the constrained windows. We cache the old host
-  // view so that we can unregister when it's not the parent anymore.
-  aura::Window* host_window_;
+  // We cache the old parent so that we can unregister when it's not the parent
+  // anymore.
+  aura::Window* parent_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowObserver);
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 // WebContentsViewAura, public:
 
 WebContentsViewAura::WebContentsViewAura(
     WebContentsImpl* web_contents,
     WebContentsViewDelegate* delegate)
@@ skipping 854 matching lines @@
 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(web_contents_, visible);
 }
 
 }  // namespace content