[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:28 UTC 2010


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

    2010-08-30  Jian Li  <jianli at chromium.org>
    
            Fix another build break. Also fix directory upload test break.
    
            * fileapi/File.cpp:
            (WebCore::File::File):
            * fileapi/ThreadableBlobRegistry.cpp:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66456 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/fileapi/File.cpp b/WebCore/fileapi/File.cpp
index 6cc1393..150a05b 100644
--- a/WebCore/fileapi/File.cpp
+++ b/WebCore/fileapi/File.cpp
@@ -65,6 +65,7 @@ File::File(ScriptExecutionContext* scriptExecutionContext, const String& relativ
     , m_path(path)
     , m_relativePath(relativePath)
 {
+    m_name = pathGetFileName(path);
 }
 #endif
 
diff --git a/WebCore/fileapi/ThreadableBlobRegistry.cpp b/WebCore/fileapi/ThreadableBlobRegistry.cpp
index d92d570..cdbcb96 100644
--- a/WebCore/fileapi/ThreadableBlobRegistry.cpp
+++ b/WebCore/fileapi/ThreadableBlobRegistry.cpp
@@ -30,6 +30,8 @@
 
 #include "config.h"
 
+#if ENABLE(BLOB)
+
 #include "ThreadableBlobRegistry.h"
 
 #include "BlobData.h"
@@ -94,3 +96,5 @@ void ThreadableBlobRegistry::unregisterBlobURL(ScriptExecutionContext* scriptExe
 }
 
 } // namespace WebCore
+
+#endif // ENABL(BLOB)

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list