Changeset 42191 in webkit

Timestamp:

Apr 2, 2009 5:39:18 PM (15 years ago)

Author:

adele@apple.com

Message:

WebCore:

2009-04-02 Adele Peterson <​adele@apple.com>

Reviewed by Darin Adler.

Add a way to get a list of focusable nodes.

• dom/Document.cpp: (WebCore::Document::setFocusedNode): (WebCore::Document::getFocusableNodes):
• dom/Document.h:

WebKit:

2009-04-02 Adele Peterson <​adele@apple.com>

Reviewed by Darin Adler.

• WebKit.xcodeproj/project.pbxproj: Add WebDOMOperationsInternal.h and make WebDOMOperationsPrivate.h private.

WebKit/mac:

2009-04-02 Adele Peterson <​adele@apple.com>

Reviewed by Darin Adler.

Add a way to get a list of focusable nodes.

• DOM/WebDOMOperations.mm: (-[DOMDocument _focusableNodes]):
• DOM/WebDOMOperationsInternal.h: Added.
• DOM/WebDOMOperationsPrivate.h: Make this a private header. Move old methods to WebDOMOperationsInternal.h
• WebView/WebHTMLView.mm: Use methods from WebDOMOperationsInternal.h

Location:

trunk

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/dom/Document.cpp (modified) (1 diff)
• WebCore/dom/Document.h (modified) (1 diff)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/WebKit.xcodeproj/project.pbxproj (modified) (5 diffs)
• WebKit/mac/ChangeLog (modified) (1 diff)
• WebKit/mac/DOM/WebDOMOperations.mm (modified) (3 diffs)
• WebKit/mac/DOM/WebDOMOperationsInternal.h (added)
• WebKit/mac/DOM/WebDOMOperationsPrivate.h (modified) (2 diffs)
• WebKit/mac/WebView/WebHTMLView.mm (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-04-02  Adele Peterson  <adele@apple.com>
+
+        Reviewed by Darin Adler.
+
+        Add a way to get a list of focusable nodes.
+
+        * dom/Document.cpp:
+        (WebCore::Document::setFocusedNode):
+        (WebCore::Document::getFocusableNodes):
+        * dom/Document.h:
+
 2009-04-02  Darin Adler  <darin@apple.com>
 

trunk/WebCore/dom/Document.cpp

@@ -2561 +2561 @@
     updateRendering();
     return !focusChangeBlocked;
-  }
+}
+    
+void Document::getFocusableNodes(Vector<RefPtr<Node> >& nodes)
+{
+    updateLayout();
+
+    for (Node* node = firstChild(); node; node = node->traverseNextNode()) {
+        if (node->isFocusable())
+            nodes.append(node);
+    }
+}
   
 void Document::setCSSTarget(Element* n)

trunk/WebCore/dom/Document.h

@@ -510 +510 @@
     Node* focusedNode() const { return m_focusedNode.get(); }
 
+    void getFocusableNodes(Vector<RefPtr<Node> >&);
+    
     // The m_ignoreAutofocus flag specifies whether or not the document has been changed by the user enough 
     // for WebCore to ignore the autofocus attribute on any form controls

trunk/WebKit/ChangeLog

@@ +1 @@
+2009-04-02  Adele Peterson  <adele@apple.com>
+
+        Reviewed by Darin Adler.
+
+        * WebKit.xcodeproj/project.pbxproj: 
+        Add WebDOMOperationsInternal.h and make WebDOMOperationsPrivate.h private. 
+
 2009-04-01  Greg Bolsinga  <bolsinga@apple.com>
 

trunk/WebKit/WebKit.xcodeproj/project.pbxproj

@@ -209 +209 @@
                 9398109B0824BF01008DF038 /* WebViewInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 930D02BB06275F640076701E /* WebViewInternal.h */; };
                 9398109C0824BF01008DF038 /* WebFrameInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 930D02BD06275F710076701E /* WebFrameInternal.h */; };
-                9398109D0824BF01008DF038 /* WebDOMOperationsPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 84AE905F062DE6A80075BBF9 /* WebDOMOperationsPrivate.h */; };
+                9398109D0824BF01008DF038 /* WebDOMOperationsPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 84AE905F062DE6A80075BBF9 /* WebDOMOperationsPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 9398109E0824BF01008DF038 /* WebEditingDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = BE4FBECB0653DF47005EDE15 /* WebEditingDelegate.h */; settings = {ATTRIBUTES = (Public, ); }; };
                 939810A00824BF01008DF038 /* WebJavaPlugIn.h in Headers */ = {isa = PBXBuildFile; fileRef = 51863EFC065419EB00E9E8DD /* WebJavaPlugIn.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -303 +303 @@
                 A7D3C5BC0B5773C5002CA450 /* WebPasteboardHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = A7D3C5BA0B5773C5002CA450 /* WebPasteboardHelper.h */; };
                 A7D3C5BD0B5773C5002CA450 /* WebPasteboardHelper.mm in Sources */ = {isa = PBXBuildFile; fileRef = A7D3C5BB0B5773C5002CA450 /* WebPasteboardHelper.mm */; };
