96472 2012-09-11 23:08:39 -0700 Web Inspector: InspectorBackend.loadFromJSONIfNeeded should take the JSON url as argument 2012-09-12 03:15:35 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 90675 0 vivekgalatage vivekgalatage apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy webkit.review.bot yurys oldest_to_newest 717941 0 vivekgalatage 2012-09-11 23:08:39 -0700 The method loadFromJSONIfNeeded of InspectorBackend in InspectorBackend.js should take the JSON url as input. This is needed for the Inspector Protocol test harness to load as the test will be residing in a different location. Patch to follow. 717944 1 163523 vivekgalatage 2012-09-11 23:13:33 -0700 Created attachment 163523 Patch 718002 2 163523 yurys 2012-09-12 00:39:26 -0700 Comment on attachment 163523 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=163523&action=review > Source/WebCore/inspector/front-end/inspector.js:409 > + var jsonUrl = location.href.slice(0, location.href.lastIndexOf("/")) + "/../Inspector.json"; It will fail on URL like this: http://localhost/inspector/front-end/inspector.html?ws=localhost:9222/devtools/page/2_1 Please test this with the instructions described here: https://groups.google.com/d/msg/google-chrome-developer-tools/L1nemsmtnJI/ndP4cYkTy-sJ 718009 3 yurys 2012-09-12 00:43:59 -0700 Bt(In reply to comment #2) > (From update of attachment 163523 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=163523&action=review > > > Source/WebCore/inspector/front-end/inspector.js:409 > > + var jsonUrl = location.href.slice(0, location.href.lastIndexOf("/")) + "/../Inspector.json"; > > It will fail on URL like this: http://localhost/inspector/front-end/inspector.html?ws=localhost:9222/devtools/page/2_1 > > Please test this with the instructions described here: https://groups.google.com/d/msg/google-chrome-developer-tools/L1nemsmtnJI/ndP4cYkTy-sJ btw, what was wrong with '../Inspector.json' ? 718036 4 vivekgalatage 2012-09-12 01:20:10 -0700 (In reply to comment #3) > btw, what was wrong with '../Inspector.json' ? The call to above location is being made from inspector.js which is included in inspector.html in Source/WebCore/inspector/front-end. So this will work if its getting called from the inspector.html. But in case of the testing harness, the files protocol-test.html and protocol-test.js will be placed somewhere e.g. LayoutTests/http/tests/inspector-protocol folder. So when the call to loadFromJSONIfNeeded is being made from these places, the system will not find the path to the ../Inspector.json. Hence the call site should give the json location relative to where its placed. 718044 5 vivekgalatage 2012-09-12 01:29:20 -0700 (In reply to comment #2) > (From update of attachment 163523 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=163523&action=review > > > Source/WebCore/inspector/front-end/inspector.js:409 > > + var jsonUrl = location.href.slice(0, location.href.lastIndexOf("/")) + "/../Inspector.json"; > > It will fail on URL like this: http://localhost/inspector/front-end/inspector.html?ws=localhost:9222/devtools/page/2_1 > > Please test this with the instructions described here: https://groups.google.com/d/msg/google-chrome-developer-tools/L1nemsmtnJI/ndP4cYkTy-sJ Or even simple we can just pass "../Inspector.json" as url is already done i.e. var jsonUrl = "../Inspector.json"; InspectorBackend.loadFromJSONIfNeeded(jsonUrl); Without any change with current implementation. 718062 6 yurys 2012-09-12 01:48:17 -0700 (In reply to comment #4) > (In reply to comment #3) > > btw, what was wrong with '../Inspector.json' ? > > The call to above location is being made from inspector.js which is included in inspector.html in Source/WebCore/inspector/front-end. So this will work if its getting called from the inspector.html. > > But in case of the testing harness, the files protocol-test.html and protocol-test.js will be placed somewhere e.g. LayoutTests/http/tests/inspector-protocol folder. So when the call to loadFromJSONIfNeeded is being made from these places, the system will not find the path to the ../Inspector.json. Hence the call site should give the json location relative to where its placed. Exactly. But it will only affect the new code. Current implementation can keep using relative URL. (In reply to comment #5) > (In reply to comment #2) > > (From update of attachment 163523 [details] [details]) > > View in context: https://bugs.webkit.org/attachment.cgi?id=163523&action=review > > > > > Source/WebCore/inspector/front-end/inspector.js:409 > > > + var jsonUrl = location.href.slice(0, location.href.lastIndexOf("/")) + "/../Inspector.json"; > > > > It will fail on URL like this: http://localhost/inspector/front-end/inspector.html?ws=localhost:9222/devtools/page/2_1 > > > > Please test this with the instructions described here: https://groups.google.com/d/msg/google-chrome-developer-tools/L1nemsmtnJI/ndP4cYkTy-sJ > > Or even simple we can just pass "../Inspector.json" as url is already done i.e. > > var jsonUrl = "../Inspector.json"; > InspectorBackend.loadFromJSONIfNeeded(jsonUrl); > > Without any change with current implementation. Exactly. 718073 7 163551 vivekgalatage 2012-09-12 01:56:34 -0700 Created attachment 163551 Patch 718136 8 163551 webkit.review.bot 2012-09-12 03:15:31 -0700 Comment on attachment 163551 Patch Clearing flags on attachment: 163551 Committed r128287: <http://trac.webkit.org/changeset/128287> 718137 9 webkit.review.bot 2012-09-12 03:15:35 -0700 All reviewed patches have been landed. Closing bug. 163523 2012-09-11 23:13:33 -0700 2012-09-12 01:56:29 -0700 Patch bug-96472-20120912114252.patch text/plain 2378 vivekgalatage SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEyODI2NCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDEyLTA5LTExICBWaXZlayBH YWxhdGFnZSAgPHZpdmVrZ2FsYXRhZ2VAZ21haWwuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IEluc3BlY3RvckJhY2tlbmQubG9hZEZyb21KU09OSWZOZWVkZWQgc2hvdWxkIHRha2UgdGhl IEpTT04gdXJsIGFzIGFyZ3VtZW50CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD05NjQ3MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFRoZSBtZXRob2QgbG9hZEZyb21KU09OSWZOZWVkZWQgbmVlZCB0byB0YWtl IHRoZSBqc29uVXJsIGFzIGFyZ3VtZW50CisgICAgICAgIGFzIHRoaXMgd2lsbCBiZSBjYWxsZWQg ZnJvbSB0aGUgSW5zcGVjdG9yIFByb3RvY29sIFRlc3QgSGFybmVzcworICAgICAgICByZXNpZGlu ZyBpbiBhIGRpZmZlcmVudCBsb2NhdGlvbi4KKworICAgICAgICBObyBuZXcgdGVzdHMgYXMgY29k ZSByZWZhY3RvcmluZy4KKworICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvSW5zcGVjdG9y QmFja2VuZC5qczoKKyAgICAgICAgKEluc3BlY3RvckJhY2tlbmRDbGFzcy5wcm90b3R5cGUubG9h ZEZyb21KU09OSWZOZWVkZWQpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVj dG9yLmpzOgorCiAyMDEyLTA5LTExICBSeXVhbiBDaG9pICA8cnl1YW4uY2hvaUBzYW1zdW5nLmNv bT4KIAogICAgICAgICBbQ01BS0VdIFN1cHBseSBmZWF0dXJlIGRlZmluZXMgdG8gQ29kZUdlbmVy YXRvclRlc3RSdW5uZXIuCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L0luc3BlY3RvckJhY2tlbmQuanMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9JbnNwZWN0b3JCYWNrZW5kLmpzCShyZXZpc2lvbiAxMjc4MTgpCisrKyBT b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0luc3BlY3RvckJhY2tlbmQuanMJKHdv cmtpbmcgY29weSkKQEAgLTI1NiwxMyArMjU2LDEzIEBAIEluc3BlY3RvckJhY2tlbmRDbGFzcy5w cm90b3R5cGUgPSB7CiAgICAgICAgIH0KICAgICB9LAogCi0gICAgbG9hZEZyb21KU09OSWZOZWVk ZWQ6IGZ1bmN0aW9uKCkKKyAgICBsb2FkRnJvbUpTT05JZk5lZWRlZDogZnVuY3Rpb24oanNvblVy bCkKICAgICB7CiAgICAgICAgIGlmICh0aGlzLl9pbml0aWFsaXplZCkKICAgICAgICAgICAgIHJl dHVybjsKIAogICAgICAgICB2YXIgeGhyID0gbmV3IFhNTEh0dHBSZXF1ZXN0KCk7Ci0gICAgICAg IHhoci5vcGVuKCJHRVQiLCAiLi4vSW5zcGVjdG9yLmpzb24iLCBmYWxzZSk7CisgICAgICAgIHho ci5vcGVuKCJHRVQiLCBqc29uVXJsLCBmYWxzZSk7CiAgICAgICAgIHhoci5zZW5kKG51bGwpOwog ICAgIAogICAgICAgICB2YXIgc2NoZW1hID0gSlNPTi5wYXJzZSh4aHIucmVzcG9uc2VUZXh0KTsK SW5kZXg6IFNvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9y LmpzCShyZXZpc2lvbiAxMjc4MTgpCisrKyBTb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL2luc3BlY3Rvci5qcwkod29ya2luZyBjb3B5KQpAQCAtNDA2LDcgKzQwNiw4IEBAIFdlYklu c3BlY3Rvci5FdmVudHMgPSB7CiAKIFdlYkluc3BlY3Rvci5sb2FkZWQgPSBmdW5jdGlvbigpCiB7 Ci0gICAgSW5zcGVjdG9yQmFja2VuZC5sb2FkRnJvbUpTT05JZk5lZWRlZCgpOworICAgIHZhciBq c29uVXJsID0gbG9jYXRpb24uaHJlZi5zbGljZSgwLCBsb2NhdGlvbi5ocmVmLmxhc3RJbmRleE9m KCIvIikpICsgIi8uLi9JbnNwZWN0b3IuanNvbiI7CisgICAgSW5zcGVjdG9yQmFja2VuZC5sb2Fk RnJvbUpTT05JZk5lZWRlZChqc29uVXJsKTsKIAogICAgIGlmIChXZWJJbnNwZWN0b3IuV29ya2Vy TWFuYWdlci5pc0RlZGljYXRlZFdvcmtlckZyb250ZW5kKCkpIHsKICAgICAgICAgLy8gRG8gbm90 IGNyZWF0ZSBzb2NrZXQgZm9yIHRoZSB3b3JrZXIgZnJvbnQtZW5kLgo= 163551 2012-09-12 01:56:34 -0700 2012-09-12 03:15:31 -0700 Patch bug-96472-20120912142552.patch text/plain 2276 vivekgalatage SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEyODI3NikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDEyLTA5LTEyICBWaXZlayBH YWxhdGFnZSAgPHZpdmVrZ2FsYXRhZ2VAZ21haWwuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IEluc3BlY3RvckJhY2tlbmQubG9hZEZyb21KU09OSWZOZWVkZWQgc2hvdWxkIHRha2UgdGhl IEpTT04gdXJsIGFzIGFyZ3VtZW50CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD05NjQ3MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFRoZSBtZXRob2QgbG9hZEZyb21KU09OSWZOZWVkZWQgbmVlZCB0byB0YWtl IHRoZSBqc29uVXJsIGFzIGFyZ3VtZW50CisgICAgICAgIGFzIHRoaXMgd2lsbCBiZSBjYWxsZWQg ZnJvbSB0aGUgSW5zcGVjdG9yIFByb3RvY29sIFRlc3QgSGFybmVzcworICAgICAgICByZXNpZGlu ZyBpbiBhIGRpZmZlcmVudCBsb2NhdGlvbi4KKworICAgICAgICBObyBuZXcgdGVzdHMgYXMgY29k ZSByZWZhY3RvcmluZyBkb25lLgorCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9JbnNw ZWN0b3JCYWNrZW5kLmpzOgorICAgICAgICAoSW5zcGVjdG9yQmFja2VuZENsYXNzLnByb3RvdHlw ZS5sb2FkRnJvbUpTT05JZk5lZWRlZCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9p bnNwZWN0b3IuanM6CisKIDIwMTItMDktMTIgIEtlbm5ldGggUm9oZGUgQ2hyaXN0aWFuc2VuICA8 a2VubmV0aEB3ZWJraXQub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQgRUZMIGJ1aWxkIGZpeC4K SW5kZXg6IFNvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSW5zcGVjdG9yQmFja2Vu ZC5qcwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0lu c3BlY3RvckJhY2tlbmQuanMJKHJldmlzaW9uIDEyODI2OSkKKysrIFNvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvSW5zcGVjdG9yQmFja2VuZC5qcwkod29ya2luZyBjb3B5KQpAQCAt MjU2LDEzICsyNTYsMTMgQEAgSW5zcGVjdG9yQmFja2VuZENsYXNzLnByb3RvdHlwZSA9IHsKICAg ICAgICAgfQogICAgIH0sCiAKLSAgICBsb2FkRnJvbUpTT05JZk5lZWRlZDogZnVuY3Rpb24oKQor ICAgIGxvYWRGcm9tSlNPTklmTmVlZGVkOiBmdW5jdGlvbihqc29uVXJsKQogICAgIHsKICAgICAg ICAgaWYgKHRoaXMuX2luaXRpYWxpemVkKQogICAgICAgICAgICAgcmV0dXJuOwogCiAgICAgICAg IHZhciB4aHIgPSBuZXcgWE1MSHR0cFJlcXVlc3QoKTsKLSAgICAgICAgeGhyLm9wZW4oIkdFVCIs ICIuLi9JbnNwZWN0b3IuanNvbiIsIGZhbHNlKTsKKyAgICAgICAgeGhyLm9wZW4oIkdFVCIsIGpz b25VcmwsIGZhbHNlKTsKICAgICAgICAgeGhyLnNlbmQobnVsbCk7CiAgICAgCiAgICAgICAgIHZh ciBzY2hlbWEgPSBKU09OLnBhcnNlKHhoci5yZXNwb25zZVRleHQpOwpJbmRleDogU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanMKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanMJKHJldmlzaW9uIDEy ODI2OSkKKysrIFNvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpz CSh3b3JraW5nIGNvcHkpCkBAIC00MDYsNyArNDA2LDcgQEAgV2ViSW5zcGVjdG9yLkV2ZW50cyA9 IHsKIAogV2ViSW5zcGVjdG9yLmxvYWRlZCA9IGZ1bmN0aW9uKCkKIHsKLSAgICBJbnNwZWN0b3JC YWNrZW5kLmxvYWRGcm9tSlNPTklmTmVlZGVkKCk7CisgICAgSW5zcGVjdG9yQmFja2VuZC5sb2Fk RnJvbUpTT05JZk5lZWRlZCgiLi4vSW5zcGVjdG9yLmpzb24iKTsKIAogICAgIGlmIChXZWJJbnNw ZWN0b3IuV29ya2VyTWFuYWdlci5pc0RlZGljYXRlZFdvcmtlckZyb250ZW5kKCkpIHsKICAgICAg ICAgLy8gRG8gbm90IGNyZWF0ZSBzb2NrZXQgZm9yIHRoZSB3b3JrZXIgZnJvbnQtZW5kLgo=