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

WebCore/storage/IDBKey.h

 /*
  * 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 25 matching lines @@
 
 class SQLiteStatement;
 
 // FIXME: Add dates.
 class IDBKey : public ThreadSafeShared<IDBKey> {
 public:
     static PassRefPtr<IDBKey> create()
     {
         return adoptRef(new IDBKey());
     }
-    static PassRefPtr<IDBKey> create(int32_t number)
+    static PassRefPtr<IDBKey> create(double number)
     {
         return adoptRef(new IDBKey(number));
     }
     static PassRefPtr<IDBKey> create(const String& string)
     {
         return adoptRef(new IDBKey(string));
     }
     ~IDBKey();
 
     // In order of the least to the highest precedent in terms of sort order.
     enum Type {
         NullType = 0, // FIXME: Phase out support for null keys.
         StringType,
         NumberType
     };
 
     Type type() const { return m_type; }
 
     const String& string() const
     {
         ASSERT(m_type == StringType);
         return m_string;
     }
 
-    int32_t number() const
+    double number() const
     {
         ASSERT(m_type == NumberType);
         return m_number;
     }
 
     static PassRefPtr<IDBKey> fromQuery(SQLiteStatement& query, int baseColumn);
 
     bool isEqual(IDBKey* other);
     String whereSyntax(String qualifiedTableName = "") const;
     String lowerCursorWhereFragment(String comparisonOperator, String qualifiedTableName = "");
     String upperCursorWhereFragment(String comparisonOperator, String qualifiedTableName = "");
     int bind(SQLiteStatement& query, int column) const;
     void bindWithNulls(SQLiteStatement& query, int baseColumn) const;
 
     using ThreadSafeShared<IDBKey>::ref;
     using ThreadSafeShared<IDBKey>::deref;
 
 private:
     IDBKey();
-    explicit IDBKey(int32_t);
+    explicit IDBKey(double);
     explicit IDBKey(const String&);
 
     Type m_type;
     String m_string;
-    int32_t m_number;
+    double m_number;
 };
 
 }
 
 #endif // ENABLE(INDEXED_DATABASE)
 
 #endif // IDBKey_h