+                AB9FBBBB0F8582B0006ADC43 /* WebDOMOperationsInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = AB9FBBBA0F8582B0006ADC43 /* WebDOMOperationsInternal.h */; };
                 ABDDF20D08EB0DDC001E1241 /* WebDownloadInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = ABDDF20C08EB0DDC001E1241 /* WebDownloadInternal.h */; };
                 C0167BF80D7F5DD00028696E /* WebScriptDebugger.h in Headers */ = {isa = PBXBuildFile; fileRef = C0167BF60D7F5DD00028696E /* WebScriptDebugger.h */; };
@@ -548 +549 @@
                 A7D3C5BA0B5773C5002CA450 /* WebPasteboardHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebPasteboardHelper.h; sourceTree = "<group>"; };
                 A7D3C5BB0B5773C5002CA450 /* WebPasteboardHelper.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebPasteboardHelper.mm; sourceTree = "<group>"; };
+                AB9FBBBA0F8582B0006ADC43 /* WebDOMOperationsInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebDOMOperationsInternal.h; sourceTree = "<group>"; };
                 ABDDF20C08EB0DDC001E1241 /* WebDownloadInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebDownloadInternal.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                 BE4FBECB0653DF47005EDE15 /* WebEditingDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebEditingDelegate.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
@@ -1087 +1089 @@
                                 846171F90624AE5B0071A4A3 /* WebDOMOperations.h */,
                                 846171FA0624AE5B0071A4A3 /* WebDOMOperations.mm */,
+                                AB9FBBBA0F8582B0006ADC43 /* WebDOMOperationsInternal.h */,
                                 84AE905F062DE6A80075BBF9 /* WebDOMOperationsPrivate.h */,
                         );
@@ -1401 +1404 @@
                                 FEF52DFC0F6748F200FF70EE /* WebGeolocationPrivate.h in Headers */,
                                 1C0456480F7D416F00BA7AA3 /* DOMDocumentPrivate.h in Headers */,
+                                AB9FBBBB0F8582B0006ADC43 /* WebDOMOperationsInternal.h in Headers */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;

trunk/WebKit/mac/ChangeLog

@@ +1 @@
+2009-04-02  Adele Peterson  <adele@apple.com>
+
+        Reviewed by Darin Adler.
+
+        Add a way to get a list of focusable nodes.
+
+        * DOM/WebDOMOperations.mm:
+        (-[DOMDocument _focusableNodes]):
+        * DOM/WebDOMOperationsInternal.h: Added.
+        * DOM/WebDOMOperationsPrivate.h: Make this a private header.
+        Move old methods to WebDOMOperationsInternal.h
+        * WebView/WebHTMLView.mm: Use methods from WebDOMOperationsInternal.h
+
 2009-04-01  Darin Adler  <darin@apple.com>
 

trunk/WebKit/mac/DOM/WebDOMOperations.mm

@@ -64 +64 @@
 @end
 
-@implementation DOMNode (WebDOMNodeOperationsPrivate)
+/* This doesn't appear to be used by anyone.  We should consider removing this. */
+@implementation DOMNode (WebDOMNodeOperationsInternal)
 
 - (NSArray *)_subresourceURLs
@@ -102 +103 @@
 @end
 
-@implementation DOMDocument (WebDOMDocumentOperationsPrivate)
+@implementation DOMDocument (WebDOMDocumentOperationsInternal)
 
+/* This doesn't appear to be used by anyone.  We should consider removing this. */
 - (DOMRange *)_createRangeWithNode:(DOMNode *)node
 {
@@ -114 +116 @@
 {
     return [self _createRangeWithNode:[self documentElement]];
+}
+
+@end
+
+@implementation DOMDocument (WebDOMDocumentOperationsPrivate)
+
+- (NSArray *)_focusableNodes
+{
+    Vector<RefPtr<Node> > nodes;
+    core(self)->getFocusableNodes(nodes);
+    NSMutableArray *array = [NSMutableArray arrayWithCapacity:nodes.size()];
+    for (unsigned i = 0; i < nodes.size(); ++i)
+        [array addObject:[DOMNode _wrapNode:nodes[i].get()]];
+    return array;
 }
 

trunk/WebKit/mac/DOM/WebDOMOperationsPrivate.h

@@ -1 +1 @@
 /*
- * Copyright (C) 2005, 2008 Apple Inc. All rights reserved.
+ * Copyright (C) 2005, 2008, 2009 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -29 +29 @@
 #import <WebKit/WebDOMOperations.h>
 
-@interface DOMNode (WebDOMNodeOperationsPrivate)
-- (NSArray *)_subresourceURLs;
+@interface DOMDocument (WebDOMDocumentOperationsPrivate)
+- (NSArray *)_focusableNodes;
 @end
-
-@interface DOMDocument (WebDOMDocumentOperationsPrivate)
-- (DOMRange *)_createRangeWithNode:(DOMNode *)node;
-- (DOMRange *)_documentRange;
-@end

trunk/WebKit/mac/WebView/WebHTMLView.mm

@@ -34 +34 @@
 #import "WebArchive.h"
 #import "WebClipView.h"
-#import "WebDOMOperationsPrivate.h"
+#import "WebDOMOperationsInternal.h"
 #import "WebDataSourceInternal.h"
 #import "WebDefaultUIDelegate.h"