123579 2013-10-31 11:43:56 -0700 Web Inspector: Convert some InspectorObject member variables to HashSet/HashMap 2013-10-31 16:59:30 -0700 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 joepeck webkit-unassigned commit-queue graouts joepeck timothy webkit-bug-importer oldest_to_newest 945613 0 joepeck 2013-10-31 11:43:56 -0700 InspectorObject is more heavyweight then it needs to be for a few of these member variables. 945614 1 webkit-bug-importer 2013-10-31 11:44:16 -0700 <rdar://problem/15364115> 945730 2 215686 joepeck 2013-10-31 15:53:20 -0700 Created attachment 215686 [PATCH] Proposed Fix 945755 3 215686 commit-queue 2013-10-31 16:59:28 -0700 Comment on attachment 215686 [PATCH] Proposed Fix Clearing flags on attachment: 215686 Committed r158408: <http://trac.webkit.org/changeset/158408> 945756 4 commit-queue 2013-10-31 16:59:30 -0700 All reviewed patches have been landed. Closing bug. 215686 2013-10-31 15:53:20 -0700 2013-10-31 16:59:28 -0700 [PATCH] Proposed Fix setmap.patch text/plain 9618 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA5ZGQzMjIyLi5lNWRhNzA2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzAg QEAKKzIwMTMtMTAtMzEgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKwor ICAgICAgICBXZWIgSW5zcGVjdG9yOiBDb252ZXJ0IHNvbWUgSW5zcGVjdG9yT2JqZWN0IG1lbWJl ciB2YXJpYWJsZXMgdG8gSGFzaFNldC9IYXNoTWFwCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjM1NzkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JET01EZWJ1Z2dlckFn ZW50Lmg6CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckRPTURlYnVnZ2VyQWdlbnQuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yRE9NRGVidWdnZXJBZ2VudDo6SW5zcGVjdG9y RE9NRGVidWdnZXJBZ2VudCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JET01EZWJ1Z2dl ckFnZW50OjpzZXRCcmVha3BvaW50KToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckRPTURl YnVnZ2VyQWdlbnQ6OnJlbW92ZUJyZWFrcG9pbnQpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVj dG9yRE9NRGVidWdnZXJBZ2VudDo6cGF1c2VPbk5hdGl2ZUV2ZW50SWZOZWVkZWQpOgorICAgICAg ICAoV2ViQ29yZTo6SW5zcGVjdG9yRE9NRGVidWdnZXJBZ2VudDo6c2V0WEhSQnJlYWtwb2ludCk6 CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JET01EZWJ1Z2dlckFnZW50OjpyZW1vdmVYSFJC cmVha3BvaW50KToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckRPTURlYnVnZ2VyQWdlbnQ6 OndpbGxTZW5kWE1MSHR0cFJlcXVlc3QpOgorICAgICAgICBNYWtlIG1fZXZlbnRMaXN0ZW5lckJy ZWFrcG9pbnRzIGFuZCBtX3hockJyZWFrcG9pbnRzIEhhc2hTZXQuCisKKyAgICAgICAgKiBpbnNw ZWN0b3IvSW5zcGVjdG9yRGVidWdnZXJBZ2VudC5oOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNw ZWN0b3JEZWJ1Z2dlckFnZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckRlYnVn Z2VyQWdlbnQ6Okluc3BlY3RvckRlYnVnZ2VyQWdlbnQpOgorICAgICAgICAoV2ViQ29yZTo6SW5z cGVjdG9yRGVidWdnZXJBZ2VudDo6ZGlzYWJsZSk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0 b3JEZWJ1Z2dlckFnZW50OjpzZXRCcmVha3BvaW50QnlVcmwpOgorICAgICAgICAoV2ViQ29yZTo6 SW5zcGVjdG9yRGVidWdnZXJBZ2VudDo6cmVtb3ZlQnJlYWtwb2ludCk6CisgICAgICAgIChXZWJD b3JlOjpJbnNwZWN0b3JEZWJ1Z2dlckFnZW50OjpkaWRQYXJzZVNvdXJjZSk6CisgICAgICAgIE1h a2UgbV9qYXZhU2NyaXB0QnJlYWtwb2ludHMgYSBIYXNoTWFwLgorCiAyMDEzLTEwLTMwICBKb3Nl cGggUGVjb3Jhcm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3Rv cjogUmVtb3ZlIEluc3BlY3RvclN0YXRlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvSW5zcGVjdG9yRE9NRGVidWdnZXJBZ2VudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvSW5zcGVjdG9yRE9NRGVidWdnZXJBZ2VudC5jcHAKaW5kZXggODliOGE5ZC4uMDBlMGU1 MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRPTURlYnVn Z2VyQWdlbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JET01E ZWJ1Z2dlckFnZW50LmNwcApAQCAtNzIsOCArNzIsNiBAQCBJbnNwZWN0b3JET01EZWJ1Z2dlckFn ZW50OjpJbnNwZWN0b3JET01EZWJ1Z2dlckFnZW50KEluc3RydW1lbnRpbmdBZ2VudHMqIGluc3Ry dQogICAgIDogSW5zcGVjdG9yQmFzZUFnZW50PEluc3BlY3RvckRPTURlYnVnZ2VyQWdlbnQ+KCJE T01EZWJ1Z2dlciIsIGluc3RydW1lbnRpbmdBZ2VudHMpCiAgICAgLCBtX2RvbUFnZW50KGRvbUFn ZW50KQogICAgICwgbV9kZWJ1Z2dlckFnZW50KGRlYnVnZ2VyQWdlbnQpCi0gICAgLCBtX2V2ZW50 TGlzdGVuZXJCcmVha3BvaW50cyhJbnNwZWN0b3JPYmplY3Q6OmNyZWF0ZSgpKQotICAgICwgbV94 aHJCcmVha3BvaW50cyhJbnNwZWN0b3JPYmplY3Q6OmNyZWF0ZSgpKQogICAgICwgbV9wYXVzZUlu TmV4dEV2ZW50TGlzdGVuZXIoZmFsc2UpCiAgICAgLCBtX3BhdXNlT25BbGxYSFJzRW5hYmxlZChm YWxzZSkKIHsKQEAgLTE0Niw3ICsxNDQsNyBAQCB2b2lkIEluc3BlY3RvckRPTURlYnVnZ2VyQWdl bnQ6OnNldEJyZWFrcG9pbnQoRXJyb3JTdHJpbmcqIGVycm9yLCBjb25zdCBTdHJpbmcmCiAgICAg ICAgIHJldHVybjsKICAgICB9CiAKLSAgICBtX2V2ZW50TGlzdGVuZXJCcmVha3BvaW50cy0+c2V0 Qm9vbGVhbihldmVudE5hbWUsIHRydWUpOworICAgIG1fZXZlbnRMaXN0ZW5lckJyZWFrcG9pbnRz LmFkZChldmVudE5hbWUpOwogfQogCiB2b2lkIEluc3BlY3RvckRPTURlYnVnZ2VyQWdlbnQ6OnJl bW92ZUV2ZW50TGlzdGVuZXJCcmVha3BvaW50KEVycm9yU3RyaW5nKiBlcnJvciwgY29uc3QgU3Ry aW5nJiBldmVudE5hbWUpCkBAIC0xNjYsNyArMTY0LDcgQEAgdm9pZCBJbnNwZWN0b3JET01EZWJ1 Z2dlckFnZW50OjpyZW1vdmVCcmVha3BvaW50KEVycm9yU3RyaW5nKiBlcnJvciwgY29uc3QgU3Ry aW4KICAgICAgICAgcmV0dXJuOwogICAgIH0KIAotICAgIG1fZXZlbnRMaXN0ZW5lckJyZWFrcG9p bnRzLT5yZW1vdmUoZXZlbnROYW1lKTsKKyAgICBtX2V2ZW50TGlzdGVuZXJCcmVha3BvaW50cy5y ZW1vdmUoZXZlbnROYW1lKTsKIH0KIAogdm9pZCBJbnNwZWN0b3JET01EZWJ1Z2dlckFnZW50Ojpk aWRJbnZhbGlkYXRlU3R5bGVBdHRyKE5vZGUqIG5vZGUpCkBAIC0zNjQsNyArMzYyLDcgQEAgdm9p ZCBJbnNwZWN0b3JET01EZWJ1Z2dlckFnZW50OjpwYXVzZU9uTmF0aXZlRXZlbnRJZk5lZWRlZChi b29sIGlzRE9NRXZlbnQsIGNvbnMKICAgICBpZiAobV9wYXVzZUluTmV4dEV2ZW50TGlzdGVuZXIp CiAgICAgICAgIG1fcGF1c2VJbk5leHRFdmVudExpc3RlbmVyID0gZmFsc2U7CiAgICAgZWxzZSB7 Ci0gICAgICAgIGlmIChtX2V2ZW50TGlzdGVuZXJCcmVha3BvaW50cy0+ZmluZChmdWxsRXZlbnRO YW1lKSA9PSBtX2V2ZW50TGlzdGVuZXJCcmVha3BvaW50cy0+ZW5kKCkpCisgICAgICAgIGlmICgh bV9ldmVudExpc3RlbmVyQnJlYWtwb2ludHMuY29udGFpbnMoZnVsbEV2ZW50TmFtZSkpCiAgICAg ICAgICAgICByZXR1cm47CiAgICAgfQogCkBAIC0zODMsNyArMzgxLDcgQEAgdm9pZCBJbnNwZWN0 b3JET01EZWJ1Z2dlckFnZW50OjpzZXRYSFJCcmVha3BvaW50KEVycm9yU3RyaW5nKiwgY29uc3Qg U3RyaW5nJiB1cmwKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAotICAgIG1feGhyQnJlYWtwb2lu dHMtPnNldEJvb2xlYW4odXJsLCB0cnVlKTsKKyAgICBtX3hockJyZWFrcG9pbnRzLmFkZCh1cmwp OwogfQogCiB2b2lkIEluc3BlY3RvckRPTURlYnVnZ2VyQWdlbnQ6OnJlbW92ZVhIUkJyZWFrcG9p bnQoRXJyb3JTdHJpbmcqLCBjb25zdCBTdHJpbmcmIHVybCkKQEAgLTM5Myw3ICszOTEsNyBAQCB2 b2lkIEluc3BlY3RvckRPTURlYnVnZ2VyQWdlbnQ6OnJlbW92ZVhIUkJyZWFrcG9pbnQoRXJyb3JT dHJpbmcqLCBjb25zdCBTdHJpbmcmCiAgICAgICAgIHJldHVybjsKICAgICB9CiAKLSAgICBtX3ho ckJyZWFrcG9pbnRzLT5yZW1vdmUodXJsKTsKKyAgICBtX3hockJyZWFrcG9pbnRzLnJlbW92ZSh1 cmwpOwogfQogCiB2b2lkIEluc3BlY3RvckRPTURlYnVnZ2VyQWdlbnQ6OndpbGxTZW5kWE1MSHR0 cFJlcXVlc3QoY29uc3QgU3RyaW5nJiB1cmwpCkBAIC00MDIsOSArNDAwLDkgQEAgdm9pZCBJbnNw ZWN0b3JET01EZWJ1Z2dlckFnZW50Ojp3aWxsU2VuZFhNTEh0dHBSZXF1ZXN0KGNvbnN0IFN0cmlu ZyYgdXJsKQogICAgIGlmIChtX3BhdXNlT25BbGxYSFJzRW5hYmxlZCkKICAgICAgICAgYnJlYWtw b2ludFVSTCA9ICIiOwogICAgIGVsc2UgewotICAgICAgICBmb3IgKEluc3BlY3Rvck9iamVjdDo6 aXRlcmF0b3IgaXQgPSBtX3hockJyZWFrcG9pbnRzLT5iZWdpbigpOyBpdCAhPSBtX3hockJyZWFr cG9pbnRzLT5lbmQoKTsgKytpdCkgewotICAgICAgICAgICAgaWYgKHVybC5jb250YWlucyhpdC0+ a2V5KSkgewotICAgICAgICAgICAgICAgIGJyZWFrcG9pbnRVUkwgPSBpdC0+a2V5OworICAgICAg ICBmb3IgKGF1dG8gaXQgPSBtX3hockJyZWFrcG9pbnRzLmJlZ2luKCksIGVuZCA9IG1feGhyQnJl YWtwb2ludHMuZW5kKCk7IGl0ICE9IGVuZDsgKytpdCkgeworICAgICAgICAgICAgaWYgKHVybC5j b250YWlucygqaXQpKSB7CisgICAgICAgICAgICAgICAgYnJlYWtwb2ludFVSTCA9ICppdDsKICAg ICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgIH0KICAgICAgICAgfQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRPTURlYnVnZ2VyQWdlbnQuaCBi L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JET01EZWJ1Z2dlckFnZW50LmgKaW5k ZXggNWNjYWEwZS4uMzgxZTIxNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L0luc3BlY3RvckRPTURlYnVnZ2VyQWdlbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvSW5zcGVjdG9yRE9NRGVidWdnZXJBZ2VudC5oCkBAIC0xMDUsOCArMTA1LDggQEAgcHJpdmF0 ZToKICAgICBJbnNwZWN0b3JET01BZ2VudCogbV9kb21BZ2VudDsKICAgICBJbnNwZWN0b3JEZWJ1 Z2dlckFnZW50KiBtX2RlYnVnZ2VyQWdlbnQ7CiAgICAgSGFzaE1hcDxOb2RlKiwgdWludDMyX3Q+ IG1fZG9tQnJlYWtwb2ludHM7Ci0gICAgUmVmUHRyPEluc3BlY3Rvck9iamVjdD4gbV9ldmVudExp c3RlbmVyQnJlYWtwb2ludHM7Ci0gICAgUmVmUHRyPEluc3BlY3Rvck9iamVjdD4gbV94aHJCcmVh a3BvaW50czsKKyAgICBIYXNoU2V0PFN0cmluZz4gbV9ldmVudExpc3RlbmVyQnJlYWtwb2ludHM7 CisgICAgSGFzaFNldDxTdHJpbmc+IG1feGhyQnJlYWtwb2ludHM7CiAgICAgYm9vbCBtX3BhdXNl SW5OZXh0RXZlbnRMaXN0ZW5lcjsKICAgICBib29sIG1fcGF1c2VPbkFsbFhIUnNFbmFibGVkOwog fTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JEZWJ1Z2dl ckFnZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JEZWJ1Z2dlckFn ZW50LmNwcAppbmRleCBkM2FiM2M4Li5iMDg4MmU0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvSW5zcGVjdG9yRGVidWdnZXJBZ2VudC5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL0luc3BlY3RvckRlYnVnZ2VyQWdlbnQuY3BwCkBAIC01OSw3ICs1OSw2IEBA IEluc3BlY3RvckRlYnVnZ2VyQWdlbnQ6Okluc3BlY3RvckRlYnVnZ2VyQWdlbnQoSW5zdHJ1bWVu dGluZ0FnZW50cyogaW5zdHJ1bWVudGluCiAgICAgLCBtX2luamVjdGVkU2NyaXB0TWFuYWdlcihp bmplY3RlZFNjcmlwdE1hbmFnZXIpCiAgICAgLCBtX2Zyb250ZW5kKDApCiAgICAgLCBtX3BhdXNl ZFNjcmlwdFN0YXRlKDApCi0gICAgLCBtX2phdmFTY3JpcHRCcmVha3BvaW50cyhJbnNwZWN0b3JP YmplY3Q6OmNyZWF0ZSgpKQogICAgICwgbV9lbmFibGVkKGZhbHNlKQogICAgICwgbV9qYXZhU2Ny aXB0UGF1c2VTY2hlZHVsZWQoZmFsc2UpCiAgICAgLCBtX2xpc3RlbmVyKDApCkBAIC04OSw3ICs4 OCw3IEBAIHZvaWQgSW5zcGVjdG9yRGVidWdnZXJBZ2VudDo6ZW5hYmxlKCkKIAogdm9pZCBJbnNw ZWN0b3JEZWJ1Z2dlckFnZW50OjpkaXNhYmxlKCkKIHsKLSAgICBtX2phdmFTY3JpcHRCcmVha3Bv aW50cyA9IEluc3BlY3Rvck9iamVjdDo6Y3JlYXRlKCk7CisgICAgbV9qYXZhU2NyaXB0QnJlYWtw b2ludHMuY2xlYXIoKTsKICAgICBtX2luc3RydW1lbnRpbmdBZ2VudHMtPnNldEluc3BlY3RvckRl YnVnZ2VyQWdlbnQoMCk7CiAKICAgICBzdG9wTGlzdGVuaW5nU2NyaXB0RGVidWdTZXJ2ZXIoKTsK QEAgLTI3NSw3ICsyNzQsNyBAQCB2b2lkIEluc3BlY3RvckRlYnVnZ2VyQWdlbnQ6OnNldEJyZWFr cG9pbnRCeVVybChFcnJvclN0cmluZyogZXJyb3JTdHJpbmcsIGludCBsaQogICAgIGJvb2wgaXNS ZWdleCA9IG9wdGlvbmFsVVJMUmVnZXg7CiAKICAgICBTdHJpbmcgYnJlYWtwb2ludElkID0gKGlz UmVnZXggPyAiLyIgKyB1cmwgKyAiLyIgOiB1cmwpICsgJzonICsgU3RyaW5nOjpudW1iZXIobGlu ZU51bWJlcikgKyAnOicgKyBTdHJpbmc6Om51bWJlcihjb2x1bW5OdW1iZXIpOwotICAgIGlmICht X2phdmFTY3JpcHRCcmVha3BvaW50cy0+ZmluZChicmVha3BvaW50SWQpICE9IG1famF2YVNjcmlw dEJyZWFrcG9pbnRzLT5lbmQoKSkgeworICAgIGlmIChtX2phdmFTY3JpcHRCcmVha3BvaW50cy5j b250YWlucyhicmVha3BvaW50SWQpKSB7CiAgICAgICAgICplcnJvclN0cmluZyA9ICJCcmVha3Bv aW50IGF0IHNwZWNpZmllZCBsb2NhdGlvbiBhbHJlYWR5IGV4aXN0cy4iOwogICAgICAgICByZXR1 cm47CiAgICAgfQpAQCAtMjkzLDcgKzI5Miw3IEBAIHZvaWQgSW5zcGVjdG9yRGVidWdnZXJBZ2Vu dDo6c2V0QnJlYWtwb2ludEJ5VXJsKEVycm9yU3RyaW5nKiBlcnJvclN0cmluZywgaW50IGxpCiAg ICAgaWYgKCFicmVha3BvaW50QWN0aW9uc0Zyb21Qcm90b2NvbChlcnJvclN0cmluZywgYWN0aW9u cywgJmJyZWFrcG9pbnRBY3Rpb25zKSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgbV9qYXZhU2Ny aXB0QnJlYWtwb2ludHMtPnNldE9iamVjdChicmVha3BvaW50SWQsIGJ1aWxkT2JqZWN0Rm9yQnJl YWtwb2ludENvb2tpZSh1cmwsIGxpbmVOdW1iZXIsIGNvbHVtbk51bWJlciwgY29uZGl0aW9uLCBh Y3Rpb25zLCBpc1JlZ2V4LCBhdXRvQ29udGludWUpKTsKKyAgICBtX2phdmFTY3JpcHRCcmVha3Bv aW50cy5zZXQoYnJlYWtwb2ludElkLCBidWlsZE9iamVjdEZvckJyZWFrcG9pbnRDb29raWUodXJs LCBsaW5lTnVtYmVyLCBjb2x1bW5OdW1iZXIsIGNvbmRpdGlvbiwgYWN0aW9ucywgaXNSZWdleCwg YXV0b0NvbnRpbnVlKSk7CiAKICAgICBTY3JpcHRCcmVha3BvaW50IGJyZWFrcG9pbnQobGluZU51 bWJlciwgY29sdW1uTnVtYmVyLCBjb25kaXRpb24sIGJyZWFrcG9pbnRBY3Rpb25zLCBhdXRvQ29u dGludWUpOwogICAgIGZvciAoU2NyaXB0c01hcDo6aXRlcmF0b3IgaXQgPSBtX3NjcmlwdHMuYmVn aW4oKTsgaXQgIT0gbV9zY3JpcHRzLmVuZCgpOyArK2l0KSB7CkBAIC0zNTcsNyArMzU2LDcgQEAg dm9pZCBJbnNwZWN0b3JEZWJ1Z2dlckFnZW50OjpzZXRCcmVha3BvaW50KEVycm9yU3RyaW5nKiBl cnJvclN0cmluZywgY29uc3QgUmVmUHQKIAogdm9pZCBJbnNwZWN0b3JEZWJ1Z2dlckFnZW50Ojpy ZW1vdmVCcmVha3BvaW50KEVycm9yU3RyaW5nKiwgY29uc3QgU3RyaW5nJiBicmVha3BvaW50SWQp CiB7Ci0gICAgbV9qYXZhU2NyaXB0QnJlYWtwb2ludHMtPnJlbW92ZShicmVha3BvaW50SWQpOwor ICAgIG1famF2YVNjcmlwdEJyZWFrcG9pbnRzLnJlbW92ZShicmVha3BvaW50SWQpOwogCiAgICAg QnJlYWtwb2ludElkVG9EZWJ1Z1NlcnZlckJyZWFrcG9pbnRJZHNNYXA6Oml0ZXJhdG9yIGRlYnVn U2VydmVyQnJlYWtwb2ludElkc0l0ZXJhdG9yID0gbV9icmVha3BvaW50SWRUb0RlYnVnU2VydmVy QnJlYWtwb2ludElkcy5maW5kKGJyZWFrcG9pbnRJZCk7CiAgICAgaWYgKGRlYnVnU2VydmVyQnJl YWtwb2ludElkc0l0ZXJhdG9yID09IG1fYnJlYWtwb2ludElkVG9EZWJ1Z1NlcnZlckJyZWFrcG9p bnRJZHMuZW5kKCkpCkBAIC02OTUsNyArNjk0LDcgQEAgdm9pZCBJbnNwZWN0b3JEZWJ1Z2dlckFn ZW50OjpkaWRQYXJzZVNvdXJjZShjb25zdCBTdHJpbmcmIHNjcmlwdElkLCBjb25zdCBTY3JpcHQK ICAgICBpZiAoc2NyaXB0VVJMLmlzRW1wdHkoKSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgZm9y IChJbnNwZWN0b3JPYmplY3Q6Oml0ZXJhdG9yIGl0ID0gbV9qYXZhU2NyaXB0QnJlYWtwb2ludHMt PmJlZ2luKCk7IGl0ICE9IG1famF2YVNjcmlwdEJyZWFrcG9pbnRzLT5lbmQoKTsgKytpdCkgewor ICAgIGZvciAoYXV0byBpdCA9IG1famF2YVNjcmlwdEJyZWFrcG9pbnRzLmJlZ2luKCksIGVuZCA9 IG1famF2YVNjcmlwdEJyZWFrcG9pbnRzLmVuZCgpOyBpdCAhPSBlbmQ7ICsraXQpIHsKICAgICAg ICAgUmVmUHRyPEluc3BlY3Rvck9iamVjdD4gYnJlYWtwb2ludE9iamVjdCA9IGl0LT52YWx1ZS0+ YXNPYmplY3QoKTsKICAgICAgICAgYm9vbCBpc1JlZ2V4OwogICAgICAgICBicmVha3BvaW50T2Jq ZWN0LT5nZXRCb29sZWFuKCJpc1JlZ2V4IiwgJmlzUmVnZXgpOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRlYnVnZ2VyQWdlbnQuaCBiL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9JbnNwZWN0b3JEZWJ1Z2dlckFnZW50LmgKaW5kZXggNTJjODFjMy4uNjdm MzYxZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRlYnVn Z2VyQWdlbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRGVidWdn ZXJBZ2VudC5oCkBAIC0xNjMsNiArMTYzLDcgQEAgcHJpdmF0ZToKIAogICAgIHR5cGVkZWYgSGFz aE1hcDxTdHJpbmcsIFNjcmlwdD4gU2NyaXB0c01hcDsKICAgICB0eXBlZGVmIEhhc2hNYXA8U3Ry aW5nLCBWZWN0b3I8U3RyaW5nPj4gQnJlYWtwb2ludElkVG9EZWJ1Z1NlcnZlckJyZWFrcG9pbnRJ ZHNNYXA7CisgICAgdHlwZWRlZiBIYXNoTWFwPFN0cmluZywgUmVmUHRyPEluc3BlY3Rvck9iamVj dD4+IEJyZWFrcG9pbnRJZFRvQnJlYWtwb2ludE1hcDsKIAogICAgIEluamVjdGVkU2NyaXB0TWFu YWdlciogbV9pbmplY3RlZFNjcmlwdE1hbmFnZXI7CiAgICAgSW5zcGVjdG9yRnJvbnRlbmQ6OkRl YnVnZ2VyKiBtX2Zyb250ZW5kOwpAQCAtMTcwLDEwICsxNzEsMTAgQEAgcHJpdmF0ZToKICAgICBT Y3JpcHRWYWx1ZSBtX2N1cnJlbnRDYWxsU3RhY2s7CiAgICAgU2NyaXB0c01hcCBtX3NjcmlwdHM7 CiAgICAgQnJlYWtwb2ludElkVG9EZWJ1Z1NlcnZlckJyZWFrcG9pbnRJZHNNYXAgbV9icmVha3Bv aW50SWRUb0RlYnVnU2VydmVyQnJlYWtwb2ludElkczsKKyAgICBCcmVha3BvaW50SWRUb0JyZWFr cG9pbnRNYXAgbV9qYXZhU2NyaXB0QnJlYWtwb2ludHM7CiAgICAgU3RyaW5nIG1fY29udGludWVU b0xvY2F0aW9uQnJlYWtwb2ludElkOwogICAgIEluc3BlY3RvckZyb250ZW5kOjpEZWJ1Z2dlcjo6 UmVhc29uOjpFbnVtIG1fYnJlYWtSZWFzb247CiAgICAgUmVmUHRyPEluc3BlY3Rvck9iamVjdD4g bV9icmVha0F1eERhdGE7Ci0gICAgUmVmUHRyPEluc3BlY3Rvck9iamVjdD4gbV9qYXZhU2NyaXB0 QnJlYWtwb2ludHM7CiAgICAgYm9vbCBtX2VuYWJsZWQ7CiAgICAgYm9vbCBtX2phdmFTY3JpcHRQ YXVzZVNjaGVkdWxlZDsKICAgICBMaXN0ZW5lciogbV9saXN0ZW5lcjsK