Reviewed by Geoff.

        http://bugzilla.opendarwin.org/show_bug.cgi?id=10151
        ghostmap XHTML + SVG fails due to javascript undefined exception

        Make sure document.URL works when called from a non-HTML document.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@15692 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index c31716b19c2849c329745e919f988708298dd86a..c288cdee1d4371efc0a31fa51a8b6a2f77fac562 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2006-07-29  Rob Buis  <buis@kde.org>
+
+        Reviewed by Geoff.
+
+        Updated test case result as a result of:
+        http://bugzilla.opendarwin.org/show_bug.cgi?id=10151
+        ghostmap XHTML + SVG fails due to javascript undefined exception
+        The new test case result now should match the required spec result
+        and acts as a way to test document.URL on non-html documents.
+
+        * dom/xhtml/level2/html/HTMLDocument04-expected.txt:
+
 2006-07-29  Darin Adler  <darin@apple.com>
 
         - changed this test to a plain-text one and added text explaining what it tests

diff --git a/LayoutTests/dom/xhtml/level2/html/HTMLDocument04-expected.txt b/LayoutTests/dom/xhtml/level2/html/HTMLDocument04-expected.txt
index 44305e17c2696c0453269874f6a2da5a8cb6bf3d..c2664e5ba32823be4b354037644a58d7450c52b0 100644 (file)
--- a/LayoutTests/dom/xhtml/level2/html/HTMLDocument04-expected.txt
+++ b/LayoutTests/dom/xhtml/level2/html/HTMLDocument04-expected.txt
@@ -1,4 +1,4 @@
+ALERT: file:///Users/rwlbuis/svn/test/WebKit/LayoutTests/dom/xhtml/level2/html/HTMLDocument04.xhtml
 Test   http://www.w3.org/2001/DOM-Test-Suite/level2/html/HTMLDocument04
-Status failure
-Message        URLLink: assertNotNull failed
+Status Success
 

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index cb3bd97525342ad49fc200e2a947d25b1fec098d..5bf5680a36de6767a4fc6ce4ab8d38ef8ac32d5a 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2006-07-29  Rob Buis  <buis@kde.org>
+
+        Reviewed by Geoff.
+
+        http://bugzilla.opendarwin.org/show_bug.cgi?id=10151
+        ghostmap XHTML + SVG fails due to javascript undefined exception
+
+        Make sure document.URL works when called from a non-HTML document.
+
+        * bindings/js/kjs_html.cpp:
+        (KJS::JSHTMLDocument::getValueProperty):
+        * bindings/js/kjs_html.h:
+        (KJS::JSHTMLDocument::):
+        * dom/Document.idl:
+
 2006-07-29  Mike Emmel  <mike.emmel@gmail.com>
 
         Reviewed and tweaked by Darin.

diff --git a/WebCore/bindings/js/kjs_html.cpp b/WebCore/bindings/js/kjs_html.cpp
index 617d08c7e6c31a558e24a8121165c3edd0ec806e..1e5d0fe88118066820ef6443471ae6ba16a06880 100644 (file)
--- a/WebCore/bindings/js/kjs_html.cpp
+++ b/WebCore/bindings/js/kjs_html.cpp
@@ -174,7 +174,6 @@ const ClassInfo JSHTMLDocument::info =
   title                 JSHTMLDocument::Title             DontDelete
   referrer              JSHTMLDocument::Referrer          DontDelete|ReadOnly
   domain                JSHTMLDocument::Domain            DontDelete
-  URL                   JSHTMLDocument::URL               DontDelete|ReadOnly
   body                  JSHTMLDocument::Body              DontDelete
   location              JSHTMLDocument::Location          DontDelete
   cookie                JSHTMLDocument::Cookie            DontDelete
@@ -249,8 +248,6 @@ JSValue *JSHTMLDocument::getValueProperty(ExecState* exec, int token) const
     return jsString(doc.referrer());
   case Domain:
     return jsString(doc.domain());
-  case URL:
-    return jsString(doc.URL());
   case Body:
     return toJS(exec, body);
   case Location:

diff --git a/WebCore/bindings/js/kjs_html.h b/WebCore/bindings/js/kjs_html.h
index 5258540f1848c5dad76ccbc8a3ea2830564b47d1..1863e68c8cdf48697ccd7d7068c9948db97b9f6c 100644 (file)
--- a/WebCore/bindings/js/kjs_html.h
+++ b/WebCore/bindings/js/kjs_html.h
@@ -51,7 +51,7 @@ namespace KJS {
     void putValueProperty(ExecState*, int token, JSValue*, int /*attr*/);
     virtual const ClassInfo* classInfo() const { return &info; }
     static const ClassInfo info;
-    enum { Title, Referrer, Domain, URL, Body, Location, Cookie,
+    enum { Title, Referrer, Domain, Body, Location, Cookie,
            Images, Applets, Embeds, Links, Forms, Anchors, Scripts, All, Clear, Open, Close,
            Write, WriteLn, GetElementsByName, CaptureEvents, ReleaseEvents,
            BgColor, FgColor, AlinkColor, LinkColor, VlinkColor, LastModified, Height, Width, Dir, DesignMode };

diff --git a/WebCore/dom/Document.idl b/WebCore/dom/Document.idl
index 9381b9e22b48f9c06e5e6e0f7d3c73443cd1c3df..bbd20e3f8072eb263e7066686e99783caaa798e5 100644 (file)
--- a/WebCore/dom/Document.idl
+++ b/WebCore/dom/Document.idl
@@ -148,6 +148,8 @@ module core {
 
         // IE extensions
 
+        readonly attribute DOMString URL;
+
         attribute [ConvertNullStringTo=Undefined] DOMString charset;
 
         readonly attribute [ConvertNullStringTo=Undefined] DOMString defaultCharset;