53086 2011-01-25 07:33:40 -0800 Web Inspector: remove "attached" state related methods from InspectorAgent 2011-01-25 08:09:51 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 yurys yurys apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 339643 0 yurys 2011-01-25 07:33:40 -0800 Web Inspector: remove "attached" state related methods from InspectorAgent. These methods are only used for local frontend and should be moved either to WebKit layer or to InspectorFrontendClientLocal. 339647 1 80064 yurys 2011-01-25 07:38:07 -0800 Created attachment 80064 Patch 339650 2 80064 loislo 2011-01-25 07:48:17 -0800 Comment on attachment 80064 Patch looks good to me 339655 3 yurys 2011-01-25 08:09:51 -0800 Committed r76594: <http://trac.webkit.org/changeset/76594> 80064 2011-01-25 07:38:07 -0800 2011-01-25 08:05:34 -0800 Patch bug-53086-20110125183804.patch text/plain 16991 yurys ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBkYTNjOGM5YmQ0YzRlOTU1ODhiMDk2MzVkMzYzODBlNTIzYmQzMDc2Li4z Y2JmYzAxMzliOTU3N2I5ZjU4MGY1OGNjZTg4YmJkYjVkNWM4MGRkIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMjAgQEAKKzIwMTEtMDEtMjUgIFl1cnkgU2VtaWtoYXRza3kgIDx5dXJ5c0BjaHJvbWl1 bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg V2ViIEluc3BlY3RvcjogcmVtb3ZlICJhdHRhY2hlZCIgc3RhdGUgcmVsYXRlZCBtZXRob2RzIGZy b20gSW5zcGVjdG9yQWdlbnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTUzMDg2CisKKyAgICAgICAgKiBXZWJDb3JlLmV4cC5pbjoKKyAgICAgICAgKiBp bnNwZWN0b3IvSW5zcGVjdG9yQWdlbnQuY3BwOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0 b3JBZ2VudC5oOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JGcm9udGVuZENsaWVudExv Y2FsLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckZyb250ZW5kQ2xpZW50TG9jYWw6 OmNoYW5nZUF0dGFjaGVkV2luZG93SGVpZ2h0KToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3Rv ckZyb250ZW5kQ2xpZW50TG9jYWw6OnJlc3RvcmVBdHRhY2hlZFdpbmRvd0hlaWdodCk6CisgICAg ICAgICogaW5zcGVjdG9yL0luc3BlY3RvclNldHRpbmdzLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 Okluc3BlY3RvclNldHRpbmdzOjpJbnNwZWN0b3JTZXR0aW5ncyk6CisgICAgICAgICogaW5zcGVj dG9yL0luc3BlY3RvclNldHRpbmdzLmg6CisKIDIwMTEtMDEtMjUgIENhcmxvcyBHYXJjaWEgQ2Ft cG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IE1hcnRpbiBS b2JpbnNvbi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmluIGIvU291 cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAuaW4KaW5kZXggMTA2YjhmNGRmOTBhZDVhZmVmYzQ0ZWVl NjFmMzAyMDNiNjM0OTUxOC4uOWIyMTE3ZGZhMGNlODM2MDRkMjJkMzE1ZWFlOTM4ODExMjVhZmM3 NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAuaW4KKysrIGIvU291cmNl L1dlYkNvcmUvV2ViQ29yZS5leHAuaW4KQEAgLTEzNjksMTAgKzEzNjksOCBAQCBfX1pON1dlYkNv cmUxNEluc3BlY3RvckFnZW50MThkaXNjb25uZWN0RnJvbnRlbmRFdgogX19aTjdXZWJDb3JlMTRJ bnNwZWN0b3JBZ2VudDIwc3RvcFRpbWVsaW5lUHJvZmlsZXJFdgogX19aTjdXZWJDb3JlMTRJbnNw ZWN0b3JBZ2VudDIxc2hvd0FuZEVuYWJsZURlYnVnZ2VyRXYKIF9fWk43V2ViQ29yZTE0SW5zcGVj dG9yQWdlbnQyMXN0YXJ0VGltZWxpbmVQcm9maWxlckV2Ci1fX1pON1dlYkNvcmUxNEluc3BlY3Rv ckFnZW50MjNpbnNwZWN0b3JTdGFydHNBdHRhY2hlZEV2CiBfX1pON1dlYkNvcmUxNEluc3BlY3Rv ckFnZW50MjVldmFsdWF0ZUZvclRlc3RJbkZyb250ZW5kRWxSS04zV1RGNlN0cmluZ0UKIF9fWk43 V2ViQ29yZTE0SW5zcGVjdG9yQWdlbnQyNnNldEluc3BlY3RvckZyb250ZW5kQ2xpZW50RU4zV1RG MTBQYXNzT3duUHRySU5TXzIzSW5zcGVjdG9yRnJvbnRlbmRDbGllbnRFRUUKLV9fWk43V2ViQ29y ZTE0SW5zcGVjdG9yQWdlbnQyNnNldEluc3BlY3RvclN0YXJ0c0F0dGFjaGVkRWIKIF9fWk43V2Vi Q29yZTE0SW5zcGVjdG9yQWdlbnQyNnN0b3BVc2VySW5pdGlhdGVkUHJvZmlsaW5nRXYKIF9fWk43 V2ViQ29yZTE0SW5zcGVjdG9yQWdlbnQyN3N0YXJ0VXNlckluaXRpYXRlZFByb2ZpbGluZ0V2CiBf X1pON1dlYkNvcmUxNUluc3BlY3RvckNsaWVudDMxZG9EaXNwYXRjaE1lc3NhZ2VPbkZyb250ZW5k UGFnZUVQTlNfNFBhZ2VFUktOM1dURjZTdHJpbmdFCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvSW5zcGVjdG9yQWdlbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L0luc3BlY3RvckFnZW50LmNwcAppbmRleCA2MGMzZmY4MTRlZTMwODQzMDU3NWFlN2ZkNWIxZDQ3 YjA3NjQ0YjQ4Li45NzBjZWFmY2ZmMmRkMjc3ZTkxZDY2MmI1YTZiNmMxY2Y2OWI1YmIzIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQWdlbnQuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JBZ2VudC5jcHAKQEAgLTE5MywyNiAr MTkzLDYgQEAgYm9vbCBJbnNwZWN0b3JBZ2VudDo6ZW5hYmxlZCgpIGNvbnN0CiAgICAgcmV0dXJu IG1faW5zcGVjdGVkUGFnZS0+c2V0dGluZ3MoKS0+ZGV2ZWxvcGVyRXh0cmFzRW5hYmxlZCgpOwog fQogCi1ib29sIEluc3BlY3RvckFnZW50OjppbnNwZWN0b3JTdGFydHNBdHRhY2hlZCgpCi17Ci0g ICAgcmV0dXJuIG1fc2V0dGluZ3MtPmdldEJvb2xlYW4oSW5zcGVjdG9yU2V0dGluZ3M6Okluc3Bl Y3RvclN0YXJ0c0F0dGFjaGVkKTsKLX0KLQotdm9pZCBJbnNwZWN0b3JBZ2VudDo6c2V0SW5zcGVj dG9yU3RhcnRzQXR0YWNoZWQoYm9vbCBhdHRhY2hlZCkKLXsKLSAgICBtX3NldHRpbmdzLT5zZXRC b29sZWFuKEluc3BlY3RvclNldHRpbmdzOjpJbnNwZWN0b3JTdGFydHNBdHRhY2hlZCwgYXR0YWNo ZWQpOwotfQotCi12b2lkIEluc3BlY3RvckFnZW50OjpzZXRJbnNwZWN0b3JBdHRhY2hlZEhlaWdo dChsb25nIGhlaWdodCkKLXsKLSAgICBtX3NldHRpbmdzLT5zZXRMb25nKEluc3BlY3RvclNldHRp bmdzOjpJbnNwZWN0b3JBdHRhY2hlZEhlaWdodCwgaGVpZ2h0KTsKLX0KLQotbG9uZyBJbnNwZWN0 b3JBZ2VudDo6aW5zcGVjdG9yQXR0YWNoZWRIZWlnaHQoKSBjb25zdAotewotICAgIHJldHVybiBt X3NldHRpbmdzLT5nZXRMb25nKEluc3BlY3RvclNldHRpbmdzOjpJbnNwZWN0b3JBdHRhY2hlZEhl aWdodCk7Ci19Ci0KIGJvb2wgSW5zcGVjdG9yQWdlbnQ6OnNlYXJjaGluZ0Zvck5vZGVJblBhZ2Uo KSBjb25zdAogewogICAgIHJldHVybiBtX3N0YXRlLT5nZXRCb29sZWFuKEluc3BlY3RvclN0YXRl OjpzZWFyY2hpbmdGb3JOb2RlKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9JbnNwZWN0b3JBZ2VudC5oIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckFn ZW50LmgKaW5kZXggYjI1MmEyMDhlNzQzZjIzNGQ3YTUxNjQ2NTExZDhjYWU3NmVjN2U4NS4uZWNj ZTA3OTc5OWVmNmI3Y2RiMjRiMjIyZDU4ZjVjZTVkNWIzYWMxOCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckFnZW50LmgKKysrIGIvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL0luc3BlY3RvckFnZW50LmgKQEAgLTI1NiwxMSArMjU2LDYgQEAgcHVibGljOgog ICAgIHZvaWQgcmVtb3ZlQWxsU2NyaXB0c1RvRXZhbHVhdGVPbkxvYWQoKTsKICAgICB2b2lkIHNl dEluc3BlY3RvckV4dGVuc2lvbkFQSShjb25zdCBTdHJpbmcmIHNvdXJjZSk7CiAKLSAgICBib29s IGluc3BlY3RvclN0YXJ0c0F0dGFjaGVkKCk7Ci0gICAgdm9pZCBzZXRJbnNwZWN0b3JTdGFydHNB dHRhY2hlZChib29sKTsKLSAgICB2b2lkIHNldEluc3BlY3RvckF0dGFjaGVkSGVpZ2h0KGxvbmcp OwotICAgIGxvbmcgaW5zcGVjdG9yQXR0YWNoZWRIZWlnaHQoKSBjb25zdDsKLQogICAgIEluc3Bl Y3RvclN0YXRlKiBzdGF0ZSgpIHsgcmV0dXJuIG1fc3RhdGUuZ2V0KCk7IH0KICAgICBJbnNwZWN0 b3JTZXR0aW5ncyogc2V0dGluZ3MoKSB7IHJldHVybiBtX3NldHRpbmdzLmdldCgpOyB9CiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JGcm9udGVuZENsaWVu dExvY2FsLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JGcm9udGVuZENs aWVudExvY2FsLmNwcAppbmRleCA0ODEyYjJhMmRkM2JiNDllNzkxYWEyY2Q0Zjc1YzdjYWViN2Uz MjhkLi41ZTliNDQxMzNjZTk0YmM0MDJlMDhmYjkxNjBmZDA4MDBjNTRlNmFjIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRnJvbnRlbmRDbGllbnRMb2NhbC5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckZyb250ZW5kQ2xpZW50 TG9jYWwuY3BwCkBAIC0zOCw2ICszOCw3IEBACiAjaW5jbHVkZSAiRnJhbWUuaCIKICNpbmNsdWRl ICJGcmFtZVZpZXcuaCIKICNpbmNsdWRlICJJbnNwZWN0b3JCYWNrZW5kRGlzcGF0Y2hlci5oIgor I2luY2x1ZGUgIkluc3BlY3RvckNsaWVudC5oIgogI2luY2x1ZGUgIkluc3BlY3RvckNvbnRyb2xs ZXIuaCIKICNpbmNsdWRlICJJbnNwZWN0b3JGcm9udGVuZEhvc3QuaCIKICNpbmNsdWRlICJQYWdl LmgiCkBAIC00Nyw2ICs0OCw3IEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAorc3RhdGljIGNv bnN0IGNoYXIqIGluc3BlY3RvckF0dGFjaGVkSGVpZ2h0U2V0dGluZyA9ICJpbnNwZWN0b3JBdHRh Y2hlZEhlaWdodCI7CiBzdGF0aWMgY29uc3QgdW5zaWduZWQgZGVmYXVsdEF0dGFjaGVkSGVpZ2h0 ID0gMzAwOwogc3RhdGljIGNvbnN0IGZsb2F0IG1pbmltdW1BdHRhY2hlZEhlaWdodCA9IDI1MC4w ZjsKIHN0YXRpYyBjb25zdCBmbG9hdCBtYXhpbXVtQXR0YWNoZWRIZWlnaHRSYXRpbyA9IDAuNzVm OwpAQCAtMTA3LDcgKzEwOSw3IEBAIHZvaWQgSW5zcGVjdG9yRnJvbnRlbmRDbGllbnRMb2NhbDo6 Y2hhbmdlQXR0YWNoZWRXaW5kb3dIZWlnaHQodW5zaWduZWQgaGVpZ2h0KQogewogICAgIHVuc2ln bmVkIHRvdGFsSGVpZ2h0ID0gbV9mcm9udGVuZFBhZ2UtPm1haW5GcmFtZSgpLT52aWV3KCktPnZp c2libGVIZWlnaHQoKSArIG1faW5zcGVjdG9yQ29udHJvbGxlci0+aW5zcGVjdGVkUGFnZSgpLT5t YWluRnJhbWUoKS0+dmlldygpLT52aXNpYmxlSGVpZ2h0KCk7CiAgICAgdW5zaWduZWQgYXR0YWNo ZWRIZWlnaHQgPSBjb25zdHJhaW5lZEF0dGFjaGVkV2luZG93SGVpZ2h0KGhlaWdodCwgdG90YWxI ZWlnaHQpOwotICAgIG1faW5zcGVjdG9yQ29udHJvbGxlci0+c2V0SW5zcGVjdG9yQXR0YWNoZWRI ZWlnaHQoYXR0YWNoZWRIZWlnaHQpOworICAgIG1faW5zcGVjdG9yQ29udHJvbGxlci0+aW5zcGVj dG9yQ2xpZW50KCktPnN0b3JlU2V0dGluZyhpbnNwZWN0b3JBdHRhY2hlZEhlaWdodFNldHRpbmcs IFN0cmluZzo6bnVtYmVyKGF0dGFjaGVkSGVpZ2h0KSk7CiAgICAgc2V0QXR0YWNoZWRXaW5kb3dI ZWlnaHQoYXR0YWNoZWRIZWlnaHQpOwogfQogCkBAIC0xMzMsOSArMTM1LDkgQEAgdm9pZCBJbnNw ZWN0b3JGcm9udGVuZENsaWVudExvY2FsOjpzZXRBdHRhY2hlZFdpbmRvdyhib29sIGF0dGFjaGVk KQogdm9pZCBJbnNwZWN0b3JGcm9udGVuZENsaWVudExvY2FsOjpyZXN0b3JlQXR0YWNoZWRXaW5k b3dIZWlnaHQoKQogewogICAgIHVuc2lnbmVkIGluc3BlY3RlZFBhZ2VIZWlnaHQgPSBtX2luc3Bl Y3RvckNvbnRyb2xsZXItPmluc3BlY3RlZFBhZ2UoKS0+bWFpbkZyYW1lKCktPnZpZXcoKS0+dmlz aWJsZUhlaWdodCgpOwotICAgIGludCBhdHRhY2hlZEhlaWdodCA9IG1faW5zcGVjdG9yQ29udHJv bGxlci0+aW5zcGVjdG9yQXR0YWNoZWRIZWlnaHQoKTsKLSAgICBib29sIHN1Y2Nlc3MgPSB0cnVl OwotICAgIHVuc2lnbmVkIHByZWZlcnJlZEhlaWdodCA9IHN1Y2Nlc3MgPyBzdGF0aWNfY2FzdDx1 bnNpZ25lZD4oYXR0YWNoZWRIZWlnaHQpIDogZGVmYXVsdEF0dGFjaGVkSGVpZ2h0OworICAgIFN0 cmluZyB2YWx1ZTsKKyAgICBtX2luc3BlY3RvckNvbnRyb2xsZXItPmluc3BlY3RvckNsaWVudCgp LT5wb3B1bGF0ZVNldHRpbmcoaW5zcGVjdG9yQXR0YWNoZWRIZWlnaHRTZXR0aW5nLCAmdmFsdWUp OworICAgIHVuc2lnbmVkIHByZWZlcnJlZEhlaWdodCA9IHZhbHVlLmlzRW1wdHkoKSA/IGRlZmF1 bHRBdHRhY2hlZEhlaWdodCA6IHZhbHVlLnRvVUludCgpOwogICAgIAogICAgIC8vIFRoaXMgY2Fs bCBtaWdodCBub3QgZ28gdGhyb3VnaCAoaWYgdGhlIHdpbmRvdyBzdGFydHMgb3V0IGRldGFjaGVk KSwgYnV0IGlmIHRoZSB3aW5kb3cgaXMgaW5pdGlhbGx5IGNyZWF0ZWQgYXR0YWNoZWQsCiAgICAg Ly8gSW5zcGVjdG9yQ29udHJvbGxlcjo6YXR0YWNoV2luZG93IGlzIG5ldmVyIGNhbGxlZCwgc28g d2UgbmVlZCB0byBtYWtlIHN1cmUgdG8gc2V0IHRoZSBhdHRhY2hlZFdpbmRvd0hlaWdodC4KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JTZXR0aW5ncy5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yU2V0dGluZ3MuY3BwCmluZGV4IDNl YmMzYWJkY2YxZDIyMWVkMjM0ZTVhZDI2NjdjYWUyYTgxZjRmOGIuLjA4YzU2NDUxYTZkNjUxMTEz Njk5OTQ2MDFmYTFjNjZkYjlhZmIwYWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9JbnNwZWN0b3JTZXR0aW5ncy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L0luc3BlY3RvclNldHRpbmdzLmNwcApAQCAtMzksOCArMzksNiBAQCBuYW1lc3BhY2UgV2ViQ29y ZSB7CiBjb25zdCBjaGFyKiBJbnNwZWN0b3JTZXR0aW5nczo6TW9uaXRvcmluZ1hIUkVuYWJsZWQg PSAieGhyTW9uaXRvciI7CiBjb25zdCBjaGFyKiBJbnNwZWN0b3JTZXR0aW5nczo6UHJvZmlsZXJB bHdheXNFbmFibGVkID0gInByb2ZpbGVyRW5hYmxlZCI7CiBjb25zdCBjaGFyKiBJbnNwZWN0b3JT ZXR0aW5nczo6RGVidWdnZXJBbHdheXNFbmFibGVkID0gImRlYnVnZ2VyRW5hYmxlZCI7Ci1jb25z dCBjaGFyKiBJbnNwZWN0b3JTZXR0aW5nczo6SW5zcGVjdG9yU3RhcnRzQXR0YWNoZWQgPSAiaW5z cGVjdG9yU3RhcnRzQXR0YWNoZWQiOwotY29uc3QgY2hhciogSW5zcGVjdG9yU2V0dGluZ3M6Oklu c3BlY3RvckF0dGFjaGVkSGVpZ2h0ID0gImluc3BlY3RvckF0dGFjaGVkSGVpZ2h0IjsKIAogSW5z cGVjdG9yU2V0dGluZ3M6Okluc3BlY3RvclNldHRpbmdzKEluc3BlY3RvckNsaWVudCogY2xpZW50 KQogICAgIDogbV9jbGllbnQoY2xpZW50KQpAQCAtNDgsOCArNDYsNiBAQCBJbnNwZWN0b3JTZXR0 aW5nczo6SW5zcGVjdG9yU2V0dGluZ3MoSW5zcGVjdG9yQ2xpZW50KiBjbGllbnQpCiAgICAgcmVn aXN0ZXJCb29sZWFuKE1vbml0b3JpbmdYSFJFbmFibGVkLCBmYWxzZSk7CiAgICAgcmVnaXN0ZXJC b29sZWFuKFByb2ZpbGVyQWx3YXlzRW5hYmxlZCwgZmFsc2UpOwogICAgIHJlZ2lzdGVyQm9vbGVh bihEZWJ1Z2dlckFsd2F5c0VuYWJsZWQsIGZhbHNlKTsKLSAgICByZWdpc3RlckJvb2xlYW4oSW5z cGVjdG9yU3RhcnRzQXR0YWNoZWQsIHRydWUpOwotICAgIHJlZ2lzdGVyTG9uZyhJbnNwZWN0b3JB dHRhY2hlZEhlaWdodCwgMzAwKTsKIH0KIAogYm9vbCBJbnNwZWN0b3JTZXR0aW5nczo6Z2V0Qm9v bGVhbihjb25zdCBTdHJpbmcmIG5hbWUpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvSW5zcGVjdG9yU2V0dGluZ3MuaCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNw ZWN0b3JTZXR0aW5ncy5oCmluZGV4IDcxN2QxMWYwZDcyYTE4ZjE1MmEzN2ZjNjI4ZDQyNjhiYzc4 OGZiYTQuLjBkNDg1NzAwMTA1MGUyMGExOWI1ZDRjMWI3MTFjNTAxNjU1ZjU3YzMgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JTZXR0aW5ncy5oCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JTZXR0aW5ncy5oCkBAIC00Nyw4ICs0Nyw2 IEBAIHB1YmxpYzoKICAgICBzdGF0aWMgY29uc3QgY2hhciogTW9uaXRvcmluZ1hIUkVuYWJsZWQ7 CiAgICAgc3RhdGljIGNvbnN0IGNoYXIqIFByb2ZpbGVyQWx3YXlzRW5hYmxlZDsKICAgICBzdGF0 aWMgY29uc3QgY2hhciogRGVidWdnZXJBbHdheXNFbmFibGVkOwotICAgIHN0YXRpYyBjb25zdCBj aGFyKiBJbnNwZWN0b3JTdGFydHNBdHRhY2hlZDsKLSAgICBzdGF0aWMgY29uc3QgY2hhciogSW5z cGVjdG9yQXR0YWNoZWRIZWlnaHQ7CiAKICAgICBJbnNwZWN0b3JTZXR0aW5ncyhJbnNwZWN0b3JD bGllbnQqIGNsaWVudCk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2YvQ2hhbmdlTG9n IGIvU291cmNlL1dlYktpdC9jZi9DaGFuZ2VMb2cKaW5kZXggZjcxMmM5NzM3ZTZhMmUzYTkzZmRh ODZjMjVmN2IxNGQ2ZDBiZjU0ZS4uN2JlYmYzODJmODk2YjA0OTM0ZDAwN2FiMmRhODZhYzM1NDlk ZTM3ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jZi9DaGFuZ2VMb2cKKysrIGIvU291cmNl L1dlYktpdC9jZi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAxMS0wMS0yNSAgWXVyeSBT ZW1pa2hhdHNreSAgPHl1cnlzQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiByZW1vdmUgImF0dGFjaGVk IiBzdGF0ZSByZWxhdGVkIG1ldGhvZHMgZnJvbSBJbnNwZWN0b3JBZ2VudAorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTMwODYKKworICAgICAgICAqIFdl YkNvcmVTdXBwb3J0L1dlYkluc3BlY3RvckNsaWVudENGLmNwcDoKKyAgICAgICAgKFdlYkluc3Bl Y3RvckNsaWVudDo6c2VuZE1lc3NhZ2VUb0Zyb250ZW5kKToKKyAgICAgICAgKFdlYkluc3BlY3Rv ckNsaWVudDo6aW5zcGVjdG9yU3RhcnRzQXR0YWNoZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9y Q2xpZW50OjpzZXRJbnNwZWN0b3JTdGFydHNBdHRhY2hlZCk6CisgICAgICAgIChXZWJJbnNwZWN0 b3JDbGllbnQ6OnJlbGVhc2VGcm9udGVuZFBhZ2UpOgorCiAyMDExLTAxLTAzICBQcmF0aWsgU29s YW5raSAgPHBzb2xhbmtpQGFwcGxlLmNvbT4KIAogICAgICAgICBNYWMgYnVpbGQgZml4LiBEZWZp bmUgV1RGX1VTRV9DRk5FVFdPUksgZm9yIFdpbmRvd3MgYnVpbGQgb25seS4KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvY2YvV2ViQ29yZVN1cHBvcnQvV2ViSW5zcGVjdG9yQ2xpZW50Q0YuY3Bw IGIvU291cmNlL1dlYktpdC9jZi9XZWJDb3JlU3VwcG9ydC9XZWJJbnNwZWN0b3JDbGllbnRDRi5j cHAKaW5kZXggOTE4M2ZhNDQ4NTAwMmRhMDg2M2YwYmU4ZDVhM2Y3M2YxNjkwNjkwOC4uY2VmZTU0 NGY2ZGIyZTU0MzY1OGEzMzEzMzg5OTlmODY2Mjg0N2VlNyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9jZi9XZWJDb3JlU3VwcG9ydC9XZWJJbnNwZWN0b3JDbGllbnRDRi5jcHAKKysrIGIvU291 cmNlL1dlYktpdC9jZi9XZWJDb3JlU3VwcG9ydC9XZWJJbnNwZWN0b3JDbGllbnRDRi5jcHAKQEAg LTY1LDYgKzY1LDggQEAKIAogdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAKK3N0YXRpYyBjb25z dCBjaGFyKiBpbnNwZWN0b3JTdGFydHNBdHRhY2hlZFNldHRpbmcgPSAiaW5zcGVjdG9yU3RhcnRz QXR0YWNoZWQiOworCiBzdGF0aWMgaW5saW5lIENGU3RyaW5nUmVmIGNyZWF0ZUtleUZvclByZWZl cmVuY2VzKGNvbnN0IFN0cmluZyYga2V5KQogewogICAgIFJldGFpblB0cjxDRlN0cmluZ1JlZj4g a2V5Q0ZTdHJpbmcoQWRvcHRDRiwga2V5LmNyZWF0ZUNGU3RyaW5nKCkpOwpAQCAtOTgsMTIgKzEw MCwyNCBAQCB2b2lkIFdlYkluc3BlY3RvckNsaWVudDo6c3RvcmVTZXR0aW5nKGNvbnN0IFN0cmlu ZyYga2V5LCBjb25zdCBTdHJpbmcmIHNldHRpbmcpCiAgICAgQ0ZQcmVmZXJlbmNlc1NldEFwcFZh bHVlKHByZWZlcmVuY2VzS2V5LmdldCgpLCBvYmplY3RUb1N0b3JlLmdldCgpLCBrQ0ZQcmVmZXJl bmNlc0N1cnJlbnRBcHBsaWNhdGlvbik7CiB9CiAKLXZvaWQgV2ViSW5zcGVjdG9yQ2xpZW50Ojpy ZWxlYXNlRnJvbnRlbmRQYWdlKCkKK2Jvb2wgV2ViSW5zcGVjdG9yQ2xpZW50OjpzZW5kTWVzc2Fn ZVRvRnJvbnRlbmQoY29uc3QgU3RyaW5nJiBtZXNzYWdlKQogewotICAgIG1fZnJvbnRlbmRQYWdl ID0gMDsKKyAgICByZXR1cm4gZG9EaXNwYXRjaE1lc3NhZ2VPbkZyb250ZW5kUGFnZShtX2Zyb250 ZW5kUGFnZSwgbWVzc2FnZSk7CiB9CiAKLWJvb2wgV2ViSW5zcGVjdG9yQ2xpZW50OjpzZW5kTWVz c2FnZVRvRnJvbnRlbmQoY29uc3QgU3RyaW5nJiBtZXNzYWdlKQorYm9vbCBXZWJJbnNwZWN0b3JD bGllbnQ6Omluc3BlY3RvclN0YXJ0c0F0dGFjaGVkKCkKIHsKLSAgICByZXR1cm4gZG9EaXNwYXRj aE1lc3NhZ2VPbkZyb250ZW5kUGFnZShtX2Zyb250ZW5kUGFnZSwgbWVzc2FnZSk7CisgICAgU3Ry aW5nIHZhbHVlOworICAgIHBvcHVsYXRlU2V0dGluZyhpbnNwZWN0b3JTdGFydHNBdHRhY2hlZFNl dHRpbmcsICZ2YWx1ZSk7CisgICAgcmV0dXJuIHZhbHVlID09ICJ0cnVlIjsKK30KKwordm9pZCBX ZWJJbnNwZWN0b3JDbGllbnQ6OnNldEluc3BlY3RvclN0YXJ0c0F0dGFjaGVkKGJvb2wgYXR0YWNo ZWQpCit7CisgICAgc3RvcmVTZXR0aW5nKGluc3BlY3RvclN0YXJ0c0F0dGFjaGVkU2V0dGluZywg YXR0YWNoZWQgPyAidHJ1ZSIgOiAiZmFsc2UiKTsKK30KKwordm9pZCBXZWJJbnNwZWN0b3JDbGll bnQ6OnJlbGVhc2VGcm9udGVuZFBhZ2UoKQoreworICAgIG1fZnJvbnRlbmRQYWdlID0gMDsKIH0K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQv bWFjL0NoYW5nZUxvZwppbmRleCAwMmRmODM1MDExNTZiMzBjZmY4NTAwZTg2OGQ4MGI1MmZlYjBk OGE0Li5mYzhlMjQ4MTIyYzk4OWY1ZTJiN2UyNzY3YWE3ZTEyMGRmZjdkMjYyIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9tYWMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTEtMDEtMjUgIFl1cnkgU2VtaWtoYXRza3kgIDx5 dXJ5c0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogcmVtb3ZlICJhdHRhY2hlZCIgc3RhdGUgcmVsYXRl ZCBtZXRob2RzIGZyb20gSW5zcGVjdG9yQWdlbnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTUzMDg2CisKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9X ZWJJbnNwZWN0b3JDbGllbnQuaDoKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9XZWJJbnNwZWN0 b3JDbGllbnQubW06CisgICAgICAgICgtW1dlYkluc3BlY3RvcldpbmRvd0NvbnRyb2xsZXIgc2hv d1dpbmRvdzpdKToKKyAgICAgICAgKC1bV2ViSW5zcGVjdG9yV2luZG93Q29udHJvbGxlciBhdHRh Y2hdKToKKyAgICAgICAgKC1bV2ViSW5zcGVjdG9yV2luZG93Q29udHJvbGxlciBkZXRhY2hdKToK KwogMjAxMS0wMS0yMyAgRGFuIEJlcm5zdGVpbiAgPG1pdHpAYXBwbGUuY29tPgogCiAgICAgICAg IFJldmlld2VkIGJ5IEpvaG4gU3VsbGl2YW4uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21h Yy9XZWJDb3JlU3VwcG9ydC9XZWJJbnNwZWN0b3JDbGllbnQuaCBiL1NvdXJjZS9XZWJLaXQvbWFj L1dlYkNvcmVTdXBwb3J0L1dlYkluc3BlY3RvckNsaWVudC5oCmluZGV4IDc1YTNjYzZjNDk5OTEz YTE2MTYzMGIyNDAxOTg4YzU4N2EzM2NjZDIuLmNiOTI4ZTVkYTIxMTNjZWVkODRmNDg1NmM1Njdl Nzg5OWI1ZTgyZmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0 L1dlYkluc3BlY3RvckNsaWVudC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL1dlYkNvcmVTdXBw b3J0L1dlYkluc3BlY3RvckNsaWVudC5oCkBAIC02NCw2ICs2NCw5IEBAIHB1YmxpYzoKIAogICAg IHZpcnR1YWwgYm9vbCBzZW5kTWVzc2FnZVRvRnJvbnRlbmQoY29uc3QgV1RGOjpTdHJpbmcmKTsK IAorICAgIGJvb2wgaW5zcGVjdG9yU3RhcnRzQXR0YWNoZWQoKTsKKyAgICB2b2lkIHNldEluc3Bl Y3RvclN0YXJ0c0F0dGFjaGVkKGJvb2wpOworCiAgICAgdm9pZCByZWxlYXNlRnJvbnRlbmRQYWdl KCk7CiAKIHByaXZhdGU6CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21hYy9XZWJDb3JlU3Vw cG9ydC9XZWJJbnNwZWN0b3JDbGllbnQubW0gYi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJDb3JlU3Vw cG9ydC9XZWJJbnNwZWN0b3JDbGllbnQubW0KaW5kZXggNWJlZWRjZmVlNGYzMDlmYzcwZmJmMDYz NTYyYTgyZDZiOGQxZDA1Zi4uMTg3NDZiM2ViOTExNzdmMmE3MDhhYjNiYmVkN2I4ZGVkZjM5ZGIx NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViSW5zcGVj dG9yQ2xpZW50Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYklu c3BlY3RvckNsaWVudC5tbQpAQCAtMzU1LDkgKzM1NSw3IEBAIHZvaWQgV2ViSW5zcGVjdG9yRnJv bnRlbmRDbGllbnQ6OnVwZGF0ZVdpbmRvd1RpdGxlKCkgY29uc3QKIAogICAgIF92aXNpYmxlID0g WUVTOwogICAgIAotICAgIC8vIElmIG5vIHByZWZlcmVuY2UgaXMgc2V0IC0gZGVmYXVsdCB0byBh biBhdHRhY2hlZCB3aW5kb3cuIFRoaXMgaXMgaW1wb3J0YW50IGZvciBpbnNwZWN0b3IgTGF5b3V0 VGVzdHMuCi0gICAgLy8gRklYTUU6IFRoaXMgZmxhZyBjYW4gYmUgZmV0Y2hlZCBkaXJlY3RseSBm cm9tIHRoZSBmbGFncyBzdG9yYWdlLgotICAgIF9zaG91bGRBdHRhY2ggPSBbX2luc3BlY3RlZFdl YlZpZXcgcGFnZV0tPmluc3BlY3RvckNvbnRyb2xsZXIoKS0+aW5zcGVjdG9yU3RhcnRzQXR0YWNo ZWQoKTsKKyAgICBfc2hvdWxkQXR0YWNoID0gX2luc3BlY3RvckNsaWVudC0+aW5zcGVjdG9yU3Rh cnRzQXR0YWNoZWQoKTsKICAgICAKICAgICBpZiAoX3Nob3VsZEF0dGFjaCAmJiAhX2Zyb250ZW5k Q2xpZW50LT5jYW5BdHRhY2hXaW5kb3coKSkKICAgICAgICAgX3Nob3VsZEF0dGFjaCA9IE5POwpA QCAtMzkyLDggKzM5MCw3IEBAIHZvaWQgV2ViSW5zcGVjdG9yRnJvbnRlbmRDbGllbnQ6OnVwZGF0 ZVdpbmRvd1RpdGxlKCkgY29uc3QKICAgICBpZiAoX2F0dGFjaGVkVG9JbnNwZWN0ZWRXZWJWaWV3 KQogICAgICAgICByZXR1cm47CiAKLSAgICAvLyBGSVhNRTogVGhpcyBmbGFnIGNhbiBiZSBzYXZl ZCBkaXJlY3RseSB0byB0aGUgZmxhZ3Mgc3RvcmFnZS4KLSAgICBbX2luc3BlY3RlZFdlYlZpZXcg cGFnZV0tPmluc3BlY3RvckNvbnRyb2xsZXIoKS0+c2V0SW5zcGVjdG9yU3RhcnRzQXR0YWNoZWQo dHJ1ZSk7CisgICAgX2luc3BlY3RvckNsaWVudC0+c2V0SW5zcGVjdG9yU3RhcnRzQXR0YWNoZWQo dHJ1ZSk7CiAKICAgICBbc2VsZiBjbG9zZV07CiAgICAgW3NlbGYgc2hvd1dpbmRvdzpuaWxdOwpA QCAtNDA0LDggKzQwMSw3IEBAIHZvaWQgV2ViSW5zcGVjdG9yRnJvbnRlbmRDbGllbnQ6OnVwZGF0 ZVdpbmRvd1RpdGxlKCkgY29uc3QKICAgICBpZiAoIV9hdHRhY2hlZFRvSW5zcGVjdGVkV2ViVmll dykKICAgICAgICAgcmV0dXJuOwogCi0gICAgLy8gRklYTUU6IFRoaXMgZmxhZyBjYW4gYmUgc2F2 ZWQgdG8gdGhlIGZsYWdzIHN0b3JhZ2UgZGlyZWN0bHkuCi0gICAgW19pbnNwZWN0ZWRXZWJWaWV3 IHBhZ2VdLT5pbnNwZWN0b3JDb250cm9sbGVyKCktPnNldEluc3BlY3RvclN0YXJ0c0F0dGFjaGVk KGZhbHNlKTsKKyAgICBfaW5zcGVjdG9yQ2xpZW50LT5zZXRJbnNwZWN0b3JTdGFydHNBdHRhY2hl ZChmYWxzZSk7CiAKICAgICBbc2VsZiBjbG9zZV07CiAgICAgW3NlbGYgc2hvd1dpbmRvdzpuaWxd OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC93aW4vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktp dC93aW4vQ2hhbmdlTG9nCmluZGV4IGNlZmVkYzcxZWI1ZWY4NTkxYjIxYjFiZjc3NjM3M2E3ZGJi YmIzMGEuLjYzYjhiZWExYTA5Mjc2M2MyYzNlYmJmOWYxNzI4OTFlNDU0YWQ2MDUgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvd2luL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L3dpbi9D aGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAxMS0wMS0yNSAgWXVyeSBTZW1pa2hhdHNreSAg PHl1cnlzQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiByZW1vdmUgImF0dGFjaGVkIiBzdGF0ZSByZWxh dGVkIG1ldGhvZHMgZnJvbSBJbnNwZWN0b3JBZ2VudAorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTMwODYKKworICAgICAgICAqIFdlYkNvcmVTdXBwb3J0 L1dlYkluc3BlY3RvckNsaWVudC5jcHA6CisgICAgICAgIChXZWJJbnNwZWN0b3JGcm9udGVuZENs aWVudDo6YXR0YWNoV2luZG93KToKKyAgICAgICAgKFdlYkluc3BlY3RvckZyb250ZW5kQ2xpZW50 OjpkZXRhY2hXaW5kb3cpOgorICAgICAgICAoV2ViSW5zcGVjdG9yRnJvbnRlbmRDbGllbnQ6OnNo b3dXaW5kb3dXaXRob3V0Tm90aWZpY2F0aW9ucyk6CisgICAgICAgICogV2ViQ29yZVN1cHBvcnQv V2ViSW5zcGVjdG9yQ2xpZW50Lmg6CisKIDIwMTEtMDEtMjQgIEFkYW0gUm9iZW4gIDxhcm9iZW5A YXBwbGUuY29tPgogCiAgICAgICAgIFdpbmRvd3MgUHJvZHVjdGlvbiBidWlsZCBmaXgKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvd2luL1dlYkNvcmVTdXBwb3J0L1dlYkluc3BlY3RvckNsaWVu dC5jcHAgYi9Tb3VyY2UvV2ViS2l0L3dpbi9XZWJDb3JlU3VwcG9ydC9XZWJJbnNwZWN0b3JDbGll bnQuY3BwCmluZGV4IDc2ZWJjOGY2ZDI1YzE1YzNhOTQ3MjJlNjIxNTk5MzEwZTcyNjA3MDEuLmRl ZTI1MTZhYThlNzY4MGU4NWZhNDc5MWExMjJmNjJhZGIwNWM3N2QgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvd2luL1dlYkNvcmVTdXBwb3J0L1dlYkluc3BlY3RvckNsaWVudC5jcHAKKysrIGIv U291cmNlL1dlYktpdC93aW4vV2ViQ29yZVN1cHBvcnQvV2ViSW5zcGVjdG9yQ2xpZW50LmNwcApA QCAtMjcxLDggKzI3MSw3IEBAIHZvaWQgV2ViSW5zcGVjdG9yRnJvbnRlbmRDbGllbnQ6OmF0dGFj aFdpbmRvdygpCiAgICAgaWYgKG1fYXR0YWNoZWQpCiAgICAgICAgIHJldHVybjsKIAotICAgIC8v IEZJWE1FOiBUaGlzIGZsYWcgY2FuIGJlIHNhdmVkIHRvIHRoZSBmbGFncyBzdG9yYWdlIGRpcmVj dGx5LgotICAgIG1faW5zcGVjdGVkV2ViVmlldy0+cGFnZSgpLT5pbnNwZWN0b3JDb250cm9sbGVy KCktPnNldEluc3BlY3RvclN0YXJ0c0F0dGFjaGVkKHRydWUpOworICAgIG1faW5zcGVjdG9yQ2xp ZW50LT5zZXRJbnNwZWN0b3JTdGFydHNBdHRhY2hlZCh0cnVlKTsKIAogICAgIGNsb3NlV2luZG93 V2l0aG91dE5vdGlmaWNhdGlvbnMoKTsKICAgICBzaG93V2luZG93V2l0aG91dE5vdGlmaWNhdGlv bnMoKTsKQEAgLTI4Myw4ICsyODIsNyBAQCB2b2lkIFdlYkluc3BlY3RvckZyb250ZW5kQ2xpZW50 OjpkZXRhY2hXaW5kb3coKQogICAgIGlmICghbV9hdHRhY2hlZCkKICAgICAgICAgcmV0dXJuOwog Ci0gICAgLy8gRklYTUU6IFRoaXMgZmxhZyBjYW4gYmUgc2F2ZWQgdG8gdGhlIGZsYWdzIHN0b3Jh Z2UgZGlyZWN0bHkuCi0gICAgbV9pbnNwZWN0ZWRXZWJWaWV3LT5wYWdlKCktPmluc3BlY3RvckNv bnRyb2xsZXIoKS0+c2V0SW5zcGVjdG9yU3RhcnRzQXR0YWNoZWQoZmFsc2UpOworICAgIG1faW5z cGVjdG9yQ2xpZW50LT5zZXRJbnNwZWN0b3JTdGFydHNBdHRhY2hlZChmYWxzZSk7CiAKICAgICBj bG9zZVdpbmRvd1dpdGhvdXROb3RpZmljYXRpb25zKCk7CiAgICAgc2hvd1dpbmRvd1dpdGhvdXRO b3RpZmljYXRpb25zKCk7CkBAIC0zNjUsNyArMzYzLDcgQEAgdm9pZCBXZWJJbnNwZWN0b3JGcm9u dGVuZENsaWVudDo6c2hvd1dpbmRvd1dpdGhvdXROb3RpZmljYXRpb25zKCkKICAgICBlbHNlIHsK ICAgICAgICAgLy8gSWYgbm8gcHJlZmVyZW5jZSBpcyBzZXQgLSBkZWZhdWx0IHRvIGFuIGF0dGFj aGVkIHdpbmRvdy4gVGhpcyBpcyBpbXBvcnRhbnQgZm9yIGluc3BlY3RvciBMYXlvdXRUZXN0cy4K ICAgICAgICAgLy8gRklYTUU6IFRoaXMgZmxhZyBjYW4gYmUgZmV0Y2hlZCBkaXJlY3RseSBmcm9t IHRoZSBmbGFncyBzdG9yYWdlLgotICAgICAgICBzaG91bGRBdHRhY2ggPSBtX2luc3BlY3RlZFdl YlZpZXctPnBhZ2UoKS0+aW5zcGVjdG9yQ29udHJvbGxlcigpLT5pbnNwZWN0b3JTdGFydHNBdHRh Y2hlZCgpOworICAgICAgICBzaG91bGRBdHRhY2ggPSBtX2luc3BlY3RvckNsaWVudC0+aW5zcGVj dG9yU3RhcnRzQXR0YWNoZWQoKTsKIAogICAgICAgICBpZiAoc2hvdWxkQXR0YWNoICYmICFjYW5B dHRhY2hXaW5kb3coKSkKICAgICAgICAgICAgIHNob3VsZEF0dGFjaCA9IGZhbHNlOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC93aW4vV2ViQ29yZVN1cHBvcnQvV2ViSW5zcGVjdG9yQ2xpZW50 LmggYi9Tb3VyY2UvV2ViS2l0L3dpbi9XZWJDb3JlU3VwcG9ydC9XZWJJbnNwZWN0b3JDbGllbnQu aAppbmRleCAwYzM4MjQ3ZWE1OWJlMDk5NmFkZjcyYzFjODc3NmZiMDdlMTQ4ODU5Li4yYzRiY2Rm NTMwZTI1NjdkMTRlODk4ZDQwMTYxNWY2NGY3OGNmMWViIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L3dpbi9XZWJDb3JlU3VwcG9ydC9XZWJJbnNwZWN0b3JDbGllbnQuaAorKysgYi9Tb3VyY2Uv V2ViS2l0L3dpbi9XZWJDb3JlU3VwcG9ydC9XZWJJbnNwZWN0b3JDbGllbnQuaApAQCAtNjMsNiAr NjMsMTEgQEAgcHVibGljOgogCiAgICAgdmlydHVhbCBib29sIHNlbmRNZXNzYWdlVG9Gcm9udGVu ZChjb25zdCBXVEY6OlN0cmluZyYpOwogCisgICAgYm9vbCBpbnNwZWN0b3JTdGFydHNBdHRhY2hl ZCgpOworICAgIHZvaWQgc2V0SW5zcGVjdG9yU3RhcnRzQXR0YWNoZWQoYm9vbCk7CisKKyAgICB2 b2lkIHJlbGVhc2VGcm9udGVuZFBhZ2UoKTsKKwogICAgIHZvaWQgdXBkYXRlSGlnaGxpZ2h0KCk7 CiAgICAgdm9pZCBmcm9udGVuZENsb3NpbmcoKQogICAgIHsKQEAgLTcwLDcgKzc1LDYgQEAgcHVi bGljOgogICAgICAgICByZWxlYXNlRnJvbnRlbmRQYWdlKCk7CiAgICAgfQogCi0gICAgdm9pZCBy ZWxlYXNlRnJvbnRlbmRQYWdlKCk7CiBwcml2YXRlOgogICAgIH5XZWJJbnNwZWN0b3JDbGllbnQo KTsKIAo=