[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 a0ec479009f2c6e3dc179fa9ce699fd0ef476407
Author: jianli at chromium.org <jianli at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Aug 18 23:26:57 2010 +0000

    Fix chromium build break.
    
    * src/WebBlobStorageData.cpp:
    (WebKit::WebBlobStorageData::itemAt):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65641 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 829705e..8885bbf 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,5 +1,12 @@
 2010-08-18  Jian Li  <jianli at chromium.org>
 
+        Fix chromium build break.
+
+        * src/WebBlobStorageData.cpp:
+        (WebKit::WebBlobStorageData::itemAt):
+
+2010-08-18  Jian Li  <jianli at chromium.org>
+
         Reviewed by Darin Fisher.
 
         [chromium] Chromium side implementation of blob data and blob registry.
diff --git a/WebKit/chromium/src/WebBlobStorageData.cpp b/WebKit/chromium/src/WebBlobStorageData.cpp
index 7e3b08e..40a73cc 100644
--- a/WebKit/chromium/src/WebBlobStorageData.cpp
+++ b/WebKit/chromium/src/WebBlobStorageData.cpp
@@ -62,18 +62,16 @@ bool WebBlobStorageData::itemAt(size_t index, WebBlobData::Item& result) const
     result.offset = item.offset;
     result.length = item.length;
     result.expectedModificationTime = item.expectedModificationTime;
-    switch (item.type) {
-    case BlobDataItem::Data:
+    if (item.type == BlobDataItem::Data) {
         result.type = WebBlobData::Item::TypeData;
         result.data.assign(item.data.data(), static_cast<size_t>(item.data.length()));
         return true;
-    case BlobDataItem::File:
+    } else {
+        ASSERT(item.type == BlobDataItem::File);
         result.type = WebBlobData::Item::TypeFile;
         result.pathOrURL = item.path;
         return true;
     }
-    ASSERT_NOT_REACHED();
-    return false;
 }
 
 WebString WebBlobStorageData::contentType() const

-- 
WebKit Debian packaging