Changeset 18187 in webkit

Timestamp:

Dec 12, 2006, 2:11:18 PM (18 years ago)

Author:

ggaren

Message:

Reviewed by Adam Roben, Dave Hyatt, Darin Adler.

Factored focus control into a FocusController class. I inted to use this
class for handling window active state and the focused frame, as well.

Layout tests pass.

• WebCore.xcodeproj/project.pbxproj:
• dom/Document.cpp: (WebCore::Document::view): (WebCore::Document::page): New helper function.
• dom/Document.h: Moved setters before getters. (WebCore::Document::hoverNode): (WebCore::Document::activeNode):
• dom/Node.cpp: (WebCore::Node::detach): Use the FocusController.
• page/FocusController.cpp: Added. (WebCore::shouldFocus): renamed and refactored this helper function. (WebCore::shouldUnfocus): ditto.
• page/FocusController.h: Added.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• WebCore.xcodeproj/project.pbxproj (modified) (5 diffs)
• dom/Document.cpp (modified) (4 diffs)
• dom/Document.h (modified) (3 diffs)
• dom/Node.cpp (modified) (1 diff)
• page/FocusController.cpp (added)
• page/FocusController.h (added)
• page/Page.cpp (modified) (3 diffs)
• page/Page.h (modified) (4 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2006-12-12  Geoffrey Garen  <ggaren@apple.com>
+
+        Reviewed by Adam Roben, Dave Hyatt, Darin Adler.
+        
+        Factored focus control into a FocusController class. I inted to use this
+        class for handling window active state and the focused frame, as well.
+
+        Layout tests pass.
+
+        * WebCore.xcodeproj/project.pbxproj:
+        * dom/Document.cpp:
+        (WebCore::Document::view):
+        (WebCore::Document::page): New helper function.
+        * dom/Document.h: Moved setters before getters.
+        (WebCore::Document::hoverNode):
+        (WebCore::Document::activeNode):
+        * dom/Node.cpp:
+        (WebCore::Node::detach): Use the FocusController.
+        * page/FocusController.cpp: Added.
+        (WebCore::shouldFocus): renamed and refactored this helper function.
+        (WebCore::shouldUnfocus): ditto.
+        * page/FocusController.h: Added.
+
 2006-12-12  Anders Carlsson  <acarlsson@apple.com>
 

trunk/WebCore/WebCore.xcodeproj/project.pbxproj

@@ -50 +50 @@
                 148AFDA60AF58360008CC700 /* ExceptionHandlers.mm in Sources */ = {isa = PBXBuildFile; fileRef = 148AFDA40AF58360008CC700 /* ExceptionHandlers.mm */; };
                 148CF65E0B00561400A997FC /* Screen.h in Headers */ = {isa = PBXBuildFile; fileRef = 148CF65D0B00561400A997FC /* Screen.h */; settings = {ATTRIBUTES = (Private, ); }; };
+                14993BE50B2F2B1C0050497F /* FocusController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 14993BE30B2F2B1C0050497F /* FocusController.cpp */; };
+                14993BE60B2F2B1C0050497F /* FocusController.h in Headers */ = {isa = PBXBuildFile; fileRef = 14993BE40B2F2B1C0050497F /* FocusController.h */; };
                 14CF78A409F58CBF00EB3665 /* JSCSSValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 14CF78A309F58CBF00EB3665 /* JSCSSValue.cpp */; };
                 14CF78A609F58CD800EB3665 /* JSCSSValue.h in Headers */ = {isa = PBXBuildFile; fileRef = 14CF78A509F58CD800EB3665 /* JSCSSValue.h */; };
@@ -3030 +3032 @@
                 148AFDA40AF58360008CC700 /* ExceptionHandlers.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = ExceptionHandlers.mm; sourceTree = "<group>"; };
                 148CF65D0B00561400A997FC /* Screen.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Screen.h; sourceTree = "<group>"; };
+                14993BE30B2F2B1C0050497F /* FocusController.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = FocusController.cpp; sourceTree = "<group>"; };
+                14993BE40B2F2B1C0050497F /* FocusController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = FocusController.h; sourceTree = "<group>"; };
                 14CF787109F587CA00EB3665 /* CSSValue.idl */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = CSSValue.idl; sourceTree = "<group>"; };
                 14CF78A309F58CBF00EB3665 /* JSCSSValue.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSCSSValue.cpp; sourceTree = "<group>"; };
@@ -6696 +6700 @@
                                 93C09A520B064DB3005ABD4D /* EventHandler.h */,
                                 93C09A800B064F00005ABD4D /* EventHandler.cpp */,
