Merge 131709

Source/WebCore/dom/ContainerNodeAlgorithms.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 30 matching lines @@
         // inserted into the document because they haven't.
         if (node->inDocument() && child->parentNode() == node)
             notifyNodeInsertedIntoDocument(child);
     }
 
     if (!node->isElementNode())
         return;
 
     if (ElementShadow* shadow = toElement(node)->shadow()) {
         ShadowRootVector roots(shadow);
-        for (size_t i = 0; i < roots.size(); ++i)
-            notifyNodeInsertedIntoDocument(roots[i].get());
+        for (size_t i = 0; i < roots.size(); ++i) {
+            if (node->inDocument() && roots[i]->host() == node)
+                notifyNodeInsertedIntoDocument(roots[i].get());
+        }
     }
 }
 
 void ChildNodeInsertionNotifier::notifyDescendantInsertedIntoTree(ContainerNode* node)
 {
     for (Node* child = node->firstChild(); child; child = child->nextSibling()) {
         if (child->isContainerNode())
             notifyNodeInsertedIntoTree(toContainerNode(child));
     }
 
@@ skipping 13 matching lines @@
     }
 
     if (!node->isElementNode())
         return;
 
     if (node->document()->cssTarget() == node)
         node->document()->setCSSTarget(0);
 
     if (ElementShadow* shadow = toElement(node)->shadow()) {
         ShadowRootVector roots(shadow);
-        for (size_t i = 0; i < roots.size(); ++i)
-            notifyNodeRemovedFromDocument(roots[i].get());
+        for (size_t i = 0; i < roots.size(); ++i) {
+            if (!node->inDocument() && roots[i]->host() == node)
+                notifyNodeRemovedFromDocument(roots[i].get());
+        }
     }
 }
 
 void ChildNodeRemovalNotifier::notifyDescendantRemovedFromTree(ContainerNode* node)
 {
     for (Node* child = node->firstChild(); child; child = child->nextSibling()) {
         if (child->isContainerNode())
             notifyNodeRemovedFromTree(toContainerNode(child));
     }
 
@@ skipping 13 matching lines @@
         collectDescendant(root, IncludeRoot);
 }
 
 void ChildFrameDisconnector::Target::disconnect()
 {
     ASSERT(isValid());
     toFrameOwnerElement(m_owner.get())->disconnectContentFrame();
 }
 
 }