Index: third_party/WebKit/Source/devtools/front_end/sources/JavaScriptSourceFrame.js |
diff --git a/third_party/WebKit/Source/devtools/front_end/sources/JavaScriptSourceFrame.js b/third_party/WebKit/Source/devtools/front_end/sources/JavaScriptSourceFrame.js |
index 817a396fae00ec8d1c7d98d71718d6874d500120..062da56500287bdfdd55ccd2576ff5f71c61f23b 100644 |
--- a/third_party/WebKit/Source/devtools/front_end/sources/JavaScriptSourceFrame.js |
+++ b/third_party/WebKit/Source/devtools/front_end/sources/JavaScriptSourceFrame.js |
@@ -81,7 +81,7 @@ Sources.JavaScriptSourceFrame = class extends Sources.UISourceCodeFrame { |
this._valueWidgets = new Map(); |
this.onBindingChanged(); |
Bindings.debuggerWorkspaceBinding.addEventListener( |
- Bindings.DebuggerWorkspaceBinding.Events.SourceMappingChanged, this._onSourceMappingChanged, this); |
+ Bindings.DebuggerWorkspaceBinding.Events.SourceMappingChanged, this._onSourceMappingChanged, this); |
} |
/** |
@@ -571,7 +571,7 @@ Sources.JavaScriptSourceFrame = class extends Sources.UISourceCodeFrame { |
var functionLocation = callFrame.functionLocation(); |
if (localScope && functionLocation) { |
Sources.SourceMapNamesResolver.resolveScopeInObject(localScope) |
- .getAllProperties(false, this._prepareScopeVariables.bind(this, callFrame)); |
+ .getAllProperties(false, false, this._prepareScopeVariables.bind(this, callFrame)); |
} |
if (this._clearValueWidgetsTimer) { |
@@ -689,10 +689,12 @@ Sources.JavaScriptSourceFrame = class extends Sources.UISourceCodeFrame { |
var value = valuesMap.get(name); |
var propertyCount = value.preview ? value.preview.properties.length : 0; |
var entryCount = value.preview && value.preview.entries ? value.preview.entries.length : 0; |
- if (value.preview && propertyCount + entryCount < 10) |
- formatter.appendObjectPreview(nameValuePair, value.preview); |
- else |
- nameValuePair.appendChild(Components.ObjectPropertiesSection.createValueElement(value, false)); |
+ if (value.preview && propertyCount + entryCount < 10) { |
+ formatter.appendObjectPreview(nameValuePair, value.preview, false /* isEntry */); |
+ } else { |
+ nameValuePair.appendChild(Components.ObjectPropertiesSection.createValueElement( |
+ value, false /* wasThrown */, false /* showPreview */)); |
+ } |
++renderedNameCount; |
} |
@@ -1294,7 +1296,7 @@ Sources.JavaScriptSourceFrame = class extends Sources.UISourceCodeFrame { |
*/ |
dispose() { |
Bindings.debuggerWorkspaceBinding.removeEventListener( |
- Bindings.DebuggerWorkspaceBinding.Events.SourceMappingChanged, this._onSourceMappingChanged, this); |
+ Bindings.DebuggerWorkspaceBinding.Events.SourceMappingChanged, this._onSourceMappingChanged, this); |
this._breakpointManager.removeEventListener( |
Bindings.BreakpointManager.Events.BreakpointAdded, this._breakpointAdded, this); |
this._breakpointManager.removeEventListener( |