Simplify inDetach() assert and make it stronger.

Simplify inDetach() assert and make it stronger.

Instead of just checking inDetach() on a single node at a time, just forbid
setFocusedElement from running at all inside ::detach since it's never okay
to do that.

This also allows adding future asserts about what code cannot be run inside
::detach.

R=timloh@chromium.org

Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=196988

[esprehn, 2015-06-11 17:30:01]

esprehn@chromium.org changed reviewers:
+ jchaffraix@chromium.org, ojan@chromium.org, rune@opera.com,
timloh@chromium.org

[esprehn, 2015-06-11 17:30:07]

The CQ bit was checked by esprehn@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2015-06-11 17:30:38]

Dry run: CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1175173002/1

[commit-bot: I haz the power, 2015-06-11 18:57:26]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-06-11 18:57:26]

Dry run: This issue passed the CQ dry run.

[dglazkov, 2015-06-11 23:03:54]

dglazkov@chromium.org changed reviewers:
+ dglazkov@chromium.org

[dglazkov, 2015-06-11 23:03:54]

The CQ bit was checked by dglazkov@chromium.org

[dglazkov, 2015-06-11 23:03:55]

lgtm

[commit-bot: I haz the power, 2015-06-11 23:04:07]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1175173002/1

[commit-bot: I haz the power, 2015-06-11 23:08:07]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-06-11 23:08:09]

Failed to apply patch for Source/core/dom/Node.cpp:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file Source/core/dom/Node.cpp
  Hunk #1 succeeded at 931 (offset 1 line).
  Hunk #2 FAILED at 957.
  1 out of 2 hunks FAILED -- saving rejects to file Source/core/dom/Node.cpp.rej

Patch:       Source/core/dom/Node.cpp
Index: Source/core/dom/Node.cpp
diff --git a/Source/core/dom/Node.cpp b/Source/core/dom/Node.cpp
index
aa67a5ea3fc523d3fff4d823531b89ee4e66fac3..3bd7455968a21c154f7f0c0781b83545e2b1f0ba
100644
--- a/Source/core/dom/Node.cpp
+++ b/Source/core/dom/Node.cpp
@@ -930,29 +930,11 @@ void Node::attach(const AttachContext&)
         cache->updateCacheAfterNodeIsAttached(this);
 }
 
-#if ENABLE(ASSERT)
-static Node* detachingNode;
-
-bool Node::inDetach() const
-{
-    return detachingNode == this;
-}
-#endif
-
 void Node::detach(const AttachContext& context)
 {
     ASSERT(document().lifecycle().stateAllowsDetach());
     DocumentLifecycle::DetachScope willDetach(document().lifecycle());
 
-#if ENABLE(ASSERT)
-    // The detaching might trigger destruction of a popup menu window,
-    // with ensuing detachment of its Nodes. In a separate document, so
-    // don't assert for these, but do set detachingNode to the most recent
-    // Node being detached.
-    ASSERT(!detachingNode || detachingNode->document() != document());
-    detachingNode = this;
-#endif
-
     if (layoutObject())
         layoutObject()->destroyAndCleanupAnonymousWrappers();
     setLayoutObject(nullptr);
@@ -975,10 +957,6 @@ void Node::detach(const AttachContext& context)
     document().styleEngine().styleInvalidator().clearInvalidation(*this);
     clearChildNeedsStyleInvalidation();
     clearNeedsStyleInvalidation();
-
-#if ENABLE(ASSERT)
-    detachingNode = nullptr;
-#endif
 }
 
 void Node::reattachWhitespaceSiblingsIfNeeded(Text* start)

[esprehn, 2015-06-12 00:16:25]

The CQ bit was checked by esprehn@chromium.org

[esprehn, 2015-06-12 00:16:26]

The patchset sent to the CQ was uploaded after l-g-t-m from
dglazkov@chromium.org
Link to the patchset: https://codereview.chromium.org/1175173002/#ps20001
(title: "Rebase.")

[commit-bot: I haz the power, 2015-06-12 00:16:35]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1175173002/20001

[commit-bot: I haz the power, 2015-06-12 02:03:34]

Committed patchset #2 (id:20001) as
https://src.chromium.org/viewvc/blink?view=rev&revision=196988