Switch v8 inspector to stl collections

third_party/WebKit/Source/platform/v8_inspector/V8DebuggerImpl.h

 /*
  * Copyright (c) 2010, Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 13 matching lines @@
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef V8DebuggerImpl_h
 #define V8DebuggerImpl_h
 
+#include "platform/inspector_protocol/Collections.h"
 #include "platform/inspector_protocol/Maybe.h"
 #include "platform/inspector_protocol/Platform.h"
 #include "platform/v8_inspector/JavaScriptCallFrame.h"
 #include "platform/v8_inspector/V8DebuggerScript.h"
 #include "platform/v8_inspector/protocol/Debugger.h"
 #include "platform/v8_inspector/public/V8Debugger.h"
 
 #include <v8-debug.h>
 #include <v8.h>
 
+#include <vector>
+
 namespace blink {
 
 using protocol::Maybe;
 
 struct ScriptBreakpoint;
 class InspectedContext;
 class V8DebuggerAgentImpl;
 class V8InspectorSessionImpl;
 class V8RuntimeAgentImpl;
 
@@ skipping 25 matching lines @@
     void stepOverStatement();
     void stepOutOfFunction();
     void clearStepping();
 
     bool setScriptSource(const String16& sourceID, const String16& newContent, bool preview, ErrorString*, Maybe<protocol::Debugger::SetScriptSourceError>*, JavaScriptCallFrames* newCallFrames, Maybe<bool>* stackChanged);
     JavaScriptCallFrames currentCallFrames(int limit = 0);
 
     // Each script inherits debug data from v8::Context where it has been compiled.
     // Only scripts whose debug data matches |contextGroupId| will be reported.
     // Passing 0 will result in reporting all scripts.
-    void getCompiledScripts(int contextGroupId, protocol::Vector<V8DebuggerParsedScript>&);
+    void getCompiledScripts(int contextGroupId, std::vector<V8DebuggerParsedScript>&);
     void debuggerAgentEnabled();
     void debuggerAgentDisabled();
 
     bool isPaused() override;
     v8::Local<v8::Context> pausedContext() { return m_pausedContext; }
 
     v8::MaybeLocal<v8::Value> functionScopes(v8::Local<v8::Function>);
     v8::Local<v8::Value> generatorObjectDetails(v8::Local<v8::Object>&);
     v8::Local<v8::Value> collectionEntries(v8::Local<v8::Object>&);
 
@@ skipping 40 matching lines @@
     static void breakProgramCallback(const v8::FunctionCallbackInfo<v8::Value>&);
     void handleProgramBreak(v8::Local<v8::Context> pausedContext, v8::Local<v8::Object> executionState, v8::Local<v8::Value> exception, v8::Local<v8::Array> hitBreakpoints, bool isPromiseRejection = false);
     static void v8DebugEventCallback(const v8::Debug::EventDetails&);
     v8::Local<v8::Value> callInternalGetterFunction(v8::Local<v8::Object>, const char* functionName);
     void handleV8DebugEvent(const v8::Debug::EventDetails&);
 
     v8::Local<v8::String> v8InternalizedString(const char*) const;
 
     void handleV8AsyncTaskEvent(V8DebuggerAgentImpl*, v8::Local<v8::Context>, v8::Local<v8::Object> executionState, v8::Local<v8::Object> eventData);
 
+    using ContextsByGroupMap = protocol::HashMap<int, std::unique_ptr<ContextByIdMap>>;
+
+    bool isContextInGroup(int groupId, int contextId) const

[dgozman, 2016/06/24 17:01:13]

Please move implementation to cpp.

[eostroukhov-old, 2016/06/24 22:24:26]

Done.

+    {
+        ContextsByGroupMap::const_iterator iter = m_contexts.find(groupId);
+        return iter != m_contexts.cend()
+            && iter->second->find(contextId) != iter->second->cend();
+    }
+
     v8::Isolate* m_isolate;
     V8DebuggerClient* m_client;
-    using ContextsByGroupMap = protocol::HashMap<int, std::unique_ptr<ContextByIdMap>>;
     ContextsByGroupMap m_contexts;
     using SessionMap = protocol::HashMap<int, V8InspectorSessionImpl*>;
     SessionMap m_sessions;
     int m_enabledAgentsCount;
     bool m_breakpointsActivated;
     v8::Global<v8::Object> m_debuggerScript;
     v8::Global<v8::Context> m_debuggerContext;
     v8::Local<v8::Object> m_executionState;
     v8::Local<v8::Context> m_pausedContext;
     bool m_runningNestedMessageLoop;
     v8::Global<v8::Context> m_regexContext;
 };
 
 } // namespace blink
 
 
 #endif // V8DebuggerImpl_h