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


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

    2010-08-30  Jian Li  <jianli at chromium.org>
    
            Try to fix break again.
    
            * fileapi/ThreadableBlobRegistry.cpp:
            (WebCore::ThreadableBlobRegistry::registerBlobURL):
            (WebCore::ThreadableBlobRegistry::unregisterBlobURL):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66457 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/fileapi/ThreadableBlobRegistry.cpp b/WebCore/fileapi/ThreadableBlobRegistry.cpp
index cdbcb96..8d72076 100644
--- a/WebCore/fileapi/ThreadableBlobRegistry.cpp
+++ b/WebCore/fileapi/ThreadableBlobRegistry.cpp
@@ -30,8 +30,6 @@
 
 #include "config.h"
 
-#if ENABLE(BLOB)
-
 #include "ThreadableBlobRegistry.h"
 
 #include "BlobData.h"
@@ -45,6 +43,8 @@
 
 namespace WebCore {
 
+#if ENABLE(BLOB)
+
 static void postTaskToMainThread(ScriptExecutionContext* scriptExecutionContext, PassOwnPtr<ScriptExecutionContext::Task> task)
 {
 #if ENABLE(WORKERS)
@@ -95,6 +95,19 @@ void ThreadableBlobRegistry::unregisterBlobURL(ScriptExecutionContext* scriptExe
         unregisterBlobURLTask(scriptExecutionContext, url);
 }
 
-} // namespace WebCore
+#else
+
+void ThreadableBlobRegistry::registerBlobURL(ScriptExecutionContext*, const KURL&, PassOwnPtr<BlobData>)
+{
+}
+
+void ThreadableBlobRegistry::registerBlobURL(ScriptExecutionContext*, const KURL&, const KURL&)
+{
+}
 
+void ThreadableBlobRegistry::unregisterBlobURL(ScriptExecutionContext*, const KURL&)
+{
+}
 #endif // ENABL(BLOB)
+
+} // namespace WebCore

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list