Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(108)

Unified Diff: public/platform/WebIDBKey.h

Issue 19316002: Separate WebIDBKey type into separate header (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: also do WebIDBKeyPath types Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/web/WebIDBKeyPath.cpp ('k') | public/platform/WebIDBKeyPath.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
};
« no previous file with comments | « Source/web/WebIDBKeyPath.cpp ('k') | public/platform/WebIDBKeyPath.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698