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

[jianli at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 23ae52f3913e7217369e76e88796784b864ec2b5
Author: jianli at chromium.org <jianli at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Aug 11 00:14:19 2010 +0000

    Fix qt build break.
    
    * html/BlobRegistryImpl.cpp:
    * html/BlobRegistryImpl.h:
    * html/BlobURL.cpp:
    * html/BlobURL.h:
    * platform/BlobRegistry.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65103 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 9955b32..0bff7a0 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,15 @@
 2010-08-10  Jian Li  <jianli at chromium.org>
 
+        Fix qt build break.
+
+        * html/BlobRegistryImpl.cpp:
+        * html/BlobRegistryImpl.h:
+        * html/BlobURL.cpp:
+        * html/BlobURL.h:
+        * platform/BlobRegistry.h:
+
+2010-08-10  Jian Li  <jianli at chromium.org>
+
         Reviewed by David Levin.
 
         Add the support to register the blob data.
diff --git a/WebCore/html/BlobRegistryImpl.cpp b/WebCore/html/BlobRegistryImpl.cpp
index 5eea4ca..74e5175 100644
--- a/WebCore/html/BlobRegistryImpl.cpp
+++ b/WebCore/html/BlobRegistryImpl.cpp
@@ -30,8 +30,6 @@
 
 #include "config.h"
 
-#if ENABLE(BLOB)
-
 #include "BlobRegistryImpl.h"
 
 #include "FileStream.h"
@@ -168,6 +166,4 @@ PassRefPtr<BlobStorageData> BlobRegistryImpl::getBlobDataFromURL(const KURL& url
     return m_blobs.get(url.string());
 }
 
-#endif // ENABLE(BLOB)
-
 } // namespace WebCore
diff --git a/WebCore/html/BlobRegistryImpl.h b/WebCore/html/BlobRegistryImpl.h
index d87b58e..42693bc 100644
--- a/WebCore/html/BlobRegistryImpl.h
+++ b/WebCore/html/BlobRegistryImpl.h
@@ -31,8 +31,6 @@
 #ifndef BlobRegistryImpl_h
 #define BlobRegistryImpl_h
 
-#if ENABLE(BLOB)
-
 #include "BlobData.h"
 #include "BlobRegistry.h"
 #include "BlobStorageData.h"
@@ -73,6 +71,4 @@ private:
 
 } // namespace WebCore
 
-#endif // ENABLE(BLOB)
-
 #endif // BlobRegistryImpl_h
diff --git a/WebCore/html/BlobURL.cpp b/WebCore/html/BlobURL.cpp
index 8a9bb05..610aac4 100644
--- a/WebCore/html/BlobURL.cpp
+++ b/WebCore/html/BlobURL.cpp
@@ -30,8 +30,6 @@
 
 #include "config.h"
 
-#if ENABLE(BLOB)
-
 #include "BlobURL.h"
 
 #include "KURL.h"
@@ -66,5 +64,3 @@ KURL BlobURL::getOrigin(const KURL& url)
 }
 
 } // namespace WebCore
-
-#endif // ENABLE(BLOB)
diff --git a/WebCore/html/BlobURL.h b/WebCore/html/BlobURL.h
index dc79c99..2ce2c85 100644
--- a/WebCore/html/BlobURL.h
+++ b/WebCore/html/BlobURL.h
@@ -31,8 +31,6 @@
 #ifndef BlobURL_h
 #define BlobURL_h
 
-#if ENABLE(BLOB)
-
 #include "KURL.h"
 
 namespace WebCore {
@@ -47,6 +45,4 @@ public:
 
 }
 
-#endif // ENABLE(BLOB)
-
 #endif // BlobURL_h
diff --git a/WebCore/platform/BlobRegistry.h b/WebCore/platform/BlobRegistry.h
index fd33ba5..fcd7b1c 100644
--- a/WebCore/platform/BlobRegistry.h
+++ b/WebCore/platform/BlobRegistry.h
@@ -31,8 +31,6 @@
 #ifndef BlobRegistry_h
 #define BlobRegistry_h
 
-#if ENABLE(BLOB)
-
 #include <wtf/PassOwnPtr.h>
 #include <wtf/PassRefPtr.h>
 #include <wtf/Vector.h>
@@ -63,6 +61,4 @@ public:
 
 } // namespace WebCore
 
-#endif // ENABLE(BLOB)
-
 #endif // BlobRegistry_h

-- 
WebKit Debian packaging