From 81bc750723a18f21cd17d1b173cd2a4dda9cea6e Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Tue, 24 May 2011 11:24:40 +0100 Subject: Merge WebKit at r80534: Intial merge by Git Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61 --- Source/WebKit/chromium/src/WebIDBCursorImpl.cpp | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) (limited to 'Source/WebKit/chromium/src/WebIDBCursorImpl.cpp') 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 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) -- cgit v1.1