Index: content/common/indexed_db/indexed_db_key.h |
diff --git a/content/common/indexed_db/indexed_db_key.h b/content/common/indexed_db/indexed_db_key.h |
index e688939e621f1b76c8215f214316ca2888727133..9b46ed7d6f9cb93d34c74e252037f06fd3b541b9 100644 |
--- a/content/common/indexed_db/indexed_db_key.h |
+++ b/content/common/indexed_db/indexed_db_key.h |
@@ -11,7 +11,11 @@ |
#include "base/memory/scoped_vector.h" |
#include "base/strings/string16.h" |
#include "content/common/content_export.h" |
-#include "third_party/WebKit/public/platform/WebIDBKey.h" |
+#include "third_party/WebKit/public/platform/WebIDBTypes.h" |
+ |
+namespace WebKit { |
+class WebIDBKey; |
+} |
namespace content { |
@@ -19,12 +23,12 @@ class CONTENT_EXPORT IndexedDBKey { |
public: |
typedef std::vector<IndexedDBKey> KeyArray; |
- IndexedDBKey(); // Defaults to WebKit::WebIDBKey::InvalidType. |
- IndexedDBKey(WebKit::WebIDBKey::Type); // must be Null or Invalid |
+ IndexedDBKey(); // Defaults to WebKit::WebIDBKeyTypeInvalid. |
+ IndexedDBKey(WebKit::WebIDBKeyType); // must be Null or Invalid |
explicit IndexedDBKey(const KeyArray& array); |
explicit IndexedDBKey(const string16& str); |
IndexedDBKey(double number, |
- WebKit::WebIDBKey::Type type); // must be date or number |
+ WebKit::WebIDBKeyType type); // must be date or number |
explicit IndexedDBKey(const WebKit::WebIDBKey& key); |
~IndexedDBKey(); |
@@ -34,7 +38,7 @@ class CONTENT_EXPORT IndexedDBKey { |
bool IsLessThan(const IndexedDBKey& other) const; |
bool IsEqual(const IndexedDBKey& other) const; |
- WebKit::WebIDBKey::Type type() const { return type_; } |
+ WebKit::WebIDBKeyType type() const { return type_; } |
const std::vector<IndexedDBKey>& array() const { return array_; } |
const string16& string() const { return string_; } |
double date() const { return date_; } |
@@ -44,7 +48,7 @@ class CONTENT_EXPORT IndexedDBKey { |
size_t size_estimate() const { return size_estimate_; } |
private: |
- WebKit::WebIDBKey::Type type_; |
+ WebKit::WebIDBKeyType type_; |
std::vector<IndexedDBKey> array_; |
string16 string_; |
double date_; |