140570 2015-01-16 15:11:14 -0800 Web Inspector: Remove unused WebInspector.LocalJSONObject 2015-01-16 16:10:22 -0800 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED DoNotImportToRadar P2 Normal --- 1 joepeck joepeck commit-queue graouts joepeck jonowells mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1061986 0 joepeck 2015-01-16 15:11:14 -0800 * SUMMARY Remove unused WebInspector.LocalJSONObject. This is meant to be a way to create a WebInspector.RemoteObject from a local object, but it is unused and could be stale or out of date. * NOTES - Blink still uses these objects for Map entries, so we might want to re-introduce this kind of class later, or implement differently. Seems it could just as easily use RemoteObjects though. 1061988 1 244808 joepeck 2015-01-16 15:12:38 -0800 Created attachment 244808 [PATCH] Proposed Fix 1062021 2 244808 commit-queue 2015-01-16 16:10:16 -0800 Comment on attachment 244808 [PATCH] Proposed Fix Clearing flags on attachment: 244808 Committed r178610: <http://trac.webkit.org/changeset/178610> 1062022 3 commit-queue 2015-01-16 16:10:22 -0800 All reviewed patches have been landed. Closing bug. 244808 2015-01-16 15:12:38 -0800 2015-01-16 16:10:16 -0800 [PATCH] Proposed Fix part-1.patch text/plain 5871 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDZiZWEyYTguLmRmNjgxNjkgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDE1LTAxLTE2ICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogUmVtb3Zl IHVudXNlZCBXZWJJbnNwZWN0b3IuTG9jYWxKU09OT2JqZWN0CisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDA1NzAKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvUHJvdG9jb2wvUmVt b3RlT2JqZWN0LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlbW90ZU9iamVjdC5mcm9tTG9j YWxPYmplY3QpOiBEZWxldGVkLgorICAgICAgICAoV2ViSW5zcGVjdG9yLkxvY2FsSlNPTk9iamVj dCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJJbnNwZWN0b3IuTG9jYWxKU09OT2JqZWN0LnByb3Rv dHlwZS5nZXQgZGVzY3JpcHRpb24uc3dpdGNoLmNhc2Uuc3RyaW5nX2FwcGVhcmVkX2hlcmUpOiBE ZWxldGVkLgorICAgICAgICAoV2ViSW5zcGVjdG9yLkxvY2FsSlNPTk9iamVjdC5wcm90b3R5cGUu Z2V0IGRlc2NyaXB0aW9uLnN3aXRjaC5kZWZhdWx0KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYklu c3BlY3Rvci5Mb2NhbEpTT05PYmplY3QucHJvdG90eXBlLmdldCBkZXNjcmlwdGlvbik6IERlbGV0 ZWQuCisgICAgICAgIChXZWJJbnNwZWN0b3IuTG9jYWxKU09OT2JqZWN0LnByb3RvdHlwZS5fY29u Y2F0ZW5hdGUpOiBEZWxldGVkLgorICAgICAgICAoV2ViSW5zcGVjdG9yLkxvY2FsSlNPTk9iamVj dC5wcm90b3R5cGUuZ2V0IHR5cGUpOiBEZWxldGVkLgorICAgICAgICAoV2ViSW5zcGVjdG9yLkxv Y2FsSlNPTk9iamVjdC5wcm90b3R5cGUuZ2V0IHN1YnR5cGUpOiBEZWxldGVkLgorICAgICAgICAo V2ViSW5zcGVjdG9yLkxvY2FsSlNPTk9iamVjdC5wcm90b3R5cGUuZ2V0IGhhc0NoaWxkcmVuKTog RGVsZXRlZC4KKyAgICAgICAgKFdlYkluc3BlY3Rvci5Mb2NhbEpTT05PYmplY3QucHJvdG90eXBl LmdldE93blByb3BlcnRpZXMpOiBEZWxldGVkLgorICAgICAgICAoV2ViSW5zcGVjdG9yLkxvY2Fs SlNPTk9iamVjdC5wcm90b3R5cGUuZ2V0QWxsUHJvcGVydGllcyk6IERlbGV0ZWQuCisgICAgICAg IChXZWJJbnNwZWN0b3IuTG9jYWxKU09OT2JqZWN0LnByb3RvdHlwZS5fY2hpbGRyZW4uYnVpbGRQ cm9wZXJ0eSk6IERlbGV0ZWQuCisgICAgICAgIChXZWJJbnNwZWN0b3IuTG9jYWxKU09OT2JqZWN0 LnByb3RvdHlwZS5fY2hpbGRyZW4pOiBEZWxldGVkLgorICAgICAgICAoV2ViSW5zcGVjdG9yLkxv Y2FsSlNPTk9iamVjdC5wcm90b3R5cGUuaXNFcnJvcik6IERlbGV0ZWQuCisKIDIwMTUtMDEtMTUg IEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5z cGVjdG9yOiBVbmNhdWdodCBleGNlcHRpb25zLCBhdHRlbXB0aW5nIHRvIGRpc3BhdGNoIHVuaW1w bGVtZW50ZWQgTmV0d29yayBXZWJTb2NrZXQgbWV0aG9kcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvUHJvdG9jb2wvUmVtb3RlT2JqZWN0LmpzIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvUHJvdG9jb2wvUmVtb3RlT2JqZWN0Lmpz CmluZGV4IGU1Mzg5ZTMuLmZjZDRmYjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1Byb3RvY29sL1JlbW90ZU9iamVjdC5qcworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Qcm90b2NvbC9SZW1vdGVPYmplY3QuanMKQEAgLTUx LDExICs1MSw2IEBAIFdlYkluc3BlY3Rvci5SZW1vdGVPYmplY3QuZnJvbVByaW1pdGl2ZVZhbHVl ID0gZnVuY3Rpb24odmFsdWUpCiAgICAgcmV0dXJuIG5ldyBXZWJJbnNwZWN0b3IuUmVtb3RlT2Jq ZWN0KHVuZGVmaW5lZCwgdHlwZW9mIHZhbHVlLCB1bmRlZmluZWQsIHZhbHVlKTsKIH07CiAKLVdl Ykluc3BlY3Rvci5SZW1vdGVPYmplY3QuZnJvbUxvY2FsT2JqZWN0ID0gZnVuY3Rpb24odmFsdWUp Ci17Ci0gICAgcmV0dXJuIG5ldyBXZWJJbnNwZWN0b3IuTG9jYWxKU09OT2JqZWN0KHZhbHVlKTsK LX07Ci0KIFdlYkluc3BlY3Rvci5SZW1vdGVPYmplY3QucmVzb2x2ZU5vZGUgPSBmdW5jdGlvbihu b2RlLCBvYmplY3RHcm91cCwgY2FsbGJhY2spCiB7CiAgICAgZnVuY3Rpb24gbXljYWxsYmFjayhl cnJvciwgb2JqZWN0KQpAQCAtMjUxLDExNiArMjQ2LDMgQEAgV2ViSW5zcGVjdG9yLlJlbW90ZU9i amVjdFByb3BlcnR5LmZyb21QcmltaXRpdmVWYWx1ZSA9IGZ1bmN0aW9uKG5hbWUsIHZhbHVlKQog ewogICAgIHJldHVybiBuZXcgV2ViSW5zcGVjdG9yLlJlbW90ZU9iamVjdFByb3BlcnR5KG5hbWUs IFdlYkluc3BlY3Rvci5SZW1vdGVPYmplY3QuZnJvbVByaW1pdGl2ZVZhbHVlKHZhbHVlKSk7CiB9 OwotCi0vLyBUaGUgYmVsb3cgaXMgYSB3cmFwcGVyIGFyb3VuZCBhIGxvY2FsIG9iamVjdCB0aGF0 IHByb3ZpZGVzIGFuIGludGVyZmFjZSBjb21hcHRpYmxlCi0vLyB3aXRoIFJlbW90ZU9iamVjdCwg dG8gYmUgdXNlZCBieSB0aGUgVUkgY29kZSAocHJpbWFyaWx5IE9iamVjdFByb3BlcnRpZXNTZWN0 aW9uKS4KLS8vIE5vdGUgdGhhdCBvbmx5IEpTT04tY29tcGxpYW50IG9iamVjdHMgYXJlIGN1cnJl bnRseSBzdXBwb3J0ZWQsIGFzIHRoZXJlJ3Mgbm8gcHJvdmlzaW9uCi0vLyBmb3IgdHJhdmVyc2lu ZyBwcm90b3R5cGVzLCBleHRyYWN0aW5nIGNsYXNzIG5hbWVzIHZpYSBjb25zdHVjdG9yLCBoYW5k bGluZyBwcm9wZXJ0aWVzCi0vLyBvciBmdW5jdGlvbnMuCi0KLVdlYkluc3BlY3Rvci5Mb2NhbEpT T05PYmplY3QgPSBmdW5jdGlvbih2YWx1ZSkKLXsKLSAgICB0aGlzLl92YWx1ZSA9IHZhbHVlOwot fTsKLQotV2ViSW5zcGVjdG9yLkxvY2FsSlNPTk9iamVjdC5wcm90b3R5cGUgPSB7Ci0gICAgZ2V0 IGRlc2NyaXB0aW9uKCkKLSAgICB7Ci0gICAgICAgIGlmICh0aGlzLl9jYWNoZWREZXNjcmlwdGlv bikKLSAgICAgICAgICAgIHJldHVybiB0aGlzLl9jYWNoZWREZXNjcmlwdGlvbjsKLQotICAgICAg ICBpZiAodGhpcy50eXBlID09PSAib2JqZWN0IikgewotICAgICAgICAgICAgc3dpdGNoICh0aGlz LnN1YnR5cGUpIHsKLSAgICAgICAgICAgIGNhc2UgImFycmF5IjoKLSAgICAgICAgICAgICAgICBm dW5jdGlvbiBmb3JtYXRBcnJheUl0ZW0ocHJvcGVydHkpCi0gICAgICAgICAgICAgICAgewotICAg ICAgICAgICAgICAgICAgICByZXR1cm4gcHJvcGVydHkudmFsdWUuZGVzY3JpcHRpb247Ci0gICAg ICAgICAgICAgICAgfQotICAgICAgICAgICAgICAgIHRoaXMuX2NhY2hlZERlc2NyaXB0aW9uID0g dGhpcy5fY29uY2F0ZW5hdGUoIlsiLCAiXSIsIGZvcm1hdEFycmF5SXRlbSk7Ci0gICAgICAgICAg ICAgICAgYnJlYWs7Ci0gICAgICAgICAgICBjYXNlICJudWxsIjoKLSAgICAgICAgICAgICAgICB0 aGlzLl9jYWNoZWREZXNjcmlwdGlvbiA9ICJudWxsIjsKLSAgICAgICAgICAgICAgICBicmVhazsK LSAgICAgICAgICAgIGRlZmF1bHQ6Ci0gICAgICAgICAgICAgICAgZnVuY3Rpb24gZm9ybWF0T2Jq ZWN0SXRlbShwcm9wZXJ0eSkKLSAgICAgICAgICAgICAgICB7Ci0gICAgICAgICAgICAgICAgICAg IHJldHVybiBwcm9wZXJ0eS5uYW1lICsgIjoiICsgcHJvcGVydHkudmFsdWUuZGVzY3JpcHRpb247 Ci0gICAgICAgICAgICAgICAgfQotICAgICAgICAgICAgICAgIHRoaXMuX2NhY2hlZERlc2NyaXB0 aW9uID0gdGhpcy5fY29uY2F0ZW5hdGUoInsiLCAifSIsIGZvcm1hdE9iamVjdEl0ZW0pOwotICAg ICAgICAgICAgfQotICAgICAgICB9IGVsc2UKLSAgICAgICAgICAgIHRoaXMuX2NhY2hlZERlc2Ny aXB0aW9uID0gU3RyaW5nKHRoaXMuX3ZhbHVlKTsKLQotICAgICAgICByZXR1cm4gdGhpcy5fY2Fj aGVkRGVzY3JpcHRpb247Ci0gICAgfSwKLQotICAgIF9jb25jYXRlbmF0ZTogZnVuY3Rpb24ocHJl Zml4LCBzdWZmaXgsIGZvcm1hdFByb3BlcnR5KQotICAgIHsKLSAgICAgICAgY29uc3QgcHJldmll d0NoYXJzID0gMTAwOwotCi0gICAgICAgIHZhciBidWZmZXIgPSBwcmVmaXg7Ci0gICAgICAgIHZh ciBjaGlsZHJlbiA9IHRoaXMuX2NoaWxkcmVuKCk7Ci0gICAgICAgIGZvciAodmFyIGkgPSAwOyBp IDwgY2hpbGRyZW4ubGVuZ3RoOyArK2kpIHsKLSAgICAgICAgICAgIHZhciBpdGVtRGVzY3JpcHRp b24gPSBmb3JtYXRQcm9wZXJ0eShjaGlsZHJlbltpXSk7Ci0gICAgICAgICAgICBpZiAoYnVmZmVy Lmxlbmd0aCArIGl0ZW1EZXNjcmlwdGlvbi5sZW5ndGggPiBwcmV2aWV3Q2hhcnMpIHsKLSAgICAg ICAgICAgICAgICBidWZmZXIgKz0gIixcdTIwMjYiOwotICAgICAgICAgICAgICAgIGJyZWFrOwot ICAgICAgICAgICAgfQotICAgICAgICAgICAgaWYgKGkpCi0gICAgICAgICAgICAgICAgYnVmZmVy ICs9ICIsICI7Ci0gICAgICAgICAgICBidWZmZXIgKz0gaXRlbURlc2NyaXB0aW9uOwotICAgICAg ICB9Ci0gICAgICAgIGJ1ZmZlciArPSBzdWZmaXg7Ci0gICAgICAgIHJldHVybiBidWZmZXI7Ci0g ICAgfSwKLQotICAgIGdldCB0eXBlKCkKLSAgICB7Ci0gICAgICAgIHJldHVybiB0eXBlb2YgdGhp cy5fdmFsdWU7Ci0gICAgfSwKLQotICAgIGdldCBzdWJ0eXBlKCkKLSAgICB7Ci0gICAgICAgIGlm ICh0aGlzLl92YWx1ZSA9PT0gbnVsbCkKLSAgICAgICAgICAgIHJldHVybiAibnVsbCI7Ci0KLSAg ICAgICAgaWYgKHRoaXMuX3ZhbHVlIGluc3RhbmNlb2YgQXJyYXkpCi0gICAgICAgICAgICByZXR1 cm4gImFycmF5IjsKLQotICAgICAgICByZXR1cm4gdW5kZWZpbmVkOwotICAgIH0sCi0KLSAgICBn ZXQgaGFzQ2hpbGRyZW4oKQotICAgIHsKLSAgICAgICAgcmV0dXJuIHR5cGVvZiB0aGlzLl92YWx1 ZSA9PT0gIm9iamVjdCIgJiYgdGhpcy5fdmFsdWUgIT09IG51bGwgJiYgIWlzRW1wdHlPYmplY3Qo dGhpcy5fdmFsdWUpOwotICAgIH0sCi0KLSAgICBnZXRPd25Qcm9wZXJ0aWVzOiBmdW5jdGlvbihj YWxsYmFjaykKLSAgICB7Ci0gICAgICAgIGNhbGxiYWNrKHRoaXMuX2NoaWxkcmVuKCkpOwotICAg IH0sCi0KLSAgICBnZXRBbGxQcm9wZXJ0aWVzOiBmdW5jdGlvbihjYWxsYmFjaykKLSAgICB7Ci0g ICAgICAgIGNhbGxiYWNrKHRoaXMuX2NoaWxkcmVuKCkpOwotICAgIH0sCi0KLSAgICBfY2hpbGRy ZW46IGZ1bmN0aW9uKCkKLSAgICB7Ci0gICAgICAgIGlmICghdGhpcy5oYXNDaGlsZHJlbikKLSAg ICAgICAgICAgIHJldHVybiBbXTsKLQotICAgICAgICBmdW5jdGlvbiBidWlsZFByb3BlcnR5KHBy b3BOYW1lKQotICAgICAgICB7Ci0gICAgICAgICAgICByZXR1cm4gbmV3IFdlYkluc3BlY3Rvci5S ZW1vdGVPYmplY3RQcm9wZXJ0eShwcm9wTmFtZSwgbmV3IFdlYkluc3BlY3Rvci5Mb2NhbEpTT05P YmplY3QodGhpcy5fdmFsdWVbcHJvcE5hbWVdKSk7Ci0gICAgICAgIH0KLSAgICAgICAgaWYgKCF0 aGlzLl9jYWNoZWRDaGlsZHJlbikKLSAgICAgICAgICAgIHRoaXMuX2NhY2hlZENoaWxkcmVuID0g T2JqZWN0LmtleXModGhpcy5fdmFsdWUgfHwge30pLm1hcChidWlsZFByb3BlcnR5LCB0aGlzKTsK LSAgICAgICAgcmV0dXJuIHRoaXMuX2NhY2hlZENoaWxkcmVuOwotICAgIH0sCi0KLSAgICBpc0Vy cm9yOiBmdW5jdGlvbigpCi0gICAgewotICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgfQotfTsK