diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-05-25 15:09:11 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-05-25 15:09:11 +0200 |
| commit | a89b2ebb8e192c5e8cea21079bda2ee2c0c7dddd (patch) | |
| tree | b7abd9f49ae1d4d2e426a5883bfccd42b8e2ee12 /Source/WebKit/chromium/src/ExternalPopupMenu.cpp | |
| parent | 8d473cf9743f1d30a16a27114e93bd5af5648d23 (diff) | |
| download | qtwebkit-a89b2ebb8e192c5e8cea21079bda2ee2c0c7dddd.tar.gz | |
Imported WebKit commit eb5c1b8fe4d4b1b90b5137433fc58a91da0e6878 (http://svn.webkit.org/repository/webkit/trunk@118516)
Diffstat (limited to 'Source/WebKit/chromium/src/ExternalPopupMenu.cpp')
| -rw-r--r-- | Source/WebKit/chromium/src/ExternalPopupMenu.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Source/WebKit/chromium/src/ExternalPopupMenu.cpp b/Source/WebKit/chromium/src/ExternalPopupMenu.cpp index 63fa3aeac..1855401c4 100644 --- a/Source/WebKit/chromium/src/ExternalPopupMenu.cpp +++ b/Source/WebKit/chromium/src/ExternalPopupMenu.cpp @@ -69,7 +69,12 @@ void ExternalPopupMenu::show(const IntRect& rect, FrameView* v, int index) return; m_webExternalPopupMenu = m_webViewClient->createExternalPopupMenu(info, this); - m_webExternalPopupMenu->show(v->contentsToWindow(rect)); + if (m_webExternalPopupMenu) + m_webExternalPopupMenu->show(v->contentsToWindow(rect)); + else { + // The client might refuse to create a popup (when there is already one pending to be shown for example). + didCancel(); + } } void ExternalPopupMenu::hide() |