203913 2019-11-06 12:45:00 -0800 Rename AXIsolatedTreeNode to AXIsolatedObject for consistency with AXCoreObject and AccessibilityObject. 2019-11-07 06:16:16 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 andresg_22 andresg_22 aboxhall andresg_22 apinheiro cfleizach commit-queue dmazzoni ews-watchlist jcraig jdiggs samuel_white webkit-bug-importer oldest_to_newest 1587875 0 andresg_22 2019-11-06 12:45:00 -0800 Rename AXIsolatedTreeNode to AXIsolatedObject for consistency with AXCoreObject and AccessibilityObject. 1587880 1 382949 andresg_22 2019-11-06 12:55:24 -0800 Created attachment 382949 Patch 1588184 2 382949 commit-queue 2019-11-07 06:15:52 -0800 Comment on attachment 382949 Patch Clearing flags on attachment: 382949 Committed r252182: <https://trac.webkit.org/changeset/252182> 1588185 3 commit-queue 2019-11-07 06:15:54 -0800 All reviewed patches have been landed. Closing bug. 1588186 4 webkit-bug-importer 2019-11-07 06:16:16 -0800 <rdar://problem/56980427> 382949 2019-11-06 12:55:24 -0800 2019-11-07 06:15:52 -0800 Patch bug-203913-20191106155523.patch text/plain 21441 andresg_22 U3VidmVyc2lvbiBSZXZpc2lvbjogMjUyMTQwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOThmZGMyMmU3Yzc4MDc1 ZjczYjEzYzdjNDRiMDk2NzdhMjM1NDE3OS4uZDlhODYyZWQ2MmMyMmIwMzE1OWJjMzhkZWU3ZTMw YmJlMTQ1MmM4NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDcxIEBACisyMDE5LTExLTA2ICBBbmRy ZXMgR29uemFsZXogIDxhbmRyZXNnXzIyQGFwcGxlLmNvbT4KKworICAgICAgICBSZW5hbWUgQVhJ c29sYXRlZFRyZWVOb2RlIHRvIEFYSXNvbGF0ZWRPYmplY3QgZm9yIGNvbnNpc3RlbmN5IHdpdGgg QVhDb3JlT2JqZWN0IGFuZCBBY2Nlc3NpYmlsaXR5T2JqZWN0LgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAzOTEzCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIG5lZWRlZCwgbm8gbmV3 IGZ1bmN0aW9uYWxpdHkuCisKKyAgICAgICAgLSBSZW5hbWVkIEFYSXNvbGF0ZWRUcmVlTm9kZSBh cyBBWElzb2xhdGVkT2JqZWN0LgorICAgICAgICAtIFRoaXMgbWFrZXMgdGhlIG5hbWluZyBjb25z aXN0ZW50IHdpdGggQVhDb3JlT2JqZWN0IGFuZCBBY2Nlc3NpYmlsaXR5T2JqZWN0LgorICAgICAg ICAtIFNvbWUgY29kZSBjbGVhbnVwIGluIFdlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyQmFz ZS5oLgorCisgICAgICAgICogYWNjZXNzaWJpbGl0eS9BWE9iamVjdENhY2hlLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OkFYT2JqZWN0Q2FjaGU6OmNyZWF0ZUlzb2xhdGVkQWNjZXNzaWJpbGl0eVRy ZWVIaWVyYXJjaHkpOgorICAgICAgICAoV2ViQ29yZTo6QVhPYmplY3RDYWNoZTo6Z2VuZXJhdGVJ c29sYXRlZEFjY2Vzc2liaWxpdHlUcmVlKToKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L0FYT2Jq ZWN0Q2FjaGUuaDoKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xh dGVkVHJlZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpBWElzb2xhdGVkVHJlZTo6bm9kZUluVHJl ZUZvcklEKToKKyAgICAgICAgKFdlYkNvcmU6OkFYSXNvbGF0ZWRUcmVlOjpub2RlRm9ySUQgY29u c3QpOgorICAgICAgICAoV2ViQ29yZTo6QVhJc29sYXRlZFRyZWU6OmZvY3VzZWRVSUVsZW1lbnQp OgorICAgICAgICAoV2ViQ29yZTo6QVhJc29sYXRlZFRyZWU6OnJvb3ROb2RlKToKKyAgICAgICAg KFdlYkNvcmU6OkFYSXNvbGF0ZWRUcmVlOjpzZXRSb290KToKKyAgICAgICAgKFdlYkNvcmU6OkFY SXNvbGF0ZWRUcmVlOjphcHBlbmROb2RlQ2hhbmdlcyk6CisgICAgICAgIChXZWJDb3JlOjpBWElz b2xhdGVkVHJlZTo6YXBwbHlQZW5kaW5nQ2hhbmdlcyk6CisgICAgICAgICogYWNjZXNzaWJpbGl0 eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZFRyZWUuaDoKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5 L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkVHJlZU5vZGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 QVhJc29sYXRlZE9iamVjdDo6QVhJc29sYXRlZE9iamVjdCk6CisgICAgICAgIChXZWJDb3JlOjpB WElzb2xhdGVkT2JqZWN0OjpjcmVhdGUpOgorICAgICAgICAoV2ViQ29yZTo6QVhJc29sYXRlZE9i amVjdDo6aW5pdGlhbGl6ZUF0dHJpYnV0ZURhdGEpOgorICAgICAgICAoV2ViQ29yZTo6QVhJc29s YXRlZE9iamVjdDo6c2V0UHJvcGVydHkpOgorICAgICAgICAoV2ViQ29yZTo6QVhJc29sYXRlZE9i amVjdDo6YXBwZW5kQ2hpbGQpOgorICAgICAgICAoV2ViQ29yZTo6QVhJc29sYXRlZE9iamVjdDo6 c2V0UGFyZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkFYSXNvbGF0ZWRPYmplY3Q6OnNldFRyZWVJ ZGVudGlmaWVyKToKKyAgICAgICAgKFdlYkNvcmU6OkFYSXNvbGF0ZWRPYmplY3Q6OmNoaWxkcmVu KToKKyAgICAgICAgKFdlYkNvcmU6OkFYSXNvbGF0ZWRPYmplY3Q6OmZvY3VzZWRVSUVsZW1lbnQg Y29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6QVhJc29sYXRlZE9iamVjdDo6cGFyZW50T2JqZWN0 VW5pZ25vcmVkIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkFYSXNvbGF0ZWRPYmplY3Q6OmFj Y2Vzc2liaWxpdHlIaXRUZXN0IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkFYSXNvbGF0ZWRP YmplY3Q6OnRyZWUgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6QVhJc29sYXRlZE9iamVjdDo6 cmVjdEF0dHJpYnV0ZVZhbHVlIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkFYSXNvbGF0ZWRP YmplY3Q6OmRvdWJsZUF0dHJpYnV0ZVZhbHVlIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkFY SXNvbGF0ZWRPYmplY3Q6OnVuc2lnbmVkQXR0cmlidXRlVmFsdWUgY29uc3QpOgorICAgICAgICAo V2ViQ29yZTo6QVhJc29sYXRlZE9iamVjdDo6Ym9vbEF0dHJpYnV0ZVZhbHVlIGNvbnN0KToKKyAg ICAgICAgKFdlYkNvcmU6OkFYSXNvbGF0ZWRPYmplY3Q6OnN0cmluZ0F0dHJpYnV0ZVZhbHVlIGNv bnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkFYSXNvbGF0ZWRPYmplY3Q6OmludEF0dHJpYnV0ZVZh bHVlIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkFYSXNvbGF0ZWRPYmplY3Q6OnVwZGF0ZUJh Y2tpbmdTdG9yZSk6CisgICAgICAgIChXZWJDb3JlOjpBWElzb2xhdGVkVHJlZU5vZGU6OkFYSXNv bGF0ZWRUcmVlTm9kZSk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpBWElzb2xhdGVkVHJl ZU5vZGU6OmNyZWF0ZSk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpBWElzb2xhdGVkVHJl ZU5vZGU6OmluaXRpYWxpemVBdHRyaWJ1dGVEYXRhKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNv cmU6OkFYSXNvbGF0ZWRUcmVlTm9kZTo6c2V0UHJvcGVydHkpOiBEZWxldGVkLgorICAgICAgICAo V2ViQ29yZTo6QVhJc29sYXRlZFRyZWVOb2RlOjphcHBlbmRDaGlsZCk6IERlbGV0ZWQuCisgICAg ICAgIChXZWJDb3JlOjpBWElzb2xhdGVkVHJlZU5vZGU6OnNldFBhcmVudCk6IERlbGV0ZWQuCisg ICAgICAgIChXZWJDb3JlOjpBWElzb2xhdGVkVHJlZU5vZGU6OnNldFRyZWVJZGVudGlmaWVyKTog RGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkFYSXNvbGF0ZWRUcmVlTm9kZTo6Y2hpbGRyZW4p OiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6QVhJc29sYXRlZFRyZWVOb2RlOjpmb2N1c2Vk VUlFbGVtZW50IGNvbnN0KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkFYSXNvbGF0ZWRU cmVlTm9kZTo6cGFyZW50T2JqZWN0VW5pZ25vcmVkIGNvbnN0KTogRGVsZXRlZC4KKyAgICAgICAg KFdlYkNvcmU6OkFYSXNvbGF0ZWRUcmVlTm9kZTo6YWNjZXNzaWJpbGl0eUhpdFRlc3QgY29uc3Qp OiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6QVhJc29sYXRlZFRyZWVOb2RlOjp0cmVlIGNv bnN0KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkFYSXNvbGF0ZWRUcmVlTm9kZTo6cmVj dEF0dHJpYnV0ZVZhbHVlIGNvbnN0KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkFYSXNv bGF0ZWRUcmVlTm9kZTo6ZG91YmxlQXR0cmlidXRlVmFsdWUgY29uc3QpOiBEZWxldGVkLgorICAg ICAgICAoV2ViQ29yZTo6QVhJc29sYXRlZFRyZWVOb2RlOjp1bnNpZ25lZEF0dHJpYnV0ZVZhbHVl IGNvbnN0KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkFYSXNvbGF0ZWRUcmVlTm9kZTo6 Ym9vbEF0dHJpYnV0ZVZhbHVlIGNvbnN0KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkFY SXNvbGF0ZWRUcmVlTm9kZTo6c3RyaW5nQXR0cmlidXRlVmFsdWUgY29uc3QpOiBEZWxldGVkLgor ICAgICAgICAoV2ViQ29yZTo6QVhJc29sYXRlZFRyZWVOb2RlOjppbnRBdHRyaWJ1dGVWYWx1ZSBj b25zdCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpBWElzb2xhdGVkVHJlZU5vZGU6OnVw ZGF0ZUJhY2tpbmdTdG9yZSk6IERlbGV0ZWQuCisgICAgICAgICogYWNjZXNzaWJpbGl0eS9pc29s YXRlZHRyZWUvQVhJc29sYXRlZFRyZWVOb2RlLmg6CisgICAgICAgICogYWNjZXNzaWJpbGl0eS9t YWMvV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJCYXNlLmg6CisKIDIwMTktMTEtMDYgIENo cmlzIExvcmQgIDxjbG9yZEBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtDYWlyb10gQ2Fpcm8gZ3Jh cGhpY3MgYmFja2VuZCB1c2VzIEltYWdlQnVmZmVyOjpjb3B5SW1hZ2UganVzdCB0byBhY2Nlc3Mg bmF0aXZlIGltYWdlIGJ1ZmZlciBoYW5kbGVzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9h Y2Nlc3NpYmlsaXR5L0FYT2JqZWN0Q2FjaGUuY3BwIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJp bGl0eS9BWE9iamVjdENhY2hlLmNwcAppbmRleCBjYWE3MDM0ZjU0NTY3MDYzZGYzZGM1YTBiNTVl M2IwMzY4OTc0N2U5Li40ZmVjNDU3NWMyOTAyOWZkMzQ3OTZhNTcxNzZlY2U4ZjBiNWE3ZmFiIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FYT2JqZWN0Q2FjaGUuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhPYmplY3RDYWNoZS5jcHAKQEAg LTI5NDMsOSArMjk0Myw5IEBAIHZvaWQgQVhPYmplY3RDYWNoZTo6cGVyZm9ybURlZmVycmVkQ2Fj aGVVcGRhdGUoKQogfQogICAgIAogI2lmIEVOQUJMRShBQ0NFU1NJQklMSVRZX0lTT0xBVEVEX1RS RUUpCi1SZWY8QVhJc29sYXRlZFRyZWVOb2RlPiBBWE9iamVjdENhY2hlOjpjcmVhdGVJc29sYXRl ZEFjY2Vzc2liaWxpdHlUcmVlSGllcmFyY2h5KEFYQ29yZU9iamVjdCYgb2JqZWN0LCBBWElEIHBh cmVudElELCBBWElzb2xhdGVkVHJlZSYgdHJlZSwgVmVjdG9yPFJlZjxBWElzb2xhdGVkVHJlZU5v ZGU+PiYgbm9kZUNoYW5nZXMpCitSZWY8QVhJc29sYXRlZE9iamVjdD4gQVhPYmplY3RDYWNoZTo6 Y3JlYXRlSXNvbGF0ZWRBY2Nlc3NpYmlsaXR5VHJlZUhpZXJhcmNoeShBWENvcmVPYmplY3QmIG9i amVjdCwgQVhJRCBwYXJlbnRJRCwgQVhJc29sYXRlZFRyZWUmIHRyZWUsIFZlY3RvcjxSZWY8QVhJ c29sYXRlZE9iamVjdD4+JiBub2RlQ2hhbmdlcykKIHsKLSAgICBhdXRvIGlzb2xhdGVkVHJlZU5v ZGUgPSBBWElzb2xhdGVkVHJlZU5vZGU6OmNyZWF0ZShvYmplY3QpOworICAgIGF1dG8gaXNvbGF0 ZWRUcmVlTm9kZSA9IEFYSXNvbGF0ZWRPYmplY3Q6OmNyZWF0ZShvYmplY3QpOwogICAgIG5vZGVD aGFuZ2VzLmFwcGVuZChpc29sYXRlZFRyZWVOb2RlLmNvcHlSZWYoKSk7CiAKICAgICBpc29sYXRl ZFRyZWVOb2RlLT5zZXRUcmVlSWRlbnRpZmllcih0cmVlLnRyZWVJZGVudGlmaWVyKCkpOwpAQCAt Mjk2OCw3ICsyOTY4LDcgQEAgUmVmPEFYSXNvbGF0ZWRUcmVlPiBBWE9iamVjdENhY2hlOjpnZW5l cmF0ZUlzb2xhdGVkQWNjZXNzaWJpbGl0eVRyZWUoKQogICAgIGlmICghdHJlZSkKICAgICAgICAg dHJlZSA9IEFYSXNvbGF0ZWRUcmVlOjpjcmVhdGVUcmVlRm9yUGFnZUlEKCptX2RvY3VtZW50LnBh Z2VJRCgpKTsKICAgICAKLSAgICBWZWN0b3I8UmVmPEFYSXNvbGF0ZWRUcmVlTm9kZT4+IG5vZGVD aGFuZ2VzOworICAgIFZlY3RvcjxSZWY8QVhJc29sYXRlZE9iamVjdD4+IG5vZGVDaGFuZ2VzOwog ICAgIGF1dG8gcm9vdCA9IGNyZWF0ZUlzb2xhdGVkQWNjZXNzaWJpbGl0eVRyZWVIaWVyYXJjaHko KnJvb3RPYmplY3QoKSwgSW52YWxpZEFYSUQsICp0cmVlLCBub2RlQ2hhbmdlcyk7CiAgICAgdHJl ZS0+c2V0Um9vdChyb290KTsKICAgICB0cmVlLT5hcHBlbmROb2RlQ2hhbmdlcyhub2RlQ2hhbmdl cyk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FYT2JqZWN0Q2Fj aGUuaCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhPYmplY3RDYWNoZS5oCmluZGV4 IGFjMGMyYmM4Nzc5MjA5NGEzZGE5MGEzNjgzYzZiM2UzYjg4OWNkNjQuLjI5YmIyNTBiOTdhZWMz ZmQ0NDMxOTVkNjFjZGQwYWZkNzU2MGZiNTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Fj Y2Vzc2liaWxpdHkvQVhPYmplY3RDYWNoZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2li aWxpdHkvQVhPYmplY3RDYWNoZS5oCkBAIC00Nyw3ICs0Nyw3IEBACiBuYW1lc3BhY2UgV2ViQ29y ZSB7CiAKICNpZiBFTkFCTEUoQUNDRVNTSUJJTElUWV9JU09MQVRFRF9UUkVFKQotY2xhc3MgQVhJ c29sYXRlZFRyZWVOb2RlOworY2xhc3MgQVhJc29sYXRlZE9iamVjdDsKICNlbmRpZgogY2xhc3Mg RG9jdW1lbnQ7CiBjbGFzcyBIVE1MQXJlYUVsZW1lbnQ7CkBAIC0xOTQsNyArMTk0LDcgQEAgcHVi bGljOgogI2lmIEVOQUJMRShBQ0NFU1NJQklMSVRZX0lTT0xBVEVEX1RSRUUpCiAgICAgV0VCQ09S RV9FWFBPUlQgUmVmPEFYSXNvbGF0ZWRUcmVlPiBnZW5lcmF0ZUlzb2xhdGVkQWNjZXNzaWJpbGl0 eVRyZWUoKTsKIAotICAgIFJlZjxBWElzb2xhdGVkVHJlZU5vZGU+IGNyZWF0ZUlzb2xhdGVkQWNj ZXNzaWJpbGl0eVRyZWVIaWVyYXJjaHkoQVhDb3JlT2JqZWN0JiwgQVhJRCwgQVhJc29sYXRlZFRy ZWUmLCBWZWN0b3I8UmVmPEFYSXNvbGF0ZWRUcmVlTm9kZT4+Jik7CisgICAgUmVmPEFYSXNvbGF0 ZWRPYmplY3Q+IGNyZWF0ZUlzb2xhdGVkQWNjZXNzaWJpbGl0eVRyZWVIaWVyYXJjaHkoQVhDb3Jl T2JqZWN0JiwgQVhJRCwgQVhJc29sYXRlZFRyZWUmLCBWZWN0b3I8UmVmPEFYSXNvbGF0ZWRPYmpl Y3Q+PiYpOwogI2VuZGlmCiAgICAgCiAjaWYgRU5BQkxFKEFDQ0VTU0lCSUxJVFkpCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVk VHJlZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElz b2xhdGVkVHJlZS5jcHAKaW5kZXggY2ZmOTcwN2UwNTg1YThmNTY3YzU5YzE2OWY5N2Y4ZjM0ZTY1 ZWRiNy4uMDdjYmMyYmQ0NzVhYTEwMDViYmRmMmYwYWI2NDQ5YjY3YzExMjU4NyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZFRy ZWUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FY SXNvbGF0ZWRUcmVlLmNwcApAQCAtNjcsNyArNjcsNyBAQCBSZWY8QVhJc29sYXRlZFRyZWU+IEFY SXNvbGF0ZWRUcmVlOjpjcmVhdGUoKQogICAgIHJldHVybiBhZG9wdFJlZigqbmV3IEFYSXNvbGF0 ZWRUcmVlKCkpOwogfQogCi1SZWZQdHI8QVhJc29sYXRlZFRyZWVOb2RlPiBBWElzb2xhdGVkVHJl ZTo6bm9kZUluVHJlZUZvcklEKEFYSXNvbGF0ZWRUcmVlSUQgdHJlZUlELCBBWElEIGF4SUQpCitS ZWZQdHI8QVhJc29sYXRlZE9iamVjdD4gQVhJc29sYXRlZFRyZWU6Om5vZGVJblRyZWVGb3JJRChB WElzb2xhdGVkVHJlZUlEIHRyZWVJRCwgQVhJRCBheElEKQogewogICAgIHJldHVybiB0cmVlRm9y SUQodHJlZUlEKS0+bm9kZUZvcklEKGF4SUQpOwogfQpAQCAtOTcsMjQgKzk3LDI0IEBAIFJlZlB0 cjxBWElzb2xhdGVkVHJlZT4gQVhJc29sYXRlZFRyZWU6OnRyZWVGb3JQYWdlSUQoUGFnZUlkZW50 aWZpZXIgcGFnZUlEKQogICAgIHJldHVybiBudWxscHRyOwogfQogCi1SZWZQdHI8QVhJc29sYXRl ZFRyZWVOb2RlPiBBWElzb2xhdGVkVHJlZTo6bm9kZUZvcklEKEFYSUQgYXhJRCkgY29uc3QKK1Jl ZlB0cjxBWElzb2xhdGVkT2JqZWN0PiBBWElzb2xhdGVkVHJlZTo6bm9kZUZvcklEKEFYSUQgYXhJ RCkgY29uc3QKIHsKICAgICBpZiAoIWF4SUQpCiAgICAgICAgIHJldHVybiBudWxscHRyOwogICAg IHJldHVybiBtX3JlYWRlclRocmVhZE5vZGVNYXAuZ2V0KGF4SUQpOwogfQogCi1SZWZQdHI8QVhJ c29sYXRlZFRyZWVOb2RlPiBBWElzb2xhdGVkVHJlZTo6Zm9jdXNlZFVJRWxlbWVudCgpCitSZWZQ dHI8QVhJc29sYXRlZE9iamVjdD4gQVhJc29sYXRlZFRyZWU6OmZvY3VzZWRVSUVsZW1lbnQoKQog ewogICAgIHJldHVybiBub2RlRm9ySUQobV9mb2N1c2VkTm9kZUlEKTsKIH0KICAgICAKLVJlZlB0 cjxBWElzb2xhdGVkVHJlZU5vZGU+IEFYSXNvbGF0ZWRUcmVlOjpyb290Tm9kZSgpCitSZWZQdHI8 QVhJc29sYXRlZE9iamVjdD4gQVhJc29sYXRlZFRyZWU6OnJvb3ROb2RlKCkKIHsKICAgICByZXR1 cm4gbm9kZUZvcklEKG1fcm9vdE5vZGVJRCk7CiB9CiAKLXZvaWQgQVhJc29sYXRlZFRyZWU6OnNl dFJvb3QoUmVmPEFYSXNvbGF0ZWRUcmVlTm9kZT4mIHJvb3QpCit2b2lkIEFYSXNvbGF0ZWRUcmVl OjpzZXRSb290KFJlZjxBWElzb2xhdGVkT2JqZWN0PiYgcm9vdCkKIHsKICAgICBMb2NrSG9sZGVy IGxvY2tlciB7IG1fY2hhbmdlTG9nTG9jayB9OwogICAgIG1fcm9vdE5vZGVJRCA9IHJvb3QtPm9i amVjdElEKCk7CkBAIC0xMzMsNyArMTMzLDcgQEAgdm9pZCBBWElzb2xhdGVkVHJlZTo6cmVtb3Zl Tm9kZShBWElEIGF4SUQpCiAgICAgbV9wZW5kaW5nUmVtb3ZhbHMuYXBwZW5kKGF4SUQpOwogfQog Ci12b2lkIEFYSXNvbGF0ZWRUcmVlOjphcHBlbmROb2RlQ2hhbmdlcyhWZWN0b3I8UmVmPEFYSXNv bGF0ZWRUcmVlTm9kZT4+JiBsb2cpCit2b2lkIEFYSXNvbGF0ZWRUcmVlOjphcHBlbmROb2RlQ2hh bmdlcyhWZWN0b3I8UmVmPEFYSXNvbGF0ZWRPYmplY3Q+PiYgbG9nKQogewogICAgIExvY2tIb2xk ZXIgbG9ja2VyIHsgbV9jaGFuZ2VMb2dMb2NrIH07CiAgICAgZm9yIChhdXRvJiBub2RlIDogbG9n KQpAQCAtMTQ0LDcgKzE0NCw3IEBAIHZvaWQgQVhJc29sYXRlZFRyZWU6OmFwcGx5UGVuZGluZ0No YW5nZXMoKQogewogICAgIFJFTEVBU0VfQVNTRVJUKCFpc01haW5UaHJlYWQoKSk7CiAgICAgTG9j a0hvbGRlciBsb2NrZXIgeyBtX2NoYW5nZUxvZ0xvY2sgfTsKLSAgICBWZWN0b3I8UmVmPEFYSXNv bGF0ZWRUcmVlTm9kZT4+IGFwcGVuZENvcHk7CisgICAgVmVjdG9yPFJlZjxBWElzb2xhdGVkT2Jq ZWN0Pj4gYXBwZW5kQ29weTsKICAgICBzdGQ6OnN3YXAoYXBwZW5kQ29weSwgbV9wZW5kaW5nQXBw ZW5kcyk7CiAgICAgVmVjdG9yPEFYSUQ+IHJlbW92ZUNvcHkoeyBXVEZNb3ZlKG1fcGVuZGluZ1Jl bW92YWxzKSB9KTsKICAgICBsb2NrZXIudW5sb2NrRWFybHkoKTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRUcmVlLmggYi9T b3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkVHJlZS5o CmluZGV4IGRhZjMzZmMwZDdiNjhkYWExNjY0MWE4MzQ3NjIxZmJiZGNjZTliYTEuLjMwN2NkOTFh MDdkMmM1ZjMwYjM3Y2Y3MWY4YzMxMjgyMTE5NDk1YmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRUcmVlLmgKKysrIGIvU291 cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZFRyZWUuaApA QCAtNDgsMTYgKzQ4LDE2IEBAIHB1YmxpYzoKICAgICBXRUJDT1JFX0VYUE9SVCBzdGF0aWMgUmVm UHRyPEFYSXNvbGF0ZWRUcmVlPiB0cmVlRm9yUGFnZUlEKFBhZ2VJZGVudGlmaWVyKTsKICAgICBX RUJDT1JFX0VYUE9SVCBzdGF0aWMgUmVmUHRyPEFYSXNvbGF0ZWRUcmVlPiB0cmVlRm9ySUQoQVhJ c29sYXRlZFRyZWVJRCk7CiAKLSAgICBXRUJDT1JFX0VYUE9SVCBSZWZQdHI8QVhJc29sYXRlZFRy ZWVOb2RlPiByb290Tm9kZSgpOwotICAgIFdFQkNPUkVfRVhQT1JUIFJlZlB0cjxBWElzb2xhdGVk VHJlZU5vZGU+IGZvY3VzZWRVSUVsZW1lbnQoKTsKLSAgICBSZWZQdHI8QVhJc29sYXRlZFRyZWVO b2RlPiBub2RlRm9ySUQoQVhJRCkgY29uc3Q7Ci0gICAgc3RhdGljIFJlZlB0cjxBWElzb2xhdGVk VHJlZU5vZGU+IG5vZGVJblRyZWVGb3JJRChBWElzb2xhdGVkVHJlZUlELCBBWElEKTsKKyAgICBX RUJDT1JFX0VYUE9SVCBSZWZQdHI8QVhJc29sYXRlZE9iamVjdD4gcm9vdE5vZGUoKTsKKyAgICBX RUJDT1JFX0VYUE9SVCBSZWZQdHI8QVhJc29sYXRlZE9iamVjdD4gZm9jdXNlZFVJRWxlbWVudCgp OworICAgIFJlZlB0cjxBWElzb2xhdGVkT2JqZWN0PiBub2RlRm9ySUQoQVhJRCkgY29uc3Q7Cisg ICAgc3RhdGljIFJlZlB0cjxBWElzb2xhdGVkT2JqZWN0PiBub2RlSW5UcmVlRm9ySUQoQVhJc29s YXRlZFRyZWVJRCwgQVhJRCk7CiAKICAgICAvLyBDYWxsIG9uIG1haW4gdGhyZWFkCi0gICAgdm9p ZCBhcHBlbmROb2RlQ2hhbmdlcyhWZWN0b3I8UmVmPEFYSXNvbGF0ZWRUcmVlTm9kZT4+Jik7Cisg ICAgdm9pZCBhcHBlbmROb2RlQ2hhbmdlcyhWZWN0b3I8UmVmPEFYSXNvbGF0ZWRPYmplY3Q+PiYp OwogICAgIHZvaWQgcmVtb3ZlTm9kZShBWElEKTsKIAotICAgIHZvaWQgc2V0Um9vdChSZWY8QVhJ c29sYXRlZFRyZWVOb2RlPiYpOworICAgIHZvaWQgc2V0Um9vdChSZWY8QVhJc29sYXRlZE9iamVj dD4mKTsKICAgICB2b2lkIHNldEZvY3VzZWROb2RlSUQoQVhJRCk7CiAgICAgCiAgICAgLy8gQ2Fs bCBvbiBBWCB0aHJlYWQKQEAgLTcyLDEwICs3MiwxMCBAQCBwcml2YXRlOgogICAgIHN0YXRpYyBI YXNoTWFwPFBhZ2VJZGVudGlmaWVyLCBSZWY8QVhJc29sYXRlZFRyZWU+PiYgdHJlZVBhZ2VDYWNo ZSgpOwogCiAgICAgLy8gT25seSBhY2Nlc3Mgb24gQVggdGhyZWFkIHJlcXVlc3RpbmcgZGF0YS4K LSAgICBIYXNoTWFwPEFYSUQsIFJlZjxBWElzb2xhdGVkVHJlZU5vZGU+PiBtX3JlYWRlclRocmVh ZE5vZGVNYXA7CisgICAgSGFzaE1hcDxBWElELCBSZWY8QVhJc29sYXRlZE9iamVjdD4+IG1fcmVh ZGVyVGhyZWFkTm9kZU1hcDsKIAogICAgIC8vIFdyaXR0ZW4gdG8gYnkgbWFpbiB0aHJlYWQgdW5k ZXIgbG9jaywgYWNjZXNzZWQgYW5kIGFwcGxpZWQgYnkgQVggdGhyZWFkLgotICAgIFZlY3RvcjxS ZWY8QVhJc29sYXRlZFRyZWVOb2RlPj4gbV9wZW5kaW5nQXBwZW5kczsKKyAgICBWZWN0b3I8UmVm PEFYSXNvbGF0ZWRPYmplY3Q+PiBtX3BlbmRpbmdBcHBlbmRzOwogICAgIFZlY3RvcjxBWElEPiBt X3BlbmRpbmdSZW1vdmFsczsKICAgICBBWElEIG1fcGVuZGluZ0ZvY3VzZWROb2RlSUQ7CiAgICAg TG9jayBtX2NoYW5nZUxvZ0xvY2s7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3Np YmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkVHJlZU5vZGUuY3BwIGIvU291cmNlL1dlYkNv cmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZFRyZWVOb2RlLmNwcAppbmRl eCBjYWU4NzgzOGZiZDVkODI2YTljY2I0OTVmNDY2MDY1Mjg5Mjk4ZTY0Li4zZTUxMjYyOWFjOGNi N2Q3NGNkZTQyMDk0NDNjOWM5NDliMzIwOTY0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9h Y2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkVHJlZU5vZGUuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRUcmVlTm9k ZS5jcHAKQEAgLTM0LDcgKzM0LDcgQEAgZXh0ZXJuICJDIiBib29sIF9BWFVJRWxlbWVudFJlcXVl c3RTZXJ2aWNlZEJ5U2Vjb25kYXJ5QVhUaHJlYWQodm9pZCk7CiAKIG5hbWVzcGFjZSBXZWJDb3Jl IHsKIAotQVhJc29sYXRlZFRyZWVOb2RlOjpBWElzb2xhdGVkVHJlZU5vZGUoY29uc3QgQVhDb3Jl T2JqZWN0JiBvYmplY3QpCitBWElzb2xhdGVkT2JqZWN0OjpBWElzb2xhdGVkT2JqZWN0KGNvbnN0 IEFYQ29yZU9iamVjdCYgb2JqZWN0KQogICAgIDogbV9pZChvYmplY3Qub2JqZWN0SUQoKSkKIHsK ICAgICBBU1NFUlQoaXNNYWluVGhyZWFkKCkpOwpAQCAtNDQsMTQgKzQ0LDE0IEBAIEFYSXNvbGF0 ZWRUcmVlTm9kZTo6QVhJc29sYXRlZFRyZWVOb2RlKGNvbnN0IEFYQ29yZU9iamVjdCYgb2JqZWN0 KQogI2VuZGlmCiB9CiAKLVJlZjxBWElzb2xhdGVkVHJlZU5vZGU+IEFYSXNvbGF0ZWRUcmVlTm9k ZTo6Y3JlYXRlKGNvbnN0IEFYQ29yZU9iamVjdCYgb2JqZWN0KQorUmVmPEFYSXNvbGF0ZWRPYmpl Y3Q+IEFYSXNvbGF0ZWRPYmplY3Q6OmNyZWF0ZShjb25zdCBBWENvcmVPYmplY3QmIG9iamVjdCkK IHsKLSAgICByZXR1cm4gYWRvcHRSZWYoKm5ldyBBWElzb2xhdGVkVHJlZU5vZGUob2JqZWN0KSk7 CisgICAgcmV0dXJuIGFkb3B0UmVmKCpuZXcgQVhJc29sYXRlZE9iamVjdChvYmplY3QpKTsKIH0K IAotQVhJc29sYXRlZFRyZWVOb2RlOjp+QVhJc29sYXRlZFRyZWVOb2RlKCkgPSBkZWZhdWx0Owor QVhJc29sYXRlZE9iamVjdDo6fkFYSXNvbGF0ZWRPYmplY3QoKSA9IGRlZmF1bHQ7CiAKLXZvaWQg QVhJc29sYXRlZFRyZWVOb2RlOjppbml0aWFsaXplQXR0cmlidXRlRGF0YShjb25zdCBBWENvcmVP YmplY3QmIG9iamVjdCkKK3ZvaWQgQVhJc29sYXRlZE9iamVjdDo6aW5pdGlhbGl6ZUF0dHJpYnV0 ZURhdGEoY29uc3QgQVhDb3JlT2JqZWN0JiBvYmplY3QpCiB7CiAgICAgc2V0UHJvcGVydHkoQVhQ cm9wZXJ0eU5hbWU6OlJvbGVWYWx1ZSwgc3RhdGljX2Nhc3Q8aW50PihvYmplY3Qucm9sZVZhbHVl KCkpKTsKICAgICBzZXRQcm9wZXJ0eShBWFByb3BlcnR5TmFtZTo6SXNBdHRhY2htZW50LCBvYmpl Y3QuaXNBdHRhY2htZW50KCkpOwpAQCAtNzAsNyArNzAsNyBAQCB2b2lkIEFYSXNvbGF0ZWRUcmVl Tm9kZTo6aW5pdGlhbGl6ZUF0dHJpYnV0ZURhdGEoY29uc3QgQVhDb3JlT2JqZWN0JiBvYmplY3Qp CiAgICAgc2V0UHJvcGVydHkoQVhQcm9wZXJ0eU5hbWU6OkhlbHBUZXh0LCBvYmplY3QuaGVscFRl eHRBdHRyaWJ1dGVWYWx1ZSgpLmlzb2xhdGVkQ29weSgpKTsKIH0KIAotdm9pZCBBWElzb2xhdGVk VHJlZU5vZGU6OnNldFByb3BlcnR5KEFYUHJvcGVydHlOYW1lIHByb3BlcnR5TmFtZSwgQXR0cmli dXRlVmFsdWVWYXJpYW50JiYgdmFsdWUsIGJvb2wgc2hvdWxkUmVtb3ZlKQordm9pZCBBWElzb2xh dGVkT2JqZWN0OjpzZXRQcm9wZXJ0eShBWFByb3BlcnR5TmFtZSBwcm9wZXJ0eU5hbWUsIEF0dHJp YnV0ZVZhbHVlVmFyaWFudCYmIHZhbHVlLCBib29sIHNob3VsZFJlbW92ZSkKIHsKICAgICBBU1NF UlQoIW1faW5pdGlhbGl6ZWQpOwogICAgIEFTU0VSVChpc01haW5UaHJlYWQoKSk7CkBAIC04MSwy NiArODEsMjYgQEAgdm9pZCBBWElzb2xhdGVkVHJlZU5vZGU6OnNldFByb3BlcnR5KEFYUHJvcGVy dHlOYW1lIHByb3BlcnR5TmFtZSwgQXR0cmlidXRlVmFsdWUKICAgICAgICAgbV9hdHRyaWJ1dGVN YXAuc2V0KHByb3BlcnR5TmFtZSwgdmFsdWUpOwogfQogCi12b2lkIEFYSXNvbGF0ZWRUcmVlTm9k ZTo6YXBwZW5kQ2hpbGQoQVhJRCBheElEKQordm9pZCBBWElzb2xhdGVkT2JqZWN0OjphcHBlbmRD aGlsZChBWElEIGF4SUQpCiB7CiAgICAgQVNTRVJUKGlzTWFpblRocmVhZCgpKTsKICAgICBtX2No aWxkcmVuSURzLmFwcGVuZChheElEKTsKIH0KIAotdm9pZCBBWElzb2xhdGVkVHJlZU5vZGU6OnNl dFBhcmVudChBWElEIHBhcmVudCkKK3ZvaWQgQVhJc29sYXRlZE9iamVjdDo6c2V0UGFyZW50KEFY SUQgcGFyZW50KQogewogICAgIEFTU0VSVChpc01haW5UaHJlYWQoKSk7CiAgICAgbV9wYXJlbnQg PSBwYXJlbnQ7CiB9CiAKLXZvaWQgQVhJc29sYXRlZFRyZWVOb2RlOjpzZXRUcmVlSWRlbnRpZmll cihBWElzb2xhdGVkVHJlZUlEIHRyZWVJZGVudGlmaWVyKQordm9pZCBBWElzb2xhdGVkT2JqZWN0 OjpzZXRUcmVlSWRlbnRpZmllcihBWElzb2xhdGVkVHJlZUlEIHRyZWVJZGVudGlmaWVyKQogewog ICAgIG1fdHJlZUlkZW50aWZpZXIgPSB0cmVlSWRlbnRpZmllcjsKICAgICBpZiAoYXV0byB0cmVl ID0gQVhJc29sYXRlZFRyZWU6OnRyZWVGb3JJRChtX3RyZWVJZGVudGlmaWVyKSkKICAgICAgICAg bV9jYWNoZWRUcmVlID0gdHJlZTsKIH0KIAotY29uc3QgQVhDb3JlT2JqZWN0OjpBY2Nlc3NpYmls aXR5Q2hpbGRyZW5WZWN0b3ImIEFYSXNvbGF0ZWRUcmVlTm9kZTo6Y2hpbGRyZW4oYm9vbCkKK2Nv bnN0IEFYQ29yZU9iamVjdDo6QWNjZXNzaWJpbGl0eUNoaWxkcmVuVmVjdG9yJiBBWElzb2xhdGVk T2JqZWN0OjpjaGlsZHJlbihib29sKQogewogICAgIGlmIChfQVhVSUVsZW1lbnRSZXF1ZXN0U2Vy dmljZWRCeVNlY29uZGFyeUFYVGhyZWFkKCkpIHsKICAgICAgICAgbV9jaGlsZHJlbi5jbGVhcigp OwpAQCAtMTEyLDE5ICsxMTIsMTkgQEAgY29uc3QgQVhDb3JlT2JqZWN0OjpBY2Nlc3NpYmlsaXR5 Q2hpbGRyZW5WZWN0b3ImIEFYSXNvbGF0ZWRUcmVlTm9kZTo6Y2hpbGRyZW4oYm8KICAgICByZXR1 cm4gbV9jaGlsZHJlbjsKIH0KIAotQVhDb3JlT2JqZWN0KiBBWElzb2xhdGVkVHJlZU5vZGU6OmZv Y3VzZWRVSUVsZW1lbnQoKSBjb25zdAorQVhDb3JlT2JqZWN0KiBBWElzb2xhdGVkT2JqZWN0Ojpm b2N1c2VkVUlFbGVtZW50KCkgY29uc3QKIHsKICAgICBpZiAoYXV0byBmb2N1c2VkRWxlbWVudCA9 IHRyZWUoKS0+Zm9jdXNlZFVJRWxlbWVudCgpKQogICAgICAgICByZXR1cm4gZm9jdXNlZEVsZW1l bnQuZ2V0KCk7CiAgICAgcmV0dXJuIG51bGxwdHI7CiB9CiAgICAgCi1BWENvcmVPYmplY3QqIEFY SXNvbGF0ZWRUcmVlTm9kZTo6cGFyZW50T2JqZWN0VW5pZ25vcmVkKCkgY29uc3QKK0FYQ29yZU9i amVjdCogQVhJc29sYXRlZE9iamVjdDo6cGFyZW50T2JqZWN0VW5pZ25vcmVkKCkgY29uc3QKIHsK ICAgICByZXR1cm4gdHJlZSgpLT5ub2RlRm9ySUQocGFyZW50KCkpLmdldCgpOwogfQogCi1BWENv cmVPYmplY3QqIEFYSXNvbGF0ZWRUcmVlTm9kZTo6YWNjZXNzaWJpbGl0eUhpdFRlc3QoY29uc3Qg SW50UG9pbnQmIHBvaW50KSBjb25zdAorQVhDb3JlT2JqZWN0KiBBWElzb2xhdGVkT2JqZWN0Ojph Y2Nlc3NpYmlsaXR5SGl0VGVzdChjb25zdCBJbnRQb2ludCYgcG9pbnQpIGNvbnN0CiB7CiAgICAg aWYgKCFyZWxhdGl2ZUZyYW1lKCkuY29udGFpbnMocG9pbnQpKQogICAgICAgICByZXR1cm4gbnVs bHB0cjsKQEAgLTEzNCwxNSArMTM0LDE1IEBAIEFYQ29yZU9iamVjdCogQVhJc29sYXRlZFRyZWVO b2RlOjphY2Nlc3NpYmlsaXR5SGl0VGVzdChjb25zdCBJbnRQb2ludCYgcG9pbnQpIGNvCiAgICAg ICAgIGlmIChjaGlsZCAmJiBjaGlsZC0+cmVsYXRpdmVGcmFtZSgpLmNvbnRhaW5zKHBvaW50KSkK ICAgICAgICAgICAgIHJldHVybiBjaGlsZC0+YWNjZXNzaWJpbGl0eUhpdFRlc3QocG9pbnQpOwog ICAgIH0KLSAgICByZXR1cm4gY29uc3RfY2FzdDxBWElzb2xhdGVkVHJlZU5vZGUqPih0aGlzKTsK KyAgICByZXR1cm4gY29uc3RfY2FzdDxBWElzb2xhdGVkT2JqZWN0Kj4odGhpcyk7CiB9CiAKLUFY SXNvbGF0ZWRUcmVlKiBBWElzb2xhdGVkVHJlZU5vZGU6OnRyZWUoKSBjb25zdAorQVhJc29sYXRl ZFRyZWUqIEFYSXNvbGF0ZWRPYmplY3Q6OnRyZWUoKSBjb25zdAogewogICAgIHJldHVybiBtX2Nh Y2hlZFRyZWUuZ2V0KCk7CiB9CiAKLUZsb2F0UmVjdCBBWElzb2xhdGVkVHJlZU5vZGU6OnJlY3RB dHRyaWJ1dGVWYWx1ZShBWFByb3BlcnR5TmFtZSBwcm9wZXJ0eU5hbWUpIGNvbnN0CitGbG9hdFJl Y3QgQVhJc29sYXRlZE9iamVjdDo6cmVjdEF0dHJpYnV0ZVZhbHVlKEFYUHJvcGVydHlOYW1lIHBy b3BlcnR5TmFtZSkgY29uc3QKIHsKICAgICBhdXRvIHZhbHVlID0gbV9hdHRyaWJ1dGVNYXAuZ2V0 KHByb3BlcnR5TmFtZSk7CiAgICAgcmV0dXJuIFdURjo6c3dpdGNoT24odmFsdWUsCkBAIC0xNTUs NyArMTU1LDcgQEAgRmxvYXRSZWN0IEFYSXNvbGF0ZWRUcmVlTm9kZTo6cmVjdEF0dHJpYnV0ZVZh bHVlKEFYUHJvcGVydHlOYW1lIHByb3BlcnR5TmFtZSkgY28KICAgICApOwogfQogCi1kb3VibGUg QVhJc29sYXRlZFRyZWVOb2RlOjpkb3VibGVBdHRyaWJ1dGVWYWx1ZShBWFByb3BlcnR5TmFtZSBw cm9wZXJ0eU5hbWUpIGNvbnN0Citkb3VibGUgQVhJc29sYXRlZE9iamVjdDo6ZG91YmxlQXR0cmli dXRlVmFsdWUoQVhQcm9wZXJ0eU5hbWUgcHJvcGVydHlOYW1lKSBjb25zdAogewogICAgIGF1dG8g dmFsdWUgPSBtX2F0dHJpYnV0ZU1hcC5nZXQocHJvcGVydHlOYW1lKTsKICAgICByZXR1cm4gV1RG Ojpzd2l0Y2hPbih2YWx1ZSwKQEAgLTE2NCw3ICsxNjQsNyBAQCBkb3VibGUgQVhJc29sYXRlZFRy ZWVOb2RlOjpkb3VibGVBdHRyaWJ1dGVWYWx1ZShBWFByb3BlcnR5TmFtZSBwcm9wZXJ0eU5hbWUp IGNvbgogICAgICk7CiB9CiAKLXVuc2lnbmVkIEFYSXNvbGF0ZWRUcmVlTm9kZTo6dW5zaWduZWRB dHRyaWJ1dGVWYWx1ZShBWFByb3BlcnR5TmFtZSBwcm9wZXJ0eU5hbWUpIGNvbnN0Cit1bnNpZ25l ZCBBWElzb2xhdGVkT2JqZWN0Ojp1bnNpZ25lZEF0dHJpYnV0ZVZhbHVlKEFYUHJvcGVydHlOYW1l IHByb3BlcnR5TmFtZSkgY29uc3QKIHsKICAgICBhdXRvIHZhbHVlID0gbV9hdHRyaWJ1dGVNYXAu Z2V0KHByb3BlcnR5TmFtZSk7CiAgICAgcmV0dXJuIFdURjo6c3dpdGNoT24odmFsdWUsCkBAIC0x NzMsNyArMTczLDcgQEAgdW5zaWduZWQgQVhJc29sYXRlZFRyZWVOb2RlOjp1bnNpZ25lZEF0dHJp YnV0ZVZhbHVlKEFYUHJvcGVydHlOYW1lIHByb3BlcnR5TmFtZSkKICAgICApOwogfQogCi1ib29s IEFYSXNvbGF0ZWRUcmVlTm9kZTo6Ym9vbEF0dHJpYnV0ZVZhbHVlKEFYUHJvcGVydHlOYW1lIHBy b3BlcnR5TmFtZSkgY29uc3QKK2Jvb2wgQVhJc29sYXRlZE9iamVjdDo6Ym9vbEF0dHJpYnV0ZVZh bHVlKEFYUHJvcGVydHlOYW1lIHByb3BlcnR5TmFtZSkgY29uc3QKIHsKICAgICBhdXRvIHZhbHVl ID0gbV9hdHRyaWJ1dGVNYXAuZ2V0KHByb3BlcnR5TmFtZSk7CiAgICAgcmV0dXJuIFdURjo6c3dp dGNoT24odmFsdWUsCkBAIC0xODIsNyArMTgyLDcgQEAgYm9vbCBBWElzb2xhdGVkVHJlZU5vZGU6 OmJvb2xBdHRyaWJ1dGVWYWx1ZShBWFByb3BlcnR5TmFtZSBwcm9wZXJ0eU5hbWUpIGNvbnN0CiAg ICAgKTsKIH0KIAotY29uc3QgU3RyaW5nIEFYSXNvbGF0ZWRUcmVlTm9kZTo6c3RyaW5nQXR0cmli dXRlVmFsdWUoQVhQcm9wZXJ0eU5hbWUgcHJvcGVydHlOYW1lKSBjb25zdAorY29uc3QgU3RyaW5n IEFYSXNvbGF0ZWRPYmplY3Q6OnN0cmluZ0F0dHJpYnV0ZVZhbHVlKEFYUHJvcGVydHlOYW1lIHBy b3BlcnR5TmFtZSkgY29uc3QKIHsKICAgICBhdXRvIHZhbHVlID0gbV9hdHRyaWJ1dGVNYXAuZ2V0 KHByb3BlcnR5TmFtZSk7CiAgICAgcmV0dXJuIFdURjo6c3dpdGNoT24odmFsdWUsCkBAIC0xOTEs NyArMTkxLDcgQEAgY29uc3QgU3RyaW5nIEFYSXNvbGF0ZWRUcmVlTm9kZTo6c3RyaW5nQXR0cmli dXRlVmFsdWUoQVhQcm9wZXJ0eU5hbWUgcHJvcGVydHlOYW0KICAgICApOwogfQogCi1pbnQgQVhJ c29sYXRlZFRyZWVOb2RlOjppbnRBdHRyaWJ1dGVWYWx1ZShBWFByb3BlcnR5TmFtZSBwcm9wZXJ0 eU5hbWUpIGNvbnN0CitpbnQgQVhJc29sYXRlZE9iamVjdDo6aW50QXR0cmlidXRlVmFsdWUoQVhQ cm9wZXJ0eU5hbWUgcHJvcGVydHlOYW1lKSBjb25zdAogewogICAgIGF1dG8gdmFsdWUgPSBtX2F0 dHJpYnV0ZU1hcC5nZXQocHJvcGVydHlOYW1lKTsKICAgICByZXR1cm4gV1RGOjpzd2l0Y2hPbih2 YWx1ZSwKQEAgLTIwMCw3ICsyMDAsNyBAQCBpbnQgQVhJc29sYXRlZFRyZWVOb2RlOjppbnRBdHRy aWJ1dGVWYWx1ZShBWFByb3BlcnR5TmFtZSBwcm9wZXJ0eU5hbWUpIGNvbnN0CiAgICAgKTsKIH0K IAotdm9pZCBBWElzb2xhdGVkVHJlZU5vZGU6OnVwZGF0ZUJhY2tpbmdTdG9yZSgpCit2b2lkIEFY SXNvbGF0ZWRPYmplY3Q6OnVwZGF0ZUJhY2tpbmdTdG9yZSgpCiB7CiAgICAgaWYgKF9BWFVJRWxl bWVudFJlcXVlc3RTZXJ2aWNlZEJ5U2Vjb25kYXJ5QVhUaHJlYWQoKSkgewogICAgICAgICBSRUxF QVNFX0FTU0VSVCghaXNNYWluVGhyZWFkKCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv YWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZFRyZWVOb2RlLmggYi9Tb3VyY2Uv V2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkVHJlZU5vZGUuaApp bmRleCAyY2UwMDhmYzAwYjM4YTIxYTlkNGUzOTI0OTIyYTdmM2Y4YWE5N2I3Li5iNTdhOTVmNDU3 MWI4NmE4NjkzYTAzZjMzMTA0NTVkZGFiM2Q2MmQxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkVHJlZU5vZGUuaAorKysgYi9T b3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkVHJlZU5v ZGUuaApAQCAtNDUsMTAgKzQ1LDEwIEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogY2xhc3MgQVhJ c29sYXRlZFRyZWU7CiAKLWNsYXNzIEFYSXNvbGF0ZWRUcmVlTm9kZSBmaW5hbCA6IHB1YmxpYyBB WENvcmVPYmplY3QgeworY2xhc3MgQVhJc29sYXRlZE9iamVjdCBmaW5hbCA6IHB1YmxpYyBBWENv cmVPYmplY3QgewogcHVibGljOgotICAgIHN0YXRpYyBSZWY8QVhJc29sYXRlZFRyZWVOb2RlPiBj cmVhdGUoY29uc3QgQVhDb3JlT2JqZWN0Jik7Ci0gICAgfkFYSXNvbGF0ZWRUcmVlTm9kZSgpOwor ICAgIHN0YXRpYyBSZWY8QVhJc29sYXRlZE9iamVjdD4gY3JlYXRlKGNvbnN0IEFYQ29yZU9iamVj dCYpOworICAgIH5BWElzb2xhdGVkT2JqZWN0KCk7CiAKICAgICB2b2lkIHNldE9iamVjdElEKEFY SUQgaWQpIG92ZXJyaWRlIHsgbV9pZCA9IGlkOyB9CiAgICAgQVhJRCBvYmplY3RJRCgpIGNvbnN0 IG92ZXJyaWRlIHsgcmV0dXJuIG1faWQ7IH0KQEAgLTY2MCw4ICs2NjAsOCBAQCBwcml2YXRlOgog CiAgICAgQVhJc29sYXRlZFRyZWVJRCB0cmVlSWRlbnRpZmllcigpIGNvbnN0IHsgcmV0dXJuIG1f dHJlZUlkZW50aWZpZXI7IH0KIAotICAgIEFYSXNvbGF0ZWRUcmVlTm9kZSgpID0gZGVmYXVsdDsK LSAgICBBWElzb2xhdGVkVHJlZU5vZGUoY29uc3QgQVhDb3JlT2JqZWN0Jik7CisgICAgQVhJc29s YXRlZE9iamVjdCgpID0gZGVmYXVsdDsKKyAgICBBWElzb2xhdGVkT2JqZWN0KGNvbnN0IEFYQ29y ZU9iamVjdCYpOwogICAgIHZvaWQgaW5pdGlhbGl6ZUF0dHJpYnV0ZURhdGEoY29uc3QgQVhDb3Jl T2JqZWN0Jik7CiAKICAgICB1c2luZyBBdHRyaWJ1dGVWYWx1ZVZhcmlhbnQgPSBWYXJpYW50PHN0 ZDo6bnVsbHB0cl90LCBTdHJpbmcsIGJvb2wsIGludCwgdW5zaWduZWQsIGRvdWJsZSwgT3B0aW9u YWw8RmxvYXRSZWN0Pj47CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5 L21hYy9XZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlckJhc2UuaCBiL1NvdXJjZS9XZWJDb3Jl L2FjY2Vzc2liaWxpdHkvbWFjL1dlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyQmFzZS5oCmlu ZGV4IDA1YTQ0ZmUyMDJlZWZhMmRmYmQ5OTM1YjVlMmZhZjk0MDhlODNmNWMuLmI2NGQwZTc2YzRk Mzk2ZGVjMThmYjY4ZjYwYzk1ODExMDg1YmZmNWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2FjY2Vzc2liaWxpdHkvbWFjL1dlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyQmFzZS5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvbWFjL1dlYkFjY2Vzc2liaWxpdHlPYmpl Y3RXcmFwcGVyQmFzZS5oCkBAIC0yOSwxOSArMjksMTMgQEAKICNpZm5kZWYgV2ViQWNjZXNzaWJp bGl0eU9iamVjdFdyYXBwZXJCYXNlX2gKICNkZWZpbmUgV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdy YXBwZXJCYXNlX2gKIAotI2luY2x1ZGUgIkFYSXNvbGF0ZWRUcmVlLmgiCi0jaW5jbHVkZSAiQVhJ c29sYXRlZFRyZWVOb2RlLmgiCi0jaW5jbHVkZSAiQWNjZXNzaWJpbGl0eU9iamVjdC5oIgorI2lu Y2x1ZGUgIkFjY2Vzc2liaWxpdHlPYmplY3RJbnRlcmZhY2UuaCIKICNpbmNsdWRlIDxDb3JlR3Jh cGhpY3MvQ29yZUdyYXBoaWNzLmg+CiAjaW5jbHVkZSA8d3RmL1JlZlB0ci5oPgogI2luY2x1ZGUg PHd0Zi9WYXJpYW50Lmg+CiAjaW5jbHVkZSA8d3RmL1dlYWtQdHIuaD4KIAogbmFtZXNwYWNlIFdl YkNvcmUgewotY2xhc3MgQWNjZXNzaWJpbGl0eU9iamVjdDsKLSNpZiBFTkFCTEUoQUNDRVNTSUJJ TElUWV9JU09MQVRFRF9UUkVFKQotY2xhc3MgQVhJc29sYXRlZFRyZWVOb2RlOwotI2VuZGlmCiBz dHJ1Y3QgQWNjZXNzaWJpbGl0eVNlYXJjaENyaXRlcmlhOwogY2xhc3MgSW50UmVjdDsKIGNsYXNz IEZsb2F0UG9pbnQ7CkBAIC01NywxMSArNTEsNiBAQCBjbGFzcyBWaXNpYmxlUG9zaXRpb247CiAK IC0gKGlkKWluaXRXaXRoQWNjZXNzaWJpbGl0eU9iamVjdDooV2ViQ29yZTo6QVhDb3JlT2JqZWN0 KilheE9iamVjdDsKIAotI2lmIEVOQUJMRShBQ0NFU1NJQklMSVRZX0lTT0xBVEVEX1RSRUUpCi1A cHJvcGVydHkgKG5vbmF0b21pYywgcmVhZG9ubHkpIFJlZlB0cjxXZWJDb3JlOjpBWElzb2xhdGVk VHJlZU5vZGU+IGlzb2xhdGVkVHJlZU5vZGU7Ci1AcHJvcGVydHkgKG5vbmF0b21pYywgYXNzaWdu KSBXZWJDb3JlOjpBWElzb2xhdGVkVHJlZUlEIGlzb2xhdGVkVHJlZUlkZW50aWZpZXI7Ci0jZW5k aWYKLQogLSAodm9pZClkZXRhY2g7CiAKIEBwcm9wZXJ0eSAobm9uYXRvbWljLCBhc3NpZ24pIFdl YkNvcmU6OkFYSUQgaWRlbnRpZmllcjsKQEAgLTY5LDcgKzU4LDcgQEAgY2xhc3MgVmlzaWJsZVBv c2l0aW9uOwogLSAoV2ViQ29yZTo6QVhDb3JlT2JqZWN0KilhY2Nlc3NpYmlsaXR5T2JqZWN0Owog LSAoQk9PTCl1cGRhdGVPYmplY3RCYWNraW5nU3RvcmU7CiAKLS8vIFRoaXMgY2FuIGJlIGVpdGhl ciBhbiBBY2Nlc3NpYmlsaXR5T2JqZWN0IG9yIGFuIEFYSXNvbGF0ZWRUcmVlTm9kZQorLy8gVGhp cyBjYW4gYmUgZWl0aGVyIGFuIEFjY2Vzc2liaWxpdHlPYmplY3Qgb3IgYW4gQVhJc29sYXRlZE9i amVjdAogLSAoV2ViQ29yZTo6QVhDb3JlT2JqZWN0KilheEJhY2tpbmdPYmplY3Q7CiAKIC8vIFRo ZXNlIGFyZSBwcmUtZml4ZWQgd2l0aCBiYXNlIHNvIHRoYXQgQXBwS2l0IGRvZXMgbm90IGVuZCB1 cCBjYWxsaW5nIGludG8gdGhlc2UgZGlyZWN0bHkgKGJ5cGFzc2luZyBzYWZldHkgY2hlY2tzKS4K QEAgLTk2LDEwICs4NSw3IEBAIGNsYXNzIFZpc2libGVQb3NpdGlvbjsKIAogZXh0ZXJuIFdlYkNv cmU6OkFjY2Vzc2liaWxpdHlTZWFyY2hDcml0ZXJpYSBhY2Nlc3NpYmlsaXR5U2VhcmNoQ3JpdGVy aWFGb3JTZWFyY2hQcmVkaWNhdGVQYXJhbWV0ZXJpemVkQXR0cmlidXRlKGNvbnN0IE5TRGljdGlv bmFyeSAqKTsKIAotI2lmIEVOQUJMRShBQ0NFU1NJQklMSVRZX0lTT0xBVEVEX1RSRUUpCi1leHRl cm4gTlNBcnJheSAqY29udmVydFRvTlNBcnJheShjb25zdCBWZWN0b3I8UmVmUHRyPFdlYkNvcmU6 OkFYSXNvbGF0ZWRUcmVlTm9kZT4+Jik7Ci0jZW5kaWYKLWV4dGVybiBOU0FycmF5ICpjb252ZXJ0 VG9OU0FycmF5KGNvbnN0IFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlPYmplY3Q6OkFjY2Vzc2liaWxp dHlDaGlsZHJlblZlY3RvciYpOworZXh0ZXJuIE5TQXJyYXkgKmNvbnZlcnRUb05TQXJyYXkoY29u c3QgV2ViQ29yZTo6QVhDb3JlT2JqZWN0OjpBY2Nlc3NpYmlsaXR5Q2hpbGRyZW5WZWN0b3ImKTsK IAogI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCiAtIChpZClfYWNjZXNzaWJpbGl0eVdlYkRvY3Vt ZW50VmlldzsK