diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-24 11:24:40 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-06-02 09:53:15 +0100 |
| commit | 81bc750723a18f21cd17d1b173cd2a4dda9cea6e (patch) | |
| tree | 7a9e5ed86ff429fd347a25153107221543909b19 /Source/WebKit/chromium/src/WebIDBCursorImpl.cpp | |
| parent | 94088a6d336c1dd80a1e734af51e96abcbb689a7 (diff) | |
| download | external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.zip external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.gz external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.bz2 | |
Merge WebKit at r80534: Intial merge by Git
Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
Diffstat (limited to 'Source/WebKit/chromium/src/WebIDBCursorImpl.cpp')
| -rw-r--r-- | Source/WebKit/chromium/src/WebIDBCursorImpl.cpp | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/Source/WebKit/chromium/src/WebIDBCursorImpl.cpp b/Source/WebKit/chromium/src/WebIDBCursorImpl.cpp index 5165574..86c4f57 100644 --- a/Source/WebKit/chromium/src/WebIDBCursorImpl.cpp +++ b/Source/WebKit/chromium/src/WebIDBCursorImpl.cpp @@ -52,22 +52,17 @@ unsigned short WebIDBCursorImpl::direction() const WebIDBKey WebIDBCursorImpl::key() const { - return WebIDBKey(m_idbCursorBackend->key()); + return m_idbCursorBackend->key(); } -void WebIDBCursorImpl::value(WebSerializedScriptValue& serializedScriptValue, WebIDBKey& idbKey) const +WebIDBKey WebIDBCursorImpl::primaryKey() const { - // Verify we're starting off with blank slates. - ASSERT(serializedScriptValue.isNull()); - ASSERT(idbKey.type() == WebIDBKey::InvalidType); + return m_idbCursorBackend->primaryKey(); +} - RefPtr<IDBAny> any = m_idbCursorBackend->value(); - if (any->type() == IDBAny::SerializedScriptValueType) - serializedScriptValue.assign(any->serializedScriptValue()); - else if (any->type() == IDBAny::IDBKeyType) - idbKey.assign(any->idbKey()); - else - ASSERT_NOT_REACHED(); +WebSerializedScriptValue WebIDBCursorImpl::value() const +{ + return m_idbCursorBackend->value(); } void WebIDBCursorImpl::update(const WebSerializedScriptValue& value, WebIDBCallbacks* callbacks, WebExceptionCode& ec) |