[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

jianli at chromium.org jianli at chromium.org
Wed Dec 22 12:49:27 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit e10d9b6efb64bb33c09a21b3f2706243bc9b8116
Author: jianli at chromium.org <jianli at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 31 05:17:02 2010 +0000

    2010-08-30  Jian Li  <jianli at chromium.org>
    
            Fix build break.
    
            * xml/XMLHttpRequest.cpp:
            (WebCore::XMLHttpRequest::send):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66455 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/xml/XMLHttpRequest.cpp b/WebCore/xml/XMLHttpRequest.cpp
index f3b8d64..37e5833 100644
--- a/WebCore/xml/XMLHttpRequest.cpp
+++ b/WebCore/xml/XMLHttpRequest.cpp
@@ -32,6 +32,7 @@
 #include "EventException.h"
 #include "EventListener.h"
 #include "EventNames.h"
+#include "File.h"
 #include "HTTPParsers.h"
 #include "InspectorController.h"
 #include "InspectorTimelineAgent.h"
@@ -522,7 +523,12 @@ void XMLHttpRequest::send(Blob* body, ExceptionCode& ec)
         // FIXME: Should we set a Content-Type if one is not set.
         // FIXME: add support for uploading bundles.
         m_requestEntityBody = FormData::create();
-        m_requestEntityBody->appendBlob(body->url());
+        if (body->isFile())
+            m_requestEntityBody->appendFile(static_cast<File*>(body)->path());
+#if ENABLE(BLOB)
+        else
+            m_requestEntityBody->appendBlob(body->url());
+#endif
     }
 
     createRequest(ec);

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list