diff options
Diffstat (limited to 'Source/WebKit/chromium/src/IDBCursorBackendProxy.cpp')
| -rw-r--r-- | Source/WebKit/chromium/src/IDBCursorBackendProxy.cpp | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/Source/WebKit/chromium/src/IDBCursorBackendProxy.cpp b/Source/WebKit/chromium/src/IDBCursorBackendProxy.cpp index ec7bf63..7dab6a2 100644 --- a/Source/WebKit/chromium/src/IDBCursorBackendProxy.cpp +++ b/Source/WebKit/chromium/src/IDBCursorBackendProxy.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 Google Inc. All rights reserved. + * Copyright (C) 2011 Google Inc. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -36,14 +36,16 @@ #include "WebIDBKey.h" #include "WebSerializedScriptValue.h" -namespace WebCore { +using namespace WebCore; -PassRefPtr<IDBCursorBackendInterface> IDBCursorBackendProxy::create(PassOwnPtr<WebKit::WebIDBCursor> idbCursor) +namespace WebKit { + +PassRefPtr<IDBCursorBackendInterface> IDBCursorBackendProxy::create(PassOwnPtr<WebIDBCursor> idbCursor) { return adoptRef(new IDBCursorBackendProxy(idbCursor)); } -IDBCursorBackendProxy::IDBCursorBackendProxy(PassOwnPtr<WebKit::WebIDBCursor> idbCursor) +IDBCursorBackendProxy::IDBCursorBackendProxy(PassOwnPtr<WebIDBCursor> idbCursor) : m_idbCursor(idbCursor) { } @@ -62,17 +64,14 @@ PassRefPtr<IDBKey> IDBCursorBackendProxy::key() const return m_idbCursor->key(); } -PassRefPtr<IDBAny> IDBCursorBackendProxy::value() const +PassRefPtr<IDBKey> IDBCursorBackendProxy::primaryKey() const +{ + return m_idbCursor->primaryKey(); +} + +PassRefPtr<SerializedScriptValue> IDBCursorBackendProxy::value() const { - WebKit::WebSerializedScriptValue webScriptValue; - WebKit::WebIDBKey webKey; - m_idbCursor->value(webScriptValue, webKey); - if (!webScriptValue.isNull()) { - ASSERT(webKey.type() == WebKit::WebIDBKey::InvalidType); - return IDBAny::create<SerializedScriptValue>(webScriptValue); - } - ASSERT(webKey.type() != WebKit::WebIDBKey::InvalidType); - return IDBAny::create<IDBKey>(webKey); + return m_idbCursor->value(); } void IDBCursorBackendProxy::update(PassRefPtr<SerializedScriptValue> value, PassRefPtr<IDBCallbacks> callbacks, ExceptionCode& ec) @@ -90,6 +89,6 @@ void IDBCursorBackendProxy::deleteFunction(PassRefPtr<IDBCallbacks> callbacks, E m_idbCursor->deleteFunction(new WebIDBCallbacksImpl(callbacks), ec); } -} // namespace WebCore +} // namespace WebKit #endif // ENABLE(INDEXED_DATABASE) |