Changeset 201939 in webkit

Timestamp:

Jun 10, 2016 1:59:38 PM (8 years ago)

Author:

commit-queue@webkit.org

Message:

Web Inspector: Cleanup InspectorIndexedDBAgent a bit
​https://bugs.webkit.org/show_bug.cgi?id=158598

Patch by Joseph Pecoraro <Joseph Pecoraro> on 2016-06-10
Reviewed by Darin Adler.

• inspector/InspectorIndexedDBAgent.cpp:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/InspectorIndexedDBAgent.cpp (modified) (19 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-06-10  Joseph Pecoraro  <pecoraro@apple.com>
+
+        Web Inspector: Cleanup InspectorIndexedDBAgent a bit
+        https://bugs.webkit.org/show_bug.cgi?id=158598
+
+        Reviewed by Darin Adler.
+
+        * inspector/InspectorIndexedDBAgent.cpp:
+
 2016-06-10  Youenn Fablet  <youenn.fablet@crf.canon.fr>
 

trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.cpp

@@ -95 +95 @@
     ExecutableWithDatabase(ScriptExecutionContext* context)
         : m_context(context) { }
-    virtual ~ExecutableWithDatabase() { };
+    virtual ~ExecutableWithDatabase() { }
     void start(IDBFactory*, SecurityOrigin*, const String& databaseName);
     virtual void execute(IDBDatabase&) = 0;
     virtual RequestCallback& requestCallback() = 0;
-    ScriptExecutionContext* context() { return m_context; };
+    ScriptExecutionContext* context() const { return m_context; }
 private:
     ScriptExecutionContext* m_context;
 };
 
-class OpenDatabaseCallback : public EventListener {
+class OpenDatabaseCallback final : public EventListener {
 public:
     static Ref<OpenDatabaseCallback> create(ExecutableWithDatabase* executableWithDatabase)
@@ -149 +149 @@
 void ExecutableWithDatabase::start(IDBFactory* idbFactory, SecurityOrigin*, const String& databaseName)
 {
-    Ref<OpenDatabaseCallback> callback = OpenDatabaseCallback::create(this);
-    ExceptionCodeWithMessage ec;
-
     if (!context()) {
         requestCallback().sendFailure("Could not open database.");
@@ -157 +154 @@
     }
 
+    ExceptionCodeWithMessage ec;
     RefPtr<IDBOpenDBRequest> idbOpenDBRequest = idbFactory->open(*context(), databaseName, Nullopt, ec);
     if (ec.code) {
@@ -162 +160 @@
         return;
     }
+
+    Ref<OpenDatabaseCallback> callback = OpenDatabaseCallback::create(this);
     idbOpenDBRequest->addEventListener(eventNames().successEvent, WTFMove(callback), false);
 }
@@ -175 +175 @@
             .release();
         break;
+
     case IDBKeyPath::Type::String:
         keyPath = KeyPath::create()
@@ -180 +181 @@
             .release();
         keyPath->setString(idbKeyPath.string());
-
         break;
+
     case IDBKeyPath::Type::Array: {
         auto array = Inspector::Protocol::Array<String>::create();
@@ -192 +193 @@
         break;
     }
+
     default:
         ASSERT_NOT_REACHED();
@@ -226 +228 @@
 }
 
-class DatabaseLoader : public ExecutableWithDatabase {
+class DatabaseLoader final : public ExecutableWithDatabase {
 public:
     static Ref<DatabaseLoader> create(ScriptExecutionContext* context, Ref<RequestDatabaseCallback>&& requestCallback)
@@ -266 +268 @@
                 .setIndexes(WTFMove(indexes))
                 .release();
-        
             objectStores->addItem(WTFMove(objectStore));
         }
@@ -275 +276 @@
             .setObjectStores(WTFMove(objectStores))
             .release();
-        
         m_requestCallback->sendSuccess(WTFMove(result));
     }
@@ -289 +289 @@
 static RefPtr<IDBKey> idbKeyFromInspectorObject(InspectorObject* key)
 {
-    RefPtr<IDBKey> idbKey;
-
     String type;
     if (!key->getString("type", type))
@@ -300 +298 @@
     static NeverDestroyed<const String> arrayType(ASCIILiteral("array"));
 
+    RefPtr<IDBKey> idbKey;
     if (type == numberType) {
         double number;
@@ -337 +336 @@
 {
     RefPtr<InspectorObject> lower;
-    if (!keyRange->getObject("lower", lower))
+    if (!keyRange->getObject(ASCIILiteral("lower"), lower))
         return nullptr;
     RefPtr<IDBKey> idbLower = idbKeyFromInspectorObject(lower.get());
@@ -344 +343 @@
 
     RefPtr<InspectorObject> upper;
-    if (!keyRange->getObject("upper", upper))
+    if (!keyRange->getObject(ASCIILiteral("upper"), upper))
         return nullptr;
     RefPtr<IDBKey> idbUpper = idbKeyFromInspectorObject(upper.get());
@@ -351 +350 @@
 
     bool lowerOpen;
-    if (!keyRange->getBoolean("lowerOpen", lowerOpen))
+    if (!keyRange->getBoolean(ASCIILiteral("lowerOpen"), lowerOpen))
         return nullptr;
 
     bool upperOpen;
-    if (!keyRange->getBoolean("upperOpen", upperOpen))
+    if (!keyRange->getBoolean(ASCIILiteral("upperOpen"), upperOpen))
         return nullptr;
 
@@ -433 +432 @@
             .release();
         m_result->addItem(WTFMove(dataEntry));
-
     }
 
@@ -448 +446 @@
         , m_injectedScript(injectedScript)
         , m_requestCallback(WTFMove(requestCallback))
+        , m_result(Array<DataEntry>::create())
         , m_skipCount(skipCount)
         , m_pageSize(pageSize)
-        , m_result(Array<DataEntry>::create())
     {
     }
     InjectedScript m_injectedScript;
     Ref<RequestDataCallback> m_requestCallback;
+    Ref<Array<DataEntry>> m_result;
     int m_skipCount;
     unsigned m_pageSize;
-    Ref<Array<DataEntry>> m_result;
 };
 
@@ -473 +471 @@
         if (!requestCallback().isActive())
             return;
+
         RefPtr<IDBTransaction> idbTransaction = transactionForDatabase(context(), &database, m_objectStoreName);
         if (!idbTransaction) {
@@ -711 +710 @@
             return;
         }
+
         RefPtr<IDBObjectStore> idbObjectStore = objectStoreForTransaction(idbTransaction.get(), m_objectStoreName);
         if (!idbObjectStore) {