diff options
author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-06-02 10:43:26 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-06-02 10:44:03 +0200 |
commit | bb91a70e24ac49fd21c1d7c8c91a216961da1e2d (patch) | |
tree | 4c2497e0b093c7b0a25d48e72659dca21a50569a /chromium/third_party/WebKit/Source/web/PopupMenuImpl.h | |
parent | 1ec92e71bb67445775ce64cb081ed25c3d7481f1 (diff) | |
parent | b92421879c003a0857b2074f7e05b3bbbb326569 (diff) | |
download | qtwebengine-chromium-bb91a70e24ac49fd21c1d7c8c91a216961da1e2d.tar.gz |
Merge branch 'upstream-master' into 51-based
Change-Id: I08d36e04494c3bb0c04641ad7c8e53bf418975db
Diffstat (limited to 'chromium/third_party/WebKit/Source/web/PopupMenuImpl.h')
-rw-r--r-- | chromium/third_party/WebKit/Source/web/PopupMenuImpl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chromium/third_party/WebKit/Source/web/PopupMenuImpl.h b/chromium/third_party/WebKit/Source/web/PopupMenuImpl.h index 9ed6b1381c6..fe630f9dc90 100644 --- a/chromium/third_party/WebKit/Source/web/PopupMenuImpl.h +++ b/chromium/third_party/WebKit/Source/web/PopupMenuImpl.h @@ -41,7 +41,7 @@ private: void show() override; void hide() override; void disconnectClient() override; - void updateFromElement() override; + void updateFromElement(UpdateReason) override; // PagePopupClient functions: void writeDocument(SharedBuffer*) override; |