Rename adjustPointerLockElement

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

 /*
  * Copyright (C) 2011 Google Inc. All Rights Reserved.
  * Copyright (C) 2012 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 370 matching lines @@
             // - InsertionPoint
             // - shadow host
             // - Document::focusedElement()
             // So, it's safe to do toElement().
             return toElement(eventPath->at(i).target()->toNode());
         }
     }
     return nullptr;
 }
 
-Element* TreeScope::adjustedPointerLockElement(const Element& target) const
+Element* TreeScope::retargetElementIfInSameTreeScope(const Element& target) const
 {
     const Element* adjustedTarget = ⌖
     // Unless the target is in the same TreeScope as |scope|, traverse up shadow trees to
     // find a shadow host that is in the same TreeScope as |scope|.

[kochi, 2016/07/15 05:35:11]

(although I wrote this comment) it seems weird as there is no |scope|
variable, and basically this says the logic below literally, which is
redundant.

     for (const Element* ancestor = ⌖ ancestor; ancestor = ancestor->shadowHost()) {
         // Exception is that if the host has V0 or UA shadow, skip the adjustment because
         // .pointerLockElement is not available for non-V1 shadows.
         // TODO(kochi): Once V0 code is removed, use the same logic as .activeElement for
         // Shadow DOM V1.
         if (ancestor->shadowRootIfV1())
             adjustedTarget = ancestor;
         if (this == ancestor->treeScope())
             return const_cast<Element*>(adjustedTarget);
     }
     return nullptr;
 }
+
 unsigned short TreeScope::comparePosition(const TreeScope& otherScope) const
 {
     if (otherScope == this)
         return Node::DOCUMENT_POSITION_EQUIVALENT;
 
     HeapVector<Member<const TreeScope>, 16> chain1;
     HeapVector<Member<const TreeScope>, 16> chain2;
     const TreeScope* current;
     for (current = this; current; current = current->parentTreeScope())
         chain1.append(current);
@@ skipping 100 matching lines @@
     visitor->trace(m_parentTreeScope);
     visitor->trace(m_idTargetObserverRegistry);
     visitor->trace(m_selection);
     visitor->trace(m_elementsById);
     visitor->trace(m_imageMapsByName);
     visitor->trace(m_scopedStyleResolver);
     visitor->trace(m_radioButtonGroupScope);
 }
 
 } // namespace blink