| Index: public/platform/WebIDBKeyPath.h
|
| diff --git a/public/platform/WebIDBKeyPath.h b/public/platform/WebIDBKeyPath.h
|
| index fdbef92286c33d280e6c8aac33aef378950ff0b7..89c5950ed699f857e051e7d20af85983c0bba44a 100644
|
| --- a/public/platform/WebIDBKeyPath.h
|
| +++ b/public/platform/WebIDBKeyPath.h
|
| @@ -27,6 +27,7 @@
|
| #define WebIDBKeyPath_h
|
|
|
| #include "WebCommon.h"
|
| +#include "WebIDBTypes.h"
|
| #include "WebPrivateOwnPtr.h"
|
| #include "WebString.h"
|
| #include "WebVector.h"
|
| @@ -52,14 +53,8 @@ public:
|
| WEBKIT_EXPORT void reset();
|
| WEBKIT_EXPORT void assign(const WebIDBKeyPath&);
|
|
|
| - enum Type {
|
| - NullType = 0,
|
| - StringType,
|
| - ArrayType,
|
| - };
|
| -
|
| WEBKIT_EXPORT bool isValid() const;
|
| - WEBKIT_EXPORT Type type() const;
|
| + WEBKIT_EXPORT WebIDBKeyPathType keyPathType() const;
|
| WEBKIT_EXPORT WebVector<WebString> array() const; // Only valid for ArrayType.
|
| WEBKIT_EXPORT WebString string() const; // Only valid for StringType.
|
|
|
| @@ -69,6 +64,16 @@ public:
|
| operator const WebCore::IDBKeyPath&() const;
|
| #endif
|
|
|
| + // DEPRECATED. Use WebIDBKeyPathType and keyPathType() instead.
|
| + // FIXME: Remove once the chromium-side users are gone
|
| + enum Type {
|
| + NullType = 0,
|
| + StringType,
|
| + ArrayType,
|
| + };
|
| +
|
| + WEBKIT_EXPORT Type type() const;
|
| +
|
| private:
|
| WebPrivateOwnPtr<WebCore::IDBKeyPath> m_private;
|
| };
|
|
|