Title: [192694] trunk/Source/WebCore
Revision
192694
Author
beid...@apple.com
Date
2015-11-20 13:14:58 -0800 (Fri, 20 Nov 2015)

Log Message

Addressing missed review feedback for:
Modern IDB: Make in-memory ObjectStore cursors work.
https://bugs.webkit.org/show_bug.cgi?id=151196

Reviewed by Darin Adler.

* Modules/indexeddb/server/MemoryObjectStore.cpp:
(WebCore::IDBServer::MemoryObjectStore::maybeOpenCursor):
* Modules/indexeddb/server/MemoryObjectStoreCursor.cpp:
(WebCore::IDBServer::MemoryObjectStoreCursor::create): Deleted.
* Modules/indexeddb/server/MemoryObjectStoreCursor.h:

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (192693 => 192694)


--- trunk/Source/WebCore/ChangeLog	2015-11-20 20:45:12 UTC (rev 192693)
+++ trunk/Source/WebCore/ChangeLog	2015-11-20 21:14:58 UTC (rev 192694)
@@ -1,3 +1,17 @@
+2015-11-20  Brady Eidson  <beid...@apple.com>
+
+        Addressing missed review feedback for:
+        Modern IDB: Make in-memory ObjectStore cursors work.
+        https://bugs.webkit.org/show_bug.cgi?id=151196
+
+        Reviewed by Darin Adler.
+
+        * Modules/indexeddb/server/MemoryObjectStore.cpp:
+        (WebCore::IDBServer::MemoryObjectStore::maybeOpenCursor):
+        * Modules/indexeddb/server/MemoryObjectStoreCursor.cpp:
+        (WebCore::IDBServer::MemoryObjectStoreCursor::create): Deleted.
+        * Modules/indexeddb/server/MemoryObjectStoreCursor.h:
+
 2015-11-20  Chris Dumez  <cdu...@apple.com>
 
         Caching of properties on objects that have named property getters is sometimes incorrect

Modified: trunk/Source/WebCore/Modules/indexeddb/server/MemoryObjectStore.cpp (192693 => 192694)


--- trunk/Source/WebCore/Modules/indexeddb/server/MemoryObjectStore.cpp	2015-11-20 20:45:12 UTC (rev 192693)
+++ trunk/Source/WebCore/Modules/indexeddb/server/MemoryObjectStore.cpp	2015-11-20 21:14:58 UTC (rev 192694)
@@ -480,7 +480,7 @@
     if (!result.isNewEntry)
         return nullptr;
 
-    result.iterator->value = MemoryObjectStoreCursor::create(*this, info);
+    result.iterator->value = std::make_unique<MemoryObjectStoreCursor>(*this, info);
     return result.iterator->value.get();
 }
 

Modified: trunk/Source/WebCore/Modules/indexeddb/server/MemoryObjectStoreCursor.cpp (192693 => 192694)


--- trunk/Source/WebCore/Modules/indexeddb/server/MemoryObjectStoreCursor.cpp	2015-11-20 20:45:12 UTC (rev 192693)
+++ trunk/Source/WebCore/Modules/indexeddb/server/MemoryObjectStoreCursor.cpp	2015-11-20 21:14:58 UTC (rev 192694)
@@ -34,11 +34,6 @@
 namespace WebCore {
 namespace IDBServer {
 
-std::unique_ptr<MemoryObjectStoreCursor> MemoryObjectStoreCursor::create(MemoryObjectStore& objectStore, const IDBCursorInfo& info)
-{
-    return std::make_unique<MemoryObjectStoreCursor>(objectStore, info);
-}
-
 MemoryObjectStoreCursor::MemoryObjectStoreCursor(MemoryObjectStore& objectStore, const IDBCursorInfo& info)
     : MemoryCursor(info)
     , m_objectStore(objectStore)

Modified: trunk/Source/WebCore/Modules/indexeddb/server/MemoryObjectStoreCursor.h (192693 => 192694)


--- trunk/Source/WebCore/Modules/indexeddb/server/MemoryObjectStoreCursor.h	2015-11-20 20:45:12 UTC (rev 192693)
+++ trunk/Source/WebCore/Modules/indexeddb/server/MemoryObjectStoreCursor.h	2015-11-20 21:14:58 UTC (rev 192694)
@@ -40,17 +40,14 @@
 class MemoryObjectStore;
 
 class MemoryObjectStoreCursor : public MemoryCursor {
-    friend std::unique_ptr<MemoryObjectStoreCursor> std::make_unique<MemoryObjectStoreCursor>(WebCore::IDBServer::MemoryObjectStore&, const WebCore::IDBCursorInfo&);
 public:
-    static std::unique_ptr<MemoryObjectStoreCursor> create(MemoryObjectStore&, const IDBCursorInfo&);
+    MemoryObjectStoreCursor(MemoryObjectStore&, const IDBCursorInfo&);
 
     void objectStoreCleared();
     void keyDeleted(const IDBKeyData&);
     void keyAdded(std::set<IDBKeyData>::iterator);
 
 private:
-    MemoryObjectStoreCursor(MemoryObjectStore&, const IDBCursorInfo&);
-
     virtual void currentData(IDBGetResult&) override final;
     virtual void iterate(const IDBKeyData&, uint32_t count, IDBGetResult&) override final;
 
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to