+                                14993BE40B2F2B1C0050497F /* FocusController.h */,
+                                14993BE30B2F2B1C0050497F /* FocusController.cpp */,
                                 65BF02290974816300C43196 /* Frame.cpp */,
                                 65BF022A0974816300C43196 /* Frame.h */,
@@ -10841 +10847 @@
                                 93E241FF0B2B4E4000C732A1 /* HTMLFrameOwnerElement.h in Headers */,
                                 E11D51930B2E7A5F0056C188 /* Base64.h in Headers */,
+                                14993BE60B2F2B1C0050497F /* FocusController.h in Headers */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;
@@ -12161 +12168 @@
                                 B25DFAAF0B2E2929000E6510 /* JSSVGMatrixCustom.cpp in Sources */,
                                 E11D51940B2E7A5F0056C188 /* Base64.cpp in Sources */,
+                                14993BE50B2F2B1C0050497F /* FocusController.cpp in Sources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;

trunk/WebCore/dom/Document.cpp

@@ -46 +46 @@
 #include "EventNames.h"
 #include "ExceptionCode.h"
+#include "FocusController.h"
 #include "Frame.h"
 #include "FrameLoader.h"
@@ -811 +812 @@
 }
 
+FrameView* Document::view() const
+{
+    return m_view;
+}
+
 Frame* Document::frame() const 
 {
     return m_view ? m_view->frame() : 0; 
+}
+
+Page* Document::page() const
+{
+    Frame* frame = this->frame();
+    return frame ? frame->page() : 0;    
 }
 
@@ -1944 +1956 @@
 }
 
+void Document::focusedNodeDetached(Node* node)
+{
+    Page* page = this->page();
+    if (!page)
+        return;
+    page->focusController()->focusedNodeDetached(node);
+}
+
 void Document::hoveredNodeDetached(Node* node)
 {
@@ -1981 +2001 @@
 bool Document::setFocusedNode(PassRefPtr<Node> node)
 {
-    Frame* frame = this->frame();
-    if (!frame)
-        return false;
-    
-    Page* page = frame->page();
+    Page* page = this->page();
     if (!page)
         return false;
     
-    return page->setFocusedNode(node);
+    return page->focusController()->setFocusedNode(node);
 }
 
 Node* Document::focusedNode() const
 {
-    Frame* frame = this->frame();
-    if (!frame)
-        return 0;
-    
-    Page* page = frame->page();
+    Page* page = this->page();
     if (!page)
         return 0;
     
-    return page->focusedNode();
+    return page->focusController()->focusedNode();
 }
 

trunk/WebCore/dom/Document.h

@@ -75 +75 @@
     class NodeIterator;
     class NodeList;
+    class Page;
     class PlatformMouseEvent;
     class ProcessingInstruction;
@@ -279 +280 @@
     bool takeStateForFormElement(AtomicStringImpl* name, AtomicStringImpl* type, String& state);
 
-    FrameView* view() const { return m_view; }
-    Frame* frame() const;
+    FrameView* view() const; // can be NULL
+    Frame* frame() const; // can be NULL
+    Page* page() const; // can be NULL
 
     PassRefPtr<Range> createRange();
@@ -403 +405 @@
     void setSelectedStylesheetSet(const String&);
 
+    // Convenience functions for accessing the page's focused node.
     bool setFocusedNode(PassRefPtr<Node>);
     Node* focusedNode() const;
 
+    // Hover and active are still per-document, not per-page.
+    void setHoverNode(PassRefPtr<Node>);
     Node* hoverNode() const { return m_hoverNode.get(); }
-    void setHoverNode(PassRefPtr<Node>);
+
+    void setActiveNode(PassRefPtr<Node>);
+    Node* activeNode() const { return m_activeNode.get(); }
+
+    void focusedNodeDetached(Node*);
     void hoveredNodeDetached(Node*);
     void activeChainNodeDetached(Node*);
-    
-    Node* activeNode() const { return m_activeNode.get(); }
-    void setActiveNode(PassRefPtr<Node>);
 
     // Updates for :target (CSS3 selector).

trunk/WebCore/dom/Node.cpp

@@ -718 +718 @@
     Document* doc = document();
     if (m_focused)
-        doc->setFocusedNode(0);
+        doc->focusedNodeDetached(this);
     if (m_hovered)
         doc->hoveredNodeDetached(this);

trunk/WebCore/page/Page.cpp

@@ -22 +22 @@
 #include "Page.h"
 
-#include "AXObjectCache.h"
 #include "Chrome.h"
 #include "ChromeClient.h"
 #include "ContextMenuClient.h"
 #include "ContextMenuController.h"
-#include "Document.h"
-#include "Editor.h"
 #include "EditorClient.h"
-#include "Element.h"
-#include "Event.h"
-#include "EventNames.h"
+#include "FocusController.h"
 #include "Frame.h"
 #include "FrameLoader.h"
 #include "FrameTree.h"
-#include "FrameView.h"
-#include "RenderWidget.h"
 #include "SelectionController.h"
 #include "StringHash.h"
@@ -52 +45 @@
 static HashMap<String, HashSet<Page*>*>* frameNamespaces;
 
-using namespace EventNames;
-
-static bool shouldAcquireEditingFocus(Node* node)
-{
-    ASSERT(node);
-    ASSERT(node->isContentEditable());
-
-    Node* root = node->rootEditableElement();
-    if (!root || !root->document()->frame())
-        return false;
-
-    return root->document()->frame()->editor()->shouldBeginEditing(rangeOfContents(root).get());
-}
-
-static bool shouldRelinquishEditingFocus(Node* node)
-{
-    ASSERT(node);
-    ASSERT(node->isContentEditable());
-
-    Node* root = node->rootEditableElement();
-    if (!root || !root->document()->frame())
-        return false;
-
-    return root->document()->frame()->editor()->shouldEndEditing(rangeOfContents(root).get());
-}
-
-static void clearSelectionIfNeeded(Node* oldFocusedNode, Node* newFocusedNode)
-{
-    Frame* frame = oldFocusedNode ? oldFocusedNode->document()->frame() : 0;
-    if (!frame)
-        return;
-
-    // Clear the selection when changing the focus node to null or to a node that is not 
-    // contained by the current selection.
-    Node *startContainer = frame->selectionController()->start().node();
-    if (!newFocusedNode || (startContainer && startContainer != newFocusedNode && !(startContainer->isDescendantOf(newFocusedNode)) && startContainer->shadowAncestorNode() != newFocusedNode))
-        frame->selectionController()->clear();
-}
-
-static Widget* widgetForNode(Node* node)
-{
-    if (!node)
-        return 0;
-    RenderObject* renderer = node->renderer();
-    if (!renderer || !renderer->isWidget())
-        return 0;
-    return static_cast<RenderWidget*>(renderer)->widget();
-}
-
 Page::Page(ChromeClient* chromeClient, ContextMenuClient* contextMenuClient, EditorClient* editorClient)
-    : m_dragCaretController(new SelectionController(0, true))
-    , m_chrome(new Chrome(this, chromeClient))
+    : m_chrome(new Chrome(this, chromeClient))
+    , m_dragCaretController(new SelectionController(0, true))
+    , m_focusController(new FocusController)
     , m_contextMenuController(new ContextMenuController(this, contextMenuClient))
     , m_editorClient(editorClient)
@@ -169 +114 @@
 }
 
-bool Page::setFocusedNode(PassRefPtr<Node> newFocusedNode)
-{    
-    if (m_focusedNode == newFocusedNode)
-        return true;
-
-    if (m_focusedNode && m_focusedNode == m_focusedNode->rootEditableElement() && !shouldRelinquishEditingFocus(m_focusedNode.get()))
-        return false;
-
-    bool focusChangeBlocked = false;
-    RefPtr<Node> oldFocusedNode = m_focusedNode;
-    m_focusedNode = 0;
-    clearSelectionIfNeeded(oldFocusedNode.get(), newFocusedNode.get());
-
-    // Remove focus from the existing focus node (if any)
-    if (oldFocusedNode && !oldFocusedNode->inDetach()) { 
-        if (oldFocusedNode->active())
-            oldFocusedNode->setActive(false);
-
-        oldFocusedNode->setFocus(false);
-                
-        // Dispatch a change event for text fields or textareas that have been edited
-        RenderObject *r = static_cast<RenderObject*>(oldFocusedNode->renderer());
-        if (r && (r->isTextArea() || r->isTextField()) && r->isEdited()) {
-            EventTargetNodeCast(oldFocusedNode.get())->dispatchHTMLEvent(changeEvent, true, false);
-            if ((r = static_cast<RenderObject*>(oldFocusedNode.get()->renderer())))
-                r->setEdited(false);
-        }
-
-        // Dispatch the blur event and let the node do any other blur related activities (important for text fields)
-        EventTargetNodeCast(oldFocusedNode.get())->dispatchBlurEvent();
-
-        if (m_focusedNode) {
-            // handler shifted focus
-            focusChangeBlocked = true;
-            newFocusedNode = 0;
-        }
-        clearSelectionIfNeeded(oldFocusedNode.get(), newFocusedNode.get());
-        EventTargetNodeCast(oldFocusedNode.get())->dispatchUIEvent(DOMFocusOutEvent);
-        if (m_focusedNode) {
-            // handler shifted focus
-            focusChangeBlocked = true;
-            newFocusedNode = 0;
-        }
-        clearSelectionIfNeeded(oldFocusedNode.get(), newFocusedNode.get());
-        if ((oldFocusedNode == oldFocusedNode->document()) && oldFocusedNode->hasOneRef())
-            return true;
-
-        if (oldFocusedNode == oldFocusedNode->rootEditableElement())
-            oldFocusedNode->document()->frame()->editor()->didEndEditing();
-    }
-
-    if (newFocusedNode) {
-        if (newFocusedNode == newFocusedNode->rootEditableElement() && !shouldAcquireEditingFocus(newFocusedNode.get())) {
-            // delegate blocks focus change
-            focusChangeBlocked = true;
-            goto SetFocusedNodeDone;
-        }
-        // Set focus on the new node
-        m_focusedNode = newFocusedNode.get();
-
-        // Dispatch the focus event and let the node do any other focus related activities (important for text fields)
-        EventTargetNodeCast(m_focusedNode.get())->dispatchFocusEvent();
-
-        if (m_focusedNode != newFocusedNode) {
-            // handler shifted focus
-            focusChangeBlocked = true;
-            goto SetFocusedNodeDone;
-        }
-        EventTargetNodeCast(m_focusedNode.get())->dispatchUIEvent(DOMFocusInEvent);
-        if (m_focusedNode != newFocusedNode) { 
-            // handler shifted focus
-            focusChangeBlocked = true;
-            goto SetFocusedNodeDone;
-        }
-        m_focusedNode->setFocus();
-        
-        if (m_focusedNode.get() == m_focusedNode->rootEditableElement())
-            m_focusedNode->document()->frame()->editor()->didBeginEditing();
-        
-        // This only matters for searchfield
-        if (m_focusedNode->document()->view()) {
-            Widget* focusWidget = widgetForNode(m_focusedNode.get());
-            if (focusWidget) {
-                // Make sure a widget has the right size before giving it focus.
-                // Otherwise, we are testing edge cases of the Widget code.
-                // Specifically, in WebCore this does not work well for text fields.
-                m_focusedNode->document()->updateLayout();
-                // Re-get the widget in case updating the layout changed things.
-                focusWidget = widgetForNode(m_focusedNode.get());
-            }
-            if (focusWidget)
-                focusWidget->setFocus();
-            else
-                m_focusedNode->document()->view()->setFocus();
-        }
-   }
-
-#if PLATFORM(MAC)
-    if (!focusChangeBlocked && m_focusedNode && AXObjectCache::accessibilityEnabled())
-        m_focusedNode->document()->axObjectCache()->handleFocusedUIElementChanged();
-#endif
-
-SetFocusedNodeDone:
-    Document::updateDocumentsRendering();
-    return !focusChangeBlocked;
-}
-
 const HashSet<Page*>* Page::frameNamespace() const
 {

trunk/WebCore/page/Page.h

@@ -37 +37 @@
     class ContextMenuController;
     class EditorClient;
+    class FocusController;
     class Frame;
     class FrameNamespace;
@@ -58 +59 @@
         String groupName() const { return m_groupName; }
 
-        bool setFocusedNode(PassRefPtr<Node>);
-        Node* focusedNode() const { return m_focusedNode.get(); }
-
         const HashSet<Page*>* frameNamespace() const;
         static const HashSet<Page*>* frameNamespace(const String&);
@@ -71 +69 @@
         static void setNeedsReapplyStylesForSettingsChange(Settings*);
 
+        Chrome* chrome() { return m_chrome.get(); }
         SelectionController* dragCaretController() { return m_dragCaretController.get(); }
-        Chrome* chrome() { return m_chrome.get(); }
+        FocusController* focusController() { return m_focusController.get(); }
         ContextMenuController* contextMenuController() { return m_contextMenuController.get(); }
 
@@ -85 +84 @@
 
     private:
+        OwnPtr<Chrome> m_chrome;
         OwnPtr<SelectionController> m_dragCaretController;
-        OwnPtr<Chrome> m_chrome;
+        OwnPtr<FocusController> m_focusController;
         OwnPtr<ContextMenuController> m_contextMenuController;