diff options
| author | Steve Block <steveblock@google.com> | 2009-12-15 10:12:09 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2009-12-17 17:41:10 +0000 |
| commit | 643ca7872b450ea4efacab6188849e5aac2ba161 (patch) | |
| tree | 6982576c228bcd1a7efe98afed544d840751094c /WebKit/win/WebDropSource.cpp | |
| parent | d026980fde6eb3b01c1fe49441174e89cd1be298 (diff) | |
| download | external_webkit-643ca7872b450ea4efacab6188849e5aac2ba161.zip external_webkit-643ca7872b450ea4efacab6188849e5aac2ba161.tar.gz external_webkit-643ca7872b450ea4efacab6188849e5aac2ba161.tar.bz2 | |
Merge webkit.org at r51976 : Initial merge by git.
Change-Id: Ib0e7e2f0fb4bee5a186610272edf3186f0986b43
Diffstat (limited to 'WebKit/win/WebDropSource.cpp')
| -rw-r--r-- | WebKit/win/WebDropSource.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/WebKit/win/WebDropSource.cpp b/WebKit/win/WebDropSource.cpp index 5c26b37..294c337 100644 --- a/WebKit/win/WebDropSource.cpp +++ b/WebKit/win/WebDropSource.cpp @@ -107,9 +107,7 @@ STDMETHODIMP WebDropSource::QueryContinueDrag(BOOL fEscapePressed, DWORD grfKeyS if (fEscapePressed || !(grfKeyState & (MK_LBUTTON|MK_RBUTTON))) { m_dropped = !fEscapePressed; return fEscapePressed? DRAGDROP_S_CANCEL : DRAGDROP_S_DROP; - } else if (Page* page = m_webView->page()) - if (Frame* frame = page->mainFrame()) - frame->eventHandler()->dragSourceMovedTo(generateMouseEvent(m_webView.get(), true)); + } return S_OK; } |