[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

mjs mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 08:18:40 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit 74e363dd8e89eda19c1d223649d40ea16c2d6aeb
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Dec 12 20:18:46 2003 +0000

            Reviewed by John.
    
    	<rdar://problem/3507856>: XMLHttpRequest xhtml test displays but doesn't load
    
            * khtml/ecma/xmlhttprequest.cpp:
            (KJS::XMLHttpRequestProtoFunc::tryCall): complete the URL using the document,
    	not the htmlDocument.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5782 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index aa2eb87..8057b9f 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2003-12-11  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by John.
+
+	<rdar://problem/3507856>: XMLHttpRequest xhtml test displays but doesn't load
+
+        * khtml/ecma/xmlhttprequest.cpp:
+        (KJS::XMLHttpRequestProtoFunc::tryCall): complete the URL using the document,
+	not the htmlDocument.
+
 2003-12-12  Richard Williamson   <rjw at apple.com>
 
 	Replace call to global functions with static member functions.
diff --git a/WebCore/khtml/ecma/xmlhttprequest.cpp b/WebCore/khtml/ecma/xmlhttprequest.cpp
index da510bd..ceadfcc 100644
--- a/WebCore/khtml/ecma/xmlhttprequest.cpp
+++ b/WebCore/khtml/ecma/xmlhttprequest.cpp
@@ -583,7 +583,7 @@ Value XMLHttpRequestProtoFunc::tryCall(ExecState *exec, Object &thisObj, const L
       }
     
       QString method = args[0].toString(exec).qstring();
-      KURL url = KURL(Window::retrieveActive(exec)->part()->htmlDocument().completeURL(args[1].toString(exec).qstring()).string());
+      KURL url = KURL(Window::retrieveActive(exec)->part()->document().completeURL(args[1].toString(exec).qstring()).string());
 
       bool async = true;
       if (args.size() >= 3) {

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list