44160 2010-08-18 02:42:16 -0700 Web Inspector: make objectId of string type instead of object. 2010-08-18 09:43:54 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 pfeldman pfeldman abarth bweinstein eric joepeck keishi pfeldman pmuellr rik timothy webkit.review.bot yurys oldest_to_newest 266006 0 pfeldman 2010-08-18 02:42:16 -0700 We'd like objectId to be 'string' on the protocol level. Patch to follow. 266011 1 64679 pfeldman 2010-08-18 03:01:35 -0700 Created attachment 64679 [PATCH] Proposed change. 266015 2 64679 pfeldman 2010-08-18 03:09:39 -0700 Comment on attachment 64679 [PATCH] Proposed change. Clearing flags on attachment: 64679 Committed r65597: <http://trac.webkit.org/changeset/65597> 266016 3 pfeldman 2010-08-18 03:09:49 -0700 All reviewed patches have been landed. Closing bug. 266024 4 webkit.review.bot 2010-08-18 03:28:30 -0700 http://trac.webkit.org/changeset/65597 might have broken Qt Windows 32-bit Debug The following changes are on the blame list: http://trac.webkit.org/changeset/65594 http://trac.webkit.org/changeset/65595 http://trac.webkit.org/changeset/65596 http://trac.webkit.org/changeset/65597 266168 5 64679 joepeck 2010-08-18 09:43:54 -0700 Comment on attachment 64679 [PATCH] Proposed change. > + parsedObjectId.id = parseInt(tokens[1]); > + return InjectedScriptAccess.get(parseInt(tokens[0])); I am always wary of parseInt() calls without a radix. Especially when user input may be involved. But I guess it is okay here. Just something to keep in mind. 64679 2010-08-18 03:01:35 -0700 2010-08-18 09:43:54 -0700 [PATCH] Proposed change. obj_id_str text/plain 7310 pfeldman ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NWQyNmYxOC4uMzVjOGMwMCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMCBAQAorMjAxMC0wOC0xOCAgUGF2ZWwgRmVsZG1h biAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBtYWtlIG9iamVjdElkIG9mIHN0cmlu ZyB0eXBlIGluc3RlYWQgb2Ygb2JqZWN0LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9NDQxNjAKKworICAgICAgICAqIFdlYkNvcmUueGNvZGVwcm9qL3By b2plY3QucGJ4cHJvajoKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0luamVjdGVkU2Ny aXB0LmpzOgorICAgICAgICAoaW5qZWN0ZWRTY3JpcHRDb25zdHJ1Y3Rvci4pOgorICAgICAgICAq IGluc3BlY3Rvci9mcm9udC1lbmQvSW5qZWN0ZWRTY3JpcHRBY2Nlc3MuanM6CisgICAgICAgIChn ZXQgSW5qZWN0ZWRTY3JpcHRBY2Nlc3MuZ2V0Rm9yT2JqZWN0SWQpOgorICAgICAgICAqIGluc3Bl Y3Rvci9mcm9udC1lbmQvUmVtb3RlT2JqZWN0LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJl bW90ZU9iamVjdC5wcm90b3R5cGUuZ2V0UHJvcGVydGllcyk6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuUmVtb3RlT2JqZWN0LnByb3RvdHlwZS5zZXRQcm9wZXJ0eVZhbHVlKToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5SZW1vdGVPYmplY3QucHJvdG90eXBlLnB1c2hOb2RlVG9Gcm9udGVuZCk6CisK IDIwMTAtMDgtMTggIFNoaW5pY2hpcm8gSGFtYWppICA8aGFtYWppQGNocm9taXVtLm9yZz4KIAog ICAgICAgICBSZXZpZXdlZCBieSBEaW1pdHJpIEdsYXprb3YuCmRpZmYgLS1naXQgYS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvSW5qZWN0ZWRTY3JpcHQuanMgYi9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvSW5qZWN0ZWRTY3JpcHQuanMKaW5kZXggYjlhNDNmNi4uZDRlM2Q4MCAxMDA2 NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0luamVjdGVkU2NyaXB0LmpzCisr KyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9JbmplY3RlZFNjcmlwdC5qcwpAQCAtNjEs NyArNjEsNyBAQCBJbmplY3RlZFNjcmlwdC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICAgICAg ICAgIHRoaXMuX29iamVjdEdyb3Vwc1tvYmplY3RHcm91cE5hbWVdID0gZ3JvdXA7CiAgICAgICAg ICAgICAgICAgfQogICAgICAgICAgICAgICAgIGdyb3VwLnB1c2goaWQpOwotICAgICAgICAgICAg ICAgIG9iamVjdElkID0gbmV3IEluamVjdGVkU2NyaXB0LlJlbW90ZU9iamVjdElkKGlkLCBvYmpl Y3RHcm91cE5hbWUpOworICAgICAgICAgICAgICAgIG9iamVjdElkID0gdGhpcy5fc2VyaWFsaXpl T2JqZWN0SWQoaWQsIG9iamVjdEdyb3VwTmFtZSk7CiAgICAgICAgICAgICB9CiAgICAgICAgICAg ICByZXR1cm4gSW5qZWN0ZWRTY3JpcHQuUmVtb3RlT2JqZWN0LmZyb21PYmplY3Qob2JqZWN0LCBv YmplY3RJZCwgYWJicmV2aWF0ZSk7CiAgICAgICAgIH0gY2F0Y2ggKGUpIHsKQEAgLTY5LDYgKzY5 LDIwIEBAIEluamVjdGVkU2NyaXB0LnByb3RvdHlwZSA9IHsKICAgICAgICAgfQogICAgIH0sCiAK KyAgICBfc2VyaWFsaXplT2JqZWN0SWQ6IGZ1bmN0aW9uKGlkLCBncm91cE5hbWUpCisgICAgewor ICAgICAgICByZXR1cm4gaW5qZWN0ZWRTY3JpcHRJZCArICI6IiArIGlkICsgIjoiICsgZ3JvdXBO YW1lOworICAgIH0sCisKKyAgICBfcGFyc2VPYmplY3RJZDogZnVuY3Rpb24ob2JqZWN0SWQpCisg ICAgeworICAgICAgICB2YXIgdG9rZW5zID0gb2JqZWN0SWQuc3BsaXQoIjoiKTsKKyAgICAgICAg dmFyIHBhcnNlZE9iamVjdElkID0ge307CisgICAgICAgIHBhcnNlZE9iamVjdElkLmlkID0gcGFy c2VJbnQodG9rZW5zWzFdKTsKKyAgICAgICAgcGFyc2VkT2JqZWN0SWQuZ3JvdXBOYW1lID0gdG9r ZW5zWzJdOworICAgICAgICByZXR1cm4gcGFyc2VkT2JqZWN0SWQ7CisgICAgfSwKKwogICAgIHJl bGVhc2VXcmFwcGVyT2JqZWN0R3JvdXA6IGZ1bmN0aW9uKG9iamVjdEdyb3VwTmFtZSkKICAgICB7 CiAgICAgICAgIHZhciBncm91cCA9IHRoaXMuX29iamVjdEdyb3Vwc1tvYmplY3RHcm91cE5hbWVd OwpAQCAtMTA4LDcgKzEyMiw4IEBAIEluamVjdGVkU2NyaXB0LnByb3RvdHlwZSA9IHsKIAogICAg IGdldFByb3BlcnRpZXM6IGZ1bmN0aW9uKG9iamVjdElkLCBpZ25vcmVIYXNPd25Qcm9wZXJ0eSwg YWJicmV2aWF0ZSkKICAgICB7Ci0gICAgICAgIHZhciBvYmplY3QgPSB0aGlzLl9vYmplY3RGb3JJ ZChvYmplY3RJZCk7CisgICAgICAgIHZhciBwYXJzZWRPYmplY3RJZCA9IHRoaXMuX3BhcnNlT2Jq ZWN0SWQob2JqZWN0SWQpOworICAgICAgICB2YXIgb2JqZWN0ID0gdGhpcy5fb2JqZWN0Rm9ySWQo cGFyc2VkT2JqZWN0SWQpOwogICAgICAgICBpZiAoIXRoaXMuX2lzRGVmaW5lZChvYmplY3QpKQog ICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAgICB2YXIgcHJvcGVydGllcyA9IFtdOwpA QCAtMTI2LDcgKzE0MSw3IEBAIEluamVjdGVkU2NyaXB0LnByb3RvdHlwZSA9IHsKICAgICAgICAg ICAgIHZhciBpc0dldHRlciA9IG9iamVjdFsiX19sb29rdXBHZXR0ZXJfXyJdICYmIG9iamVjdC5f X2xvb2t1cEdldHRlcl9fKHByb3BlcnR5TmFtZSk7CiAgICAgICAgICAgICBpZiAoIWlzR2V0dGVy KSB7CiAgICAgICAgICAgICAgICAgdHJ5IHsKLSAgICAgICAgICAgICAgICAgICAgcHJvcGVydHku dmFsdWUgPSB0aGlzLl93cmFwT2JqZWN0KG9iamVjdFtwcm9wZXJ0eU5hbWVdLCBvYmplY3RJZC5n cm91cE5hbWUsIGFiYnJldmlhdGUpOworICAgICAgICAgICAgICAgICAgICBwcm9wZXJ0eS52YWx1 ZSA9IHRoaXMuX3dyYXBPYmplY3Qob2JqZWN0W3Byb3BlcnR5TmFtZV0sIHBhcnNlZE9iamVjdElk Lmdyb3VwTmFtZSwgYWJicmV2aWF0ZSk7CiAgICAgICAgICAgICAgICAgfSBjYXRjaChlKSB7CiAg ICAgICAgICAgICAgICAgICAgIHByb3BlcnR5LnZhbHVlID0gbmV3IEluamVjdGVkU2NyaXB0LlJl bW90ZU9iamVjdC5mcm9tRXhjZXB0aW9uKGUpOwogICAgICAgICAgICAgICAgIH0KQEAgLTE0Miw3 ICsxNTcsOCBAQCBJbmplY3RlZFNjcmlwdC5wcm90b3R5cGUgPSB7CiAKICAgICBzZXRQcm9wZXJ0 eVZhbHVlOiBmdW5jdGlvbihvYmplY3RJZCwgcHJvcGVydHlOYW1lLCBleHByZXNzaW9uKQogICAg IHsKLSAgICAgICAgdmFyIG9iamVjdCA9IHRoaXMuX29iamVjdEZvcklkKG9iamVjdElkKTsKKyAg ICAgICAgdmFyIHBhcnNlZE9iamVjdElkID0gdGhpcy5fcGFyc2VPYmplY3RJZChvYmplY3RJZCk7 CisgICAgICAgIHZhciBvYmplY3QgPSB0aGlzLl9vYmplY3RGb3JJZChwYXJzZWRPYmplY3RJZCk7 CiAgICAgICAgIGlmICghdGhpcy5faXNEZWZpbmVkKG9iamVjdCkpCiAgICAgICAgICAgICByZXR1 cm4gZmFsc2U7CiAgICAgCkBAIC0zMDUsOSArMzIxLDkgQEAgSW5qZWN0ZWRTY3JpcHQucHJvdG90 eXBlID0gewogICAgICAgICByZXR1cm4gSW5qZWN0ZWRTY3JpcHRIb3N0Lm5vZGVGb3JJZChub2Rl SWQpOwogICAgIH0sCiAKLSAgICBfb2JqZWN0Rm9ySWQ6IGZ1bmN0aW9uKG9iamVjdElkKQorICAg IF9vYmplY3RGb3JJZDogZnVuY3Rpb24ocGFyc2VkT2JqZWN0SWQpCiAgICAgewotICAgICAgICBy ZXR1cm4gdGhpcy5faWRUb1dyYXBwZWRPYmplY3Rbb2JqZWN0SWQuaWRdOworICAgICAgICByZXR1 cm4gdGhpcy5faWRUb1dyYXBwZWRPYmplY3RbcGFyc2VkT2JqZWN0SWQuaWRdOwogICAgIH0sCiAK ICAgICByZXNvbHZlTm9kZTogZnVuY3Rpb24obm9kZUlkKQpAQCAtMzMyLDcgKzM0OCw4IEBAIElu amVjdGVkU2NyaXB0LnByb3RvdHlwZSA9IHsKIAogICAgIHB1c2hOb2RlVG9Gcm9udGVuZDogZnVu Y3Rpb24ob2JqZWN0SWQpCiAgICAgewotICAgICAgICB2YXIgb2JqZWN0ID0gdGhpcy5fb2JqZWN0 Rm9ySWQob2JqZWN0SWQpOworICAgICAgICB2YXIgcGFyc2VkT2JqZWN0SWQgPSB0aGlzLl9wYXJz ZU9iamVjdElkKG9iamVjdElkKTsKKyAgICAgICAgdmFyIG9iamVjdCA9IHRoaXMuX29iamVjdEZv cklkKHBhcnNlZE9iamVjdElkKTsKICAgICAgICAgaWYgKCFvYmplY3QgfHwgdGhpcy5fdHlwZShv YmplY3QpICE9PSAibm9kZSIpCiAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgICAgIHJl dHVybiBJbmplY3RlZFNjcmlwdEhvc3QucHVzaE5vZGVQYXRoVG9Gcm9udGVuZChvYmplY3QsIGZh bHNlLCBmYWxzZSk7CkBAIC00OTcsMTQgKzUxNCw2IEBAIEluamVjdGVkU2NyaXB0LnByb3RvdHlw ZSA9IHsKIAogdmFyIGluamVjdGVkU2NyaXB0ID0gbmV3IEluamVjdGVkU2NyaXB0KCk7CiAKLS8v IEZJWE1FOiBSZW1vdGVPYmplY3RJZCBhbmQgUmVtb3RlT2JqZWN0IHN0cnVjdHMgbXVzdCBtYXRj aCB0aGUgV2ViSW5zcGVjdG9yLiogb25lcy4gU2hvdWxkIHJldXNlIHNhbWUgZmlsZSBpbnN0ZWFk LgotSW5qZWN0ZWRTY3JpcHQuUmVtb3RlT2JqZWN0SWQgPSBmdW5jdGlvbihpZCwgZ3JvdXBOYW1l KQotewotICAgIHRoaXMud29ybGRJZCA9IGluamVjdGVkU2NyaXB0SWQ7Ci0gICAgdGhpcy5pZCA9 IGlkOwotICAgIHRoaXMuZ3JvdXBOYW1lID0gZ3JvdXBOYW1lOwotfQotCiBJbmplY3RlZFNjcmlw dC5SZW1vdGVPYmplY3QgPSBmdW5jdGlvbihvYmplY3RJZCwgdHlwZSwgZGVzY3JpcHRpb24sIGhh c0NoaWxkcmVuKQogewogICAgIHRoaXMub2JqZWN0SWQgPSBvYmplY3RJZDsKZGlmZiAtLWdpdCBh L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9JbmplY3RlZFNjcmlwdEFjY2Vzcy5qcyBiL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9JbmplY3RlZFNjcmlwdEFjY2Vzcy5qcwppbmRleCA3 MWU1YmQzLi5jZTI2NGRkIDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv SW5qZWN0ZWRTY3JpcHRBY2Nlc3MuanMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L0luamVjdGVkU2NyaXB0QWNjZXNzLmpzCkBAIC00Nyw2ICs0NywxMyBAQCBJbmplY3RlZFNjcmlw dEFjY2Vzcy5nZXRGb3JOb2RlID0gZnVuY3Rpb24obm9kZSkKICAgICByZXR1cm4gSW5qZWN0ZWRT Y3JpcHRBY2Nlc3MuZ2V0KC1ub2RlLmlkKTsKIH0KIAorSW5qZWN0ZWRTY3JpcHRBY2Nlc3MuZ2V0 Rm9yT2JqZWN0SWQgPSBmdW5jdGlvbihvYmplY3RJZCkKK3sKKyAgICAvLyBGSVhNRTogbW92ZSB0 byBuYXRpdmUgbGF5ZXIuCisgICAgdmFyIHRva2VucyA9IG9iamVjdElkLnNwbGl0KCI6Iik7Cisg ICAgcmV0dXJuIEluamVjdGVkU2NyaXB0QWNjZXNzLmdldChwYXJzZUludCh0b2tlbnNbMF0pKTsK K30KKwogSW5qZWN0ZWRTY3JpcHRBY2Nlc3MuZ2V0RGVmYXVsdCA9IGZ1bmN0aW9uKCkKIHsKICAg ICByZXR1cm4gSW5qZWN0ZWRTY3JpcHRBY2Nlc3MuZ2V0KDApOwpkaWZmIC0tZ2l0IGEvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1JlbW90ZU9iamVjdC5qcyBiL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9SZW1vdGVPYmplY3QuanMKaW5kZXggZWQwMjllZi4uMDAzZDQ4MyAxMDA2NDQK LS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1JlbW90ZU9iamVjdC5qcworKysgYi9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVtb3RlT2JqZWN0LmpzCkBAIC0yOCwxMyArMjgs NiBAQAogICogT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJ TElUWSBPRiBTVUNIIERBTUFHRS4KICAqLwogCi1XZWJJbnNwZWN0b3IuUmVtb3RlT2JqZWN0SWQg PSBmdW5jdGlvbih3b3JsZElkLCBpZCwgZ3JvdXBOYW1lKQotewotICAgIHRoaXMud29ybGRJZCA9 IHdvcmxkSWQ7Ci0gICAgdGhpcy5pZCA9IGlkOwotICAgIHRoaXMuZ3JvdXBOYW1lID0gZ3JvdXBO YW1lOwotfQotCiBXZWJJbnNwZWN0b3IuUmVtb3RlT2JqZWN0ID0gZnVuY3Rpb24ob2JqZWN0SWQs IHR5cGUsIGRlc2NyaXB0aW9uLCBoYXNDaGlsZHJlbikKIHsKICAgICB0aGlzLl9vYmplY3RJZCA9 IG9iamVjdElkOwpAQCAtMTIwLDcgKzExMyw3IEBAIFdlYkluc3BlY3Rvci5SZW1vdGVPYmplY3Qu cHJvdG90eXBlID0gewogICAgICAgICAgICAgICAgIHByb3BlcnRpZXNbaV0udmFsdWUgPSBXZWJJ bnNwZWN0b3IuUmVtb3RlT2JqZWN0LmZyb21QYXlsb2FkKHByb3BlcnRpZXNbaV0udmFsdWUpOwog ICAgICAgICAgICAgY2FsbGJhY2socHJvcGVydGllcyk7CiAgICAgICAgIH0KLSAgICAgICAgSW5q ZWN0ZWRTY3JpcHRBY2Nlc3MuZ2V0KHRoaXMuX29iamVjdElkLndvcmxkSWQpLmdldFByb3BlcnRp ZXModGhpcy5fb2JqZWN0SWQsIGlnbm9yZUhhc093blByb3BlcnR5LCBhYmJyZXZpYXRlLCByZW1v dGVPYmplY3RCaW5kZXIpOworICAgICAgICBJbmplY3RlZFNjcmlwdEFjY2Vzcy5nZXRGb3JPYmpl Y3RJZCh0aGlzLl9vYmplY3RJZCkuZ2V0UHJvcGVydGllcyh0aGlzLl9vYmplY3RJZCwgaWdub3Jl SGFzT3duUHJvcGVydHksIGFiYnJldmlhdGUsIHJlbW90ZU9iamVjdEJpbmRlcik7CiAgICAgfSwK IAogICAgIHNldFByb3BlcnR5VmFsdWU6IGZ1bmN0aW9uKG5hbWUsIHZhbHVlLCBjYWxsYmFjaykK QEAgLTEyOSwxMiArMTIyLDEyIEBAIFdlYkluc3BlY3Rvci5SZW1vdGVPYmplY3QucHJvdG90eXBl ID0gewogICAgICAgICAgICAgY2FsbGJhY2soZmFsc2UpOwogICAgICAgICAgICAgcmV0dXJuOwog ICAgICAgICB9Ci0gICAgICAgIEluamVjdGVkU2NyaXB0QWNjZXNzLmdldCh0aGlzLl9vYmplY3RJ ZC53b3JsZElkKS5zZXRQcm9wZXJ0eVZhbHVlKHRoaXMuX29iamVjdElkLCBuYW1lLCB2YWx1ZSwg Y2FsbGJhY2spOworICAgICAgICBJbmplY3RlZFNjcmlwdEFjY2Vzcy5nZXRGb3JPYmplY3RJZCh0 aGlzLl9vYmplY3RJZCkuc2V0UHJvcGVydHlWYWx1ZSh0aGlzLl9vYmplY3RJZCwgbmFtZSwgdmFs dWUsIGNhbGxiYWNrKTsKICAgICB9LAogCiAgICAgcHVzaE5vZGVUb0Zyb250ZW5kOiBmdW5jdGlv bihjYWxsYmFjaykKICAgICB7Ci0gICAgICAgIEluamVjdGVkU2NyaXB0QWNjZXNzLmdldCh0aGlz Ll9vYmplY3RJZC53b3JsZElkKS5wdXNoTm9kZVRvRnJvbnRlbmQodGhpcy5fb2JqZWN0SWQsIGNh bGxiYWNrKTsKKyAgICAgICAgSW5qZWN0ZWRTY3JpcHRBY2Nlc3MuZ2V0Rm9yT2JqZWN0SWQodGhp cy5fb2JqZWN0SWQpLnB1c2hOb2RlVG9Gcm9udGVuZCh0aGlzLl9vYmplY3RJZCwgY2FsbGJhY2sp OwogICAgIH0KIH0KIAo=