Add IndexedDBValue wrapper class to group blob info with bits.

content/browser/indexed_db/indexed_db_cursor.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/indexed_db/indexed_db_cursor.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "content/browser/indexed_db/indexed_db_callbacks.h"
 #include "content/browser/indexed_db/indexed_db_database_error.h"
 #include "content/browser/indexed_db/indexed_db_tracing.h"
 #include "content/browser/indexed_db/indexed_db_transaction.h"
+#include "content/browser/indexed_db/indexed_db_value.h"
 
 namespace content {
 
 IndexedDBCursor::IndexedDBCursor(
     scoped_ptr<IndexedDBBackingStore::Cursor> cursor,
     indexed_db::CursorType cursor_type,
     IndexedDBDatabase::TaskType task_type,
     IndexedDBTransaction* transaction)
     : task_type_(task_type),
       cursor_type_(cursor_type),
@@ skipping 31 matching lines @@
           &IndexedDBCursor::CursorAdvanceOperation, this, count, callbacks));
 }
 
 void IndexedDBCursor::CursorAdvanceOperation(
     uint32 count,
     scoped_refptr<IndexedDBCallbacks> callbacks,
     IndexedDBTransaction* /*transaction*/) {
   IDB_TRACE("IndexedDBCursor::CursorAdvanceOperation");
   if (!cursor_ || !cursor_->Advance(count)) {
     cursor_.reset();
-    callbacks->OnSuccess(static_cast<std::string*>(NULL));
+    callbacks->OnSuccess(static_cast<IndexedDBValue*>(NULL));
     return;
   }
 
   callbacks->OnSuccess(key(), primary_key(), Value());
 }
 
 void IndexedDBCursor::CursorIterationOperation(
     scoped_ptr<IndexedDBKey> key,
     scoped_ptr<IndexedDBKey> primary_key,
     scoped_refptr<IndexedDBCallbacks> callbacks,
     IndexedDBTransaction* /*transaction*/) {
   IDB_TRACE("IndexedDBCursor::CursorIterationOperation");
   if (!cursor_ ||
       !cursor_->Continue(
            key.get(), primary_key.get(), IndexedDBBackingStore::Cursor::SEEK)) {
     cursor_.reset();
-    callbacks->OnSuccess(static_cast<std::string*>(NULL));
+    callbacks->OnSuccess(static_cast<IndexedDBValue*>(NULL));
     return;
   }
 
   callbacks->OnSuccess(this->key(), this->primary_key(), Value());
 }
 
 void IndexedDBCursor::PrefetchContinue(
     int number_to_fetch,
     scoped_refptr<IndexedDBCallbacks> callbacks) {
   IDB_TRACE("IndexedDBCursor::PrefetchContinue");
 
   transaction_->ScheduleTask(
       task_type_,
       base::Bind(&IndexedDBCursor::CursorPrefetchIterationOperation,
                  this,
                  number_to_fetch,
                  callbacks));
 }
 
 void IndexedDBCursor::CursorPrefetchIterationOperation(
     int number_to_fetch,
     scoped_refptr<IndexedDBCallbacks> callbacks,
     IndexedDBTransaction* /*transaction*/) {
   IDB_TRACE("IndexedDBCursor::CursorPrefetchIterationOperation");
 
   std::vector<IndexedDBKey> found_keys;
   std::vector<IndexedDBKey> found_primary_keys;
-  std::vector<std::string> found_values;
+  std::vector<IndexedDBValue> found_values;
 
   saved_cursor_.reset();
   const size_t max_size_estimate = 10 * 1024 * 1024;
   size_t size_estimate = 0;
 
   for (int i = 0; i < number_to_fetch; ++i) {
     if (!cursor_ || !cursor_->Continue()) {
       cursor_.reset();
       break;
     }
 
     if (i == 0) {
       // First prefetched result is always used, so that's the position
       // a cursor should be reset to if the prefetch is invalidated.
       saved_cursor_.reset(cursor_->Clone());
     }
 
     found_keys.push_back(cursor_->key());
     found_primary_keys.push_back(cursor_->primary_key());
 
     switch (cursor_type_) {
       case indexed_db::CURSOR_KEY_ONLY:
-        found_values.push_back(std::string());
+        found_values.push_back(IndexedDBValue());
         break;
       case indexed_db::CURSOR_KEY_AND_VALUE: {
-        std::string value;
+        IndexedDBValue value;
         value.swap(*cursor_->value());
-        size_estimate += value.size();
+        size_estimate += value.SizeEstimate();
         found_values.push_back(value);
         break;
       }
       default:
         NOTREACHED();
     }
     size_estimate += cursor_->key().size_estimate();
     size_estimate += cursor_->primary_key().size_estimate();
 
     if (size_estimate > max_size_estimate)
       break;
   }
 
   if (!found_keys.size()) {
-    callbacks->OnSuccess(static_cast<std::string*>(NULL));
+    callbacks->OnSuccess(static_cast<IndexedDBValue*>(NULL));
     return;
   }
 
   callbacks->OnSuccessWithPrefetch(
       found_keys, found_primary_keys, found_values);
 }
 
 void IndexedDBCursor::PrefetchReset(int used_prefetches,
                                     int /* unused_prefetches */) {
   IDB_TRACE("IndexedDBCursor::PrefetchReset");
@@ skipping 13 matching lines @@
 }
 
 void IndexedDBCursor::Close() {
   IDB_TRACE("IndexedDBCursor::Close");
   closed_ = true;
   cursor_.reset();
   saved_cursor_.reset();
 }
 
 }  // namespace content