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

WebKit/chromium/public/WebIDBKey.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 30 matching lines @@
 public:
     // Please use one of the factory methods. This is public only to allow WebVector.
     WebIDBKey() { }
     ~WebIDBKey() { reset(); }
 
     WEBKIT_API static WebIDBKey createNull();
     WEBKIT_API static WebIDBKey createInvalid();
     WEBKIT_API static WebIDBKey createFromValueAndKeyPath(const WebSerializedScriptValue&, const WebIDBKeyPath&);
 
     WebIDBKey(const WebString& string) { assign(string); }
-    WebIDBKey(int32_t number) { assign(number); }
+    WebIDBKey(double number) { assign(number); }
     WebIDBKey(const WebIDBKey& e) { assign(e); }
     WebIDBKey& operator=(const WebIDBKey& e)
     {
         assign(e);
         return *this;
     }
 
     WEBKIT_API void assign(const WebIDBKey&);
     WEBKIT_API void assignNull();
     WEBKIT_API void assign(const WebString&);
-    WEBKIT_API void assign(int32_t);
+    WEBKIT_API void assign(double);
     WEBKIT_API void assignInvalid();
     WEBKIT_API void reset();
 
     enum Type {
         NullType = 0,
         StringType,
         NumberType,
         // Types not in WebCore::IDBKey:
         InvalidType
     };
 
     WEBKIT_API Type type() const;
     WEBKIT_API WebString string() const; // Only valid for StringType.
-    WEBKIT_API int32_t number() const; // Only valid for numberType.
+    WEBKIT_API double number() const; // Only valid for numberType.
 
 #if WEBKIT_IMPLEMENTATION
     WebIDBKey(const WTF::PassRefPtr<WebCore::IDBKey>&);
     WebIDBKey& operator=(const WTF::PassRefPtr<WebCore::IDBKey>&);
     operator WTF::PassRefPtr<WebCore::IDBKey>() const;
 #endif
 
 private:
     WebPrivatePtr<WebCore::IDBKey> m_private;
 };
 
 } // namespace WebKit
 
 #endif // WebIDBKey_h