| Index: public/platform/WebIDBKey.h
|
| diff --git a/public/platform/WebIDBKey.h b/public/platform/WebIDBKey.h
|
| index 5cdda3d5bfdc1c14bdda11132250dcfeecdcab8d..5f99ac6c821c1c9342c2f4377e90d1c616d42bf7 100644
|
| --- a/public/platform/WebIDBKey.h
|
| +++ b/public/platform/WebIDBKey.h
|
| @@ -27,6 +27,7 @@
|
| #define WebIDBKey_h
|
|
|
| #include "WebCommon.h"
|
| +#include "WebIDBTypes.h"
|
| #include "WebPrivatePtr.h"
|
| #include "WebString.h"
|
| #include "WebVector.h"
|
| @@ -64,17 +65,7 @@ public:
|
| WEBKIT_EXPORT void assignNull();
|
| WEBKIT_EXPORT void reset();
|
|
|
| - enum Type {
|
| - InvalidType = 0,
|
| - ArrayType,
|
| - StringType,
|
| - DateType,
|
| - NumberType,
|
| - NullType,
|
| - MinType,
|
| - };
|
| -
|
| - WEBKIT_EXPORT Type type() const;
|
| + WEBKIT_EXPORT WebIDBKeyType keyType() const;
|
| WEBKIT_EXPORT bool isValid() const;
|
| WEBKIT_EXPORT WebVector<WebIDBKey> array() const; // Only valid for ArrayType.
|
| WEBKIT_EXPORT WebString string() const; // Only valid for StringType.
|
| @@ -87,6 +78,19 @@ public:
|
| operator WTF::PassRefPtr<WebCore::IDBKey>() const;
|
| #endif
|
|
|
| + // DEPRECATED! Use WebIDBKeyType and keyType() instead.
|
| + // FIXME: Remove once the chromium-side users are updated.
|
| + enum Type {
|
| + InvalidType = 0,
|
| + ArrayType,
|
| + StringType,
|
| + DateType,
|
| + NumberType,
|
| + NullType,
|
| + MinType,
|
| + };
|
| + WEBKIT_EXPORT Type type() const;
|
| +
|
| private:
|
| WebPrivatePtr<WebCore::IDBKey> m_private;
|
| };
|
|
|