Changeset 109356 in webkit

Timestamp:

Mar 1, 2012, 9:52:00 AM (15 years ago)

Author:

cevans@google.com

Message:

Merge 108152
BUG=105867
Review URL: ​https://chromiumcodereview.appspot.com/9567012

Location:

branches/chromium/1025

Files:

• LayoutTests/fast/dom/getElementById-consistency-expected.txt (copied) (copied from trunk/LayoutTests/fast/dom/getElementById-consistency-expected.txt )
• LayoutTests/fast/dom/getElementById-consistency.html (copied) (copied from trunk/LayoutTests/fast/dom/getElementById-consistency.html )
• LayoutTests/fast/dom/getElementById-consistency2-expected.txt (copied) (copied from trunk/LayoutTests/fast/dom/getElementById-consistency2-expected.txt )
• LayoutTests/fast/dom/getElementById-consistency2.html (copied) (copied from trunk/LayoutTests/fast/dom/getElementById-consistency2.html )
• Source/WebCore/dom/ContainerNode.cpp (modified) (1 diff)
• Source/WebCore/svg/SVGTRefElement.cpp (modified) (1 diff)

branches/chromium/1025/Source/WebCore/dom/ContainerNode.cpp

@@ -480 +480 @@
     removeBetween(prev, next, child.get());
 
-    // Dispatch post-removal mutation events
-    childrenChanged(false, prev, next, -1);
-    dispatchSubtreeModifiedEvent();
-
     if (child->inDocument())
         child->removedFromDocument();
     else
         child->removedFromTree(true);
+
+    // Dispatch post-removal mutation events
+    childrenChanged(false, prev, next, -1);
+    dispatchSubtreeModifiedEvent();
 
     return child;

branches/chromium/1025/Source/WebCore/svg/SVGTRefElement.cpp

@@ -147 +147 @@
 void SVGTRefElement::updateReferencedText()
 {
-    Element* target = SVGURIReference::targetElementFromIRIString(href(), document());
-    ASSERT(target);
     String textContent;
-    if (target->parentNode())
+    if (Element* target = SVGURIReference::targetElementFromIRIString(href(), document()))
         textContent = target->textContent();
     ExceptionCode ignore = 0;