Minor IndexedDB refactorings.

third_party/WebKit/Source/modules/indexeddb/IDBCursor.cpp

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 318 matching lines @@
 {
     m_primaryKeyDirty = false;
     return ScriptValue::from(scriptState, m_primaryKey);
 }
 
 ScriptValue IDBCursor::value(ScriptState* scriptState)
 {
     ASSERT(isCursorWithValue());
 
     IDBObjectStore* objectStore = effectiveObjectStore();
-    const IDBObjectStoreMetadata& metadata = objectStore->metadata();
     IDBAny* value;
     if (!m_value) {
         value = IDBAny::createUndefined();
-    } else if (metadata.autoIncrement && !metadata.keyPath.isNull()) {
-        RefPtr<IDBValue> idbValue = IDBValue::create(m_value.get(), m_primaryKey, metadata.keyPath);
+    } else if (objectStore->autoIncrement() && !objectStore->idbKeyPath().isNull()) {
+        RefPtr<IDBValue> idbValue = IDBValue::create(m_value.get(), m_primaryKey, objectStore->idbKeyPath());
 #if ENABLE(ASSERT)
         assertPrimaryKeyValidOrInjectable(scriptState, idbValue.get());
 #endif
         value = IDBAny::create(idbValue.release());
     } else {
         value = IDBAny::create(m_value);
     }
 
     m_valueDirty = false;
     ScriptValue scriptValue = ScriptValue::from(scriptState, value);
@@ skipping 65 matching lines @@
     case WebIDBCursorDirectionPrevNoDuplicate:
         return IndexedDBNames::prevunique;
 
     default:
         ASSERT_NOT_REACHED();
         return IndexedDBNames::next;
     }
 }
 
 } // namespace blink