CONTINUED Make FrameSelection to hold non-canonicalized positions

third_party/WebKit/Source/core/dom/TreeScopeAdopter.cpp

Index: third_party/WebKit/Source/core/dom/TreeScopeAdopter.cpp
diff --git a/third_party/WebKit/Source/core/dom/TreeScopeAdopter.cpp b/third_party/WebKit/Source/core/dom/TreeScopeAdopter.cpp
index 8600f7773cf3b11aa8b994cf5d819644ce31eddf..a544590e7d1d43cff80ee5f8cdf6d2d450b95d78 100644
--- a/third_party/WebKit/Source/core/dom/TreeScopeAdopter.cpp
+++ b/third_party/WebKit/Source/core/dom/TreeScopeAdopter.cpp
@@ -36,6 +36,14 @@
 
 namespace blink {
 
+void TreeScopeAdopter::execute() const {
+  moveTreeToNewScope(*m_toAdopt);
+  Document& oldDocument = oldScope().document();
+  if (oldDocument == newScope().document())
+    return;
+  oldDocument.didMoveTreeToNewDocument(*m_toAdopt);
+}
+
 void TreeScopeAdopter::moveTreeToNewScope(Node& root) const {
   DCHECK(needsScopeChange());
 
@@ -48,8 +56,6 @@ void TreeScopeAdopter::moveTreeToNewScope(Node& root) const {
   Document& oldDocument = oldScope().document();
   Document& newDocument = newScope().document();
   bool willMoveToNewDocument = oldDocument != newDocument;
-  if (willMoveToNewDocument)
-    oldDocument.incDOMTreeVersion();
 
   for (Node& node : NodeTraversal::inclusiveDescendantsOf(root)) {
     updateTreeScope(node);
@@ -78,9 +84,6 @@ void TreeScopeAdopter::moveTreeToNewScope(Node& root) const {
         moveTreeToNewDocument(*shadow, oldDocument, newDocument);
     }
   }
-  if (!willMoveToNewDocument)
-    return;
-  oldDocument.didMoveTreeToNewDocument(root);
 }
 
 void TreeScopeAdopter::moveTreeToNewDocument(Node& root,