[webkit-changes] cvs commit: WebCore/khtml/ecma domparser.lut.h
Makefile.am domparser.cpp kjs_window.cpp kjs_window.h
kjs_window.lut.h
Adele
adele at opensource.apple.com
Mon Jul 11 17:06:45 PDT 2005
adele 05/07/11 17:06:44
Modified: . Tag: Safari-1-3-branch ChangeLog
WebCore.pbproj Tag: Safari-1-3-branch project.pbxproj
khtml/ecma Tag: Safari-1-3-branch Makefile.am domparser.cpp
kjs_window.cpp kjs_window.h kjs_window.lut.h
Added: khtml/ecma Tag: Safari-1-3-branch domparser.lut.h
Log:
Merged fix from TOT to Safari-1-3-branch
<rdar://problem/4164913> implement Mozilla "DOMParser" extension for use with XMLHTTPRequest
2005-06-08 Anders Carlsson <andersca at mac.com>
Reviewed and committed by Maciej.
- fixed http://bugzilla.opendarwin.org/show_bug.cgi?id=3337
(Support the Mozilla DOMParser and XMLSerializer objects)
<rdar://problem/3533735> implement Mozilla "DOMParser" extension for use with XMLHTTPRequest
Test cases added:
* layout-tests/fast/dom/dom-parse-serialize-display-expected.txt: Added.
* layout-tests/fast/dom/dom-parse-serialize-display.html: Added.
* layout-tests/fast/dom/dom-parse-serialize-expected.txt: Added.
* layout-tests/fast/dom/dom-parse-serialize.html: Added.
* khtml/ecma/domparser.h:
* khtml/ecma/domparser.cpp:
Add files implementing the DOMParser object.
* khtml/ecma/kjs_window.h:
* khtml/ecma/kjs_window.cpp:
Expose DOMParser object.
Revision Changes Path
No revision
No revision
1.4108.4.15 +28 -0 WebCore/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvs/root/WebCore/ChangeLog,v
retrieving revision 1.4108.4.14
retrieving revision 1.4108.4.15
diff -u -r1.4108.4.14 -r1.4108.4.15
--- ChangeLog 1 Jul 2005 21:14:24 -0000 1.4108.4.14
+++ ChangeLog 12 Jul 2005 00:06:33 -0000 1.4108.4.15
@@ -1,3 +1,31 @@
+2005-07-11 Adele Peterson <adele at apple.com>
+
+ Merged fix from TOT to Safari-1-3-branch
+ <rdar://problem/4164913> implement Mozilla "DOMParser" extension for use with XMLHTTPRequest
+
+ 2005-06-08 Anders Carlsson <andersca at mac.com>
+
+ Reviewed and committed by Maciej.
+
+ - fixed http://bugzilla.opendarwin.org/show_bug.cgi?id=3337
+ (Support the Mozilla DOMParser and XMLSerializer objects)
+
+ <rdar://problem/3533735> implement Mozilla "DOMParser" extension for use with XMLHTTPRequest
+
+ Test cases added:
+ * layout-tests/fast/dom/dom-parse-serialize-display-expected.txt: Added.
+ * layout-tests/fast/dom/dom-parse-serialize-display.html: Added.
+ * layout-tests/fast/dom/dom-parse-serialize-expected.txt: Added.
+ * layout-tests/fast/dom/dom-parse-serialize.html: Added.
+
+ * khtml/ecma/domparser.h:
+ * khtml/ecma/domparser.cpp:
+ Add files implementing the DOMParser object.
+
+ * khtml/ecma/kjs_window.h:
+ * khtml/ecma/kjs_window.cpp:
+ Expose DOMParser object.
+
=== WebCore-315.7 ===
2005-07-01 Adele Peterson <adele at apple.com>
No revision
No revision
1.528.2.7 +58 -0 WebCore/WebCore.pbproj/project.pbxproj
Index: project.pbxproj
===================================================================
RCS file: /cvs/root/WebCore/WebCore.pbproj/project.pbxproj,v
retrieving revision 1.528.2.6
retrieving revision 1.528.2.7
diff -u -r1.528.2.6 -r1.528.2.7
--- project.pbxproj 1 Jul 2005 21:14:32 -0000 1.528.2.6
+++ project.pbxproj 12 Jul 2005 00:06:40 -0000 1.528.2.7
@@ -540,6 +540,8 @@
BEA5E01E075CEDAC0098A432,
9378D9FC07640A46004B97BF,
EDA4AC98076FB89100DD23EC,
+ B55772C70883262B00DCA277,
+ B55772DF08833B6300DCA277,
);
isa = PBXHeadersBuildPhase;
runOnlyForDeploymentPostprocessing = 0;
@@ -828,6 +830,7 @@
BEA5DBDB075CEDA00098A432,
9378D9FB07640A46004B97BF,
51111AC107BD812C00B7162C,
+ B55772C60883262B00DCA277,
);
isa = PBXSourcesBuildPhase;
runOnlyForDeploymentPostprocessing = 0;
@@ -2337,6 +2340,58 @@
//932
//933
//934
+//B50
+//B51
+//B52
+//B53
+//B54
+ B55772C40883262B00DCA277 = {
+ fileEncoding = 30;
+ isa = PBXFileReference;
+ lastKnownFileType = sourcecode.cpp.cpp;
+ path = domparser.cpp;
+ refType = 4;
+ sourceTree = "<group>";
+ };
+ B55772C50883262B00DCA277 = {
+ fileEncoding = 30;
+ isa = PBXFileReference;
+ lastKnownFileType = sourcecode.c.h;
+ path = domparser.h;
+ refType = 4;
+ sourceTree = "<group>";
+ };
+ B55772C60883262B00DCA277 = {
+ fileRef = B55772C40883262B00DCA277;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ B55772C70883262B00DCA277 = {
+ fileRef = B55772C50883262B00DCA277;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ B55772DE08833B6300DCA277 = {
+ fileEncoding = 30;
+ isa = PBXFileReference;
+ lastKnownFileType = sourcecode.c.h;
+ path = domparser.lut.h;
+ refType = 4;
+ sourceTree = "<group>";
+ };
+ B55772DF08833B6300DCA277 = {
+ fileRef = B55772DE08833B6300DCA277;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+//B50
+//B51
+//B52
+//B53
+//B54
//BC0
//BC1
//BC2
@@ -5317,8 +5372,11 @@
};
F523D23402DE436B018635CA = {
children = (
+ B55772DE08833B6300DCA277,
F523D1F402DE4369018635CA,
F523D1F502DE4369018635CA,
+ B55772C40883262B00DCA277,
+ B55772C50883262B00DCA277,
F523D1F602DE4369018635CA,
F523D1F702DE4369018635CA,
F523D1F802DE4369018635CA,
No revision
No revision
1.13.24.1 +1 -0 WebCore/khtml/ecma/Attic/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/Attic/Makefile.am,v
retrieving revision 1.13
retrieving revision 1.13.24.1
diff -u -r1.13 -r1.13.24.1
--- Makefile.am 10 Dec 2003 04:09:52 -0000 1.13
+++ Makefile.am 12 Jul 2005 00:06:43 -0000 1.13.24.1
@@ -12,6 +12,7 @@
kjs_window.lut.h \
xmlhttprequest.lut.h \
xmlserializer.lut.h \
+ domparser.lut.h \
$(NULL)
CREATE_HASH_TABLE = $(top_srcdir)/JavaScriptCore/kjs/create_hash_table
1.1.2.1 +4 -2 WebCore/khtml/ecma/domparser.cpp
Index: domparser.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/domparser.cpp,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- domparser.cpp 8 Jun 2005 09:16:42 -0000 1.1
+++ domparser.cpp 12 Jul 2005 00:06:43 -0000 1.1.2.1
@@ -25,6 +25,8 @@
using DOM::DocumentImpl;
+using namespace KJS;
+
////////////////////// DOMParser Object ////////////////////////
/* Source for DOMParserProtoTable.
@@ -32,12 +34,12 @@
parseFromString DOMParser::ParseFromString DontDelete|Function 2
@end
*/
-namespace KJS {
-
DEFINE_PROTOTYPE("DOMParser",DOMParserProto)
IMPLEMENT_PROTOFUNC(DOMParserProtoFunc)
IMPLEMENT_PROTOTYPE(DOMParserProto,DOMParserProtoFunc)
+namespace KJS {
+
DOMParserConstructorImp::DOMParserConstructorImp(ExecState *, DOM::DocumentImpl *d)
: doc(d)
{
1.146.6.3 +4 -0 WebCore/khtml/ecma/kjs_window.cpp
Index: kjs_window.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/kjs_window.cpp,v
retrieving revision 1.146.6.2
retrieving revision 1.146.6.3
diff -u -r1.146.6.2 -r1.146.6.3
--- kjs_window.cpp 14 Jun 2005 18:06:23 -0000 1.146.6.2
+++ kjs_window.cpp 12 Jul 2005 00:06:43 -0000 1.146.6.3
@@ -50,6 +50,7 @@
#include "kjs_events.h"
#include "xmlhttprequest.h"
#include "xmlserializer.h"
+#include "domparser.h"
#include "khtmlview.h"
#include "khtml_part.h"
@@ -255,6 +256,7 @@
Option Window::Option DontDelete|ReadOnly
XMLHttpRequest Window::XMLHttpRequest DontDelete|ReadOnly
XMLSerializer Window::XMLSerializer DontDelete|ReadOnly
+ DOMParser Window::DOMParser DontDelete|ReadOnly
alert Window::Alert DontDelete|Function 1
confirm Window::Confirm DontDelete|Function 1
prompt Window::Prompt DontDelete|Function 2
@@ -879,6 +881,8 @@
return Value(new XMLHttpRequestConstructorImp(exec, m_part->document()));
case XMLSerializer:
return Value(new XMLSerializerConstructorImp(exec));
+ case DOMParser:
+ return Value(new DOMParserConstructorImp(exec, m_part->xmlDocImpl()));
case Focus:
case Blur:
case Close:
1.34.6.2 +1 -1 WebCore/khtml/ecma/kjs_window.h
Index: kjs_window.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/kjs_window.h,v
retrieving revision 1.34.6.1
retrieving revision 1.34.6.2
diff -u -r1.34.6.1 -r1.34.6.2
--- kjs_window.h 2 Jun 2005 15:49:16 -0000 1.34.6.1
+++ kjs_window.h 12 Jul 2005 00:06:43 -0000 1.34.6.2
@@ -140,7 +140,7 @@
ScrollTo, ScrollX, ScrollY, MoveBy, MoveTo, ResizeBy, ResizeTo, Self, _Window, Top, _Screen,
Image, Option, Alert, Confirm, Prompt, Open, Print, SetTimeout, ClearTimeout,
Focus, GetSelection, Blur, Close, SetInterval, ClearInterval, CaptureEvents,
- ReleaseEvents, AddEventListener, RemoveEventListener, XMLHttpRequest, XMLSerializer,
+ ReleaseEvents, AddEventListener, RemoveEventListener, XMLHttpRequest, XMLSerializer, DOMParser,
Onabort, Onblur, Onchange, Onclick, Ondblclick, Ondragdrop, Onerror,
Onfocus, Onkeydown, Onkeypress, Onkeyup, Onload, Onmousedown, Onmousemove,
Onmouseout, Onmouseover, Onmouseup, Onmove, Onreset, Onresize, Onscroll, Onsearch,
1.17.10.2 +24 -23 WebCore/khtml/ecma/Attic/kjs_window.lut.h
Index: kjs_window.lut.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/Attic/kjs_window.lut.h,v
retrieving revision 1.17.10.1
retrieving revision 1.17.10.2
diff -u -r1.17.10.1 -r1.17.10.2
--- kjs_window.lut.h 2 Jun 2005 15:49:16 -0000 1.17.10.1
+++ kjs_window.lut.h 12 Jul 2005 00:06:43 -0000 1.17.10.2
@@ -26,26 +26,26 @@
{ "frames", Window::Frames, DontDelete|ReadOnly, 0, &WindowTableEntries[95] },
{ "onmouseup", Window::Onmouseup, DontDelete, 0, 0 },
{ "NodeFilter", Window::NodeFilter, DontDelete, 0, &WindowTableEntries[102] },
- { "CSSRule", Window::CSSRule, DontDelete, 0, &WindowTableEntries[111] },
+ { "CSSRule", Window::CSSRule, DontDelete, 0, &WindowTableEntries[112] },
{ "length", Window::Length, DontDelete|ReadOnly, 0, 0 },
{ 0, 0, 0, 0, 0 },
{ 0, 0, 0, 0, 0 },
{ 0, 0, 0, 0, 0 },
{ 0, 0, 0, 0, 0 },
{ 0, 0, 0, 0, 0 },
- { "print", Window::Print, DontDelete|Function, 2, &WindowTableEntries[110] },
+ { "print", Window::Print, DontDelete|Function, 2, &WindowTableEntries[111] },
{ "opener", Window::Opener, DontDelete|ReadOnly, 0, 0 },
{ "parent", Window::Parent, DontDelete|ReadOnly, 0, 0 },
{ 0, 0, 0, 0, 0 },
- { "scrollX", Window::ScrollX, DontDelete|ReadOnly, 0, &WindowTableEntries[118] },
- { "scrollY", Window::ScrollY, DontDelete|ReadOnly, 0, &WindowTableEntries[112] },
+ { "scrollX", Window::ScrollX, DontDelete|ReadOnly, 0, &WindowTableEntries[119] },
+ { "scrollY", Window::ScrollY, DontDelete|ReadOnly, 0, &WindowTableEntries[113] },
{ "XMLSerializer", Window::XMLSerializer, DontDelete|ReadOnly, 0, 0 },
{ "menubar", Window::Menubar, DontDelete|ReadOnly, 0, &WindowTableEntries[97] },
{ 0, 0, 0, 0, 0 },
- { "defaultStatus", Window::DefaultStatus, DontDelete, 0, &WindowTableEntries[108] },
+ { "defaultStatus", Window::DefaultStatus, DontDelete, 0, &WindowTableEntries[109] },
{ "onblur", Window::Onblur, DontDelete, 0, 0 },
{ "confirm", Window::Confirm, DontDelete|Function, 1, 0 },
- { "scrollBy", Window::ScrollBy, DontDelete|Function, 2, &WindowTableEntries[123] },
+ { "scrollBy", Window::ScrollBy, DontDelete|Function, 2, &WindowTableEntries[124] },
{ "pageXOffset", Window::PageXOffset, DontDelete|ReadOnly, 0, 0 },
{ "pageYOffset", Window::PageYOffset, DontDelete|ReadOnly, 0, 0 },
{ "Node", Window::Node, DontDelete, 0, &WindowTableEntries[99] },
@@ -53,7 +53,7 @@
{ "Image", Window::Image, DontDelete|ReadOnly, 0, 0 },
{ "onabort", Window::Onabort, DontDelete, 0, 0 },
{ "onmousemove", Window::Onmousemove, DontDelete, 0, 0 },
- { "scrollTo", Window::ScrollTo, DontDelete|Function, 2, &WindowTableEntries[121] },
+ { "scrollTo", Window::ScrollTo, DontDelete|Function, 2, &WindowTableEntries[122] },
{ "onsearch", Window::Onsearch, DontDelete, 0, 0 },
{ 0, 0, 0, 0, 0 },
{ "screenLeft", Window::ScreenLeft, DontDelete|ReadOnly, 0, &WindowTableEntries[100] },
@@ -66,14 +66,14 @@
{ 0, 0, 0, 0, 0 },
{ "onselect", Window::Onselect, DontDelete, 0, 0 },
{ 0, 0, 0, 0, 0 },
- { "document", Window::Document, DontDelete|ReadOnly, 0, &WindowTableEntries[114] },
+ { "document", Window::Document, DontDelete|ReadOnly, 0, &WindowTableEntries[115] },
{ "onunload", Window::Onunload, DontDelete, 0, 0 },
{ 0, 0, 0, 0, 0 },
{ "onerror", Window::Onerror, DontDelete, 0, 0 },
{ 0, 0, 0, 0, 0 },
{ "innerHeight", Window::InnerHeight, DontDelete|ReadOnly, 0, 0 },
{ 0, 0, 0, 0, 0 },
- { "innerWidth", Window::InnerWidth, DontDelete|ReadOnly, 0, &WindowTableEntries[119] },
+ { "innerWidth", Window::InnerWidth, DontDelete|ReadOnly, 0, &WindowTableEntries[120] },
{ "defaultstatus", Window::DefaultStatus, DontDelete, 0, 0 },
{ "name", Window::Name, DontDelete, 0, 0 },
{ 0, 0, 0, 0, 0 },
@@ -84,7 +84,7 @@
{ "Event", Window::EventCtor, DontDelete, 0, 0 },
{ "onresize", Window::Onresize, DontDelete, 0, 0 },
{ "navigator", Window::_Navigator, DontDelete|ReadOnly, 0, 0 },
- { "self", Window::Self, DontDelete|ReadOnly, 0, &WindowTableEntries[124] },
+ { "self", Window::Self, DontDelete|ReadOnly, 0, &WindowTableEntries[125] },
{ 0, 0, 0, 0, 0 },
{ 0, 0, 0, 0, 0 },
{ 0, 0, 0, 0, 0 },
@@ -92,17 +92,17 @@
{ 0, 0, 0, 0, 0 },
{ "clientInformation", Window::ClientInformation, DontDelete|ReadOnly, 0, &WindowTableEntries[93] },
{ 0, 0, 0, 0, 0 },
- { "outerWidth", Window::OuterWidth, DontDelete|ReadOnly, 0, &WindowTableEntries[105] },
- { "getSelection", Window::GetSelection, DontDelete|Function, 0, &WindowTableEntries[115] },
+ { "outerWidth", Window::OuterWidth, DontDelete|ReadOnly, 0, &WindowTableEntries[106] },
+ { "getSelection", Window::GetSelection, DontDelete|Function, 0, &WindowTableEntries[116] },
{ 0, 0, 0, 0, 0 },
{ "blur", Window::Blur, DontDelete|Function, 0, 0 },
- { "locationbar", Window::Locationbar, DontDelete, 0, &WindowTableEntries[106] },
+ { "locationbar", Window::Locationbar, DontDelete, 0, &WindowTableEntries[107] },
{ "DOMException", Window::DOMException, DontDelete, 0, &WindowTableEntries[96] },
{ 0, 0, 0, 0, 0 },
{ "setInterval", Window::SetInterval, DontDelete|Function, 2, 0 },
- { "scrollbars", Window::Scrollbars, DontDelete|ReadOnly, 0, &WindowTableEntries[125] },
- { "clearTimeout", Window::ClearTimeout, DontDelete|Function, 1, &WindowTableEntries[107] },
- { "moveBy", Window::MoveBy, DontDelete|Function, 2, &WindowTableEntries[117] },
+ { "scrollbars", Window::Scrollbars, DontDelete|ReadOnly, 0, &WindowTableEntries[126] },
+ { "clearTimeout", Window::ClearTimeout, DontDelete|Function, 1, &WindowTableEntries[108] },
+ { "moveBy", Window::MoveBy, DontDelete|Function, 2, &WindowTableEntries[118] },
{ "alert", Window::Alert, DontDelete|Function, 1, 0 },
{ "clearInterval", Window::ClearInterval, DontDelete|Function, 1, 0 },
{ 0, 0, 0, 0, 0 },
@@ -116,23 +116,24 @@
{ "location", Window::_Location, DontDelete, 0, 0 },
{ "konqueror", Window::_Konqueror, DontDelete|ReadOnly, 0, &WindowTableEntries[98] },
{ "outerHeight", Window::OuterHeight, DontDelete|ReadOnly, 0, 0 },
- { "screenX", Window::ScreenX, DontDelete|ReadOnly, 0, &WindowTableEntries[120] },
- { "screenY", Window::ScreenY, DontDelete|ReadOnly, 0, &WindowTableEntries[109] },
+ { "screenX", Window::ScreenX, DontDelete|ReadOnly, 0, &WindowTableEntries[121] },
+ { "screenY", Window::ScreenY, DontDelete|ReadOnly, 0, &WindowTableEntries[110] },
{ "statusbar", Window::Statusbar, DontDelete|ReadOnly, 0, 0 },
{ "scroll", Window::Scroll, DontDelete|Function, 2, 0 },
{ "moveTo", Window::MoveTo, DontDelete|Function, 2, 0 },
- { "resizeBy", Window::ResizeBy, DontDelete|Function, 2, &WindowTableEntries[122] },
+ { "resizeBy", Window::ResizeBy, DontDelete|Function, 2, &WindowTableEntries[104] },
{ "resizeTo", Window::ResizeTo, DontDelete|Function, 2, 0 },
{ "window", Window::_Window, DontDelete|ReadOnly, 0, 0 },
{ "screen", Window::_Screen, DontDelete|ReadOnly, 0, 0 },
- { "XMLHttpRequest", Window::XMLHttpRequest, DontDelete|ReadOnly, 0, &WindowTableEntries[104] },
- { "prompt", Window::Prompt, DontDelete|Function, 2, &WindowTableEntries[116] },
+ { "XMLHttpRequest", Window::XMLHttpRequest, DontDelete|ReadOnly, 0, &WindowTableEntries[105] },
+ { "DOMParser", Window::DOMParser, DontDelete|ReadOnly, 0, &WindowTableEntries[123] },
+ { "prompt", Window::Prompt, DontDelete|Function, 2, &WindowTableEntries[117] },
{ "open", Window::Open, DontDelete|Function, 3, 0 },
{ "setTimeout", Window::SetTimeout, DontDelete|Function, 2, 0 },
{ "close", Window::Close, DontDelete|Function, 0, 0 },
{ "captureEvents", Window::CaptureEvents, DontDelete|Function, 0, 0 },
{ "releaseEvents", Window::ReleaseEvents, DontDelete|Function, 0, 0 },
- { "addEventListener", Window::AddEventListener, DontDelete|Function, 3, &WindowTableEntries[113] },
+ { "addEventListener", Window::AddEventListener, DontDelete|Function, 3, &WindowTableEntries[114] },
{ "removeEventListener", Window::RemoveEventListener, DontDelete|Function, 3, 0 },
{ "onchange", Window::Onchange, DontDelete, 0, 0 },
{ "onclick", Window::Onclick, DontDelete, 0, 0 },
@@ -150,7 +151,7 @@
{ "showModalDialog", Window::ShowModalDialog, DontDelete|Function, 1, 0 }
};
-const struct HashTable WindowTable = { 2, 126, WindowTableEntries, 91 };
+const struct HashTable WindowTable = { 2, 127, WindowTableEntries, 91 };
} // namespace
No revision
No revision
1.1.2.1 +20 -0 WebCore/khtml/ecma/Attic/domparser.lut.h
More information about the webkit-changes
mailing list