[IndexedDB] Propogating changes to observers : Renderer

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

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "modules/indexeddb/IDBObserver.h"
 
 #include "bindings/core/v8/ExceptionState.h"
 #include "bindings/modules/v8/ToV8ForModules.h"
 #include "bindings/modules/v8/V8BindingForModules.h"
 #include "core/dom/ExceptionCode.h"
 #include "modules/indexeddb/IDBDatabase.h"
 #include "modules/indexeddb/IDBObserverCallback.h"
+#include "modules/indexeddb/IDBObserverChanges.h"
 #include "modules/indexeddb/IDBObserverInit.h"
 #include "modules/indexeddb/IDBTransaction.h"
 #include "modules/indexeddb/WebIDBObserverImpl.h"
 
 namespace blink {
 
 IDBObserver* IDBObserver::create(IDBObserverCallback& callback, const IDBObserverInit& options)
 {
     return new IDBObserver(callback, options);
 }
@@ skipping 19 matching lines @@
         return;
     }
     if (!database->backend()) {
         exceptionState.throwDOMException(InvalidStateError, IDBDatabase::databaseClosedErrorMessage);
         return;
     }
 
     std::unique_ptr<WebIDBObserverImpl> observer = WebIDBObserverImpl::create(this);
     WebIDBObserverImpl* observerPtr = observer.get();
     int32_t observerId = database->backend()->addObserver(std::move(observer), transaction->id());
-    m_observerIds.insert(observerId);
+    m_observerIds.add(observerId, database);
     observerPtr->setId(observerId);
 }
 
 void IDBObserver::unobserve(IDBDatabase* database, ExceptionState& exceptionState)
 {
     if (!database->backend()) {
         exceptionState.throwDOMException(InvalidStateError, IDBDatabase::databaseClosedErrorMessage);
         return;
     }
-    auto it = m_observerIds.begin();
+
+    HeapHashMap<int32_t, WeakMember<IDBDatabase>> observersToRetain;
     std::vector<int32_t> observerIdsToRemove;
-    while (it != m_observerIds.end()) {
-        if (database->backend()->containsObserverId(*it)) {
-            observerIdsToRemove.push_back(*it);
-            it = m_observerIds.erase(it);
-        } else {
-            it++;
-        }
+    for (const auto& it : m_observerIds) {
+        if (it.value == database)
+            observersToRetain.add(it.key, it.value);
+        else
+            observerIdsToRemove.push_back(it.key);

[palakj1, 2016/07/13 17:47:18]

typo : the if and else condition must be swapped. Changing with next patch.

     }
+    m_observerIds.swap(observersToRetain);
+
     if (!observerIdsToRemove.empty())
         database->backend()->removeObservers(observerIdsToRemove);
 }
 
 void IDBObserver::removeObserver(int32_t id)
 {
-    m_observerIds.erase(id);
+    m_observerIds.remove(id);
+}
+
+void IDBObserver::onChange(int32_t id, const std::vector<WebIDBObservation>& observations, const std::vector<int32_t>& observationIndex)
+{
+    auto it = m_observerIds.find(id);
+    DCHECK_NE(it, m_observerIds.end());
+    m_callback->handleEvent(*IDBObserverChanges::create(it->value, observations, observationIndex), *this);
 }
 
 DEFINE_TRACE(IDBObserver)
 {
     visitor->trace(m_callback);
+    visitor->trace(m_observerIds);
 }
 
 } // namespace blink