diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-08-21 10:57:44 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-08-21 10:57:44 +0200 |
| commit | 5ef7c8a6a70875d4430752d146bdcb069605d71d (patch) | |
| tree | f6256640b6c46d7da221435803cae65326817ba2 /Source/WebKit/chromium/src/WebPagePopupImpl.cpp | |
| parent | decad929f578d8db641febc8740649ca6c574638 (diff) | |
| download | qtwebkit-5ef7c8a6a70875d4430752d146bdcb069605d71d.tar.gz | |
Imported WebKit commit 356d83016b090995d08ad568f2d2c243aa55e831 (http://svn.webkit.org/repository/webkit/trunk@126147)
New snapshot including various build fixes for newer Qt 5
Diffstat (limited to 'Source/WebKit/chromium/src/WebPagePopupImpl.cpp')
| -rw-r--r-- | Source/WebKit/chromium/src/WebPagePopupImpl.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Source/WebKit/chromium/src/WebPagePopupImpl.cpp b/Source/WebKit/chromium/src/WebPagePopupImpl.cpp index 18f5de20a..fe945c063 100644 --- a/Source/WebKit/chromium/src/WebPagePopupImpl.cpp +++ b/Source/WebKit/chromium/src/WebPagePopupImpl.cpp @@ -191,15 +191,14 @@ bool WebPagePopupImpl::initPage() frame->view()->resize(m_popupClient->contentSize()); frame->view()->setTransparent(false); + DOMWindowPagePopup::install(frame->document()->domWindow(), m_popupClient); + DocumentWriter* writer = frame->loader()->activeDocumentLoader()->writer(); writer->setMIMEType("text/html"); writer->setEncoding("UTF-8", false); writer->begin(); m_popupClient->writeDocument(*writer); writer->end(); - - ASSERT(frame->existingDOMWindow()); - DOMWindowPagePopup::install(frame->existingDOMWindow(), m_popupClient); return true; } |