[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 ae2b881554868565347b38d18f63574900491b47
Author: jianli at chromium.org <jianli at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Aug 11 00:29:31 2010 +0000

    Fix more build break.
    
    * bindings/v8/SerializedScriptValue.cpp:
    (WebCore::ZigZag::Reader::readBlob):
    (WebCore::ZigZag::Reader::readFile):
    * dom/ScriptExecutionContext.cpp:
    (WebCore::ScriptExecutionContext::~ScriptExecutionContext):
    (WebCore::ScriptExecutionContext::revokeBlobURL):
    * dom/ScriptExecutionContext.h:
    * html/Blob.cpp:
    (WebCore::Blob::slice):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65105 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 0a62793..b9eb251 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-08-10  Jian Li  <jianli at chromium.org>
+
+        Fix more build break.
+
+        * bindings/v8/SerializedScriptValue.cpp:
+        (WebCore::ZigZag::Reader::readBlob):
+        (WebCore::ZigZag::Reader::readFile):
+        * dom/ScriptExecutionContext.cpp:
+        (WebCore::ScriptExecutionContext::~ScriptExecutionContext):
+        (WebCore::ScriptExecutionContext::revokeBlobURL):
+        * dom/ScriptExecutionContext.h:
+        * html/Blob.cpp:
+        (WebCore::Blob::slice):
+
 2010-08-10  Gavin Barraclough  <barraclough at apple.com>
 
         Rubber stamped by Sam Weinig
diff --git a/WebCore/bindings/v8/SerializedScriptValue.cpp b/WebCore/bindings/v8/SerializedScriptValue.cpp
index 0cacb67..395ef1a 100644
--- a/WebCore/bindings/v8/SerializedScriptValue.cpp
+++ b/WebCore/bindings/v8/SerializedScriptValue.cpp
@@ -872,14 +872,14 @@ private:
     {
         String url;
         String type;
-        unsigned long long size;
+        uint64_t size;
         if (!readWebCoreString(&url))
             return false;
         if (!readWebCoreString(&type))
             return false;
         if (!doReadUint64(&size))
             return false;
-        RefPtr<Blob> blob = Blob::create(getScriptExecutionContext(), KURL(ParsedURLString, url), type, size);
+        PassRefPtr<Blob> blob = Blob::create(getScriptExecutionContext(), KURL(ParsedURLString, url), type, size);
         *value = toV8(blob);
         return true;
     }
@@ -895,7 +895,7 @@ private:
             return false;
         if (!readWebCoreString(&type))
             return false;
-        RefPtr<File> file = File::create(getScriptExecutionContext(), path, KURL(ParsedURLString, url), type);
+        PassRefPtr<File> file = File::create(getScriptExecutionContext(), path, KURL(ParsedURLString, url), type);
         *value = toV8(file);
         return true;
     }
diff --git a/WebCore/dom/ScriptExecutionContext.cpp b/WebCore/dom/ScriptExecutionContext.cpp
index 095fbd0..9fdec9f 100644
--- a/WebCore/dom/ScriptExecutionContext.cpp
+++ b/WebCore/dom/ScriptExecutionContext.cpp
@@ -91,12 +91,10 @@ ScriptExecutionContext::~ScriptExecutionContext()
         m_fileThread = 0;
     }
 #endif
-#if ENABLE(BLOB)
     HashSet<String>::iterator blobURLsEnd = m_blobURLs.end();
     for (HashSet<String>::iterator iter = m_blobURLs.begin(); iter != blobURLsEnd; ++iter)
         // FIXME: implement thread-safe proxy to make it work with workers.
         BlobRegistry::instance().unregisterBlobURL(KURL(ParsedURLString, *iter));
-#endif
 }
 
 #if ENABLE(DATABASE)
@@ -246,7 +244,6 @@ DOMTimer* ScriptExecutionContext::findTimeout(int timeoutId)
     return m_timeouts.get(timeoutId);
 }
 
-#if ENABLE(BLOB)
 void ScriptExecutionContext::trackBlobURL(const String& url)
 {
     m_blobURLs.add(url);
@@ -260,7 +257,6 @@ void ScriptExecutionContext::revokeBlobURL(const String& url)
         m_blobURLs.remove(url);
     }
 }
-#endif
 
 #if ENABLE(BLOB) || ENABLE(FILE_WRITER)
 FileThread* ScriptExecutionContext::fileThread()
diff --git a/WebCore/dom/ScriptExecutionContext.h b/WebCore/dom/ScriptExecutionContext.h
index 720a4ee..79d4d42 100644
--- a/WebCore/dom/ScriptExecutionContext.h
+++ b/WebCore/dom/ScriptExecutionContext.h
@@ -126,10 +126,8 @@ namespace WebCore {
         void removeTimeout(int timeoutId);
         DOMTimer* findTimeout(int timeoutId);
 
-#if ENABLE(BLOB)
         void trackBlobURL(const String&);
         void revokeBlobURL(const String&);
-#endif
 
 #if USE(JSC)
         JSC::JSGlobalData* globalData();
@@ -158,9 +156,7 @@ namespace WebCore {
 
         HashMap<int, DOMTimer*> m_timeouts;
 
-#if ENABLE(BLOB)
         HashSet<String> m_blobURLs;
-#endif
 
         virtual void refScriptExecutionContext() = 0;
         virtual void derefScriptExecutionContext() = 0;
diff --git a/WebCore/html/Blob.cpp b/WebCore/html/Blob.cpp
index bb04e10..f8f795e 100644
--- a/WebCore/html/Blob.cpp
+++ b/WebCore/html/Blob.cpp
@@ -141,7 +141,6 @@ PassRefPtr<Blob> Blob::slice(ScriptExecutionContext* scriptExecutionContext, lon
     }
     return Blob::create(scriptExecutionContext, contentType, items);
 }
-#endif // ENABLE(BLOB)
 
 KURL Blob::createPublicURL(ScriptExecutionContext* scriptExecutionContext) const
 {
@@ -155,5 +154,6 @@ KURL Blob::createPublicURL(ScriptExecutionContext* scriptExecutionContext) const
 
     return url;
 }
+#endif // ENABLE(BLOB)
 
 } // namespace WebCore

-- 
WebKit Debian packaging