summaryrefslogtreecommitdiff
path: root/chromium/third_party/WebKit/Source/web/PopupMenuImpl.cpp
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2016-06-02 10:43:26 +0200
committerAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2016-06-02 10:44:03 +0200
commitbb91a70e24ac49fd21c1d7c8c91a216961da1e2d (patch)
tree4c2497e0b093c7b0a25d48e72659dca21a50569a /chromium/third_party/WebKit/Source/web/PopupMenuImpl.cpp
parent1ec92e71bb67445775ce64cb081ed25c3d7481f1 (diff)
parentb92421879c003a0857b2074f7e05b3bbbb326569 (diff)
downloadqtwebengine-chromium-bb91a70e24ac49fd21c1d7c8c91a216961da1e2d.tar.gz
Merge branch 'upstream-master' into 51-based
Change-Id: I08d36e04494c3bb0c04641ad7c8e53bf418975db
Diffstat (limited to 'chromium/third_party/WebKit/Source/web/PopupMenuImpl.cpp')
-rw-r--r--chromium/third_party/WebKit/Source/web/PopupMenuImpl.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/chromium/third_party/WebKit/Source/web/PopupMenuImpl.cpp b/chromium/third_party/WebKit/Source/web/PopupMenuImpl.cpp
index 8334670156b..fc3e634e12c 100644
--- a/chromium/third_party/WebKit/Source/web/PopupMenuImpl.cpp
+++ b/chromium/third_party/WebKit/Source/web/PopupMenuImpl.cpp
@@ -481,7 +481,7 @@ void PopupMenuImpl::hide()
m_chromeClient->closePagePopup(m_popup);
}
-void PopupMenuImpl::updateFromElement()
+void PopupMenuImpl::updateFromElement(UpdateReason)
{
if (m_needsUpdate)
return;