diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-05-07 11:21:11 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-05-07 11:21:11 +0200 |
| commit | 2cf6c8816a73e0132bd8fa3b509d62d7c51b6e47 (patch) | |
| tree | 988e8c5b116dd0466244ae2fe5af8ee9be926d76 /Source/WebKit2/UIProcess/win/WebView.cpp | |
| parent | dd91e772430dc294e3bf478c119ef8d43c0a3358 (diff) | |
| download | qtwebkit-2cf6c8816a73e0132bd8fa3b509d62d7c51b6e47.tar.gz | |
Imported WebKit commit 7e538425aa020340619e927792f3d895061fb54b (http://svn.webkit.org/repository/webkit/trunk@116286)
Diffstat (limited to 'Source/WebKit2/UIProcess/win/WebView.cpp')
| -rw-r--r-- | Source/WebKit2/UIProcess/win/WebView.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/WebKit2/UIProcess/win/WebView.cpp b/Source/WebKit2/UIProcess/win/WebView.cpp index 4e4e33f1f..f6e75d68a 100644 --- a/Source/WebKit2/UIProcess/win/WebView.cpp +++ b/Source/WebKit2/UIProcess/win/WebView.cpp @@ -1080,7 +1080,7 @@ void WebView::setScrollOffsetOnNextResize(const IntSize& scrollOffset) m_nextResizeScrollOffset = scrollOffset; } -void WebView::didChangeViewportProperties(const WebCore::ViewportArguments&) +void WebView::didChangeViewportProperties(const WebCore::ViewportAttributes&) { } @@ -1738,7 +1738,8 @@ HRESULT STDMETHODCALLTYPE WebView::Drop(IDataObject* pDataObject, DWORD grfKeySt bool createdExtension = maybeCreateSandboxExtensionFromDragData(data, sandboxExtensionHandle); if (createdExtension) m_page->process()->willAcquireUniversalFileReadSandboxExtension(); - m_page->performDrag(&data, String(), sandboxExtensionHandle); + SandboxExtension::HandleArray sandboxExtensionForUpload; + m_page->performDrag(&data, String(), sandboxExtensionHandle, sandboxExtensionForUpload); return S_OK; } |