186304 2018-06-05 02:55:01 -0700 Fix the iOS build after r232496 2018-06-05 14:07:15 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 186096 186321 1 graouts graouts bfulgham commit-queue oldest_to_newest 1430067 0 graouts 2018-06-05 02:55:01 -0700 Fix the iOS build after r232496 1430068 1 341960 graouts 2018-06-05 02:58:08 -0700 Created attachment 341960 Patch 1430100 2 341960 bfulgham 2018-06-05 08:50:47 -0700 Comment on attachment 341960 Patch Yes -- this is correct. Thank you for fixing this! 1430103 3 bfulgham 2018-06-05 08:51:34 -0700 <rdar://problem/40651015> 1430112 4 bfulgham 2018-06-05 09:16:10 -0700 Committed r232511: <https://trac.webkit.org/changeset/232511> 1430117 5 bfulgham 2018-06-05 09:28:28 -0700 Committed r232512: <https://trac.webkit.org/changeset/232512> 341960 2018-06-05 02:58:08 -0700 2018-06-05 08:50:27 -0700 Patch bug-186304-20180605115806.patch text/plain 19313 graouts U3VidmVyc2lvbiBSZXZpc2lvbjogMjMyNTA0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGJkNjdmMjM1ODJlYWZk ZTk1YzU3MjE0Zjg4ZmNhN2FhYzdjM2NkOS4uOWNkMWJkN2E2N2RiNjc0Y2Y1YTc4ZTQ0NjQ5MjJi OWEwMTlmNWNmOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ0IEBACisyMDE4LTA2LTA1ICBBbnRv aW5lIFF1aW50ICA8Z3Jhb3V0c0BhcHBsZS5jb20+CisKKyAgICAgICAgRml4IHRoZSBpT1MgYnVp bGQgYWZ0ZXIgcjIzMjQ5NgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTg2MzA0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgVGhlIGNoYW5nZXMgaW4gcjIzMjQ5NiBjaGFuZ2VkIHRoZSBJbnB1dFR5cGU6OmVs ZW1lbnQoKSBzaWduYXR1cmUgZnJvbSBIVE1MSW5wdXRFbGVtZW50JgorICAgICAgICB0byBIVE1M SW5wdXRFbGVtZW50KiBhbmQgc29tZSBjYWxsIHNpdGVzIGRpZCBub3QgZXhwZWN0IHRoYXQuCisK KyAgICAgICAgKiBodG1sL0Jhc2VDaG9vc2VyT25seURhdGVBbmRUaW1lSW5wdXRUeXBlLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkJhc2VDaG9vc2VyT25seURhdGVBbmRUaW1lSW5wdXRUeXBlOjpo YW5kbGVET01BY3RpdmF0ZUV2ZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkJhc2VDaG9vc2VyT25s eURhdGVBbmRUaW1lSW5wdXRUeXBlOjpjcmVhdGVTaGFkb3dTdWJ0cmVlKToKKyAgICAgICAgKFdl YkNvcmU6OkJhc2VDaG9vc2VyT25seURhdGVBbmRUaW1lSW5wdXRUeXBlOjp1cGRhdGVJbm5lclRl eHRWYWx1ZSk6CisgICAgICAgIChXZWJDb3JlOjpCYXNlQ2hvb3Nlck9ubHlEYXRlQW5kVGltZUlu cHV0VHlwZTo6ZGlkQ2hvb3NlVmFsdWUpOgorICAgICAgICAoV2ViQ29yZTo6QmFzZUNob29zZXJP bmx5RGF0ZUFuZFRpbWVJbnB1dFR5cGU6OmhhbmRsZUtleWRvd25FdmVudCk6CisgICAgICAgIChX ZWJDb3JlOjpCYXNlQ2hvb3Nlck9ubHlEYXRlQW5kVGltZUlucHV0VHlwZTo6aGFuZGxlS2V5cHJl c3NFdmVudCk6CisgICAgICAgIChXZWJDb3JlOjpCYXNlQ2hvb3Nlck9ubHlEYXRlQW5kVGltZUlu cHV0VHlwZTo6YWNjZXNzS2V5QWN0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OkJhc2VDaG9vc2Vy T25seURhdGVBbmRUaW1lSW5wdXRUeXBlOjppc01vdXNlRm9jdXNhYmxlIGNvbnN0KToKKyAgICAg ICAgKiBodG1sL0Jhc2VEYXRlQW5kVGltZUlucHV0VHlwZS5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpCYXNlRGF0ZUFuZFRpbWVJbnB1dFR5cGU6OnNldFZhbHVlQXNEYXRlIGNvbnN0KToKKyAgICAg ICAgKFdlYkNvcmU6OkJhc2VEYXRlQW5kVGltZUlucHV0VHlwZTo6dmFsdWVBc0RvdWJsZSBjb25z dCk6CisgICAgICAgIChXZWJDb3JlOjpCYXNlRGF0ZUFuZFRpbWVJbnB1dFR5cGU6OnNldFZhbHVl QXNEZWNpbWFsIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkJhc2VEYXRlQW5kVGltZUlucHV0 VHlwZTo6dHlwZU1pc21hdGNoIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkJhc2VEYXRlQW5k VGltZUlucHV0VHlwZTo6c2VyaWFsaXplV2l0aENvbXBvbmVudHMgY29uc3QpOgorICAgICAgICAo V2ViQ29yZTo6QmFzZURhdGVBbmRUaW1lSW5wdXRUeXBlOjpsb2NhbGl6ZVZhbHVlIGNvbnN0KToK KyAgICAgICAgKFdlYkNvcmU6OkJhc2VEYXRlQW5kVGltZUlucHV0VHlwZTo6dmlzaWJsZVZhbHVl IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkJhc2VEYXRlQW5kVGltZUlucHV0VHlwZTo6dmFs dWVNaXNzaW5nIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkJhc2VEYXRlQW5kVGltZUlucHV0 VHlwZTo6aXNLZXlib2FyZEZvY3VzYWJsZSBjb25zdCk6CisgICAgICAgICogaHRtbC9EYXRlSW5w dXRUeXBlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRhdGVJbnB1dFR5cGU6OmNyZWF0ZVN0ZXBS YW5nZSBjb25zdCk6CisgICAgICAgICogaHRtbC9EYXRlVGltZUxvY2FsSW5wdXRUeXBlLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkRhdGVUaW1lTG9jYWxJbnB1dFR5cGU6OmNyZWF0ZVN0ZXBSYW5n ZSBjb25zdCk6CisgICAgICAgICogaHRtbC9Nb250aElucHV0VHlwZS5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpNb250aElucHV0VHlwZTo6dmFsdWVBc0RhdGUgY29uc3QpOgorICAgICAgICAoV2Vi Q29yZTo6TW9udGhJbnB1dFR5cGU6OmNyZWF0ZVN0ZXBSYW5nZSBjb25zdCk6CisgICAgICAgICog aHRtbC9UaW1lSW5wdXRUeXBlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlRpbWVJbnB1dFR5cGU6 OmNyZWF0ZVN0ZXBSYW5nZSBjb25zdCk6CisgICAgICAgICogaHRtbC9XZWVrSW5wdXRUeXBlLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OldlZWtJbnB1dFR5cGU6OmNyZWF0ZVN0ZXBSYW5nZSBjb25z dCk6CisKIDIwMTgtMDYtMDMgIERhcmluIEFkbGVyICA8ZGFyaW5AYXBwbGUuY29tPgogCiAgICAg ICAgIFtDb2NvYV0gVXBkYXRlIG1vcmUgY29kZSB0byBiZSBtb3JlIEFSQy1jb21wYXRpYmxlIHRv IHByZXBhcmUgZm9yIGZ1dHVyZSBBUkMgYWRvcHRpb24KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2h0bWwvQmFzZUNob29zZXJPbmx5RGF0ZUFuZFRpbWVJbnB1dFR5cGUuY3BwIGIvU291cmNl L1dlYkNvcmUvaHRtbC9CYXNlQ2hvb3Nlck9ubHlEYXRlQW5kVGltZUlucHV0VHlwZS5jcHAKaW5k ZXggNWM0NjNhMDc0MDNmMTUzZTkxNDdmYTg3YjJhNjE3NGY3MTI3YjgwMS4uNWMxMmY2YzE1NDRk M2E1YmMzNzI0NzZjMjk3NTNlYTYyYjI3OWI0YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv aHRtbC9CYXNlQ2hvb3Nlck9ubHlEYXRlQW5kVGltZUlucHV0VHlwZS5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvaHRtbC9CYXNlQ2hvb3Nlck9ubHlEYXRlQW5kVGltZUlucHV0VHlwZS5jcHAKQEAg LTQ2LDE1ICs0NiwxNiBAQCBCYXNlQ2hvb3Nlck9ubHlEYXRlQW5kVGltZUlucHV0VHlwZTo6fkJh c2VDaG9vc2VyT25seURhdGVBbmRUaW1lSW5wdXRUeXBlKCkKIAogdm9pZCBCYXNlQ2hvb3Nlck9u bHlEYXRlQW5kVGltZUlucHV0VHlwZTo6aGFuZGxlRE9NQWN0aXZhdGVFdmVudChFdmVudCYpCiB7 Ci0gICAgaWYgKGVsZW1lbnQoKS5pc0Rpc2FibGVkT3JSZWFkT25seSgpIHx8ICFlbGVtZW50KCku cmVuZGVyZXIoKSB8fCAhVXNlckdlc3R1cmVJbmRpY2F0b3I6OnByb2Nlc3NpbmdVc2VyR2VzdHVy ZSgpKQorICAgIEFTU0VSVChlbGVtZW50KCkpOworICAgIGlmIChlbGVtZW50KCktPmlzRGlzYWJs ZWRPclJlYWRPbmx5KCkgfHwgIWVsZW1lbnQoKS0+cmVuZGVyZXIoKSB8fCAhVXNlckdlc3R1cmVJ bmRpY2F0b3I6OnByb2Nlc3NpbmdVc2VyR2VzdHVyZSgpKQogICAgICAgICByZXR1cm47CiAKICAg ICBpZiAobV9kYXRlVGltZUNob29zZXIpCiAgICAgICAgIHJldHVybjsKLSAgICBpZiAoIWVsZW1l bnQoKS5kb2N1bWVudCgpLnBhZ2UoKSkKKyAgICBpZiAoIWVsZW1lbnQoKS0+ZG9jdW1lbnQoKS5w YWdlKCkpCiAgICAgICAgIHJldHVybjsKICAgICBEYXRlVGltZUNob29zZXJQYXJhbWV0ZXJzIHBh cmFtZXRlcnM7Ci0gICAgaWYgKCFlbGVtZW50KCkuc2V0dXBEYXRlVGltZUNob29zZXJQYXJhbWV0 ZXJzKHBhcmFtZXRlcnMpKQorICAgIGlmICghZWxlbWVudCgpLT5zZXR1cERhdGVUaW1lQ2hvb3Nl clBhcmFtZXRlcnMocGFyYW1ldGVycykpCiAgICAgICAgIHJldHVybjsKIH0KIApAQCAtNjIsMTUg KzYzLDE3IEBAIHZvaWQgQmFzZUNob29zZXJPbmx5RGF0ZUFuZFRpbWVJbnB1dFR5cGU6OmNyZWF0 ZVNoYWRvd1N1YnRyZWUoKQogewogICAgIHN0YXRpYyBOZXZlckRlc3Ryb3llZDxBdG9taWNTdHJp bmc+IHZhbHVlQ29udGFpbmVyUHNldWRvKCItd2Via2l0LWRhdGUtYW5kLXRpbWUtdmFsdWUiLCBB dG9taWNTdHJpbmc6OkNvbnN0cnVjdEZyb21MaXRlcmFsKTsKIAotICAgIGF1dG8gdmFsdWVDb250 YWluZXIgPSBIVE1MRGl2RWxlbWVudDo6Y3JlYXRlKGVsZW1lbnQoKS5kb2N1bWVudCgpKTsKKyAg ICBBU1NFUlQoZWxlbWVudCgpKTsKKyAgICBhdXRvIHZhbHVlQ29udGFpbmVyID0gSFRNTERpdkVs ZW1lbnQ6OmNyZWF0ZShlbGVtZW50KCktPmRvY3VtZW50KCkpOwogICAgIHZhbHVlQ29udGFpbmVy LT5zZXRQc2V1ZG8odmFsdWVDb250YWluZXJQc2V1ZG8pOwotICAgIGVsZW1lbnQoKS51c2VyQWdl bnRTaGFkb3dSb290KCktPmFwcGVuZENoaWxkKHZhbHVlQ29udGFpbmVyKTsKKyAgICBlbGVtZW50 KCktPnVzZXJBZ2VudFNoYWRvd1Jvb3QoKS0+YXBwZW5kQ2hpbGQodmFsdWVDb250YWluZXIpOwog ICAgIHVwZGF0ZUlubmVyVGV4dFZhbHVlKCk7CiB9CiAKIHZvaWQgQmFzZUNob29zZXJPbmx5RGF0 ZUFuZFRpbWVJbnB1dFR5cGU6OnVwZGF0ZUlubmVyVGV4dFZhbHVlKCkKIHsKLSAgICBSZWZQdHI8 Tm9kZT4gbm9kZSA9IGVsZW1lbnQoKS51c2VyQWdlbnRTaGFkb3dSb290KCktPmZpcnN0Q2hpbGQo KTsKKyAgICBBU1NFUlQoZWxlbWVudCgpKTsKKyAgICBSZWZQdHI8Tm9kZT4gbm9kZSA9IGVsZW1l bnQoKS0+dXNlckFnZW50U2hhZG93Um9vdCgpLT5maXJzdENoaWxkKCk7CiAgICAgaWYgKCFpczxI VE1MRWxlbWVudD4obm9kZSkpCiAgICAgICAgIHJldHVybjsKICAgICBTdHJpbmcgZGlzcGxheVZh bHVlID0gdmlzaWJsZVZhbHVlKCk7CkBAIC05NSw3ICs5OCw4IEBAIHZvaWQgQmFzZUNob29zZXJP bmx5RGF0ZUFuZFRpbWVJbnB1dFR5cGU6OmRldGFjaCgpCiAKIHZvaWQgQmFzZUNob29zZXJPbmx5 RGF0ZUFuZFRpbWVJbnB1dFR5cGU6OmRpZENob29zZVZhbHVlKGNvbnN0IFN0cmluZyYgdmFsdWUp CiB7Ci0gICAgZWxlbWVudCgpLnNldFZhbHVlKHZhbHVlLCBEaXNwYXRjaElucHV0QW5kQ2hhbmdl RXZlbnQpOworICAgIEFTU0VSVChlbGVtZW50KCkpOworICAgIGVsZW1lbnQoKS0+c2V0VmFsdWUo dmFsdWUsIERpc3BhdGNoSW5wdXRBbmRDaGFuZ2VFdmVudCk7CiB9CiAKIHZvaWQgQmFzZUNob29z ZXJPbmx5RGF0ZUFuZFRpbWVJbnB1dFR5cGU6OmRpZEVuZENob29zZXIoKQpAQCAtMTExLDEyICsx MTUsMTQgQEAgdm9pZCBCYXNlQ2hvb3Nlck9ubHlEYXRlQW5kVGltZUlucHV0VHlwZTo6Y2xvc2VE YXRlVGltZUNob29zZXIoKQogCiB2b2lkIEJhc2VDaG9vc2VyT25seURhdGVBbmRUaW1lSW5wdXRU eXBlOjpoYW5kbGVLZXlkb3duRXZlbnQoS2V5Ym9hcmRFdmVudCYgZXZlbnQpCiB7Ci0gICAgQmFz ZUNsaWNrYWJsZVdpdGhLZXlJbnB1dFR5cGU6OmhhbmRsZUtleWRvd25FdmVudChlbGVtZW50KCks IGV2ZW50KTsKKyAgICBBU1NFUlQoZWxlbWVudCgpKTsKKyAgICBCYXNlQ2xpY2thYmxlV2l0aEtl eUlucHV0VHlwZTo6aGFuZGxlS2V5ZG93bkV2ZW50KCplbGVtZW50KCksIGV2ZW50KTsKIH0KIAog dm9pZCBCYXNlQ2hvb3Nlck9ubHlEYXRlQW5kVGltZUlucHV0VHlwZTo6aGFuZGxlS2V5cHJlc3NF dmVudChLZXlib2FyZEV2ZW50JiBldmVudCkKIHsKLSAgICBCYXNlQ2xpY2thYmxlV2l0aEtleUlu cHV0VHlwZTo6aGFuZGxlS2V5cHJlc3NFdmVudChlbGVtZW50KCksIGV2ZW50KTsKKyAgICBBU1NF UlQoZWxlbWVudCgpKTsKKyAgICBCYXNlQ2xpY2thYmxlV2l0aEtleUlucHV0VHlwZTo6aGFuZGxl S2V5cHJlc3NFdmVudCgqZWxlbWVudCgpLCBldmVudCk7CiB9CiAKIHZvaWQgQmFzZUNob29zZXJP bmx5RGF0ZUFuZFRpbWVJbnB1dFR5cGU6OmhhbmRsZUtleXVwRXZlbnQoS2V5Ym9hcmRFdmVudCYg ZXZlbnQpCkBAIC0xMjcsMTIgKzEzMywxNCBAQCB2b2lkIEJhc2VDaG9vc2VyT25seURhdGVBbmRU aW1lSW5wdXRUeXBlOjpoYW5kbGVLZXl1cEV2ZW50KEtleWJvYXJkRXZlbnQmIGV2ZW50KQogdm9p ZCBCYXNlQ2hvb3Nlck9ubHlEYXRlQW5kVGltZUlucHV0VHlwZTo6YWNjZXNzS2V5QWN0aW9uKGJv b2wgc2VuZE1vdXNlRXZlbnRzKQogewogICAgIEJhc2VEYXRlQW5kVGltZUlucHV0VHlwZTo6YWNj ZXNzS2V5QWN0aW9uKHNlbmRNb3VzZUV2ZW50cyk7Ci0gICAgQmFzZUNsaWNrYWJsZVdpdGhLZXlJ bnB1dFR5cGU6OmFjY2Vzc0tleUFjdGlvbihlbGVtZW50KCksIHNlbmRNb3VzZUV2ZW50cyk7Cisg ICAgQVNTRVJUKGVsZW1lbnQoKSk7CisgICAgQmFzZUNsaWNrYWJsZVdpdGhLZXlJbnB1dFR5cGU6 OmFjY2Vzc0tleUFjdGlvbigqZWxlbWVudCgpLCBzZW5kTW91c2VFdmVudHMpOwogfQogCiBib29s IEJhc2VDaG9vc2VyT25seURhdGVBbmRUaW1lSW5wdXRUeXBlOjppc01vdXNlRm9jdXNhYmxlKCkg Y29uc3QKIHsKLSAgICByZXR1cm4gZWxlbWVudCgpLmlzVGV4dEZvcm1Db250cm9sRm9jdXNhYmxl KCk7CisgICAgQVNTRVJUKGVsZW1lbnQoKSk7CisgICAgcmV0dXJuIGVsZW1lbnQoKS0+aXNUZXh0 Rm9ybUNvbnRyb2xGb2N1c2FibGUoKTsKIH0KIAogdm9pZCBCYXNlQ2hvb3Nlck9ubHlEYXRlQW5k VGltZUlucHV0VHlwZTo6YXR0cmlidXRlQ2hhbmdlZChjb25zdCBRdWFsaWZpZWROYW1lJiBuYW1l KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9CYXNlRGF0ZUFuZFRpbWVJbnB1dFR5 cGUuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9CYXNlRGF0ZUFuZFRpbWVJbnB1dFR5cGUuY3Bw CmluZGV4IGNjOTA3MGExYTA3MmEwYjA3YmYyMzFiMDA1OGE4NmU4ZDEzNzBhYzEuLjkwMzZlNzY0 Njc2NDkwMTE4Yjg5YTg0ZDllODYyNTU5Yjg5YTA4Y2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2h0bWwvQmFzZURhdGVBbmRUaW1lSW5wdXRUeXBlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9odG1sL0Jhc2VEYXRlQW5kVGltZUlucHV0VHlwZS5jcHAKQEAgLTU3LDE5ICs1NywyMiBAQCBk b3VibGUgQmFzZURhdGVBbmRUaW1lSW5wdXRUeXBlOjp2YWx1ZUFzRGF0ZSgpIGNvbnN0CiAKIEV4 Y2VwdGlvbk9yPHZvaWQ+IEJhc2VEYXRlQW5kVGltZUlucHV0VHlwZTo6c2V0VmFsdWVBc0RhdGUo ZG91YmxlIHZhbHVlKSBjb25zdAogewotICAgIGVsZW1lbnQoKS5zZXRWYWx1ZShzZXJpYWxpemVX aXRoTWlsbGlzZWNvbmRzKHZhbHVlKSk7CisgICAgQVNTRVJUKGVsZW1lbnQoKSk7CisgICAgZWxl bWVudCgpLT5zZXRWYWx1ZShzZXJpYWxpemVXaXRoTWlsbGlzZWNvbmRzKHZhbHVlKSk7CiAgICAg cmV0dXJuIHsgfTsKIH0KIAogZG91YmxlIEJhc2VEYXRlQW5kVGltZUlucHV0VHlwZTo6dmFsdWVB c0RvdWJsZSgpIGNvbnN0CiB7Ci0gICAgY29uc3QgRGVjaW1hbCB2YWx1ZSA9IHBhcnNlVG9OdW1i ZXIoZWxlbWVudCgpLnZhbHVlKCksIERlY2ltYWw6Om5hbigpKTsKKyAgICBBU1NFUlQoZWxlbWVu dCgpKTsKKyAgICBjb25zdCBEZWNpbWFsIHZhbHVlID0gcGFyc2VUb051bWJlcihlbGVtZW50KCkt PnZhbHVlKCksIERlY2ltYWw6Om5hbigpKTsKICAgICByZXR1cm4gdmFsdWUuaXNGaW5pdGUoKSA/ IHZhbHVlLnRvRG91YmxlKCkgOiBEYXRlQ29tcG9uZW50czo6aW52YWxpZE1pbGxpc2Vjb25kcygp OwogfQogCiBFeGNlcHRpb25Pcjx2b2lkPiBCYXNlRGF0ZUFuZFRpbWVJbnB1dFR5cGU6OnNldFZh bHVlQXNEZWNpbWFsKGNvbnN0IERlY2ltYWwmIG5ld1ZhbHVlLCBUZXh0RmllbGRFdmVudEJlaGF2 aW9yIGV2ZW50QmVoYXZpb3IpIGNvbnN0CiB7Ci0gICAgZWxlbWVudCgpLnNldFZhbHVlKHNlcmlh bGl6ZShuZXdWYWx1ZSksIGV2ZW50QmVoYXZpb3IpOworICAgIEFTU0VSVChlbGVtZW50KCkpOwor ICAgIGVsZW1lbnQoKS0+c2V0VmFsdWUoc2VyaWFsaXplKG5ld1ZhbHVlKSwgZXZlbnRCZWhhdmlv cik7CiAgICAgcmV0dXJuIHsgfTsKIH0KIApAQCAtODAsNyArODMsOCBAQCBib29sIEJhc2VEYXRl QW5kVGltZUlucHV0VHlwZTo6dHlwZU1pc21hdGNoRm9yKGNvbnN0IFN0cmluZyYgdmFsdWUpIGNv bnN0CiAKIGJvb2wgQmFzZURhdGVBbmRUaW1lSW5wdXRUeXBlOjp0eXBlTWlzbWF0Y2goKSBjb25z dAogewotICAgIHJldHVybiB0eXBlTWlzbWF0Y2hGb3IoZWxlbWVudCgpLnZhbHVlKCkpOworICAg IEFTU0VSVChlbGVtZW50KCkpOworICAgIHJldHVybiB0eXBlTWlzbWF0Y2hGb3IoZWxlbWVudCgp LT52YWx1ZSgpKTsKIH0KIAogRGVjaW1hbCBCYXNlRGF0ZUFuZFRpbWVJbnB1dFR5cGU6OmRlZmF1 bHRWYWx1ZUZvclN0ZXBVcCgpIGNvbnN0CkBAIC0xMzYsOCArMTQwLDkgQEAgU3RyaW5nIEJhc2VE YXRlQW5kVGltZUlucHV0VHlwZTo6c2VyaWFsaXplKGNvbnN0IERlY2ltYWwmIHZhbHVlKSBjb25z dAogCiBTdHJpbmcgQmFzZURhdGVBbmRUaW1lSW5wdXRUeXBlOjpzZXJpYWxpemVXaXRoQ29tcG9u ZW50cyhjb25zdCBEYXRlQ29tcG9uZW50cyYgZGF0ZSkgY29uc3QKIHsKKyAgICBBU1NFUlQoZWxl bWVudCgpKTsKICAgICBEZWNpbWFsIHN0ZXA7Ci0gICAgaWYgKCFlbGVtZW50KCkuZ2V0QWxsb3dl ZFZhbHVlU3RlcCgmc3RlcCkpCisgICAgaWYgKCFlbGVtZW50KCktPmdldEFsbG93ZWRWYWx1ZVN0 ZXAoJnN0ZXApKQogICAgICAgICByZXR1cm4gZGF0ZS50b1N0cmluZygpOwogICAgIGlmIChzdGVw LnJlbWFpbmRlcihtc2VjUGVyTWludXRlKS5pc1plcm8oKSkKICAgICAgICAgcmV0dXJuIGRhdGUu dG9TdHJpbmcoRGF0ZUNvbXBvbmVudHM6Ok5vbmUpOwpAQCAtMTU3LDEzICsxNjIsMTUgQEAgU3Ry aW5nIEJhc2VEYXRlQW5kVGltZUlucHV0VHlwZTo6bG9jYWxpemVWYWx1ZShjb25zdCBTdHJpbmcm IHByb3Bvc2VkVmFsdWUpIGNvbnMKICAgICBpZiAoIXBhcnNlVG9EYXRlQ29tcG9uZW50cyhwcm9w b3NlZFZhbHVlLCAmZGF0ZSkpCiAgICAgICAgIHJldHVybiBwcm9wb3NlZFZhbHVlOwogCi0gICAg U3RyaW5nIGxvY2FsaXplZCA9IGVsZW1lbnQoKS5sb2NhbGUoKS5mb3JtYXREYXRlVGltZShkYXRl KTsKKyAgICBBU1NFUlQoZWxlbWVudCgpKTsKKyAgICBTdHJpbmcgbG9jYWxpemVkID0gZWxlbWVu dCgpLT5sb2NhbGUoKS5mb3JtYXREYXRlVGltZShkYXRlKTsKICAgICByZXR1cm4gbG9jYWxpemVk LmlzRW1wdHkoKSA/IHByb3Bvc2VkVmFsdWUgOiBsb2NhbGl6ZWQ7CiB9CiAKIFN0cmluZyBCYXNl RGF0ZUFuZFRpbWVJbnB1dFR5cGU6OnZpc2libGVWYWx1ZSgpIGNvbnN0CiB7Ci0gICAgcmV0dXJu IGxvY2FsaXplVmFsdWUoZWxlbWVudCgpLnZhbHVlKCkpOworICAgIEFTU0VSVChlbGVtZW50KCkp OworICAgIHJldHVybiBsb2NhbGl6ZVZhbHVlKGVsZW1lbnQoKS0+dmFsdWUoKSk7CiB9CiAKIFN0 cmluZyBCYXNlRGF0ZUFuZFRpbWVJbnB1dFR5cGU6OnNhbml0aXplVmFsdWUoY29uc3QgU3RyaW5n JiBwcm9wb3NlZFZhbHVlKSBjb25zdApAQCAtMTgzLDEzICsxOTAsMTUgQEAgYm9vbCBCYXNlRGF0 ZUFuZFRpbWVJbnB1dFR5cGU6OnNob3VsZFJlc3BlY3RMaXN0QXR0cmlidXRlKCkKIAogYm9vbCBC YXNlRGF0ZUFuZFRpbWVJbnB1dFR5cGU6OnZhbHVlTWlzc2luZyhjb25zdCBTdHJpbmcmIHZhbHVl KSBjb25zdAogewotICAgIHJldHVybiBlbGVtZW50KCkuaXNSZXF1aXJlZCgpICYmIHZhbHVlLmlz RW1wdHkoKTsKKyAgICBBU1NFUlQoZWxlbWVudCgpKTsKKyAgICByZXR1cm4gZWxlbWVudCgpLT5p c1JlcXVpcmVkKCkgJiYgdmFsdWUuaXNFbXB0eSgpOwogfQogCiAjaWYgUExBVEZPUk0oSU9TKQog Ym9vbCBCYXNlRGF0ZUFuZFRpbWVJbnB1dFR5cGU6OmlzS2V5Ym9hcmRGb2N1c2FibGUoS2V5Ym9h cmRFdmVudCopIGNvbnN0CiB7Ci0gICAgcmV0dXJuICFlbGVtZW50KCkuaXNSZWFkT25seSgpICYm IGVsZW1lbnQoKS5pc1RleHRGb3JtQ29udHJvbEZvY3VzYWJsZSgpOworICAgIEFTU0VSVChlbGVt ZW50KCkpOworICAgIHJldHVybiAhZWxlbWVudCgpLT5pc1JlYWRPbmx5KCkgJiYgZWxlbWVudCgp LT5pc1RleHRGb3JtQ29udHJvbEZvY3VzYWJsZSgpOwogfQogI2VuZGlmCiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2h0bWwvRGF0ZUlucHV0VHlwZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9o dG1sL0RhdGVJbnB1dFR5cGUuY3BwCmluZGV4IDFlYjYxYjNmNzk4YzQ2Yzk3YjY0NjliNDhkN2I5 N2Q5ODZjN2ZlOWMuLjUxODhhZDM0NzEwZGRmYjQ2NDBjZTE5ZTBjMjBkMTc1NTUzY2ExYTEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvRGF0ZUlucHV0VHlwZS5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvaHRtbC9EYXRlSW5wdXRUeXBlLmNwcApAQCAtNjQsMTAgKzY0LDExIEBAIFN0 ZXBSYW5nZSBEYXRlSW5wdXRUeXBlOjpjcmVhdGVTdGVwUmFuZ2UoQW55U3RlcEhhbmRsaW5nIGFu eVN0ZXBIYW5kbGluZykgY29uc3QKIHsKICAgICBzdGF0aWMgTmV2ZXJEZXN0cm95ZWQ8Y29uc3Qg U3RlcFJhbmdlOjpTdGVwRGVzY3JpcHRpb24+IHN0ZXBEZXNjcmlwdGlvbihkYXRlRGVmYXVsdFN0 ZXAsIGRhdGVEZWZhdWx0U3RlcEJhc2UsIGRhdGVTdGVwU2NhbGVGYWN0b3IsIFN0ZXBSYW5nZTo6 UGFyc2VkU3RlcFZhbHVlU2hvdWxkQmVJbnRlZ2VyKTsKIAotICAgIGNvbnN0IERlY2ltYWwgc3Rl cEJhc2UgPSBwYXJzZVRvTnVtYmVyKGVsZW1lbnQoKS5hdHRyaWJ1dGVXaXRob3V0U3luY2hyb25p emF0aW9uKG1pbkF0dHIpLCAwKTsKLSAgICBjb25zdCBEZWNpbWFsIG1pbmltdW0gPSBwYXJzZVRv TnVtYmVyKGVsZW1lbnQoKS5hdHRyaWJ1dGVXaXRob3V0U3luY2hyb25pemF0aW9uKG1pbkF0dHIp LCBEZWNpbWFsOjpmcm9tRG91YmxlKERhdGVDb21wb25lbnRzOjptaW5pbXVtRGF0ZSgpKSk7Ci0g ICAgY29uc3QgRGVjaW1hbCBtYXhpbXVtID0gcGFyc2VUb051bWJlcihlbGVtZW50KCkuYXR0cmli dXRlV2l0aG91dFN5bmNocm9uaXphdGlvbihtYXhBdHRyKSwgRGVjaW1hbDo6ZnJvbURvdWJsZShE YXRlQ29tcG9uZW50czo6bWF4aW11bURhdGUoKSkpOwotICAgIGNvbnN0IERlY2ltYWwgc3RlcCA9 IFN0ZXBSYW5nZTo6cGFyc2VTdGVwKGFueVN0ZXBIYW5kbGluZywgc3RlcERlc2NyaXB0aW9uLCBl bGVtZW50KCkuYXR0cmlidXRlV2l0aG91dFN5bmNocm9uaXphdGlvbihzdGVwQXR0cikpOworICAg IEFTU0VSVChlbGVtZW50KCkpOworICAgIGNvbnN0IERlY2ltYWwgc3RlcEJhc2UgPSBwYXJzZVRv TnVtYmVyKGVsZW1lbnQoKS0+YXR0cmlidXRlV2l0aG91dFN5bmNocm9uaXphdGlvbihtaW5BdHRy KSwgMCk7CisgICAgY29uc3QgRGVjaW1hbCBtaW5pbXVtID0gcGFyc2VUb051bWJlcihlbGVtZW50 KCktPmF0dHJpYnV0ZVdpdGhvdXRTeW5jaHJvbml6YXRpb24obWluQXR0ciksIERlY2ltYWw6OmZy b21Eb3VibGUoRGF0ZUNvbXBvbmVudHM6Om1pbmltdW1EYXRlKCkpKTsKKyAgICBjb25zdCBEZWNp bWFsIG1heGltdW0gPSBwYXJzZVRvTnVtYmVyKGVsZW1lbnQoKS0+YXR0cmlidXRlV2l0aG91dFN5 bmNocm9uaXphdGlvbihtYXhBdHRyKSwgRGVjaW1hbDo6ZnJvbURvdWJsZShEYXRlQ29tcG9uZW50 czo6bWF4aW11bURhdGUoKSkpOworICAgIGNvbnN0IERlY2ltYWwgc3RlcCA9IFN0ZXBSYW5nZTo6 cGFyc2VTdGVwKGFueVN0ZXBIYW5kbGluZywgc3RlcERlc2NyaXB0aW9uLCBlbGVtZW50KCktPmF0 dHJpYnV0ZVdpdGhvdXRTeW5jaHJvbml6YXRpb24oc3RlcEF0dHIpKTsKICAgICByZXR1cm4gU3Rl cFJhbmdlKHN0ZXBCYXNlLCBSYW5nZUxpbWl0YXRpb25zOjpWYWxpZCwgbWluaW11bSwgbWF4aW11 bSwgc3RlcCwgc3RlcERlc2NyaXB0aW9uKTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvaHRtbC9EYXRlVGltZUxvY2FsSW5wdXRUeXBlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwv RGF0ZVRpbWVMb2NhbElucHV0VHlwZS5jcHAKaW5kZXggYmRjMzg1NzgzOTA5ZTYxZmRhNDVhNzdk Zjg5ZDFhYzJjMDI5YWI5NC4uNzRmNTg2NmIxNzA3NDBlZmQzNjI1MTFlYjJkYzNlMTlhYTFhYmM0 OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9EYXRlVGltZUxvY2FsSW5wdXRUeXBl LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0RhdGVUaW1lTG9jYWxJbnB1dFR5cGUuY3Bw CkBAIC03MiwxMCArNzIsMTEgQEAgU3RlcFJhbmdlIERhdGVUaW1lTG9jYWxJbnB1dFR5cGU6OmNy ZWF0ZVN0ZXBSYW5nZShBbnlTdGVwSGFuZGxpbmcgYW55U3RlcEhhbmRsaW4KIHsKICAgICBzdGF0 aWMgTmV2ZXJEZXN0cm95ZWQ8Y29uc3QgU3RlcFJhbmdlOjpTdGVwRGVzY3JpcHRpb24+IHN0ZXBE ZXNjcmlwdGlvbihkYXRlVGltZUxvY2FsRGVmYXVsdFN0ZXAsIGRhdGVUaW1lTG9jYWxEZWZhdWx0 U3RlcEJhc2UsIGRhdGVUaW1lTG9jYWxTdGVwU2NhbGVGYWN0b3IsIFN0ZXBSYW5nZTo6U2NhbGVk U3RlcFZhbHVlU2hvdWxkQmVJbnRlZ2VyKTsKIAotICAgIGNvbnN0IERlY2ltYWwgc3RlcEJhc2Ug PSBwYXJzZVRvTnVtYmVyKGVsZW1lbnQoKS5hdHRyaWJ1dGVXaXRob3V0U3luY2hyb25pemF0aW9u KG1pbkF0dHIpLCAwKTsKLSAgICBjb25zdCBEZWNpbWFsIG1pbmltdW0gPSBwYXJzZVRvTnVtYmVy KGVsZW1lbnQoKS5hdHRyaWJ1dGVXaXRob3V0U3luY2hyb25pemF0aW9uKG1pbkF0dHIpLCBEZWNp bWFsOjpmcm9tRG91YmxlKERhdGVDb21wb25lbnRzOjptaW5pbXVtRGF0ZVRpbWUoKSkpOwotICAg IGNvbnN0IERlY2ltYWwgbWF4aW11bSA9IHBhcnNlVG9OdW1iZXIoZWxlbWVudCgpLmF0dHJpYnV0 ZVdpdGhvdXRTeW5jaHJvbml6YXRpb24obWF4QXR0ciksIERlY2ltYWw6OmZyb21Eb3VibGUoRGF0 ZUNvbXBvbmVudHM6Om1heGltdW1EYXRlVGltZSgpKSk7Ci0gICAgY29uc3QgRGVjaW1hbCBzdGVw ID0gU3RlcFJhbmdlOjpwYXJzZVN0ZXAoYW55U3RlcEhhbmRsaW5nLCBzdGVwRGVzY3JpcHRpb24s IGVsZW1lbnQoKS5hdHRyaWJ1dGVXaXRob3V0U3luY2hyb25pemF0aW9uKHN0ZXBBdHRyKSk7Cisg ICAgQVNTRVJUKGVsZW1lbnQoKSk7CisgICAgY29uc3QgRGVjaW1hbCBzdGVwQmFzZSA9IHBhcnNl VG9OdW1iZXIoZWxlbWVudCgpLT5hdHRyaWJ1dGVXaXRob3V0U3luY2hyb25pemF0aW9uKG1pbkF0 dHIpLCAwKTsKKyAgICBjb25zdCBEZWNpbWFsIG1pbmltdW0gPSBwYXJzZVRvTnVtYmVyKGVsZW1l bnQoKS0+YXR0cmlidXRlV2l0aG91dFN5bmNocm9uaXphdGlvbihtaW5BdHRyKSwgRGVjaW1hbDo6 ZnJvbURvdWJsZShEYXRlQ29tcG9uZW50czo6bWluaW11bURhdGVUaW1lKCkpKTsKKyAgICBjb25z dCBEZWNpbWFsIG1heGltdW0gPSBwYXJzZVRvTnVtYmVyKGVsZW1lbnQoKS0+YXR0cmlidXRlV2l0 aG91dFN5bmNocm9uaXphdGlvbihtYXhBdHRyKSwgRGVjaW1hbDo6ZnJvbURvdWJsZShEYXRlQ29t cG9uZW50czo6bWF4aW11bURhdGVUaW1lKCkpKTsKKyAgICBjb25zdCBEZWNpbWFsIHN0ZXAgPSBT dGVwUmFuZ2U6OnBhcnNlU3RlcChhbnlTdGVwSGFuZGxpbmcsIHN0ZXBEZXNjcmlwdGlvbiwgZWxl bWVudCgpLT5hdHRyaWJ1dGVXaXRob3V0U3luY2hyb25pemF0aW9uKHN0ZXBBdHRyKSk7CiAgICAg cmV0dXJuIFN0ZXBSYW5nZShzdGVwQmFzZSwgUmFuZ2VMaW1pdGF0aW9uczo6VmFsaWQsIG1pbmlt dW0sIG1heGltdW0sIHN0ZXAsIHN0ZXBEZXNjcmlwdGlvbik7CiB9CiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2h0bWwvTW9udGhJbnB1dFR5cGUuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRt bC9Nb250aElucHV0VHlwZS5jcHAKaW5kZXggMjJlZWFkYTMzNWU4MDQ5NTEwYjY0MTQ2MWU5YjM3 NGQ5NzYzYjg1Mi4uNTk3N2NhYTBhYjAwMWY3NTg4MDdmNTM0OTdhN2I1M2VmNTI2ZTc0ZiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9Nb250aElucHV0VHlwZS5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvaHRtbC9Nb250aElucHV0VHlwZS5jcHAKQEAgLTU5LDggKzU5LDkgQEAgRGF0 ZUNvbXBvbmVudHM6OlR5cGUgTW9udGhJbnB1dFR5cGU6OmRhdGVUeXBlKCkgY29uc3QKIAogZG91 YmxlIE1vbnRoSW5wdXRUeXBlOjp2YWx1ZUFzRGF0ZSgpIGNvbnN0CiB7CisgICAgQVNTRVJUKGVs ZW1lbnQoKSk7CiAgICAgRGF0ZUNvbXBvbmVudHMgZGF0ZTsKLSAgICBpZiAoIXBhcnNlVG9EYXRl Q29tcG9uZW50cyhlbGVtZW50KCkudmFsdWUoKSwgJmRhdGUpKQorICAgIGlmICghcGFyc2VUb0Rh dGVDb21wb25lbnRzKGVsZW1lbnQoKS0+dmFsdWUoKSwgJmRhdGUpKQogICAgICAgICByZXR1cm4g RGF0ZUNvbXBvbmVudHM6OmludmFsaWRNaWxsaXNlY29uZHMoKTsKICAgICBkb3VibGUgbXNlYyA9 IGRhdGUubWlsbGlzZWNvbmRzU2luY2VFcG9jaCgpOwogICAgIEFTU0VSVChzdGQ6OmlzZmluaXRl KG1zZWMpKTsKQEAgLTkyLDEwICs5MywxMSBAQCBTdGVwUmFuZ2UgTW9udGhJbnB1dFR5cGU6OmNy ZWF0ZVN0ZXBSYW5nZShBbnlTdGVwSGFuZGxpbmcgYW55U3RlcEhhbmRsaW5nKSBjb25zdAogewog ICAgIHN0YXRpYyBOZXZlckRlc3Ryb3llZDxjb25zdCBTdGVwUmFuZ2U6OlN0ZXBEZXNjcmlwdGlv bj4gc3RlcERlc2NyaXB0aW9uKG1vbnRoRGVmYXVsdFN0ZXAsIG1vbnRoRGVmYXVsdFN0ZXBCYXNl LCBtb250aFN0ZXBTY2FsZUZhY3RvciwgU3RlcFJhbmdlOjpQYXJzZWRTdGVwVmFsdWVTaG91bGRC ZUludGVnZXIpOwogCi0gICAgY29uc3QgRGVjaW1hbCBzdGVwQmFzZSA9IHBhcnNlVG9OdW1iZXIo ZWxlbWVudCgpLmF0dHJpYnV0ZVdpdGhvdXRTeW5jaHJvbml6YXRpb24obWluQXR0ciksIERlY2lt YWw6OmZyb21Eb3VibGUobW9udGhEZWZhdWx0U3RlcEJhc2UpKTsKLSAgICBjb25zdCBEZWNpbWFs IG1pbmltdW0gPSBwYXJzZVRvTnVtYmVyKGVsZW1lbnQoKS5hdHRyaWJ1dGVXaXRob3V0U3luY2hy b25pemF0aW9uKG1pbkF0dHIpLCBEZWNpbWFsOjpmcm9tRG91YmxlKERhdGVDb21wb25lbnRzOjpt aW5pbXVtTW9udGgoKSkpOwotICAgIGNvbnN0IERlY2ltYWwgbWF4aW11bSA9IHBhcnNlVG9OdW1i ZXIoZWxlbWVudCgpLmF0dHJpYnV0ZVdpdGhvdXRTeW5jaHJvbml6YXRpb24obWF4QXR0ciksIERl Y2ltYWw6OmZyb21Eb3VibGUoRGF0ZUNvbXBvbmVudHM6Om1heGltdW1Nb250aCgpKSk7Ci0gICAg Y29uc3QgRGVjaW1hbCBzdGVwID0gU3RlcFJhbmdlOjpwYXJzZVN0ZXAoYW55U3RlcEhhbmRsaW5n LCBzdGVwRGVzY3JpcHRpb24sIGVsZW1lbnQoKS5hdHRyaWJ1dGVXaXRob3V0U3luY2hyb25pemF0 aW9uKHN0ZXBBdHRyKSk7CisgICAgQVNTRVJUKGVsZW1lbnQoKSk7CisgICAgY29uc3QgRGVjaW1h bCBzdGVwQmFzZSA9IHBhcnNlVG9OdW1iZXIoZWxlbWVudCgpLT5hdHRyaWJ1dGVXaXRob3V0U3lu Y2hyb25pemF0aW9uKG1pbkF0dHIpLCBEZWNpbWFsOjpmcm9tRG91YmxlKG1vbnRoRGVmYXVsdFN0 ZXBCYXNlKSk7CisgICAgY29uc3QgRGVjaW1hbCBtaW5pbXVtID0gcGFyc2VUb051bWJlcihlbGVt ZW50KCktPmF0dHJpYnV0ZVdpdGhvdXRTeW5jaHJvbml6YXRpb24obWluQXR0ciksIERlY2ltYWw6 OmZyb21Eb3VibGUoRGF0ZUNvbXBvbmVudHM6Om1pbmltdW1Nb250aCgpKSk7CisgICAgY29uc3Qg RGVjaW1hbCBtYXhpbXVtID0gcGFyc2VUb051bWJlcihlbGVtZW50KCktPmF0dHJpYnV0ZVdpdGhv dXRTeW5jaHJvbml6YXRpb24obWF4QXR0ciksIERlY2ltYWw6OmZyb21Eb3VibGUoRGF0ZUNvbXBv bmVudHM6Om1heGltdW1Nb250aCgpKSk7CisgICAgY29uc3QgRGVjaW1hbCBzdGVwID0gU3RlcFJh bmdlOjpwYXJzZVN0ZXAoYW55U3RlcEhhbmRsaW5nLCBzdGVwRGVzY3JpcHRpb24sIGVsZW1lbnQo KS0+YXR0cmlidXRlV2l0aG91dFN5bmNocm9uaXphdGlvbihzdGVwQXR0cikpOwogICAgIHJldHVy biBTdGVwUmFuZ2Uoc3RlcEJhc2UsIFJhbmdlTGltaXRhdGlvbnM6OlZhbGlkLCBtaW5pbXVtLCBt YXhpbXVtLCBzdGVwLCBzdGVwRGVzY3JpcHRpb24pOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9odG1sL1RpbWVJbnB1dFR5cGUuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9UaW1l SW5wdXRUeXBlLmNwcAppbmRleCA0ZmE0ODFkNGY4ZWVhNTVjNWZjY2E1ZGI0MDQzM2NhZTA3Nzk2 ZTlhLi4wNzk5MzljYzYzNWNlNzRiMzE5MThlZGYwYWNmZmJkOTJhNWE3YTQzIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9odG1sL1RpbWVJbnB1dFR5cGUuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL2h0bWwvVGltZUlucHV0VHlwZS5jcHAKQEAgLTc5LDEwICs3OSwxMSBAQCBTdGVwUmFuZ2Ug VGltZUlucHV0VHlwZTo6Y3JlYXRlU3RlcFJhbmdlKEFueVN0ZXBIYW5kbGluZyBhbnlTdGVwSGFu ZGxpbmcpIGNvbnN0CiB7CiAgICAgc3RhdGljIE5ldmVyRGVzdHJveWVkPGNvbnN0IFN0ZXBSYW5n ZTo6U3RlcERlc2NyaXB0aW9uPiBzdGVwRGVzY3JpcHRpb24odGltZURlZmF1bHRTdGVwLCB0aW1l RGVmYXVsdFN0ZXBCYXNlLCB0aW1lU3RlcFNjYWxlRmFjdG9yLCBTdGVwUmFuZ2U6OlNjYWxlZFN0 ZXBWYWx1ZVNob3VsZEJlSW50ZWdlcik7CiAKLSAgICBjb25zdCBEZWNpbWFsIHN0ZXBCYXNlID0g cGFyc2VUb051bWJlcihlbGVtZW50KCkuYXR0cmlidXRlV2l0aG91dFN5bmNocm9uaXphdGlvbiht aW5BdHRyKSwgMCk7Ci0gICAgY29uc3QgRGVjaW1hbCBtaW5pbXVtID0gcGFyc2VUb051bWJlcihl bGVtZW50KCkuYXR0cmlidXRlV2l0aG91dFN5bmNocm9uaXphdGlvbihtaW5BdHRyKSwgRGVjaW1h bDo6ZnJvbURvdWJsZShEYXRlQ29tcG9uZW50czo6bWluaW11bVRpbWUoKSkpOwotICAgIGNvbnN0 IERlY2ltYWwgbWF4aW11bSA9IHBhcnNlVG9OdW1iZXIoZWxlbWVudCgpLmF0dHJpYnV0ZVdpdGhv dXRTeW5jaHJvbml6YXRpb24obWF4QXR0ciksIERlY2ltYWw6OmZyb21Eb3VibGUoRGF0ZUNvbXBv bmVudHM6Om1heGltdW1UaW1lKCkpKTsKLSAgICBjb25zdCBEZWNpbWFsIHN0ZXAgPSBTdGVwUmFu Z2U6OnBhcnNlU3RlcChhbnlTdGVwSGFuZGxpbmcsIHN0ZXBEZXNjcmlwdGlvbiwgZWxlbWVudCgp LmF0dHJpYnV0ZVdpdGhvdXRTeW5jaHJvbml6YXRpb24oc3RlcEF0dHIpKTsKKyAgICBBU1NFUlQo ZWxlbWVudCgpKTsKKyAgICBjb25zdCBEZWNpbWFsIHN0ZXBCYXNlID0gcGFyc2VUb051bWJlcihl bGVtZW50KCktPmF0dHJpYnV0ZVdpdGhvdXRTeW5jaHJvbml6YXRpb24obWluQXR0ciksIDApOwor ICAgIGNvbnN0IERlY2ltYWwgbWluaW11bSA9IHBhcnNlVG9OdW1iZXIoZWxlbWVudCgpLT5hdHRy aWJ1dGVXaXRob3V0U3luY2hyb25pemF0aW9uKG1pbkF0dHIpLCBEZWNpbWFsOjpmcm9tRG91Ymxl KERhdGVDb21wb25lbnRzOjptaW5pbXVtVGltZSgpKSk7CisgICAgY29uc3QgRGVjaW1hbCBtYXhp bXVtID0gcGFyc2VUb051bWJlcihlbGVtZW50KCktPmF0dHJpYnV0ZVdpdGhvdXRTeW5jaHJvbml6 YXRpb24obWF4QXR0ciksIERlY2ltYWw6OmZyb21Eb3VibGUoRGF0ZUNvbXBvbmVudHM6Om1heGlt dW1UaW1lKCkpKTsKKyAgICBjb25zdCBEZWNpbWFsIHN0ZXAgPSBTdGVwUmFuZ2U6OnBhcnNlU3Rl cChhbnlTdGVwSGFuZGxpbmcsIHN0ZXBEZXNjcmlwdGlvbiwgZWxlbWVudCgpLT5hdHRyaWJ1dGVX aXRob3V0U3luY2hyb25pemF0aW9uKHN0ZXBBdHRyKSk7CiAgICAgcmV0dXJuIFN0ZXBSYW5nZShz dGVwQmFzZSwgUmFuZ2VMaW1pdGF0aW9uczo6VmFsaWQsIG1pbmltdW0sIG1heGltdW0sIHN0ZXAs IHN0ZXBEZXNjcmlwdGlvbik7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwv V2Vla0lucHV0VHlwZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL1dlZWtJbnB1dFR5cGUuY3Bw CmluZGV4IDczMThiNTkzNjNhZjMyMTVkZjBhM2I0ZDI2M2U1MzhjNWZlNDQ3ZjEuLmQ2Mzc5MGRl YWQyYjY0MDY2ZmZkMzY2OTI4NjllMmY4NTUzZWNkZjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2h0bWwvV2Vla0lucHV0VHlwZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9XZWVr SW5wdXRUeXBlLmNwcApAQCAtNTksMTAgKzU5LDExIEBAIFN0ZXBSYW5nZSBXZWVrSW5wdXRUeXBl OjpjcmVhdGVTdGVwUmFuZ2UoQW55U3RlcEhhbmRsaW5nIGFueVN0ZXBIYW5kbGluZykgY29uc3QK IHsKICAgICBzdGF0aWMgTmV2ZXJEZXN0cm95ZWQ8Y29uc3QgU3RlcFJhbmdlOjpTdGVwRGVzY3Jp cHRpb24+IHN0ZXBEZXNjcmlwdGlvbih3ZWVrRGVmYXVsdFN0ZXAsIHdlZWtEZWZhdWx0U3RlcEJh c2UsIHdlZWtTdGVwU2NhbGVGYWN0b3IsIFN0ZXBSYW5nZTo6UGFyc2VkU3RlcFZhbHVlU2hvdWxk QmVJbnRlZ2VyKTsKIAotICAgIGNvbnN0IERlY2ltYWwgc3RlcEJhc2UgPSBwYXJzZVRvTnVtYmVy KGVsZW1lbnQoKS5hdHRyaWJ1dGVXaXRob3V0U3luY2hyb25pemF0aW9uKG1pbkF0dHIpLCB3ZWVr RGVmYXVsdFN0ZXBCYXNlKTsKLSAgICBjb25zdCBEZWNpbWFsIG1pbmltdW0gPSBwYXJzZVRvTnVt YmVyKGVsZW1lbnQoKS5hdHRyaWJ1dGVXaXRob3V0U3luY2hyb25pemF0aW9uKG1pbkF0dHIpLCBE ZWNpbWFsOjpmcm9tRG91YmxlKERhdGVDb21wb25lbnRzOjptaW5pbXVtV2VlaygpKSk7Ci0gICAg Y29uc3QgRGVjaW1hbCBtYXhpbXVtID0gcGFyc2VUb051bWJlcihlbGVtZW50KCkuYXR0cmlidXRl V2l0aG91dFN5bmNocm9uaXphdGlvbihtYXhBdHRyKSwgRGVjaW1hbDo6ZnJvbURvdWJsZShEYXRl Q29tcG9uZW50czo6bWF4aW11bVdlZWsoKSkpOwotICAgIGNvbnN0IERlY2ltYWwgc3RlcCA9IFN0 ZXBSYW5nZTo6cGFyc2VTdGVwKGFueVN0ZXBIYW5kbGluZywgc3RlcERlc2NyaXB0aW9uLCBlbGVt ZW50KCkuYXR0cmlidXRlV2l0aG91dFN5bmNocm9uaXphdGlvbihzdGVwQXR0cikpOworICAgIEFT U0VSVChlbGVtZW50KCkpOworICAgIGNvbnN0IERlY2ltYWwgc3RlcEJhc2UgPSBwYXJzZVRvTnVt YmVyKGVsZW1lbnQoKS0+YXR0cmlidXRlV2l0aG91dFN5bmNocm9uaXphdGlvbihtaW5BdHRyKSwg d2Vla0RlZmF1bHRTdGVwQmFzZSk7CisgICAgY29uc3QgRGVjaW1hbCBtaW5pbXVtID0gcGFyc2VU b051bWJlcihlbGVtZW50KCktPmF0dHJpYnV0ZVdpdGhvdXRTeW5jaHJvbml6YXRpb24obWluQXR0 ciksIERlY2ltYWw6OmZyb21Eb3VibGUoRGF0ZUNvbXBvbmVudHM6Om1pbmltdW1XZWVrKCkpKTsK KyAgICBjb25zdCBEZWNpbWFsIG1heGltdW0gPSBwYXJzZVRvTnVtYmVyKGVsZW1lbnQoKS0+YXR0 cmlidXRlV2l0aG91dFN5bmNocm9uaXphdGlvbihtYXhBdHRyKSwgRGVjaW1hbDo6ZnJvbURvdWJs ZShEYXRlQ29tcG9uZW50czo6bWF4aW11bVdlZWsoKSkpOworICAgIGNvbnN0IERlY2ltYWwgc3Rl cCA9IFN0ZXBSYW5nZTo6cGFyc2VTdGVwKGFueVN0ZXBIYW5kbGluZywgc3RlcERlc2NyaXB0aW9u LCBlbGVtZW50KCktPmF0dHJpYnV0ZVdpdGhvdXRTeW5jaHJvbml6YXRpb24oc3RlcEF0dHIpKTsK ICAgICByZXR1cm4gU3RlcFJhbmdlKHN0ZXBCYXNlLCBSYW5nZUxpbWl0YXRpb25zOjpWYWxpZCwg bWluaW11bSwgbWF4aW11bSwgc3RlcCwgc3RlcERlc2NyaXB0aW9uKTsKIH0KIAo=