diff options
| author | Kent Tamura <tkent@chromium.org> | 2016-10-28 09:46:23 +0900 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-03-16 14:47:44 +0000 |
| commit | 965db0de3913007ea170150343a37a7277e78f06 (patch) | |
| tree | 1b808c3218ebb6d29a0d555edbe2f6ca8847c109 /chromium/third_party/WebKit/Source/web | |
| parent | d194a3211caf26866985202eac9d5210f16a941f (diff) | |
[Backport] Merge: "INPUT element: Do not dispatch events in detachLayoutTree()." to M55 branch.
When a color chooser is closed, we dispatches a 'change' event asynchronously.
Some tests need to be updated due to this behavior change.
BUG=658535
Review-Url: https://codereview.chromium.org/2447653002
Cr-Commit-Position: refs/heads/master@{#427286}
(cherry picked from commit fbe37c7239e4a6e75f12c0d35e60987a6aa75ee0)
Review URL: https://codereview.chromium.org/2458743004 .
Change-Id: Icaa7e038198b8c41f98f02dd40910fbf4d1c8270
Cr-Commit-Position: refs/branch-heads/2883@{#353}
Cr-Branched-From: 614d31daee2f61b0180df403a8ad43f20b9f6dd7-refs/heads/master@{#423768}
(CVE-2016-5208)
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/third_party/WebKit/Source/web')
| -rw-r--r-- | chromium/third_party/WebKit/Source/web/WebPagePopupImpl.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chromium/third_party/WebKit/Source/web/WebPagePopupImpl.cpp b/chromium/third_party/WebKit/Source/web/WebPagePopupImpl.cpp index 541a2787747..9fecc3e0790 100644 --- a/chromium/third_party/WebKit/Source/web/WebPagePopupImpl.cpp +++ b/chromium/third_party/WebKit/Source/web/WebPagePopupImpl.cpp @@ -477,6 +477,7 @@ void WebPagePopupImpl::close() void WebPagePopupImpl::closePopup() { + { // This function can be called in EventDispatchForbiddenScope for the main // document, and the following operations dispatch some events. It's safe // because web authors can't listen the events. @@ -496,8 +497,8 @@ void WebPagePopupImpl::closePopup() // closeWidgetSoon() will call this->close() later. m_widgetClient->closeWidgetSoon(); } - - m_popupClient->didClosePopup(); + } + m_popupClient->didClosePopup(); } LocalDOMWindow* WebPagePopupImpl::window() |