[IndexedDB] Propogating changes to observers : Renderer

third_party/WebKit/Source/modules/indexeddb/IDBObservation.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/IDBObserverChangesRecord.h"
+#include "modules/indexeddb/IDBObservation.h"
 
 #include "bindings/core/v8/ExceptionState.h"
 #include "bindings/core/v8/ScriptState.h"
 #include "bindings/core/v8/ToV8.h"
 #include "bindings/modules/v8/ToV8ForModules.h"
 #include "bindings/modules/v8/V8BindingForModules.h"
 #include "modules/IndexedDBNames.h"
 #include "modules/indexeddb/IDBAny.h"
-#include "modules/indexeddb/IDBKey.h"
+#include "modules/indexeddb/IDBKeyRange.h"
 #include "modules/indexeddb/IDBValue.h"
+#include "public/platform/modules/indexeddb/WebIDBObservation.h"
 
 namespace blink {
 
-IDBObserverChangesRecord::~IDBObserverChangesRecord() {}
+IDBObservation::~IDBObservation() {}
 
-ScriptValue IDBObserverChangesRecord::key(ScriptState* scriptState)
+ScriptValue IDBObservation::key(ScriptState* scriptState)
 {
-    return ScriptValue::from(scriptState, m_key);
+    if (!m_keyRange)
+        return ScriptValue::from(scriptState, IDBAny::createUndefined());

[jsbell, 2016/07/14 20:08:14]

I'd lean towards:

return ScriptValue(scriptState, v8::Undefined(scriptState->isolate()));

... but not strongly.

[palakj1, 2016/07/15 20:16:05]

Was looking for something like that. Thanks for pointing it out.

+
+    return ScriptValue::from(scriptState, m_keyRange);
 }
 
-ScriptValue IDBObserverChangesRecord::value(ScriptState* scriptState)
+ScriptValue IDBObservation::value(ScriptState* scriptState)
 {
     IDBAny* value;
     if (!m_value) {

[jsbell, 2016/07/14 20:08:14]

Not this CL but: don't need {} if every branch of if/else is single line.

[palakj1, 2016/07/15 20:16:05]

Done.

         value = IDBAny::createUndefined();
     } else {
         value = IDBAny::create(m_value);
     }
     ScriptValue scriptValue = ScriptValue::from(scriptState, value);

[jsbell, 2016/07/14 20:08:14]

Not this CL but: why is there a temp variable here rather than just returning?

     return scriptValue;
 }
 
-WebIDBOperationType IDBObserverChangesRecord::stringToOperationType(const String& type)
+WebIDBOperationType IDBObservation::stringToOperationType(const String& type)
 {
     if (type == IndexedDBNames::add)
         return WebIDBAdd;
     if (type == IndexedDBNames::put)
         return WebIDBPut;
     if (type == IndexedDBNames::kDelete)
         return WebIDBDelete;
     if (type == IndexedDBNames::clear)
         return WebIDBClear;
 
     NOTREACHED();
     return WebIDBAdd;
 }
 
-const String& IDBObserverChangesRecord::type() const
+const String& IDBObservation::type() const
 {
     switch (m_operationType) {
     case WebIDBAdd:
         return IndexedDBNames::add;
 
     case WebIDBPut:
         return IndexedDBNames::put;
 
     case WebIDBDelete:
         return IndexedDBNames::kDelete;
 
     case WebIDBClear:
         return IndexedDBNames::clear;
 
     default:
         NOTREACHED();
         return IndexedDBNames::add;
     }
 }
 
-IDBObserverChangesRecord* IDBObserverChangesRecord::create(IDBKey* key, PassRefPtr<IDBValue> value, WebIDBOperationType type)
+IDBObservation* IDBObservation::create(const WebIDBObservation& observation)
 {
-    return new IDBObserverChangesRecord(key, value, type);
+    return new IDBObservation(observation);
 }
 
-IDBObserverChangesRecord::IDBObserverChangesRecord(IDBKey* key, PassRefPtr<IDBValue> value, WebIDBOperationType type)
-    : m_key(key)
-    , m_value(value)
-    , m_operationType(type)
+IDBObservation::IDBObservation(const WebIDBObservation& observation)
+    : m_keyRange(observation.keyRange)
+    , m_value(IDBValue::create(observation.value))
+    , m_operationType(observation.type)
 {
 }
 
-DEFINE_TRACE(IDBObserverChangesRecord)
+DEFINE_TRACE(IDBObservation)
 {
-    visitor->trace(m_key);
+    visitor->trace(m_keyRange);
 }
 
 } // namespace blink