IndexedDB: Fixed threading bugs with use of AtomicStrings.

Source/modules/indexeddb/IDBTransaction.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 13 matching lines @@
  */
 
 #include "config.h"
 #include "modules/indexeddb/IDBTransaction.h"
 
 #include "bindings/core/v8/ExceptionState.h"
 #include "bindings/core/v8/ExceptionStatePlaceholder.h"
 #include "core/dom/ExecutionContext.h"
 #include "core/events/EventQueue.h"
 #include "core/inspector/ScriptCallStack.h"
+#include "modules/IndexedDBNames.h"
 #include "modules/indexeddb/IDBDatabase.h"
 #include "modules/indexeddb/IDBEventDispatcher.h"
 #include "modules/indexeddb/IDBIndex.h"
 #include "modules/indexeddb/IDBObjectStore.h"
 #include "modules/indexeddb/IDBOpenDBRequest.h"
 #include "modules/indexeddb/IDBPendingTransactionMonitor.h"
 #include "modules/indexeddb/IDBTracing.h"
 
 using blink::WebIDBDatabase;
 
 namespace blink {
 
 IDBTransaction* IDBTransaction::create(ExecutionContext* context, int64_t id, const Vector<String>& objectStoreNames, blink::WebIDBTransactionMode mode, IDBDatabase* db)
 {
     IDBOpenDBRequest* openDBRequest = 0;
     IDBTransaction* transaction = adoptRefCountedGarbageCollectedWillBeNoop(new IDBTransaction(context, id, objectStoreNames, mode, db, openDBRequest, IDBDatabaseMetadata()));
     transaction->suspendIfNeeded();
     return transaction;
 }
 
 IDBTransaction* IDBTransaction::create(ExecutionContext* context, int64_t id, IDBDatabase* db, IDBOpenDBRequest* openDBRequest, const IDBDatabaseMetadata& previousMetadata)
 {
     IDBTransaction* transaction = adoptRefCountedGarbageCollectedWillBeNoop(new IDBTransaction(context, id, Vector<String>(), blink::WebIDBTransactionModeVersionChange, db, openDBRequest, previousMetadata));
     transaction->suspendIfNeeded();
     return transaction;
 }
 
-const AtomicString& IDBTransaction::modeReadOnly()
-{
-    DEFINE_STATIC_LOCAL(AtomicString, readonly, ("readonly", AtomicString::ConstructFromLiteral));
-    return readonly;
-}
-
-const AtomicString& IDBTransaction::modeReadWrite()
-{
-    DEFINE_STATIC_LOCAL(AtomicString, readwrite, ("readwrite", AtomicString::ConstructFromLiteral));
-    return readwrite;
-}
-
-const AtomicString& IDBTransaction::modeVersionChange()
-{
-    DEFINE_STATIC_LOCAL(AtomicString, versionchange, ("versionchange", AtomicString::ConstructFromLiteral));
-    return versionchange;
-}
-
 IDBTransaction::IDBTransaction(ExecutionContext* context, int64_t id, const Vector<String>& objectStoreNames, blink::WebIDBTransactionMode mode, IDBDatabase* db, IDBOpenDBRequest* openDBRequest, const IDBDatabaseMetadata& previousMetadata)
     : ActiveDOMObject(context)
     , m_id(id)
     , m_database(db)
     , m_objectStoreNames(objectStoreNames)
     , m_openDBRequest(openDBRequest)
     , m_mode(mode)
     , m_state(Active)
     , m_hasPendingActivity(true)
     , m_contextStopped(false)
@@ skipping 21 matching lines @@
     visitor->trace(m_database);
     visitor->trace(m_openDBRequest);
     visitor->trace(m_error);
     visitor->trace(m_requestList);
     visitor->trace(m_objectStoreMap);
     visitor->trace(m_deletedObjectStores);
     visitor->trace(m_objectStoreCleanupMap);
     EventTargetWithInlineData::trace(visitor);
 }
 
-const String& IDBTransaction::mode() const
-{
-    return modeToString(m_mode);
-}
-
 void IDBTransaction::setError(PassRefPtrWillBeRawPtr<DOMError> error)
 {
     ASSERT(m_state != Finished);
     ASSERT(error);
 
     // The first error to be set is the true cause of the
     // transaction abort.
     if (!m_error) {
         m_error = error;
     }
@@ skipping 159 matching lines @@
 bool IDBTransaction::hasPendingActivity() const
 {
     // FIXME: In an ideal world, we should return true as long as anyone has a or can
     //        get a handle to us or any child request object and any of those have
     //        event listeners. This is  in order to handle user generated events properly.
     return m_hasPendingActivity && !m_contextStopped;
 }
 
 blink::WebIDBTransactionMode IDBTransaction::stringToMode(const String& modeString, ExceptionState& exceptionState)
 {
-    if (modeString == IDBTransaction::modeReadOnly())
+    if (modeString == IndexedDBNames::readonly)
         return blink::WebIDBTransactionModeReadOnly;
-    if (modeString == IDBTransaction::modeReadWrite())
+    if (modeString == IndexedDBNames::readwrite)
         return blink::WebIDBTransactionModeReadWrite;
 
     exceptionState.throwTypeError("The mode provided ('" + modeString + "') is not one of 'readonly' or 'readwrite'.");
     return blink::WebIDBTransactionModeReadOnly;
 }
 
-const AtomicString& IDBTransaction::modeToString(blink::WebIDBTransactionMode mode)
+const String& IDBTransaction::mode() const
 {
-    switch (mode) {
+    switch (m_mode) {
     case blink::WebIDBTransactionModeReadOnly:
-        return IDBTransaction::modeReadOnly();
-        break;
+        return IndexedDBNames::readonly;
 
     case blink::WebIDBTransactionModeReadWrite:
-        return IDBTransaction::modeReadWrite();
-        break;
+        return IndexedDBNames::readwrite;
 
     case blink::WebIDBTransactionModeVersionChange:
-        return IDBTransaction::modeVersionChange();
-        break;
+        return IndexedDBNames::versionchange;
     }
 
     ASSERT_NOT_REACHED();
-    return IDBTransaction::modeReadOnly();
+    return IndexedDBNames::readonly;
 }
 
 const AtomicString& IDBTransaction::interfaceName() const
 {
     return EventTargetNames::IDBTransaction;
 }
 
 ExecutionContext* IDBTransaction::executionContext() const
 {
     return ActiveDOMObject::executionContext();
@@ skipping 57 matching lines @@
     event->setTarget(this);
     eventQueue->enqueueEvent(event);
 }
 
 blink::WebIDBDatabase* IDBTransaction::backendDB() const
 {
     return m_database->backend();
 }
 
 } // namespace blink