Title: [128287] trunk/Source/WebCore
- Revision
- 128287
- Author
- [email protected]
- Date
- 2012-09-12 03:15:53 -0700 (Wed, 12 Sep 2012)
Log Message
Web Inspector: InspectorBackend.loadFromJSONIfNeeded should take the JSON url as argument
https://bugs.webkit.org/show_bug.cgi?id=96472
Patch by Vivek Galatage <[email protected]> on 2012-09-12
Reviewed by Yury Semikhatsky.
The method loadFromJSONIfNeeded need to take the jsonUrl as argument
as this will be called from the Inspector Protocol Test Harness
residing in a different location.
No new tests as code refactoring done.
* inspector/front-end/InspectorBackend.js:
(InspectorBackendClass.prototype.loadFromJSONIfNeeded):
* inspector/front-end/inspector.js:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (128286 => 128287)
--- trunk/Source/WebCore/ChangeLog 2012-09-12 09:58:42 UTC (rev 128286)
+++ trunk/Source/WebCore/ChangeLog 2012-09-12 10:15:53 UTC (rev 128287)
@@ -1,3 +1,20 @@
+2012-09-12 Vivek Galatage <[email protected]>
+
+ Web Inspector: InspectorBackend.loadFromJSONIfNeeded should take the JSON url as argument
+ https://bugs.webkit.org/show_bug.cgi?id=96472
+
+ Reviewed by Yury Semikhatsky.
+
+ The method loadFromJSONIfNeeded need to take the jsonUrl as argument
+ as this will be called from the Inspector Protocol Test Harness
+ residing in a different location.
+
+ No new tests as code refactoring done.
+
+ * inspector/front-end/InspectorBackend.js:
+ (InspectorBackendClass.prototype.loadFromJSONIfNeeded):
+ * inspector/front-end/inspector.js:
+
2012-09-12 Vsevolod Vlasov <[email protected]>
Web Inspector: XMLHttpRequest instrumentation methods used by timeline should have better names.
Modified: trunk/Source/WebCore/inspector/front-end/InspectorBackend.js (128286 => 128287)
--- trunk/Source/WebCore/inspector/front-end/InspectorBackend.js 2012-09-12 09:58:42 UTC (rev 128286)
+++ trunk/Source/WebCore/inspector/front-end/InspectorBackend.js 2012-09-12 10:15:53 UTC (rev 128287)
@@ -256,13 +256,13 @@
}
},
- loadFromJSONIfNeeded: function()
+ loadFromJSONIfNeeded: function(jsonUrl)
{
if (this._initialized)
return;
var xhr = new XMLHttpRequest();
- xhr.open("GET", "../Inspector.json", false);
+ xhr.open("GET", jsonUrl, false);
xhr.send(null);
var schema = JSON.parse(xhr.responseText);
Modified: trunk/Source/WebCore/inspector/front-end/inspector.js (128286 => 128287)
--- trunk/Source/WebCore/inspector/front-end/inspector.js 2012-09-12 09:58:42 UTC (rev 128286)
+++ trunk/Source/WebCore/inspector/front-end/inspector.js 2012-09-12 10:15:53 UTC (rev 128287)
@@ -406,7 +406,7 @@
WebInspector.loaded = function()
{
- InspectorBackend.loadFromJSONIfNeeded();
+ InspectorBackend.loadFromJSONIfNeeded("../Inspector.json");
if (WebInspector.WorkerManager.isDedicatedWorkerFrontend()) {
// Do not create socket for the worker front-end.
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
