Changeset 150733 in webkit

Timestamp:

May 26, 2013 7:07:54 PM (11 years ago)

Author:

akling@apple.com

Message:

Turn TreeScope::focusedNode() into focusedElement().
<​http://webkit.org/b/116802>

Reviewed by Darin Adler.

For the hundredth time, only Elements can be focused!

This change mostly reverts r121079 since that made things unnecessarily complicated
just to tweak the behavior of ShadowRoot.activeElement, an API that we don't expose.
Finding a TreeScope's focused element now does a simple walk up the parent chain instead
of running the full Shadow DOM re-targeting algorithm.

(WebCore::TreeScope::focusedElement):

Simplify and return Element* instead of Node*.

• dom/TreeScope.h:
• dom/TreeScope.cpp:

(WebCore::focusedFrameOwnerElement):

Make this return Element* as the name already suggested.

• dom/Document.cpp:

(WebCore::Document::removeFocusedNodeOfSubtree):

• dom/Element.cpp:

(WebCore::Element::blur):

• dom/ShadowRoot.h:

(WebCore::ShadowRoot::activeElement):

• html/HTMLDocument.cpp:

(WebCore::HTMLDocument::activeElement):

Simplified call sites that were paranoid about getting a non-Element focused node.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Document.cpp (modified) (1 diff)
• dom/Element.cpp (modified) (1 diff)
• dom/ShadowRoot.h (modified) (1 diff)
• dom/TreeScope.cpp (modified) (5 diffs)
• dom/TreeScope.h (modified) (1 diff)
• html/HTMLDocument.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-05-26  Andreas Kling  <akling@apple.com>
+
+        Turn TreeScope::focusedNode() into focusedElement().
+        <http://webkit.org/b/116802>
+
+        Reviewed by Darin Adler.
+
+        For the hundredth time, only Elements can be focused!
+
+        This change mostly reverts r121079 since that made things unnecessarily complicated
+        just to tweak the behavior of ShadowRoot.activeElement, an API that we don't expose.
+        Finding a TreeScope's focused element now does a simple walk up the parent chain instead
+        of running the full Shadow DOM re-targeting algorithm.
+
+        (WebCore::TreeScope::focusedElement):
+
+            Simplify and return Element* instead of Node*.
+
+        * dom/TreeScope.h:
+        * dom/TreeScope.cpp:
+        (WebCore::focusedFrameOwnerElement):
+
+            Make this return Element* as the name already suggested.
+
+        * dom/Document.cpp:
+        (WebCore::Document::removeFocusedNodeOfSubtree):
+        * dom/Element.cpp:
+        (WebCore::Element::blur):
+        * dom/ShadowRoot.h:
+        (WebCore::ShadowRoot::activeElement):
+        * html/HTMLDocument.cpp:
+        (WebCore::HTMLDocument::activeElement):
+
+            Simplified call sites that were paranoid about getting a non-Element focused node.
+
 2013-05-26  Dean Jackson  <dino@apple.com>
 

trunk/Source/WebCore/dom/Document.cpp

@@ -3270 +3270 @@
         return;
 
-    Node* focusedNode = node->treeScope()->focusedNode();
-    if (!focusedNode)
+    Element* focusedElement = node->treeScope()->focusedElement();
+    if (!focusedElement)
         return;
 
     bool nodeInSubtree = false;
     if (amongChildrenOnly)
-        nodeInSubtree = focusedNode->isDescendantOf(node);
+        nodeInSubtree = focusedElement->isDescendantOf(node);
     else
-        nodeInSubtree = (focusedNode == node) || focusedNode->isDescendantOf(node);
+        nodeInSubtree = (focusedElement == node) || focusedElement->isDescendantOf(node);
     
     if (nodeInSubtree)

trunk/Source/WebCore/dom/Element.cpp

@@ -2151 +2151 @@
     cancelFocusAppearanceUpdate();
     Document* doc = document();
-    if (treeScope()->focusedNode() == this) {
+    if (treeScope()->focusedElement() == this) {
         if (doc->frame())
             doc->frame()->page()->focusController()->setFocusedElement(0, doc->frame());

trunk/Source/WebCore/dom/ShadowRoot.h

@@ -102 +102 @@
 inline Element* ShadowRoot::activeElement() const
 {
-    if (Node* node = treeScope()->focusedNode())
-        return node->isElementNode() ? toElement(node) : 0;
-    return 0;
+    return treeScope()->focusedElement();
 }
 

trunk/Source/WebCore/dom/TreeScope.cpp

@@ -1 +1 @@
 /*
  * Copyright (C) 2011 Google Inc. All Rights Reserved.
- * Copyright (C) 2012 Apple Inc. All rights reserved.
+ * Copyright (C) 2012, 2013 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -33 +33 @@
 #include "Document.h"
 #include "Element.h"
-#include "EventPathWalker.h"
 #include "FocusController.h"
 #include "Frame.h"
@@ -44 +43 @@
 #include "HitTestResult.h"
 #include "IdTargetObserverRegistry.h"
-#include "InsertionPoint.h"
 #include "NodeTraversal.h"
 #include "Page.h"
@@ -383 +381 @@
 }
 
-static Node* focusedFrameOwnerElement(Frame* focusedFrame, Frame* currentFrame)
+static Element* focusedFrameOwnerElement(Frame* focusedFrame, Frame* currentFrame)
 {
     for (; focusedFrame; focusedFrame = focusedFrame->tree()->parent()) {
@@ -392 +390 @@
 }
 
-Node* TreeScope::focusedNode()
+Element* TreeScope::focusedElement()
 {
     Document* document = rootNode()->document();
     Node* node = document->focusedNode();
-    if (!node && document->page())
-        node = focusedFrameOwnerElement(document->page()->focusController()->focusedFrame(), document->frame());
-    if (!node)
-        return 0;
-    Vector<Node*> targetStack;
-    for (EventPathWalker walker(node); walker.node(); walker.moveToParent()) {
-        Node* node = walker.node();
-        if (targetStack.isEmpty())
-            targetStack.append(node);
-        else if (walker.isVisitingInsertionPointInReprojection())
-            targetStack.append(targetStack.last());
-        if (node == rootNode())
-            return targetStack.last();
-        if (node->isShadowRoot()) {
-            ASSERT(!targetStack.isEmpty());
-            targetStack.removeLast();
-        }
-    }
-    return 0;
+
+    ASSERT(!node || node->isElementNode());
+    Element* element = toElement(node);
+
+    if (!element && document->page())
+        element = focusedFrameOwnerElement(document->page()->focusController()->focusedFrame(), document->frame());
+    if (!element)
+        return 0;
+    TreeScope* treeScope = element->treeScope();
+    while (treeScope != this && treeScope != document) {
+        element = toShadowRoot(treeScope->rootNode())->host();
+        treeScope = element->treeScope();
+    }
+    if (this != treeScope)
+        return 0;
+    return element;
 }
 

trunk/Source/WebCore/dom/TreeScope.h

@@ -55 +55 @@
     void setParentTreeScope(TreeScope*);
 
-    Node* focusedNode();
+    Element* focusedElement();
     Element* getElementById(const AtomicString&) const;
     const Vector<Element*>* getAllElementsById(const AtomicString&) const;

trunk/Source/WebCore/html/HTMLDocument.cpp

@@ -140 +140 @@
 Element* HTMLDocument::activeElement()
 {
-    if (Node* node = treeScope()->focusedNode())
-        return node->isElementNode() ? toElement(node) : body();
+    if (Element* element = treeScope()->focusedElement())
+        return element;
     return body();
 }