188793 2018-08-21 06:07:37 -0700 REGRESSION(r234981): It was not the main cause of the high CPU usage in the end (Requested by KaL on #webkit). 2018-08-21 06:12:39 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 188005 1 commit-queue commit-queue cgarcia mcatanzaro webkit-bug-importer oldest_to_newest 1452056 0 commit-queue 2018-08-21 06:07:37 -0700 https://trac.webkit.org/changeset/234981 broke the build: It was not the main cause of the high CPU usage in the end (Requested by KaL on #webkit). This is an automatic bug report generated by webkitbot. If this bug report was created because of a flaky test, please file a bug for the flaky test (if we don't already have one on file) and dup this bug against that bug so that we can track how often these flaky tests fail. 1452057 1 347636 commit-queue 2018-08-21 06:07:46 -0700 Created attachment 347636 ROLLOUT of r234981 Any committer can land this patch automatically by marking it commit-queue+. The commit-queue will build and test the patch before landing to ensure that the rollout will be successful. This process takes approximately 15 minutes. If you would like to land the rollout faster, you can use the following command: webkit-patch land-attachment ATTACHMENT_ID where ATTACHMENT_ID is the ID of this attachment. 1452058 2 347636 commit-queue 2018-08-21 06:11:01 -0700 Comment on attachment 347636 ROLLOUT of r234981 Clearing flags on attachment: 347636 Committed r235111: <https://trac.webkit.org/changeset/235111> 1452059 3 commit-queue 2018-08-21 06:11:03 -0700 All reviewed patches have been landed. Closing bug. 1452062 4 webkit-bug-importer 2018-08-21 06:12:39 -0700 <rdar://problem/43558545> 347636 2018-08-21 06:07:46 -0700 2018-08-21 06:11:01 -0700 ROLLOUT of r234981 bug-188793-20180821090746.patch text/plain 20312 commit-queue U3VidmVyc2lvbiBSZXZpc2lvbjogMjM1MTEwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDcyMWZkMzU5NjAxOTM4OWNi YTFmZmRjODY0MzIzZDI1NWFmYjIxOWYuLjQ3ZDIzZGFiYjhhMzRhYTkzMmE1ZGQ2MzE5YmNmZmJi YTFhNzgzOGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTgtMDgtMjEgIENvbW1pdCBR dWV1ZSAgPGNvbW1pdC1xdWV1ZUB3ZWJraXQub3JnPgorCisgICAgICAgIFVucmV2aWV3ZWQsIHJv bGxpbmcgb3V0IHIyMzQ5ODEuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xODg3OTMKKworICAgICAgICBJdCB3YXMgbm90IHRoZSBtYWluIGNhdXNlIG9m IHRoZSBoaWdoIENQVSB1c2FnZSBpbiB0aGUgZW5kCisgICAgICAgIChSZXF1ZXN0ZWQgYnkgS2FM IG9uICN3ZWJraXQpLgorCisgICAgICAgIFJldmVydGVkIGNoYW5nZXNldDoKKworICAgICAgICAi VW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjIzNDI1OS4iCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODgwMDUKKyAgICAgICAgaHR0cHM6Ly90cmFjLndl YmtpdC5vcmcvY2hhbmdlc2V0LzIzNDk4MQorCiAyMDE4LTA4LTIwICBNaWNoYWVsIENhdGFuemFy byAgPG1jYXRhbnphcm9AaWdhbGlhLmNvbT4KIAogICAgICAgICBVc2UgdW5pZmllZCBidWlsZCBm b3IgTmV0d29ya1Byb2Nlc3MKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL0Nvb3Jk aW5hdGVkR3JhcGhpY3MvdGhyZWFkZWRjb21wb3NpdG9yL1RocmVhZGVkQ29tcG9zaXRvci5jcHAg Yi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9Db29yZGluYXRlZEdyYXBoaWNzL3RocmVhZGVkY29tcG9z aXRvci9UaHJlYWRlZENvbXBvc2l0b3IuY3BwCmluZGV4IDZmMWZmMmM5M2U3YTYxOTg1M2EyYTY4 N2E4NjE4NmMxZDZhNTU3NTYuLjJjZGMxZmZiOWEzNzVhYTY1MDYzZDhlYzVkNmY1ZDBkOWI3ODFj MGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL0Nvb3JkaW5hdGVkR3JhcGhpY3Mv dGhyZWFkZWRjb21wb3NpdG9yL1RocmVhZGVkQ29tcG9zaXRvci5jcHAKKysrIGIvU291cmNlL1dl YktpdC9TaGFyZWQvQ29vcmRpbmF0ZWRHcmFwaGljcy90aHJlYWRlZGNvbXBvc2l0b3IvVGhyZWFk ZWRDb21wb3NpdG9yLmNwcApAQCAtNDUsMTggKzQ1LDE4IEBACiBuYW1lc3BhY2UgV2ViS2l0IHsK IHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogCi1SZWY8VGhyZWFkZWRDb21wb3NpdG9yPiBUaHJl YWRlZENvbXBvc2l0b3I6OmNyZWF0ZShDbGllbnQmIGNsaWVudCwgUGxhdGZvcm1EaXNwbGF5SUQg ZGlzcGxheUlELCBjb25zdCBJbnRTaXplJiB2aWV3cG9ydFNpemUsIGZsb2F0IHNjYWxlRmFjdG9y LCBTaG91bGREb0ZyYW1lU3luYyBkb0ZyYW1lU3luYywgVGV4dHVyZU1hcHBlcjo6UGFpbnRGbGFn cyBwYWludEZsYWdzKQorUmVmPFRocmVhZGVkQ29tcG9zaXRvcj4gVGhyZWFkZWRDb21wb3NpdG9y OjpjcmVhdGUoQ2xpZW50JiBjbGllbnQsIFRocmVhZGVkRGlzcGxheVJlZnJlc2hNb25pdG9yOjpD bGllbnQmIGRpc3BsYXlSZWZyZXNoTW9uaXRvckNsaWVudCwgUGxhdGZvcm1EaXNwbGF5SUQgZGlz cGxheUlELCBjb25zdCBJbnRTaXplJiB2aWV3cG9ydFNpemUsIGZsb2F0IHNjYWxlRmFjdG9yLCBT aG91bGREb0ZyYW1lU3luYyBkb0ZyYW1lU3luYywgVGV4dHVyZU1hcHBlcjo6UGFpbnRGbGFncyBw YWludEZsYWdzKQogewotICAgIHJldHVybiBhZG9wdFJlZigqbmV3IFRocmVhZGVkQ29tcG9zaXRv cihjbGllbnQsIGRpc3BsYXlJRCwgdmlld3BvcnRTaXplLCBzY2FsZUZhY3RvciwgZG9GcmFtZVN5 bmMsIHBhaW50RmxhZ3MpKTsKKyAgICByZXR1cm4gYWRvcHRSZWYoKm5ldyBUaHJlYWRlZENvbXBv c2l0b3IoY2xpZW50LCBkaXNwbGF5UmVmcmVzaE1vbml0b3JDbGllbnQsIGRpc3BsYXlJRCwgdmll d3BvcnRTaXplLCBzY2FsZUZhY3RvciwgZG9GcmFtZVN5bmMsIHBhaW50RmxhZ3MpKTsKIH0KIAot VGhyZWFkZWRDb21wb3NpdG9yOjpUaHJlYWRlZENvbXBvc2l0b3IoQ2xpZW50JiBjbGllbnQsIFBs YXRmb3JtRGlzcGxheUlEIGRpc3BsYXlJRCwgY29uc3QgSW50U2l6ZSYgdmlld3BvcnRTaXplLCBm bG9hdCBzY2FsZUZhY3RvciwgU2hvdWxkRG9GcmFtZVN5bmMgZG9GcmFtZVN5bmMsIFRleHR1cmVN YXBwZXI6OlBhaW50RmxhZ3MgcGFpbnRGbGFncykKK1RocmVhZGVkQ29tcG9zaXRvcjo6VGhyZWFk ZWRDb21wb3NpdG9yKENsaWVudCYgY2xpZW50LCBUaHJlYWRlZERpc3BsYXlSZWZyZXNoTW9uaXRv cjo6Q2xpZW50JiBkaXNwbGF5UmVmcmVzaE1vbml0b3JDbGllbnQsIFBsYXRmb3JtRGlzcGxheUlE IGRpc3BsYXlJRCwgY29uc3QgSW50U2l6ZSYgdmlld3BvcnRTaXplLCBmbG9hdCBzY2FsZUZhY3Rv ciwgU2hvdWxkRG9GcmFtZVN5bmMgZG9GcmFtZVN5bmMsIFRleHR1cmVNYXBwZXI6OlBhaW50Rmxh Z3MgcGFpbnRGbGFncykKICAgICA6IG1fY2xpZW50KGNsaWVudCkKICAgICAsIG1fZG9GcmFtZVN5 bmMoZG9GcmFtZVN5bmMpCiAgICAgLCBtX3BhaW50RmxhZ3MocGFpbnRGbGFncykKICAgICAsIG1f Y29tcG9zaXRpbmdSdW5Mb29wKHN0ZDo6bWFrZV91bmlxdWU8Q29tcG9zaXRpbmdSdW5Mb29wPihb dGhpc10geyByZW5kZXJMYXllclRyZWUoKTsgfSkpCiAjaWYgVVNFKFJFUVVFU1RfQU5JTUFUSU9O X0ZSQU1FX0RJU1BMQVlfTU9OSVRPUikKLSAgICAsIG1fZGlzcGxheVJlZnJlc2hNb25pdG9yKFRo cmVhZGVkRGlzcGxheVJlZnJlc2hNb25pdG9yOjpjcmVhdGUoZGlzcGxheUlELCAqdGhpcykpCisg ICAgLCBtX2Rpc3BsYXlSZWZyZXNoTW9uaXRvcihUaHJlYWRlZERpc3BsYXlSZWZyZXNoTW9uaXRv cjo6Y3JlYXRlKGRpc3BsYXlJRCwgZGlzcGxheVJlZnJlc2hNb25pdG9yQ2xpZW50KSkKICNlbmRp ZgogewogICAgIHsKQEAgLTMwNCwyMiArMzA0LDcgQEAgUmVmUHRyPFdlYkNvcmU6OkRpc3BsYXlS ZWZyZXNoTW9uaXRvcj4gVGhyZWFkZWRDb21wb3NpdG9yOjpkaXNwbGF5UmVmcmVzaE1vbml0b3IK ICAgICByZXR1cm4gbV9kaXNwbGF5UmVmcmVzaE1vbml0b3IuY29weVJlZigpOwogfQogCi12b2lk IFRocmVhZGVkQ29tcG9zaXRvcjo6cmVxdWVzdERpc3BsYXlSZWZyZXNoTW9uaXRvclVwZGF0ZSgp Ci17Ci0gICAgLy8gVGhpcyBpcyBpbnZva2VkIGJ5IFRocmVhZGVkRGlzcGxheVJlZnJlc2hNb25p dG9yIHdoZW4gYSBmcmVzaCB1cGRhdGUgaXMgcmVxdWlyZWQuCi0KLSAgICBMb2NrSG9sZGVyIHN0 YXRlTG9ja2VyKG1fY29tcG9zaXRpbmdSdW5Mb29wLT5zdGF0ZUxvY2soKSk7Ci0gICAgewotICAg ICAgICAvLyBjb29yZGluYXRlVXBkYXRlQ29tcGxldGlvbldpdGhDbGllbnQgaXMgc2V0IHRvIHRy dWUgaW4gb3JkZXIgdG8gZGVsYXkgdGhlIHNjZW5lIHVwZGF0ZQotICAgICAgICAvLyBjb21wbGV0 aW9uIHVudGlsIHRoZSBEaXNwbGF5UmVmcmVzaE1vbml0b3IgaXMgZmlyZWQgb24gdGhlIG1haW4g dGhyZWFkIGFmdGVyIHRoZSBjb21wb3NpdGlvbgotICAgICAgICAvLyBpcyBjb21wbGV0ZWQuCi0g ICAgICAgIExvY2tIb2xkZXIgbG9ja2VyKG1fYXR0cmlidXRlcy5sb2NrKTsKLSAgICAgICAgbV9h dHRyaWJ1dGVzLmNvb3JkaW5hdGVVcGRhdGVDb21wbGV0aW9uV2l0aENsaWVudCA9IHRydWU7Ci0g ICAgfQotICAgIG1fY29tcG9zaXRpbmdSdW5Mb29wLT5zY2hlZHVsZVVwZGF0ZShzdGF0ZUxvY2tl cik7Ci19Ci0KLXZvaWQgVGhyZWFkZWRDb21wb3NpdG9yOjpoYW5kbGVEaXNwbGF5UmVmcmVzaE1v bml0b3JVcGRhdGUoYm9vbCBoYXNCZWVuUmVzY2hlZHVsZWQpCit2b2lkIFRocmVhZGVkQ29tcG9z aXRvcjo6aGFuZGxlRGlzcGxheVJlZnJlc2hNb25pdG9yVXBkYXRlKCkKIHsKICAgICAvLyBSZXRy aWV2ZSBjb29yZGluYXRlVXBkYXRlQ29tcGxldGlvbldpdGhDbGllbnQuCiAgICAgYm9vbCBjb29y ZGluYXRlVXBkYXRlQ29tcGxldGlvbldpdGhDbGllbnQgeyBmYWxzZSB9OwpAQCAtMzI4LDEyICsz MTMsNiBAQCB2b2lkIFRocmVhZGVkQ29tcG9zaXRvcjo6aGFuZGxlRGlzcGxheVJlZnJlc2hNb25p dG9yVXBkYXRlKGJvb2wgaGFzQmVlblJlc2NoZWR1bAogICAgICAgICBjb29yZGluYXRlVXBkYXRl Q29tcGxldGlvbldpdGhDbGllbnQgPSBzdGQ6OmV4Y2hhbmdlKG1fYXR0cmlidXRlcy5jb29yZGlu YXRlVXBkYXRlQ29tcGxldGlvbldpdGhDbGllbnQsIGZhbHNlKTsKICAgICB9CiAKLSAgICAvLyBU aGUgY2xpZW50IGlzIGZpbmFsbHkgbm90aWZpZWQgYWJvdXQgdGhlIHNjZW5lIHVwZGF0ZSBuZWFy aW5nIGNvbXBsZXRpb24uIFRoZSBjbGllbnQgd2lsbCB1c2UgdGhpcwotICAgIC8vIG9wcG9ydHVu aXR5IHRvIGNsZWFuIHVwIHJlc291cmNlcyBhcyBhcHByb3ByaWF0ZS4gSXQgY2FuIGFsc28gcGVy Zm9ybSBhbnkgbGF5ZXIgZmx1c2ggdGhhdCB3YXMKLSAgICAvLyByZXF1ZXN0ZWQgZHVyaW5nIHRo ZSBjb21wb3NpdGlvbiwgb3IgYnkgYW55IERpc3BsYXlSZWZyZXNoTW9uaXRvciBub3RpZmljYXRp b25zIHRoYXQgaGF2ZSBiZWVuCi0gICAgLy8gaGFuZGxlZCBhdCB0aGlzIHBvaW50LgotICAgIG1f Y2xpZW50LnJlbmRlck5leHRGcmFtZSgpOwotCiAgICAgTG9ja0hvbGRlciBzdGF0ZUxvY2tlciht X2NvbXBvc2l0aW5nUnVuTG9vcC0+c3RhdGVMb2NrKCkpOwogCiAgICAgLy8gSWYgcmVxdWlyZWQs IG1hcmsgdGhlIGN1cnJlbnQgc2NlbmUgdXBkYXRlIGFzIGNvbXBsZXRlZC4gQ29tcG9zaXRpbmdS dW5Mb29wIHdpbGwgdGFrZSBjYXJlIG9mCkBAIC0zNDEsMTYgKzMyMCw2IEBAIHZvaWQgVGhyZWFk ZWRDb21wb3NpdG9yOjpoYW5kbGVEaXNwbGF5UmVmcmVzaE1vbml0b3JVcGRhdGUoYm9vbCBoYXNC ZWVuUmVzY2hlZHVsCiAgICAgLy8gb3IgRGlzcGxheVJlZnJlc2hNb25pdG9yIG5vdGlmaWNhdGlv bnMuCiAgICAgaWYgKGNvb3JkaW5hdGVVcGRhdGVDb21wbGV0aW9uV2l0aENsaWVudCkKICAgICAg ICAgbV9jb21wb3NpdGluZ1J1bkxvb3AtPnVwZGF0ZUNvbXBsZXRlZChzdGF0ZUxvY2tlcik7Ci0K LSAgICAvLyBJZiB0aGUgRGlzcGxheVJlZnJlc2hNb25pdG9yIHdhcyBzY2hlZHVsZWQgYWdhaW4s IHdlIGltbWVkaWF0ZWx5IGRlbWFuZCB0aGUgdXBkYXRlIGNvbXBsZXRpb24KLSAgICAvLyBjb29y ZGluYXRpb24gKGxpa2Ugd2UgZG8gaW4gcmVxdWVzdERpc3BsYXlSZWZyZXNoTW9uaXRvclVwZGF0 ZSgpKSBhbmQgcmVxdWVzdCBhbiB1cGRhdGUuCi0gICAgaWYgKGhhc0JlZW5SZXNjaGVkdWxlZCkg ewotICAgICAgICB7Ci0gICAgICAgICAgICBMb2NrSG9sZGVyIGxvY2tlcihtX2F0dHJpYnV0ZXMu bG9jayk7Ci0gICAgICAgICAgICBtX2F0dHJpYnV0ZXMuY29vcmRpbmF0ZVVwZGF0ZUNvbXBsZXRp b25XaXRoQ2xpZW50ID0gdHJ1ZTsKLSAgICAgICAgfQotICAgICAgICBtX2NvbXBvc2l0aW5nUnVu TG9vcC0+c2NoZWR1bGVVcGRhdGUoc3RhdGVMb2NrZXIpOwotICAgIH0KIH0KICNlbmRpZgogCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9Db29yZGluYXRlZEdyYXBoaWNzL3RocmVh ZGVkY29tcG9zaXRvci9UaHJlYWRlZENvbXBvc2l0b3IuaCBiL1NvdXJjZS9XZWJLaXQvU2hhcmVk L0Nvb3JkaW5hdGVkR3JhcGhpY3MvdGhyZWFkZWRjb21wb3NpdG9yL1RocmVhZGVkQ29tcG9zaXRv ci5oCmluZGV4IDAzN2ZkNzcwYzQzMTJhOWVjODAxNjkwMzNjMWRlOTMxM2QxZWM5YjcuLjQyYjI0 NmQyYjA2OWQ2NDFiNzM5YmQ1YzgzMWNlZWUzZTU5ZGVlZTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvU2hhcmVkL0Nvb3JkaW5hdGVkR3JhcGhpY3MvdGhyZWFkZWRjb21wb3NpdG9yL1RocmVh ZGVkQ29tcG9zaXRvci5oCisrKyBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL0Nvb3JkaW5hdGVkR3Jh cGhpY3MvdGhyZWFkZWRjb21wb3NpdG9yL1RocmVhZGVkQ29tcG9zaXRvci5oCkBAIC0zOSwxNCAr MzksMTMgQEAKICNpbmNsdWRlIDx3dGYvVGhyZWFkU2FmZVJlZkNvdW50ZWQuaD4KIAogI2lmIFVT RShSRVFVRVNUX0FOSU1BVElPTl9GUkFNRV9ESVNQTEFZX01PTklUT1IpCi0jaW5jbHVkZSA8V2Vi Q29yZS9EaXNwbGF5UmVmcmVzaE1vbml0b3IuaD4KKyNpbmNsdWRlICJUaHJlYWRlZERpc3BsYXlS ZWZyZXNoTW9uaXRvci5oIgogI2VuZGlmCiAKIG5hbWVzcGFjZSBXZWJLaXQgewogCiBjbGFzcyBD b29yZGluYXRlZEdyYXBoaWNzU2NlbmU7CiBjbGFzcyBDb29yZGluYXRlZEdyYXBoaWNzU2NlbmVD bGllbnQ7Ci1jbGFzcyBUaHJlYWRlZERpc3BsYXlSZWZyZXNoTW9uaXRvcjsKIAogY2xhc3MgVGhy ZWFkZWRDb21wb3NpdG9yIDogcHVibGljIENvb3JkaW5hdGVkR3JhcGhpY3NTY2VuZUNsaWVudCwg cHVibGljIFRocmVhZFNhZmVSZWZDb3VudGVkPFRocmVhZGVkQ29tcG9zaXRvcj4gewogICAgIFdU Rl9NQUtFX05PTkNPUFlBQkxFKFRocmVhZGVkQ29tcG9zaXRvcik7CkBAIC01NCw4ICs1Myw2IEBA IGNsYXNzIFRocmVhZGVkQ29tcG9zaXRvciA6IHB1YmxpYyBDb29yZGluYXRlZEdyYXBoaWNzU2Nl bmVDbGllbnQsIHB1YmxpYyBUaHJlYWRTCiBwdWJsaWM6CiAgICAgY2xhc3MgQ2xpZW50IHsKICAg ICBwdWJsaWM6Ci0gICAgICAgIHZpcnR1YWwgdm9pZCByZW5kZXJOZXh0RnJhbWUoKSA9IDA7Ci0K ICAgICAgICAgdmlydHVhbCB1aW50NjRfdCBuYXRpdmVTdXJmYWNlSGFuZGxlRm9yQ29tcG9zaXRp bmcoKSA9IDA7CiAgICAgICAgIHZpcnR1YWwgdm9pZCBkaWREZXN0cm95R0xDb250ZXh0KCkgPSAw OwogCkBAIC02NSw3ICs2Miw3IEBAIHB1YmxpYzoKIAogICAgIGVudW0gY2xhc3MgU2hvdWxkRG9G cmFtZVN5bmMgeyBObywgWWVzIH07CiAKLSAgICBzdGF0aWMgUmVmPFRocmVhZGVkQ29tcG9zaXRv cj4gY3JlYXRlKENsaWVudCYsIFdlYkNvcmU6OlBsYXRmb3JtRGlzcGxheUlELCBjb25zdCBXZWJD b3JlOjpJbnRTaXplJiwgZmxvYXQgc2NhbGVGYWN0b3IsIFNob3VsZERvRnJhbWVTeW5jID0gU2hv dWxkRG9GcmFtZVN5bmM6OlllcywgV2ViQ29yZTo6VGV4dHVyZU1hcHBlcjo6UGFpbnRGbGFncyA9 IDApOworICAgIHN0YXRpYyBSZWY8VGhyZWFkZWRDb21wb3NpdG9yPiBjcmVhdGUoQ2xpZW50Jiwg VGhyZWFkZWREaXNwbGF5UmVmcmVzaE1vbml0b3I6OkNsaWVudCYsIFdlYkNvcmU6OlBsYXRmb3Jt RGlzcGxheUlELCBjb25zdCBXZWJDb3JlOjpJbnRTaXplJiwgZmxvYXQgc2NhbGVGYWN0b3IsIFNo b3VsZERvRnJhbWVTeW5jID0gU2hvdWxkRG9GcmFtZVN5bmM6OlllcywgV2ViQ29yZTo6VGV4dHVy ZU1hcHBlcjo6UGFpbnRGbGFncyA9IDApOwogICAgIHZpcnR1YWwgflRocmVhZGVkQ29tcG9zaXRv cigpOwogCiAgICAgdm9pZCBzZXROYXRpdmVTdXJmYWNlSGFuZGxlRm9yQ29tcG9zaXRpbmcodWlu dDY0X3QpOwpAQCAtODIsMTQgKzc5LDEzIEBAIHB1YmxpYzoKIAogI2lmIFVTRShSRVFVRVNUX0FO SU1BVElPTl9GUkFNRV9ESVNQTEFZX01PTklUT1IpCiAgICAgUmVmUHRyPFdlYkNvcmU6OkRpc3Bs YXlSZWZyZXNoTW9uaXRvcj4gZGlzcGxheVJlZnJlc2hNb25pdG9yKFdlYkNvcmU6OlBsYXRmb3Jt RGlzcGxheUlEKTsKLSAgICB2b2lkIHJlcXVlc3REaXNwbGF5UmVmcmVzaE1vbml0b3JVcGRhdGUo KTsKLSAgICB2b2lkIGhhbmRsZURpc3BsYXlSZWZyZXNoTW9uaXRvclVwZGF0ZShib29sIGhhc0Jl ZW5SZXNjaGVkdWxlZCk7CisgICAgdm9pZCBoYW5kbGVEaXNwbGF5UmVmcmVzaE1vbml0b3JVcGRh dGUoKTsKICNlbmRpZgogCiAgICAgdm9pZCBmcmFtZUNvbXBsZXRlKCk7CiAKIHByaXZhdGU6Ci0g ICAgVGhyZWFkZWRDb21wb3NpdG9yKENsaWVudCYsIFdlYkNvcmU6OlBsYXRmb3JtRGlzcGxheUlE LCBjb25zdCBXZWJDb3JlOjpJbnRTaXplJiwgZmxvYXQgc2NhbGVGYWN0b3IsIFNob3VsZERvRnJh bWVTeW5jLCBXZWJDb3JlOjpUZXh0dXJlTWFwcGVyOjpQYWludEZsYWdzKTsKKyAgICBUaHJlYWRl ZENvbXBvc2l0b3IoQ2xpZW50JiwgVGhyZWFkZWREaXNwbGF5UmVmcmVzaE1vbml0b3I6OkNsaWVu dCYsIFdlYkNvcmU6OlBsYXRmb3JtRGlzcGxheUlELCBjb25zdCBXZWJDb3JlOjpJbnRTaXplJiwg ZmxvYXQgc2NhbGVGYWN0b3IsIFNob3VsZERvRnJhbWVTeW5jLCBXZWJDb3JlOjpUZXh0dXJlTWFw cGVyOjpQYWludEZsYWdzKTsKIAogICAgIC8vIENvb3JkaW5hdGVkR3JhcGhpY3NTY2VuZUNsaWVu dAogICAgIHZvaWQgdXBkYXRlVmlld3BvcnQoKSBvdmVycmlkZTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvU2hhcmVkL0Nvb3JkaW5hdGVkR3JhcGhpY3MvdGhyZWFkZWRjb21wb3NpdG9yL1Ro cmVhZGVkRGlzcGxheVJlZnJlc2hNb25pdG9yLmNwcCBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL0Nv b3JkaW5hdGVkR3JhcGhpY3MvdGhyZWFkZWRjb21wb3NpdG9yL1RocmVhZGVkRGlzcGxheVJlZnJl c2hNb25pdG9yLmNwcAppbmRleCA1MTQ4N2I5OThjMzY5ZTIxY2M4MDlkMTg1YjMzZDA2ZjIxOGNk ZDFmLi5kMDg4ZjI4MTUyZDcxM2E2MTllMzYxMWE3ZTMxZGFmYWZmNzlkOTVkIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9Db29yZGluYXRlZEdyYXBoaWNzL3RocmVhZGVkY29tcG9z aXRvci9UaHJlYWRlZERpc3BsYXlSZWZyZXNoTW9uaXRvci5jcHAKKysrIGIvU291cmNlL1dlYktp dC9TaGFyZWQvQ29vcmRpbmF0ZWRHcmFwaGljcy90aHJlYWRlZGNvbXBvc2l0b3IvVGhyZWFkZWRE aXNwbGF5UmVmcmVzaE1vbml0b3IuY3BwCkBAIC0zNywxMCArMzcsMTAgQEAKIAogbmFtZXNwYWNl IFdlYktpdCB7CiAKLVRocmVhZGVkRGlzcGxheVJlZnJlc2hNb25pdG9yOjpUaHJlYWRlZERpc3Bs YXlSZWZyZXNoTW9uaXRvcihXZWJDb3JlOjpQbGF0Zm9ybURpc3BsYXlJRCBkaXNwbGF5SUQsIFRo cmVhZGVkQ29tcG9zaXRvciYgY29tcG9zaXRvcikKK1RocmVhZGVkRGlzcGxheVJlZnJlc2hNb25p dG9yOjpUaHJlYWRlZERpc3BsYXlSZWZyZXNoTW9uaXRvcihXZWJDb3JlOjpQbGF0Zm9ybURpc3Bs YXlJRCBkaXNwbGF5SUQsIENsaWVudCYgY2xpZW50KQogICAgIDogV2ViQ29yZTo6RGlzcGxheVJl ZnJlc2hNb25pdG9yKGRpc3BsYXlJRCkKICAgICAsIG1fZGlzcGxheVJlZnJlc2hUaW1lcihSdW5M b29wOjptYWluKCksIHRoaXMsICZUaHJlYWRlZERpc3BsYXlSZWZyZXNoTW9uaXRvcjo6ZGlzcGxh eVJlZnJlc2hDYWxsYmFjaykKLSAgICAsIG1fY29tcG9zaXRvcigmY29tcG9zaXRvcikKKyAgICAs IG1fY2xpZW50KCZjbGllbnQpCiB7CiAjaWYgVVNFKEdMSUJfRVZFTlRfTE9PUCkKICAgICBtX2Rp c3BsYXlSZWZyZXNoVGltZXIuc2V0UHJpb3JpdHkoUnVuTG9vcFNvdXJjZVByaW9yaXR5OjpEaXNw bGF5UmVmcmVzaE1vbml0b3JUaW1lcik7CkBAIC01MCw3ICs1MCw3IEBAIFRocmVhZGVkRGlzcGxh eVJlZnJlc2hNb25pdG9yOjpUaHJlYWRlZERpc3BsYXlSZWZyZXNoTW9uaXRvcihXZWJDb3JlOjpQ bGF0Zm9ybURpCiAKIGJvb2wgVGhyZWFkZWREaXNwbGF5UmVmcmVzaE1vbml0b3I6OnJlcXVlc3RS ZWZyZXNoQ2FsbGJhY2soKQogewotICAgIGlmICghbV9jb21wb3NpdG9yKQorICAgIGlmICghbV9j bGllbnQpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIGJvb2wgcHJldmlvdXNGcmFtZURv bmUgeyBmYWxzZSB9OwpAQCAtNjQsNyArNjQsNyBAQCBib29sIFRocmVhZGVkRGlzcGxheVJlZnJl c2hNb25pdG9yOjpyZXF1ZXN0UmVmcmVzaENhbGxiYWNrKCkKICAgICAvLyByZWZyZXNoIG5vdGlm aWNhdGlvbnMgdW5kZXIgVGhyZWFkZWREaXNwbGF5UmVmcmVzaE1vbml0b3I6OmRpc3BsYXlSZWZy ZXNoQ2FsbGJhY2soKS4KICAgICAvLyBBbnkgc3VjaCBzY2hlZHVsZSByZXF1ZXN0IGlzIGhhbmRs ZWQgaW4gdGhhdCBtZXRob2QgYWZ0ZXIgdGhlIG5vdGlmaWNhdGlvbnMuCiAgICAgaWYgKHByZXZp b3VzRnJhbWVEb25lKQotICAgICAgICBtX2NvbXBvc2l0b3ItPnJlcXVlc3REaXNwbGF5UmVmcmVz aE1vbml0b3JVcGRhdGUoKTsKKyAgICAgICAgbV9jbGllbnQtPnJlcXVlc3REaXNwbGF5UmVmcmVz aE1vbml0b3JVcGRhdGUoKTsKIAogICAgIHJldHVybiB0cnVlOwogfQpAQCAtNzcsNyArNzcsNyBA QCBib29sIFRocmVhZGVkRGlzcGxheVJlZnJlc2hNb25pdG9yOjpyZXF1aXJlc0Rpc3BsYXlSZWZy ZXNoQ2FsbGJhY2soKQogCiB2b2lkIFRocmVhZGVkRGlzcGxheVJlZnJlc2hNb25pdG9yOjpkaXNw YXRjaERpc3BsYXlSZWZyZXNoQ2FsbGJhY2soKQogewotICAgIGlmICghbV9jb21wb3NpdG9yKQor ICAgIGlmICghbV9jbGllbnQpCiAgICAgICAgIHJldHVybjsKICAgICBtX2Rpc3BsYXlSZWZyZXNo VGltZXIuc3RhcnRPbmVTaG90KDBfcyk7CiB9CkBAIC04NSw3ICs4NSw3IEBAIHZvaWQgVGhyZWFk ZWREaXNwbGF5UmVmcmVzaE1vbml0b3I6OmRpc3BhdGNoRGlzcGxheVJlZnJlc2hDYWxsYmFjaygp CiB2b2lkIFRocmVhZGVkRGlzcGxheVJlZnJlc2hNb25pdG9yOjppbnZhbGlkYXRlKCkKIHsKICAg ICBtX2Rpc3BsYXlSZWZyZXNoVGltZXIuc3RvcCgpOwotICAgIG1fY29tcG9zaXRvciA9IG51bGxw dHI7CisgICAgbV9jbGllbnQgPSBudWxscHRyOwogfQogCiB2b2lkIFRocmVhZGVkRGlzcGxheVJl ZnJlc2hNb25pdG9yOjpkaXNwbGF5UmVmcmVzaENhbGxiYWNrKCkKQEAgLTExMSw4ICsxMTEsOCBA QCB2b2lkIFRocmVhZGVkRGlzcGxheVJlZnJlc2hNb25pdG9yOjpkaXNwbGF5UmVmcmVzaENhbGxi YWNrKCkKICAgICAvLyBOb3RpZnkgdGhlIGNvbXBvc2l0b3IgYWJvdXQgdGhlIGNvbXBsZXRlZCBE aXNwbGF5UmVmcmVzaE1vbml0b3IgdXBkYXRlLCBwYXNzaW5nCiAgICAgLy8gYWxvbmcgaW5mb3Jt YXRpb24gYWJvdXQgYW55IHNjaGVkdWxlIHJlcXVlc3QgdGhhdCBtaWdodCBoYXZlIG9jY3VycmVk IGR1cmluZwogICAgIC8vIHRoZSBub3RpZmljYXRpb24gaGFuZGxpbmcuCi0gICAgaWYgKG1fY29t cG9zaXRvcikKLSAgICAgICAgbV9jb21wb3NpdG9yLT5oYW5kbGVEaXNwbGF5UmVmcmVzaE1vbml0 b3JVcGRhdGUoaGFzQmVlblJlc2NoZWR1bGVkKTsKKyAgICBpZiAobV9jbGllbnQpCisgICAgICAg IG1fY2xpZW50LT5oYW5kbGVEaXNwbGF5UmVmcmVzaE1vbml0b3JVcGRhdGUoaGFzQmVlblJlc2No ZWR1bGVkKTsKIH0KIAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L1NoYXJlZC9Db29yZGluYXRlZEdyYXBoaWNzL3RocmVhZGVkY29tcG9zaXRvci9UaHJl YWRlZERpc3BsYXlSZWZyZXNoTW9uaXRvci5oIGIvU291cmNlL1dlYktpdC9TaGFyZWQvQ29vcmRp bmF0ZWRHcmFwaGljcy90aHJlYWRlZGNvbXBvc2l0b3IvVGhyZWFkZWREaXNwbGF5UmVmcmVzaE1v bml0b3IuaAppbmRleCBkMGIwN2YzMTZlMzQ1Yjc1NWFjMjQwNmZmYTAxMDNmMjMyZWQyZmJkLi40 ODdlNjYwNzRmMjc5MzIxYmY4OWViYTNhYjllZjgwOTE0YTNkMzMzIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L1NoYXJlZC9Db29yZGluYXRlZEdyYXBoaWNzL3RocmVhZGVkY29tcG9zaXRvci9U aHJlYWRlZERpc3BsYXlSZWZyZXNoTW9uaXRvci5oCisrKyBiL1NvdXJjZS9XZWJLaXQvU2hhcmVk L0Nvb3JkaW5hdGVkR3JhcGhpY3MvdGhyZWFkZWRjb21wb3NpdG9yL1RocmVhZGVkRGlzcGxheVJl ZnJlc2hNb25pdG9yLmgKQEAgLTM2LDkgKzM2LDE1IEBAIGNsYXNzIFRocmVhZGVkQ29tcG9zaXRv cjsKIAogY2xhc3MgVGhyZWFkZWREaXNwbGF5UmVmcmVzaE1vbml0b3IgOiBwdWJsaWMgV2ViQ29y ZTo6RGlzcGxheVJlZnJlc2hNb25pdG9yIHsKIHB1YmxpYzoKLSAgICBzdGF0aWMgUmVmPFRocmVh ZGVkRGlzcGxheVJlZnJlc2hNb25pdG9yPiBjcmVhdGUoV2ViQ29yZTo6UGxhdGZvcm1EaXNwbGF5 SUQgZGlzcGxheUlELCBUaHJlYWRlZENvbXBvc2l0b3ImIGNvbXBvc2l0b3IpCisgICAgY2xhc3Mg Q2xpZW50IHsKKyAgICBwdWJsaWM6CisgICAgICAgIHZpcnR1YWwgdm9pZCByZXF1ZXN0RGlzcGxh eVJlZnJlc2hNb25pdG9yVXBkYXRlKCkgPSAwOworICAgICAgICB2aXJ0dWFsIHZvaWQgaGFuZGxl RGlzcGxheVJlZnJlc2hNb25pdG9yVXBkYXRlKGJvb2wpID0gMDsKKyAgICB9OworCisgICAgc3Rh dGljIFJlZjxUaHJlYWRlZERpc3BsYXlSZWZyZXNoTW9uaXRvcj4gY3JlYXRlKFdlYkNvcmU6OlBs YXRmb3JtRGlzcGxheUlEIGRpc3BsYXlJRCwgQ2xpZW50JiBjbGllbnQpCiAgICAgewotICAgICAg ICByZXR1cm4gYWRvcHRSZWYoKm5ldyBUaHJlYWRlZERpc3BsYXlSZWZyZXNoTW9uaXRvcihkaXNw bGF5SUQsIGNvbXBvc2l0b3IpKTsKKyAgICAgICAgcmV0dXJuIGFkb3B0UmVmKCpuZXcgVGhyZWFk ZWREaXNwbGF5UmVmcmVzaE1vbml0b3IoZGlzcGxheUlELCBjbGllbnQpKTsKICAgICB9CiAgICAg dmlydHVhbCB+VGhyZWFkZWREaXNwbGF5UmVmcmVzaE1vbml0b3IoKSA9IGRlZmF1bHQ7CiAKQEAg LTQ5LDExICs1NSwxMSBAQCBwdWJsaWM6CiAgICAgdm9pZCBpbnZhbGlkYXRlKCk7CiAKIHByaXZh dGU6Ci0gICAgVGhyZWFkZWREaXNwbGF5UmVmcmVzaE1vbml0b3IoV2ViQ29yZTo6UGxhdGZvcm1E aXNwbGF5SUQsIFRocmVhZGVkQ29tcG9zaXRvciYpOworICAgIFRocmVhZGVkRGlzcGxheVJlZnJl c2hNb25pdG9yKFdlYkNvcmU6OlBsYXRmb3JtRGlzcGxheUlELCBDbGllbnQmKTsKIAogICAgIHZv aWQgZGlzcGxheVJlZnJlc2hDYWxsYmFjaygpOwogICAgIFJ1bkxvb3A6OlRpbWVyPFRocmVhZGVk RGlzcGxheVJlZnJlc2hNb25pdG9yPiBtX2Rpc3BsYXlSZWZyZXNoVGltZXI7Ci0gICAgVGhyZWFk ZWRDb21wb3NpdG9yKiBtX2NvbXBvc2l0b3I7CisgICAgQ2xpZW50KiBtX2NsaWVudDsKIH07CiAK IH0gLy8gbmFtZXNwYWNlIFdlYktpdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9j ZXNzL1dlYlBhZ2UvQ29vcmRpbmF0ZWRHcmFwaGljcy9Db29yZGluYXRlZExheWVyVHJlZUhvc3Qu Y3BwIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvQ29vcmRpbmF0ZWRHcmFwaGlj cy9Db29yZGluYXRlZExheWVyVHJlZUhvc3QuY3BwCmluZGV4IDc1MTIzYzk3N2I2YzkyZjhjZGI0 M2Y3OTIwNjhlZTJhNWNlOTE4N2UuLjcwOTJmYzUzMjBiODFiYjk0ZDY2MDM2ODcyYmE5MGZiNDAz MjRmMGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL0Nvb3Jk aW5hdGVkR3JhcGhpY3MvQ29vcmRpbmF0ZWRMYXllclRyZWVIb3N0LmNwcAorKysgYi9Tb3VyY2Uv V2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9Db29yZGluYXRlZEdyYXBoaWNzL0Nvb3JkaW5hdGVk TGF5ZXJUcmVlSG9zdC5jcHAKQEAgLTE0NSw3ICsxNDUsNyBAQCB2b2lkIENvb3JkaW5hdGVkTGF5 ZXJUcmVlSG9zdDo6c2V0VmlzaWJsZUNvbnRlbnRzUmVjdChjb25zdCBGbG9hdFJlY3QmIHJlY3Qp CiAgICAgc2NoZWR1bGVMYXllckZsdXNoKCk7CiB9CiAKLXZvaWQgQ29vcmRpbmF0ZWRMYXllclRy ZWVIb3N0OjpyZW5kZXJOZXh0RnJhbWUoKQordm9pZCBDb29yZGluYXRlZExheWVyVHJlZUhvc3Q6 OnJlbmRlck5leHRGcmFtZShib29sIGZvcmNlUmVwYWludCkKIHsKICAgICBtX2lzV2FpdGluZ0Zv clJlbmRlcmVyID0gZmFsc2U7CiAgICAgYm9vbCBzY2hlZHVsZWRXaGlsZVdhaXRpbmdGb3JSZW5k ZXJlciA9IHN0ZDo6ZXhjaGFuZ2UobV9zY2hlZHVsZWRXaGlsZVdhaXRpbmdGb3JSZW5kZXJlciwg ZmFsc2UpOwpAQCAtMTY3LDggKzE2NywxMCBAQCB2b2lkIENvb3JkaW5hdGVkTGF5ZXJUcmVlSG9z dDo6cmVuZGVyTmV4dEZyYW1lKCkKICAgICAgICAgbV9mb3JjZVJlcGFpbnRBc3luYy5uZWVkc0Zy ZXNoRmx1c2ggPSBmYWxzZTsKICAgICB9CiAKLSAgICBpZiAoc2NoZWR1bGVkV2hpbGVXYWl0aW5n Rm9yUmVuZGVyZXIgfHwgbV9sYXllckZsdXNoVGltZXIuaXNBY3RpdmUoKSkgeworICAgIGlmIChz Y2hlZHVsZWRXaGlsZVdhaXRpbmdGb3JSZW5kZXJlciB8fCBtX2xheWVyRmx1c2hUaW1lci5pc0Fj dGl2ZSgpIHx8IGZvcmNlUmVwYWludCkgewogICAgICAgICBtX2xheWVyRmx1c2hUaW1lci5zdG9w KCk7CisgICAgICAgIGlmIChmb3JjZVJlcGFpbnQpCisgICAgICAgICAgICBtX2Nvb3JkaW5hdG9y LmZvcmNlRnJhbWVTeW5jKCk7CiAgICAgICAgIGxheWVyRmx1c2hUaW1lckZpcmVkKCk7CiAgICAg fQogfQpAQCAtMjA5LDYgKzIxMSwxNSBAQCB2b2lkIENvb3JkaW5hdGVkTGF5ZXJUcmVlSG9zdDo6 Y29tbWl0U2NlbmVTdGF0ZShjb25zdCBDb29yZGluYXRlZEdyYXBoaWNzU3RhdGUmCiAgICAgbV9p c1dhaXRpbmdGb3JSZW5kZXJlciA9IHRydWU7CiB9CiAKK3ZvaWQgQ29vcmRpbmF0ZWRMYXllclRy ZWVIb3N0OjpmbHVzaExheWVyc0FuZEZvcmNlUmVwYWludCgpCit7CisgICAgaWYgKG1fbGF5ZXJG bHVzaFRpbWVyLmlzQWN0aXZlKCkpCisgICAgICAgIG1fbGF5ZXJGbHVzaFRpbWVyLnN0b3AoKTsK KworICAgIG1fY29vcmRpbmF0b3IuZm9yY2VGcmFtZVN5bmMoKTsKKyAgICBsYXllckZsdXNoVGlt ZXJGaXJlZCgpOworfQorCiB2b2lkIENvb3JkaW5hdGVkTGF5ZXJUcmVlSG9zdDo6ZGV2aWNlT3JQ YWdlU2NhbGVGYWN0b3JDaGFuZ2VkKCkKIHsKICAgICBtX2Nvb3JkaW5hdG9yLmRldmljZU9yUGFn ZVNjYWxlRmFjdG9yQ2hhbmdlZCgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9j ZXNzL1dlYlBhZ2UvQ29vcmRpbmF0ZWRHcmFwaGljcy9Db29yZGluYXRlZExheWVyVHJlZUhvc3Qu aCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL0Nvb3JkaW5hdGVkR3JhcGhpY3Mv Q29vcmRpbmF0ZWRMYXllclRyZWVIb3N0LmgKaW5kZXggNTA2MWI3NWRkYTlkZWZiOGUzMWUzMTVl YWE2YjNkMTBmMzgwNmJmNi4uMGE4YmVjOGEzOTg2Y2VhMmE4MGRhNTA5OTJhYmEyYTgzMWMzNTM2 YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvQ29vcmRpbmF0 ZWRHcmFwaGljcy9Db29yZGluYXRlZExheWVyVHJlZUhvc3QuaAorKysgYi9Tb3VyY2UvV2ViS2l0 L1dlYlByb2Nlc3MvV2ViUGFnZS9Db29yZGluYXRlZEdyYXBoaWNzL0Nvb3JkaW5hdGVkTGF5ZXJU cmVlSG9zdC5oCkBAIC01OCw3ICs1OCw3IEBAIHByb3RlY3RlZDoKICAgICB2b2lkIHBhZ2VCYWNr Z3JvdW5kVHJhbnNwYXJlbmN5Q2hhbmdlZCgpIG92ZXJyaWRlOwogCiAgICAgdm9pZCBzZXRWaXNp YmxlQ29udGVudHNSZWN0KGNvbnN0IFdlYkNvcmU6OkZsb2F0UmVjdCYpOwotICAgIHZvaWQgcmVu ZGVyTmV4dEZyYW1lKCk7CisgICAgdm9pZCByZW5kZXJOZXh0RnJhbWUoYm9vbCk7CiAKICAgICBX ZWJDb3JlOjpHcmFwaGljc0xheWVyRmFjdG9yeSogZ3JhcGhpY3NMYXllckZhY3RvcnkoKSBvdmVy cmlkZTsKIApAQCAtNzEsNiArNzEsOCBAQCBwcm90ZWN0ZWQ6CiAgICAgdm9pZCBub3RpZnlGbHVz aFJlcXVpcmVkKCkgb3ZlcnJpZGUgeyBzY2hlZHVsZUxheWVyRmx1c2goKTsgfTsKICAgICB2b2lk IGNvbW1pdFNjZW5lU3RhdGUoY29uc3QgV2ViQ29yZTo6Q29vcmRpbmF0ZWRHcmFwaGljc1N0YXRl Jikgb3ZlcnJpZGU7CiAKKyAgICB2b2lkIGZsdXNoTGF5ZXJzQW5kRm9yY2VSZXBhaW50KCk7CisK IHByaXZhdGU6CiAgICAgdm9pZCBsYXllckZsdXNoVGltZXJGaXJlZCgpOwogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9Db29yZGluYXRlZEdyYXBoaWNzL1Ro cmVhZGVkQ29vcmRpbmF0ZWRMYXllclRyZWVIb3N0LmNwcCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJv Y2Vzcy9XZWJQYWdlL0Nvb3JkaW5hdGVkR3JhcGhpY3MvVGhyZWFkZWRDb29yZGluYXRlZExheWVy VHJlZUhvc3QuY3BwCmluZGV4IDU0MTk4NTFlMTEyNzA4YTYzYjM4NWNmZDY2ZDBjN2E0NjQxOTlm ZGMuLmQ5OWYxNmJjZTc1MDU5NzQ0OGIxZGE3OTc3OWJiMzU4ZGZkMzhmN2EgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL0Nvb3JkaW5hdGVkR3JhcGhpY3MvVGhy ZWFkZWRDb29yZGluYXRlZExheWVyVHJlZUhvc3QuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvV2Vi UHJvY2Vzcy9XZWJQYWdlL0Nvb3JkaW5hdGVkR3JhcGhpY3MvVGhyZWFkZWRDb29yZGluYXRlZExh eWVyVHJlZUhvc3QuY3BwCkBAIC03NywxMCArNzcsMTAgQEAgVGhyZWFkZWRDb29yZGluYXRlZExh eWVyVHJlZUhvc3Q6OlRocmVhZGVkQ29vcmRpbmF0ZWRMYXllclRyZWVIb3N0KFdlYlBhZ2UmIHdl YlAKICAgICAgICAgaWYgKG1fc3VyZmFjZS0+c2hvdWxkUGFpbnRNaXJyb3JlZCgpKQogICAgICAg ICAgICAgcGFpbnRGbGFncyB8PSBUZXh0dXJlTWFwcGVyOjpQYWludGluZ01pcnJvcmVkOwogCi0g ICAgICAgIG1fY29tcG9zaXRvciA9IFRocmVhZGVkQ29tcG9zaXRvcjo6Y3JlYXRlKG1fY29tcG9z aXRvckNsaWVudCwgY29tcG9zaXRpbmdEaXNwbGF5SUQsIHNjYWxlZFNpemUsIHNjYWxlRmFjdG9y LCBUaHJlYWRlZENvbXBvc2l0b3I6OlNob3VsZERvRnJhbWVTeW5jOjpZZXMsIHBhaW50RmxhZ3Mp OworICAgICAgICBtX2NvbXBvc2l0b3IgPSBUaHJlYWRlZENvbXBvc2l0b3I6OmNyZWF0ZShtX2Nv bXBvc2l0b3JDbGllbnQsIG1fY29tcG9zaXRvckNsaWVudCwgY29tcG9zaXRpbmdEaXNwbGF5SUQs IHNjYWxlZFNpemUsIHNjYWxlRmFjdG9yLCBUaHJlYWRlZENvbXBvc2l0b3I6OlNob3VsZERvRnJh bWVTeW5jOjpZZXMsIHBhaW50RmxhZ3MpOwogICAgICAgICBtX2xheWVyVHJlZUNvbnRleHQuY29u dGV4dElEID0gbV9zdXJmYWNlLT5zdXJmYWNlSUQoKTsKICAgICB9IGVsc2UKLSAgICAgICAgbV9j b21wb3NpdG9yID0gVGhyZWFkZWRDb21wb3NpdG9yOjpjcmVhdGUobV9jb21wb3NpdG9yQ2xpZW50 LCBjb21wb3NpdGluZ0Rpc3BsYXlJRCwgc2NhbGVkU2l6ZSwgc2NhbGVGYWN0b3IpOworICAgICAg ICBtX2NvbXBvc2l0b3IgPSBUaHJlYWRlZENvbXBvc2l0b3I6OmNyZWF0ZShtX2NvbXBvc2l0b3JD bGllbnQsIG1fY29tcG9zaXRvckNsaWVudCwgY29tcG9zaXRpbmdEaXNwbGF5SUQsIHNjYWxlZFNp emUsIHNjYWxlRmFjdG9yKTsKIAogICAgIG1fd2ViUGFnZS53aW5kb3dTY3JlZW5EaWRDaGFuZ2Uo Y29tcG9zaXRpbmdEaXNwbGF5SUQpOwogCkBAIC0xMDUsNiArMTA1LDIyIEBAIHZvaWQgVGhyZWFk ZWRDb29yZGluYXRlZExheWVyVHJlZUhvc3Q6OmZyYW1lQ29tcGxldGUoKQogICAgIG1fY29tcG9z aXRvci0+ZnJhbWVDb21wbGV0ZSgpOwogfQogCit2b2lkIFRocmVhZGVkQ29vcmRpbmF0ZWRMYXll clRyZWVIb3N0OjpyZXF1ZXN0RGlzcGxheVJlZnJlc2hNb25pdG9yVXBkYXRlKCkKK3sKKyAgICAv LyBGbHVzaCBsYXllcnMgdG8gY2F1c2UgYSByZXBhaW50LiBJZiBtX2lzV2FpdGluZ0ZvclJlbmRl cmVyIHdhcyB0cnVlIGF0IHRoaXMgcG9pbnQsIHRoZSBsYXllcgorICAgIC8vIGZsdXNoIHdvbid0 IGRvIGFueXRoaW5nLCBidXQgdGhhdCBtZWFucyB0aGVyZSdzIGEgcGFpbnRpbmcgb25nb2luZyB0 aGF0IHdpbGwgc2VuZCB0aGUKKyAgICAvLyBkaXNwbGF5IHJlZnJlc2ggbm90aWZpY2F0aW9uIHdo ZW4gaXQncyBkb25lLgorICAgIGZsdXNoTGF5ZXJzQW5kRm9yY2VSZXBhaW50KCk7Cit9CisKK3Zv aWQgVGhyZWFkZWRDb29yZGluYXRlZExheWVyVHJlZUhvc3Q6OmhhbmRsZURpc3BsYXlSZWZyZXNo TW9uaXRvclVwZGF0ZShib29sIGhhc0JlZW5SZXNjaGVkdWxlZCkKK3sKKyAgICAvLyBDYWxsIHJl bmRlck5leHRGcmFtZS4gSWYgaGFzQmVlblJlc2NoZWR1bGVkIGlzIHRydWUsIHRoZSBsYXllciBm bHVzaCB3aWxsIGZvcmNlIGEgcmVwYWludAorICAgIC8vIHRoYXQgd2lsbCBjYXVzZSB0aGUgZGlz cGxheSByZWZyZXNoIG5vdGlmaWNhdGlvbiB0byBjb21lLgorICAgIHJlbmRlck5leHRGcmFtZSho YXNCZWVuUmVzY2hlZHVsZWQpOworICAgIG1fY29tcG9zaXRvci0+aGFuZGxlRGlzcGxheVJlZnJl c2hNb25pdG9yVXBkYXRlKCk7Cit9CisKIHVpbnQ2NF90IFRocmVhZGVkQ29vcmRpbmF0ZWRMYXll clRyZWVIb3N0OjpuYXRpdmVTdXJmYWNlSGFuZGxlRm9yQ29tcG9zaXRpbmcoKQogewogICAgIGlm ICghbV9zdXJmYWNlKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBh Z2UvQ29vcmRpbmF0ZWRHcmFwaGljcy9UaHJlYWRlZENvb3JkaW5hdGVkTGF5ZXJUcmVlSG9zdC5o IGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvQ29vcmRpbmF0ZWRHcmFwaGljcy9U aHJlYWRlZENvb3JkaW5hdGVkTGF5ZXJUcmVlSG9zdC5oCmluZGV4IDYyOWRkYWY2MWE3MDI4MWZi MDg4ZWJjMWNmZjRmYzY4YWFlZTcxYTEuLjg3YTdkYTcxN2NkZDlhNGUxMTU4NWE3MjI0NWRjNmNl Y2UyZmI1YjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL0Nv b3JkaW5hdGVkR3JhcGhpY3MvVGhyZWFkZWRDb29yZGluYXRlZExheWVyVHJlZUhvc3QuaAorKysg Yi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9Db29yZGluYXRlZEdyYXBoaWNzL1Ro cmVhZGVkQ29vcmRpbmF0ZWRMYXllclRyZWVIb3N0LmgKQEAgLTMzLDYgKzMzLDcgQEAKICNpbmNs dWRlICJDb29yZGluYXRlZExheWVyVHJlZUhvc3QuaCIKICNpbmNsdWRlICJTaW1wbGVWaWV3cG9y dENvbnRyb2xsZXIuaCIKICNpbmNsdWRlICJUaHJlYWRlZENvbXBvc2l0b3IuaCIKKyNpbmNsdWRl ICJUaHJlYWRlZERpc3BsYXlSZWZyZXNoTW9uaXRvci5oIgogI2luY2x1ZGUgPHd0Zi9PcHRpb25T ZXQuaD4KIAogbmFtZXNwYWNlIFdlYkNvcmUgewpAQCAtNzEsNyArNzIsNyBAQCBwcml2YXRlOgog ICAgIHZvaWQgc2V0TmF0aXZlU3VyZmFjZUhhbmRsZUZvckNvbXBvc2l0aW5nKHVpbnQ2NF90KSBv dmVycmlkZTsKICNlbmRpZgogCi0gICAgY2xhc3MgQ29tcG9zaXRvckNsaWVudCBmaW5hbCA6IHB1 YmxpYyBUaHJlYWRlZENvbXBvc2l0b3I6OkNsaWVudCB7CisgICAgY2xhc3MgQ29tcG9zaXRvckNs aWVudCBmaW5hbCA6IHB1YmxpYyBUaHJlYWRlZENvbXBvc2l0b3I6OkNsaWVudCwgcHVibGljIFRo cmVhZGVkRGlzcGxheVJlZnJlc2hNb25pdG9yOjpDbGllbnQgIHsKICAgICAgICAgV1RGX01BS0Vf Tk9OQ09QWUFCTEUoQ29tcG9zaXRvckNsaWVudCk7CiAgICAgcHVibGljOgogICAgICAgICBDb21w b3NpdG9yQ2xpZW50KFRocmVhZGVkQ29vcmRpbmF0ZWRMYXllclRyZWVIb3N0JiBsYXllclRyZWVI b3N0KQpAQCAtODAsMTEgKzgxLDYgQEAgcHJpdmF0ZToKICAgICAgICAgfQogCiAgICAgcHJpdmF0 ZToKLSAgICAgICAgdm9pZCByZW5kZXJOZXh0RnJhbWUoKSBvdmVycmlkZQotICAgICAgICB7Ci0g ICAgICAgICAgICBtX2xheWVyVHJlZUhvc3QucmVuZGVyTmV4dEZyYW1lKCk7Ci0gICAgICAgIH0K LQogICAgICAgICB1aW50NjRfdCBuYXRpdmVTdXJmYWNlSGFuZGxlRm9yQ29tcG9zaXRpbmcoKSBv dmVycmlkZQogICAgICAgICB7CiAgICAgICAgICAgICByZXR1cm4gbV9sYXllclRyZWVIb3N0Lm5h dGl2ZVN1cmZhY2VIYW5kbGVGb3JDb21wb3NpdGluZygpOwpAQCAtMTA1LDYgKzEwMSwxNiBAQCBw cml2YXRlOgogICAgICAgICAgICAgbV9sYXllclRyZWVIb3N0LmRpZFJlbmRlckZyYW1lKCk7CiAg ICAgICAgIH0KIAorICAgICAgICB2b2lkIHJlcXVlc3REaXNwbGF5UmVmcmVzaE1vbml0b3JVcGRh dGUoKSBvdmVycmlkZQorICAgICAgICB7CisgICAgICAgICAgICBtX2xheWVyVHJlZUhvc3QucmVx dWVzdERpc3BsYXlSZWZyZXNoTW9uaXRvclVwZGF0ZSgpOworICAgICAgICB9CisKKyAgICAgICAg dm9pZCBoYW5kbGVEaXNwbGF5UmVmcmVzaE1vbml0b3JVcGRhdGUoYm9vbCBoYXNCZWVuUmVzY2hl ZHVsZWQpCisgICAgICAgIHsKKyAgICAgICAgICAgIG1fbGF5ZXJUcmVlSG9zdC5oYW5kbGVEaXNw bGF5UmVmcmVzaE1vbml0b3JVcGRhdGUoaGFzQmVlblJlc2NoZWR1bGVkKTsKKyAgICAgICAgfQor CiAgICAgICAgIFRocmVhZGVkQ29vcmRpbmF0ZWRMYXllclRyZWVIb3N0JiBtX2xheWVyVHJlZUhv c3Q7CiAgICAgfTsKIApAQCAtMTI1LDYgKzEzMSw4IEBAIHByaXZhdGU6CiAgICAgdm9pZCBkaWRE ZXN0cm95R0xDb250ZXh0KCk7CiAgICAgdm9pZCB3aWxsUmVuZGVyRnJhbWUoKTsKICAgICB2b2lk IGRpZFJlbmRlckZyYW1lKCk7CisgICAgdm9pZCByZXF1ZXN0RGlzcGxheVJlZnJlc2hNb25pdG9y VXBkYXRlKCk7CisgICAgdm9pZCBoYW5kbGVEaXNwbGF5UmVmcmVzaE1vbml0b3JVcGRhdGUoYm9v bCk7CiAKICAgICBlbnVtIGNsYXNzIERpc2NhcmRhYmxlU3luY0FjdGlvbnMgewogICAgICAgICBV cGRhdGVTaXplID0gMSA8PCAxLAo=