[merge to M53] Make sure Widget::dispose() respects UpdateSuspendScope.

third_party/WebKit/Source/core/html/HTMLFrameOwnerElement.cpp

 /*
  * Copyright (C) 2006, 2007, 2009 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 36 matching lines @@
 
 using WidgetSet = HeapHashSet<Member<Widget>>;
 static WidgetSet& widgetsPendingTemporaryRemovalFromParent()
 {
     // Widgets in this set will not leak because it will be cleared in
     // HTMLFrameOwnerElement::UpdateSuspendScope::performDeferredWidgetTreeOperations.
     DEFINE_STATIC_LOCAL(WidgetSet, set, (new WidgetSet));
     return set;
 }
 
+static WidgetSet& widgetsPendingDispose()
+{
+    DEFINE_STATIC_LOCAL(WidgetSet, set, (new WidgetSet));
+    return set;
+}
+
 SubframeLoadingDisabler::SubtreeRootSet& SubframeLoadingDisabler::disabledSubtreeRoots()
 {
     DEFINE_STATIC_LOCAL(SubtreeRootSet, nodes, (new SubtreeRootSet));
     return nodes;
 }
 
 static unsigned s_updateSuspendCount = 0;
 
 HTMLFrameOwnerElement::UpdateSuspendScope::UpdateSuspendScope()
 {
@@ skipping 11 matching lines @@
         if (newParent != currentParent) {
             if (currentParent)
                 currentParent->removeChild(child);
             if (newParent)
                 newParent->addChild(child);
             if (currentParent && !newParent)
                 child->dispose();
         }
     }
 
-    WidgetSet set;
-    widgetsPendingTemporaryRemovalFromParent().swap(set);
-    for (const auto& widget : set) {
-        FrameView* currentParent = toFrameView(widget->parent());
-        if (currentParent)
-            currentParent->removeChild(widget.get());
+    {
+        WidgetSet set;
+        widgetsPendingTemporaryRemovalFromParent().swap(set);
+        for (const auto& widget : set) {
+            FrameView* currentParent = toFrameView(widget->parent());
+            if (currentParent)
+                currentParent->removeChild(widget.get());
+        }
+    }
+
+    {
+        WidgetSet set;
+        widgetsPendingDispose().swap(set);
+        for (const auto& widget : set) {
+            widget->dispose();
+        }
     }
 }
 
 HTMLFrameOwnerElement::UpdateSuspendScope::~UpdateSuspendScope()
 {
     ASSERT(s_updateSuspendCount > 0);
     if (s_updateSuspendCount == 1)
         performDeferredWidgetTreeOperations();
     --s_updateSuspendCount;
 }
@@ skipping 99 matching lines @@
     // the subframe hasn't been created yet.
     if (contentFrame())
         document().frame()->loader().client()->didChangeSandboxFlags(contentFrame(), flags);
 }
 
 bool HTMLFrameOwnerElement::isKeyboardFocusable() const
 {
     return m_contentFrame && HTMLElement::isKeyboardFocusable();
 }
 
+void HTMLFrameOwnerElement::disposeWidgetSoon(Widget* widget)
+{
+    if (s_updateSuspendCount) {
+        widgetsPendingDispose().add(widget);
+        return;
+    }
+    widget->dispose();
+}
+
 void HTMLFrameOwnerElement::dispatchLoad()
 {
     dispatchScopedEvent(Event::create(EventTypeNames::load));
 }
 
 const WebVector<WebPermissionType>& HTMLFrameOwnerElement::delegatedPermissions() const
 {
     DEFINE_STATIC_LOCAL(WebVector<WebPermissionType>, permissions, ());
     return permissions;
 }
@@ skipping 86 matching lines @@
 DEFINE_TRACE(HTMLFrameOwnerElement)
 {
     visitor->trace(m_contentFrame);
     visitor->trace(m_widget);
     HTMLElement::trace(visitor);
     FrameOwner::trace(visitor);
 }
 
 
 } // namespace blink