Commit b4483824 authored by darin's avatar darin

Reviewed by Geoff, tweaked a bit by Darin.

        - http://bugzilla.opendarwin.org/show_bug.cgi?id=9064
          Split dom2_traversalimpl.* into separate files (one class per file).

        * WebCore.xcodeproj/project.pbxproj: Updated for new files.
        * WebCore.vcproj/WebCore/WebCore.vcproj: Ditto.

        * bindings/js/kjs_traversal.h:
        * bindings/scripts/CodeGeneratorJS.pm:
        * bindings/objc/DOM.mm:
        * dom/Document.cpp:
        * dom/Document.h:
        Updated includes.

        * dom/NodeFilter.cpp: Added.
        * dom/NodeFilter.h: Added.
        * dom/NodeFilterCondition.cpp: Added.
        * dom/NodeFilterCondition.h: Added.
        * dom/NodeIterator.cpp: Added.
        * dom/NodeIterator.h: Added.
        * dom/Traversal.cpp: Added.
        * dom/Traversal.h: Added.
        * dom/TreeWalker.cpp: Added.
        * dom/TreeWalker.h: Added.

        * dom/dom2_traversalimpl.cpp: Removed.
        * dom/dom2_traversalimpl.h: Removed.



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@14680 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent bd205a70
2006-06-01 Sam Weinig <sam.weinig@gmail.com>
Reviewed by Geoff, tweaked a bit by Darin.
- http://bugzilla.opendarwin.org/show_bug.cgi?id=9064
Split dom2_traversalimpl.* into separate files (one class per file).
* WebCore.xcodeproj/project.pbxproj: Updated for new files.
* WebCore.vcproj/WebCore/WebCore.vcproj: Ditto.
* bindings/js/kjs_traversal.h:
* bindings/scripts/CodeGeneratorJS.pm:
* bindings/objc/DOM.mm:
* dom/Document.cpp:
* dom/Document.h:
Updated includes.
* dom/NodeFilter.cpp: Added.
* dom/NodeFilter.h: Added.
* dom/NodeFilterCondition.cpp: Added.
* dom/NodeFilterCondition.h: Added.
* dom/NodeIterator.cpp: Added.
* dom/NodeIterator.h: Added.
* dom/Traversal.cpp: Added.
* dom/Traversal.h: Added.
* dom/TreeWalker.cpp: Added.
* dom/TreeWalker.h: Added.
* dom/dom2_traversalimpl.cpp: Removed.
* dom/dom2_traversalimpl.h: Removed.
2006-06-01 David Carson <dacarson@gmail.com>
Reviewed by Maciej and Adele
......
......@@ -3506,14 +3506,6 @@
RelativePath="..\..\dom\dom2_eventsimpl.h"
>
</File>
<File
RelativePath="..\..\dom\dom2_traversalimpl.cpp"
>
</File>
<File
RelativePath="..\..\dom\dom2_traversalimpl.h"
>
</File>
<File
RelativePath="..\..\dom\DOMImplementation.cpp"
>
......@@ -3626,6 +3618,30 @@
RelativePath="..\..\dom\Node.h"
>
</File>
<File
RelativePath="..\..\dom\NodeFilter.cpp"
>
</File>
<File
RelativePath="..\..\dom\NodeFilter.h"
>
</File>
<File
RelativePath="..\..\dom\NodeFilterCondition.cpp"
>
</File>
<File
RelativePath="..\..\dom\NodeFilterCondition.h"
>
</File>
<File
RelativePath="..\..\dom\NodeIterator.cpp"
>
</File>
<File
RelativePath="..\..\dom\NodeIterator.h"
>
</File>
<File
RelativePath="..\..\dom\NodeList.cpp"
>
......@@ -3690,6 +3706,22 @@
RelativePath="..\..\dom\Text.h"
>
</File>
<File
RelativePath="..\..\dom\Traversal.cpp"
>
</File>
<File
RelativePath="..\..\dom\Traversal.h"
>
</File>
<File
RelativePath="..\..\dom\TreeWalker.cpp"
>
</File>
<File
RelativePath="..\..\dom\TreeWalker.h"
>
</File>
<File
RelativePath="..\..\dom\xml_tokenizer.cpp"
>
......
......@@ -283,6 +283,16 @@
7E6FEED90898582300C44C3F /* WebCoreScriptDebugger.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7E6FEED70898582300C44C3F /* WebCoreScriptDebugger.mm */; };
8116895F09F2A4A000772CA0 /* SVGTRefElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8116895D09F2A4A000772CA0 /* SVGTRefElement.cpp */; };
8116896009F2A4A000772CA0 /* SVGTRefElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 8116895E09F2A4A000772CA0 /* SVGTRefElement.h */; };
854FE7300A2297BE0058D7AD /* NodeFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 854FE7260A2297BE0058D7AD /* NodeFilter.cpp */; };
854FE7310A2297BE0058D7AD /* NodeFilter.h in Headers */ = {isa = PBXBuildFile; fileRef = 854FE7270A2297BE0058D7AD /* NodeFilter.h */; };
854FE7320A2297BE0058D7AD /* NodeFilterCondition.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 854FE7280A2297BE0058D7AD /* NodeFilterCondition.cpp */; };
854FE7330A2297BE0058D7AD /* NodeFilterCondition.h in Headers */ = {isa = PBXBuildFile; fileRef = 854FE7290A2297BE0058D7AD /* NodeFilterCondition.h */; };
854FE7340A2297BE0058D7AD /* NodeIterator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 854FE72A0A2297BE0058D7AD /* NodeIterator.cpp */; };
854FE7350A2297BE0058D7AD /* NodeIterator.h in Headers */ = {isa = PBXBuildFile; fileRef = 854FE72B0A2297BE0058D7AD /* NodeIterator.h */; };
854FE7360A2297BE0058D7AD /* Traversal.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 854FE72C0A2297BE0058D7AD /* Traversal.cpp */; };
854FE7370A2297BE0058D7AD /* Traversal.h in Headers */ = {isa = PBXBuildFile; fileRef = 854FE72D0A2297BE0058D7AD /* Traversal.h */; };
854FE7380A2297BE0058D7AD /* TreeWalker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 854FE72E0A2297BE0058D7AD /* TreeWalker.cpp */; };
854FE7390A2297BE0058D7AD /* TreeWalker.h in Headers */ = {isa = PBXBuildFile; fileRef = 854FE72F0A2297BE0058D7AD /* TreeWalker.h */; };
93032CC809AEC34300F82A18 /* PathCG.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93032CC709AEC34300F82A18 /* PathCG.cpp */; };
93032CCA09AEC34B00F82A18 /* Path.h in Headers */ = {isa = PBXBuildFile; fileRef = 93032CC909AEC34B00F82A18 /* Path.h */; };
9305B24D098F1B6B00C28855 /* Timer.h in Headers */ = {isa = PBXBuildFile; fileRef = 9305B24C098F1B6B00C28855 /* Timer.h */; };
......@@ -477,7 +487,6 @@
93F198F608245E59001E9ABC /* Decoder.h in Headers */ = {isa = PBXBuildFile; fileRef = F523D27902DE43D7018635CA /* Decoder.h */; };
93F1991708245E59001E9ABC /* dom2_eventsimpl.h in Headers */ = {isa = PBXBuildFile; fileRef = F523D30202DE4476018635CA /* dom2_eventsimpl.h */; };
93F1991808245E59001E9ABC /* Range.h in Headers */ = {isa = PBXBuildFile; fileRef = F523D30402DE4476018635CA /* Range.h */; };
93F1991908245E59001E9ABC /* dom2_traversalimpl.h in Headers */ = {isa = PBXBuildFile; fileRef = F523D30602DE4476018635CA /* dom2_traversalimpl.h */; };
93F1992108245E59001E9ABC /* xml_tokenizer.h in Headers */ = {isa = PBXBuildFile; fileRef = F523D30A02DE4476018635CA /* xml_tokenizer.h */; };
93F1992908245E59001E9ABC /* KWQCString.h in Headers */ = {isa = PBXBuildFile; fileRef = F587868302DE3B8601EA4122 /* KWQCString.h */; };
93F1992E08245E59001E9ABC /* KWQComboBox.h in Headers */ = {isa = PBXBuildFile; fileRef = F587868202DE3B8601EA4122 /* KWQComboBox.h */; };
......@@ -565,7 +574,6 @@
93F19A9D08245E59001E9ABC /* Decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F523D27802DE43D7018635CA /* Decoder.cpp */; };
93F19AB808245E59001E9ABC /* dom2_eventsimpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F523D30102DE4476018635CA /* dom2_eventsimpl.cpp */; };
93F19AB908245E59001E9ABC /* Range.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F523D30302DE4476018635CA /* Range.cpp */; };
93F19ABA08245E59001E9ABC /* dom2_traversalimpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F523D30502DE4476018635CA /* dom2_traversalimpl.cpp */; };
93F19ABC08245E59001E9ABC /* xml_tokenizer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F523D30902DE4476018635CA /* xml_tokenizer.cpp */; };
93F19ABE08245E59001E9ABC /* WebCoreCache.mm in Sources */ = {isa = PBXBuildFile; fileRef = F5B2A4FD02E2220F018635CB /* WebCoreCache.mm */; };
93F19ABF08245E59001E9ABC /* WebCoreJavaScript.mm in Sources */ = {isa = PBXBuildFile; fileRef = F5B2A52C02E22573018635CB /* WebCoreJavaScript.mm */; };
......@@ -1911,6 +1919,16 @@
84C0FA2C052B966D000440A1 /* southWestResizeCursor.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = southWestResizeCursor.tiff; sourceTree = "<group>"; };
84C0FA2D052B966D000440A1 /* waitCursor.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = waitCursor.tiff; sourceTree = "<group>"; };
84C0FA2E052B966D000440A1 /* westResizeCursor.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = westResizeCursor.tiff; sourceTree = "<group>"; };
854FE7260A2297BE0058D7AD /* NodeFilter.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = NodeFilter.cpp; sourceTree = "<group>"; };
854FE7270A2297BE0058D7AD /* NodeFilter.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = NodeFilter.h; sourceTree = "<group>"; };
854FE7280A2297BE0058D7AD /* NodeFilterCondition.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = NodeFilterCondition.cpp; sourceTree = "<group>"; };
854FE7290A2297BE0058D7AD /* NodeFilterCondition.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = NodeFilterCondition.h; sourceTree = "<group>"; };
854FE72A0A2297BE0058D7AD /* NodeIterator.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = NodeIterator.cpp; sourceTree = "<group>"; };
854FE72B0A2297BE0058D7AD /* NodeIterator.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = NodeIterator.h; sourceTree = "<group>"; };
854FE72C0A2297BE0058D7AD /* Traversal.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = Traversal.cpp; sourceTree = "<group>"; };
854FE72D0A2297BE0058D7AD /* Traversal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Traversal.h; sourceTree = "<group>"; };
854FE72E0A2297BE0058D7AD /* TreeWalker.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = TreeWalker.cpp; sourceTree = "<group>"; };
854FE72F0A2297BE0058D7AD /* TreeWalker.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = TreeWalker.h; sourceTree = "<group>"; };
93032CC709AEC34300F82A18 /* PathCG.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PathCG.cpp; sourceTree = "<group>"; };
93032CC909AEC34B00F82A18 /* Path.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Path.h; sourceTree = "<group>"; };
9305B24C098F1B6B00C28855 /* Timer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Timer.h; sourceTree = "<group>"; };
......@@ -2137,6 +2155,10 @@
93F19B1908245E59001E9ABC /* Info.plist */ = {isa = PBXFileReference; indentWidth = 4; lastKnownFileType = text.xml; path = Info.plist; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
93F19B1A08245E5A001E9ABC /* WebCore.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = WebCore.framework; sourceTree = BUILT_PRODUCTS_DIR; };
93F1D31A0558CC5C00821BC0 /* libicucore.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libicucore.dylib; path = /usr/lib/libicucore.dylib; sourceTree = "<absolute>"; };
93F8B3050A300FE100F61AB8 /* CodeGenerator.pm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.perl; name = CodeGenerator.pm; path = scripts/CodeGenerator.pm; sourceTree = "<group>"; };
93F8B3060A300FEA00F61AB8 /* CodeGeneratorJS.pm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.perl; name = CodeGeneratorJS.pm; path = ../scripts/CodeGeneratorJS.pm; sourceTree = "<group>"; };
93F8B3070A300FEA00F61AB8 /* generate-bindings.pl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.perl; name = "generate-bindings.pl"; path = "scripts/generate-bindings.pl"; sourceTree = "<group>"; };
93F8B3080A300FEA00F61AB8 /* IDLStructure.pm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.perl; name = IDLStructure.pm; path = scripts/IDLStructure.pm; sourceTree = "<group>"; };
A7638A8909958EA50007E14F /* WKDisplacementMapFilter.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WKDisplacementMapFilter.h; sourceTree = "<group>"; };
A7638A8A09958EA50007E14F /* WKDisplacementMapFilter.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = WKDisplacementMapFilter.m; sourceTree = "<group>"; };
A7638A91099592C30007E14F /* WKDisplacementMapFilter.cikernel */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = WKDisplacementMapFilter.cikernel; sourceTree = "<group>"; };
......@@ -3229,8 +3251,6 @@
F523D30202DE4476018635CA /* dom2_eventsimpl.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = dom2_eventsimpl.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
F523D30302DE4476018635CA /* Range.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Range.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
F523D30402DE4476018635CA /* Range.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = Range.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
F523D30502DE4476018635CA /* dom2_traversalimpl.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = dom2_traversalimpl.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
F523D30602DE4476018635CA /* dom2_traversalimpl.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = dom2_traversalimpl.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
F523D30902DE4476018635CA /* xml_tokenizer.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = xml_tokenizer.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
F523D30A02DE4476018635CA /* xml_tokenizer.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = xml_tokenizer.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
F5517DC2031AB56301A80180 /* WebCoreHistory.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebCoreHistory.h; sourceTree = "<group>"; };
......@@ -4767,6 +4787,9 @@
isa = PBXGroup;
children = (
14813BF309EDF88E00F757E1 /* IDLParser.pm */,
93F8B3050A300FE100F61AB8 /* CodeGenerator.pm */,
93F8B3070A300FEA00F61AB8 /* generate-bindings.pl */,
93F8B3080A300FEA00F61AB8 /* IDLStructure.pm */,
BC1A3793097C6FB10019F3D8 /* js */,
BC1A3794097C6FC40019F3D8 /* objc */,
);
......@@ -4776,6 +4799,7 @@
BC1A3793097C6FB10019F3D8 /* js */ = {
isa = PBXGroup;
children = (
93F8B3060A300FEA00F61AB8 /* CodeGeneratorJS.pm */,
1A9EF4560A1B957D00332B63 /* JSCanvasRenderingContext2DCustom.cpp */,
93B70D3F09EB0C7C009D8468 /* JSDOMParser.cpp */,
93B70D4009EB0C7C009D8468 /* JSDOMParser.h */,
......@@ -5290,8 +5314,6 @@
93EEC1E809C2877700C515D1 /* DocumentType.idl */,
F523D30102DE4476018635CA /* dom2_eventsimpl.cpp */,
F523D30202DE4476018635CA /* dom2_eventsimpl.h */,
F523D30502DE4476018635CA /* dom2_traversalimpl.cpp */,
F523D30602DE4476018635CA /* dom2_traversalimpl.h */,
A8185F3609765765005826D9 /* DOMImplementation.cpp */,
A8185F3309765765005826D9 /* DOMImplementation.h */,
93EEC1E909C2877700C515D1 /* DOMImplementation.idl */,
......@@ -5328,7 +5350,13 @@
A8C4A7EE09D563270003AC8D /* Node.cpp */,
14115B5109F84B7100CA4FC1 /* Node.h */,
14DC0D0B09FECFA4007B0235 /* Node.idl */,
854FE7260A2297BE0058D7AD /* NodeFilter.cpp */,
854FE7270A2297BE0058D7AD /* NodeFilter.h */,
14115AF909F847D600CA4FC1 /* NodeFilter.idl */,
854FE7280A2297BE0058D7AD /* NodeFilterCondition.cpp */,
854FE7290A2297BE0058D7AD /* NodeFilterCondition.h */,
854FE72A0A2297BE0058D7AD /* NodeIterator.cpp */,
854FE72B0A2297BE0058D7AD /* NodeIterator.h */,
A81872160977D3C0005826D9 /* NodeList.cpp */,
A81872100977D3C0005826D9 /* NodeList.h */,
A8EA7EB70A1945D000A8EF5F /* Notation.cpp */,
......@@ -5349,6 +5377,10 @@
6550B69B099DF0270090D781 /* Text.cpp */,
6550B69C099DF0270090D781 /* Text.h */,
93EEC1F609C2877700C515D1 /* Text.idl */,
854FE72C0A2297BE0058D7AD /* Traversal.cpp */,
854FE72D0A2297BE0058D7AD /* Traversal.h */,
854FE72E0A2297BE0058D7AD /* TreeWalker.cpp */,
854FE72F0A2297BE0058D7AD /* TreeWalker.h */,
141B94EE09EC425A000E9413 /* UIEvent.idl */,
93EEC1F709C2877700C515D1 /* WheelEvent.idl */,
F523D30902DE4476018635CA /* xml_tokenizer.cpp */,
......@@ -5425,7 +5457,6 @@
93F198F608245E59001E9ABC /* Decoder.h in Headers */,
93F1991708245E59001E9ABC /* dom2_eventsimpl.h in Headers */,
93F1991808245E59001E9ABC /* Range.h in Headers */,
93F1991908245E59001E9ABC /* dom2_traversalimpl.h in Headers */,
93F1992108245E59001E9ABC /* xml_tokenizer.h in Headers */,
93F1992908245E59001E9ABC /* KWQCString.h in Headers */,
93F1992E08245E59001E9ABC /* KWQComboBox.h in Headers */,
......@@ -6157,6 +6188,11 @@
1AE2AE5C0A1D26F200B42B25 /* JSHTMLMenuElement.h in Headers */,
1AE2AEC80A1D297B00B42B25 /* JSHTMLQuoteElement.h in Headers */,
1AE2AEE70A1D2A7500B42B25 /* JSHTMLBlockquoteElement.h in Headers */,
854FE7310A2297BE0058D7AD /* NodeFilter.h in Headers */,
854FE7330A2297BE0058D7AD /* NodeFilterCondition.h in Headers */,
854FE7350A2297BE0058D7AD /* NodeIterator.h in Headers */,
854FE7370A2297BE0058D7AD /* Traversal.h in Headers */,
854FE7390A2297BE0058D7AD /* TreeWalker.h in Headers */,
A8D05FA80A23B301005E7203 /* JSCSSRuleList.h in Headers */,
A8D05FAC0A23B30F005E7203 /* JSCSSValueList.h in Headers */,
A8D064FC0A23C0CC005E7203 /* JSHTMLFormElement.h in Headers */,
......@@ -6333,7 +6369,6 @@
93F19A9D08245E59001E9ABC /* Decoder.cpp in Sources */,
93F19AB808245E59001E9ABC /* dom2_eventsimpl.cpp in Sources */,
93F19AB908245E59001E9ABC /* Range.cpp in Sources */,
93F19ABA08245E59001E9ABC /* dom2_traversalimpl.cpp in Sources */,
93F19ABC08245E59001E9ABC /* xml_tokenizer.cpp in Sources */,
93F19ABE08245E59001E9ABC /* WebCoreCache.mm in Sources */,
93F19ABF08245E59001E9ABC /* WebCoreJavaScript.mm in Sources */,
......@@ -6988,6 +7023,11 @@
1AE2AE5B0A1D26F200B42B25 /* JSHTMLMenuElement.cpp in Sources */,
1AE2AEC70A1D297B00B42B25 /* JSHTMLQuoteElement.cpp in Sources */,
1AE2AEE60A1D2A7500B42B25 /* JSHTMLBlockquoteElement.cpp in Sources */,
854FE7300A2297BE0058D7AD /* NodeFilter.cpp in Sources */,
854FE7320A2297BE0058D7AD /* NodeFilterCondition.cpp in Sources */,
854FE7340A2297BE0058D7AD /* NodeIterator.cpp in Sources */,
854FE7360A2297BE0058D7AD /* Traversal.cpp in Sources */,
854FE7380A2297BE0058D7AD /* TreeWalker.cpp in Sources */,
A8D05FA70A23B301005E7203 /* JSCSSRuleList.cpp in Sources */,
A8D05FAB0A23B30F005E7203 /* JSCSSValueList.cpp in Sources */,
A8D064FB0A23C0CC005E7203 /* JSHTMLFormElement.cpp in Sources */,
......
......@@ -21,7 +21,10 @@
#ifndef KJS_TRAVERSAL_H_
#define KJS_TRAVERSAL_H_
#include "dom2_traversalimpl.h"
#include "NodeFilter.h"
#include "NodeFilterCondition.h"
#include "NodeIterator.h"
#include "TreeWalker.h"
#include "kjs_dom.h"
namespace WebCore {
......
......@@ -27,28 +27,32 @@
#import "DOM.h"
#import "CDATASection.h"
#import "Comment.h"
#import "CSSStyleSheet.h"
#import "Comment.h"
#import "DOMEventsInternal.h"
#import "DOMImplementationFront.h"
#import "DOMInternal.h"
#import "DOMPrivate.h"
#import "DocumentFragment.h"
#import "Document.h"
#import "DocumentFragment.h"
#import "DocumentType.h"
#import "Entity.h"
#import "EntityReference.h"
#import "EventListener.h"
#import "FoundationExtras.h"
#import "FrameMac.h"
#import "HTMLNames.h"
#import "NodeFilter.h"
#import "NodeFilterCondition.h"
#import "NodeIterator.h"
#import "NodeList.h"
#import "Notation.h"
#import "ProcessingInstruction.h"
#import "csshelper.h"
#import "Range.h"
#import "HTMLNames.h"
#import "QualifiedName.h"
#import "Range.h"
#import "RenderImage.h"
#import "TreeWalker.h"
#import "csshelper.h"
#import <JavaScriptCore/WebScriptObjectPrivate.h>
#import <objc/objc-class.h>
......
......@@ -157,10 +157,6 @@ sub AddIncludesForType
$type eq "UIEvent" or
$type eq "WheelEvent") {
$implIncludes{"dom2_eventsimpl.h"} = 1;
} elsif ($type eq "NodeIterator" or
$type eq "NodeFilter" or
$type eq "TreeWalker") {
$implIncludes{"dom2_traversalimpl.h"} = 1;
} elsif ($type eq "CanvasRenderingContext2D") {
$implIncludes{"CanvasGradient.h"} = 1;
$implIncludes{"CanvasPattern.h"} = 1;
......
......@@ -34,6 +34,7 @@
#import "Cursor.h"
#import "DOMInternal.h"
#import "DOMWindow.h"
#import "Decoder.h"
#import "EventNames.h"
#import "FloatRect.h"
#import "FoundationExtras.h"
......
......@@ -45,6 +45,7 @@
#include "Document.h"
#include "FontFamilyValue.h"
#include "FontValue.h"
#include "KURL.h"
#include "MediaList.h"
#include "Pair.h"
#include "ShadowValue.h"
......
......@@ -31,6 +31,7 @@
#include "CSSValueKeywords.h"
#include "Comment.h"
#include "DOMImplementation.h"
#include "Decoder.h"
#include "DocLoader.h"
#include "DocumentFragment.h"
#include "DocumentType.h"
......@@ -55,6 +56,8 @@
#include "Logging.h"
#include "MouseEventWithHitTestResults.h"
#include "NameNodeList.h"
#include "NodeFilter.h"
#include "NodeIterator.h"
#include "PlatformKeyboardEvent.h"
#include "ProcessingInstruction.h"
#include "RegularExpression.h"
......@@ -67,6 +70,7 @@
#include "StyleSheetList.h"
#include "SystemTime.h"
#include "TextIterator.h"
#include "TreeWalker.h"
#include "csshelper.h"
#include "cssstyleselector.h"
#include "dom2_eventsimpl.h"
......@@ -74,10 +78,13 @@
#include "kjs_proxy.h"
#include "xml_tokenizer.h"
#include "xmlhttprequest.h"
#if XPATH_SUPPORT
#include "XPathEvaluator.h"
#include "XPathExpression.h"
#include "XPathNSResolver.h"
#include "XPathResult.h"
#endif
#ifdef KHTML_XSLT
#include "XSLTProcessor.h"
......
......@@ -28,15 +28,12 @@
#include "Attr.h"
#include "Color.h"
#include "DeprecatedPtrList.h"
#include "DeprecatedStringList.h"
#include "DocumentMarker.h"
#include "KURL.h"
#include "StringHash.h"
#include "Timer.h"
#include "Decoder.h"
#include "dom2_traversalimpl.h"
#include <wtf/HashCountedSet.h>
#include "DeprecatedPtrList.h"
class RenderArena;
......@@ -49,6 +46,8 @@ namespace XBL {
namespace WebCore {
class AccessibilityObjectCache;
class Attr;
class Attribute;
class CDATASection;
class CSSStyleDeclaration;
class CSSStyleSelector;
......@@ -56,6 +55,7 @@ namespace WebCore {
class Comment;
class DOMImplementation;
class DOMWindow;
class Decoder;
class DocLoader;
class DocumentFragment;
class DocumentType;
......@@ -105,6 +105,8 @@ namespace WebCore {
class SVGDocumentExtensions;
#endif
typedef int ExceptionCode;
class FormElementKey {
public:
FormElementKey(AtomicStringImpl* = 0, AtomicStringImpl* = 0);
......@@ -275,7 +277,7 @@ public:
PassRefPtr<EditingText> createEditingTextNode(const String&);
virtual void recalcStyle( StyleChange = NoChange );
static DeprecatedPtrList<Document> * changedDocuments;
static DeprecatedPtrList<Document>* changedDocuments;
virtual void updateRendering();
void updateLayout();
void updateLayoutIgnorePendingStylesheets();
......@@ -521,8 +523,8 @@ public:
bool queryCommandSupported(const String& command);
String queryCommandValue(const String& command);
void addMarker(Range*, DocumentMarker::MarkerType type);
void addMarker(Node*, DocumentMarker marker);
void addMarker(Range*, DocumentMarker::MarkerType);
void addMarker(Node*, DocumentMarker);
void copyMarkers(Node *srcNode, unsigned startOffset, int length, Node *dstNode, int delta, DocumentMarker::MarkerType = DocumentMarker::AllMarkers);
void removeMarkers(Range*, DocumentMarker::MarkerType = DocumentMarker::AllMarkers);
void removeMarkers(Node*, unsigned startOffset, int length, DocumentMarker::MarkerType = DocumentMarker::AllMarkers);
......
/**
* This file is part of the DOM implementation for KDE.
*
* Copyright (C) 1999 Lars Knoll (knoll@kde.org)
* Copyright (C) 2000 Frederik Holljen (frederik.holljen@hig.no)
* Copyright (C) 2001 Peter Kelly (pmk@post.com)
* Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
* Copyright (C) 2004 Apple Computer, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public License
* along with this library; see the file COPYING.LIB. If not, write to
* the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*
*/
#include "config.h"
#include "NodeFilter.h"
namespace WebCore {
NodeFilter::NodeFilter(NodeFilterCondition* condition)
: m_condition(condition)
{
}
short NodeFilter::acceptNode(Node* node) const
{
// cast to short silences "enumeral and non-enumeral types in return" warning
return m_condition ? m_condition->acceptNode(node) : static_cast<short>(FILTER_ACCEPT);
}
} // namespace WebCore
/*
* This file is part of the DOM implementation for KDE.
*
* Copyright (C) 1999 Lars Knoll (knoll@kde.org)
* Copyright (C) 2000 Frederik Holljen (frederik.holljen@hig.no)
* Copyright (C) 2001 Peter Kelly (pmk@post.com)
* Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
* Copyright (C) 2004 Apple Computer, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public License
* along with this library; see the file COPYING.LIB. If not, write to
* the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*
*/
#ifndef NodeFilter_h
#define NodeFilter_h
#include "NodeFilterCondition.h"
#include <wtf/Noncopyable.h>
#include <wtf/RefPtr.h>
namespace WebCore {
class NodeFilter : public Shared<NodeFilter>, Noncopyable {
public:
/**
* The following constants are returned by the acceptNode()
* method:
*/
enum {
FILTER_ACCEPT = 1,
FILTER_REJECT = 2,
FILTER_SKIP = 3
};
/**
* These are the available values for the whatToShow parameter.
* They are the same as the set of possible types for Node, and
* their values are derived by using a bit position corresponding
* to the value of NodeType for the equivalent node type.
*/
enum {
SHOW_ALL = 0xFFFFFFFF,
SHOW_ELEMENT = 0x00000001,
SHOW_ATTRIBUTE = 0x00000002,
SHOW_TEXT = 0x00000004,
SHOW_CDATA_SECTION = 0x00000008,
SHOW_ENTITY_REFERENCE = 0x00000010,
SHOW_ENTITY = 0x00000020,
SHOW_PROCESSING_INSTRUCTION = 0x00000040,
SHOW_COMMENT = 0x00000080,
SHOW_DOCUMENT = 0x00000100,
SHOW_DOCUMENT_TYPE = 0x00000200,
SHOW_DOCUMENT_FRAGMENT = 0x00000400,
SHOW_NOTATION = 0x00000800
};
NodeFilter(NodeFilterCondition*);
short acceptNode(Node*) const;
void mark() { m_condition->mark(); };
private:
RefPtr<NodeFilterCondition> m_condition;
};
} // namespace WebCore
#endif // NodeFilter_h
/**
* This file is part of the DOM implementation for KDE.
*
* Copyright (C) 1999 Lars Knoll (knoll@kde.org)
* Copyright (C) 2000 Frederik Holljen (frederik.holljen@hig.no)
* Copyright (C) 2001 Peter Kelly (pmk@post.com)
* Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
* Copyright (C) 2004 Apple Computer, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public License
* along with this library; see the file COPYING.LIB. If not, write to
* the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*
*/
#include "config.h"
#include "NodeFilterCondition.h"
#include "NodeFilter.h"
namespace WebCore {
short NodeFilterCondition::acceptNode(Node*) const
{
return NodeFilter::FILTER_ACCEPT;
}
} // namespace WebCore
/*
* This file is part of the DOM implementation for KDE.
*
* Copyright (C) 1999 Lars Knoll (knoll@kde.org)
* Copyright (C) 2000 Frederik Holljen (frederik.holljen@hig.no)
* Copyright (C) 2001 Peter Kelly (pmk@post.com)
* Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
* Copyright (C) 2004 Apple Computer, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public License
* along with this library; see the file COPYING.LIB. If not, write to
* the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*
*/
#ifndef NodeFilterCondition_h
#define NodeFilterCondition_h
#include "Shared.h"
namespace WebCore {
class Node;
class NodeFilterCondition : public Shared<NodeFilterCondition> {
public:
virtual ~NodeFilterCondition() { }
virtual short acceptNode(Node*) const;
virtual void mark() { }
};
} // namespace WebCore
#endif // NodeFilterCondition_h