141222 2015-02-03 17:12:33 -0800 Web Inspector: Clean up Object Property Descriptor Collection 2015-02-04 14:58:10 -0800 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED DoNotImportToRadar P2 Normal --- 1 joepeck joepeck burg commit-queue graouts joepeck jonowells mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1066652 0 joepeck 2015-02-03 17:12:33 -0800 * SUMMARY Clean up Object Property Descriptor Collection. I really didn't like the random list of booleans. 1066654 1 245990 joepeck 2015-02-03 17:14:48 -0800 Created attachment 245990 [PATCH] Proposed Fix 1066944 2 245990 commit-queue 2015-02-04 14:58:06 -0800 Comment on attachment 245990 [PATCH] Proposed Fix Clearing flags on attachment: 245990 Committed r179640: <http://trac.webkit.org/changeset/179640> 1066945 3 commit-queue 2015-02-04 14:58:10 -0800 All reviewed patches have been landed. Closing bug. 245990 2015-02-03 17:14:48 -0800 2015-02-04 14:58:06 -0800 [PATCH] Proposed Fix cleanup-1.patch text/plain 6127 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IGU4OWQwMGUuLmI3MzBhMGEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE2IEBACiAyMDE1LTAyLTAzICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKKyAgICAgICAgV2ViIEluc3BlY3RvcjogQ2xlYW4g dXAgT2JqZWN0IFByb3BlcnR5IERlc2NyaXB0b3IgQ29sbGVjdGlvbgorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQxMjIyCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5qZWN0ZWRTY3Jp cHRTb3VyY2UuanM6CisgICAgICAgIFVzZSBhIGxpc3Qgb2Ygb3B0aW9ucyB3aGVuIGRldGVybWlu aW5nIHdoaWNoIHByb3BlcnRpZXMgdG8gY29sbGVjdAorICAgICAgICBpbnN0ZWFkIG9mIGEgZmV3 IGJvb2xlYW5zIHdpdGggb3ZlcmxhcHBpbmcgcmVzcG9uc2liaWxpdGllcy4KKworMjAxNS0wMi0w MyAgSm9zZXBoIFBlY29yYXJvICA8cGVjb3Jhcm9AYXBwbGUuY29tPgorCiAgICAgICAgIFdlYiBJ bnNwZWN0b3I6IEFTU0VSVCBtYWluVGhyZWFkUHRocmVhZCBsYXVuY2hpbmcgcmVtb3RlIGRlYnVn Z2FibGUgSlNDb250ZXh0IGFwcCB3aXRoIERlYnVnIEphdmFTY3JpcHRDb3JlCiAgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDExODkKIApkaWZmIC0tZ2l0 IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9JbmplY3RlZFNjcmlwdFNvdXJjZS5q cyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvSW5qZWN0ZWRTY3JpcHRTb3VyY2Uu anMKaW5kZXggNWRmMzBiZS4uY2M0ZWM4NyAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRD b3JlL2luc3BlY3Rvci9JbmplY3RlZFNjcmlwdFNvdXJjZS5qcworKysgYi9Tb3VyY2UvSmF2YVNj cmlwdENvcmUvaW5zcGVjdG9yL0luamVjdGVkU2NyaXB0U291cmNlLmpzCkBAIC02Miw2ICs2Miwx MiBAQCBJbmplY3RlZFNjcmlwdC5wcmltaXRpdmVUeXBlcyA9IHsKICAgICBzdHJpbmc6IHRydWUK IH0KIAorSW5qZWN0ZWRTY3JpcHQuQ29sbGVjdGlvbk1vZGUgPSB7CisgICAgT3duUHJvcGVydGll czogMSA8PCAwLCAgICAvLyBvd24gcHJvcGVydGllcy4KKyAgICBHZXR0ZXJQcm9wZXJ0aWVzOiAx IDw8IDEsIC8vIGdldHRlciBwcm9wZXJ0aWVzIGluIHRoZSBwcm90b3R5cGUgY2hhaW4uCisgICAg QWxsUHJvcGVydGllczogMSA8PCAyLCAgICAvLyBhbGwgcHJvcGVydGllcyBpbiB0aGUgcHJvdG90 eXBlIGNoYWluLgorfQorCiBJbmplY3RlZFNjcmlwdC5wcm90b3R5cGUgPSB7CiAgICAgaXNQcmlt aXRpdmVWYWx1ZTogZnVuY3Rpb24ob2JqZWN0KQogICAgIHsKQEAgLTE5MCw3ICsxOTYsMTMgQEAg SW5qZWN0ZWRTY3JpcHQucHJvdG90eXBlID0gewogICAgICAgICBpZiAoIXRoaXMuX2lzRGVmaW5l ZChvYmplY3QpKQogICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0gICAgICAgIHZhciBkZXNj cmlwdG9ycyA9IHRoaXMuX3Byb3BlcnR5RGVzY3JpcHRvcnMob2JqZWN0LCBvd25Qcm9wZXJ0aWVz LCBvd25BbmRHZXR0ZXJQcm9wZXJ0aWVzKTsKKyAgICAgICAgdmFyIGNvbGxlY3Rpb25Nb2RlID0g SW5qZWN0ZWRTY3JpcHQuQ29sbGVjdGlvbk1vZGUuQWxsUHJvcGVydGllczsKKyAgICAgICAgaWYg KG93blByb3BlcnRpZXMpCisgICAgICAgICAgICBjb2xsZWN0aW9uTW9kZSA9IEluamVjdGVkU2Ny aXB0LkNvbGxlY3Rpb25Nb2RlLk93blByb3BlcnRpZXM7CisgICAgICAgIGVsc2UgaWYgKG93bkFu ZEdldHRlclByb3BlcnRpZXMpCisgICAgICAgICAgICBjb2xsZWN0aW9uTW9kZSA9IEluamVjdGVk U2NyaXB0LkNvbGxlY3Rpb25Nb2RlLk93blByb3BlcnRpZXMgfCBJbmplY3RlZFNjcmlwdC5Db2xs ZWN0aW9uTW9kZS5HZXR0ZXJQcm9wZXJ0aWVzOworCisgICAgICAgIHZhciBkZXNjcmlwdG9ycyA9 IHRoaXMuX3Byb3BlcnR5RGVzY3JpcHRvcnMob2JqZWN0LCBjb2xsZWN0aW9uTW9kZSk7CiAKICAg ICAgICAgLy8gR28gb3ZlciBwcm9wZXJ0aWVzLCB3cmFwIG9iamVjdCB2YWx1ZXMuCiAgICAgICAg IGZvciAodmFyIGkgPSAwOyBpIDwgZGVzY3JpcHRvcnMubGVuZ3RoOyArK2kpIHsKQEAgLTUxMSwx MyArNTIzLDggQEAgSW5qZWN0ZWRTY3JpcHQucHJvdG90eXBlID0gewogICAgICAgICByZXR1cm4g bW9kdWxlOwogICAgIH0sCiAKLSAgICBfcHJvcGVydHlEZXNjcmlwdG9yczogZnVuY3Rpb24ob2Jq ZWN0LCBvd25Qcm9wZXJ0aWVzLCBvd25BbmRHZXR0ZXJQcm9wZXJ0aWVzKQorICAgIF9wcm9wZXJ0 eURlc2NyaXB0b3JzOiBmdW5jdGlvbihvYmplY3QsIGNvbGxlY3Rpb25Nb2RlKQogICAgIHsKLSAg ICAgICAgLy8gTW9kZXM6Ci0gICAgICAgIC8vICAtIG93blByb3BlcnRpZXMgLSBvbmx5IG93biBw cm9wZXJ0aWVzIGFuZCBfX3Byb3RvX18KLSAgICAgICAgLy8gIC0gb3duQW5kR2V0dGVyUHJvcGVy dGllcyAtIG93biBwcm9wZXJ0aWVzLCBfX3Byb3RvX18sIGFuZCBnZXR0ZXJzIGluIHRoZSBwcm90 b3R5cGUgY2hhaW4KLSAgICAgICAgLy8gIC0gbmVpdGhlciAtIGdldCBhbGwgcHJvcGVydGllcyBp biB0aGUgcHJvdG90eXBlIGNoYWluIGFuZCBfX3Byb3RvX18KLQogICAgICAgICB2YXIgZGVzY3Jp cHRvcnMgPSBbXTsKICAgICAgICAgdmFyIG5hbWVQcm9jZXNzZWQgPSB7fTsKICAgICAgICAgbmFt ZVByb2Nlc3NlZFsiX19wcm90b19fIl0gPSBudWxsOwpAQCAtNTM2LDMwICs1NDMsMzIgQEAgSW5q ZWN0ZWRTY3JpcHQucHJvdG90eXBlID0gewogCiAgICAgICAgIGZ1bmN0aW9uIHByb2Nlc3NEZXNj cmlwdG9yKGRlc2NyaXB0b3IsIGlzT3duUHJvcGVydHksIHBvc3NpYmxlTmF0aXZlQmluZGluZ0dl dHRlcikKICAgICAgICAgewotICAgICAgICAgICAgLy8gT3duIHByb3BlcnRpZXMgb25seS4KLSAg ICAgICAgICAgIGlmIChvd25Qcm9wZXJ0aWVzKSB7Ci0gICAgICAgICAgICAgICAgaWYgKGlzT3du UHJvcGVydHkpCi0gICAgICAgICAgICAgICAgICAgIGRlc2NyaXB0b3JzLnB1c2goZGVzY3JpcHRv cik7CisgICAgICAgICAgICAvLyBBbGwgcHJvcGVydGllcy4KKyAgICAgICAgICAgIGlmIChjb2xs ZWN0aW9uTW9kZSAmIEluamVjdGVkU2NyaXB0LkNvbGxlY3Rpb25Nb2RlLkFsbFByb3BlcnRpZXMp IHsKKyAgICAgICAgICAgICAgICBkZXNjcmlwdG9ycy5wdXNoKGRlc2NyaXB0b3IpOwogICAgICAg ICAgICAgICAgIHJldHVybjsKICAgICAgICAgICAgIH0KIAotICAgICAgICAgICAgLy8gT3duIGFu ZCBnZXR0ZXIgcHJvcGVydGllcy4KLSAgICAgICAgICAgIGlmIChvd25BbmRHZXR0ZXJQcm9wZXJ0 aWVzKSB7Ci0gICAgICAgICAgICAgICAgaWYgKGlzT3duUHJvcGVydHkpIHsKLSAgICAgICAgICAg ICAgICAgICAgLy8gT3duIHByb3BlcnR5LCBpbmNsdWRlIHRoZSBkZXNjcmlwdG9yIGFzIGlzLgot ICAgICAgICAgICAgICAgICAgICBkZXNjcmlwdG9ycy5wdXNoKGRlc2NyaXB0b3IpOwotICAgICAg ICAgICAgICAgIH0gZWxzZSBpZiAoZGVzY3JpcHRvci5oYXNPd25Qcm9wZXJ0eSgiZ2V0IikgJiYg ZGVzY3JpcHRvci5nZXQpIHsKKyAgICAgICAgICAgIC8vIE93biBwcm9wZXJ0aWVzLgorICAgICAg ICAgICAgaWYgKGNvbGxlY3Rpb25Nb2RlICYgSW5qZWN0ZWRTY3JpcHQuQ29sbGVjdGlvbk1vZGUu T3duUHJvcGVydGllcyAmJiBpc093blByb3BlcnR5KSB7CisgICAgICAgICAgICAgICAgZGVzY3Jp cHRvcnMucHVzaChkZXNjcmlwdG9yKTsKKyAgICAgICAgICAgICAgICByZXR1cm47CisgICAgICAg ICAgICB9CisKKyAgICAgICAgICAgIC8vIEdldHRlciBwcm9wZXJ0aWVzLgorICAgICAgICAgICAg aWYgKGNvbGxlY3Rpb25Nb2RlICYgSW5qZWN0ZWRTY3JpcHQuQ29sbGVjdGlvbk1vZGUuR2V0dGVy UHJvcGVydGllcykgeworICAgICAgICAgICAgICAgIGlmIChkZXNjcmlwdG9yLmhhc093blByb3Bl cnR5KCJnZXQiKSAmJiBkZXNjcmlwdG9yLmdldCkgewogICAgICAgICAgICAgICAgICAgICAvLyBH ZXR0ZXIgcHJvcGVydHkgaW4gdGhlIHByb3RvdHlwZSBjaGFpbi4gQ3JlYXRlIGEgZmFrZSB2YWx1 ZSBkZXNjcmlwdG9yLgogICAgICAgICAgICAgICAgICAgICBkZXNjcmlwdG9ycy5wdXNoKGNyZWF0 ZUZha2VWYWx1ZURlc2NyaXB0b3IoZGVzY3JpcHRvci5uYW1lLCBkZXNjcmlwdG9yLCBpc093blBy b3BlcnR5KSk7Ci0gICAgICAgICAgICAgICAgfSBlbHNlIGlmIChwb3NzaWJsZU5hdGl2ZUJpbmRp bmdHZXR0ZXIpIHsKKyAgICAgICAgICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgICAg IH0KKworICAgICAgICAgICAgICAgIGlmIChwb3NzaWJsZU5hdGl2ZUJpbmRpbmdHZXR0ZXIpIHsK ICAgICAgICAgICAgICAgICAgICAgLy8gUG9zc2libGUgZ2V0dGVyIHByb3BlcnR5IGluIHRoZSBw cm90b3R5cGUgY2hhaW4uCiAgICAgICAgICAgICAgICAgICAgIGRlc2NyaXB0b3JzLnB1c2goZGVz Y3JpcHRvcik7CisgICAgICAgICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgICAgICAgICB9 Ci0gICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICAgICAgfQotCi0gICAgICAgICAgICAv LyBBbGwgcHJvcGVydGllcy4KLSAgICAgICAgICAgIGRlc2NyaXB0b3JzLnB1c2goZGVzY3JpcHRv cik7CiAgICAgICAgIH0KIAogICAgICAgICBmdW5jdGlvbiBwcm9jZXNzUHJvcGVydHlOYW1lcyhv LCBuYW1lcywgaXNPd25Qcm9wZXJ0eSkKQEAgLTYwMCwxMSArNjA5LDExIEBAIEluamVjdGVkU2Ny aXB0LnByb3RvdHlwZSA9IHsKICAgICAgICAgZm9yICh2YXIgbyA9IG9iamVjdDsgdGhpcy5faXNE ZWZpbmVkKG8pOyBvID0gby5fX3Byb3RvX18pIHsKICAgICAgICAgICAgIHZhciBpc093blByb3Bl cnR5ID0gbyA9PT0gb2JqZWN0OwogICAgICAgICAgICAgcHJvY2Vzc1Byb3BlcnR5TmFtZXMobywg T2JqZWN0LmdldE93blByb3BlcnR5TmFtZXMobyksIGlzT3duUHJvcGVydHkpOwotICAgICAgICAg ICAgaWYgKG93blByb3BlcnRpZXMpCisgICAgICAgICAgICBpZiAoY29sbGVjdGlvbk1vZGUgPT09 IEluamVjdGVkU2NyaXB0LkNvbGxlY3Rpb25Nb2RlLk93blByb3BlcnRpZXMpCiAgICAgICAgICAg ICAgICAgYnJlYWs7CiAgICAgICAgIH0KIAotICAgICAgICAvLyBJbmNsdWRlIF9fcHJvdG9fXyBh dCB0aGUgZW5kLgorICAgICAgICAvLyBBbHdheXMgaW5jbHVkZSBfX3Byb3RvX18gYXQgdGhlIGVu ZC4KICAgICAgICAgdHJ5IHsKICAgICAgICAgICAgIGlmIChvYmplY3QuX19wcm90b19fKQogICAg ICAgICAgICAgICAgIGRlc2NyaXB0b3JzLnB1c2goe25hbWU6ICJfX3Byb3RvX18iLCB2YWx1ZTog b2JqZWN0Ll9fcHJvdG9fXywgd3JpdGFibGU6IHRydWUsIGNvbmZpZ3VyYWJsZTogdHJ1ZSwgZW51 bWVyYWJsZTogZmFsc2UsIGlzT3duOiB0cnVlfSk7CkBAIC04NDksNyArODU4LDcgQEAgSW5qZWN0 ZWRTY3JpcHQuUmVtb3RlT2JqZWN0LnByb3RvdHlwZSA9IHsKIAogICAgICAgICAgICAgLy8gUHJv cGVydGllcy4KICAgICAgICAgICAgIHByZXZpZXcucHJvcGVydGllcyA9IFtdOwotICAgICAgICAg ICAgdmFyIGRlc2NyaXB0b3JzID0gaW5qZWN0ZWRTY3JpcHQuX3Byb3BlcnR5RGVzY3JpcHRvcnMo b2JqZWN0KTsKKyAgICAgICAgICAgIHZhciBkZXNjcmlwdG9ycyA9IGluamVjdGVkU2NyaXB0Ll9w cm9wZXJ0eURlc2NyaXB0b3JzKG9iamVjdCwgSW5qZWN0ZWRTY3JpcHQuQ29sbGVjdGlvbk1vZGUu QWxsUHJvcGVydGllcyk7CiAgICAgICAgICAgICB0aGlzLl9hcHBlbmRQcm9wZXJ0eVByZXZpZXdz KHByZXZpZXcsIGRlc2NyaXB0b3JzLCBwcm9wZXJ0aWVzVGhyZXNob2xkLCBmaXJzdExldmVsS2V5 cywgc2Vjb25kTGV2ZWxLZXlzKTsKICAgICAgICAgICAgIGlmIChwcm9wZXJ0aWVzVGhyZXNob2xk LmluZGV4ZXMgPCAwIHx8IHByb3BlcnRpZXNUaHJlc2hvbGQucHJvcGVydGllcyA8IDApCiAgICAg ICAgICAgICAgICAgcmV0dXJuIHByZXZpZXc7Cg==