142101 2015-02-27 13:52:10 -0800 Web Inspector: Use Maps in ResourceCollection instead of objects 2015-02-27 15:35:35 -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 1072821 0 joepeck 2015-02-27 13:52:10 -0800 * SUMMARY Use Maps in ResourceCollection instead of objects. Frankly this is just so that I can have a better test case for realistic Map use. Map is a clearer data structure here anyways. 1072822 1 247550 joepeck 2015-02-27 13:53:29 -0800 Created attachment 247550 [PATCH] Proposed Fix 1072843 2 247550 timothy 2015-02-27 14:50:08 -0800 Comment on attachment 247550 [PATCH] Proposed Fix Nice! 1072873 3 247550 commit-queue 2015-02-27 15:35:31 -0800 Comment on attachment 247550 [PATCH] Proposed Fix Clearing flags on attachment: 247550 Committed r180788: <http://trac.webkit.org/changeset/180788> 1072874 4 commit-queue 2015-02-27 15:35:35 -0800 All reviewed patches have been landed. Closing bug. 247550 2015-02-27 13:53:29 -0800 2015-02-27 15:35:31 -0800 [PATCH] Proposed Fix map-use.patch text/plain 5299 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDc5ZTQxZjcuLjU5YWQ5M2MgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE1LTAyLTI3ICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogVXNlIE1h cHMgaW4gUmVzb3VyY2VDb2xsZWN0aW9uIGluc3RlYWQgb2Ygb2JqZWN0cworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQyMTAxCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL01vZGVs cy9SZXNvdXJjZUNvbGxlY3Rpb24uanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2VD b2xsZWN0aW9uKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZUNvbGxlY3Rpb24ucHJv dG90eXBlLnJlc291cmNlc1dpdGhUeXBlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJj ZUNvbGxlY3Rpb24ucHJvdG90eXBlLnJlbW92ZUFsbFJlc291cmNlcyk6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuUmVzb3VyY2VDb2xsZWN0aW9uLnByb3RvdHlwZS5yZXNvdXJjZUZvclVSTCk6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2VDb2xsZWN0aW9uLnByb3RvdHlwZS5fYXNzb2Np YXRlV2l0aFJlc291cmNlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZUNvbGxlY3Rp b24ucHJvdG90eXBlLl9kaXNhc3NvY2lhdGVXaXRoUmVzb3VyY2UpOgorICAgICAgICAoV2ViSW5z cGVjdG9yLlJlc291cmNlQ29sbGVjdGlvbi5wcm90b3R5cGUuX3Jlc291cmNlVVJMRGlkQ2hhbmdl KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZUNvbGxlY3Rpb24ucHJvdG90eXBlLl9y ZXNvdXJjZVR5cGVEaWRDaGFuZ2UpOgorICAgICAgICBVc2UgTWFwcyBpbnN0ZWFkIG9mIG9iamVj dHMuCisKIDIwMTUtMDItMjYgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4K IAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBDbGVhciBMb2cgb24gUmVsb2FkIGNsZWFycyBzb21l IGxvZ3MgdGhhdCB3ZXJlIGFmdGVyIHJlbG9hZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL1Jlc291cmNlQ29sbGVjdGlvbi5qcyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9SZXNvdXJjZUNvbGxlY3Rpb24u anMKaW5kZXggZTY4MzM0YS4uOTNhODZlZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL1Jlc291cmNlQ29sbGVjdGlvbi5qcworKysgYi9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvUmVzb3VyY2VDb2xsZWN0aW9u LmpzCkBAIC0yOCw4ICsyOCw4IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZUNvbGxlY3Rpb24gPSBm dW5jdGlvbigpCiAgICAgV2ViSW5zcGVjdG9yLk9iamVjdC5jYWxsKHRoaXMpOwogCiAgICAgdGhp cy5fcmVzb3VyY2VzID0gW107Ci0gICAgdGhpcy5fcmVzb3VyY2VVUkxNYXAgPSB7fTsKLSAgICB0 aGlzLl9yZXNvdXJjZXNUeXBlTWFwID0ge307CisgICAgdGhpcy5fcmVzb3VyY2VVUkxNYXAgPSBu ZXcgTWFwOworICAgIHRoaXMuX3Jlc291cmNlc1R5cGVNYXAgPSBuZXcgTWFwOwogfTsKIAogV2Vi SW5zcGVjdG9yLlJlc291cmNlQ29sbGVjdGlvbi5wcm90b3R5cGUgPSB7CkBAIC00NCwxMiArNDQs MTIgQEAgV2ViSW5zcGVjdG9yLlJlc291cmNlQ29sbGVjdGlvbi5wcm90b3R5cGUgPSB7CiAKICAg ICByZXNvdXJjZUZvclVSTDogZnVuY3Rpb24odXJsKQogICAgIHsKLSAgICAgICAgcmV0dXJuIHRo aXMuX3Jlc291cmNlVVJMTWFwW3VybF0gfHwgbnVsbDsKKyAgICAgICAgcmV0dXJuIHRoaXMuX3Jl c291cmNlVVJMTWFwLmdldCh1cmwpIHx8IG51bGw7CiAgICAgfSwKIAogICAgIHJlc291cmNlc1dp dGhUeXBlOiBmdW5jdGlvbih0eXBlKQogICAgIHsKLSAgICAgICAgcmV0dXJuIHRoaXMuX3Jlc291 cmNlc1R5cGVNYXBbdHlwZV0gfHwgW107CisgICAgICAgIHJldHVybiB0aGlzLl9yZXNvdXJjZXNU eXBlTWFwLmdldCh0eXBlKSB8fCBbXTsKICAgICB9LAogCiAgICAgYWRkUmVzb3VyY2U6IGZ1bmN0 aW9uKHJlc291cmNlKQpAQCAtOTIsOCArOTIsOCBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VDb2xs ZWN0aW9uLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHRoaXMuX2Rpc2Fzc29jaWF0ZVdpdGhS ZXNvdXJjZSh0aGlzLl9yZXNvdXJjZXNbaV0sIHRydWUpOwogCiAgICAgICAgIHRoaXMuX3Jlc291 cmNlcyA9IFtdOwotICAgICAgICB0aGlzLl9yZXNvdXJjZVVSTE1hcCA9IHt9OwotICAgICAgICB0 aGlzLl9yZXNvdXJjZXNUeXBlTWFwID0ge307CisgICAgICAgIHRoaXMuX3Jlc291cmNlVVJMTWFw LmNsZWFyKCk7CisgICAgICAgIHRoaXMuX3Jlc291cmNlc1R5cGVNYXAuY2xlYXIoKTsKICAgICB9 LAogCiAgICAgLy8gUHJpdmF0ZQpAQCAtMTAxLDExICsxMDEsMTIgQEAgV2ViSW5zcGVjdG9yLlJl c291cmNlQ29sbGVjdGlvbi5wcm90b3R5cGUgPSB7CiAgICAgX2Fzc29jaWF0ZVdpdGhSZXNvdXJj ZTogZnVuY3Rpb24ocmVzb3VyY2UpCiAgICAgewogICAgICAgICB0aGlzLl9yZXNvdXJjZXMucHVz aChyZXNvdXJjZSk7Ci0gICAgICAgIHRoaXMuX3Jlc291cmNlVVJMTWFwW3Jlc291cmNlLnVybF0g PSByZXNvdXJjZTsKKyAgICAgICAgdGhpcy5fcmVzb3VyY2VVUkxNYXAuc2V0KHJlc291cmNlLnVy bCwgcmVzb3VyY2UpOwogCi0gICAgICAgIGlmICghdGhpcy5fcmVzb3VyY2VzVHlwZU1hcFtyZXNv dXJjZS50eXBlXSkKLSAgICAgICAgICAgIHRoaXMuX3Jlc291cmNlc1R5cGVNYXBbcmVzb3VyY2Uu dHlwZV0gPSBbXTsKLSAgICAgICAgdGhpcy5fcmVzb3VyY2VzVHlwZU1hcFtyZXNvdXJjZS50eXBl XS5wdXNoKHJlc291cmNlKTsKKyAgICAgICAgaWYgKCF0aGlzLl9yZXNvdXJjZXNUeXBlTWFwLmhh cyhyZXNvdXJjZS50eXBlKSkKKyAgICAgICAgICAgIHRoaXMuX3Jlc291cmNlc1R5cGVNYXAuc2V0 KHJlc291cmNlLnR5cGUsIFtyZXNvdXJjZV0pOworICAgICAgICBlbHNlCisgICAgICAgICAgICB0 aGlzLl9yZXNvdXJjZXNUeXBlTWFwLmdldChyZXNvdXJjZS50eXBlKS5wdXNoKHJlc291cmNlKTsK IAogICAgICAgICByZXNvdXJjZS5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5SZXNvdXJj ZS5FdmVudC5VUkxEaWRDaGFuZ2UsIHRoaXMuX3Jlc291cmNlVVJMRGlkQ2hhbmdlLCB0aGlzKTsK ICAgICAgICAgcmVzb3VyY2UuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuUmVzb3VyY2Uu RXZlbnQuVHlwZURpZENoYW5nZSwgdGhpcy5fcmVzb3VyY2VUeXBlRGlkQ2hhbmdlLCB0aGlzKTsK QEAgLTExNSw5ICsxMTYsOSBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VDb2xsZWN0aW9uLnByb3Rv dHlwZSA9IHsKICAgICB7CiAgICAgICAgIGlmIChza2lwUmVtb3ZhbCkgewogICAgICAgICAgICAg dGhpcy5fcmVzb3VyY2VzLnJlbW92ZShyZXNvdXJjZSk7Ci0gICAgICAgICAgICBpZiAodGhpcy5f cmVzb3VyY2VzVHlwZU1hcFtyZXNvdXJjZS50eXBlXSkKLSAgICAgICAgICAgICAgICB0aGlzLl9y ZXNvdXJjZXNUeXBlTWFwW3Jlc291cmNlLnR5cGVdLnJlbW92ZShyZXNvdXJjZSk7Ci0gICAgICAg ICAgICBkZWxldGUgdGhpcy5fcmVzb3VyY2VVUkxNYXBbcmVzb3VyY2UudXJsXTsKKyAgICAgICAg ICAgIGlmICh0aGlzLl9yZXNvdXJjZXNUeXBlTWFwLmhhcyhyZXNvdXJjZS50eXBlKSkKKyAgICAg ICAgICAgICAgICB0aGlzLl9yZXNvdXJjZXNUeXBlTWFwLmdldChyZXNvdXJjZS50eXBlKS5yZW1v dmUocmVzb3VyY2UpOworICAgICAgICAgICAgdGhpcy5fcmVzb3VyY2VVUkxNYXAuZGVsZXRlKHJl c291cmNlLnVybCk7CiAgICAgICAgIH0KIAogICAgICAgICByZXNvdXJjZS5yZW1vdmVFdmVudExp c3RlbmVyKFdlYkluc3BlY3Rvci5SZXNvdXJjZS5FdmVudC5VUkxEaWRDaGFuZ2UsIHRoaXMuX3Jl c291cmNlVVJMRGlkQ2hhbmdlLCB0aGlzKTsKQEAgLTEzNiw4ICsxMzcsOCBAQCBXZWJJbnNwZWN0 b3IuUmVzb3VyY2VDb2xsZWN0aW9uLnByb3RvdHlwZSA9IHsKICAgICAgICAgaWYgKCFvbGRVUkwp CiAgICAgICAgICAgICByZXR1cm47CiAKLSAgICAgICAgdGhpcy5fcmVzb3VyY2VVUkxNYXBbcmVz b3VyY2UudXJsXSA9IHJlc291cmNlOwotICAgICAgICBkZWxldGUgdGhpcy5fcmVzb3VyY2VVUkxN YXBbb2xkVVJMXTsKKyAgICAgICAgdGhpcy5fcmVzb3VyY2VVUkxNYXAuc2V0KHJlc291cmNlLnVy bCwgcmVzb3VyY2UpOworICAgICAgICB0aGlzLl9yZXNvdXJjZVVSTE1hcC5kZWxldGUob2xkVVJM KTsKICAgICB9LAogCiAgICAgX3Jlc291cmNlVHlwZURpZENoYW5nZTogZnVuY3Rpb24oZXZlbnQp CkBAIC0xNTIsMTIgKzE1MywxMyBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VDb2xsZWN0aW9uLnBy b3RvdHlwZSA9IHsKICAgICAgICAgaWYgKCFvbGRUeXBlKQogICAgICAgICAgICAgcmV0dXJuOwog Ci0gICAgICAgIGlmICghdGhpcy5fcmVzb3VyY2VzVHlwZU1hcFtyZXNvdXJjZS50eXBlXSkKLSAg ICAgICAgICAgIHRoaXMuX3Jlc291cmNlc1R5cGVNYXBbcmVzb3VyY2UudHlwZV0gPSBbXTsKLSAg ICAgICAgdGhpcy5fcmVzb3VyY2VzVHlwZU1hcFtyZXNvdXJjZS50eXBlXS5wdXNoKHJlc291cmNl KTsKKyAgICAgICAgaWYgKCF0aGlzLl9yZXNvdXJjZXNUeXBlTWFwLmhhcyhyZXNvdXJjZS50eXBl KSkKKyAgICAgICAgICAgIHRoaXMuX3Jlc291cmNlc1R5cGVNYXAuc2V0KHJlc291cmNlLnR5cGUs IFtyZXNvdXJjZV0pOworICAgICAgICBlbHNlCisgICAgICAgICAgICB0aGlzLl9yZXNvdXJjZXNU eXBlTWFwLmdldChyZXNvdXJjZS50eXBlKS5wdXNoKHJlc291cmNlKTsKIAotICAgICAgICBpZiAo dGhpcy5fcmVzb3VyY2VzVHlwZU1hcFtvbGRUeXBlXSkKLSAgICAgICAgICAgIHRoaXMuX3Jlc291 cmNlc1R5cGVNYXBbb2xkVHlwZV0ucmVtb3ZlKHJlc291cmNlKTsKKyAgICAgICAgaWYgKHRoaXMu X3Jlc291cmNlc1R5cGVNYXAuaGFzKG9sZFR5cGUpKQorICAgICAgICAgICAgdGhpcy5fcmVzb3Vy Y2VzVHlwZU1hcC5nZXQob2xkVHlwZSkucmVtb3ZlKHJlc291cmNlKTsKICAgICB9CiB9OwogCg==