Chromium Code Reviews| Index: third_party/WebKit/Source/devtools/front_end/sdk/RemoteObject.js |
| diff --git a/third_party/WebKit/Source/devtools/front_end/sdk/RemoteObject.js b/third_party/WebKit/Source/devtools/front_end/sdk/RemoteObject.js |
| index bba2c6e5f6d1dfe3da730ee0fc25a806ba2bb48f..436d72e243060fae28b64f5e131c55c7b6cec347 100644 |
| --- a/third_party/WebKit/Source/devtools/front_end/sdk/RemoteObject.js |
| +++ b/third_party/WebKit/Source/devtools/front_end/sdk/RemoteObject.js |
| @@ -978,13 +978,25 @@ WebInspector.RemoteObject.loadFromObjectPerProto = function(object, callback) |
| if (--resultCounter) |
| return; |
| if (savedOwnProperties && savedAccessorProperties) { |
| - var combinedList = savedAccessorProperties.slice(0); |
| + var propertiesMap = new Map(); |
| + var propertySymbols = []; |
| + for (var i = 0; i < savedAccessorProperties.length; i++) { |
| + var property = savedAccessorProperties[i]; |
| + if (property.symbol) |
| + propertySymbols.push(property); |
| + else |
| + propertiesMap.set(property.name, property); |
| + } |
| for (var i = 0; i < savedOwnProperties.length; i++) { |
| var property = savedOwnProperties[i]; |
| - if (!property.isAccessorProperty()) |
| - combinedList.push(property); |
| + if (!property.isAccessorProperty()) { |
|
lushnikov
2016/05/02 18:38:20
if (property.isAccessorProperty())
continue;
allada
2016/05/02 19:06:13
Done.
|
| + if (property.symbol) |
| + propertySymbols.push(property); |
| + else |
| + propertiesMap.set(property.name, property); |
| + } |
| } |
| - return callback(combinedList, savedInternalProperties ? savedInternalProperties : null); |
| + return callback(propertySymbols.concat(propertiesMap.valuesArray()), savedInternalProperties ? savedInternalProperties : null); |
|
lushnikov
2016/05/02 18:38:19
will this display symbols in the very beginning of
allada
2016/05/02 19:06:13
Done. This list gets sorted later anyway and We al
|
| } else { |
| callback(null, null); |
| } |