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/win/WebFrame.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/win/WebFrame.cpp')
| -rw-r--r-- | Source/WebKit/win/WebFrame.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/WebKit/win/WebFrame.cpp b/Source/WebKit/win/WebFrame.cpp index ff560c67b..d1880cf3f 100644 --- a/Source/WebKit/win/WebFrame.cpp +++ b/Source/WebKit/win/WebFrame.cpp @@ -478,7 +478,7 @@ HRESULT WebFrame::DOMWindow(/* [retval][out] */ IDOMWindow** window) *window = 0; if (Frame* coreFrame = core(this)) { - if (WebCore::DOMWindow* coreWindow = coreFrame->domWindow()) + if (WebCore::DOMWindow* coreWindow = coreFrame->document()->domWindow()) *window = ::DOMWindow::createInstance(coreWindow); } @@ -989,7 +989,7 @@ HRESULT STDMETHODCALLTYPE WebFrame::pendingFrameUnloadEventCount( if (!coreFrame) return E_FAIL; - *result = coreFrame->domWindow()->pendingUnloadEventListeners(); + *result = coreFrame->document()->domWindow()->pendingUnloadEventListeners(); return S_OK; } |