[webkit-changes] cvs commit: WebCore/kwq DOM.mm
Eric
eseidel at opensource.apple.com
Sun Dec 4 04:43:16 PST 2005
eseidel 05/12/04 04:43:15
Modified: . ChangeLog
WebCore.xcodeproj project.pbxproj
khtml/css css_base.h
khtml/dom dom2_events.h dom2_traversal.cpp dom2_traversal.h
dom_exception.h
khtml/ecma kjs_traversal.cpp kjs_traversal.h
kwq DOM.mm
Removed: khtml/dom dom_misc.cpp dom_misc.h
Log:
Bug #: 5929
Submitted by: eseidel
Reviewed by: darin
No functionality changes, no test cases possible or necessary.
Removed dom_misc.* and changed to use Shared instead of DOMShared.
Also removed FilterNode typedef, now using NodeImpl* directly.
http://bugzilla.opendarwin.org/show_bug.cgi?id=5929
* WebCore.xcodeproj/project.pbxproj:
* khtml/css/css_base.h:
* khtml/dom/dom2_events.h:
* khtml/dom/dom2_traversal.cpp:
(DOM::NodeFilterCondition::acceptNode):
* khtml/dom/dom2_traversal.h:
* khtml/dom/dom_exception.h:
* khtml/dom/dom_misc.cpp: Removed.
* khtml/dom/dom_misc.h: Removed.
* khtml/ecma/kjs_traversal.cpp:
(KJS::JSNodeFilterCondition::acceptNode):
* khtml/ecma/kjs_traversal.h:
* kwq/DOM.mm:
(ObjCNodeFilterCondition::acceptNode):
Revision Changes Path
1.469 +25 -0 WebCore/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvs/root/WebCore/ChangeLog,v
retrieving revision 1.468
retrieving revision 1.469
diff -u -r1.468 -r1.469
--- ChangeLog 4 Dec 2005 11:34:55 -0000 1.468
+++ ChangeLog 4 Dec 2005 12:43:02 -0000 1.469
@@ -1,5 +1,30 @@
2005-12-04 Eric Seidel <eseidel at apple.com>
+ Reviewed by darin.
+
+ No functionality changes, no test cases possible or necessary.
+
+ Removed dom_misc.* and changed to use Shared instead of DOMShared.
+ Also removed FilterNode typedef, now using NodeImpl* directly.
+ http://bugzilla.opendarwin.org/show_bug.cgi?id=5929
+
+ * WebCore.xcodeproj/project.pbxproj:
+ * khtml/css/css_base.h:
+ * khtml/dom/dom2_events.h:
+ * khtml/dom/dom2_traversal.cpp:
+ (DOM::NodeFilterCondition::acceptNode):
+ * khtml/dom/dom2_traversal.h:
+ * khtml/dom/dom_exception.h:
+ * khtml/dom/dom_misc.cpp: Removed.
+ * khtml/dom/dom_misc.h: Removed.
+ * khtml/ecma/kjs_traversal.cpp:
+ (KJS::JSNodeFilterCondition::acceptNode):
+ * khtml/ecma/kjs_traversal.h:
+ * kwq/DOM.mm:
+ (ObjCNodeFilterCondition::acceptNode):
+
+2005-12-04 Eric Seidel <eseidel at apple.com>
+
Reviewed by mjs.
No test cases possible, no function changes.
1.50 +0 -12 WebCore/WebCore.xcodeproj/project.pbxproj
Index: project.pbxproj
===================================================================
RCS file: /cvs/root/WebCore/WebCore.xcodeproj/project.pbxproj,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- project.pbxproj 2 Dec 2005 09:19:04 -0000 1.49
+++ project.pbxproj 4 Dec 2005 12:43:08 -0000 1.50
@@ -87,7 +87,6 @@
93F198B508245E59001E9ABC /* dom2_range.h in Headers */ = {isa = PBXBuildFile; fileRef = F523D19F02DE4322018635CA /* dom2_range.h */; };
93F198B608245E59001E9ABC /* dom2_traversal.h in Headers */ = {isa = PBXBuildFile; fileRef = F523D1A102DE4322018635CA /* dom2_traversal.h */; };
93F198BB08245E59001E9ABC /* dom_exception.h in Headers */ = {isa = PBXBuildFile; fileRef = F523D19002DE4322018635CA /* dom_exception.h */; };
- 93F198BD08245E59001E9ABC /* dom_misc.h in Headers */ = {isa = PBXBuildFile; fileRef = F523D19302DE4322018635CA /* dom_misc.h */; };
93F198BE08245E59001E9ABC /* dom_node.h in Headers */ = {isa = PBXBuildFile; fileRef = F523D19502DE4322018635CA /* dom_node.h */; };
93F198BF08245E59001E9ABC /* dom_string.h in Headers */ = {isa = PBXBuildFile; fileRef = F523D19702DE4322018635CA /* dom_string.h */; };
93F198CE08245E59001E9ABC /* kjs_binding.h in Headers */ = {isa = PBXBuildFile; fileRef = F523D1F502DE4369018635CA /* kjs_binding.h */; };
@@ -467,7 +466,6 @@
93F19A6608245E59001E9ABC /* csshelper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F523D16A02DE42E7018635CA /* csshelper.cpp */; };
93F19A6708245E59001E9ABC /* cssparser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F523D16C02DE42E7018635CA /* cssparser.cpp */; };
93F19A6808245E59001E9ABC /* cssstyleselector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F523D17002DE42E7018635CA /* cssstyleselector.cpp */; };
- 93F19A6E08245E59001E9ABC /* dom_misc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F523D19202DE4322018635CA /* dom_misc.cpp */; };
93F19A7008245E59001E9ABC /* dom_string.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F523D19602DE4322018635CA /* dom_string.cpp */; };
93F19A7308245E59001E9ABC /* dom2_events.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F523D19C02DE4322018635CA /* dom2_events.cpp */; };
93F19A7508245E59001E9ABC /* dom2_traversal.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F523D1A002DE4322018635CA /* dom2_traversal.cpp */; };
@@ -625,7 +623,6 @@
A8212A9208794A2300677359 /* dom2_range.h in Headers */ = {isa = PBXBuildFile; fileRef = F523D19F02DE4322018635CA /* dom2_range.h */; };
A8212A9308794A2300677359 /* dom2_traversal.h in Headers */ = {isa = PBXBuildFile; fileRef = F523D1A102DE4322018635CA /* dom2_traversal.h */; };
A8212A9408794A2300677359 /* dom_exception.h in Headers */ = {isa = PBXBuildFile; fileRef = F523D19002DE4322018635CA /* dom_exception.h */; };
- A8212A9508794A2300677359 /* dom_misc.h in Headers */ = {isa = PBXBuildFile; fileRef = F523D19302DE4322018635CA /* dom_misc.h */; };
A8212A9608794A2300677359 /* dom_node.h in Headers */ = {isa = PBXBuildFile; fileRef = F523D19502DE4322018635CA /* dom_node.h */; };
A8212A9708794A2300677359 /* dom_string.h in Headers */ = {isa = PBXBuildFile; fileRef = F523D19702DE4322018635CA /* dom_string.h */; };
A8212AA408794A2300677359 /* kjs_binding.h in Headers */ = {isa = PBXBuildFile; fileRef = F523D1F502DE4369018635CA /* kjs_binding.h */; };
@@ -1037,7 +1034,6 @@
A8212C4D08794A2300677359 /* csshelper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F523D16A02DE42E7018635CA /* csshelper.cpp */; };
A8212C4E08794A2300677359 /* cssparser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F523D16C02DE42E7018635CA /* cssparser.cpp */; };
A8212C4F08794A2300677359 /* cssstyleselector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F523D17002DE42E7018635CA /* cssstyleselector.cpp */; };
- A8212C5008794A2300677359 /* dom_misc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F523D19202DE4322018635CA /* dom_misc.cpp */; };
A8212C5108794A2300677359 /* dom_string.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F523D19602DE4322018635CA /* dom_string.cpp */; };
A8212C5208794A2300677359 /* dom2_events.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F523D19C02DE4322018635CA /* dom2_events.cpp */; };
A8212C5308794A2300677359 /* dom2_traversal.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F523D1A002DE4322018635CA /* dom2_traversal.cpp */; };
@@ -2678,8 +2674,6 @@
F523D18802DE4322018635CA /* css_stylesheet.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = css_stylesheet.h; sourceTree = "<group>"; };
F523D18A02DE4322018635CA /* css_value.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = css_value.h; sourceTree = "<group>"; };
F523D19002DE4322018635CA /* dom_exception.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = dom_exception.h; sourceTree = "<group>"; };
- F523D19202DE4322018635CA /* dom_misc.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = dom_misc.cpp; sourceTree = "<group>"; };
- F523D19302DE4322018635CA /* dom_misc.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = dom_misc.h; sourceTree = "<group>"; };
F523D19502DE4322018635CA /* dom_node.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = dom_node.h; sourceTree = "<group>"; };
F523D19602DE4322018635CA /* dom_string.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = dom_string.cpp; sourceTree = "<group>"; };
F523D19702DE4322018635CA /* dom_string.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = dom_string.h; sourceTree = "<group>"; };
@@ -4263,8 +4257,6 @@
F523D18802DE4322018635CA /* css_stylesheet.h */,
F523D18A02DE4322018635CA /* css_value.h */,
F523D19002DE4322018635CA /* dom_exception.h */,
- F523D19202DE4322018635CA /* dom_misc.cpp */,
- F523D19302DE4322018635CA /* dom_misc.h */,
F523D19502DE4322018635CA /* dom_node.h */,
F523D19602DE4322018635CA /* dom_string.cpp */,
F523D19702DE4322018635CA /* dom_string.h */,
@@ -4832,7 +4824,6 @@
93F198B508245E59001E9ABC /* dom2_range.h in Headers */,
93F198B608245E59001E9ABC /* dom2_traversal.h in Headers */,
93F198BB08245E59001E9ABC /* dom_exception.h in Headers */,
- 93F198BD08245E59001E9ABC /* dom_misc.h in Headers */,
93F198BE08245E59001E9ABC /* dom_node.h in Headers */,
93F198BF08245E59001E9ABC /* dom_string.h in Headers */,
93F198CE08245E59001E9ABC /* kjs_binding.h in Headers */,
@@ -5174,7 +5165,6 @@
A8212A9208794A2300677359 /* dom2_range.h in Headers */,
A8212A9308794A2300677359 /* dom2_traversal.h in Headers */,
A8212A9408794A2300677359 /* dom_exception.h in Headers */,
- A8212A9508794A2300677359 /* dom_misc.h in Headers */,
A8212A9608794A2300677359 /* dom_node.h in Headers */,
A8212A9708794A2300677359 /* dom_string.h in Headers */,
A8212AA408794A2300677359 /* kjs_binding.h in Headers */,
@@ -6873,7 +6863,6 @@
93F19A6608245E59001E9ABC /* csshelper.cpp in Sources */,
93F19A6708245E59001E9ABC /* cssparser.cpp in Sources */,
93F19A6808245E59001E9ABC /* cssstyleselector.cpp in Sources */,
- 93F19A6E08245E59001E9ABC /* dom_misc.cpp in Sources */,
93F19A7008245E59001E9ABC /* dom_string.cpp in Sources */,
93F19A7308245E59001E9ABC /* dom2_events.cpp in Sources */,
93F19A7508245E59001E9ABC /* dom2_traversal.cpp in Sources */,
@@ -7144,7 +7133,6 @@
A8212C4D08794A2300677359 /* csshelper.cpp in Sources */,
A8212C4E08794A2300677359 /* cssparser.cpp in Sources */,
A8212C4F08794A2300677359 /* cssstyleselector.cpp in Sources */,
- A8212C5008794A2300677359 /* dom_misc.cpp in Sources */,
A8212C5108794A2300677359 /* dom_string.cpp in Sources */,
A8212C5208794A2300677359 /* dom2_events.cpp in Sources */,
A8212C5308794A2300677359 /* dom2_traversal.cpp in Sources */,
1.22 +0 -1 WebCore/khtml/css/css_base.h
Index: css_base.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/css/css_base.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- css_base.h 26 Oct 2005 19:44:04 -0000 1.21
+++ css_base.h 4 Dec 2005 12:43:11 -0000 1.22
@@ -25,7 +25,6 @@
#define CSS_BASE_H
#include "dom/dom_string.h"
-#include "dom/dom_misc.h"
#include "xml/dom_nodeimpl.h"
#include "dom_qname.h"
#include "misc/shared.h"
1.22 +2 -2 WebCore/khtml/dom/dom2_events.h
Index: dom2_events.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/dom/dom2_events.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- dom2_events.h 4 Dec 2005 11:35:05 -0000 1.21
+++ dom2_events.h 4 Dec 2005 12:43:11 -0000 1.22
@@ -24,7 +24,7 @@
#ifndef _DOM_Events_h_
#define _DOM_Events_h_
-#include <dom/dom_misc.h>
+#include "misc/shared.h"
#include <dom/dom_string.h>
namespace DOM {
@@ -49,7 +49,7 @@
* add them manually.
*
*/
-class EventListener : public DomShared {
+class EventListener : public khtml::Shared<EventListener> {
public:
EventListener();
virtual ~EventListener();
1.9 +1 -1 WebCore/khtml/dom/dom2_traversal.cpp
Index: dom2_traversal.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/dom/dom2_traversal.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- dom2_traversal.cpp 4 Dec 2005 11:35:05 -0000 1.8
+++ dom2_traversal.cpp 4 Dec 2005 12:43:12 -0000 1.9
@@ -27,7 +27,7 @@
// --------------------------------------------------------------
-short NodeFilterCondition::acceptNode(FilterNode) const
+short NodeFilterCondition::acceptNode(NodeImpl*) const
{
return NodeFilter::FILTER_ACCEPT;
}
1.8 +4 -9 WebCore/khtml/dom/dom2_traversal.h
Index: dom2_traversal.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/dom/dom2_traversal.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- dom2_traversal.h 4 Dec 2005 11:35:05 -0000 1.7
+++ dom2_traversal.h 4 Dec 2005 12:43:12 -0000 1.8
@@ -27,22 +27,17 @@
#ifndef _dom2_traversal_h_
#define _dom2_traversal_h_
-#include <dom/dom_misc.h>
+#include "misc/shared.h"
namespace DOM {
class NodeImpl;
-class NodeFilterImpl;
-class NodeIteratorImpl;
-class TreeWalkerImpl;
-typedef NodeImpl *FilterNode;
-
-
-class NodeFilterCondition : public DomShared
+class NodeFilterCondition : public khtml::Shared<NodeFilterCondition>
{
public:
- virtual short acceptNode(FilterNode) const;
+ virtual ~NodeFilterCondition() { }
+ virtual short acceptNode(NodeImpl*) const;
};
/**
1.7 +0 -2 WebCore/khtml/dom/dom_exception.h
Index: dom_exception.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/dom/dom_exception.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- dom_exception.h 4 Dec 2005 11:35:06 -0000 1.6
+++ dom_exception.h 4 Dec 2005 12:43:12 -0000 1.7
@@ -29,8 +29,6 @@
#ifndef _DOM_DOMException_h_
#define _DOM_DOMException_h_
-#include <dom/dom_misc.h>
-
namespace DOM {
/**
1.21 +1 -2 WebCore/khtml/ecma/kjs_traversal.cpp
Index: kjs_traversal.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/kjs_traversal.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- kjs_traversal.cpp 4 Dec 2005 11:35:08 -0000 1.20
+++ kjs_traversal.cpp 4 Dec 2005 12:43:13 -0000 1.21
@@ -29,7 +29,6 @@
#include <kdebug.h>
#include <kjs/protect.h>
-using DOM::FilterNode;
using DOM::NodeFilterImpl;
using DOM::NodeImpl;
using DOM::NodeIteratorImpl;
@@ -314,7 +313,7 @@
{
}
-short JSNodeFilterCondition::acceptNode(FilterNode filterNode) const
+short JSNodeFilterCondition::acceptNode(NodeImpl* filterNode) const
{
NodeImpl *node = filterNode;
KHTMLPart *part = node->getDocument()->part();
1.14 +2 -2 WebCore/khtml/ecma/kjs_traversal.h
Index: kjs_traversal.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/kjs_traversal.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- kjs_traversal.h 1 Dec 2005 10:32:10 -0000 1.13
+++ kjs_traversal.h 4 Dec 2005 12:43:13 -0000 1.14
@@ -28,7 +28,7 @@
namespace DOM {
class NodeFilterImpl;
class NodeIteratorImpl;
- class NodeTreeWalkerImpl;
+ class TreeWalkerImpl;
}
namespace KJS {
@@ -101,7 +101,7 @@
public:
JSNodeFilterCondition(ObjectImp * _filter);
virtual ~JSNodeFilterCondition() {}
- virtual short acceptNode(DOM::FilterNode) const;
+ virtual short acceptNode(DOM::NodeImpl*) const;
protected:
ProtectedPtr<ObjectImp> filter;
};
1.62 +2 -3 WebCore/kwq/DOM.mm
Index: DOM.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/DOM.mm,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- DOM.mm 29 Nov 2005 17:28:34 -0000 1.61
+++ DOM.mm 4 Dec 2005 12:43:15 -0000 1.62
@@ -76,7 +76,6 @@
using DOM::EntityImpl;
using DOM::EventImpl;
using DOM::EventListener;
-using DOM::FilterNode;
using DOM::HTMLElementImpl;
using DOM::NamedNodeMapImpl;
using DOM::Node;
@@ -2218,7 +2217,7 @@
public:
ObjCNodeFilterCondition(id <DOMNodeFilter>);
virtual ~ObjCNodeFilterCondition();
- virtual short acceptNode(FilterNode) const;
+ virtual short acceptNode(NodeImpl*) const;
private:
ObjCNodeFilterCondition(const ObjCNodeFilterCondition &);
@@ -2239,7 +2238,7 @@
CFRelease(m_filter);
}
-short ObjCNodeFilterCondition::acceptNode(FilterNode n) const
+short ObjCNodeFilterCondition::acceptNode(NodeImpl* n) const
{
#if KHTML_NO_CPLUSPLUS_DOM
NodeImpl *node = n;
More information about the webkit-changes
mailing list