Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(211)

Unified Diff: Source/core/dom/ContainerNode.cpp

Issue 23618022: BrowserPlugin/WebView - Move plugin lifetime to DOM (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: ASSERT on ownerElement->widget() == this causes many tests to fail. Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/core/dom/ContainerNode.cpp
diff --git a/Source/core/dom/ContainerNode.cpp b/Source/core/dom/ContainerNode.cpp
index ba1ac83c6632233c263f03136bfa2a66b2f71934..b26282af6e8b8215394669d9c437abfcb2d1fe3f 100644
--- a/Source/core/dom/ContainerNode.cpp
+++ b/Source/core/dom/ContainerNode.cpp
@@ -36,11 +36,12 @@
#include "core/events/MutationEvent.h"
#include "core/events/ThreadLocalEventNames.h"
#include "core/html/HTMLCollection.h"
+#include "core/html/HTMLFrameOwnerElement.h"
#include "core/rendering/InlineTextBox.h"
#include "core/rendering/RenderText.h"
#include "core/rendering/RenderTheme.h"
#include "core/rendering/RenderView.h"
-#include "core/rendering/RenderWidget.h"
+#include "wtf/Vector.h"
using namespace std;
@@ -435,7 +436,7 @@ void ContainerNode::removeChild(Node* oldChild, ExceptionState& exceptionState)
}
{
- RenderWidget::UpdateSuspendScope suspendWidgetHierarchyUpdates;
+ HTMLFrameOwnerElement::UpdateSuspendScope suspendWidgetHierarchyUpdates;
Node* prev = child->previousSibling();
Node* next = child->nextSibling();
@@ -525,7 +526,7 @@ void ContainerNode::removeChildren()
NodeVector removedChildren;
{
- RenderWidget::UpdateSuspendScope suspendWidgetHierarchyUpdates;
+ HTMLFrameOwnerElement::UpdateSuspendScope suspendWidgetHierarchyUpdates;
{
NoEventDispatchAssertion assertNoEventDispatch;
removedChildren.reserveInitialCapacity(childNodeCount());

Powered by Google App Engine
This is Rietveld 408576698