Introduce Node::containingTreeScope(), which asserts that the node's root is a tree scope

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

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Peter Kelly (pmk@post.com)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  *           (C) 2007 David Smith (catfish.man@gmail.com)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012, 2013 Apple Inc. All rights reserved.
  *           (C) 2007 Eric Seidel (eric@webkit.org)
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 2205 matching lines @@
     detachAttrNodeAtIndex(attr, index);
     return attr;
 }
 
 void Element::parseAttribute(const QualifiedName& name, const AtomicString&, const AtomicString& value)
 {
     if (name == tabindexAttr) {
         int tabindex = 0;
         if (value.isEmpty()) {
             clearTabIndexExplicitlyIfNeeded();
-            if (treeScope().adjustedFocusedElement() == this) {
+            if (adjustedFocusedElementInTreeScope() == this) {
                 // We might want to call blur(), but it's dangerous to dispatch
                 // events here.
                 document().setNeedsFocusedElementCheck();
             }
         } else if (parseHTMLInteger(value, tabindex)) {
             // Clamp tabindex to the range of 'short' to match Firefox's behavior.
             setTabIndexExplicitly(max(static_cast<int>(std::numeric_limits<short>::min()), std::min(tabindex, static_cast<int>(std::numeric_limits<short>::max()))));
         }
     } else if (name == XMLNames::langAttr) {
         pseudoStateChanged(CSSSelector::PseudoLang);
@@ skipping 177 matching lines @@
         frame->selection().setSelection(newSelection,  FrameSelection::CloseTyping | FrameSelection::ClearTypingStyle | FrameSelection::DoNotSetFocus);
         frame->selection().revealSelection();
     } else if (layoutObject() && !layoutObject()->isLayoutPart()) {
         layoutObject()->scrollRectToVisible(boundingBox());
     }
 }
 
 void Element::blur()
 {
     cancelFocusAppearanceUpdate();
-    if (treeScope().adjustedFocusedElement() == this) {
+    if (adjustedFocusedElementInTreeScope() == this) {
         Document& doc = document();
         if (doc.page())
             doc.page()->focusController().setFocusedElement(0, doc.frame());
         else
             doc.clearFocusedElement();
     }
 }
 
 bool Element::supportsFocus() const
 {
@@ skipping 46 matching lines @@
 bool Element::isMouseFocusable() const
 {
     return isFocusable();
 }
 
 bool Element::isFocusedElementInDocument() const
 {
     return this == document().focusedElement();
 }
 
+Element* Element::adjustedFocusedElementInTreeScope() const
+{
+    return isInTreeScope() ? containingTreeScope().adjustedFocusedElement() : nullptr;
+}
+
 void Element::dispatchFocusEvent(Element* oldFocusedElement, WebFocusType type, InputDeviceCapabilities* sourceCapabilities)
 {
     dispatchEvent(FocusEvent::create(EventTypeNames::focus, false, false, document().domWindow(), 0, oldFocusedElement, sourceCapabilities));
 }
 
 void Element::dispatchBlurEvent(Element* newFocusedElement, WebFocusType type, InputDeviceCapabilities* sourceCapabilities)
 {
     dispatchEvent(FocusEvent::create(EventTypeNames::blur, false, false, document().domWindow(), 0, newFocusedElement, sourceCapabilities));
 }
 
@@ skipping 643 matching lines @@
 }
 
 inline void Element::updateId(const AtomicString& oldId, const AtomicString& newId)
 {
     if (!isInTreeScope())
         return;
 
     if (oldId == newId)
         return;
 
-    updateId(treeScope(), oldId, newId);
+    updateId(containingTreeScope(), oldId, newId);
 }
 
 inline void Element::updateId(TreeScope& scope, const AtomicString& oldId, const AtomicString& newId)
 {
     DCHECK(isInTreeScope());
     DCHECK_NE(oldId, newId);
 
     if (!oldId.isEmpty())
         scope.removeElementById(oldId, this);
     if (!newId.isEmpty())
@@ skipping 539 matching lines @@
 
 DEFINE_TRACE_WRAPPERS(Element)
 {
     if (hasRareData()) {
         visitor->traceWrappers(elementRareData());
     }
     ContainerNode::traceWrappers(visitor);
 }
 
 } // namespace blink