Plumb the correct owner document through DocumentInit::m_owner.

third_party/WebKit/Source/web/WebPagePopupImpl.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 23 matching lines @@
 #include "core/events/MessageEvent.h"
 #include "core/frame/FrameHost.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/Settings.h"
 #include "core/frame/VisualViewport.h"
 #include "core/input/EventHandler.h"
 #include "core/layout/LayoutView.h"
 #include "core/loader/EmptyClients.h"
 #include "core/loader/FrameLoadRequest.h"
-#include "core/page/DOMWindowPagePopup.h"
 #include "core/page/FocusController.h"
 #include "core/page/Page.h"
 #include "core/page/PagePopupClient.h"
+#include "core/page/PagePopupSupplement.h"
 #include "modules/accessibility/AXObject.h"
 #include "modules/accessibility/AXObjectCacheImpl.h"
 #include "platform/EventDispatchForbiddenScope.h"
 #include "platform/LayoutTestSupport.h"
 #include "platform/ScriptForbiddenScope.h"
 #include "platform/TraceEvent.h"
 #include "platform/heap/Handle.h"
 #include "public/platform/WebCompositeAndReadbackAsyncCallback.h"
 #include "public/platform/WebCursorInfo.h"
 #include "public/web/WebAXObject.h"
@@ skipping 229 matching lines @@
     frame->setPagePopupOwner(m_popupClient->ownerElement());
     frame->setView(FrameView::create(frame.get()));
     frame->init();
     frame->view()->setParentVisible(true);
     frame->view()->setSelfVisible(true);
     frame->view()->setTransparent(false);
     if (AXObjectCache* cache = m_popupClient->ownerElement().document().existingAXObjectCache())
         cache->childrenChanged(&m_popupClient->ownerElement());
 
     ASSERT(frame->localDOMWindow());
-    DOMWindowPagePopup::install(*frame->localDOMWindow(), *this, m_popupClient);
+    PagePopupSupplement::install(*frame, *this, m_popupClient);
     ASSERT(m_popupClient->ownerElement().document().existingAXObjectCache() == frame->document()->existingAXObjectCache());
 
     RefPtr<SharedBuffer> data = SharedBuffer::create();
     m_popupClient->writeDocument(data.get());
     frame->loader().load(FrameLoadRequest(0, blankURL(), SubstituteData(data, "text/html", "UTF-8", KURL(), ForceSynchronousLoad)));
     frame->setPageZoomFactor(m_popupClient->zoomFactor());
     return true;
 }
 
 void WebPagePopupImpl::postMessage(const String& message)
@@ skipping 199 matching lines @@
 
 void WebPagePopupImpl::closePopup()
 {
     // This function can be called in EventDispatchForbiddenScope for the main
     // document, and the following operations dispatch some events.  It's safe
     // because web authors can't listen the events.
     EventDispatchForbiddenScope::AllowUserAgentEvents allowEvents;
 
     if (m_page) {
         toLocalFrame(m_page->mainFrame())->loader().stopAllLoaders();
-        ASSERT(m_page->deprecatedLocalMainFrame()->localDOMWindow());
-        DOMWindowPagePopup::uninstall(*m_page->deprecatedLocalMainFrame()->localDOMWindow());
+        PagePopupSupplement::uninstall(*toLocalFrame(m_page->mainFrame()));
     }
     m_closing = true;
 
     destroyPage();
 
     // m_widgetClient might be 0 because this widget might be already closed.
     if (m_widgetClient) {
         // closeWidgetSoon() will call this->close() later.
         m_widgetClient->closeWidgetSoon();
     }
@@ skipping 38 matching lines @@
     // A WebPagePopupImpl instance usually has two references.
     //  - One owned by the instance itself. It represents the visible widget.
     //  - One owned by a WebViewImpl. It's released when the WebViewImpl ask the
     //    WebPagePopupImpl to close.
     // We need them because the closing operation is asynchronous and the widget
     // can be closed while the WebViewImpl is unaware of it.
     return adoptRef(new WebPagePopupImpl(client)).leakRef();
 }
 
 } // namespace blink