Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3562)

Unified Diff: Source/web/WebPagePopupImpl.cpp

Issue 683013002: Extract a DOMWindow interface from LocalDOMWindow and use it in the idl. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase on top of DOMWindow moves and UseCounter overload for Frame Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/web/WebPagePopupImpl.cpp
diff --git a/Source/web/WebPagePopupImpl.cpp b/Source/web/WebPagePopupImpl.cpp
index 12c741114e2385f36d62a2a66459513419fa1f46..086ba4ee5ce943bd5cc33a1ad5ca9076be9a5e5e 100644
--- a/Source/web/WebPagePopupImpl.cpp
+++ b/Source/web/WebPagePopupImpl.cpp
@@ -249,8 +249,8 @@ bool WebPagePopupImpl::initializePage()
if (AXObjectCache* cache = m_popupClient->ownerElement().document().existingAXObjectCache())
cache->childrenChanged(&m_popupClient->ownerElement());
- ASSERT(frame->domWindow());
- DOMWindowPagePopup::install(*frame->domWindow(), m_popupClient);
+ ASSERT(frame->localDOMWindow());
+ DOMWindowPagePopup::install(*frame->localDOMWindow(), m_popupClient);
ASSERT(m_popupClient->ownerElement().document().existingAXObjectCache() == frame->document()->existingAXObjectCache());
RefPtr<SharedBuffer> data = SharedBuffer::create();
@@ -419,8 +419,8 @@ void WebPagePopupImpl::closePopup()
{
if (m_page) {
toLocalFrame(m_page->mainFrame())->loader().stopAllLoaders();
- ASSERT(m_page->mainFrame()->domWindow());
- DOMWindowPagePopup::uninstall(*m_page->mainFrame()->domWindow());
+ ASSERT(m_page->deprecatedLocalMainFrame()->localDOMWindow());
+ DOMWindowPagePopup::uninstall(*m_page->deprecatedLocalMainFrame()->localDOMWindow());
}
m_closing = true;
@@ -437,7 +437,7 @@ void WebPagePopupImpl::closePopup()
LocalDOMWindow* WebPagePopupImpl::window()
{
- return m_page->mainFrame()->domWindow();
+ return m_page->deprecatedLocalMainFrame()->localDOMWindow();
}
void WebPagePopupImpl::compositeAndReadbackAsync(WebCompositeAndReadbackAsyncCallback* callback)

Powered by Google App Engine
This is Rietveld 408576698