Rename inDocument() to inShadowIncludingDocument()

Rename inDocument() to inShadowIncludingDocument()

This CL renames inDocument() to inShadowIncludingDocument(), which better matches what the function does, and makes it consistent with spec terminology.
See the description of the term "Shadow Including Document" in the spec: https://dom.spec.whatwg.org/#in-a-shadow-including-document

BUG=600631
Committed: https://crrev.com/40fbf8f4d6a7af7041d45319d92312755aa28977
Cr-Commit-Position: refs/heads/master@{#385680}

[yuzuchan, 2016-04-05 08:33:13]

yuzus@chromium.org changed reviewers:
+ hayato@chromium.org, kochi@chromium.org

[yuzuchan, 2016-04-05 08:33:14]

This is how I feel about this patch: http://i.imgur.com/T9MxPR1.gif

[hayato, 2016-04-05 09:22:50]

LGTM

Could you rename Node::NodeFlags::InDocumentFlag (in Node.h) too?

https://codereview.chromium.org/1858163002/diff/1/third_party/WebKit/Source/c...
File third_party/WebKit/Source/core/dom/Node.h (right):

https://codereview.chromium.org/1858163002/diff/1/third_party/WebKit/Source/c...
third_party/WebKit/Source/core/dom/Node.h:478: // Returns true if this node is
associated with a document and is in its associated document's
Please update the comment.

// Returns true if this node is in a shadow-including document, false otherwise.

[kochi, 2016-04-05 09:33:18]

lgtm

[yuzuchan, 2016-04-06 05:28:44]

The CQ bit was checked by yuzus@chromium.org

[yuzuchan, 2016-04-06 05:28:45]

The patchset sent to the CQ was uploaded after l-g-t-m from hayato@chromium.org,
kochi@chromium.org
Link to the patchset: https://codereview.chromium.org/1858163002/#ps20001
(title: "Add acomment")

[commit-bot: I haz the power, 2016-04-06 05:29:19]

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

[commit-bot: I haz the power, 2016-04-06 05:41:07]

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

[commit-bot: I haz the power, 2016-04-06 05:41:09]

Try jobs failed on following builders:
  chromium_presubmit on tryserver.chromium.linux (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/chromium_presub...)

[kochi, 2016-04-06 06:20:27]

On 2016/04/06 05:41:09, commit-bot: I haz the power wrote:
> Try jobs failed on following builders:
>   chromium_presubmit on tryserver.chromium.linux (JOB_FAILED,
>
http://build.chromium.org/p/tryserver.chromium.linux/builders/chromium_presub...)

Yuzu, could you ask reviews for OWNERS of the following:

** Presubmit ERRORS **
Missing LGTM from an OWNER for these files:
    third_party/WebKit/Source/bindings/core/v8/RetainedDOMInfo.cpp
    third_party/WebKit/Source/bindings/core/v8/V8GCController.cpp
    third_party/WebKit/Source/modules/canvas2d/CanvasStyle.cpp
    third_party/WebKit/Source/web/RotationViewportAnchor.cpp
    third_party/WebKit/Source/web/TextFinder.cpp

[haraken, 2016-04-06 06:36:40]

On 2016/04/06 06:20:27, kochi wrote:
> On 2016/04/06 05:41:09, commit-bot: I haz the power wrote:
> > Try jobs failed on following builders:
> >   chromium_presubmit on tryserver.chromium.linux (JOB_FAILED,
> >
>
http://build.chromium.org/p/tryserver.chromium.linux/builders/chromium_presub...)
> 
> Yuzu, could you ask reviews for OWNERS of the following:
> 
> ** Presubmit ERRORS **
> Missing LGTM from an OWNER for these files:
>     third_party/WebKit/Source/bindings/core/v8/RetainedDOMInfo.cpp
>     third_party/WebKit/Source/bindings/core/v8/V8GCController.cpp
>     third_party/WebKit/Source/modules/canvas2d/CanvasStyle.cpp
>     third_party/WebKit/Source/web/RotationViewportAnchor.cpp
>     third_party/WebKit/Source/web/TextFinder.cpp

LGTM for everything.

[yuzuchan, 2016-04-06 06:45:09]

yuzus@chromium.org changed reviewers:
+ haraken@chromium.org, junov@chromium.org

[yuzuchan, 2016-04-06 06:45:11]

PTAL

https://codereview.chromium.org/1858163002/diff/1/third_party/WebKit/Source/c...
File third_party/WebKit/Source/core/dom/Node.h (right):

https://codereview.chromium.org/1858163002/diff/1/third_party/WebKit/Source/c...
third_party/WebKit/Source/core/dom/Node.h:478: // Returns true if this node is
associated with a document and is in its associated document's
On 2016/04/05 at 09:22:50, hayato wrote:
> Please update the comment.
> 
> // Returns true if this node is in a shadow-including document, false
otherwise.

Done.

[rune, 2016-04-06 09:39:38]

rune@opera.com changed reviewers:
+ rune@opera.com

[rune, 2016-04-06 09:39:39]

What was wrong with inDocument? To me inShadowIncludingDocument sounds like it
has to be in a shadow tree.

[kochi, 2016-04-06 09:50:07]

On 2016/04/06 09:39:39, rune wrote:
> What was wrong with inDocument? To me inShadowIncludingDocument sounds like it
> has to be in a shadow tree.

Maybe sounds strange at first, but the term is selected in DOM spec
https://dom.spec.whatwg.org/#in-a-shadow-including-document
So this rename is to make it more consistent with the spec terminology.

[rune, 2016-04-06 09:56:06]

On 2016/04/06 09:50:07, kochi wrote:
> On 2016/04/06 09:39:39, rune wrote:
> > What was wrong with inDocument? To me inShadowIncludingDocument sounds like
it
> > has to be in a shadow tree.
> 
> Maybe sounds strange at first, but the term is selected in DOM spec
> https://dom.spec.whatwg.org/#in-a-shadow-including-document
> So this rename is to make it more consistent with the spec terminology.

Ah, I wasn't aware of the term. Would be good to refer to the spec in the CL
description. I read it as "in shadow, including document". Perhaps
inShadowincludingDocument() would be better, I don't know.

The CL description line is way too long and contains a "Doucment" typo.

[Justin Novosad, 2016-04-06 18:03:26]

modules/canvas2d lgtm

[yuzuchan, 2016-04-07 02:43:08]

Description was changed from

==========
Rename inDocument() to inShadowIncludingDocument()

This CL renames inDocument() to inShadowIncludingDoucment(), which better
matches what the function does.

BUG=600631
==========

to

==========
Rename inDocument() to inShadowIncludingDocument()

This CL renames inDocument() to inShadowIncludingDocument(), which better
matches what the function does.

BUG=600631
==========

[yuzuchan, 2016-04-07 03:21:26]

Description was changed from

==========
Rename inDocument() to inShadowIncludingDocument()

This CL renames inDocument() to inShadowIncludingDocument(), which better
matches what the function does.

BUG=600631
==========

to

==========
Rename inDocument() to inShadowIncludingDocument()

This CL renames inDocument() to inShadowIncludingDocument(), which better
matches what the function does, and makes it consistent with spec terminology.
See the description of the term "Shadow Including Document" in the spec:
https://dom.spec.whatwg.org/#in-a-shadow-including-document

BUG=600631
==========

[yuzuchan, 2016-04-07 03:21:36]

The CQ bit was checked by yuzus@chromium.org

[yuzuchan, 2016-04-07 03:21:37]

The patchset sent to the CQ was uploaded after l-g-t-m from hayato@chromium.org,
kochi@chromium.org, haraken@chromium.org
Link to the patchset: https://codereview.chromium.org/1858163002/#ps60001
(title: "Rebase")

[commit-bot: I haz the power, 2016-04-07 03:21:50]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1858163002/60001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1858163002/60001

[commit-bot: I haz the power, 2016-04-07 03:28:22]

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

[commit-bot: I haz the power, 2016-04-07 03:28:25]

Failed to apply patch for third_party/WebKit/Source/core/dom/Node.cpp:
While running git apply --index -3 -p1;
  error: patch failed: third_party/WebKit/Source/core/dom/Node.cpp:618
  Falling back to three-way merge...
  Applied patch to 'third_party/WebKit/Source/core/dom/Node.cpp' with conflicts.
  U third_party/WebKit/Source/core/dom/Node.cpp

Patch:       third_party/WebKit/Source/core/dom/Node.cpp
Index: third_party/WebKit/Source/core/dom/Node.cpp
diff --git a/third_party/WebKit/Source/core/dom/Node.cpp
b/third_party/WebKit/Source/core/dom/Node.cpp
index
cfabb0f2f5256b758ea29e5b0619b660c05c840f..3e7fa9bda395c0c026a238dec612426070f2aa50
100644
--- a/third_party/WebKit/Source/core/dom/Node.cpp
+++ b/third_party/WebKit/Source/core/dom/Node.cpp
@@ -618,7 +618,7 @@ inline static ShadowRoot* oldestShadowRootFor(const Node*
node)
 
 inline static Node& rootInComposedTree(const Node& node)
 {
-    if (node.inDocument())
+    if (node.inShadowIncludingDocument())
         return node.document();
     Node* root = const_cast<Node*>(&node);
     while (Node* host = root->shadowHost())
@@ -639,7 +639,7 @@ bool Node::needsDistributionRecalc() const
 void Node::updateDistribution()
 {
     // Extra early out to avoid spamming traces.
-    if (inDocument() && !document().childNeedsDistributionRecalc())
+    if (inShadowIncludingDocument() &&
!document().childNeedsDistributionRecalc())
         return;
     TRACE_EVENT0("blink", "Node::updateDistribution");
     ScriptForbiddenScope forbidScript;
@@ -694,7 +694,7 @@ void Node::markAncestorsWithChildNeedsStyleInvalidation()
 void Node::markAncestorsWithChildNeedsDistributionRecalc()
 {
     ScriptForbiddenScope forbidScriptDuringRawIteration;
-    if (RuntimeEnabledFeatures::shadowDOMV1Enabled() && inDocument() &&
!document().childNeedsDistributionRecalc()) {
+    if (RuntimeEnabledFeatures::shadowDOMV1Enabled() &&
inShadowIncludingDocument() && !document().childNeedsDistributionRecalc()) {
         // TODO(hayato): Support a non-document composed tree.
         // TODO(hayato): Enqueue a task only if a 'slotchange' event listner is
registered in the document composed tree.
         Microtask::enqueueMicrotask(WTF::bind(&Document::updateDistribution,
RawPtr<Document>(&document())));
@@ -752,7 +752,7 @@ void Node::clearNeedsStyleRecalc()
 
 bool Node::inActiveDocument() const
 {
-    return inDocument() && document().isActive();
+    return inShadowIncludingDocument() && document().isActive();
 }
 
 Node* Node::focusDelegate()
@@ -796,7 +796,7 @@ void Node::clearNodeLists()
 bool Node::isDescendantOf(const Node *other) const
 {
     // Return true if other is an ancestor of this, otherwise false
-    if (!other || !other->hasChildren() || inDocument() != other->inDocument())
+    if (!other || !other->hasChildren() || inShadowIncludingDocument() !=
other->inShadowIncludingDocument())
         return false;
     if (other->treeScope() != treeScope())
         return false;
@@ -827,7 +827,7 @@ bool Node::containsIncludingShadowDOM(const Node* node)
const
     if (document() != node->document())
         return false;
 
-    if (inDocument() != node->inDocument())
+    if (inShadowIncludingDocument() != node->inShadowIncludingDocument())
         return false;
 
     bool hasChildren = isContainerNode() &&
toContainerNode(this)->hasChildren();
@@ -1416,8 +1416,8 @@ unsigned short Node::compareDocumentPosition(const Node*
otherNode, ShadowTreesT
 
     // If one node is in the document and the other is not, we must be
disconnected.
     // If the nodes have different owning documents, they must be disconnected.
 Note that we avoid
-    // comparing Attr nodes here, since they return false from inDocument() all
the time (which seems like a bug).
-    if (start1->inDocument() != start2->inDocument() || (treatment ==
TreatShadowTreesAsDisconnected && start1->treeScope() != start2->treeScope())) {
+    // comparing Attr nodes here, since they return false from
inShadowIncludingDocument() all the time (which seems like a bug).
+    if (start1->inShadowIncludingDocument() !=
start2->inShadowIncludingDocument() || (treatment ==
TreatShadowTreesAsDisconnected && start1->treeScope() != start2->treeScope())) {
         unsigned short direction = (this > otherNode) ?
DOCUMENT_POSITION_PRECEDING : DOCUMENT_POSITION_FOLLOWING;
         return DOCUMENT_POSITION_DISCONNECTED |
DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC | direction;
     }

[commit-bot: I haz the power, 2016-04-07 03:28:34]

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

[yuzuchan, 2016-04-07 04:36:43]

The CQ bit was checked by yuzus@chromium.org

[yuzuchan, 2016-04-07 04:36:44]

The patchset sent to the CQ was uploaded after l-g-t-m from
haraken@chromium.org, hayato@chromium.org, junov@chromium.org,
kochi@chromium.org
Link to the patchset: https://codereview.chromium.org/1858163002/#ps100001
(title: "Rebase")

[commit-bot: I haz the power, 2016-04-07 04:37:03]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1858163002/100001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1858163002/100001

[commit-bot: I haz the power, 2016-04-07 06:41:34]

Committed patchset #6 (id:100001)

[commit-bot: I haz the power, 2016-04-07 06:42:59]

Description was changed from

==========
Rename inDocument() to inShadowIncludingDocument()

This CL renames inDocument() to inShadowIncludingDocument(), which better
matches what the function does, and makes it consistent with spec terminology.
See the description of the term "Shadow Including Document" in the spec:
https://dom.spec.whatwg.org/#in-a-shadow-including-document

BUG=600631
==========

to

==========
Rename inDocument() to inShadowIncludingDocument()

This CL renames inDocument() to inShadowIncludingDocument(), which better
matches what the function does, and makes it consistent with spec terminology.
See the description of the term "Shadow Including Document" in the spec:
https://dom.spec.whatwg.org/#in-a-shadow-including-document

BUG=600631

Committed: https://crrev.com/40fbf8f4d6a7af7041d45319d92312755aa28977
Cr-Commit-Position: refs/heads/master@{#385680}
==========

[commit-bot: I haz the power, 2016-04-07 06:43:02]

Patchset 6 (id:??) landed as
https://crrev.com/40fbf8f4d6a7af7041d45319d92312755aa28977
Cr-Commit-Position: refs/heads/master@{#385680}