Convert MediaKeyStatusMap to iterable<BufferSource,MediaKeyStatus>

third_party/WebKit/Source/modules/encryptedmedia/MediaKeyStatusMap.cpp

 // Copyright 2015 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/encryptedmedia/MediaKeyStatusMap.h"
 
 #include "bindings/core/v8/ArrayBufferOrArrayBufferView.h"
 #include "core/dom/DOMArrayBuffer.h"
 #include "core/dom/DOMArrayPiece.h"
 #include "public/platform/WebData.h"
@@ skipping 122 matching lines @@
 }
 
 size_t MediaKeyStatusMap::indexOf(const DOMArrayPiece& key) const
 {
     for (size_t index = 0; index < m_entries.size(); ++index) {
         const auto& current = m_entries.at(index)->keyId();
         if (key == *current)
             return index;
     }
 
     // Not found, so return an index outside the valid range.

[ddorwin, 2016/06/14 20:56:05]

The caller must ensure this value is not exposed outside this class.

[jrummell, 2016/06/14 22:24:21]

Done.

     return m_entries.size();

[ddorwin, 2016/06/14 20:56:05]

Unrelated to this CL:
Is this a common pattern? It seems we should return size_t's max() instead.

[jrummell, 2016/06/14 22:24:21]

Done. There is also WTF::kNotFound.

 }
 
+bool MediaKeyStatusMap::has(const ArrayBufferOrArrayBufferView& keyId)
+{
+    size_t index = indexOf(keyId);
+    return index < m_entries.size();
+}
+
+ScriptValue MediaKeyStatusMap::get(ScriptState* scriptState, const ArrayBufferOrArrayBufferView& keyId)
+{
+    size_t index = indexOf(keyId);
+    if (index >= m_entries.size())
+        return ScriptValue(scriptState, v8::Undefined(scriptState->isolate()));
+    return ScriptValue::from(scriptState, at(index).status());
+}
+
 PairIterable<ArrayBufferOrArrayBufferView, String>::IterationSource* MediaKeyStatusMap::startIteration(ScriptState*, ExceptionState&)
 {
     return new MapIterationSource(this);
 }
 
-bool MediaKeyStatusMap::getMapEntry(ScriptState*, const ArrayBufferOrArrayBufferView& key, String& value, ExceptionState&)
-{
-    size_t index = indexOf(key);
-    if (index < m_entries.size()) {
-        value = at(index).status();
-        return true;
-    }
-    return false;
-}
-
 DEFINE_TRACE(MediaKeyStatusMap)
 {
     visitor->trace(m_entries);
 }
 
 } // namespace blink