diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-06-25 13:35:59 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-06-25 13:35:59 +0200 |
| commit | 79ad030d505ccf79cf10aa9f8189ca3e2f61f6f4 (patch) | |
| tree | 0287b1a69d84492c901e8bc820e635e7133809a0 /Source/WebKit/chromium/src/WebIDBKey.cpp | |
| parent | 682ab87480e7757346802ce7f54cfdbdfeb2339e (diff) | |
| download | qtwebkit-79ad030d505ccf79cf10aa9f8189ca3e2f61f6f4.tar.gz | |
Imported WebKit commit c4b613825abd39ac739a47d7b4410468fcef66dc (http://svn.webkit.org/repository/webkit/trunk@121147)
New snapshot that includes Win32 debug build fix (use SVGAllInOne)
Diffstat (limited to 'Source/WebKit/chromium/src/WebIDBKey.cpp')
| -rw-r--r-- | Source/WebKit/chromium/src/WebIDBKey.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/Source/WebKit/chromium/src/WebIDBKey.cpp b/Source/WebKit/chromium/src/WebIDBKey.cpp index 25be6c52f..cfadafbac 100644 --- a/Source/WebKit/chromium/src/WebIDBKey.cpp +++ b/Source/WebKit/chromium/src/WebIDBKey.cpp @@ -120,6 +120,8 @@ static PassRefPtr<IDBKey> convertFromWebIDBKeyArray(const WebVector<WebIDBKey>& keys.append(IDBKey::createNumber(array[i].number())); break; case WebIDBKey::InvalidType: + keys.append(IDBKey::createInvalid()); + break; case WebIDBKey::NullType: ASSERT_NOT_REACHED(); break; @@ -149,6 +151,8 @@ static void convertToWebIDBKeyArray(const IDBKey::KeyArray& array, WebVector<Web keys[i] = WebIDBKey::createNumber(key->number()); break; case IDBKey::InvalidType: + keys[i] = WebIDBKey::createInvalid(); + break; case IDBKey::MinType: ASSERT_NOT_REACHED(); break; @@ -199,6 +203,13 @@ WebIDBKey::Type WebIDBKey::type() const return Type(m_private->type()); } +bool WebIDBKey::isValid() const +{ + if (!m_private.get()) + return false; + return m_private->isValid(); +} + WebVector<WebIDBKey> WebIDBKey::array() const { WebVector<WebIDBKey> keys; |