84658 2012-04-23 17:24:37 -0700 [V8] Pass Isolate to setDOMException() (Part2) 2012-04-24 09:15:31 -0700 1 1 1 Unclassified WebKit WebCore JavaScript 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 84074 1 haraken haraken abarth japhet webkit.review.bot oldest_to_newest 608222 0 haraken 2012-04-23 17:24:37 -0700 The objective is to pass Isolate around in V8 bindings. In this bug we pass Isolate to setDOMException() in custom binding code. The work will continue to Part3 or so. 608223 1 138468 haraken 2012-04-23 17:26:09 -0700 Created attachment 138468 Patch 608744 2 138468 webkit.review.bot 2012-04-24 09:15:15 -0700 Comment on attachment 138468 Patch Clearing flags on attachment: 138468 Committed r115068: <http://trac.webkit.org/changeset/115068> 608745 3 webkit.review.bot 2012-04-24 09:15:31 -0700 All reviewed patches have been landed. Closing bug. 138468 2012-04-23 17:26:09 -0700 2012-04-24 09:15:15 -0700 Patch bug-84658-20120423172608.patch text/plain 21197 haraken U3VidmVyc2lvbiBSZXZpc2lvbjogMTE0OTYyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDJmYmY2NTY0YzQwODYw MTU3YzgwN2Y2YWFlZjkzMjQ5MDQ0ZjYxMC4uYWNlMjk1OWRjYzQyMWNhNTEwZmZmMTBiNTkzOTYx YjNjNjVkNjg0NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDU1IEBACisyMDEyLTA0LTIzICBLZW50 YXJvIEhhcmEgIDxoYXJha2VuQGNocm9taXVtLm9yZz4KKworICAgICAgICBbVjhdIFBhc3MgSXNv bGF0ZSB0byBzZXRET01FeGNlcHRpb24oKSAoUGFydDIpCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NDY1OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSBvYmplY3RpdmUgaXMgdG8gcGFzcyBJc29sYXRl IGFyb3VuZCBpbiBWOCBiaW5kaW5ncy4KKyAgICAgICAgVGhpcyBwYXRjaCBwYXNzZXMgSXNvbGF0 ZSB0byBzZXRET01FeGNlcHRpb24oKSBpbiBjdXN0b20KKyAgICAgICAgYmluZGluZyBjb2RlLgor CisgICAgICAgIE5vIHRlc3RzLiBObyBjaGFuZ2UgaW4gYmVoYXZpb3IuCisKKyAgICAgICAgKiBi aW5kaW5ncy92OC9WOENvbGxlY3Rpb24uY3BwOgorICAgICAgICAoV2ViQ29yZTo6dG9PcHRpb25z Q29sbGVjdGlvblNldHRlcik6CisgICAgICAgICogYmluZGluZ3MvdjgvVjhDb2xsZWN0aW9uLmg6 CisgICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKiBiaW5kaW5ncy92OC9jdXN0b20vVjhBcnJh eUJ1ZmZlclZpZXdDdXN0b20uaDoKKyAgICAgICAgKFdlYkNvcmU6OmNvbnN0cnVjdFdlYkdMQXJy YXlXaXRoQXJyYXlCdWZmZXJBcmd1bWVudCk6CisgICAgICAgIChXZWJDb3JlOjpzZXRXZWJHTEFy cmF5SGVscGVyKToKKyAgICAgICAgKiBiaW5kaW5ncy92OC9jdXN0b20vVjhET01XaW5kb3dDdXN0 b20uY3BwOgorICAgICAgICAoV2ViQ29yZTo6V2luZG93U2V0VGltZW91dEltcGwpOgorICAgICAg ICAqIGJpbmRpbmdzL3Y4L2N1c3RvbS9WOERhdGFWaWV3Q3VzdG9tLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlY4RGF0YVZpZXc6OmdldEludDhDYWxsYmFjayk6CisgICAgICAgIChXZWJDb3JlOjpW OERhdGFWaWV3OjpnZXRVaW50OENhbGxiYWNrKToKKyAgICAgICAgKFdlYkNvcmU6OlY4RGF0YVZp ZXc6OnNldEludDhDYWxsYmFjayk6CisgICAgICAgIChXZWJDb3JlOjpWOERhdGFWaWV3OjpzZXRV aW50OENhbGxiYWNrKToKKyAgICAgICAgKiBiaW5kaW5ncy92OC9jdXN0b20vVjhEaXJlY3RvcnlF bnRyeVN5bmNDdXN0b20uY3BwOgorICAgICAgICAoV2ViQ29yZTo6VjhEaXJlY3RvcnlFbnRyeVN5 bmM6OmdldERpcmVjdG9yeUNhbGxiYWNrKToKKyAgICAgICAgKFdlYkNvcmU6OlY4RGlyZWN0b3J5 RW50cnlTeW5jOjpnZXRGaWxlQ2FsbGJhY2spOgorICAgICAgICAqIGJpbmRpbmdzL3Y4L2N1c3Rv bS9WOEhUTUxDYW52YXNFbGVtZW50Q3VzdG9tLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlY4SFRN TENhbnZhc0VsZW1lbnQ6OnRvRGF0YVVSTENhbGxiYWNrKToKKyAgICAgICAgKiBiaW5kaW5ncy92 OC9jdXN0b20vVjhIVE1MRWxlbWVudEN1c3RvbS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpWOEhU TUxFbGVtZW50OjppdGVtVmFsdWVBY2Nlc3NvclNldHRlcik6CisgICAgICAgICogYmluZGluZ3Mv djgvY3VzdG9tL1Y4SFRNTE9wdGlvbnNDb2xsZWN0aW9uQ3VzdG9tLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlY4SFRNTE9wdGlvbnNDb2xsZWN0aW9uOjphZGRDYWxsYmFjayk6CisgICAgICAgIChX ZWJDb3JlOjpWOEhUTUxPcHRpb25zQ29sbGVjdGlvbjo6bGVuZ3RoQWNjZXNzb3JTZXR0ZXIpOgor ICAgICAgICAoV2ViQ29yZTo6VjhIVE1MT3B0aW9uc0NvbGxlY3Rpb246OmluZGV4ZWRQcm9wZXJ0 eVNldHRlcik6CisgICAgICAgICogYmluZGluZ3MvdjgvY3VzdG9tL1Y4SFRNTFNlbGVjdEVsZW1l bnRDdXN0b20uY3BwOgorICAgICAgICAoV2ViQ29yZTo6VjhIVE1MU2VsZWN0RWxlbWVudDo6aW5k ZXhlZFByb3BlcnR5U2V0dGVyKToKKyAgICAgICAgKiBiaW5kaW5ncy92OC9jdXN0b20vVjhOb2Rl Q3VzdG9tLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlY4Tm9kZTo6aW5zZXJ0QmVmb3JlQ2FsbGJh Y2spOgorICAgICAgICAoV2ViQ29yZTo6VjhOb2RlOjpyZXBsYWNlQ2hpbGRDYWxsYmFjayk6Cisg ICAgICAgIChXZWJDb3JlOjpWOE5vZGU6OnJlbW92ZUNoaWxkQ2FsbGJhY2spOgorICAgICAgICAo V2ViQ29yZTo6VjhOb2RlOjphcHBlbmRDaGlsZENhbGxiYWNrKToKKyAgICAgICAgKiBiaW5kaW5n cy92OC9jdXN0b20vVjhTUUxUcmFuc2FjdGlvbkN1c3RvbS5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpWOFNRTFRyYW5zYWN0aW9uOjpleGVjdXRlU3FsQ2FsbGJhY2spOgorICAgICAgICAqIGJpbmRp bmdzL3Y4L2N1c3RvbS9WOFdlYktpdE11dGF0aW9uT2JzZXJ2ZXJDdXN0b20uY3BwOgorICAgICAg ICAoV2ViQ29yZTo6VjhXZWJLaXRNdXRhdGlvbk9ic2VydmVyOjpvYnNlcnZlQ2FsbGJhY2spOgor ICAgICAgICAqIGJpbmRpbmdzL3Y4L2N1c3RvbS9WOFhNTEh0dHBSZXF1ZXN0Q3VzdG9tLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlY4WE1MSHR0cFJlcXVlc3Q6OnJlc3BvbnNlQWNjZXNzb3JHZXR0 ZXIpOgorCiAyMDEyLTA0LTIzICBKdWxpZW4gQ2hhZmZyYWl4ICA8amNoYWZmcmFpeEB3ZWJraXQu b3JnPgogCiAgICAgICAgIEN1dCBkZXBlbmRlbmN5IG9uIFJlbmRlckxheWVyOjpzY3JvbGxSZWN0 VG9WaXNpYmxlIG91dHNpZGUgcmVuZGVyaW5nCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9i aW5kaW5ncy92OC9WOENvbGxlY3Rpb24uY3BwIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvdjgv VjhDb2xsZWN0aW9uLmNwcAppbmRleCAyZmY1Yzg4ZGQxNDJiMmQzZWVmNTc2MGNjZGFkNGRhMTA2 NTQ0N2Y0Li44ZGNiY2MxZGQ5NWQ0NjE4MTBjY2UxMGE5ZTkzMjIwMmRiYzU1YWU4IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9WOENvbGxlY3Rpb24uY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4Q29sbGVjdGlvbi5jcHAKQEAgLTM3LDcgKzM3LDcg QEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi12ODo6SGFuZGxlPHY4OjpWYWx1ZT4gdG9PcHRp b25zQ29sbGVjdGlvblNldHRlcih1aW50MzJfdCBpbmRleCwgdjg6OkhhbmRsZTx2ODo6VmFsdWU+ IHZhbHVlLCBIVE1MU2VsZWN0RWxlbWVudCogYmFzZSkKK3Y4OjpIYW5kbGU8djg6OlZhbHVlPiB0 b09wdGlvbnNDb2xsZWN0aW9uU2V0dGVyKHVpbnQzMl90IGluZGV4LCB2ODo6SGFuZGxlPHY4OjpW YWx1ZT4gdmFsdWUsIEhUTUxTZWxlY3RFbGVtZW50KiBiYXNlLCB2ODo6SXNvbGF0ZSogaXNvbGF0 ZSkKIHsKICAgICBpZiAodmFsdWUtPklzTnVsbCgpIHx8IHZhbHVlLT5Jc1VuZGVmaW5lZCgpKSB7 CiAgICAgICAgIGJhc2UtPnJlbW92ZShpbmRleCk7CkBAIC00OCwxNCArNDgsMTQgQEAgdjg6Okhh bmRsZTx2ODo6VmFsdWU+IHRvT3B0aW9uc0NvbGxlY3Rpb25TZXR0ZXIodWludDMyX3QgaW5kZXgs IHY4OjpIYW5kbGU8djg6OlYKIAogICAgIC8vIENoZWNrIHRoYXQgdGhlIHZhbHVlIGlzIGFuIEhU TUxPcHRpb25FbGVtZW50LiAgSWYgbm90LCB0aHJvdyBhIFRZUEVfTUlTTUFUQ0hfRVJSIERPTUV4 Y2VwdGlvbi4KICAgICBpZiAoIVY4SFRNTE9wdGlvbkVsZW1lbnQ6Okhhc0luc3RhbmNlKHZhbHVl KSkgewotICAgICAgICBWOFByb3h5OjpzZXRET01FeGNlcHRpb24oVFlQRV9NSVNNQVRDSF9FUlIp OworICAgICAgICBWOFByb3h5OjpzZXRET01FeGNlcHRpb24oVFlQRV9NSVNNQVRDSF9FUlIsIGlz b2xhdGUpOwogICAgICAgICByZXR1cm4gdmFsdWU7CiAgICAgfQogCiAgICAgSFRNTE9wdGlvbkVs ZW1lbnQqIGVsZW1lbnQgPSBWOEhUTUxPcHRpb25FbGVtZW50Ojp0b05hdGl2ZSh2ODo6SGFuZGxl PHY4OjpPYmplY3Q+OjpDYXN0KHZhbHVlKSk7CiAgICAgYmFzZS0+c2V0T3B0aW9uKGluZGV4LCBl bGVtZW50LCBlYyk7CiAKLSAgICBWOFByb3h5OjpzZXRET01FeGNlcHRpb24oZWMpOworICAgIFY4 UHJveHk6OnNldERPTUV4Y2VwdGlvbihlYywgaXNvbGF0ZSk7CiAgICAgcmV0dXJuIHZhbHVlOwog fQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9WOENvbGxlY3Rpb24u aCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4Q29sbGVjdGlvbi5oCmluZGV4IDMwZGU2 MGU4ZTM4ZTBlNzU5MjcxOGNkMjBlMTk5N2QzODg1ZWMzMzcuLjEzNjIwNGQwMjlkZjRhMWEyYzgx NTg3NzkxNTdhZTQ1M2I5NDJjN2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdz L3Y4L1Y4Q29sbGVjdGlvbi5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4Q29s bGVjdGlvbi5oCkBAIC0xNzYsNyArMTc2LDcgQEAgdGVtcGxhdGU8Y2xhc3MgQ29sbGVjdGlvbj4g c3RhdGljIHZvaWQgc2V0Q29sbGVjdGlvblN0cmluZ0luZGV4ZWRHZXR0ZXIodjg6OkhhbmQKICAg ICBkZXNjLT5JbnN0YW5jZVRlbXBsYXRlKCktPlNldEluZGV4ZWRQcm9wZXJ0eUhhbmRsZXIoY29s bGVjdGlvblN0cmluZ0luZGV4ZWRQcm9wZXJ0eUdldHRlcjxDb2xsZWN0aW9uPiwgMCwgMCwgMCwg Y29sbGVjdGlvbkluZGV4ZWRQcm9wZXJ0eUVudW1lcmF0b3I8Q29sbGVjdGlvbj4pOwogfQogCi12 ODo6SGFuZGxlPHY4OjpWYWx1ZT4gdG9PcHRpb25zQ29sbGVjdGlvblNldHRlcih1aW50MzJfdCBp bmRleCwgdjg6OkhhbmRsZTx2ODo6VmFsdWU+LCBIVE1MU2VsZWN0RWxlbWVudCopOwordjg6Okhh bmRsZTx2ODo6VmFsdWU+IHRvT3B0aW9uc0NvbGxlY3Rpb25TZXR0ZXIodWludDMyX3QgaW5kZXgs IHY4OjpIYW5kbGU8djg6OlZhbHVlPiwgSFRNTFNlbGVjdEVsZW1lbnQqLCB2ODo6SXNvbGF0ZSop OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2JpbmRpbmdzL3Y4L2N1c3RvbS9WOEFycmF5QnVmZmVyVmlld0N1c3RvbS5oIGIvU291cmNlL1dl YkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4QXJyYXlCdWZmZXJWaWV3Q3VzdG9tLmgKaW5kZXgg ZWZlZGQzYjczNDMzOGFjNjlmMjA4NTdlMzM5ZGFkNmFhOGRmZDhlNS4uYTBmYzVhZWQ1MmU0MWY0 YWY4MTYzNGFhODExZTIwMzMzNDBkOWUwNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmlu ZGluZ3MvdjgvY3VzdG9tL1Y4QXJyYXlCdWZmZXJWaWV3Q3VzdG9tLmgKKysrIGIvU291cmNlL1dl YkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4QXJyYXlCdWZmZXJWaWV3Q3VzdG9tLmgKQEAgLTgx LDcgKzgxLDcgQEAgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IGNvbnN0cnVjdFdlYkdMQXJyYXlXaXRo QXJyYXlCdWZmZXJBcmd1bWVudChjb25zdCB2ODo6QXJndW0KICAgICB9CiAgICAgUmVmUHRyPEFy cmF5Q2xhc3M+IGFycmF5ID0gQXJyYXlDbGFzczo6Y3JlYXRlKGJ1Ziwgb2Zmc2V0LCBsZW5ndGgp OwogICAgIGlmICghYXJyYXkpIHsKLSAgICAgICAgVjhQcm94eTo6c2V0RE9NRXhjZXB0aW9uKElO REVYX1NJWkVfRVJSKTsKKyAgICAgICAgVjhQcm94eTo6c2V0RE9NRXhjZXB0aW9uKElOREVYX1NJ WkVfRVJSLCBhcmdzLkdldElzb2xhdGUoKSk7CiAgICAgICAgIHJldHVybiBub3RIYW5kbGVkQnlJ bnRlcmNlcHRvcigpOwogICAgIH0KICAgICAvLyBUcmFuc2Zvcm0gdGhlIGhvbGRlciBpbnRvIGEg d3JhcHBlciBvYmplY3QgZm9yIHRoZSBhcnJheS4KQEAgLTE4OSw3ICsxODksNyBAQCB0ZW1wbGF0 ZSA8Y2xhc3MgQ1BsdXNQbHVzQXJyYXlUeXBlLCBjbGFzcyBKYXZhU2NyaXB0V3JhcHBlckFycmF5 VHlwZT4KIHY4OjpIYW5kbGU8djg6OlZhbHVlPiBzZXRXZWJHTEFycmF5SGVscGVyKGNvbnN0IHY4 OjpBcmd1bWVudHMmIGFyZ3MpCiB7CiAgICAgaWYgKGFyZ3MuTGVuZ3RoKCkgPCAxKSB7Ci0gICAg ICAgIFY4UHJveHk6OnNldERPTUV4Y2VwdGlvbihTWU5UQVhfRVJSKTsKKyAgICAgICAgVjhQcm94 eTo6c2V0RE9NRXhjZXB0aW9uKFNZTlRBWF9FUlIsIGFyZ3MuR2V0SXNvbGF0ZSgpKTsKICAgICAg ICAgcmV0dXJuIG5vdEhhbmRsZWRCeUludGVyY2VwdG9yKCk7CiAgICAgfQogCkBAIC0yMDIsNyAr MjAyLDcgQEAgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IHNldFdlYkdMQXJyYXlIZWxwZXIoY29uc3Qg djg6OkFyZ3VtZW50cyYgYXJncykKICAgICAgICAgaWYgKGFyZ3MuTGVuZ3RoKCkgPT0gMikKICAg ICAgICAgICAgIG9mZnNldCA9IHRvVUludDMyKGFyZ3NbMV0pOwogICAgICAgICBpZiAoIWltcGwt PnNldChzcmMsIG9mZnNldCkpCi0gICAgICAgICAgICBWOFByb3h5OjpzZXRET01FeGNlcHRpb24o SU5ERVhfU0laRV9FUlIpOworICAgICAgICAgICAgVjhQcm94eTo6c2V0RE9NRXhjZXB0aW9uKElO REVYX1NJWkVfRVJSLCBhcmdzLkdldElzb2xhdGUoKSk7CiAgICAgICAgIHJldHVybiB2ODo6VW5k ZWZpbmVkKCk7CiAgICAgfQogCkBAIC0yMTcsNyArMjE3LDcgQEAgdjg6OkhhbmRsZTx2ODo6VmFs dWU+IHNldFdlYkdMQXJyYXlIZWxwZXIoY29uc3Qgdjg6OkFyZ3VtZW50cyYgYXJncykKICAgICAg ICAgICAgIHx8IG9mZnNldCArIGxlbmd0aCA+IGltcGwtPmxlbmd0aCgpCiAgICAgICAgICAgICB8 fCBvZmZzZXQgKyBsZW5ndGggPCBvZmZzZXQpCiAgICAgICAgICAgICAvLyBPdXQgb2YgcmFuZ2Ug b2Zmc2V0IG9yIG92ZXJmbG93Ci0gICAgICAgICAgICBWOFByb3h5OjpzZXRET01FeGNlcHRpb24o SU5ERVhfU0laRV9FUlIpOworICAgICAgICAgICAgVjhQcm94eTo6c2V0RE9NRXhjZXB0aW9uKElO REVYX1NJWkVfRVJSLCBhcmdzLkdldElzb2xhdGUoKSk7CiAgICAgICAgIGVsc2UgewogICAgICAg ICAgICAgaWYgKCFmYXN0U2V0SW5zdGFsbGVkKGFyZ3MuSG9sZGVyKCkpKSB7CiAgICAgICAgICAg ICAgICAgaW5zdGFsbEZhc3RTZXQoYXJncy5Ib2xkZXIoKSk7CkBAIC0yMzAsNyArMjMwLDcgQEAg djg6OkhhbmRsZTx2ODo6VmFsdWU+IHNldFdlYkdMQXJyYXlIZWxwZXIoY29uc3Qgdjg6OkFyZ3Vt ZW50cyYgYXJncykKICAgICAgICAgcmV0dXJuIHY4OjpVbmRlZmluZWQoKTsKICAgICB9CiAKLSAg ICBWOFByb3h5OjpzZXRET01FeGNlcHRpb24oU1lOVEFYX0VSUik7CisgICAgVjhQcm94eTo6c2V0 RE9NRXhjZXB0aW9uKFNZTlRBWF9FUlIsIGFyZ3MuR2V0SXNvbGF0ZSgpKTsKICAgICByZXR1cm4g bm90SGFuZGxlZEJ5SW50ZXJjZXB0b3IoKTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4RE9NV2luZG93Q3VzdG9tLmNwcCBiL1NvdXJjZS9XZWJD b3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOERPTVdpbmRvd0N1c3RvbS5jcHAKaW5kZXggMzJlNTg5 ZDFhYThmOTRiOTcxYjI2Njk1M2VjYzBkOWEwOTZlMmE2NS4uYmYwODNiNTIxMjE4MDg0ZjE4MDdi NmNiMDhkMWIzODZkMTgyM2VjOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mv djgvY3VzdG9tL1Y4RE9NV2luZG93Q3VzdG9tLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5k aW5ncy92OC9jdXN0b20vVjhET01XaW5kb3dDdXN0b20uY3BwCkBAIC03OCw3ICs3OCw3IEBAIHY4 OjpIYW5kbGU8djg6OlZhbHVlPiBXaW5kb3dTZXRUaW1lb3V0SW1wbChjb25zdCB2ODo6QXJndW1l bnRzJiBhcmdzLCBib29sIHNpbmdsCiAgICAgU2NyaXB0RXhlY3V0aW9uQ29udGV4dCogc2NyaXB0 Q29udGV4dCA9IHN0YXRpY19jYXN0PFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqPihpbXAtPmRvY3Vt ZW50KCkpOwogCiAgICAgaWYgKCFzY3JpcHRDb250ZXh0KSB7Ci0gICAgICAgIFY4UHJveHk6OnNl dERPTUV4Y2VwdGlvbihJTlZBTElEX0FDQ0VTU19FUlIpOworICAgICAgICBWOFByb3h5OjpzZXRE T01FeGNlcHRpb24oSU5WQUxJRF9BQ0NFU1NfRVJSLCBhcmdzLkdldElzb2xhdGUoKSk7CiAgICAg ICAgIHJldHVybiB2ODo6VW5kZWZpbmVkKCk7CiAgICAgfQogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhEYXRhVmlld0N1c3RvbS5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhEYXRhVmlld0N1c3RvbS5jcHAKaW5kZXggMDI2 ZjkyNDBjZTQyNGRlNzYwZWNmOTAyNjhjYjg2MzFjODhiZDI0Zi4uNDE3YzQ5ZTM0YjNmZGU4Nzc3 Njk2ZjEyMWU2ODEwMWFmMjgwOTgyOCAxMDA3NTUKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGlu Z3MvdjgvY3VzdG9tL1Y4RGF0YVZpZXdDdXN0b20uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Jp bmRpbmdzL3Y4L2N1c3RvbS9WOERhdGFWaWV3Q3VzdG9tLmNwcApAQCAtNzUsNyArNzUsNyBAQCB2 ODo6SGFuZGxlPHY4OjpWYWx1ZT4gVjhEYXRhVmlldzo6Z2V0SW50OENhbGxiYWNrKGNvbnN0IHY4 OjpBcmd1bWVudHMmIGFyZ3MpCiAgICAgRVhDRVBUSU9OX0JMT0NLKHVuc2lnbmVkLCBieXRlT2Zm c2V0LCB0b1VJbnQzMihhcmdzWzBdKSk7CiAgICAgaW50OF90IHJlc3VsdCA9IGltcC0+Z2V0SW50 OChieXRlT2Zmc2V0LCBlYyk7CiAgICAgaWYgKFVOTElLRUxZKGVjKSkgewotICAgICAgICBWOFBy b3h5OjpzZXRET01FeGNlcHRpb24oZWMpOworICAgICAgICBWOFByb3h5OjpzZXRET01FeGNlcHRp b24oZWMsIGFyZ3MuR2V0SXNvbGF0ZSgpKTsKICAgICAgICAgcmV0dXJuIHY4OjpIYW5kbGU8djg6 OlZhbHVlPigpOwogICAgIH0KICAgICByZXR1cm4gdjg6OkludGVnZXI6Ok5ldyhyZXN1bHQpOwpA QCAtOTIsNyArOTIsNyBAQCB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gVjhEYXRhVmlldzo6Z2V0VWlu dDhDYWxsYmFjayhjb25zdCB2ODo6QXJndW1lbnRzJiBhcmdzKQogICAgIEVYQ0VQVElPTl9CTE9D Syh1bnNpZ25lZCwgYnl0ZU9mZnNldCwgdG9VSW50MzIoYXJnc1swXSkpOwogICAgIHVpbnQ4X3Qg cmVzdWx0ID0gaW1wLT5nZXRVaW50OChieXRlT2Zmc2V0LCBlYyk7CiAgICAgaWYgKFVOTElLRUxZ KGVjKSkgewotICAgICAgICBWOFByb3h5OjpzZXRET01FeGNlcHRpb24oZWMpOworICAgICAgICBW OFByb3h5OjpzZXRET01FeGNlcHRpb24oZWMsIGFyZ3MuR2V0SXNvbGF0ZSgpKTsKICAgICAgICAg cmV0dXJuIHY4OjpIYW5kbGU8djg6OlZhbHVlPigpOwogICAgIH0KICAgICByZXR1cm4gdjg6Oklu dGVnZXI6Ok5ldyhyZXN1bHQpOwpAQCAtMTEwLDcgKzExMCw3IEBAIHY4OjpIYW5kbGU8djg6OlZh bHVlPiBWOERhdGFWaWV3OjpzZXRJbnQ4Q2FsbGJhY2soY29uc3Qgdjg6OkFyZ3VtZW50cyYgYXJn cykKICAgICBFWENFUFRJT05fQkxPQ0soaW50LCB2YWx1ZSwgdG9JbnQzMihhcmdzWzFdKSk7CiAg ICAgaW1wLT5zZXRJbnQ4KGJ5dGVPZmZzZXQsIHN0YXRpY19jYXN0PGludDhfdD4odmFsdWUpLCBl Yyk7CiAgICAgaWYgKFVOTElLRUxZKGVjKSkKLSAgICAgICAgVjhQcm94eTo6c2V0RE9NRXhjZXB0 aW9uKGVjKTsKKyAgICAgICAgVjhQcm94eTo6c2V0RE9NRXhjZXB0aW9uKGVjLCBhcmdzLkdldElz b2xhdGUoKSk7CiAgICAgcmV0dXJuIHY4OjpIYW5kbGU8djg6OlZhbHVlPigpOwogfQogCkBAIC0x MjYsNyArMTI2LDcgQEAgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IFY4RGF0YVZpZXc6OnNldFVpbnQ4 Q2FsbGJhY2soY29uc3Qgdjg6OkFyZ3VtZW50cyYgYXJncykKICAgICBFWENFUFRJT05fQkxPQ0so aW50LCB2YWx1ZSwgdG9JbnQzMihhcmdzWzFdKSk7CiAgICAgaW1wLT5zZXRVaW50OChieXRlT2Zm c2V0LCBzdGF0aWNfY2FzdDx1aW50OF90Pih2YWx1ZSksIGVjKTsKICAgICBpZiAoVU5MSUtFTFko ZWMpKQotICAgICAgICBWOFByb3h5OjpzZXRET01FeGNlcHRpb24oZWMpOworICAgICAgICBWOFBy b3h5OjpzZXRET01FeGNlcHRpb24oZWMsIGFyZ3MuR2V0SXNvbGF0ZSgpKTsKICAgICByZXR1cm4g djg6OkhhbmRsZTx2ODo6VmFsdWU+KCk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2JpbmRpbmdzL3Y4L2N1c3RvbS9WOERpcmVjdG9yeUVudHJ5U3luY0N1c3RvbS5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhEaXJlY3RvcnlFbnRyeVN5bmNDdXN0b20u Y3BwCmluZGV4IGE2ZGNkNzY4NTg1NjhhZGNmOTM5MjJkMjM4MjFjNTVlYzM5MGQwYWQuLjUxMzVi Y2UzMzhjZjE2NzMwMmQ1ZGNjOWI5YWM4NTlkYWM4MGMwN2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOERpcmVjdG9yeUVudHJ5U3luY0N1c3RvbS5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4RGlyZWN0b3J5RW50cnlT eW5jQ3VzdG9tLmNwcApAQCAtOTksMTIgKzk5LDEyIEBAIHY4OjpIYW5kbGU8djg6OlZhbHVlPiBW OERpcmVjdG9yeUVudHJ5U3luYzo6Z2V0RGlyZWN0b3J5Q2FsbGJhY2soY29uc3Qgdjg6OkFyZ3Vt CiAgICAgU1RSSU5HX1RPX1Y4UEFSQU1FVEVSX0VYQ0VQVElPTl9CTE9DSyhWOFBhcmFtZXRlcjw+ LCBwYXRoLCBhcmdzWzBdKTsKICAgICBSZWZQdHI8V2ViS2l0RmxhZ3M+IGZsYWdzID0gZ2V0Rmxh Z3MoYXJnc1sxXSwgZWMpOwogICAgIGlmIChVTkxJS0VMWShlYykpIHsKLSAgICAgICAgVjhQcm94 eTo6c2V0RE9NRXhjZXB0aW9uKGVjKTsKKyAgICAgICAgVjhQcm94eTo6c2V0RE9NRXhjZXB0aW9u KGVjLCBhcmdzLkdldElzb2xhdGUoKSk7CiAgICAgICAgIHJldHVybiB2ODo6SGFuZGxlPHY4OjpW YWx1ZT4oKTsKICAgICB9CiAgICAgUmVmUHRyPERpcmVjdG9yeUVudHJ5U3luYz4gcmVzdWx0ID0g aW1wLT5nZXREaXJlY3RvcnkocGF0aCwgZmxhZ3MsIGVjKTsKICAgICBpZiAoVU5MSUtFTFkoZWMp KSB7Ci0gICAgICAgIFY4UHJveHk6OnNldERPTUV4Y2VwdGlvbihlYyk7CisgICAgICAgIFY4UHJv eHk6OnNldERPTUV4Y2VwdGlvbihlYywgYXJncy5HZXRJc29sYXRlKCkpOwogICAgICAgICByZXR1 cm4gdjg6OkhhbmRsZTx2ODo6VmFsdWU+KCk7CiAgICAgfQogICAgIHJldHVybiB0b1Y4KHJlc3Vs dC5yZWxlYXNlKCksIGFyZ3MuR2V0SXNvbGF0ZSgpKTsKQEAgLTExOCwxMiArMTE4LDEyIEBAIHY4 OjpIYW5kbGU8djg6OlZhbHVlPiBWOERpcmVjdG9yeUVudHJ5U3luYzo6Z2V0RmlsZUNhbGxiYWNr KGNvbnN0IHY4OjpBcmd1bWVudHMmCiAgICAgU1RSSU5HX1RPX1Y4UEFSQU1FVEVSX0VYQ0VQVElP Tl9CTE9DSyhWOFBhcmFtZXRlcjw+LCBwYXRoLCBhcmdzWzBdKTsKICAgICBSZWZQdHI8V2ViS2l0 RmxhZ3M+IGZsYWdzID0gZ2V0RmxhZ3MoYXJnc1sxXSwgZWMpOwogICAgIGlmIChVTkxJS0VMWShl YykpIHsKLSAgICAgICAgVjhQcm94eTo6c2V0RE9NRXhjZXB0aW9uKGVjKTsKKyAgICAgICAgVjhQ cm94eTo6c2V0RE9NRXhjZXB0aW9uKGVjLCBhcmdzLkdldElzb2xhdGUoKSk7CiAgICAgICAgIHJl dHVybiB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4oKTsKICAgICB9CiAgICAgUmVmUHRyPEZpbGVFbnRy eVN5bmM+IHJlc3VsdCA9IGltcC0+Z2V0RmlsZShwYXRoLCBmbGFncywgZWMpOwogICAgIGlmIChV TkxJS0VMWShlYykpIHsKLSAgICAgICAgVjhQcm94eTo6c2V0RE9NRXhjZXB0aW9uKGVjKTsKKyAg ICAgICAgVjhQcm94eTo6c2V0RE9NRXhjZXB0aW9uKGVjLCBhcmdzLkdldElzb2xhdGUoKSk7CiAg ICAgICAgIHJldHVybiB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4oKTsKICAgICB9CiAgICAgcmV0dXJu IHRvVjgocmVzdWx0LnJlbGVhc2UoKSwgYXJncy5HZXRJc29sYXRlKCkpOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4SFRNTENhbnZhc0VsZW1lbnRDdXN0 b20uY3BwIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4SFRNTENhbnZhc0Vs ZW1lbnRDdXN0b20uY3BwCmluZGV4IDk5ODBhZjM1ZDJmYWVhMWM5MWNhMWY1MzQyYjAxZGIwM2Fi MjQ3NzguLjAxYzU0ZGI0NjRhNDNjMWRhN2I1MzY5OWM5NDA5YWQ3MTVlYzgwYzUgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOEhUTUxDYW52YXNFbGVtZW50 Q3VzdG9tLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhIVE1M Q2FudmFzRWxlbWVudEN1c3RvbS5jcHAKQEAgLTExMCw3ICsxMTAsNyBAQCB2ODo6SGFuZGxlPHY4 OjpWYWx1ZT4gVjhIVE1MQ2FudmFzRWxlbWVudDo6dG9EYXRhVVJMQ2FsbGJhY2soY29uc3Qgdjg6 OkFyZ3VtZW50cwogICAgIH0KIAogICAgIFN0cmluZyByZXN1bHQgPSBjYW52YXMtPnRvRGF0YVVS TCh0eXBlLCBxdWFsaXR5UHRyLCBlYyk7Ci0gICAgVjhQcm94eTo6c2V0RE9NRXhjZXB0aW9uKGVj KTsKKyAgICBWOFByb3h5OjpzZXRET01FeGNlcHRpb24oZWMsIGFyZ3MuR2V0SXNvbGF0ZSgpKTsK ICAgICByZXR1cm4gdjhTdHJpbmdPclVuZGVmaW5lZChyZXN1bHQpOwogfQogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhIVE1MRWxlbWVudEN1c3RvbS5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhIVE1MRWxlbWVudEN1c3Rv bS5jcHAKaW5kZXggOTNkZjMwZWExZmZjNTRiNDYyMTRmNTA3MDBlMDg3ODljOTk4MzE5NC4uZGVh MTdlYzhjYzI2OWFkYWI2YTM2MzNjZWQ0ODY3YWMyMjk0N2Y4MCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4SFRNTEVsZW1lbnRDdXN0b20uY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOEhUTUxFbGVtZW50Q3VzdG9tLmNw cApAQCAtNzMsNyArNzMsNyBAQCB2b2lkIFY4SFRNTEVsZW1lbnQ6Oml0ZW1WYWx1ZUFjY2Vzc29y U2V0dGVyKHY4OjpMb2NhbDx2ODo6U3RyaW5nPiBuYW1lLCB2ODo6TG9jYQogICAgIEV4Y2VwdGlv bkNvZGUgZWMgPSAwOwogICAgIGltcGwtPnNldEl0ZW1WYWx1ZSh0b1dlYkNvcmVTdHJpbmcodmFs dWUpLCBlYyk7CiAgICAgaWYgKGVjKQotICAgICAgICBWOFByb3h5OjpzZXRET01FeGNlcHRpb24o ZWMpOworICAgICAgICBWOFByb3h5OjpzZXRET01FeGNlcHRpb24oZWMsIGluZm8uR2V0SXNvbGF0 ZSgpKTsKIH0KICNlbmRpZgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92 OC9jdXN0b20vVjhIVE1MT3B0aW9uc0NvbGxlY3Rpb25DdXN0b20uY3BwIGIvU291cmNlL1dlYkNv cmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4SFRNTE9wdGlvbnNDb2xsZWN0aW9uQ3VzdG9tLmNwcApp bmRleCA5MDNhOWY3MDI5N2U3YzQ2MmVmYzk3OTgwN2E0N2FiZWRjZmI3ZTNkLi5kNTk1ZDBlZWMy NGViY2U0YTllZDhmYzg1MWJiODUyNDFmMDZiZTRkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9iaW5kaW5ncy92OC9jdXN0b20vVjhIVE1MT3B0aW9uc0NvbGxlY3Rpb25DdXN0b20uY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOEhUTUxPcHRpb25zQ29sbGVj dGlvbkN1c3RvbS5jcHAKQEAgLTU2LDcgKzU2LDcgQEAgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IFY4 SFRNTE9wdGlvbnNDb2xsZWN0aW9uOjphZGRDYWxsYmFjayhjb25zdCB2ODo6QXJndW1lbnRzJgog ewogICAgIElOQ19TVEFUUygiRE9NLkhUTUxPcHRpb25zQ29sbGVjdGlvbi5hZGQoKSIpOwogICAg IGlmICghVjhIVE1MT3B0aW9uRWxlbWVudDo6SGFzSW5zdGFuY2UoYXJnc1swXSkpIHsKLSAgICAg ICAgVjhQcm94eTo6c2V0RE9NRXhjZXB0aW9uKFRZUEVfTUlTTUFUQ0hfRVJSKTsKKyAgICAgICAg VjhQcm94eTo6c2V0RE9NRXhjZXB0aW9uKFRZUEVfTUlTTUFUQ0hfRVJSLCBhcmdzLkdldElzb2xh dGUoKSk7CiAgICAgICAgIHJldHVybiB2ODo6VW5kZWZpbmVkKCk7CiAgICAgfQogICAgIEhUTUxP cHRpb25zQ29sbGVjdGlvbiogaW1wID0gVjhIVE1MT3B0aW9uc0NvbGxlY3Rpb246OnRvTmF0aXZl KGFyZ3MuSG9sZGVyKCkpOwpAQCAtODAsNyArODAsNyBAQCB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4g VjhIVE1MT3B0aW9uc0NvbGxlY3Rpb246OmFkZENhbGxiYWNrKGNvbnN0IHY4OjpBcmd1bWVudHMm CiAgICAgfQogCiAgICAgaWYgKGVjICE9IDApCi0gICAgICAgIFY4UHJveHk6OnNldERPTUV4Y2Vw dGlvbihlYyk7CisgICAgICAgIFY4UHJveHk6OnNldERPTUV4Y2VwdGlvbihlYywgYXJncy5HZXRJ c29sYXRlKCkpOwogCiAgICAgcmV0dXJuIHY4OjpVbmRlZmluZWQoKTsKIH0KQEAgLTExMSw3ICsx MTEsNyBAQCB2b2lkIFY4SFRNTE9wdGlvbnNDb2xsZWN0aW9uOjpsZW5ndGhBY2Nlc3NvclNldHRl cih2ODo6TG9jYWw8djg6OlN0cmluZz4gbmFtZSwgdgogICAgIGlmICghZWMpCiAgICAgICAgIGlt cC0+c2V0TGVuZ3RoKG5ld0xlbmd0aCwgZWMpOwogCi0gICAgVjhQcm94eTo6c2V0RE9NRXhjZXB0 aW9uKGVjKTsKKyAgICBWOFByb3h5OjpzZXRET01FeGNlcHRpb24oZWMsIGluZm8uR2V0SXNvbGF0 ZSgpKTsKIH0KIAogdjg6OkhhbmRsZTx2ODo6VmFsdWU+IFY4SFRNTE9wdGlvbnNDb2xsZWN0aW9u OjppbmRleGVkUHJvcGVydHlHZXR0ZXIodWludDMyX3QgaW5kZXgsIGNvbnN0IHY4OjpBY2Nlc3Nv ckluZm8mIGluZm8pCkBAIC0xMzEsNyArMTMxLDcgQEAgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IFY4 SFRNTE9wdGlvbnNDb2xsZWN0aW9uOjppbmRleGVkUHJvcGVydHlTZXR0ZXIodWludDMyX3QgaW4K ICAgICBJTkNfU1RBVFMoIkRPTS5IVE1MT3B0aW9uc0NvbGxlY3Rpb24uSW5kZXhlZFByb3BlcnR5 U2V0dGVyIik7CiAgICAgSFRNTE9wdGlvbnNDb2xsZWN0aW9uKiBjb2xsZWN0aW9uID0gVjhIVE1M T3B0aW9uc0NvbGxlY3Rpb246OnRvTmF0aXZlKGluZm8uSG9sZGVyKCkpOwogICAgIEhUTUxTZWxl Y3RFbGVtZW50KiBiYXNlID0gc3RhdGljX2Nhc3Q8SFRNTFNlbGVjdEVsZW1lbnQqPihjb2xsZWN0 aW9uLT5iYXNlKCkpOwotICAgIHJldHVybiB0b09wdGlvbnNDb2xsZWN0aW9uU2V0dGVyKGluZGV4 LCB2YWx1ZSwgYmFzZSk7CisgICAgcmV0dXJuIHRvT3B0aW9uc0NvbGxlY3Rpb25TZXR0ZXIoaW5k ZXgsIHZhbHVlLCBiYXNlLCBpbmZvLkdldElzb2xhdGUoKSk7CiB9CiAKIH0gLy8gbmFtZXNwYWNl IFdlYkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9W OEhUTUxTZWxlY3RFbGVtZW50Q3VzdG9tLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4 L2N1c3RvbS9WOEhUTUxTZWxlY3RFbGVtZW50Q3VzdG9tLmNwcAppbmRleCA1ZjhlMTM1NTAwNzg1 MzZmNzJhYjg4NWI2ZjJhMDViYjE4YWIyNTI5Li5lMWQ1OTE0YWE3MDFkZWY5Zjg1MGNiY2E1MDY3 MDcyNDM0NDRhNTZhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0 b20vVjhIVE1MU2VsZWN0RWxlbWVudEN1c3RvbS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYmlu ZGluZ3MvdjgvY3VzdG9tL1Y4SFRNTFNlbGVjdEVsZW1lbnRDdXN0b20uY3BwCkBAIC02MCw3ICs2 MCw3IEBAIHY4OjpIYW5kbGU8djg6OlZhbHVlPiBWOEhUTUxTZWxlY3RFbGVtZW50OjppbmRleGVk UHJvcGVydHlTZXR0ZXIodWludDMyX3QgaW5kZXgsCiB7CiAgICAgSU5DX1NUQVRTKCJET00uSFRN TFNlbGVjdEVsZW1lbnQuSW5kZXhlZFByb3BlcnR5U2V0dGVyIik7CiAgICAgSFRNTFNlbGVjdEVs ZW1lbnQqIHNlbGVjdCA9IFY4SFRNTFNlbGVjdEVsZW1lbnQ6OnRvTmF0aXZlKGluZm8uSG9sZGVy KCkpOwotICAgIHJldHVybiB0b09wdGlvbnNDb2xsZWN0aW9uU2V0dGVyKGluZGV4LCB2YWx1ZSwg c2VsZWN0KTsKKyAgICByZXR1cm4gdG9PcHRpb25zQ29sbGVjdGlvblNldHRlcihpbmRleCwgdmFs dWUsIHNlbGVjdCwgaW5mby5HZXRJc29sYXRlKCkpOwogfQogCiB2ODo6SGFuZGxlPHY4OjpWYWx1 ZT4gVjhIVE1MU2VsZWN0RWxlbWVudDo6cmVtb3ZlQ2FsbGJhY2soY29uc3Qgdjg6OkFyZ3VtZW50 cyYgYXJncykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9W OE5vZGVDdXN0b20uY3BwIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4Tm9k ZUN1c3RvbS5jcHAKaW5kZXggZjkyMzJkZjMzNDUzMmJhMTI3ZDM5MjIxNTAwMzBlN2Q0MGQyNGM3 NS4uNzFlNDcxYTI2OWFjOTkzNjliMTQ4ODE2YWQ4NDVmZjVmMjVjMGMxNCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4Tm9kZUN1c3RvbS5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4Tm9kZUN1c3RvbS5jcHAKQEAgLTc0 LDcgKzc0LDcgQEAgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IFY4Tm9kZTo6aW5zZXJ0QmVmb3JlQ2Fs bGJhY2soY29uc3Qgdjg6OkFyZ3VtZW50cyYgYXJncykKICAgICBOb2RlKiByZWZDaGlsZCA9IFY4 Tm9kZTo6SGFzSW5zdGFuY2UoYXJnc1sxXSkgPyBWOE5vZGU6OnRvTmF0aXZlKHY4OjpIYW5kbGU8 djg6Ok9iamVjdD46OkNhc3QoYXJnc1sxXSkpIDogMDsKICAgICBib29sIHN1Y2Nlc3MgPSBpbXAt Pmluc2VydEJlZm9yZShuZXdDaGlsZCwgcmVmQ2hpbGQsIGVjLCB0cnVlKTsKICAgICBpZiAoZWMp IHsKLSAgICAgICAgVjhQcm94eTo6c2V0RE9NRXhjZXB0aW9uKGVjKTsKKyAgICAgICAgVjhQcm94 eTo6c2V0RE9NRXhjZXB0aW9uKGVjLCBhcmdzLkdldElzb2xhdGUoKSk7CiAgICAgICAgIHJldHVy biB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4oKTsKICAgICB9CiAgICAgaWYgKHN1Y2Nlc3MpCkBAIC05 Myw3ICs5Myw3IEBAIHY4OjpIYW5kbGU8djg6OlZhbHVlPiBWOE5vZGU6OnJlcGxhY2VDaGlsZENh bGxiYWNrKGNvbnN0IHY4OjpBcmd1bWVudHMmIGFyZ3MpCiAgICAgTm9kZSogb2xkQ2hpbGQgPSBW OE5vZGU6Okhhc0luc3RhbmNlKGFyZ3NbMV0pID8gVjhOb2RlOjp0b05hdGl2ZSh2ODo6SGFuZGxl PHY4OjpPYmplY3Q+OjpDYXN0KGFyZ3NbMV0pKSA6IDA7CiAgICAgYm9vbCBzdWNjZXNzID0gaW1w LT5yZXBsYWNlQ2hpbGQobmV3Q2hpbGQsIG9sZENoaWxkLCBlYywgdHJ1ZSk7CiAgICAgaWYgKGVj KSB7Ci0gICAgICAgIFY4UHJveHk6OnNldERPTUV4Y2VwdGlvbihlYyk7CisgICAgICAgIFY4UHJv eHk6OnNldERPTUV4Y2VwdGlvbihlYywgYXJncy5HZXRJc29sYXRlKCkpOwogICAgICAgICByZXR1 cm4gdjg6OkhhbmRsZTx2ODo6VmFsdWU+KCk7CiAgICAgfQogICAgIGlmIChzdWNjZXNzKQpAQCAt MTEwLDcgKzExMCw3IEBAIHY4OjpIYW5kbGU8djg6OlZhbHVlPiBWOE5vZGU6OnJlbW92ZUNoaWxk Q2FsbGJhY2soY29uc3Qgdjg6OkFyZ3VtZW50cyYgYXJncykKICAgICBOb2RlKiBvbGRDaGlsZCA9 IFY4Tm9kZTo6SGFzSW5zdGFuY2UoYXJnc1swXSkgPyBWOE5vZGU6OnRvTmF0aXZlKHY4OjpIYW5k bGU8djg6Ok9iamVjdD46OkNhc3QoYXJnc1swXSkpIDogMDsKICAgICBib29sIHN1Y2Nlc3MgPSBp bXAtPnJlbW92ZUNoaWxkKG9sZENoaWxkLCBlYyk7CiAgICAgaWYgKGVjKSB7Ci0gICAgICAgIFY4 UHJveHk6OnNldERPTUV4Y2VwdGlvbihlYyk7CisgICAgICAgIFY4UHJveHk6OnNldERPTUV4Y2Vw dGlvbihlYywgYXJncy5HZXRJc29sYXRlKCkpOwogICAgICAgICByZXR1cm4gdjg6OkhhbmRsZTx2 ODo6VmFsdWU+KCk7CiAgICAgfQogICAgIGlmIChzdWNjZXNzKQpAQCAtMTI4LDcgKzEyOCw3IEBA IHY4OjpIYW5kbGU8djg6OlZhbHVlPiBWOE5vZGU6OmFwcGVuZENoaWxkQ2FsbGJhY2soY29uc3Qg djg6OkFyZ3VtZW50cyYgYXJncykKICAgICBOb2RlKiBuZXdDaGlsZCA9IFY4Tm9kZTo6SGFzSW5z dGFuY2UoYXJnc1swXSkgPyBWOE5vZGU6OnRvTmF0aXZlKHY4OjpIYW5kbGU8djg6Ok9iamVjdD46 OkNhc3QoYXJnc1swXSkpIDogMDsKICAgICBib29sIHN1Y2Nlc3MgPSBpbXAtPmFwcGVuZENoaWxk KG5ld0NoaWxkLCBlYywgdHJ1ZSApOwogICAgIGlmIChlYykgewotICAgICAgICBWOFByb3h5Ojpz ZXRET01FeGNlcHRpb24oZWMpOworICAgICAgICBWOFByb3h5OjpzZXRET01FeGNlcHRpb24oZWMs IGFyZ3MuR2V0SXNvbGF0ZSgpKTsKICAgICAgICAgcmV0dXJuIHY4OjpIYW5kbGU8djg6OlZhbHVl PigpOwogICAgIH0KICAgICBpZiAoc3VjY2VzcykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2JpbmRpbmdzL3Y4L2N1c3RvbS9WOFNRTFRyYW5zYWN0aW9uQ3VzdG9tLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOFNRTFRyYW5zYWN0aW9uQ3VzdG9tLmNwcAppbmRl eCBiMDdjNjhmNDQ5MmUyZmRlMzIzYjQ3ZTdlNGM4OTJhNjQyZmQzNGUyLi5mODUyMGYwMWVhZDA5 OGIyNjZlNDNmMDg0MjczM2UzOWI2YWZkMmIxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9i aW5kaW5ncy92OC9jdXN0b20vVjhTUUxUcmFuc2FjdGlvbkN1c3RvbS5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4U1FMVHJhbnNhY3Rpb25DdXN0b20uY3BwCkBA IC0xMTAsNyArMTEwLDcgQEAgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IFY4U1FMVHJhbnNhY3Rpb246 OmV4ZWN1dGVTcWxDYWxsYmFjayhjb25zdCB2ODo6QXJndW1lbnRzJgogCiAgICAgRXhjZXB0aW9u Q29kZSBlYyA9IDA7CiAgICAgdHJhbnNhY3Rpb24tPmV4ZWN1dGVTUUwoc3RhdGVtZW50LCBzcWxW YWx1ZXMsIGNhbGxiYWNrLCBlcnJvckNhbGxiYWNrLCBlYyk7Ci0gICAgVjhQcm94eTo6c2V0RE9N RXhjZXB0aW9uKGVjKTsKKyAgICBWOFByb3h5OjpzZXRET01FeGNlcHRpb24oZWMsIGFyZ3MuR2V0 SXNvbGF0ZSgpKTsKIAogICAgIHJldHVybiB2ODo6VW5kZWZpbmVkKCk7CiB9CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhXZWJLaXRNdXRhdGlvbk9ic2Vy dmVyQ3VzdG9tLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOFdlYktp dE11dGF0aW9uT2JzZXJ2ZXJDdXN0b20uY3BwCmluZGV4IDUzZjM0NDIxZDdiNDVhM2Y4OTQ0YzY2 OWQ3YTE5ZGIwNWRhYTZiZmQuLjUzODUwMDc3MDAwNzcwY2MwMzNiNjA1MDM4NjcyNzgwNGRmNWY3 YWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOFdlYktp dE11dGF0aW9uT2JzZXJ2ZXJDdXN0b20uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdz L3Y4L2N1c3RvbS9WOFdlYktpdE11dGF0aW9uT2JzZXJ2ZXJDdXN0b20uY3BwCkBAIC0xMTIsNyAr MTEyLDcgQEAgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IFY4V2ViS2l0TXV0YXRpb25PYnNlcnZlcjo6 b2JzZXJ2ZUNhbGxiYWNrKGNvbnN0IHY4OjpBcmd1bWUKICAgICBFeGNlcHRpb25Db2RlIGVjID0g MDsKICAgICBpbXAtPm9ic2VydmUodGFyZ2V0LCBvcHRpb25zLCBhdHRyaWJ1dGVGaWx0ZXIsIGVj KTsKICAgICBpZiAoZWMpCi0gICAgICAgIFY4UHJveHk6OnNldERPTUV4Y2VwdGlvbihlYyk7Cisg ICAgICAgIFY4UHJveHk6OnNldERPTUV4Y2VwdGlvbihlYywgYXJncy5HZXRJc29sYXRlKCkpOwog ICAgIHJldHVybiB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4oKTsKIH0KIApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4WE1MSHR0cFJlcXVlc3RDdXN0b20uY3Bw IGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4WE1MSHR0cFJlcXVlc3RDdXN0 b20uY3BwCmluZGV4IGU5ZTNiZjY5ZTkyN2QxMWFhMDllODUyYjNmOTI3NDdhM2ExYmMxMGEuLmY2 M2Q0NjUzNGUzZmU3ODAzZTk4MGFhZmIwMTA5OGY2MGU1OWFlY2EgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOFhNTEh0dHBSZXF1ZXN0Q3VzdG9tLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhYTUxIdHRwUmVxdWVzdEN1 c3RvbS5jcHAKQEAgLTc1LDcgKzc1LDcgQEAgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IFY4WE1MSHR0 cFJlcXVlc3Q6OnJlc3BvbnNlQWNjZXNzb3JHZXR0ZXIodjg6OkxvY2FsPHY4OjpTdHIKICAgICAg ICAgICAgIEV4Y2VwdGlvbkNvZGUgZWMgPSAwOwogICAgICAgICAgICAgRG9jdW1lbnQqIGRvY3Vt ZW50ID0geG1sSHR0cFJlcXVlc3QtPnJlc3BvbnNlWE1MKGVjKTsKICAgICAgICAgICAgIGlmIChl YykgewotICAgICAgICAgICAgICAgIFY4UHJveHk6OnNldERPTUV4Y2VwdGlvbihlYyk7CisgICAg ICAgICAgICAgICAgVjhQcm94eTo6c2V0RE9NRXhjZXB0aW9uKGVjLCBpbmZvLkdldElzb2xhdGUo KSk7CiAgICAgICAgICAgICAgICAgcmV0dXJuIHY4OjpVbmRlZmluZWQoKTsKICAgICAgICAgICAg IH0KICAgICAgICAgICAgIHJldHVybiB0b1Y4KGRvY3VtZW50KTsKQEAgLTg3LDcgKzg3LDcgQEAg djg6OkhhbmRsZTx2ODo6VmFsdWU+IFY4WE1MSHR0cFJlcXVlc3Q6OnJlc3BvbnNlQWNjZXNzb3JH ZXR0ZXIodjg6OkxvY2FsPHY4OjpTdHIKICAgICAgICAgICAgIEV4Y2VwdGlvbkNvZGUgZWMgPSAw OwogICAgICAgICAgICAgQmxvYiogYmxvYiA9IHhtbEh0dHBSZXF1ZXN0LT5yZXNwb25zZUJsb2Io ZWMpOwogICAgICAgICAgICAgaWYgKGVjKSB7Ci0gICAgICAgICAgICAgICAgVjhQcm94eTo6c2V0 RE9NRXhjZXB0aW9uKGVjKTsKKyAgICAgICAgICAgICAgICBWOFByb3h5OjpzZXRET01FeGNlcHRp b24oZWMsIGluZm8uR2V0SXNvbGF0ZSgpKTsKICAgICAgICAgICAgICAgICByZXR1cm4gdjg6OlVu ZGVmaW5lZCgpOwogICAgICAgICAgICAgfQogICAgICAgICAgICAgcmV0dXJuIHRvVjgoYmxvYik7 CkBAIC0xMDEsNyArMTAxLDcgQEAgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IFY4WE1MSHR0cFJlcXVl c3Q6OnJlc3BvbnNlQWNjZXNzb3JHZXR0ZXIodjg6OkxvY2FsPHY4OjpTdHIKICAgICAgICAgICAg IEV4Y2VwdGlvbkNvZGUgZWMgPSAwOwogICAgICAgICAgICAgQXJyYXlCdWZmZXIqIGFycmF5QnVm ZmVyID0geG1sSHR0cFJlcXVlc3QtPnJlc3BvbnNlQXJyYXlCdWZmZXIoZWMpOwogICAgICAgICAg ICAgaWYgKGVjKSB7Ci0gICAgICAgICAgICAgICAgVjhQcm94eTo6c2V0RE9NRXhjZXB0aW9uKGVj KTsKKyAgICAgICAgICAgICAgICBWOFByb3h5OjpzZXRET01FeGNlcHRpb24oZWMsIGluZm8uR2V0 SXNvbGF0ZSgpKTsKICAgICAgICAgICAgICAgICByZXR1cm4gdjg6OlVuZGVmaW5lZCgpOwogICAg ICAgICAgICAgfQogICAgICAgICAgICAgcmV0dXJuIHRvVjgoYXJyYXlCdWZmZXIpOwo=