Changeset 22035 in webkit
- Timestamp:
- Jun 6, 2007 5:54:18 PM (17 years ago)
- Location:
- trunk
- Files:
-
- 1 added
- 13 edited
- 2 moved
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r21981 r22035 1 2007-06-06 Sam Weinig <sam@webkit.org> 2 3 Reviewed by Hyatt. 4 5 Update results for http://bugs.webkit.org/show_bug.cgi?id=13947 6 Finish autogenerating the JS DOM traversal code 7 8 * fast/dom/Window/window-properties-expected.txt: 9 1 10 2007-06-05 Anders Carlsson <andersca@apple.com> 2 11 -
trunk/LayoutTests/fast/dom/Window/window-properties-expected.txt
r21911 r22035 753 753 window.NodeFilter.prototype.SHOW_PROCESSING_INSTRUCTION [number] 754 754 window.NodeFilter.prototype.SHOW_TEXT [number] 755 window.NodeFilter.prototype.acceptNode [function] 755 756 window.Notation [object NotationConstructor] 756 757 window.Notation.prototype [printed above as window.Node.prototype] -
trunk/WebCore/ChangeLog
r22030 r22035 1 2007-06-06 Sam Weinig <sam@webkit.org> 2 3 Reviewed by Hyatt. 4 5 Patch for http://bugs.webkit.org/show_bug.cgi?id=13947 6 Finish autogenerating the JS DOM traversal code 7 8 - Completely generate JSNodeFilter. 9 - Move JSNodeFilterCondition into its own file 10 11 * DerivedSources.make: 12 * WebCore.pro: 13 * WebCore.xcodeproj/project.pbxproj: 14 * bindings/js/JSNodeFilterCondition.cpp: Copied from WebCore/bindings/js/kjs_traversal.cpp. 15 (WebCore::JSNodeFilterCondition::JSNodeFilterCondition): 16 (WebCore::JSNodeFilterCondition::mark): 17 (WebCore::JSNodeFilterCondition::acceptNode): 18 * bindings/js/JSNodeFilterCondition.h: Copied from WebCore/bindings/js/kjs_traversal.h. 19 * bindings/js/JSNodeFilterCustom.cpp: Added. 20 (WebCore::JSNodeFilter::mark): 21 (WebCore::toNodeFilter): 22 * bindings/js/kjs_dom.cpp: 23 * bindings/js/kjs_traversal.cpp: Removed. 24 * bindings/js/kjs_traversal.h: Removed. 25 * bindings/js/kjs_window.cpp: 26 * bindings/objc/DOM.mm: 27 (-[DOMDocument createNodeIterator:whatToShow:filter:expandEntityReferences:]): 28 (-[DOMDocument createTreeWalker:whatToShow:filter:expandEntityReferences:]): 29 * bindings/scripts/CodeGeneratorJS.pm: 30 * dom/Document.cpp: 31 (WebCore::Document::createNodeIterator): 32 (WebCore::Document::createTreeWalker): 33 * dom/Document.h: 34 * dom/NodeFilter.idl: 35 1 36 2007-06-06 Alp Toker <alp.toker@collabora.co.uk> 2 37 -
trunk/WebCore/DerivedSources.make
r21911 r22035 550 550 kjs_html.lut.h \ 551 551 kjs_navigator.lut.h \ 552 kjs_traversal.lut.h \553 552 kjs_window.lut.h \ 554 553 ksvgcssproperties.h \ -
trunk/WebCore/WebCore.pro
r22027 r22035 144 144 bindings/js/kjs_html.cpp \ 145 145 bindings/js/kjs_navigator.cpp \ 146 bindings/js/kjs_traversal.cpp \147 146 bindings/js/kjs_window.cpp 148 147 … … 283 282 bindings/js/JSHTMLOptionsCollectionCustom.cpp \ 284 283 bindings/js/JSHTMLSelectElementCustom.cpp \ 284 bindings/js/JSNodeFilterCondition.cpp \ 285 bindings/js/JSNodeFilterCustom.cpp \ 285 286 bindings/js/JSNodeIteratorCustom.cpp \ 286 287 bindings/js/JSStyleSheetCustom.cpp \ … … 295 296 bindings/js/kjs_navigator.cpp \ 296 297 bindings/js/kjs_proxy.cpp \ 297 bindings/js/kjs_traversal.cpp \298 298 bindings/js/kjs_window.cpp \ 299 299 css/CSSBorderImageValue.cpp \ -
trunk/WebCore/WebCore.xcodeproj/project.pbxproj
r22013 r22035 1540 1540 93B70D6F09EB0C7C009D8468 /* kjs_proxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93B70D5309EB0C7C009D8468 /* kjs_proxy.cpp */; }; 1541 1541 93B70D7009EB0C7C009D8468 /* kjs_proxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 93B70D5409EB0C7C009D8468 /* kjs_proxy.h */; settings = {ATTRIBUTES = (Private, ); }; }; 1542 93B70D7109EB0C7C009D8468 /* kjs_traversal.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93B70D5509EB0C7C009D8468 /* kjs_traversal.cpp */; };1543 93B70D7209EB0C7C009D8468 /* kjs_traversal.h in Headers */ = {isa = PBXBuildFile; fileRef = 93B70D5609EB0C7C009D8468 /* kjs_traversal.h */; };1544 1542 93B70D7509EB0C7C009D8468 /* kjs_window.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93B70D5909EB0C7C009D8468 /* kjs_window.cpp */; }; 1545 1543 93B70D7609EB0C7C009D8468 /* kjs_window.h in Headers */ = {isa = PBXBuildFile; fileRef = 93B70D5A09EB0C7C009D8468 /* kjs_window.h */; }; … … 2847 2845 BCB16C2E0979C3BD00467741 /* Request.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCB16C150979C3BD00467741 /* Request.cpp */; }; 2848 2846 BCB16C2F0979C3BD00467741 /* Request.h in Headers */ = {isa = PBXBuildFile; fileRef = BCB16C160979C3BD00467741 /* Request.h */; }; 2847 BCB773610C17853D00132BA4 /* JSNodeFilterCondition.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCB7735E0C17853D00132BA4 /* JSNodeFilterCondition.cpp */; }; 2848 BCB773620C17853D00132BA4 /* JSNodeFilterCondition.h in Headers */ = {isa = PBXBuildFile; fileRef = BCB7735F0C17853D00132BA4 /* JSNodeFilterCondition.h */; }; 2849 BCB773630C17853D00132BA4 /* JSNodeFilterCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCB773600C17853D00132BA4 /* JSNodeFilterCustom.cpp */; }; 2849 2850 BCC088860A1BD78D006189A6 /* FontDataMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = BCC088850A1BD78D006189A6 /* FontDataMac.mm */; }; 2850 2851 BCC0891A0A1C4652006189A6 /* FontData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCC089190A1C4652006189A6 /* FontData.cpp */; }; … … 4707 4708 93B70D5309EB0C7C009D8468 /* kjs_proxy.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = kjs_proxy.cpp; sourceTree = "<group>"; }; 4708 4709 93B70D5409EB0C7C009D8468 /* kjs_proxy.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = kjs_proxy.h; sourceTree = "<group>"; }; 4709 93B70D5509EB0C7C009D8468 /* kjs_traversal.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = kjs_traversal.cpp; sourceTree = "<group>"; };4710 93B70D5609EB0C7C009D8468 /* kjs_traversal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = kjs_traversal.h; sourceTree = "<group>"; };4711 4710 93B70D5909EB0C7C009D8468 /* kjs_window.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = kjs_window.cpp; sourceTree = "<group>"; }; 4712 4711 93B70D5A09EB0C7C009D8468 /* kjs_window.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = kjs_window.h; sourceTree = "<group>"; }; … … 6122 6121 BCB16C150979C3BD00467741 /* Request.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = Request.cpp; sourceTree = "<group>"; }; 6123 6122 BCB16C160979C3BD00467741 /* Request.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Request.h; sourceTree = "<group>"; }; 6123 BCB7735E0C17853D00132BA4 /* JSNodeFilterCondition.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSNodeFilterCondition.cpp; sourceTree = "<group>"; }; 6124 BCB7735F0C17853D00132BA4 /* JSNodeFilterCondition.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSNodeFilterCondition.h; sourceTree = "<group>"; }; 6125 BCB773600C17853D00132BA4 /* JSNodeFilterCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSNodeFilterCustom.cpp; sourceTree = "<group>"; }; 6124 6126 BCC088850A1BD78D006189A6 /* FontDataMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = FontDataMac.mm; sourceTree = "<group>"; }; 6125 6127 BCC089190A1C4652006189A6 /* FontData.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = FontData.cpp; sourceTree = "<group>"; }; … … 9189 9191 93B70D5309EB0C7C009D8468 /* kjs_proxy.cpp */, 9190 9192 93B70D5409EB0C7C009D8468 /* kjs_proxy.h */, 9191 93B70D5509EB0C7C009D8468 /* kjs_traversal.cpp */,9192 93B70D5609EB0C7C009D8468 /* kjs_traversal.h */,9193 9193 93B70D5909EB0C7C009D8468 /* kjs_window.cpp */, 9194 9194 93B70D5A09EB0C7C009D8468 /* kjs_window.h */, … … 9257 9257 BC17F9650B64EBB8004A65CB /* JSHTMLSelectElementCustom.cpp */, 9258 9258 AB4CB4EA0B8BDA3D009F40B0 /* JSHTMLSelectElementCustom.h */, 9259 BCB7735E0C17853D00132BA4 /* JSNodeFilterCondition.cpp */, 9260 BCB7735F0C17853D00132BA4 /* JSNodeFilterCondition.h */, 9261 BCB773600C17853D00132BA4 /* JSNodeFilterCustom.cpp */, 9259 9262 1A750DD30A90E729000FF215 /* JSNodeIteratorCustom.cpp */, 9260 9263 BC98A27C0C0C9950004BEBF7 /* JSStyleSheetCustom.cpp */, … … 10404 10407 93B70D6E09EB0C7C009D8468 /* kjs_navigator.h in Headers */, 10405 10408 93B70D7009EB0C7C009D8468 /* kjs_proxy.h in Headers */, 10406 93B70D7209EB0C7C009D8468 /* kjs_traversal.h in Headers */,10407 10409 93B70D7609EB0C7C009D8468 /* kjs_window.h in Headers */, 10408 10410 1403B99709EB13AF00797C7F /* DOMWindow.h in Headers */, … … 11497 11499 BC46C2070C0DDCA10020CFC3 /* JSCSSStyleRule.h in Headers */, 11498 11500 BCC5BE010C0E93110011C2DB /* JSCSSStyleSheet.h in Headers */, 11501 BCB773620C17853D00132BA4 /* JSNodeFilterCondition.h in Headers */, 11499 11502 ); 11500 11503 runOnlyForDeploymentPostprocessing = 0; … … 11534 11537 isa = PBXProject; 11535 11538 buildConfigurationList = 149C284308902B11008A9EFC /* Build configuration list for PBXProject "WebCore" */; 11536 compatibilityVersion = "Xcode 2.4";11537 11539 hasScannedForEncodings = 1; 11538 11540 knownRegions = ( … … 11549 11551 projectDirPath = ""; 11550 11552 projectRoot = ""; 11551 shouldCheckCompatibility = 1;11552 11553 targets = ( 11553 11554 93F198A508245E59001E9ABC /* WebCore */, … … 12027 12028 93B70D6D09EB0C7C009D8468 /* kjs_navigator.cpp in Sources */, 12028 12029 93B70D6F09EB0C7C009D8468 /* kjs_proxy.cpp in Sources */, 12029 93B70D7109EB0C7C009D8468 /* kjs_traversal.cpp in Sources */,12030 12030 93B70D7509EB0C7C009D8468 /* kjs_window.cpp in Sources */, 12031 12031 1403B99809EB13AF00797C7F /* DOMWindow.cpp in Sources */, … … 12910 12910 BC20FB7F0C0E8E6C00D1447F /* JSCSSValueCustom.cpp in Sources */, 12911 12911 BCC5BE000C0E93110011C2DB /* JSCSSStyleSheet.cpp in Sources */, 12912 BCB773610C17853D00132BA4 /* JSNodeFilterCondition.cpp in Sources */, 12913 BCB773630C17853D00132BA4 /* JSNodeFilterCustom.cpp in Sources */, 12912 12914 ); 12913 12915 runOnlyForDeploymentPostprocessing = 0; -
trunk/WebCore/bindings/js/JSNodeFilterCondition.cpp
r22029 r22035 1 1 /* 2 * This file is part of the KDE libraries3 2 * Copyright (C) 2001 Peter Kelly (pmk@post.com) 3 * Copyright (C) 2007 Apple Inc. All rights reserved. 4 4 * 5 5 * This library is free software; you can redistribute it and/or … … 19 19 20 20 #include "config.h" 21 #include " kjs_traversal.h"21 #include "JSNodeFilterCondition.h" 22 22 23 23 #include "Document.h" 24 24 #include "Frame.h" 25 25 #include "JSNodeFilter.h" 26 #include "NodeFilter.h" 26 27 #include "kjs_proxy.h" 27 28 28 #include "kjs_traversal.lut.h" 29 namespace WebCore { 29 30 30 using namespace WebCore; 31 32 namespace KJS { 33 34 // ------------------------------------------------------------------------- 35 36 const ClassInfo DOMNodeFilter::info = { "NodeFilter", 0, 0, 0 }; 37 /* 38 @begin DOMNodeFilterPrototypeTable 1 39 acceptNode DOMNodeFilter::AcceptNode DontDelete|Function 0 40 @end 41 */ 42 KJS_DEFINE_PROTOTYPE(DOMNodeFilterPrototype) 43 KJS_IMPLEMENT_PROTOTYPE_FUNCTION(DOMNodeFilterPrototypeFunction) 44 KJS_IMPLEMENT_PROTOTYPE("DOMNodeFilter",DOMNodeFilterPrototype,DOMNodeFilterPrototypeFunction) 45 46 DOMNodeFilter::DOMNodeFilter(ExecState *exec, NodeFilter *nf) 47 : m_impl(nf) 48 { 49 setPrototype(DOMNodeFilterPrototype::self(exec)); 50 } 51 52 DOMNodeFilter::~DOMNodeFilter() 53 { 54 ScriptInterpreter::forgetDOMObject(m_impl.get()); 55 } 56 57 void DOMNodeFilter::mark() 58 { 59 m_impl->mark(); 60 DOMObject::mark(); 61 } 62 63 JSValue *DOMNodeFilterPrototypeFunction::callAsFunction(ExecState *exec, JSObject *thisObj, const List &args) 64 { 65 if (!thisObj->inherits(&KJS::DOMNodeFilter::info)) 66 return throwError(exec, TypeError); 67 NodeFilter &nodeFilter = *static_cast<DOMNodeFilter *>(thisObj)->impl(); 68 switch (id) { 69 case DOMNodeFilter::AcceptNode: 70 return jsNumber(nodeFilter.acceptNode(toNode(args[0]))); 71 } 72 return jsUndefined(); 73 } 74 75 JSValue *toJS(ExecState* exec, NodeFilter* nf) 76 { 77 return cacheDOMObject<NodeFilter, JSNodeFilter>(exec, nf); 78 } 79 80 PassRefPtr<NodeFilter> toNodeFilter(JSValue* val) 81 { 82 if (!val) 83 return 0; 84 if (!val->isObject()) 85 return 0; 86 87 if (val->isObject(&DOMNodeFilter::info)) 88 return static_cast<DOMNodeFilter *>(val)->impl(); 89 90 JSObject* o = static_cast<JSObject*>(val); 91 if (o->implementsCall()) 92 return new NodeFilter(new JSNodeFilterCondition(o)); 93 94 return 0; 95 } 96 97 // ------------------------------------------------------------------------- 98 99 JSNodeFilterCondition::JSNodeFilterCondition(JSObject * _filter) 100 : filter( _filter ) 31 JSNodeFilterCondition::JSNodeFilterCondition(KJS::JSObject* filter) 32 : m_filter(filter) 101 33 { 102 34 } … … 104 36 void JSNodeFilterCondition::mark() 105 37 { 106 filter->mark();38 m_filter->mark(); 107 39 } 108 40 109 short JSNodeFilterCondition::acceptNode( WebCore::Node* filterNode) const41 short JSNodeFilterCondition::acceptNode(Node* filterNode) const 110 42 { 111 WebCore::Node *node = filterNode;112 Frame *frame = node->document()->frame();113 KJSProxy *proxy = frame->scriptProxy();114 if (proxy && filter->implementsCall()) {115 JSLock lock;116 ExecState *exec = proxy->interpreter()->globalExec();117 List args;118 args.append( toJS(exec, node));119 JSObject *obj =filter;120 JSValue *result = obj->call(exec, obj, args);43 Node* node = filterNode; 44 Frame* frame = node->document()->frame(); 45 KJSProxy* proxy = frame->scriptProxy(); 46 if (proxy && m_filter->implementsCall()) { 47 KJS::JSLock lock; 48 KJS::ExecState* exec = proxy->interpreter()->globalExec(); 49 KJS::List args; 50 args.append(KJS::toJS(exec, node)); 51 KJS::JSObject* obj = m_filter; 52 KJS::JSValue* result = obj->call(exec, obj, args); 121 53 return result->toInt32(exec); 122 54 } … … 125 57 } 126 58 127 } // namespace 59 } // namespace WebCore -
trunk/WebCore/bindings/js/JSNodeFilterCondition.h
r22029 r22035 1 // -*- c-basic-offset: 2 -*-2 1 /* 3 * This file is part of the KDE libraries4 2 * Copyright (C) 2001 Peter Kelly (pmk@post.com) 3 * Copyright (C) 2007 Apple Inc. All rights reserved. 5 4 * 6 5 * This library is free software; you can redistribute it and/or … … 19 18 */ 20 19 21 #ifndef kjs_traversal_h22 #define kjs_traversal_h20 #ifndef JSNodeFilterCondition_h 21 #define JSNodeFilterCondition_h 23 22 24 #include "NodeFilter.h"25 23 #include "NodeFilterCondition.h" 26 24 #include "kjs_dom.h" 27 25 28 26 namespace WebCore { 29 class NodeFilter;30 }31 27 32 namespace KJS { 28 class Node; 33 29 34 class DOMNodeFilter : public DOMObject { 35 public: 36 DOMNodeFilter(ExecState*, WebCore::NodeFilter*); 37 ~DOMNodeFilter(); 38 virtual void mark(); 39 // no put - all read-only 40 virtual const ClassInfo* classInfo() const { return &info; } 41 static const ClassInfo info; 42 WebCore::NodeFilter* impl() const { return m_impl.get(); } 43 enum { AcceptNode }; 44 private: 45 RefPtr<WebCore::NodeFilter> m_impl; 46 }; 30 class JSNodeFilterCondition : public NodeFilterCondition { 31 public: 32 JSNodeFilterCondition(KJS::JSObject* filter); 33 virtual short acceptNode(Node*) const; 34 virtual void mark(); 47 35 48 JSValue* toJS(ExecState*, WebCore::NodeFilter*); 36 protected: 37 KJS::JSObject* m_filter; 38 }; 49 39 50 PassRefPtr<WebCore::NodeFilter> toNodeFilter(JSValue*); // returns 0 if value is not a DOMNodeFilter or JS function 40 } // namespace WebCore 51 41 52 class JSNodeFilterCondition : public WebCore::NodeFilterCondition { 53 public: 54 JSNodeFilterCondition(JSObject* filter); 55 virtual short acceptNode(WebCore::Node*) const; 56 virtual void mark(); 57 protected: 58 JSObject *filter; 59 }; 60 61 } // namespace 62 63 #endif 42 #endif // JSNodeFilterCondition_h -
trunk/WebCore/bindings/js/kjs_dom.cpp
r21927 r22035 61 61 #include "kjs_css.h" 62 62 #include "kjs_events.h" 63 #include "kjs_traversal.h"64 63 #include "kjs_window.h" 65 64 #include "xmlhttprequest.h" -
trunk/WebCore/bindings/js/kjs_window.cpp
r21927 r22035 62 62 #include "kjs_navigator.h" 63 63 #include "kjs_proxy.h" 64 #include "kjs_traversal.h"65 64 #include <wtf/MathExtras.h> 66 65 -
trunk/WebCore/bindings/objc/DOM.mm
r22020 r22035 701 701 - (DOMNodeIterator *)createNodeIterator:(DOMNode *)root whatToShow:(unsigned)whatToShow filter:(id <DOMNodeFilter>)filter expandEntityReferences:(BOOL)expandEntityReferences 702 702 { 703 RefPtr<WebCore::NodeFilter>cppFilter;703 WebCore::NodeFilter* cppFilter; 704 704 if (filter) 705 705 cppFilter = new WebCore::NodeFilter(new ObjCNodeFilterCondition(filter)); … … 712 712 - (DOMTreeWalker *)createTreeWalker:(DOMNode *)root whatToShow:(unsigned)whatToShow filter:(id <DOMNodeFilter>)filter expandEntityReferences:(BOOL)expandEntityReferences 713 713 { 714 RefPtr<WebCore::NodeFilter>cppFilter;714 WebCore::NodeFilter* cppFilter; 715 715 if (filter) 716 716 cppFilter = new WebCore::NodeFilter(new ObjCNodeFilterCondition(filter)); -
trunk/WebCore/bindings/scripts/CodeGeneratorJS.pm
r21979 r22035 145 145 return "#include \"kjs_css.h\"\n\n" if $module eq "css"; 146 146 return "#include \"kjs_html.h\"\n\n" if $module eq "html"; 147 return "#include \"kjs_traversal.h\"\n\n" if $module eq "traversal";148 147 149 148 die "Don't know what headers to include for module $module"; … … 1168 1167 } 1169 1168 1170 if ( !$hasParent || $dataNode->extendedAttributes->{"GenerateNativeConverter"}) {1169 if ((!$hasParent or $dataNode->extendedAttributes->{"GenerateNativeConverter"}) and !$dataNode->extendedAttributes->{"CustomNativeConverter"}) { 1171 1170 if ($podType) { 1172 1171 push(@implContent, "$podType to${interfaceName}(KJS::JSValue* val)\n"); … … 1246 1245 return "int" if $type eq "long"; 1247 1246 return "String" if $type eq "DOMString"; 1248 return "PassRefPtr<${type}>" if $type eq "NodeFilter";1249 1247 return "Range::CompareHow" if $type eq "CompareHow"; 1250 1248 return "EventTargetNode*" if $type eq "EventTarget"; … … 1354 1352 $implIncludes{"kjs_dom.h"} = 1; 1355 1353 return "toElement($value)"; 1356 }1357 1358 if ($type eq "NodeFilter") {1359 $implIncludes{"kjs_traversal.h"} = 1;1360 return "toNodeFilter($value)";1361 1354 } 1362 1355 -
trunk/WebCore/dom/Document.cpp
r21749 r22035 918 918 919 919 PassRefPtr<NodeIterator> Document::createNodeIterator(Node* root, unsigned whatToShow, 920 PassRefPtr<NodeFilter>filter, bool expandEntityReferences, ExceptionCode& ec)920 NodeFilter* filter, bool expandEntityReferences, ExceptionCode& ec) 921 921 { 922 922 if (!root) { … … 928 928 929 929 PassRefPtr<TreeWalker> Document::createTreeWalker(Node *root, unsigned whatToShow, 930 PassRefPtr<NodeFilter>filter, bool expandEntityReferences, ExceptionCode& ec)930 NodeFilter* filter, bool expandEntityReferences, ExceptionCode& ec) 931 931 { 932 932 if (!root) { -
trunk/WebCore/dom/Document.h
r21749 r22035 309 309 310 310 PassRefPtr<NodeIterator> createNodeIterator(Node* root, unsigned whatToShow, 311 PassRefPtr<NodeFilter>, bool expandEntityReferences, ExceptionCode&);311 NodeFilter*, bool expandEntityReferences, ExceptionCode&); 312 312 313 313 PassRefPtr<TreeWalker> createTreeWalker(Node* root, unsigned whatToShow, 314 PassRefPtr<NodeFilter>, bool expandEntityReferences, ExceptionCode&);314 NodeFilter*, bool expandEntityReferences, ExceptionCode&); 315 315 316 316 // Special support for editing -
trunk/WebCore/dom/NodeFilter.idl
r16299 r22035 1 1 /* 2 * Copyright (C) 2006 Apple Computer, Inc.2 * Copyright (C) 2006, 2007 Apple Inc. All rights reserved. 3 3 * Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com> 4 4 * … … 22 22 23 23 // Introduced in DOM Level 2: 24 interface [ LegacyParent=KJS::DOMNodeFilter, GenerateConstructor, ObjCProtocol] NodeFilter {24 interface [GenerateConstructor, CustomMarkFunction, CustomNativeConverter, ObjCProtocol] NodeFilter { 25 25 26 26 // Constants returned by acceptNode … … 44 44 const unsigned long SHOW_NOTATION = 0x00000800; 45 45 46 #if !defined(LANGUAGE_JAVASCRIPT)47 46 short acceptNode(in Node n); 48 #endif49 47 50 48 };
Note: See TracChangeset
for help on using the changeset viewer.