[IndexedDB] Use consistent enums on both sides of IPC.

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 30 matching lines @@
 #include "public/platform/WebBlobInfo.h"
 #include "public/platform/WebIDBDatabase.h"
 #include "public/platform/WebIDBKeyRange.h"
 #include <limits>
 
 using blink::WebIDBCursor;
 using blink::WebIDBDatabase;
 
 namespace WebCore {
 
-IDBCursor* IDBCursor::create(PassOwnPtr<blink::WebIDBCursor> backend, WebIDBCursor::Direction direction, IDBRequest* request, IDBAny* source, IDBTransaction* transaction)
+IDBCursor* IDBCursor::create(PassOwnPtr<blink::WebIDBCursor> backend, blink::WebIDBCursorDirection direction, IDBRequest* request, IDBAny* source, IDBTransaction* transaction)
 {
     return new IDBCursor(backend, direction, request, source, transaction);
 }
 
 const AtomicString& IDBCursor::directionNext()
 {
     DEFINE_STATIC_LOCAL(AtomicString, next, ("next", AtomicString::ConstructFromLiteral));
     return next;
 }
 
 const AtomicString& IDBCursor::directionNextUnique()
 {
     DEFINE_STATIC_LOCAL(AtomicString, nextunique, ("nextunique", AtomicString::ConstructFromLiteral));
     return nextunique;
 }
 
 const AtomicString& IDBCursor::directionPrev()
 {
     DEFINE_STATIC_LOCAL(AtomicString, prev, ("prev", AtomicString::ConstructFromLiteral));
     return prev;
 }
 
 const AtomicString& IDBCursor::directionPrevUnique()
 {
     DEFINE_STATIC_LOCAL(AtomicString, prevunique, ("prevunique", AtomicString::ConstructFromLiteral));
     return prevunique;
 }
 
-IDBCursor::IDBCursor(PassOwnPtr<blink::WebIDBCursor> backend, WebIDBCursor::Direction direction, IDBRequest* request, IDBAny* source, IDBTransaction* transaction)
+IDBCursor::IDBCursor(PassOwnPtr<blink::WebIDBCursor> backend, blink::WebIDBCursorDirection direction, IDBRequest* request, IDBAny* source, IDBTransaction* transaction)
     : m_backend(backend)
     , m_request(request)
     , m_direction(direction)
     , m_source(source)
     , m_transaction(transaction)
     , m_gotValue(false)
     , m_keyDirty(true)
     , m_primaryKeyDirty(true)
     , m_valueDirty(true)
 {
@@ skipping 51 matching lines @@
     const IDBKeyPath& keyPath = objectStore->metadata().keyPath;
     const bool usesInLineKeys = !keyPath.isNull();
     if (usesInLineKeys) {
         IDBKey* keyPathKey = createIDBKeyFromScriptValueAndKeyPath(scriptState->isolate(), value, keyPath);
         if (!keyPathKey || !keyPathKey->isEqual(m_primaryKey.get())) {
             exceptionState.throwDOMException(DataError, "The effective object store of this cursor uses in-line keys and evaluating the key path of the value parameter results in a different value than the cursor's effective key.");
             return 0;
         }
     }
 
-    return objectStore->put(scriptState, WebIDBDatabase::CursorUpdate, IDBAny::create(this), value, m_primaryKey, exceptionState);
+    return objectStore->put(scriptState, blink::WebIDBPutModeCursorUpdate, IDBAny::create(this), value, m_primaryKey, exceptionState);
 }
 
 void IDBCursor::advance(unsigned long count, ExceptionState& exceptionState)
 {
     IDB_TRACE("IDBCursor::advance");
     if (!count) {
         exceptionState.throwTypeError("A count argument with value 0 (zero) was supplied, must be greater than 0.");
         return;
     }
     if (!m_gotValue) {
@@ skipping 60 matching lines @@
         return;
     }
 
     if (isDeleted()) {
         exceptionState.throwDOMException(InvalidStateError, IDBDatabase::sourceDeletedErrorMessage);
         return;
     }
 
     if (key) {
         ASSERT(m_key);
-        if (m_direction == WebIDBCursor::Next || m_direction == WebIDBCursor::NextNoDuplicate) {
+        if (m_direction == blink::WebIDBCursorDirectionNext || m_direction == blink::WebIDBCursorDirectionNextNoDuplicate) {
             const bool ok = m_key->isLessThan(key)
                 || (primaryKey && m_key->isEqual(key) && m_primaryKey->isLessThan(primaryKey));
             if (!ok) {
                 exceptionState.throwDOMException(DataError, "The parameter is less than or equal to this cursor's position.");
                 return;
             }
 
         } else {
             const bool ok = key->isLessThan(m_key.get())
                 || (primaryKey && key->isEqual(m_key.get()) && primaryKey->isLessThan(m_primaryKey.get()));
@@ skipping 139 matching lines @@
 void IDBCursor::handleBlobAcks()
 {
     ASSERT(m_request || !m_blobInfo || !m_blobInfo->size());
     if (m_blobInfo.get() && m_blobInfo->size()) {
         ASSERT(m_request);
         m_transaction->db()->ackReceivedBlobs(m_blobInfo.get());
         m_blobInfo.clear();
     }
 }
 
-WebIDBCursor::Direction IDBCursor::stringToDirection(const String& directionString, ExceptionState& exceptionState)
+blink::WebIDBCursorDirection IDBCursor::stringToDirection(const String& directionString, ExceptionState& exceptionState)
 {
     if (directionString.isNull() || directionString == IDBCursor::directionNext())
-        return WebIDBCursor::Next;
+        return blink::WebIDBCursorDirectionNext;
     if (directionString == IDBCursor::directionNextUnique())
-        return WebIDBCursor::NextNoDuplicate;
+        return blink::WebIDBCursorDirectionNextNoDuplicate;
     if (directionString == IDBCursor::directionPrev())
-        return WebIDBCursor::Prev;
+        return blink::WebIDBCursorDirectionPrev;
     if (directionString == IDBCursor::directionPrevUnique())
-        return WebIDBCursor::PrevNoDuplicate;
+        return blink::WebIDBCursorDirectionPrevNoDuplicate;
 
     exceptionState.throwTypeError("The direction provided ('" + directionString + "') is not one of 'next', 'nextunique', 'prev', or 'prevunique'.");
-    return WebIDBCursor::Next;
+    return blink::WebIDBCursorDirectionNext;
 }
 
 const AtomicString& IDBCursor::directionToString(unsigned short direction)
 {
     switch (direction) {
-    case WebIDBCursor::Next:
+    case blink::WebIDBCursorDirectionNext:
         return IDBCursor::directionNext();
 
-    case WebIDBCursor::NextNoDuplicate:
+    case blink::WebIDBCursorDirectionNextNoDuplicate:
         return IDBCursor::directionNextUnique();
 
-    case WebIDBCursor::Prev:
+    case blink::WebIDBCursorDirectionPrev:
         return IDBCursor::directionPrev();
 
-    case WebIDBCursor::PrevNoDuplicate:
+    case blink::WebIDBCursorDirectionPrevNoDuplicate:
         return IDBCursor::directionPrevUnique();
 
     default:
         ASSERT_NOT_REACHED();
         return IDBCursor::directionNext();
     }
 }
 
 } // namespace WebCore