Merge "INPUT element: Do not dispatch events in detachLayoutTree()." to M55 branch.

third_party/WebKit/Source/web/WebPagePopupImpl.cpp

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 500 matching lines @@
 void WebPagePopupImpl::close() {
   m_closing = true;
   // In case closePopup() was not called.
   if (m_page)
     cancel();
   m_widgetClient = nullptr;
   deref();
 }
 
 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.
-  EventDispatchForbiddenScope::AllowUserAgentEvents allowEvents;
+  {
+    // 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.
+    EventDispatchForbiddenScope::AllowUserAgentEvents allowEvents;
 
-  if (m_page) {
-    toLocalFrame(m_page->mainFrame())->loader().stopAllLoaders();
-    PagePopupSupplement::uninstall(*toLocalFrame(m_page->mainFrame()));
+    if (m_page) {
+      toLocalFrame(m_page->mainFrame())->loader().stopAllLoaders();
+      PagePopupSupplement::uninstall(*toLocalFrame(m_page->mainFrame()));
+    }
+    bool closeAlreadyCalled = m_closing;
+    m_closing = true;
+
+    destroyPage();
+
+    // m_widgetClient might be 0 because this widget might be already closed.
+    if (m_widgetClient && !closeAlreadyCalled) {
+      // closeWidgetSoon() will call this->close() later.
+      m_widgetClient->closeWidgetSoon();
+    }
   }
-  bool closeAlreadyCalled = m_closing;
-  m_closing = true;
-
-  destroyPage();
-
-  // m_widgetClient might be 0 because this widget might be already closed.
-  if (m_widgetClient && !closeAlreadyCalled) {
-    // closeWidgetSoon() will call this->close() later.
-    m_widgetClient->closeWidgetSoon();
-  }
-
   m_popupClient->didClosePopup();
   m_webView->cleanupPagePopup();
 }
 
 LocalDOMWindow* WebPagePopupImpl::window() {
   return m_page->deprecatedLocalMainFrame()->localDOMWindow();
 }
 
 void WebPagePopupImpl::layoutAndPaintAsync(
     WebLayoutAndPaintAsyncCallback* callback) {
@@ skipping 30 matching lines @@
   // A WebPagePopupImpl instance usually has two references.
   //  - One owned by the instance itself. It represents the visible widget.
   //  - One owned by a WebViewImpl. It's released when the WebViewImpl ask the
   //    WebPagePopupImpl to close.
   // We need them because the closing operation is asynchronous and the widget
   // can be closed while the WebViewImpl is unaware of it.
   return adoptRef(new WebPagePopupImpl(client)).leakRef();
 }
 
 }  // namespace blink