Title: [102439] branches/chromium/963/Source/WebCore
- Revision
- 102439
- Author
- yu...@chromium.org
- Date
- 2011-12-09 00:12:50 -0800 (Fri, 09 Dec 2011)
Log Message
Merge 102140 - [Chromium] Web Inspector: getFunctionLocation should return scriptId as String not as int
https://bugs.webkit.org/show_bug.cgi?id=73892
Reviewed by Pavel Feldman.
* bindings/v8/custom/V8InjectedScriptHostCustom.cpp:
(WebCore::V8InjectedScriptHost::functionLocationCallback): scriptId should be a string not a number
* inspector/Inspector.json: removed unused parameter
TBR=pfeld...@chromium.org
Review URL: http://codereview.chromium.org/8872059
Modified Paths
Diff
Modified: branches/chromium/963/Source/WebCore/ChangeLog (102438 => 102439)
--- branches/chromium/963/Source/WebCore/ChangeLog 2011-12-09 07:26:47 UTC (rev 102438)
+++ branches/chromium/963/Source/WebCore/ChangeLog 2011-12-09 08:12:50 UTC (rev 102439)
@@ -1,3 +1,14 @@
+2011-12-06 Yury Semikhatsky <yu...@chromium.org>
+
+ [Chromium] Web Inspector: getFunctionLocation should return scriptId as String not as int
+ https://bugs.webkit.org/show_bug.cgi?id=73892
+
+ Reviewed by Pavel Feldman.
+
+ * bindings/v8/custom/V8InjectedScriptHostCustom.cpp:
+ (WebCore::V8InjectedScriptHost::functionLocationCallback): scriptId should be a string not a number
+ * inspector/Inspector.json: removed unused parameter
+
2011-12-07 Dmitry Lomov <dslo...@google.com>
https://bugs.webkit.org/show_bug.cgi?id=74038
Modified: branches/chromium/963/Source/WebCore/bindings/v8/custom/V8InjectedScriptHostCustom.cpp (102438 => 102439)
--- branches/chromium/963/Source/WebCore/bindings/v8/custom/V8InjectedScriptHostCustom.cpp 2011-12-09 07:26:47 UTC (rev 102438)
+++ branches/chromium/963/Source/WebCore/bindings/v8/custom/V8InjectedScriptHostCustom.cpp 2011-12-09 08:12:50 UTC (rev 102439)
@@ -167,7 +167,7 @@
v8::Local<v8::Object> result = v8::Object::New();
result->Set(v8::String::New("lineNumber"), v8::Integer::New(lineNumber));
result->Set(v8::String::New("columnNumber"), v8::Integer::New(columnNumber));
- result->Set(v8::String::New("scriptId"), function->GetScriptId());
+ result->Set(v8::String::New("scriptId"), function->GetScriptId()->ToString());
return result;
}
Modified: branches/chromium/963/Source/WebCore/inspector/Inspector.json (102438 => 102439)
--- branches/chromium/963/Source/WebCore/inspector/Inspector.json 2011-12-09 07:26:47 UTC (rev 102438)
+++ branches/chromium/963/Source/WebCore/inspector/Inspector.json 2011-12-09 08:12:50 UTC (rev 102439)
@@ -296,8 +296,7 @@
{ "name": "className", "type": "string", "optional": true, "description": "Object class (constructor) name. Specified for <code>object</code> type values only." },
{ "name": "value", "type": "any", "optional": true, "description": "Remote object value (in case of primitive values or JSON values if it was requested)." },
{ "name": "description", "type": "string", "optional": true, "description": "String representation of the object." },
- { "name": "objectId", "$ref": "RemoteObjectId", "optional": true, "description": "Unique object identifier (for non-primitive values)." },
- { "name": "functionLocation", "$ref": "Debugger.Location", "optional": true, "description": "Function location within owning script." }
+ { "name": "objectId", "$ref": "RemoteObjectId", "optional": true, "description": "Unique object identifier (for non-primitive values)." }
]
},
{
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
