[DevTools] Move collectionEntries to internalProperties in protocol

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

 /*
  * Copyright (c) 2010-2011 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 19 matching lines @@
 
 #include "platform/v8_inspector/V8DebuggerImpl.h"
 
 #include "platform/inspector_protocol/Values.h"
 #include "platform/v8_inspector/Atomics.h"
 #include "platform/v8_inspector/DebuggerScript.h"
 #include "platform/v8_inspector/InspectedContext.h"
 #include "platform/v8_inspector/ScriptBreakpoint.h"
 #include "platform/v8_inspector/V8Compat.h"
 #include "platform/v8_inspector/V8DebuggerAgentImpl.h"
+#include "platform/v8_inspector/V8InjectedScriptHost.h"
 #include "platform/v8_inspector/V8InspectorSessionImpl.h"
 #include "platform/v8_inspector/V8RuntimeAgentImpl.h"
 #include "platform/v8_inspector/V8StackTraceImpl.h"
 #include "platform/v8_inspector/V8StringUtil.h"
 #include "platform/v8_inspector/public/V8DebuggerClient.h"
 #include <v8-profiler.h>
 
 namespace blink {
 
 namespace {
@@ skipping 607 matching lines @@
 v8::MaybeLocal<v8::Value> V8DebuggerImpl::functionScopes(v8::Local<v8::Function> function)
 {
     if (!enabled()) {
         NOTREACHED();
         return v8::Local<v8::Value>::New(m_isolate, v8::Undefined(m_isolate));
     }
     v8::Local<v8::Value> argv[] = { function };
     return callDebuggerMethod("getFunctionScopes", 1, argv);
 }
 
+v8::MaybeLocal<v8::Array> V8DebuggerImpl::internalProperties(v8::Local<v8::Context> context, v8::Local<v8::Value> value)
+{
+    v8::Local<v8::Array> properties;
+    if (!v8::Debug::GetInternalProperties(m_isolate, value).ToLocal(&properties))
+        return v8::MaybeLocal<v8::Array>();
+    if (!enabled())
+        return properties;
+    if (value->IsMap() || value->IsWeakMap() || value->IsSet() || value->IsWeakSet() || value->IsSetIterator() || value->IsMapIterator()) {

[dgozman, 2016/06/28 18:58:09]

Let's move if body into collectionEntries.

[kozy, 2016/06/28 20:55:46]

Done.

+        v8::Local<v8::Value> entriesArray = collectionEntries(v8::Local<v8::Object>::Cast(value));
+        if (entriesArray->IsArray()) {
+            v8::Local<v8::Array> entries = entriesArray.As<v8::Array>();
+            properties->Set(properties->Length(), v8InternalizedString("[[Entries]]"));
+            properties->Set(properties->Length(), entries);
+            for (size_t i = 0; i < entries->Length(); ++i) {
+                v8::Local<v8::Value> entry;
+                if (!entries->Get(context, i).ToLocal(&entry) || !entry->IsObject())
+                    continue;
+                if (!entry.As<v8::Object>()->SetPrivate(context, V8InjectedScriptHost::internalEntryPrivate(m_isolate), v8::Boolean::New(m_isolate, true)).FromMaybe(false))
+                    continue;
+            }
+        }
+    }
+    return properties;
+}
+
 v8::Local<v8::Value> V8DebuggerImpl::generatorObjectDetails(v8::Local<v8::Object>& object)
 {
     if (!enabled()) {
         NOTREACHED();
         return v8::Local<v8::Value>::New(m_isolate, v8::Undefined(m_isolate));
     }
     v8::Local<v8::Value> argv[] = { object };
     return callDebuggerMethod("getGeneratorObjectDetails", 1, argv).ToLocalChecked();
 }
 
-v8::Local<v8::Value> V8DebuggerImpl::collectionEntries(v8::Local<v8::Object>& object)
+v8::Local<v8::Value> V8DebuggerImpl::collectionEntries(v8::Local<v8::Object> object)
 {
     if (!enabled()) {
         NOTREACHED();
         return v8::Local<v8::Value>::New(m_isolate, v8::Undefined(m_isolate));
     }
     v8::Local<v8::Value> argv[] = { object };
     return callDebuggerMethod("getCollectionEntries", 1, argv).ToLocalChecked();
 }
 
 bool V8DebuggerImpl::isPaused()
@@ skipping 269 matching lines @@
         return nullptr;
     return m_contexts.get(contextGroupId);
 }
 
 V8InspectorSessionImpl* V8DebuggerImpl::sessionForContextGroup(int contextGroupId)
 {
     return contextGroupId ? m_sessions.get(contextGroupId) : nullptr;
 }
 
 } // namespace blink