160873 2016-08-15 16:08:24 -0700 Rename RegisteredEventListener::listener() to callback() for clarity 2016-08-15 23:50:14 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 cdumez cdumez commit-queue darin esprehn+autocc kangil.han rniwa sam oldest_to_newest 1220205 0 cdumez 2016-08-15 16:08:24 -0700 Rename RegisteredEventListener::listener() to callback() for clarity and to match the spec: - https://dom.spec.whatwg.org/#concept-event-listener Always calling listener->listener() seems wrong. 1220206 1 286109 cdumez 2016-08-15 16:09:31 -0700 Created attachment 286109 Patch 1220391 2 286109 commit-queue 2016-08-15 23:50:09 -0700 Comment on attachment 286109 Patch Clearing flags on attachment: 286109 Committed r204499: <http://trac.webkit.org/changeset/204499> 1220392 3 commit-queue 2016-08-15 23:50:14 -0700 All reviewed patches have been landed. Closing bug. 286109 2016-08-15 16:09:31 -0700 2016-08-15 23:50:09 -0700 Patch bug-160873-20160815160746.patch text/plain 9746 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjA0NDg0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTk3MGVmOTUwOGZkNjZm NTU1NmRkZTI3NzVkZmEyMTc2MWM4ZTczZC4uNmMyYTA0MDIyM2VmNWMzYzcyZTU1MTU1N2UwZDQy MjQyMzJjOGNjMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDE2LTA4LTE1ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgUmVuYW1lIFJlZ2lzdGVyZWRF dmVudExpc3RlbmVyOjpsaXN0ZW5lcigpIHRvIGNhbGxiYWNrKCkgZm9yIGNsYXJpdHkKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2MDg3MworCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlbmFtZSBSZWdpc3Rl cmVkRXZlbnRMaXN0ZW5lcjo6bGlzdGVuZXIoKSB0byBjYWxsYmFjaygpIGZvciBjbGFyaXR5Cisg ICAgICAgIGFuZCB0byBtYXRjaCB0aGUgc3BlY2lmaWNhdGlvbjoKKyAgICAgICAgLSBodHRwczov L2RvbS5zcGVjLndoYXR3Zy5vcmcvI2NvbmNlcHQtZXZlbnQtbGlzdGVuZXIKKworICAgICAgICBB bHdheXMgY2FsbGluZyBsaXN0ZW5lci0+bGlzdGVuZXIoKSBzZWVtcyB3cm9uZy4KKworICAgICAg ICAqIGJpbmRpbmdzL2pzL0pTQ29tbWFuZExpbmVBUElIb3N0Q3VzdG9tLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OmdldEpTTGlzdGVuZXJGdW5jdGlvbnMpOgorICAgICAgICAqIGRvbS9FdmVudExp c3RlbmVyTWFwLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmZpbmRMaXN0ZW5lcik6CisgICAgICAg IChXZWJDb3JlOjpyZW1vdmVGaXJzdExpc3RlbmVyQ3JlYXRlZEZyb21NYXJrdXApOgorICAgICAg ICAoV2ViQ29yZTo6Y29weUxpc3RlbmVyc05vdENyZWF0ZWRGcm9tTWFya3VwVG9UYXJnZXQpOgor ICAgICAgICAoV2ViQ29yZTo6RXZlbnRMaXN0ZW5lckl0ZXJhdG9yOjpuZXh0TGlzdGVuZXIpOgor ICAgICAgICAqIGRvbS9FdmVudFRhcmdldC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpFdmVudFRh cmdldDo6Z2V0QXR0cmlidXRlRXZlbnRMaXN0ZW5lcik6CisgICAgICAgIChXZWJDb3JlOjpFdmVu dFRhcmdldDo6ZmlyZUV2ZW50TGlzdGVuZXJzKToKKyAgICAgICAgKiBkb20vUmVnaXN0ZXJlZEV2 ZW50TGlzdGVuZXIuaDoKKyAgICAgICAgKFdlYkNvcmU6OlJlZ2lzdGVyZWRFdmVudExpc3RlbmVy OjpjYWxsYmFjayk6CisgICAgICAgIChXZWJDb3JlOjpSZWdpc3RlcmVkRXZlbnRMaXN0ZW5lcjo6 UmVnaXN0ZXJlZEV2ZW50TGlzdGVuZXIpOgorICAgICAgICAoV2ViQ29yZTo6UmVnaXN0ZXJlZEV2 ZW50TGlzdGVuZXI6Omxpc3RlbmVyKTogRGVsZXRlZC4KKyAgICAgICAgKiBpbnNwZWN0b3IvSW5z cGVjdG9yRE9NQWdlbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yRE9NQWdlbnQ6 OmdldEV2ZW50TGlzdGVuZXJzKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckRPTUFnZW50 OjpidWlsZE9iamVjdEZvckV2ZW50TGlzdGVuZXIpOgorCiAyMDE2LTA4LTE1ICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmVuYW1lIFNvY2tl dFN0cmVhbUhhbmRsZUJhc2UgdG8gU29ja2V0U3RyZWFtSGFuZGxlIGFuZCBTb2NrZXRTdHJlYW1I YW5kbGUgdG8gU29ja2V0U3RyZWFtSGFuZGxlSW1wbApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvYmluZGluZ3MvanMvSlNDb21tYW5kTGluZUFQSUhvc3RDdXN0b20uY3BwIGIvU291cmNlL1dl YkNvcmUvYmluZGluZ3MvanMvSlNDb21tYW5kTGluZUFQSUhvc3RDdXN0b20uY3BwCmluZGV4IDU3 NTE5NjJjMGIyZDMwYjM4MTAxZWYyMGFlYzFhMDU3NGM3MjcyYjEuLjZkYmFmZjM3NzdlYjdlZWNi NWZlOTlkYWJjYzg1OWFjMmQ2Y2RiYTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRp bmdzL2pzL0pTQ29tbWFuZExpbmVBUElIb3N0Q3VzdG9tLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9iaW5kaW5ncy9qcy9KU0NvbW1hbmRMaW5lQVBJSG9zdEN1c3RvbS5jcHAKQEAgLTczLDcgKzcz LDcgQEAgc3RhdGljIEpTQXJyYXkqIGdldEpTTGlzdGVuZXJGdW5jdGlvbnMoRXhlY1N0YXRlJiBz dGF0ZSwgRG9jdW1lbnQqIGRvY3VtZW50LCBjb24KICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAg ICAgc2l6ZV90IGhhbmRsZXJzQ291bnQgPSBsaXN0ZW5lckluZm8uZXZlbnRMaXN0ZW5lclZlY3Rv ci5zaXplKCk7CiAgICAgZm9yIChzaXplX3QgaSA9IDAsIG91dHB1dEluZGV4ID0gMDsgaSA8IGhh bmRsZXJzQ291bnQ7ICsraSkgewotICAgICAgICBjb25zdCBKU0V2ZW50TGlzdGVuZXIqIGpzTGlz dGVuZXIgPSBKU0V2ZW50TGlzdGVuZXI6OmNhc3QoJmxpc3RlbmVySW5mby5ldmVudExpc3RlbmVy VmVjdG9yW2ldLT5saXN0ZW5lcigpKTsKKyAgICAgICAgY29uc3QgSlNFdmVudExpc3RlbmVyKiBq c0xpc3RlbmVyID0gSlNFdmVudExpc3RlbmVyOjpjYXN0KCZsaXN0ZW5lckluZm8uZXZlbnRMaXN0 ZW5lclZlY3RvcltpXS0+Y2FsbGJhY2soKSk7CiAgICAgICAgIGlmICghanNMaXN0ZW5lcikgewog ICAgICAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CiAgICAgICAgICAgICBjb250aW51ZTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9FdmVudExpc3RlbmVyTWFwLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL2RvbS9FdmVudExpc3RlbmVyTWFwLmNwcAppbmRleCA3OTI0MWIxNTRhODVh MTliNzA3ZmVlZTdjZmY5MDFjMzEzYjU3ZjYwLi5jNWFhMzFjMTgyNDZlNzU0MjMwYjk1MjRmYTZi NzVlMGQ5YjM5NzQ2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vRXZlbnRMaXN0ZW5l ck1hcC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL0V2ZW50TGlzdGVuZXJNYXAuY3BwCkBA IC0xMDIsNyArMTAyLDcgQEAgc3RhdGljIGlubGluZSBzaXplX3QgZmluZExpc3RlbmVyKGNvbnN0 IEV2ZW50TGlzdGVuZXJWZWN0b3ImIGxpc3RlbmVycywgRXZlbnRMaXMKIHsKICAgICBmb3IgKHNp emVfdCBpID0gMDsgaSA8IGxpc3RlbmVycy5zaXplKCk7ICsraSkgewogICAgICAgICBhdXRvJiBy ZWdpc3RlcmVkTGlzdGVuZXIgPSBsaXN0ZW5lcnNbaV07Ci0gICAgICAgIGlmIChyZWdpc3RlcmVk TGlzdGVuZXItPmxpc3RlbmVyKCkgPT0gbGlzdGVuZXIgJiYgcmVnaXN0ZXJlZExpc3RlbmVyLT51 c2VDYXB0dXJlKCkgPT0gdXNlQ2FwdHVyZSkKKyAgICAgICAgaWYgKHJlZ2lzdGVyZWRMaXN0ZW5l ci0+Y2FsbGJhY2soKSA9PSBsaXN0ZW5lciAmJiByZWdpc3RlcmVkTGlzdGVuZXItPnVzZUNhcHR1 cmUoKSA9PSB1c2VDYXB0dXJlKQogICAgICAgICAgICAgcmV0dXJuIGk7CiAgICAgfQogICAgIHJl dHVybiBub3RGb3VuZDsKQEAgLTE2Nyw3ICsxNjcsNyBAQCBFdmVudExpc3RlbmVyVmVjdG9yKiBF dmVudExpc3RlbmVyTWFwOjpmaW5kKGNvbnN0IEF0b21pY1N0cmluZyYgZXZlbnRUeXBlKSBjb25z dAogc3RhdGljIHZvaWQgcmVtb3ZlRmlyc3RMaXN0ZW5lckNyZWF0ZWRGcm9tTWFya3VwKEV2ZW50 TGlzdGVuZXJWZWN0b3ImIGxpc3RlbmVyVmVjdG9yKQogewogICAgIGJvb2wgZm91bmRMaXN0ZW5l ciA9IGxpc3RlbmVyVmVjdG9yLnJlbW92ZUZpcnN0TWF0Y2hpbmcoW10gKGNvbnN0IGF1dG8mIHJl Z2lzdGVyZWRMaXN0ZW5lcikgewotICAgICAgICBpZiAocmVnaXN0ZXJlZExpc3RlbmVyLT5saXN0 ZW5lcigpLndhc0NyZWF0ZWRGcm9tTWFya3VwKCkpIHsKKyAgICAgICAgaWYgKHJlZ2lzdGVyZWRM aXN0ZW5lci0+Y2FsbGJhY2soKS53YXNDcmVhdGVkRnJvbU1hcmt1cCgpKSB7CiAgICAgICAgICAg ICByZWdpc3RlcmVkTGlzdGVuZXItPm1hcmtBc1JlbW92ZWQoKTsKICAgICAgICAgICAgIHJldHVy biB0cnVlOwogICAgICAgICB9CkBAIC0xOTQsOSArMTk0LDkgQEAgc3RhdGljIHZvaWQgY29weUxp c3RlbmVyc05vdENyZWF0ZWRGcm9tTWFya3VwVG9UYXJnZXQoY29uc3QgQXRvbWljU3RyaW5nJiBl dmVudFQKIHsKICAgICBmb3IgKGF1dG8mIHJlZ2lzdGVyZWRMaXN0ZW5lciA6IGxpc3RlbmVyVmVj dG9yKSB7CiAgICAgICAgIC8vIEV2ZW50IGxpc3RlbmVycyBjcmVhdGVkIGZyb20gbWFya3VwIGhh dmUgYWxyZWFkeSBiZWVuIHRyYW5zZmVyZWQgdG8gdGhlIHNoYWRvdyB0cmVlIGR1cmluZyBjbG9u aW5nLgotICAgICAgICBpZiAocmVnaXN0ZXJlZExpc3RlbmVyLT5saXN0ZW5lcigpLndhc0NyZWF0 ZWRGcm9tTWFya3VwKCkpCisgICAgICAgIGlmIChyZWdpc3RlcmVkTGlzdGVuZXItPmNhbGxiYWNr KCkud2FzQ3JlYXRlZEZyb21NYXJrdXAoKSkKICAgICAgICAgICAgIGNvbnRpbnVlOwotICAgICAg ICB0YXJnZXQtPmFkZEV2ZW50TGlzdGVuZXIoZXZlbnRUeXBlLCByZWdpc3RlcmVkTGlzdGVuZXIt Pmxpc3RlbmVyKCksIHJlZ2lzdGVyZWRMaXN0ZW5lci0+dXNlQ2FwdHVyZSgpKTsKKyAgICAgICAg dGFyZ2V0LT5hZGRFdmVudExpc3RlbmVyKGV2ZW50VHlwZSwgcmVnaXN0ZXJlZExpc3RlbmVyLT5j YWxsYmFjaygpLCByZWdpc3RlcmVkTGlzdGVuZXItPnVzZUNhcHR1cmUoKSk7CiAgICAgfQogfQog CkBAIC0yMzksNyArMjM5LDcgQEAgRXZlbnRMaXN0ZW5lciogRXZlbnRMaXN0ZW5lckl0ZXJhdG9y OjpuZXh0TGlzdGVuZXIoKQogICAgIGZvciAoOyBtX2VudHJ5SW5kZXggPCBtX21hcC0+bV9lbnRy aWVzLnNpemUoKTsgKyttX2VudHJ5SW5kZXgpIHsKICAgICAgICAgRXZlbnRMaXN0ZW5lclZlY3Rv ciYgbGlzdGVuZXJzID0gKm1fbWFwLT5tX2VudHJpZXNbbV9lbnRyeUluZGV4XS5zZWNvbmQ7CiAg ICAgICAgIGlmIChtX2luZGV4IDwgbGlzdGVuZXJzLnNpemUoKSkKLSAgICAgICAgICAgIHJldHVy biAmbGlzdGVuZXJzW21faW5kZXgrK10tPmxpc3RlbmVyKCk7CisgICAgICAgICAgICByZXR1cm4g Jmxpc3RlbmVyc1ttX2luZGV4KytdLT5jYWxsYmFjaygpOwogICAgICAgICBtX2luZGV4ID0gMDsK ICAgICB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9FdmVudFRhcmdldC5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9kb20vRXZlbnRUYXJnZXQuY3BwCmluZGV4IGI3YTMyZDQxYjFjYWU3 ZjA4OWY4MmUyMjliZWY4ODA1MmIxNzhkMzkuLmJhZTNlYzJiNDM3MTcwMzE0YzU3NzFkNTU4MmYy MWJhZGJlZjQ4ODUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9FdmVudFRhcmdldC5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL0V2ZW50VGFyZ2V0LmNwcApAQCAtMTE2LDggKzEx Niw4IEBAIGJvb2wgRXZlbnRUYXJnZXQ6OnNldEF0dHJpYnV0ZUV2ZW50TGlzdGVuZXIoY29uc3Qg QXRvbWljU3RyaW5nJiBldmVudFR5cGUsIFJlZlB0CiBFdmVudExpc3RlbmVyKiBFdmVudFRhcmdl dDo6Z2V0QXR0cmlidXRlRXZlbnRMaXN0ZW5lcihjb25zdCBBdG9taWNTdHJpbmcmIGV2ZW50VHlw ZSkKIHsKICAgICBmb3IgKGF1dG8mIGV2ZW50TGlzdGVuZXIgOiBnZXRFdmVudExpc3RlbmVycyhl dmVudFR5cGUpKSB7Ci0gICAgICAgIGlmIChldmVudExpc3RlbmVyLT5saXN0ZW5lcigpLmlzQXR0 cmlidXRlKCkpCi0gICAgICAgICAgICByZXR1cm4gJmV2ZW50TGlzdGVuZXItPmxpc3RlbmVyKCk7 CisgICAgICAgIGlmIChldmVudExpc3RlbmVyLT5jYWxsYmFjaygpLmlzQXR0cmlidXRlKCkpCisg ICAgICAgICAgICByZXR1cm4gJmV2ZW50TGlzdGVuZXItPmNhbGxiYWNrKCk7CiAgICAgfQogICAg IHJldHVybiBudWxscHRyOwogfQpAQCAtMjQ5LDcgKzI0OSw3IEBAIHZvaWQgRXZlbnRUYXJnZXQ6 OmZpcmVFdmVudExpc3RlbmVycyhFdmVudCYgZXZlbnQsIEV2ZW50TGlzdGVuZXJWZWN0b3IgbGlz dGVuZXJzCiAKICAgICAgICAgLy8gRG8gdGhpcyBiZWZvcmUgaW52b2NhdGlvbiB0byBhdm9pZCBy ZWVudHJhbmN5IGlzc3Vlcy4KICAgICAgICAgaWYgKHJlZ2lzdGVyZWRMaXN0ZW5lci0+aXNPbmNl KCkpCi0gICAgICAgICAgICByZW1vdmVFdmVudExpc3RlbmVyKGV2ZW50LnR5cGUoKSwgcmVnaXN0 ZXJlZExpc3RlbmVyLT5saXN0ZW5lcigpLCBMaXN0ZW5lck9wdGlvbnMocmVnaXN0ZXJlZExpc3Rl bmVyLT51c2VDYXB0dXJlKCkpKTsKKyAgICAgICAgICAgIHJlbW92ZUV2ZW50TGlzdGVuZXIoZXZl bnQudHlwZSgpLCByZWdpc3RlcmVkTGlzdGVuZXItPmNhbGxiYWNrKCksIExpc3RlbmVyT3B0aW9u cyhyZWdpc3RlcmVkTGlzdGVuZXItPnVzZUNhcHR1cmUoKSkpOwogCiAgICAgICAgIGlmIChyZWdp c3RlcmVkTGlzdGVuZXItPmlzUGFzc2l2ZSgpKQogICAgICAgICAgICAgZXZlbnQuc2V0SW5QYXNz aXZlTGlzdGVuZXIodHJ1ZSk7CkBAIC0yNTcsNyArMjU3LDcgQEAgdm9pZCBFdmVudFRhcmdldDo6 ZmlyZUV2ZW50TGlzdGVuZXJzKEV2ZW50JiBldmVudCwgRXZlbnRMaXN0ZW5lclZlY3RvciBsaXN0 ZW5lcnMKICAgICAgICAgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uQ29va2llIGNvb2tpZSA9IElu c3BlY3Rvckluc3RydW1lbnRhdGlvbjo6d2lsbEhhbmRsZUV2ZW50KGNvbnRleHQsIGV2ZW50KTsK ICAgICAgICAgLy8gVG8gbWF0Y2ggTW96aWxsYSwgdGhlIEFUX1RBUkdFVCBwaGFzZSBmaXJlcyBi b3RoIGNhcHR1cmluZyBhbmQgYnViYmxpbmcKICAgICAgICAgLy8gZXZlbnQgbGlzdGVuZXJzLCBl dmVuIHRob3VnaCB0aGF0IHZpb2xhdGVzIHNvbWUgdmVyc2lvbnMgb2YgdGhlIERPTSBzcGVjLgot ICAgICAgICByZWdpc3RlcmVkTGlzdGVuZXItPmxpc3RlbmVyKCkuaGFuZGxlRXZlbnQoY29udGV4 dCwgJmV2ZW50KTsKKyAgICAgICAgcmVnaXN0ZXJlZExpc3RlbmVyLT5jYWxsYmFjaygpLmhhbmRs ZUV2ZW50KGNvbnRleHQsICZldmVudCk7CiAgICAgICAgIEluc3BlY3Rvckluc3RydW1lbnRhdGlv bjo6ZGlkSGFuZGxlRXZlbnQoY29va2llKTsKIAogICAgICAgICBpZiAocmVnaXN0ZXJlZExpc3Rl bmVyLT5pc1Bhc3NpdmUoKSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9SZWdpc3Rl cmVkRXZlbnRMaXN0ZW5lci5oIGIvU291cmNlL1dlYkNvcmUvZG9tL1JlZ2lzdGVyZWRFdmVudExp c3RlbmVyLmgKaW5kZXggYzJjZDRjZjhiOWYxOGJkMjU0YmYzZjVlYWEyOTM0YzZkNTc2NzkxOS4u YjdmM2JmN2ZhODdhYTc4NGEzOGE5YzY0Yjk5YjlhYzVjODM4NmRkMyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvZG9tL1JlZ2lzdGVyZWRFdmVudExpc3RlbmVyLmgKKysrIGIvU291cmNlL1dl YkNvcmUvZG9tL1JlZ2lzdGVyZWRFdmVudExpc3RlbmVyLmgKQEAgLTQ5LDcgKzQ5LDcgQEAgcHVi bGljOgogICAgICAgICByZXR1cm4gYWRvcHRSZWYoKm5ldyBSZWdpc3RlcmVkRXZlbnRMaXN0ZW5l cihXVEZNb3ZlKGxpc3RlbmVyKSwgb3B0aW9ucykpOwogICAgIH0KIAotICAgIEV2ZW50TGlzdGVu ZXImIGxpc3RlbmVyKCkgY29uc3QgeyByZXR1cm4gY29uc3RfY2FzdDxFdmVudExpc3RlbmVyJj4o bV9saXN0ZW5lci5nZXQoKSk7IH0KKyAgICBFdmVudExpc3RlbmVyJiBjYWxsYmFjaygpIGNvbnN0 IHsgcmV0dXJuIGNvbnN0X2Nhc3Q8RXZlbnRMaXN0ZW5lciY+KG1fY2FsbGJhY2suZ2V0KCkpOyB9 CiAgICAgYm9vbCB1c2VDYXB0dXJlKCkgY29uc3QgeyByZXR1cm4gbV91c2VDYXB0dXJlOyB9CiAg ICAgYm9vbCBpc1Bhc3NpdmUoKSBjb25zdCB7IHJldHVybiBtX2lzUGFzc2l2ZTsgfQogICAgIGJv b2wgaXNPbmNlKCkgY29uc3QgeyByZXR1cm4gbV9pc09uY2U7IH0KQEAgLTU5LDE0ICs1OSwxNCBA QCBwdWJsaWM6CiAKIHByaXZhdGU6CiAgICAgUmVnaXN0ZXJlZEV2ZW50TGlzdGVuZXIoUmVmPEV2 ZW50TGlzdGVuZXI+JiYgbGlzdGVuZXIsIGNvbnN0IE9wdGlvbnMmIG9wdGlvbnMpCi0gICAgICAg IDogbV9saXN0ZW5lcihXVEZNb3ZlKGxpc3RlbmVyKSkKKyAgICAgICAgOiBtX2NhbGxiYWNrKFdU Rk1vdmUobGlzdGVuZXIpKQogICAgICAgICAsIG1fdXNlQ2FwdHVyZShvcHRpb25zLmNhcHR1cmUp CiAgICAgICAgICwgbV9pc1Bhc3NpdmUob3B0aW9ucy5wYXNzaXZlKQogICAgICAgICAsIG1faXNP bmNlKG9wdGlvbnMub25jZSkKICAgICB7CiAgICAgfQogCi0gICAgUmVmPEV2ZW50TGlzdGVuZXI+ IG1fbGlzdGVuZXI7CisgICAgUmVmPEV2ZW50TGlzdGVuZXI+IG1fY2FsbGJhY2s7CiAgICAgYm9v bCBtX3VzZUNhcHR1cmUgeyBmYWxzZSB9OwogICAgIGJvb2wgbV9pc1Bhc3NpdmUgeyBmYWxzZSB9 OwogICAgIGJvb2wgbV9pc09uY2UgeyBmYWxzZSB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL0luc3BlY3RvckRPTUFnZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9JbnNwZWN0b3JET01BZ2VudC5jcHAKaW5kZXggNjQ0M2I2NTY5ZWI3YmZjZjQ3NzkzM2E3 YmZkODhlMGEyZWYzMjNmNy4uMmQzZTAzYWY0ZGQ5YTM0OWRjY2E3ZmE1ZjJjMGUyMWNkY2NmMTQ5 OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRPTUFnZW50 LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRE9NQWdlbnQuY3Bw CkBAIC04NjAsNyArODYwLDcgQEAgdm9pZCBJbnNwZWN0b3JET01BZ2VudDo6Z2V0RXZlbnRMaXN0 ZW5lcnMoTm9kZSogbm9kZSwgVmVjdG9yPEV2ZW50TGlzdGVuZXJJbmZvPiYKICAgICAgICAgICAg IEV2ZW50TGlzdGVuZXJWZWN0b3IgZmlsdGVyZWRMaXN0ZW5lcnM7CiAgICAgICAgICAgICBmaWx0 ZXJlZExpc3RlbmVycy5yZXNlcnZlSW5pdGlhbENhcGFjaXR5KGxpc3RlbmVycy5zaXplKCkpOwog ICAgICAgICAgICAgZm9yIChhdXRvJiBsaXN0ZW5lciA6IGxpc3RlbmVycykgewotICAgICAgICAg ICAgICAgIGlmIChsaXN0ZW5lci0+bGlzdGVuZXIoKS50eXBlKCkgPT0gRXZlbnRMaXN0ZW5lcjo6 SlNFdmVudExpc3RlbmVyVHlwZSkKKyAgICAgICAgICAgICAgICBpZiAobGlzdGVuZXItPmNhbGxi YWNrKCkudHlwZSgpID09IEV2ZW50TGlzdGVuZXI6OkpTRXZlbnRMaXN0ZW5lclR5cGUpCiAgICAg ICAgICAgICAgICAgICAgIGZpbHRlcmVkTGlzdGVuZXJzLnVuY2hlY2tlZEFwcGVuZChsaXN0ZW5l cik7CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICBpZiAoIWZpbHRlcmVkTGlzdGVuZXJzLmlz RW1wdHkoKSkKQEAgLTE0NzcsNyArMTQ3Nyw3IEBAIFJlZlB0cjxJbnNwZWN0b3I6OlByb3RvY29s OjpBcnJheTxJbnNwZWN0b3I6OlByb3RvY29sOjpET006Ok5vZGU+PiBJbnNwZWN0b3JET01BCiAK IFJlZjxJbnNwZWN0b3I6OlByb3RvY29sOjpET006OkV2ZW50TGlzdGVuZXI+IEluc3BlY3RvckRP TUFnZW50OjpidWlsZE9iamVjdEZvckV2ZW50TGlzdGVuZXIoY29uc3QgUmVnaXN0ZXJlZEV2ZW50 TGlzdGVuZXImIHJlZ2lzdGVyZWRFdmVudExpc3RlbmVyLCBjb25zdCBBdG9taWNTdHJpbmcmIGV2 ZW50VHlwZSwgTm9kZSogbm9kZSwgY29uc3QgU3RyaW5nKiBvYmplY3RHcm91cElkKQogewotICAg IFJlZjxFdmVudExpc3RlbmVyPiBldmVudExpc3RlbmVyID0gcmVnaXN0ZXJlZEV2ZW50TGlzdGVu ZXIubGlzdGVuZXIoKTsKKyAgICBSZWY8RXZlbnRMaXN0ZW5lcj4gZXZlbnRMaXN0ZW5lciA9IHJl Z2lzdGVyZWRFdmVudExpc3RlbmVyLmNhbGxiYWNrKCk7CiAKICAgICBKU0M6OkV4ZWNTdGF0ZSog c3RhdGUgPSBudWxscHRyOwogICAgIEpTQzo6SlNPYmplY3QqIGhhbmRsZXIgPSBudWxscHRyOwo=