108328 2013-01-30 04:52:03 -0800 [chromium] move custom policy delegate to TestRunner library 2013-01-30 12:47:51 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jochen jochen abarth dglazkov fishd jamesr tkent+wkapi webkit.review.bot oldest_to_newest 820098 0 jochen 2013-01-30 04:52:03 -0800 [chromium] move custom policy delegate to TestRunner library 820099 1 185468 jochen 2013-01-30 04:53:26 -0800 Created attachment 185468 Patch 820105 2 webkit.review.bot 2013-01-30 05:02:22 -0800 Please wait for approval from abarth@webkit.org, dglazkov@chromium.org, fishd@chromium.org, jamesr@chromium.org or tkent@chromium.org before submitting, as this patch contains changes to the Chromium public API. See also https://trac.webkit.org/wiki/ChromiumWebKitAPI. 820425 3 185468 webkit.review.bot 2013-01-30 12:47:47 -0800 Comment on attachment 185468 Patch Clearing flags on attachment: 185468 Committed r141298: <http://trac.webkit.org/changeset/141298> 820426 4 webkit.review.bot 2013-01-30 12:47:51 -0800 All reviewed patches have been landed. Closing bug. 185468 2013-01-30 04:53:26 -0800 2013-01-30 12:47:47 -0800 Patch bug-108328-20130130135011.patch text/plain 19033 jochen U3VidmVyc2lvbiBSZXZpc2lvbjogMTQxMjM3CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNTJmZWJhMjE4MWI5YWMzYTkxNjJlOWVmOGFkMmZiMzdl ZWQwZTQ5Zi4uODBlZWE4ZTgzZDA4YWY2YjY3OGRjM2RkMzJkOTkyMWEzMTYxYzA5NiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM5 IEBACiAyMDEzLTAxLTMwICBKb2NoZW4gRWlzaW5nZXIgIDxqb2NoZW5AY2hyb21pdW0ub3JnPgog CisgICAgICAgIFtjaHJvbWl1bV0gbW92ZSBjdXN0b20gcG9saWN5IGRlbGVnYXRlIHRvIFRlc3RS dW5uZXIgbGlicmFyeQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTA4MzI4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgKiBEdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9UZXN0UnVubmVyL3B1YmxpYy9XZWJUZXN0 RGVsZWdhdGUuaDoKKyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9UZXN0UnVubmVy L3B1YmxpYy9XZWJUZXN0UHJveHkuaDoKKyAgICAgICAgKFdlYlRlc3RQcm94eUJhc2UpOgorICAg ICAgICAoV2ViVGVzdFJ1bm5lcjo6V2ViVGVzdFByb3h5OjpkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0 aW9uKToKKyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9UZXN0UnVubmVyL3B1Ymxp Yy9XZWJUZXN0UnVubmVyLmg6CisgICAgICAgIChXZWJUZXN0UnVubmVyOjpXZWJUZXN0UnVubmVy Ojpwb2xpY3lEZWxlZ2F0ZUVuYWJsZWQpOgorICAgICAgICAoV2ViVGVzdFJ1bm5lcjo6V2ViVGVz dFJ1bm5lcjo6cG9saWN5RGVsZWdhdGVJc1Blcm1pc3NpdmUpOgorICAgICAgICAoV2ViVGVzdFJ1 bm5lcjo6V2ViVGVzdFJ1bm5lcjo6cG9saWN5RGVsZWdhdGVTaG91bGROb3RpZnlEb25lKToKKyAg ICAgICAgKiBEdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9UZXN0UnVubmVyL3NyYy9UZXN0UnVubmVy LmNwcDoKKyAgICAgICAgKFdlYlRlc3RSdW5uZXI6OlRlc3RSdW5uZXI6OnJlc2V0KToKKyAgICAg ICAgKFdlYlRlc3RSdW5uZXI6OlRlc3RSdW5uZXI6OnBvbGljeURlbGVnYXRlRW5hYmxlZCk6Cisg ICAgICAgIChXZWJUZXN0UnVubmVyKToKKyAgICAgICAgKFdlYlRlc3RSdW5uZXI6OlRlc3RSdW5u ZXI6OnBvbGljeURlbGVnYXRlSXNQZXJtaXNzaXZlKToKKyAgICAgICAgKFdlYlRlc3RSdW5uZXI6 OlRlc3RSdW5uZXI6OnBvbGljeURlbGVnYXRlU2hvdWxkTm90aWZ5RG9uZSk6CisgICAgICAgIChX ZWJUZXN0UnVubmVyOjpUZXN0UnVubmVyOjpzZXRDdXN0b21Qb2xpY3lEZWxlZ2F0ZSk6CisgICAg ICAgIChXZWJUZXN0UnVubmVyOjpUZXN0UnVubmVyOjp3YWl0Rm9yUG9saWN5RGVsZWdhdGUpOgor ICAgICAgICAqIER1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1Rlc3RSdW5uZXIvc3JjL1Rlc3RSdW5u ZXIuaDoKKyAgICAgICAgKFRlc3RSdW5uZXIpOgorICAgICAgICAqIER1bXBSZW5kZXJUcmVlL2No cm9taXVtL1Rlc3RSdW5uZXIvc3JjL1dlYlRlc3RQcm94eS5jcHA6CisgICAgICAgIChXZWJUZXN0 UnVubmVyOjpXZWJUZXN0UHJveHlCYXNlOjpkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uKToKKyAg ICAgICAgKFdlYlRlc3RSdW5uZXIpOgorICAgICAgICAqIER1bXBSZW5kZXJUcmVlL2Nocm9taXVt L1dlYlZpZXdIb3N0LmNwcDoKKyAgICAgICAgKFdlYlZpZXdIb3N0OjpkZWNpZGVQb2xpY3lGb3JO YXZpZ2F0aW9uKToKKyAgICAgICAgKFdlYlZpZXdIb3N0OjpyZXNldCk6CisgICAgICAgICogRHVt cFJlbmRlclRyZWUvY2hyb21pdW0vV2ViVmlld0hvc3QuaDoKKyAgICAgICAgKFdlYlZpZXdIb3N0 KToKKworMjAxMy0wMS0zMCAgSm9jaGVuIEVpc2luZ2VyICA8am9jaGVuQGNocm9taXVtLm9yZz4K KwogICAgICAgICBbY2hyb21pdW1dIG1vdmUgbWV0aG9kcyBmcm9tIFdlYlRlc3REZWxlZ2F0ZSB0 byBXZWJUZXN0UnVubmVyCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xMDgzMDkKIApkaWZmIC0tZ2l0IGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21p dW0vVGVzdFJ1bm5lci9wdWJsaWMvV2ViVGVzdERlbGVnYXRlLmggYi9Ub29scy9EdW1wUmVuZGVy VHJlZS9jaHJvbWl1bS9UZXN0UnVubmVyL3B1YmxpYy9XZWJUZXN0RGVsZWdhdGUuaAppbmRleCBm NzkzN2E1ZWI5MDUzZWFiMTA5M2I5NTQ0Y2Y1MmVmYTA1ZWJhMzZmLi45YjNiYzliYTIxYjNkMjAw NzBmZDJkZTNkYzE5MGE1ZjM5N2Y3NTVhIDEwMDY0NAotLS0gYS9Ub29scy9EdW1wUmVuZGVyVHJl ZS9jaHJvbWl1bS9UZXN0UnVubmVyL3B1YmxpYy9XZWJUZXN0RGVsZWdhdGUuaAorKysgYi9Ub29s cy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9UZXN0UnVubmVyL3B1YmxpYy9XZWJUZXN0RGVsZWdh dGUuaApAQCAtMTE3LDggKzExNyw2IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgY2xvc2VS ZW1haW5pbmdXaW5kb3dzKCkgeyB9CiAgICAgdmlydHVhbCBpbnQgbmF2aWdhdGlvbkVudHJ5Q291 bnQoKSB7IHJldHVybiAwOyB9CiAgICAgdmlydHVhbCBpbnQgd2luZG93Q291bnQoKSB7IHJldHVy biAwOyB9Ci0gICAgdmlydHVhbCB2b2lkIHNldEN1c3RvbVBvbGljeURlbGVnYXRlKGJvb2wsIGJv b2wpIHsgfQotICAgIHZpcnR1YWwgdm9pZCB3YWl0Rm9yUG9saWN5RGVsZWdhdGUoKSB7IH0KICAg ICB2aXJ0dWFsIHZvaWQgZ29Ub09mZnNldChpbnQpIHsgfQogICAgIHZpcnR1YWwgdm9pZCByZWxv YWQoKSB7IH0KICAgICB2aXJ0dWFsIHZvaWQgbG9hZFVSTEZvckZyYW1lKGNvbnN0IFdlYktpdDo6 V2ViVVJMJiwgY29uc3Qgc3RkOjpzdHJpbmcmKSB7IH0KZGlmZiAtLWdpdCBhL1Rvb2xzL0R1bXBS ZW5kZXJUcmVlL2Nocm9taXVtL1Rlc3RSdW5uZXIvcHVibGljL1dlYlRlc3RQcm94eS5oIGIvVG9v bHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vVGVzdFJ1bm5lci9wdWJsaWMvV2ViVGVzdFByb3h5 LmgKaW5kZXggNjBiNWRlNGMzMWExNmRiNmNkNTg5NmNhYzliZjQ0M2IwMWU1ZTE4ZS4uMTNiZGY2 NzgyOTAyNWE5ODliYTI1ZDBiN2JiZGJkZDUyMTVlYjJhNSAxMDA2NDQKLS0tIGEvVG9vbHMvRHVt cFJlbmRlclRyZWUvY2hyb21pdW0vVGVzdFJ1bm5lci9wdWJsaWMvV2ViVGVzdFByb3h5LmgKKysr IGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vVGVzdFJ1bm5lci9wdWJsaWMvV2ViVGVz dFByb3h5LmgKQEAgLTM2LDYgKzM2LDcgQEAKICNpbmNsdWRlICJXZWJLaXQvY2hyb21pdW0vcHVi bGljL1dlYkRyYWdPcGVyYXRpb24uaCIKICNpbmNsdWRlICJXZWJLaXQvY2hyb21pdW0vcHVibGlj L1dlYkVkaXRpbmdBY3Rpb24uaCIKICNpbmNsdWRlICJXZWJLaXQvY2hyb21pdW0vcHVibGljL1dl Yk5hdmlnYXRpb25Qb2xpY3kuaCIKKyNpbmNsdWRlICJXZWJLaXQvY2hyb21pdW0vcHVibGljL1dl Yk5hdmlnYXRpb25UeXBlLmgiCiAjaW5jbHVkZSAiV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJU ZXh0QWZmaW5pdHkuaCIKICNpbmNsdWRlICJXZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlRleHRE aXJlY3Rpb24uaCIKICNpbmNsdWRlIDxtYXA+CkBAIC0xNDYsNiArMTQ3LDcgQEAgcHJvdGVjdGVk OgogICAgIGJvb2wgcnVuTW9kYWxDb25maXJtRGlhbG9nKFdlYktpdDo6V2ViRnJhbWUqLCBjb25z dCBXZWJLaXQ6OldlYlN0cmluZyYpOwogICAgIGJvb2wgcnVuTW9kYWxQcm9tcHREaWFsb2coV2Vi S2l0OjpXZWJGcmFtZSosIGNvbnN0IFdlYktpdDo6V2ViU3RyaW5nJiBtZXNzYWdlLCBjb25zdCBX ZWJLaXQ6OldlYlN0cmluZyYgZGVmYXVsdFZhbHVlLCBXZWJLaXQ6OldlYlN0cmluZyogYWN0dWFs VmFsdWUpOwogICAgIGJvb2wgcnVuTW9kYWxCZWZvcmVVbmxvYWREaWFsb2coV2ViS2l0OjpXZWJG cmFtZSosIGNvbnN0IFdlYktpdDo6V2ViU3RyaW5nJik7CisgICAgV2ViS2l0OjpXZWJOYXZpZ2F0 aW9uUG9saWN5IGRlY2lkZVBvbGljeUZvck5hdmlnYXRpb24oV2ViS2l0OjpXZWJGcmFtZSosIGNv bnN0IFdlYktpdDo6V2ViVVJMUmVxdWVzdCYsIFdlYktpdDo6V2ViTmF2aWdhdGlvblR5cGUsIGNv bnN0IFdlYktpdDo6V2ViTm9kZSYgb3JpZ2luYXRpbmdOb2RlLCBXZWJLaXQ6OldlYk5hdmlnYXRp b25Qb2xpY3kgZGVmYXVsdFBvbGljeSwgYm9vbCBpc1JlZGlyZWN0KTsKIAogcHJpdmF0ZToKICAg ICB2b2lkIGxvY2F0aW9uQ2hhbmdlRG9uZShXZWJLaXQ6OldlYkZyYW1lKik7CkBAIC00NDUsNiAr NDQ3LDEzIEBAIHB1YmxpYzoKICAgICAgICAgV2ViVGVzdFByb3h5QmFzZTo6cnVuTW9kYWxCZWZv cmVVbmxvYWREaWFsb2coZnJhbWUsIG1lc3NhZ2UpOwogICAgICAgICByZXR1cm4gQmFzZTo6cnVu TW9kYWxCZWZvcmVVbmxvYWREaWFsb2coZnJhbWUsIG1lc3NhZ2UpOwogICAgIH0KKyAgICB2aXJ0 dWFsIFdlYktpdDo6V2ViTmF2aWdhdGlvblBvbGljeSBkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9u KFdlYktpdDo6V2ViRnJhbWUqIGZyYW1lLCBjb25zdCBXZWJLaXQ6OldlYlVSTFJlcXVlc3QmIHJl cXVlc3QsIFdlYktpdDo6V2ViTmF2aWdhdGlvblR5cGUgdHlwZSwgY29uc3QgV2ViS2l0OjpXZWJO b2RlJiBvcmlnaW5hdGluZ05vZGUsIFdlYktpdDo6V2ViTmF2aWdhdGlvblBvbGljeSBkZWZhdWx0 UG9saWN5LCBib29sIGlzUmVkaXJlY3QpCisgICAgeworICAgICAgICBXZWJLaXQ6OldlYk5hdmln YXRpb25Qb2xpY3kgcG9saWN5ID0gV2ViVGVzdFByb3h5QmFzZTo6ZGVjaWRlUG9saWN5Rm9yTmF2 aWdhdGlvbihmcmFtZSwgcmVxdWVzdCwgdHlwZSwgb3JpZ2luYXRpbmdOb2RlLCBkZWZhdWx0UG9s aWN5LCBpc1JlZGlyZWN0KTsKKyAgICAgICAgaWYgKHBvbGljeSA9PSBXZWJLaXQ6OldlYk5hdmln YXRpb25Qb2xpY3lJZ25vcmUpCisgICAgICAgICAgICByZXR1cm4gcG9saWN5OworICAgICAgICBy ZXR1cm4gQmFzZTo6ZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbihmcmFtZSwgcmVxdWVzdCwgdHlw ZSwgb3JpZ2luYXRpbmdOb2RlLCBkZWZhdWx0UG9saWN5LCBpc1JlZGlyZWN0KTsKKyAgICB9CiB9 OwogCiB9CmRpZmYgLS1naXQgYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9UZXN0UnVu bmVyL3B1YmxpYy9XZWJUZXN0UnVubmVyLmggYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1 bS9UZXN0UnVubmVyL3B1YmxpYy9XZWJUZXN0UnVubmVyLmgKaW5kZXggYjYyYjViYTVlZTE3NzRk OWM2NTI3ZWQ1YTI0ZDhiNTAyMGUwZmFkYi4uNGFlNjM0OTBmZGI3MjMzZDFlNDk3N2ZkMmExZTk4 YjA4NDYyNWY2YyAxMDA2NDQKLS0tIGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vVGVz dFJ1bm5lci9wdWJsaWMvV2ViVGVzdFJ1bm5lci5oCisrKyBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVl L2Nocm9taXVtL1Rlc3RSdW5uZXIvcHVibGljL1dlYlRlc3RSdW5uZXIuaApAQCAtODMsNiArODMs OSBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIHNldFRvcExvYWRpbmdGcmFtZShXZWJLaXQ6 OldlYkZyYW1lKiwgYm9vbCkgeyB9CiAgICAgdmlydHVhbCBXZWJLaXQ6OldlYkZyYW1lKiB0b3BM b2FkaW5nRnJhbWUoKSBjb25zdCB7IHJldHVybiAwOyB9CiAgICAgdmlydHVhbCB2b2lkIHBvbGlj eURlbGVnYXRlRG9uZSgpIHsgfQorICAgIHZpcnR1YWwgYm9vbCBwb2xpY3lEZWxlZ2F0ZUVuYWJs ZWQoKSBjb25zdCB7IHJldHVybiBmYWxzZTsgfQorICAgIHZpcnR1YWwgYm9vbCBwb2xpY3lEZWxl Z2F0ZUlzUGVybWlzc2l2ZSgpIGNvbnN0IHsgcmV0dXJuIGZhbHNlOyB9CisgICAgdmlydHVhbCBi b29sIHBvbGljeURlbGVnYXRlU2hvdWxkTm90aWZ5RG9uZSgpIGNvbnN0IHsgcmV0dXJuIGZhbHNl OyB9CiAgICAgdmlydHVhbCBib29sIHNob3VsZEludGVyY2VwdFBvc3RNZXNzYWdlKCkgY29uc3Qg eyByZXR1cm4gZmFsc2U7IH0KICAgICB2aXJ0dWFsIGJvb2wgaXNTbWFydEluc2VydERlbGV0ZUVu YWJsZWQoKSBjb25zdCB7IHJldHVybiB0cnVlOyB9CiAgICAgdmlydHVhbCBib29sIGlzU2VsZWN0 VHJhaWxpbmdXaGl0ZXNwYWNlRW5hYmxlZCgpIGNvbnN0IHsgcmV0dXJuIGZhbHNlOyB9CmRpZmYg LS1naXQgYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9UZXN0UnVubmVyL3NyYy9UZXN0 UnVubmVyLmNwcCBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1Rlc3RSdW5uZXIvc3Jj L1Rlc3RSdW5uZXIuY3BwCmluZGV4IDI5NjFiNzlmNDljZGVmNTAwMDc4Y2VhOTk5ZDViZjEwYTc3 NTYzYzcuLjA5ZjVkOTY3MWRmMzYxNGRkOTk2MjcxNWUwMTVmYWEwMmQ2NTcyZTkgMTAwNjQ0Ci0t LSBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1Rlc3RSdW5uZXIvc3JjL1Rlc3RSdW5u ZXIuY3BwCisrKyBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1Rlc3RSdW5uZXIvc3Jj L1Rlc3RSdW5uZXIuY3BwCkBAIC0zNzcsNiArMzc3LDkgQEAgdm9pZCBUZXN0UnVubmVyOjpyZXNl dCgpCiAgICAgfQogICAgIG1fdG9wTG9hZGluZ0ZyYW1lID0gMDsKICAgICBtX3dhaXRVbnRpbERv bmUgPSBmYWxzZTsKKyAgICBtX3BvbGljeURlbGVnYXRlRW5hYmxlZCA9IGZhbHNlOworICAgIG1f cG9saWN5RGVsZWdhdGVJc1Blcm1pc3NpdmUgPSBmYWxzZTsKKyAgICBtX3BvbGljeURlbGVnYXRl U2hvdWxkTm90aWZ5RG9uZSA9IGZhbHNlOwogCiAgICAgV2ViU2VjdXJpdHlQb2xpY3k6OnJlc2V0 T3JpZ2luQWNjZXNzV2hpdGVsaXN0cygpOwogI2lmIE9TKExJTlVYKSB8fCBPUyhBTkRST0lEKQpA QCAtNjM3LDYgKzY0MCwyMSBAQCB2b2lkIFRlc3RSdW5uZXI6OnBvbGljeURlbGVnYXRlRG9uZSgp CiAgICAgbV93YWl0VW50aWxEb25lID0gZmFsc2U7CiB9CiAKK2Jvb2wgVGVzdFJ1bm5lcjo6cG9s aWN5RGVsZWdhdGVFbmFibGVkKCkgY29uc3QKK3sKKyAgICByZXR1cm4gbV9wb2xpY3lEZWxlZ2F0 ZUVuYWJsZWQ7Cit9CisKK2Jvb2wgVGVzdFJ1bm5lcjo6cG9saWN5RGVsZWdhdGVJc1Blcm1pc3Np dmUoKSBjb25zdAoreworICAgIHJldHVybiBtX3BvbGljeURlbGVnYXRlSXNQZXJtaXNzaXZlOwor fQorCitib29sIFRlc3RSdW5uZXI6OnBvbGljeURlbGVnYXRlU2hvdWxkTm90aWZ5RG9uZSgpIGNv bnN0Cit7CisgICAgcmV0dXJuIG1fcG9saWN5RGVsZWdhdGVTaG91bGROb3RpZnlEb25lOworfQor CiBib29sIFRlc3RSdW5uZXI6OnNob3VsZEludGVyY2VwdFBvc3RNZXNzYWdlKCkgY29uc3QKIHsK ICAgICByZXR1cm4gbV9pbnRlcmNlcHRQb3N0TWVzc2FnZS5pc0Jvb2woKSAmJiBtX2ludGVyY2Vw dFBvc3RNZXNzYWdlLnRvQm9vbGVhbigpOwpAQCAtODU3LDE4ICs4NzUsMTggQEAgdm9pZCBUZXN0 UnVubmVyOjpzZXRDbG9zZVJlbWFpbmluZ1dpbmRvd3NXaGVuQ29tcGxldGUoY29uc3QgQ3BwQXJn dW1lbnRMaXN0JiBhcmcKIHZvaWQgVGVzdFJ1bm5lcjo6c2V0Q3VzdG9tUG9saWN5RGVsZWdhdGUo Y29uc3QgQ3BwQXJndW1lbnRMaXN0JiBhcmd1bWVudHMsIENwcFZhcmlhbnQqIHJlc3VsdCkKIHsK ICAgICBpZiAoYXJndW1lbnRzLnNpemUoKSA+IDAgJiYgYXJndW1lbnRzWzBdLmlzQm9vbCgpKSB7 Ci0gICAgICAgIGJvb2wgZW5hYmxlID0gYXJndW1lbnRzWzBdLnZhbHVlLmJvb2xWYWx1ZTsKLSAg ICAgICAgYm9vbCBwZXJtaXNzaXZlID0gZmFsc2U7CisgICAgICAgIG1fcG9saWN5RGVsZWdhdGVF bmFibGVkID0gYXJndW1lbnRzWzBdLnZhbHVlLmJvb2xWYWx1ZTsKKyAgICAgICAgbV9wb2xpY3lE ZWxlZ2F0ZUlzUGVybWlzc2l2ZSA9IGZhbHNlOwogICAgICAgICBpZiAoYXJndW1lbnRzLnNpemUo KSA+IDEgJiYgYXJndW1lbnRzWzFdLmlzQm9vbCgpKQotICAgICAgICAgICAgcGVybWlzc2l2ZSA9 IGFyZ3VtZW50c1sxXS52YWx1ZS5ib29sVmFsdWU7Ci0gICAgICAgIG1fZGVsZWdhdGUtPnNldEN1 c3RvbVBvbGljeURlbGVnYXRlKGVuYWJsZSwgcGVybWlzc2l2ZSk7CisgICAgICAgICAgICBtX3Bv bGljeURlbGVnYXRlSXNQZXJtaXNzaXZlID0gYXJndW1lbnRzWzFdLnZhbHVlLmJvb2xWYWx1ZTsK ICAgICB9CiAgICAgcmVzdWx0LT5zZXROdWxsKCk7CiB9CiAKIHZvaWQgVGVzdFJ1bm5lcjo6d2Fp dEZvclBvbGljeURlbGVnYXRlKGNvbnN0IENwcEFyZ3VtZW50TGlzdCYsIENwcFZhcmlhbnQqIHJl c3VsdCkKIHsKLSAgICBtX2RlbGVnYXRlLT53YWl0Rm9yUG9saWN5RGVsZWdhdGUoKTsKKyAgICBt X3BvbGljeURlbGVnYXRlRW5hYmxlZCA9IHRydWU7CisgICAgbV9wb2xpY3lEZWxlZ2F0ZVNob3Vs ZE5vdGlmeURvbmUgPSB0cnVlOwogICAgIG1fd2FpdFVudGlsRG9uZSA9IHRydWU7CiAgICAgcmVz dWx0LT5zZXROdWxsKCk7CiB9CmRpZmYgLS1naXQgYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJv bWl1bS9UZXN0UnVubmVyL3NyYy9UZXN0UnVubmVyLmggYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9j aHJvbWl1bS9UZXN0UnVubmVyL3NyYy9UZXN0UnVubmVyLmgKaW5kZXggMGIwMGQzZTg0MTI0MGUy YjIwMTYwYWQxYzg0ZmU2NTU1Mzc4Y2VlNi4uMjEzZmJmNGI5YWQxNWMxYWMxODRiYTNmNjMxZmFk ZDYyOTY5ODAzMCAxMDA2NDQKLS0tIGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vVGVz dFJ1bm5lci9zcmMvVGVzdFJ1bm5lci5oCisrKyBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9t aXVtL1Rlc3RSdW5uZXIvc3JjL1Rlc3RSdW5uZXIuaApAQCAtMTAxLDYgKzEwMSw5IEBAIHB1Ymxp YzoKICAgICB2aXJ0dWFsIHZvaWQgc2V0VG9wTG9hZGluZ0ZyYW1lKFdlYktpdDo6V2ViRnJhbWUq LCBib29sKSBPVkVSUklERTsKICAgICB2aXJ0dWFsIFdlYktpdDo6V2ViRnJhbWUqIHRvcExvYWRp bmdGcmFtZSgpIGNvbnN0IE9WRVJSSURFOwogICAgIHZpcnR1YWwgdm9pZCBwb2xpY3lEZWxlZ2F0 ZURvbmUoKSBPVkVSUklERTsKKyAgICB2aXJ0dWFsIGJvb2wgcG9saWN5RGVsZWdhdGVFbmFibGVk KCkgY29uc3QgT1ZFUlJJREU7CisgICAgdmlydHVhbCBib29sIHBvbGljeURlbGVnYXRlSXNQZXJt aXNzaXZlKCkgY29uc3QgT1ZFUlJJREU7CisgICAgdmlydHVhbCBib29sIHBvbGljeURlbGVnYXRl U2hvdWxkTm90aWZ5RG9uZSgpIGNvbnN0IE9WRVJSSURFOwogICAgIHZpcnR1YWwgYm9vbCBzaG91 bGRJbnRlcmNlcHRQb3N0TWVzc2FnZSgpIGNvbnN0IE9WRVJSSURFOwogICAgIHZpcnR1YWwgYm9v bCBpc1NtYXJ0SW5zZXJ0RGVsZXRlRW5hYmxlZCgpIGNvbnN0IE9WRVJSSURFOwogICAgIHZpcnR1 YWwgYm9vbCBpc1NlbGVjdFRyYWlsaW5nV2hpdGVzcGFjZUVuYWJsZWQoKSBjb25zdCBPVkVSUklE RTsKQEAgLTUyOSw2ICs1MzIsMTggQEAgcHJpdmF0ZToKICAgICAvLyBJZiB0cnVlLCBkb24ndCBk dW1wIG91dHB1dCB1bnRpbCBub3RpZnlEb25lIGlzIGNhbGxlZC4KICAgICBib29sIG1fd2FpdFVu dGlsRG9uZTsKIAorICAgIC8vIENhdXNlcyBuYXZpZ2F0aW9uIGFjdGlvbnMganVzdCBwcmludG91 dCB0aGUgaW50ZW5kZWQgbmF2aWdhdGlvbiBpbnN0ZWFkCisgICAgLy8gb2YgdGFraW5nIHlvdSB0 byB0aGUgcGFnZS4gVGhpcyBpcyB1c2VkIGZvciBjYXNlcyBsaWtlIG1haWx0bywgd2hlcmUgeW91 CisgICAgLy8gZG9uJ3QgYWN0dWFsbHkgd2FudCB0byBvcGVuIHRoZSBtYWlsIHByb2dyYW0uCisg ICAgYm9vbCBtX3BvbGljeURlbGVnYXRlRW5hYmxlZDsKKworICAgIC8vIFRvZ2dsZXMgdGhlIGJl aGF2aW9yIG9mIHRoZSBwb2xpY3kgZGVsZWdhdGUuIElmIHRydWUsIHRoZW4gbmF2aWdhdGlvbnMK KyAgICAvLyB3aWxsIGJlIGFsbG93ZWQuIE90aGVyd2lzZSwgdGhleSB3aWxsIGJlIGlnbm9yZWQg KGRyb3BwZWQpLgorICAgIGJvb2wgbV9wb2xpY3lEZWxlZ2F0ZUlzUGVybWlzc2l2ZTsKKworICAg IC8vIElmIHRydWUsIHRoZSBwb2xpY3kgZGVsZWdhdGUgd2lsbCBzaWduYWwgbGF5b3V0IHRlc3Qg Y29tcGxldGlvbi4KKyAgICBib29sIG1fcG9saWN5RGVsZWdhdGVTaG91bGROb3RpZnlEb25lOwor CiAgICAgV29ya1F1ZXVlIG1fd29ya1F1ZXVlOwogCiAgICAgV2ViS2l0OjpXZWJVUkwgbV91c2Vy U3R5bGVTaGVldExvY2F0aW9uOwpkaWZmIC0tZ2l0IGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvY2hy b21pdW0vVGVzdFJ1bm5lci9zcmMvV2ViVGVzdFByb3h5LmNwcCBiL1Rvb2xzL0R1bXBSZW5kZXJU cmVlL2Nocm9taXVtL1Rlc3RSdW5uZXIvc3JjL1dlYlRlc3RQcm94eS5jcHAKaW5kZXggNmMzNjZi YWE0ZGU1ZWQ0NGI0MTk1MGIyNGIzNjkxNmExMzdjYjkzMi4uOWQ0MzkyZTI0Nzg5MmJkNTE4ZDRm NzlmOTIwNWQxNDM5MjkxODQ5NiAxMDA2NDQKLS0tIGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvY2hy b21pdW0vVGVzdFJ1bm5lci9zcmMvV2ViVGVzdFByb3h5LmNwcAorKysgYi9Ub29scy9EdW1wUmVu ZGVyVHJlZS9jaHJvbWl1bS9UZXN0UnVubmVyL3NyYy9XZWJUZXN0UHJveHkuY3BwCkBAIC0yMTEs NiArMjExLDM1IEBAIHN0cmluZyB1cmxTdWl0YWJsZUZvclRlc3RSZXN1bHQoY29uc3Qgc3RyaW5n JiB1cmwpCiAgICAgcmV0dXJuIGZpbGVuYW1lOwogfQogCisvLyBXZWJOYXZpZ2F0aW9uVHlwZSBk ZWJ1Z2dpbmcgc3RyaW5ncyB0YWtlbiBmcm9tIFBvbGljeURlbGVnYXRlLm1tLgorY29uc3QgY2hh ciogbGlua0NsaWNrZWRTdHJpbmcgPSAibGluayBjbGlja2VkIjsKK2NvbnN0IGNoYXIqIGZvcm1T dWJtaXR0ZWRTdHJpbmcgPSAiZm9ybSBzdWJtaXR0ZWQiOworY29uc3QgY2hhciogYmFja0Zvcndh cmRTdHJpbmcgPSAiYmFjay9mb3J3YXJkIjsKK2NvbnN0IGNoYXIqIHJlbG9hZFN0cmluZyA9ICJy ZWxvYWQiOworY29uc3QgY2hhciogZm9ybVJlc3VibWl0dGVkU3RyaW5nID0gImZvcm0gcmVzdWJt aXR0ZWQiOworY29uc3QgY2hhciogb3RoZXJTdHJpbmcgPSAib3RoZXIiOworY29uc3QgY2hhciog aWxsZWdhbFN0cmluZyA9ICJpbGxlZ2FsIHZhbHVlIjsKKworLy8gR2V0IGEgZGVidWdnaW5nIHN0 cmluZyBmcm9tIGEgV2ViTmF2aWdhdGlvblR5cGUuCitjb25zdCBjaGFyKiB3ZWJOYXZpZ2F0aW9u VHlwZVRvU3RyaW5nKFdlYk5hdmlnYXRpb25UeXBlIHR5cGUpCit7CisgICAgc3dpdGNoICh0eXBl KSB7CisgICAgY2FzZSBXZWJLaXQ6OldlYk5hdmlnYXRpb25UeXBlTGlua0NsaWNrZWQ6CisgICAg ICAgIHJldHVybiBsaW5rQ2xpY2tlZFN0cmluZzsKKyAgICBjYXNlIFdlYktpdDo6V2ViTmF2aWdh dGlvblR5cGVGb3JtU3VibWl0dGVkOgorICAgICAgICByZXR1cm4gZm9ybVN1Ym1pdHRlZFN0cmlu ZzsKKyAgICBjYXNlIFdlYktpdDo6V2ViTmF2aWdhdGlvblR5cGVCYWNrRm9yd2FyZDoKKyAgICAg ICAgcmV0dXJuIGJhY2tGb3J3YXJkU3RyaW5nOworICAgIGNhc2UgV2ViS2l0OjpXZWJOYXZpZ2F0 aW9uVHlwZVJlbG9hZDoKKyAgICAgICAgcmV0dXJuIHJlbG9hZFN0cmluZzsKKyAgICBjYXNlIFdl YktpdDo6V2ViTmF2aWdhdGlvblR5cGVGb3JtUmVzdWJtaXR0ZWQ6CisgICAgICAgIHJldHVybiBm b3JtUmVzdWJtaXR0ZWRTdHJpbmc7CisgICAgY2FzZSBXZWJLaXQ6OldlYk5hdmlnYXRpb25UeXBl T3RoZXI6CisgICAgICAgIHJldHVybiBvdGhlclN0cmluZzsKKyAgICB9CisgICAgcmV0dXJuIGls bGVnYWxTdHJpbmc7Cit9CisKIH0KIAogV2ViVGVzdFByb3h5QmFzZTo6V2ViVGVzdFByb3h5QmFz ZSgpCkBAIC05MDgsNCArOTM3LDI2IEBAIHZvaWQgV2ViVGVzdFByb3h5QmFzZTo6bG9jYXRpb25D aGFuZ2VEb25lKFdlYkZyYW1lKiBmcmFtZSkKICAgICBtX3Rlc3RJbnRlcmZhY2VzLT50ZXN0UnVu bmVyKCktPnNldFRvcExvYWRpbmdGcmFtZShmcmFtZSwgdHJ1ZSk7CiB9CiAKK1dlYk5hdmlnYXRp b25Qb2xpY3kgV2ViVGVzdFByb3h5QmFzZTo6ZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbihXZWJG cmFtZSosIGNvbnN0IFdlYlVSTFJlcXVlc3QmIHJlcXVlc3QsIFdlYk5hdmlnYXRpb25UeXBlIHR5 cGUsIGNvbnN0IFdlYk5vZGUmIG9yaWdpbmF0aW5nTm9kZSwgV2ViTmF2aWdhdGlvblBvbGljeSBk ZWZhdWx0UG9saWN5LCBib29sIGlzUmVkaXJlY3QpCit7CisgICAgV2ViTmF2aWdhdGlvblBvbGlj eSByZXN1bHQ7CisgICAgaWYgKCEobV90ZXN0SW50ZXJmYWNlcy0+dGVzdFJ1bm5lcigpICYmIG1f dGVzdEludGVyZmFjZXMtPnRlc3RSdW5uZXIoKS0+cG9saWN5RGVsZWdhdGVFbmFibGVkKCkpKQor ICAgICAgICByZXR1cm4gZGVmYXVsdFBvbGljeTsKKworICAgIG1fZGVsZWdhdGUtPnByaW50TWVz c2FnZShzdHJpbmcoIlBvbGljeSBkZWxlZ2F0ZTogYXR0ZW1wdCB0byBsb2FkICIpICsgVVJMRGVz Y3JpcHRpb24ocmVxdWVzdC51cmwoKSkgKyAiIHdpdGggbmF2aWdhdGlvbiB0eXBlICciICsgd2Vi TmF2aWdhdGlvblR5cGVUb1N0cmluZyh0eXBlKSArICInIik7CisgICAgaWYgKCFvcmlnaW5hdGlu Z05vZGUuaXNOdWxsKCkpIHsKKyAgICAgICAgbV9kZWxlZ2F0ZS0+cHJpbnRNZXNzYWdlKCIgb3Jp Z2luYXRpbmcgZnJvbSAiKTsKKyAgICAgICAgcHJpbnROb2RlRGVzY3JpcHRpb24obV9kZWxlZ2F0 ZSwgb3JpZ2luYXRpbmdOb2RlLCAwKTsKKyAgICB9CisgICAgbV9kZWxlZ2F0ZS0+cHJpbnRNZXNz YWdlKCJcbiIpOworICAgIGlmIChtX3Rlc3RJbnRlcmZhY2VzLT50ZXN0UnVubmVyKCktPnBvbGlj eURlbGVnYXRlSXNQZXJtaXNzaXZlKCkpCisgICAgICAgIHJlc3VsdCA9IFdlYktpdDo6V2ViTmF2 aWdhdGlvblBvbGljeUN1cnJlbnRUYWI7CisgICAgZWxzZQorICAgICAgICByZXN1bHQgPSBXZWJL aXQ6OldlYk5hdmlnYXRpb25Qb2xpY3lJZ25vcmU7CisKKyAgICBpZiAobV90ZXN0SW50ZXJmYWNl cy0+dGVzdFJ1bm5lcigpLT5wb2xpY3lEZWxlZ2F0ZVNob3VsZE5vdGlmeURvbmUoKSkKKyAgICAg ICAgbV90ZXN0SW50ZXJmYWNlcy0+dGVzdFJ1bm5lcigpLT5wb2xpY3lEZWxlZ2F0ZURvbmUoKTsK KyAgICByZXR1cm4gcmVzdWx0OworfQorCiB9CmRpZmYgLS1naXQgYS9Ub29scy9EdW1wUmVuZGVy VHJlZS9jaHJvbWl1bS9XZWJWaWV3SG9zdC5jcHAgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJv bWl1bS9XZWJWaWV3SG9zdC5jcHAKaW5kZXggMDZkZmVmYWFhOTgxNGNhNTE1NzM3NWFhNTA0NzIw ZTI5N2RmMDBjOS4uYmNiZDNiZmZkMmMyOWMwMTYyYzkwYTRmNzM5MmM3OTM0NDc5NmNlYSAxMDA2 NDQKLS0tIGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vV2ViVmlld0hvc3QuY3BwCisr KyBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1dlYlZpZXdIb3N0LmNwcApAQCAtOTIs NjIgKzkyLDggQEAgc3RhdGljIGNvbnN0IGludCBzY3JlZW5XaWR0aCA9IDE5MjA7CiBzdGF0aWMg Y29uc3QgaW50IHNjcmVlbkhlaWdodCA9IDEwODA7CiBzdGF0aWMgY29uc3QgaW50IHNjcmVlblVu YXZhaWxhYmxlQm9yZGVyID0gODsKIAotLy8gV2ViTmF2aWdhdGlvblR5cGUgZGVidWdnaW5nIHN0 cmluZ3MgdGFrZW4gZnJvbSBQb2xpY3lEZWxlZ2F0ZS5tbS4KLXN0YXRpYyBjb25zdCBjaGFyKiBs aW5rQ2xpY2tlZFN0cmluZyA9ICJsaW5rIGNsaWNrZWQiOwotc3RhdGljIGNvbnN0IGNoYXIqIGZv cm1TdWJtaXR0ZWRTdHJpbmcgPSAiZm9ybSBzdWJtaXR0ZWQiOwotc3RhdGljIGNvbnN0IGNoYXIq IGJhY2tGb3J3YXJkU3RyaW5nID0gImJhY2svZm9yd2FyZCI7Ci1zdGF0aWMgY29uc3QgY2hhciog cmVsb2FkU3RyaW5nID0gInJlbG9hZCI7Ci1zdGF0aWMgY29uc3QgY2hhciogZm9ybVJlc3VibWl0 dGVkU3RyaW5nID0gImZvcm0gcmVzdWJtaXR0ZWQiOwotc3RhdGljIGNvbnN0IGNoYXIqIG90aGVy U3RyaW5nID0gIm90aGVyIjsKLXN0YXRpYyBjb25zdCBjaGFyKiBpbGxlZ2FsU3RyaW5nID0gImls bGVnYWwgdmFsdWUiOwotCiBzdGF0aWMgaW50IG5leHRQYWdlSUQgPSAxOwogCi0vLyBHZXQgYSBk ZWJ1Z2dpbmcgc3RyaW5nIGZyb20gYSBXZWJOYXZpZ2F0aW9uVHlwZS4KLXN0YXRpYyBjb25zdCBj aGFyKiB3ZWJOYXZpZ2F0aW9uVHlwZVRvU3RyaW5nKFdlYk5hdmlnYXRpb25UeXBlIHR5cGUpCi17 Ci0gICAgc3dpdGNoICh0eXBlKSB7Ci0gICAgY2FzZSBXZWJLaXQ6OldlYk5hdmlnYXRpb25UeXBl TGlua0NsaWNrZWQ6Ci0gICAgICAgIHJldHVybiBsaW5rQ2xpY2tlZFN0cmluZzsKLSAgICBjYXNl IFdlYktpdDo6V2ViTmF2aWdhdGlvblR5cGVGb3JtU3VibWl0dGVkOgotICAgICAgICByZXR1cm4g Zm9ybVN1Ym1pdHRlZFN0cmluZzsKLSAgICBjYXNlIFdlYktpdDo6V2ViTmF2aWdhdGlvblR5cGVC YWNrRm9yd2FyZDoKLSAgICAgICAgcmV0dXJuIGJhY2tGb3J3YXJkU3RyaW5nOwotICAgIGNhc2Ug V2ViS2l0OjpXZWJOYXZpZ2F0aW9uVHlwZVJlbG9hZDoKLSAgICAgICAgcmV0dXJuIHJlbG9hZFN0 cmluZzsKLSAgICBjYXNlIFdlYktpdDo6V2ViTmF2aWdhdGlvblR5cGVGb3JtUmVzdWJtaXR0ZWQ6 Ci0gICAgICAgIHJldHVybiBmb3JtUmVzdWJtaXR0ZWRTdHJpbmc7Ci0gICAgY2FzZSBXZWJLaXQ6 OldlYk5hdmlnYXRpb25UeXBlT3RoZXI6Ci0gICAgICAgIHJldHVybiBvdGhlclN0cmluZzsKLSAg ICB9Ci0gICAgcmV0dXJuIGlsbGVnYWxTdHJpbmc7Ci19Ci0KLXN0YXRpYyBzdHJpbmcgVVJMRGVz Y3JpcHRpb24oY29uc3QgR1VSTCYgdXJsKQotewotICAgIGlmICh1cmwuU2NoZW1lSXMoImZpbGUi KSkKLSAgICAgICAgcmV0dXJuIHVybC5FeHRyYWN0RmlsZU5hbWUoKTsKLSAgICByZXR1cm4gdXJs LnBvc3NpYmx5X2ludmFsaWRfc3BlYygpOwotfQotCi1zdGF0aWMgdm9pZCBwcmludE5vZGVEZXNj cmlwdGlvbihjb25zdCBXZWJOb2RlJiBub2RlLCBpbnQgZXhjZXB0aW9uKQotewotICAgIGlmIChl eGNlcHRpb24pIHsKLSAgICAgICAgZnB1dHMoIkVSUk9SIiwgc3Rkb3V0KTsKLSAgICAgICAgcmV0 dXJuOwotICAgIH0KLSAgICBpZiAobm9kZS5pc051bGwoKSkgewotICAgICAgICBmcHV0cygiKG51 bGwpIiwgc3Rkb3V0KTsKLSAgICAgICAgcmV0dXJuOwotICAgIH0KLSAgICBmcHV0cyhub2RlLm5v ZGVOYW1lKCkudXRmOCgpLmRhdGEoKSwgc3Rkb3V0KTsKLSAgICBjb25zdCBXZWJOb2RlJiBwYXJl bnQgPSBub2RlLnBhcmVudE5vZGUoKTsKLSAgICBpZiAoIXBhcmVudC5pc051bGwoKSkgewotICAg ICAgICBmcHV0cygiID4gIiwgc3Rkb3V0KTsKLSAgICAgICAgcHJpbnROb2RlRGVzY3JpcHRpb24o cGFyZW50LCAwKTsKLSAgICB9Ci19Ci0KIC8vIFdlYlZpZXdDbGllbnQgLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogCiBXZWJWaWV3 KiBXZWJWaWV3SG9zdDo6Y3JlYXRlVmlldyhXZWJGcmFtZSogY3JlYXRvciwgY29uc3QgV2ViVVJM UmVxdWVzdCYsIGNvbnN0IFdlYldpbmRvd0ZlYXR1cmVzJiwgY29uc3QgV2ViU3RyaW5nJiwgV2Vi TmF2aWdhdGlvblBvbGljeSkKQEAgLTYyNywyOSArNTczLDExIEBAIHZvaWQgV2ViVmlld0hvc3Q6 OmxvYWRVUkxFeHRlcm5hbGx5KFdlYkZyYW1lKiwgY29uc3QgV2ViVVJMUmVxdWVzdCYgcmVxdWVz dCwgV2ViCiB9CiAKIFdlYk5hdmlnYXRpb25Qb2xpY3kgV2ViVmlld0hvc3Q6OmRlY2lkZVBvbGlj eUZvck5hdmlnYXRpb24oCi0gICAgV2ViRnJhbWUqLCBjb25zdCBXZWJVUkxSZXF1ZXN0JiByZXF1 ZXN0LAotICAgIFdlYk5hdmlnYXRpb25UeXBlIHR5cGUsIGNvbnN0IFdlYk5vZGUmIG9yaWdpbmF0 aW5nTm9kZSwKLSAgICBXZWJOYXZpZ2F0aW9uUG9saWN5IGRlZmF1bHRQb2xpY3ksIGJvb2wgaXNS ZWRpcmVjdCkKLXsKLSAgICBXZWJOYXZpZ2F0aW9uUG9saWN5IHJlc3VsdDsKLSAgICBpZiAoIW1f cG9saWN5RGVsZWdhdGVFbmFibGVkKQotICAgICAgICByZXR1cm4gZGVmYXVsdFBvbGljeTsKLQot ICAgIHByaW50ZigiUG9saWN5IGRlbGVnYXRlOiBhdHRlbXB0IHRvIGxvYWQgJXMgd2l0aCBuYXZp Z2F0aW9uIHR5cGUgJyVzJyIsCi0gICAgICAgICAgIFVSTERlc2NyaXB0aW9uKHJlcXVlc3QudXJs KCkpLmNfc3RyKCksIHdlYk5hdmlnYXRpb25UeXBlVG9TdHJpbmcodHlwZSkpOwotICAgIGlmICgh b3JpZ2luYXRpbmdOb2RlLmlzTnVsbCgpKSB7Ci0gICAgICAgIGZwdXRzKCIgb3JpZ2luYXRpbmcg ZnJvbSAiLCBzdGRvdXQpOwotICAgICAgICBwcmludE5vZGVEZXNjcmlwdGlvbihvcmlnaW5hdGlu Z05vZGUsIDApOwotICAgIH0KLSAgICBmcHV0cygiXG4iLCBzdGRvdXQpOwotICAgIGlmIChtX3Bv bGljeURlbGVnYXRlSXNQZXJtaXNzaXZlKQotICAgICAgICByZXN1bHQgPSBXZWJLaXQ6OldlYk5h dmlnYXRpb25Qb2xpY3lDdXJyZW50VGFiOwotICAgIGVsc2UKLSAgICAgICAgcmVzdWx0ID0gV2Vi S2l0OjpXZWJOYXZpZ2F0aW9uUG9saWN5SWdub3JlOwotCi0gICAgaWYgKG1fcG9saWN5RGVsZWdh dGVTaG91bGROb3RpZnlEb25lKQotICAgICAgICB0ZXN0UnVubmVyKCktPnBvbGljeURlbGVnYXRl RG9uZSgpOwotICAgIHJldHVybiByZXN1bHQ7CisgICAgV2ViRnJhbWUqLCBjb25zdCBXZWJVUkxS ZXF1ZXN0JiwKKyAgICBXZWJOYXZpZ2F0aW9uVHlwZSwgY29uc3QgV2ViTm9kZSYsCisgICAgV2Vi TmF2aWdhdGlvblBvbGljeSBkZWZhdWx0UG9saWN5LCBib29sKQoreworICAgIHJldHVybiBkZWZh dWx0UG9saWN5OwogfQogCiBib29sIFdlYlZpZXdIb3N0OjpjYW5IYW5kbGVSZXF1ZXN0KFdlYkZy YW1lKiwgY29uc3QgV2ViVVJMUmVxdWVzdCYgcmVxdWVzdCkKQEAgLTEwNzcsMTggKzEwMDUsNiBA QCBpbnQgV2ViVmlld0hvc3Q6OndpbmRvd0NvdW50KCkKICAgICByZXR1cm4gbV9zaGVsbC0+d2lu ZG93Q291bnQoKTsKIH0KIAotdm9pZCBXZWJWaWV3SG9zdDo6c2V0Q3VzdG9tUG9saWN5RGVsZWdh dGUoYm9vbCBpc0N1c3RvbSwgYm9vbCBpc1Blcm1pc3NpdmUpCi17Ci0gICAgbV9wb2xpY3lEZWxl Z2F0ZUVuYWJsZWQgPSBpc0N1c3RvbTsKLSAgICBtX3BvbGljeURlbGVnYXRlSXNQZXJtaXNzaXZl ID0gaXNQZXJtaXNzaXZlOwotfQotCi12b2lkIFdlYlZpZXdIb3N0Ojp3YWl0Rm9yUG9saWN5RGVs ZWdhdGUoKQotewotICAgIG1fcG9saWN5RGVsZWdhdGVFbmFibGVkID0gdHJ1ZTsKLSAgICBtX3Bv bGljeURlbGVnYXRlU2hvdWxkTm90aWZ5RG9uZSA9IHRydWU7Ci19Ci0KIHZvaWQgV2ViVmlld0hv c3Q6OmdvVG9PZmZzZXQoaW50IG9mZnNldCkKIHsKICAgICBtX3NoZWxsLT5nb1RvT2Zmc2V0KG9m ZnNldCk7CkBAIC0xMTgzLDkgKzEwOTksNiBAQCB2b2lkIFdlYlZpZXdIb3N0OjpzZXRQcm94eShX ZWJUZXN0UHJveHlCYXNlKiBwcm94eSkKIAogdm9pZCBXZWJWaWV3SG9zdDo6cmVzZXQoKQogewot ICAgIG1fcG9saWN5RGVsZWdhdGVFbmFibGVkID0gZmFsc2U7Ci0gICAgbV9wb2xpY3lEZWxlZ2F0 ZUlzUGVybWlzc2l2ZSA9IGZhbHNlOwotICAgIG1fcG9saWN5RGVsZWdhdGVTaG91bGROb3RpZnlE b25lID0gZmFsc2U7CiAgICAgbV9wYWdlSWQgPSAtMTsKICAgICBtX2xhc3RQYWdlSWRVcGRhdGVk ID0gLTE7CiAgICAgbV9oYXNXaW5kb3cgPSBmYWxzZTsKZGlmZiAtLWdpdCBhL1Rvb2xzL0R1bXBS ZW5kZXJUcmVlL2Nocm9taXVtL1dlYlZpZXdIb3N0LmggYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9j aHJvbWl1bS9XZWJWaWV3SG9zdC5oCmluZGV4IDQ5N2NlNDc4YjQzOWJlZjc5NTEzMDY5NmZjZTAw YTI4ZjE2YmZhZjYuLmRiNmJmZjZmYmI0NWIyY2QxODZkNmZkZDFlMzRjYzgyZGVmODE3MDMgMTAw NjQ0Ci0tLSBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1dlYlZpZXdIb3N0LmgKKysr IGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vV2ViVmlld0hvc3QuaApAQCAtMTc0LDgg KzE3NCw2IEBAIGNsYXNzIFdlYlZpZXdIb3N0IDogcHVibGljIFdlYktpdDo6V2ViVmlld0NsaWVu dCwgcHVibGljIFdlYktpdDo6V2ViRnJhbWVDbGllbnQsCiAgICAgdmlydHVhbCB2b2lkIGNsb3Nl UmVtYWluaW5nV2luZG93cygpIE9WRVJSSURFOwogICAgIHZpcnR1YWwgaW50IG5hdmlnYXRpb25F bnRyeUNvdW50KCkgT1ZFUlJJREU7CiAgICAgdmlydHVhbCBpbnQgd2luZG93Q291bnQoKSBPVkVS UklERTsKLSAgICB2aXJ0dWFsIHZvaWQgc2V0Q3VzdG9tUG9saWN5RGVsZWdhdGUoYm9vbCwgYm9v bCkgT1ZFUlJJREU7Ci0gICAgdmlydHVhbCB2b2lkIHdhaXRGb3JQb2xpY3lEZWxlZ2F0ZSgpIE9W RVJSSURFOwogICAgIHZpcnR1YWwgdm9pZCBnb1RvT2Zmc2V0KGludCkgT1ZFUlJJREU7CiAgICAg dmlydHVhbCB2b2lkIHJlbG9hZCgpIE9WRVJSSURFOwogICAgIHZvaWQgbG9hZFVSTEZvckZyYW1l KGNvbnN0IFdlYktpdDo6V2ViVVJMJiwgY29uc3Qgc3RkOjpzdHJpbmcmIGZyYW1lTmFtZSkgT1ZF UlJJREU7CkBAIC0zMjksMTggKzMyNyw2IEBAIHByaXZhdGU6CiAgICAgd2Via2l0X3N1cHBvcnQ6 OlRlc3RNZWRpYVN0cmVhbUNsaWVudCogdGVzdE1lZGlhU3RyZWFtQ2xpZW50KCk7CiAjZW5kaWYK IAotICAgIC8vIENhdXNlcyBuYXZpZ2F0aW9uIGFjdGlvbnMganVzdCBwcmludG91dCB0aGUgaW50 ZW5kZWQgbmF2aWdhdGlvbiBpbnN0ZWFkCi0gICAgLy8gb2YgdGFraW5nIHlvdSB0byB0aGUgcGFn ZS4gVGhpcyBpcyB1c2VkIGZvciBjYXNlcyBsaWtlIG1haWx0bywgd2hlcmUgeW91Ci0gICAgLy8g ZG9uJ3QgYWN0dWFsbHkgd2FudCB0byBvcGVuIHRoZSBtYWlsIHByb2dyYW0uCi0gICAgYm9vbCBt X3BvbGljeURlbGVnYXRlRW5hYmxlZDsKLQotICAgIC8vIFRvZ2dsZXMgdGhlIGJlaGF2aW9yIG9m IHRoZSBwb2xpY3kgZGVsZWdhdGUuIElmIHRydWUsIHRoZW4gbmF2aWdhdGlvbnMKLSAgICAvLyB3 aWxsIGJlIGFsbG93ZWQuIE90aGVyd2lzZSwgdGhleSB3aWxsIGJlIGlnbm9yZWQgKGRyb3BwZWQp LgotICAgIGJvb2wgbV9wb2xpY3lEZWxlZ2F0ZUlzUGVybWlzc2l2ZTsKLQotICAgIC8vIElmIHRy dWUsIHRoZSBwb2xpY3kgZGVsZWdhdGUgd2lsbCBzaWduYWwgbGF5b3V0IHRlc3QgY29tcGxldGlv bi4KLSAgICBib29sIG1fcG9saWN5RGVsZWdhdGVTaG91bGROb3RpZnlEb25lOwotCiAgICAgLy8g Tm9uLW93bmluZyBwb2ludGVyLiBUaGUgV2ViVmlld0hvc3QgaW5zdGFuY2UgaXMgb3duZWQgYnkg dGhpcyBUZXN0U2hlbGwgaW5zdGFuY2UuCiAgICAgVGVzdFNoZWxsKiBtX3NoZWxsOwogCg==