1 files changed, 14 insertions, 15 deletions
diff --git a/Source/WebKit/chromium/src/WebIDBCursorImpl.cpp b/Source/WebKit/chromium/src/WebIDBCursorImpl.cpp
index 5165574..6c0012e 100644
--- a/Source/WebKit/chromium/src/WebIDBCursorImpl.cpp
+++ b/Source/WebKit/chromium/src/WebIDBCursorImpl.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
@@ -26,6 +26,8 @@
 #include "config.h"
 #include "WebIDBCursorImpl.h"
 
+#if ENABLE(INDEXED_DATABASE)
+
 #include "IDBAny.h"
 #include "IDBCallbacksProxy.h"
 #include "IDBCursorBackendInterface.h"
@@ -52,22 +54,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);
-
-    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();
+    return m_idbCursorBackend->primaryKey();
+}
+
+WebSerializedScriptValue WebIDBCursorImpl::value() const
+{
+    return m_idbCursorBackend->value();
 }
 
 void WebIDBCursorImpl::update(const WebSerializedScriptValue& value, WebIDBCallbacks* callbacks, WebExceptionCode& ec)
@@ -85,4 +82,6 @@ void WebIDBCursorImpl::deleteFunction(WebIDBCallbacks* callbacks, WebExceptionCo
     m_idbCursorBackend->deleteFunction(IDBCallbacksProxy::create(callbacks), ec);
 }
 
-} // namespace WebCore
+} // namespace WebKit
+
+#endif // ENABLE(INDEXED_DATABASE)