174148 2017-07-04 21:07:43 -0700 Use std::lock_guard instead of std::unique_lock if move semantics and try_lock is not necessary 2017-07-05 19:27:11 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ysuzuki ysuzuki commit-queue mark.lam saam oldest_to_newest 1325523 0 ysuzuki 2017-07-04 21:07:43 -0700 Use std::lock_guard instead of std::unique_lock if move semantics and try_lock is not necessary 1325525 1 314597 ysuzuki 2017-07-04 21:08:56 -0700 Created attachment 314597 Patch 1325739 2 314597 mark.lam 2017-07-05 13:35:14 -0700 Comment on attachment 314597 Patch r=me 1325871 3 314597 ysuzuki 2017-07-05 19:03:02 -0700 Comment on attachment 314597 Patch Thank you 1325883 4 314597 commit-queue 2017-07-05 19:27:09 -0700 Comment on attachment 314597 Patch Clearing flags on attachment: 314597 Committed r219179: <http://trac.webkit.org/changeset/219179> 1325884 5 commit-queue 2017-07-05 19:27:11 -0700 All reviewed patches have been landed. Closing bug. 314597 2017-07-04 21:08:56 -0700 2017-07-05 19:27:09 -0700 Patch bug-174148-20170705130855.patch text/plain 12412 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMjE5MTI0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDJkZTRmOGI0NTZkNmQ2ZWMzMGM2ODNh YmNkNTU4MjMxMGQ5NGNjZTcuLjVlZWU3ZDRjMGYzYTU3ZmIxMjI3YjhiNjBkYTlmMTk3MDdjMjdj MTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDUgKzEsMzcgQEAKIDIwMTctMDctMDQgIFl1c3VrZSBTdXp1a2kgIDx1dGF0 YW5lLnRlYUBnbWFpbC5jb20+CiAKKyAgICAgICAgVXNlIHN0ZDo6bG9ja19ndWFyZCBpbnN0ZWFk IG9mIHN0ZDo6dW5pcXVlX2xvY2sgaWYgbW92ZSBzZW1hbnRpY3MgYW5kIHRyeV9sb2NrIGlzIG5v dCBuZWNlc3NhcnkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTE3NDE0OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIEl0IGlzIG5vdCBuZWNlc3NhcnkgdG8gdXNlIHN0ZDo6dW5pcXVlX2xvY2sgaWYgd2UgZG8g bm90IHVzZSBhZGRpdGlvbmFsIGZlYXR1cmVzIGNvbXBhcmVkIHRvIHN0ZDo6bG9ja19ndWFyZC4K KworICAgICAgICAoV1RGOjpUaHJlYWRIb2xkZXI6OmdldCk6CisgICAgICAgIChXVEY6OlRocmVh ZEhvbGRlcjo6aW5pdGlhbGl6ZSk6CisgICAgICAgIChXVEY6OlRocmVhZEhvbGRlcjo6ZGVzdHJ1 Y3QpOgorICAgICAgICAqIHd0Zi9UaHJlYWRpbmcuY3BwOgorICAgICAgICAoV1RGOjpUaHJlYWQ6 OmRpZEV4aXQpOgorICAgICAgICAqIHd0Zi9UaHJlYWRpbmdQdGhyZWFkcy5jcHA6CisgICAgICAg IChXVEY6OlRocmVhZDo6Y2hhbmdlUHJpb3JpdHkpOgorICAgICAgICAoV1RGOjpUaHJlYWQ6Ondh aXRGb3JDb21wbGV0aW9uKToKKyAgICAgICAgKFdURjo6VGhyZWFkOjpkZXRhY2gpOgorICAgICAg ICAoV1RGOjpUaHJlYWQ6OnNpZ25hbCk6CisgICAgICAgIChXVEY6OlRocmVhZDo6cmVzdW1lKToK KyAgICAgICAgKFdURjo6VGhyZWFkOjpnZXRSZWdpc3RlcnMpOgorICAgICAgICAoV1RGOjpUaHJl YWQ6OmVzdGFibGlzaCk6CisgICAgICAgICogd3RmL1RocmVhZGluZ1dpbi5jcHA6CisgICAgICAg IChXVEY6OlRocmVhZDo6Y2hhbmdlUHJpb3JpdHkpOgorICAgICAgICAoV1RGOjpUaHJlYWQ6Ondh aXRGb3JDb21wbGV0aW9uKToKKyAgICAgICAgKFdURjo6VGhyZWFkOjpkZXRhY2gpOgorICAgICAg ICAoV1RGOjpUaHJlYWQ6OnJlc3VtZSk6CisgICAgICAgIChXVEY6OlRocmVhZDo6Z2V0UmVnaXN0 ZXJzKToKKyAgICAgICAgKFdURjo6VGhyZWFkOjplc3RhYmxpc2gpOgorICAgICAgICAqIHd0Zi9X b3JkTG9jay5jcHA6CisgICAgICAgIChXVEY6OldvcmRMb2NrQmFzZTo6dW5sb2NrU2xvdyk6CisK KzIwMTctMDctMDQgIFl1c3VrZSBTdXp1a2kgIDx1dGF0YW5lLnRlYUBnbWFpbC5jb20+CisKICAg ICAgICAgW1dURl0gTWFrZSBkb3VibGUtY29udmVyc2lvbidzIGNhY2hlIGRhdGEgY29uc3RhbnQg YW5kIGRyb3AgZG91YmxlX2NvbnZlcnNpb246OmluaXRpYWxpemUoKQogICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc0MTI0CiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA4 YjRmMjYwM2IzNTliNGRiYzM4YTk5Y2IxNzFkNDZiMjM5MjI3OTcwLi4xMzkzYThhNWU0YmQyNzEx MjhiNGZlMzQzMjAxYzVmZDcwYTMwZTQyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFu Z2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIw MTctMDctMDQgIFl1c3VrZSBTdXp1a2kgIDx1dGF0YW5lLnRlYUBnbWFpbC5jb20+CisKKyAgICAg ICAgVXNlIHN0ZDo6bG9ja19ndWFyZCBpbnN0ZWFkIG9mIHN0ZDo6dW5pcXVlX2xvY2sgaWYgbW92 ZSBzZW1hbnRpY3MgYW5kIHRyeV9sb2NrIGlzIG5vdCBuZWNlc3NhcnkKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3NDE0OAorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvYXZm b3VuZGF0aW9uL0F1ZGlvU291cmNlUHJvdmlkZXJBVkZPYmpDLm1tOgorICAgICAgICAoV2ViQ29y ZTo6QXVkaW9Tb3VyY2VQcm92aWRlckFWRk9iakM6On5BdWRpb1NvdXJjZVByb3ZpZGVyQVZGT2Jq Qyk6CisKIDIwMTctMDctMDQgIEFudHRpIEtvaXZpc3RvICA8YW50dGlAYXBwbGUuY29tPgogCiAg ICAgICAgIFJlbmRlclRoZW1lQ29jb2E6Om1lZGlhQ29udHJvbHNGb3JtYXR0ZWRTdHJpbmdGb3JE dXJhdGlvbiBpcyBsZWFraW5nIE5TRGF0ZUNvbXBvbmVudHNGb3JtYXR0ZXJzCmRpZmYgLS1naXQg YS9Tb3VyY2UvV1RGL3d0Zi9UaHJlYWRIb2xkZXJXaW4uY3BwIGIvU291cmNlL1dURi93dGYvVGhy ZWFkSG9sZGVyV2luLmNwcAppbmRleCBhNTEwY2YyYTM4ZDRiZjE5MjdiOWI4Y2U5ZDU3ZDA1OTE2 ODcxNzQ2Li5jZWRkYTY1NjhmYzBiM2FiMTFlYWRmZDdkNjU0OGYyNmYxMTM3MzIyIDEwMDY0NAot LS0gYS9Tb3VyY2UvV1RGL3d0Zi9UaHJlYWRIb2xkZXJXaW4uY3BwCisrKyBiL1NvdXJjZS9XVEYv d3RmL1RocmVhZEhvbGRlcldpbi5jcHAKQEAgLTY2LDE0ICs2NiwxNCBAQCBUaHJlYWRIb2xkZXIq IFRocmVhZEhvbGRlcjo6Y3VycmVudCgpCiAgICAgfQogCiAgICAgLy8gQWZ0ZXIgRkxTIGlzIGRl c3Ryb3llZCwgdGhpcyBtYXAgb2ZmZXJzIHRoZSB2YWx1ZSB1bnRpbCB0aGUgc2Vjb25kIHRocmVh ZCBleGl0IGNhbGxiYWNrIGlzIGNhbGxlZC4KLSAgICBzdGQ6OnVuaXF1ZV9sb2NrPHN0ZDo6bXV0 ZXg+IGxvY2tlcih0aHJlYWRNYXBNdXRleCgpKTsKKyAgICBzdGQ6OmxvY2tfZ3VhcmQ8c3RkOjpt dXRleD4gbG9ja2VyKHRocmVhZE1hcE11dGV4KCkpOwogICAgIHJldHVybiB0aHJlYWRNYXAoKS5n ZXQoY3VycmVudFRocmVhZCgpKTsKIH0KIAogLy8gRklYTUU6IFJlbW92ZSB0aGlzIHdvcmthcm91 bmQgY29kZSBvbmNlIDxyZGFyOi8vcHJvYmxlbS8zMTc5MzIxMz4gaXMgZml4ZWQuCiBSZWZQdHI8 VGhyZWFkPiBUaHJlYWRIb2xkZXI6OmdldChUaHJlYWRJZGVudGlmaWVyIGlkKQogewotICAgIHN0 ZDo6dW5pcXVlX2xvY2s8c3RkOjptdXRleD4gbG9ja2VyKHRocmVhZE1hcE11dGV4KCkpOworICAg IHN0ZDo6bG9ja19ndWFyZDxzdGQ6Om11dGV4PiBsb2NrZXIodGhyZWFkTWFwTXV0ZXgoKSk7CiAg ICAgVGhyZWFkSG9sZGVyKiBob2xkZXIgPSB0aHJlYWRNYXAoKS5nZXQoaWQpOwogICAgIGlmICho b2xkZXIpCiAgICAgICAgIHJldHVybiAmaG9sZGVyLT50aHJlYWQoKTsKQEAgLTkzLDcgKzkzLDcg QEAgdm9pZCBUaHJlYWRIb2xkZXI6OmluaXRpYWxpemUoVGhyZWFkJiB0aHJlYWQsIFRocmVhZElk ZW50aWZpZXIgaWQpCiAKICAgICAgICAgLy8gU2luY2UgVGhyZWFkIGlzIG5vdCBlc3RhYmxpc2hl ZCB5ZXQsIHdlIHVzZSB0aGUgZ2l2ZW4gaWQgaW5zdGVhZCBvZiB0aHJlYWQtPmlkKCkuCiAgICAg ICAgIHsKLSAgICAgICAgICAgIHN0ZDo6dW5pcXVlX2xvY2s8c3RkOjptdXRleD4gbG9ja2VyKHRo cmVhZE1hcE11dGV4KCkpOworICAgICAgICAgICAgc3RkOjpsb2NrX2d1YXJkPHN0ZDo6bXV0ZXg+ IGxvY2tlcih0aHJlYWRNYXBNdXRleCgpKTsKICAgICAgICAgICAgIHRocmVhZE1hcCgpLmFkZChp ZCwgaG9sZGVyKTsKICAgICAgICAgfQogICAgIH0KQEAgLTEyNyw3ICsxMjcsNyBAQCB2b2lkIFRo cmVhZEhvbGRlcjo6ZGVzdHJ1Y3Qodm9pZCogZGF0YSkKIAogICAgIGlmIChob2xkZXItPm1faXNE ZXN0cm95ZWRPbmNlKSB7CiAgICAgICAgIHsKLSAgICAgICAgICAgIHN0ZDo6dW5pcXVlX2xvY2s8 c3RkOjptdXRleD4gbG9ja2VyKHRocmVhZE1hcE11dGV4KCkpOworICAgICAgICAgICAgc3RkOjps b2NrX2d1YXJkPHN0ZDo6bXV0ZXg+IGxvY2tlcih0aHJlYWRNYXBNdXRleCgpKTsKICAgICAgICAg ICAgIEFTU0VSVCh0aHJlYWRNYXAoKS5jb250YWlucyhob2xkZXItPm1fdGhyZWFkLT5pZCgpKSk7 CiAgICAgICAgICAgICB0aHJlYWRNYXAoKS5yZW1vdmUoaG9sZGVyLT5tX3RocmVhZC0+aWQoKSk7 CiAgICAgICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvd3RmL1RocmVhZGluZy5jcHAgYi9T b3VyY2UvV1RGL3d0Zi9UaHJlYWRpbmcuY3BwCmluZGV4IDhlMzU3MTA1NzlhYTdiMjBkZGM0MzQ4 OGQwZjJkMjNiMjBmMDc3YzEuLmJiYmM1NjQ1MGVlYWFhYmM3OTVhY2NmYTgzZTViODM4YmIzYmU5 MTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvd3RmL1RocmVhZGluZy5jcHAKKysrIGIvU291cmNl L1dURi93dGYvVGhyZWFkaW5nLmNwcApAQCAtMTEzLDcgKzExMyw3IEBAIFJlZlB0cjxUaHJlYWQ+ IFRocmVhZDo6Y3JlYXRlKGNvbnN0IGNoYXIqIG5hbWUsIEZ1bmN0aW9uPHZvaWQoKT4mJiBlbnRy eVBvaW50KQogCiB2b2lkIFRocmVhZDo6ZGlkRXhpdCgpCiB7Ci0gICAgc3RkOjp1bmlxdWVfbG9j azxzdGQ6Om11dGV4PiBsb2NrZXIobV9tdXRleCk7CisgICAgc3RkOjpsb2NrX2d1YXJkPHN0ZDo6 bXV0ZXg+IGxvY2tlcihtX211dGV4KTsKICAgICBtX2RpZEV4aXQgPSB0cnVlOwogfQogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV1RGL3d0Zi9UaHJlYWRpbmdQdGhyZWFkcy5jcHAgYi9Tb3VyY2UvV1RG L3d0Zi9UaHJlYWRpbmdQdGhyZWFkcy5jcHAKaW5kZXggZDZjMGExNzdhNjkwOGUxZGMwMTM4YTA2 OGMyYTExMGE5NDMyNWEyZi4uMzViZTg0NWIzZGE2OTlmZmUwMTA1Y2Q3OGZiOWE5ZjcwZDFhMjc3 NSAxMDA2NDQKLS0tIGEvU291cmNlL1dURi93dGYvVGhyZWFkaW5nUHRocmVhZHMuY3BwCisrKyBi L1NvdXJjZS9XVEYvd3RmL1RocmVhZGluZ1B0aHJlYWRzLmNwcApAQCAtMjQ5LDcgKzI0OSw3IEBA IHZvaWQgVGhyZWFkOjppbml0aWFsaXplQ3VycmVudFRocmVhZEludGVybmFsKGNvbnN0IGNoYXIq IHRocmVhZE5hbWUpCiAKIHZvaWQgVGhyZWFkOjpjaGFuZ2VQcmlvcml0eShpbnQgZGVsdGEpCiB7 Ci0gICAgc3RkOjp1bmlxdWVfbG9jazxzdGQ6Om11dGV4PiBsb2NrZXIobV9tdXRleCk7CisgICAg c3RkOjpsb2NrX2d1YXJkPHN0ZDo6bXV0ZXg+IGxvY2tlcihtX211dGV4KTsKIAogICAgIGludCBw b2xpY3k7CiAgICAgc3RydWN0IHNjaGVkX3BhcmFtIHBhcmFtOwpAQCAtMjY2LDcgKzI2Niw3IEBA IGludCBUaHJlYWQ6OndhaXRGb3JDb21wbGV0aW9uKCkKIHsKICAgICBwdGhyZWFkX3QgaGFuZGxl OwogICAgIHsKLSAgICAgICAgc3RkOjp1bmlxdWVfbG9jazxzdGQ6Om11dGV4PiBsb2NrZXIobV9t dXRleCk7CisgICAgICAgIHN0ZDo6bG9ja19ndWFyZDxzdGQ6Om11dGV4PiBsb2NrZXIobV9tdXRl eCk7CiAgICAgICAgIGhhbmRsZSA9IG1faGFuZGxlOwogICAgIH0KIApAQCAtMjc3LDcgKzI3Nyw3 IEBAIGludCBUaHJlYWQ6OndhaXRGb3JDb21wbGV0aW9uKCkKICAgICBlbHNlIGlmIChqb2luUmVz dWx0KQogICAgICAgICBMT0dfRVJST1IoIlRocmVhZElkZW50aWZpZXIgJXUgd2FzIHVuYWJsZSB0 byBiZSBqb2luZWQuXG4iLCBtX2lkKTsKIAotICAgIHN0ZDo6dW5pcXVlX2xvY2s8c3RkOjptdXRl eD4gbG9ja2VyKG1fbXV0ZXgpOworICAgIHN0ZDo6bG9ja19ndWFyZDxzdGQ6Om11dGV4PiBsb2Nr ZXIobV9tdXRleCk7CiAgICAgQVNTRVJUKGpvaW5hYmxlU3RhdGUoKSA9PSBKb2luYWJsZSk7CiAK ICAgICAvLyBJZiB0aGUgdGhyZWFkIGhhcyBhbHJlYWR5IGV4aXRlZCwgdGhlbiBkbyBub3RoaW5n LiBJZiB0aGUgdGhyZWFkIGhhc24ndCBleGl0ZWQgeWV0LCB0aGVuIGp1c3Qgc2lnbmFsIHRoYXQg d2UndmUgYWxyZWFkeSBqb2luZWQgb24gaXQuCkBAIC0yOTAsNyArMjkwLDcgQEAgaW50IFRocmVh ZDo6d2FpdEZvckNvbXBsZXRpb24oKQogCiB2b2lkIFRocmVhZDo6ZGV0YWNoKCkKIHsKLSAgICBz dGQ6OnVuaXF1ZV9sb2NrPHN0ZDo6bXV0ZXg+IGxvY2tlcihtX211dGV4KTsKKyAgICBzdGQ6Omxv Y2tfZ3VhcmQ8c3RkOjptdXRleD4gbG9ja2VyKG1fbXV0ZXgpOwogICAgIGludCBkZXRhY2hSZXN1 bHQgPSBwdGhyZWFkX2RldGFjaChtX2hhbmRsZSk7CiAgICAgaWYgKGRldGFjaFJlc3VsdCkKICAg ICAgICAgTE9HX0VSUk9SKCJUaHJlYWRJZGVudGlmaWVyICV1IHdhcyB1bmFibGUgdG8gYmUgZGV0 YWNoZWRcbiIsIG1faWQpOwpAQCAtMzI3LDcgKzMyNyw3IEBAIFRocmVhZElkZW50aWZpZXIgVGhy ZWFkOjpjdXJyZW50SUQoKQogCiBib29sIFRocmVhZDo6c2lnbmFsKGludCBzaWduYWxOdW1iZXIp CiB7Ci0gICAgc3RkOjp1bmlxdWVfbG9jazxzdGQ6Om11dGV4PiBsb2NrZXIobV9tdXRleCk7Cisg ICAgc3RkOjpsb2NrX2d1YXJkPHN0ZDo6bXV0ZXg+IGxvY2tlcihtX211dGV4KTsKICAgICBpZiAo aGFzRXhpdGVkKCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICBpbnQgZXJyTm8gPSBwdGhy ZWFkX2tpbGwobV9oYW5kbGUsIHNpZ25hbE51bWJlcik7CkBAIC0zMzcsNyArMzM3LDcgQEAgYm9v bCBUaHJlYWQ6OnNpZ25hbChpbnQgc2lnbmFsTnVtYmVyKQogYXV0byBUaHJlYWQ6OnN1c3BlbmQo KSAtPiBFeHBlY3RlZDx2b2lkLCBQbGF0Zm9ybVN1c3BlbmRFcnJvcj4KIHsKICAgICBSRUxFQVNF X0FTU0VSVF9XSVRIX01FU1NBR0UoaWQoKSAhPSBjdXJyZW50VGhyZWFkKCksICJXZSBkbyBub3Qg c3VwcG9ydCBzdXNwZW5kaW5nIHRoZSBjdXJyZW50IHRocmVhZCBpdHNlbGYuIik7Ci0gICAgc3Rk Ojp1bmlxdWVfbG9jazxzdGQ6Om11dGV4PiBsb2NrZXIobV9tdXRleCk7CisgICAgc3RkOjpsb2Nr X2d1YXJkPHN0ZDo6bXV0ZXg+IGxvY2tlcihtX211dGV4KTsKICNpZiBPUyhEQVJXSU4pCiAgICAg a2Vybl9yZXR1cm5fdCByZXN1bHQgPSB0aHJlYWRfc3VzcGVuZChtX3BsYXRmb3JtVGhyZWFkKTsK ICAgICBpZiAocmVzdWx0ICE9IEtFUk5fU1VDQ0VTUykKQEAgLTM3Miw3ICszNzIsNyBAQCBhdXRv IFRocmVhZDo6c3VzcGVuZCgpIC0+IEV4cGVjdGVkPHZvaWQsIFBsYXRmb3JtU3VzcGVuZEVycm9y PgogCiB2b2lkIFRocmVhZDo6cmVzdW1lKCkKIHsKLSAgICBzdGQ6OnVuaXF1ZV9sb2NrPHN0ZDo6 bXV0ZXg+IGxvY2tlcihtX211dGV4KTsKKyAgICBzdGQ6OmxvY2tfZ3VhcmQ8c3RkOjptdXRleD4g bG9ja2VyKG1fbXV0ZXgpOwogI2lmIE9TKERBUldJTikKICAgICB0aHJlYWRfcmVzdW1lKG1fcGxh dGZvcm1UaHJlYWQpOwogI2Vsc2UKQEAgLTQzNCw3ICs0MzQsNyBAQCBzdGF0aWMgVGhyZWFkU3Rh dGVNZXRhZGF0YSB0aHJlYWRTdGF0ZU1ldGFkYXRhKCkKIAogc2l6ZV90IFRocmVhZDo6Z2V0UmVn aXN0ZXJzKFBsYXRmb3JtUmVnaXN0ZXJzJiByZWdpc3RlcnMpCiB7Ci0gICAgc3RkOjp1bmlxdWVf bG9jazxzdGQ6Om11dGV4PiBsb2NrZXIobV9tdXRleCk7CisgICAgc3RkOjpsb2NrX2d1YXJkPHN0 ZDo6bXV0ZXg+IGxvY2tlcihtX211dGV4KTsKICNpZiBPUyhEQVJXSU4pCiAgICAgYXV0byBtZXRh ZGF0YSA9IHRocmVhZFN0YXRlTWV0YWRhdGEoKTsKICAgICBrZXJuX3JldHVybl90IHJlc3VsdCA9 IHRocmVhZF9nZXRfc3RhdGUobV9wbGF0Zm9ybVRocmVhZCwgbWV0YWRhdGEuZmxhdm9yLCAodGhy ZWFkX3N0YXRlX3QpJnJlZ2lzdGVycywgJm1ldGFkYXRhLnVzZXJDb3VudCk7CkBAIC00NTIsNyAr NDUyLDcgQEAgc2l6ZV90IFRocmVhZDo6Z2V0UmVnaXN0ZXJzKFBsYXRmb3JtUmVnaXN0ZXJzJiBy ZWdpc3RlcnMpCiAKIHZvaWQgVGhyZWFkOjplc3RhYmxpc2gocHRocmVhZF90IGhhbmRsZSkKIHsK LSAgICBzdGQ6OnVuaXF1ZV9sb2NrPHN0ZDo6bXV0ZXg+IGxvY2tlcihtX211dGV4KTsKKyAgICBz dGQ6OmxvY2tfZ3VhcmQ8c3RkOjptdXRleD4gbG9ja2VyKG1fbXV0ZXgpOwogICAgIG1faGFuZGxl ID0gaGFuZGxlOwogICAgIGlmICghbV9pZCkgewogICAgICAgICBzdGF0aWMgc3RkOjphdG9taWM8 VGhyZWFkSWRlbnRpZmllcj4gcHJvdmlkZXIgeyAwIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RG L3d0Zi9UaHJlYWRpbmdXaW4uY3BwIGIvU291cmNlL1dURi93dGYvVGhyZWFkaW5nV2luLmNwcApp bmRleCBiZDYxNWZiOTJjNjQyZTU4ZTBiYTFjNTc0Y2FjNGQ3NjgxZTlmMmZiLi5hN2MxYTg5MDE5 YjZhMDUyODk4NGYyYTBlOTFhZTZiZDMyMjY0Y2RjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL3d0 Zi9UaHJlYWRpbmdXaW4uY3BwCisrKyBiL1NvdXJjZS9XVEYvd3RmL1RocmVhZGluZ1dpbi5jcHAK QEAgLTE5MSw3ICsxOTEsNyBAQCBSZWZQdHI8VGhyZWFkPiBUaHJlYWQ6OmNyZWF0ZUludGVybmFs KFRocmVhZEZ1bmN0aW9uIGVudHJ5UG9pbnQsIHZvaWQqIGRhdGEsIGNvbgogCiB2b2lkIFRocmVh ZDo6Y2hhbmdlUHJpb3JpdHkoaW50IGRlbHRhKQogewotICAgIHN0ZDo6dW5pcXVlX2xvY2s8c3Rk OjptdXRleD4gbG9ja2VyKG1fbXV0ZXgpOworICAgIHN0ZDo6bG9ja19ndWFyZDxzdGQ6Om11dGV4 PiBsb2NrZXIobV9tdXRleCk7CiAgICAgU2V0VGhyZWFkUHJpb3JpdHkobV9oYW5kbGUsIFRIUkVB RF9QUklPUklUWV9OT1JNQUwgKyBkZWx0YSk7CiB9CiAKQEAgLTE5OSw3ICsxOTksNyBAQCBpbnQg VGhyZWFkOjp3YWl0Rm9yQ29tcGxldGlvbigpCiB7CiAgICAgSEFORExFIGhhbmRsZTsKICAgICB7 Ci0gICAgICAgIHN0ZDo6dW5pcXVlX2xvY2s8c3RkOjptdXRleD4gbG9ja2VyKG1fbXV0ZXgpOwor ICAgICAgICBzdGQ6OmxvY2tfZ3VhcmQ8c3RkOjptdXRleD4gbG9ja2VyKG1fbXV0ZXgpOwogICAg ICAgICBoYW5kbGUgPSBtX2hhbmRsZTsKICAgICB9CiAKQEAgLTIwNyw3ICsyMDcsNyBAQCBpbnQg VGhyZWFkOjp3YWl0Rm9yQ29tcGxldGlvbigpCiAgICAgaWYgKGpvaW5SZXN1bHQgPT0gV0FJVF9G QUlMRUQpCiAgICAgICAgIExPR19FUlJPUigiVGhyZWFkSWRlbnRpZmllciAldSB3YXMgZm91bmQg dG8gYmUgZGVhZGxvY2tlZCB0cnlpbmcgdG8gcXVpdCIsIG1faWQpOwogCi0gICAgc3RkOjp1bmlx dWVfbG9jazxzdGQ6Om11dGV4PiBsb2NrZXIobV9tdXRleCk7CisgICAgc3RkOjpsb2NrX2d1YXJk PHN0ZDo6bXV0ZXg+IGxvY2tlcihtX211dGV4KTsKICAgICBBU1NFUlQoam9pbmFibGVTdGF0ZSgp ID09IEpvaW5hYmxlKTsKIAogICAgIC8vIFRoZSB0aHJlYWQgaGFzIGFscmVhZHkgZXhpdGVkLCBk byBub3RoaW5nLgpAQCAtMjI5LDcgKzIyOSw3IEBAIHZvaWQgVGhyZWFkOjpkZXRhY2goKQogICAg IC8vIEZsc0NhbGxiYWNrIGF1dG9tYXRpY2FsbHkuIEZsc0NhbGxiYWNrIHdpbGwgY2FsbCBDbG9z ZUhhbmRsZSB0byBjbGVhbiB1cAogICAgIC8vIHJlc291cmNlLiBTbyBpbiB0aGlzIGZ1bmN0aW9u LCB3ZSBqdXN0IG1hcmsgdGhlIHRocmVhZCBhcyBkZXRhY2hlZCB0bwogICAgIC8vIGF2b2lkIGNh bGxpbmcgd2FpdEZvckNvbXBsZXRpb24gZm9yIHRoaXMgdGhyZWFkLgotICAgIHN0ZDo6dW5pcXVl X2xvY2s8c3RkOjptdXRleD4gbG9ja2VyKG1fbXV0ZXgpOworICAgIHN0ZDo6bG9ja19ndWFyZDxz dGQ6Om11dGV4PiBsb2NrZXIobV9tdXRleCk7CiAgICAgaWYgKCFoYXNFeGl0ZWQoKSkKICAgICAg ICAgZGlkQmVjb21lRGV0YWNoZWQoKTsKIH0KQEAgLTIzNyw3ICsyMzcsNyBAQCB2b2lkIFRocmVh ZDo6ZGV0YWNoKCkKIGF1dG8gVGhyZWFkOjpzdXNwZW5kKCkgLT4gRXhwZWN0ZWQ8dm9pZCwgUGxh dGZvcm1TdXNwZW5kRXJyb3I+CiB7CiAgICAgUkVMRUFTRV9BU1NFUlRfV0lUSF9NRVNTQUdFKGlk KCkgIT0gY3VycmVudFRocmVhZCgpLCAiV2UgZG8gbm90IHN1cHBvcnQgc3VzcGVuZGluZyB0aGUg Y3VycmVudCB0aHJlYWQgaXRzZWxmLiIpOwotICAgIHN0ZDo6dW5pcXVlX2xvY2s8c3RkOjptdXRl eD4gbG9ja2VyKG1fbXV0ZXgpOworICAgIHN0ZDo6bG9ja19ndWFyZDxzdGQ6Om11dGV4PiBsb2Nr ZXIobV9tdXRleCk7CiAgICAgRFdPUkQgcmVzdWx0ID0gU3VzcGVuZFRocmVhZChtX2hhbmRsZSk7 CiAgICAgaWYgKHJlc3VsdCAhPSAoRFdPUkQpLTEpCiAgICAgICAgIHJldHVybiB7IH07CkBAIC0y NDcsMTMgKzI0NywxMyBAQCBhdXRvIFRocmVhZDo6c3VzcGVuZCgpIC0+IEV4cGVjdGVkPHZvaWQs IFBsYXRmb3JtU3VzcGVuZEVycm9yPgogLy8gRHVyaW5nIHJlc3VtZSwgc3VzcGVuZCBvciByZXN1 bWUgc2hvdWxkIG5vdCBiZSBleGVjdXRlZCBmcm9tIHRoZSBvdGhlciB0aHJlYWRzLgogdm9pZCBU aHJlYWQ6OnJlc3VtZSgpCiB7Ci0gICAgc3RkOjp1bmlxdWVfbG9jazxzdGQ6Om11dGV4PiBsb2Nr ZXIobV9tdXRleCk7CisgICAgc3RkOjpsb2NrX2d1YXJkPHN0ZDo6bXV0ZXg+IGxvY2tlcihtX211 dGV4KTsKICAgICBSZXN1bWVUaHJlYWQobV9oYW5kbGUpOwogfQogCiBzaXplX3QgVGhyZWFkOjpn ZXRSZWdpc3RlcnMoUGxhdGZvcm1SZWdpc3RlcnMmIHJlZ2lzdGVycykKIHsKLSAgICBzdGQ6OnVu aXF1ZV9sb2NrPHN0ZDo6bXV0ZXg+IGxvY2tlcihtX211dGV4KTsKKyAgICBzdGQ6OmxvY2tfZ3Vh cmQ8c3RkOjptdXRleD4gbG9ja2VyKG1fbXV0ZXgpOwogICAgIHJlZ2lzdGVycy5Db250ZXh0Rmxh Z3MgPSBDT05URVhUX0lOVEVHRVIgfCBDT05URVhUX0NPTlRST0w7CiAgICAgR2V0VGhyZWFkQ29u dGV4dChtX2hhbmRsZSwgJnJlZ2lzdGVycyk7CiAgICAgcmV0dXJuIHNpemVvZihDT05URVhUKTsK QEAgLTI4NCw3ICsyODQsNyBAQCBUaHJlYWRJZGVudGlmaWVyIFRocmVhZDo6Y3VycmVudElEKCkK IAogdm9pZCBUaHJlYWQ6OmVzdGFibGlzaChIQU5ETEUgaGFuZGxlLCBUaHJlYWRJZGVudGlmaWVy IHRocmVhZElEKQogewotICAgIHN0ZDo6dW5pcXVlX2xvY2s8c3RkOjptdXRleD4gbG9ja2VyKG1f bXV0ZXgpOworICAgIHN0ZDo6bG9ja19ndWFyZDxzdGQ6Om11dGV4PiBsb2NrZXIobV9tdXRleCk7 CiAgICAgbV9oYW5kbGUgPSBoYW5kbGU7CiAgICAgbV9pZCA9IHRocmVhZElEOwogfQpkaWZmIC0t Z2l0IGEvU291cmNlL1dURi93dGYvV29yZExvY2suY3BwIGIvU291cmNlL1dURi93dGYvV29yZExv Y2suY3BwCmluZGV4IDQ2MTcwYWQyYzZmYmI1N2JlZWZmYzc1YWZlZWQ5YzEzN2Y2Y2QxODEuLjc3 NGZlYzM2OGE4NjYzODVjMzliMmYyZTUzMGFmMzVkZDBmY2FkYmUgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XVEYvd3RmL1dvcmRMb2NrLmNwcAorKysgYi9Tb3VyY2UvV1RGL3d0Zi9Xb3JkTG9jay5jcHAK QEAgLTI1Myw3ICsyNTMsNyBAQCBORVZFUl9JTkxJTkUgdm9pZCBXb3JkTG9ja0Jhc2U6OnVubG9j a1Nsb3coKQogICAgIC8vIFdlIGRvIHRoaXMgY2FyZWZ1bGx5IGJlY2F1c2UgdGhpcyBtYXkgcnVu IGVpdGhlciBiZWZvcmUgb3IgZHVyaW5nIHRoZSBwYXJraW5nTG9jayBjcml0aWNhbAogICAgIC8v IHNlY3Rpb24gaW4gbG9ja1Nsb3coKS4KICAgICB7Ci0gICAgICAgIHN0ZDo6dW5pcXVlX2xvY2s8 c3RkOjptdXRleD4gbG9ja2VyKHF1ZXVlSGVhZC0+cGFya2luZ0xvY2spOworICAgICAgICBzdGQ6 OmxvY2tfZ3VhcmQ8c3RkOjptdXRleD4gbG9ja2VyKHF1ZXVlSGVhZC0+cGFya2luZ0xvY2spOwog ICAgICAgICBxdWV1ZUhlYWQtPnNob3VsZFBhcmsgPSBmYWxzZTsKICAgICB9CiAgICAgLy8gRG9l c24ndCBtYXR0ZXIgaWYgd2Ugbm90aWZ5X2FsbCgpIG9yIG5vdGlmeV9vbmUoKSBoZXJlIHNpbmNl IHRoZSBvbmx5IHRocmVhZCB0aGF0IGNvdWxkIGJlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vQXVkaW9Tb3VyY2VQcm92aWRlckFWRk9i akMubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vQXVk aW9Tb3VyY2VQcm92aWRlckFWRk9iakMubW0KaW5kZXggNGU3YzdjZjAyMDRlNmI0ZDkxN2FhMDVi Zjg0Y2UwNzM2YWI4NzZiOC4uODFmNzIyZjk1YTg4OTJjN2QzMjZkNjExYjg1ZWRmOTVmNWJkMWQx OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0 aW9uL0F1ZGlvU291cmNlUHJvdmlkZXJBVkZPYmpDLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9BdWRpb1NvdXJjZVByb3ZpZGVyQVZGT2JqQy5t bQpAQCAtOTMsNyArOTMsNyBAQCBBdWRpb1NvdXJjZVByb3ZpZGVyQVZGT2JqQzo6fkF1ZGlvU291 cmNlUHJvdmlkZXJBVkZPYmpDKCkKIHsKICAgICBzZXRDbGllbnQobnVsbHB0cik7CiAgICAgaWYg KG1fdGFwU3RvcmFnZSkgewotICAgICAgICBzdGQ6OnVuaXF1ZV9sb2NrPExvY2s+IGxvY2sobV90 YXBTdG9yYWdlLT5tdXRleCk7CisgICAgICAgIHN0ZDo6bG9ja19ndWFyZDxMb2NrPiBsb2NrKG1f dGFwU3RvcmFnZS0+bXV0ZXgpOwogICAgICAgICBtX3RhcFN0b3JhZ2UtPl90aGlzID0gbnVsbHB0 cjsKICAgICAgICAgbV90YXBTdG9yYWdlID0gbnVsbHB0cjsKICAgICB9Cg==