Changeset 85680 in webkit

Timestamp:

May 3, 2011 4:08:21 PM (13 years ago)

Author:

rolandsteiner@chromium.org

Message:

2011-05-03 Roland Steiner <​rolandsteiner@chromium.org>

Reviewed by Dimitri Glazkov.

Allow access keys to be used in shadow DOM
​https://bugs.webkit.org/show_bug.cgi?id=59979

Move access key methods and members back to Document from TreeScope.
Also traverse into shadow trees when building the access key map.

No new tests. (refactoring)

• dom/Document.cpp: (WebCore::Document::Document): (WebCore::Document::getElementByAccessKey): (WebCore::Document::buildAccessKeyMap): (WebCore::Document::invalidateAccessKeyMap):
• dom/Document.h:
• dom/TreeScope.cpp: (WebCore::TreeScope::TreeScope): (WebCore::TreeScope::destroyTreeScopeData):
• dom/TreeScope.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Document.cpp (modified) (2 diffs)
• dom/Document.h (modified) (3 diffs)
• dom/TreeScope.cpp (modified) (3 diffs)
• dom/TreeScope.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-03  Roland Steiner  <rolandsteiner@chromium.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        Allow access keys to be used in shadow DOM
+        https://bugs.webkit.org/show_bug.cgi?id=59979
+
+        Move access key methods and members back to Document from TreeScope.
+        Also traverse into shadow trees when building the access key map.
+
+        No new tests. (refactoring)
+
+        * dom/Document.cpp:
+        (WebCore::Document::Document):
+        (WebCore::Document::getElementByAccessKey):
+        (WebCore::Document::buildAccessKeyMap):
+        (WebCore::Document::invalidateAccessKeyMap):
+        * dom/Document.h:
+        * dom/TreeScope.cpp:
+        (WebCore::TreeScope::TreeScope):
+        (WebCore::TreeScope::destroyTreeScopeData):
+        * dom/TreeScope.h:
+
 2011-05-03  Dan Bernstein  <mitz@apple.com>
 

trunk/Source/WebCore/dom/Document.cpp

@@ -401 +401 @@
     , m_createRenderers(true)
     , m_inPageCache(false)
+    , m_accessKeyMapValid(false)
     , m_useSecureKeyboardEntryWhenActive(false)
     , m_isXHTML(isXHTML)
@@ -608 +609 @@
 {
     return TreeScope::getElementById(id);
+}
+
+Element* Document::getElementByAccessKey(const String& key)
+{
+    if (key.isEmpty())
+        return 0;
+    if (!m_accessKeyMapValid) {
+        buildAccessKeyMap(this);
+        m_accessKeyMapValid = true;
+    }
+    return m_elementsByAccessKey.get(key.impl());
+}
+
+void Document::buildAccessKeyMap(ContainerNode* root)
+{
+     for (Node* n = root; n; n = n->traverseNextNode(root)) {
+        if (!n->isElementNode())
+            continue;
+        Element* element = static_cast<Element*>(n);
+        const AtomicString& accessKey = element->getAttribute(accesskeyAttr);
+        if (!accessKey.isEmpty())
+            m_elementsByAccessKey.set(accessKey.impl(), element);
+        buildAccessKeyMap(element->shadowRoot());
+    }
+}
+
+void Document::invalidateAccessKeyMap()
+{
+    m_accessKeyMapValid = false;
+    m_elementsByAccessKey.clear();
 }
 

trunk/Source/WebCore/dom/Document.h

@@ -246 +246 @@
     Element* getElementById(const AtomicString& id) const;
 
+    Element* getElementByAccessKey(const String& key);
+    void invalidateAccessKeyMap();
+
     // DOM methods & attributes for Document
 
@@ -1120 +1123 @@
     void cacheDocumentElement() const;
 
+    void buildAccessKeyMap(ContainerNode* root);
+
     void createStyleSelector();
 
@@ -1331 +1336 @@
     HashSet<Element*> m_privateBrowsingStateChangedElements;
 
+    HashMap<StringImpl*, Element*, CaseFoldingHash> m_elementsByAccessKey;    
+    bool m_accessKeyMapValid;
+
     bool m_useSecureKeyboardEntryWhenActive;
 

trunk/Source/WebCore/dom/TreeScope.cpp

@@ -40 +40 @@
     : ContainerNode(document)
     , m_parentTreeScope(0)
-    , m_accessKeyMapValid(false)
     , m_numNodeListCaches(0)
 {
@@ -55 +54 @@
     m_elementsById.clear();
     m_imageMapsByName.clear();
-    m_elementsByAccessKey.clear();
 }
 
@@ -83 +81 @@
 {
     m_elementsById.remove(elementId.impl(), element);
-}
-
-Element* TreeScope::getElementByAccessKey(const String& key) const
-{
-    if (key.isEmpty())
-        return 0;
-    if (!m_accessKeyMapValid) {
-        for (Node* n = firstChild(); n; n = n->traverseNextNode()) {
-            if (!n->isElementNode())
-                continue;
-            Element* element = static_cast<Element*>(n);
-            const AtomicString& accessKey = element->getAttribute(accesskeyAttr);
-            if (!accessKey.isEmpty())
-                m_elementsByAccessKey.set(accessKey.impl(), element);
-        }
-        m_accessKeyMapValid = true;
-    }
-    return m_elementsByAccessKey.get(key.impl());
-}
-
-void TreeScope::invalidateAccessKeyMap()
-{
-    m_accessKeyMapValid = false;
-    m_elementsByAccessKey.clear();
 }
 

trunk/Source/WebCore/dom/TreeScope.h

@@ -52 +52 @@
     HTMLMapElement* getImageMap(const String& url) const;
 
-    Element* getElementByAccessKey(const String& key) const;
-    void invalidateAccessKeyMap();
-
     void addNodeListCache() { ++m_numNodeListCaches; }
     void removeNodeListCache() { ASSERT(m_numNodeListCaches > 0); --m_numNodeListCaches; }
@@ -80 +77 @@
     DocumentOrderedMap m_imageMapsByName;
 
-    mutable HashMap<StringImpl*, Element*, CaseFoldingHash> m_elementsByAccessKey;    
-    mutable bool m_accessKeyMapValid;
-
     unsigned m_numNodeListCaches;
 };