Plumb the correct owner document through DocumentInit::m_owner.

third_party/WebKit/Source/core/page/PagePopupSupplement.cpp

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 10 matching lines @@
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "core/page/DOMWindowPagePopup.h"
+#include "core/page/PagePopupSupplement.h"
 
-#include "core/frame/LocalDOMWindow.h"
 #include "core/page/PagePopupController.h"
 
 namespace blink {
 
-DOMWindowPagePopup::DOMWindowPagePopup(PagePopup& popup, PagePopupClient* popupClient)
+PagePopupSupplement::PagePopupSupplement(PagePopup& popup, PagePopupClient* popupClient)
     : m_controller(PagePopupController::create(popup, popupClient))
 {
     ASSERT(popupClient);
 }
 
-DEFINE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(DOMWindowPagePopup);
+DEFINE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(PagePopupSupplement);
 
-const char* DOMWindowPagePopup::supplementName()
+const char* PagePopupSupplement::supplementName()
 {
-    return "DOMWindowPagePopup";
+    return "PagePopupSupplement";
 }
 
-PagePopupController* DOMWindowPagePopup::pagePopupController(DOMWindow& window)
+PagePopupController* PagePopupSupplement::pagePopupController(LocalFrame& frame)
 {
-    DOMWindowPagePopup* supplement = static_cast<DOMWindowPagePopup*>(from(&toLocalDOMWindow(window), supplementName()));
+    PagePopupSupplement* supplement = static_cast<PagePopupSupplement*>(from(&frame, supplementName()));
     ASSERT(supplement);
     return supplement->m_controller.get();
 }
 
-void DOMWindowPagePopup::install(LocalDOMWindow& window, PagePopup& popup, PagePopupClient* popupClient)
+void PagePopupSupplement::install(LocalFrame& frame, PagePopup& popup, PagePopupClient* popupClient)
 {
     ASSERT(popupClient);
-    provideTo(window, supplementName(), adoptPtrWillBeNoop(new DOMWindowPagePopup(popup, popupClient)));
+    provideTo(frame, supplementName(), adoptPtrWillBeNoop(new PagePopupSupplement(popup, popupClient)));
 }
 
-void DOMWindowPagePopup::uninstall(LocalDOMWindow& window)
+void PagePopupSupplement::uninstall(LocalFrame& frame)
 {
-    pagePopupController(window)->clearPagePopupClient();
-    window.removeSupplement(supplementName());
+    pagePopupController(frame)->clearPagePopupClient();
+    frame.removeSupplement(supplementName());
 }
 
-DEFINE_TRACE(DOMWindowPagePopup)
+DEFINE_TRACE(PagePopupSupplement)
 {
     visitor->trace(m_controller);
-    WillBeHeapSupplement<LocalDOMWindow>::trace(visitor);
+    WillBeHeapSupplement<LocalFrame>::trace(visitor);
 }
 
 } // namespace blink