Merge 73697 - 2010-12-10 Hans Wennborg <hans@chromium.org>...

WebCore/storage/IDBKey.cpp

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 20 matching lines @@
 #include "SQLiteStatement.h"
 #include "SerializedScriptValue.h"
 
 namespace WebCore {
 
 IDBKey::IDBKey()
     : m_type(NullType)
 {
 }
 
-IDBKey::IDBKey(int32_t number)
+IDBKey::IDBKey(double number)
     : m_type(NumberType)
     , m_number(number)
 {
 }
 
 IDBKey::IDBKey(const String& string)
     : m_type(StringType)
     , m_string(string.crossThreadString())
 {
 }
 
 IDBKey::~IDBKey()
 {
 }
 
 PassRefPtr<IDBKey> IDBKey::fromQuery(SQLiteStatement& query, int baseColumn)
 {
     if (!query.isColumnNull(baseColumn))
         return IDBKey::create(query.getColumnText(baseColumn));
 
     if (!query.isColumnNull(baseColumn + 1)) {
         ASSERT_NOT_REACHED(); // FIXME: Implement date.
         return IDBKey::create();
     }
 
     if (!query.isColumnNull(baseColumn + 2))
-        return IDBKey::create(query.getColumnInt(baseColumn + 2));
+        return IDBKey::create(query.getColumnDouble(baseColumn + 2));
 
     return IDBKey::create(); // Null.
 }
 
 bool IDBKey::isEqual(IDBKey* other)
 {
     if (!other || other->m_type != m_type)
         return false;
 
     switch (m_type) {
@@ skipping 61 matching lines @@
 }
 
 // Returns the number of items bound.
 int IDBKey::bind(SQLiteStatement& query, int column) const
 {
     switch (m_type) {
     case IDBKey::StringType:
         query.bindText(column, m_string);
         return 1;
     case IDBKey::NumberType:
-        query.bindInt(column, m_number);
+        query.bindDouble(column, m_number);
         return 1;
     case IDBKey::NullType:
         return 0;
     }
 
     ASSERT_NOT_REACHED();
     return 0;
 }
 
 void IDBKey::bindWithNulls(SQLiteStatement& query, int baseColumn) const
 {
     switch (m_type) {
     case IDBKey::StringType:
         query.bindText(baseColumn + 0, m_string);
         query.bindNull(baseColumn + 1);
         query.bindNull(baseColumn + 2);
         break;
     case IDBKey::NumberType:
         query.bindNull(baseColumn + 0);
         query.bindNull(baseColumn + 1);
-        query.bindInt(baseColumn + 2, m_number);
+        query.bindDouble(baseColumn + 2, m_number);
         break;
     case IDBKey::NullType:
         query.bindNull(baseColumn + 0);
         query.bindNull(baseColumn + 1);
         query.bindNull(baseColumn + 2);
         break;
     default:
         ASSERT_NOT_REACHED();
     }
 }
 
 } // namespace WebCore
 
 #endif