171147 2017-04-21 16:06:00 -0700 [macOS] Name WebPlaybackControlsManager delegate methods correctly depending on OS version 2017-04-21 17:51:19 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 aestes aestes bdakin commit-queue mitz rniwa sam webkit-bug-importer wenson_hsieh oldest_to_newest 1299964 0 aestes 2017-04-21 16:06:00 -0700 [macOS] Name WebPlaybackControlsManager delegate methods correctly depending on OS version 1299967 1 307823 aestes 2017-04-21 16:10:34 -0700 Created attachment 307823 Patch 1299971 2 aestes 2017-04-21 16:11:26 -0700 rdar://problem/29875010 1300029 3 307823 commit-queue 2017-04-21 17:51:18 -0700 Comment on attachment 307823 Patch Clearing flags on attachment: 307823 Committed r215656: <http://trac.webkit.org/changeset/215656> 1300030 4 commit-queue 2017-04-21 17:51:19 -0700 All reviewed patches have been landed. Closing bug. 307823 2017-04-21 16:10:34 -0700 2017-04-21 17:51:18 -0700 Patch bug-171147-20170421161033.patch text/plain 14459 aestes U3VidmVyc2lvbiBSZXZpc2lvbjogMjE1NjEyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTVmZjQzMzc0MTIzY2Zl YjBhODM1YTJlYTE3MDQzODZlMzQ3YTQ2Zi4uZDU2MjNjMDNlYzQ2ZWIzNjEwODdlYmYyMGQyNWM5 YTUxNTUzOWNhNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ4IEBACisyMDE3LTA0LTIxICBBbmR5 IEVzdGVzICA8YWVzdGVzQGFwcGxlLmNvbT4KKworICAgICAgICBbbWFjT1NdIE5hbWUgV2ViUGxh eWJhY2tDb250cm9sc01hbmFnZXIgZGVsZWdhdGUgbWV0aG9kcyBjb3JyZWN0bHkgZGVwZW5kaW5n IG9uIE9TIHZlcnNpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTE3MTE0NworICAgICAgICA8cmRhcjovL3Byb2JsZW0vMjk4NzUwMTA+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgT24gbWFjT1MgMTAuMTIs IFdlYlBsYXliYWNrQ29udHJvbHNNYW5hZ2VyIGNvbmZvcm1zIHRvCisgICAgICAgIEFWRnVuY3Rp b25CYXJQbGF5YmFja0NvbnRyb2xzQ29udHJvbGxpbmcsIGJ1dCBvbiAxMC4xMyBpdCBjb25mb3Jt cyB0bworICAgICAgICBBVlRvdWNoQmFyUGxheWJhY2tDb250cm9sc0NvbnRyb2xsaW5nLiBUaGVz ZSBwcm90b2NvbHMgYXJlIG5lYXItaWRlbnRpY2FsLCBleGNlcHQgZm9yCisgICAgICAgIGluc3Rh bmNlcyBvZiAiRnVuY3Rpb25CYXIiIGluIG1ldGhvZCBuYW1lcyBhcmUgcmVuYW1lZCB0byAiVG91 Y2hCYXIiLiBUaGlzIHBhdGNoIHVwZGF0ZXMgdG8KKyAgICAgICAgdGhlIG5ldyBtZXRob2QgbmFt ZXMsIGFuZCBnZW5lcmFsbHkgcmVuYW1lcyB0aGluZ3Mgd2l0aCAiRnVuY3Rpb25CYXIiIHRvICJU b3VjaEJhciIuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9tYWMvV2ViUGxheWJhY2tDb250cm9sc01h bmFnZXIuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9tYWMvV2ViUGxheWJhY2tDb250cm9sc01hbmFn ZXIubW06CisgICAgICAgICgtW1dlYlBsYXliYWNrQ29udHJvbHNNYW5hZ2VyIGdlbmVyYXRlVG91 Y2hCYXJUaHVtYm5haWxzRm9yVGltZXM6dG9sZXJhbmNlOnNpemU6dGh1bWJuYWlsSGFuZGxlcjpd KToKKyAgICAgICAgKC1bV2ViUGxheWJhY2tDb250cm9sc01hbmFnZXIgZ2VuZXJhdGVUb3VjaEJh ckF1ZGlvQW1wbGl0dWRlU2FtcGxlczpjb21wbGV0aW9uSGFuZGxlcjpdKToKKyAgICAgICAgKC1b V2ViUGxheWJhY2tDb250cm9sc01hbmFnZXIgY2FuQmVnaW5Ub3VjaEJhclNjcnViYmluZ10pOgor ICAgICAgICAoLVtXZWJQbGF5YmFja0NvbnRyb2xzTWFuYWdlciBiZWdpblRvdWNoQmFyU2NydWJi aW5nXSk6CisgICAgICAgICgtW1dlYlBsYXliYWNrQ29udHJvbHNNYW5hZ2VyIGVuZFRvdWNoQmFy U2NydWJiaW5nXSk6CisgICAgICAgICgtW1dlYlBsYXliYWNrQ29udHJvbHNNYW5hZ2VyIGdlbmVy YXRlRnVuY3Rpb25CYXJUaHVtYm5haWxzRm9yVGltZXM6c2l6ZTpjb21wbGV0aW9uSGFuZGxlcjpd KToKKyAgICAgICAgKC1bV2ViUGxheWJhY2tDb250cm9sc01hbmFnZXIgZ2VuZXJhdGVGdW5jdGlv bkJhckF1ZGlvQW1wbGl0dWRlU2FtcGxlczpjb21wbGV0aW9uSGFuZGxlcjpdKToKKyAgICAgICAg KC1bV2ViUGxheWJhY2tDb250cm9sc01hbmFnZXIgY2FuQmVnaW5GdW5jdGlvbkJhclNjcnViYmlu Z10pOgorICAgICAgICAoLVtXZWJQbGF5YmFja0NvbnRyb2xzTWFuYWdlciBiZWdpbkZ1bmN0aW9u QmFyU2NydWJiaW5nXSk6CisgICAgICAgICgtW1dlYlBsYXliYWNrQ29udHJvbHNNYW5hZ2VyIGVu ZEZ1bmN0aW9uQmFyU2NydWJiaW5nXSk6CisgICAgICAgICgtW1dlYlBsYXliYWNrQ29udHJvbHNN YW5hZ2VyIGF1ZGlvVG91Y2hCYXJNZWRpYVNlbGVjdGlvbk9wdGlvbnNdKToKKyAgICAgICAgKC1b V2ViUGxheWJhY2tDb250cm9sc01hbmFnZXIgc2V0QXVkaW9Ub3VjaEJhck1lZGlhU2VsZWN0aW9u T3B0aW9uczpdKToKKyAgICAgICAgKC1bV2ViUGxheWJhY2tDb250cm9sc01hbmFnZXIgY3VycmVu dEF1ZGlvVG91Y2hCYXJNZWRpYVNlbGVjdGlvbk9wdGlvbl0pOgorICAgICAgICAoLVtXZWJQbGF5 YmFja0NvbnRyb2xzTWFuYWdlciBzZXRDdXJyZW50QXVkaW9Ub3VjaEJhck1lZGlhU2VsZWN0aW9u T3B0aW9uOl0pOgorICAgICAgICAoLVtXZWJQbGF5YmFja0NvbnRyb2xzTWFuYWdlciBsZWdpYmxl VG91Y2hCYXJNZWRpYVNlbGVjdGlvbk9wdGlvbnNdKToKKyAgICAgICAgKC1bV2ViUGxheWJhY2tD b250cm9sc01hbmFnZXIgc2V0TGVnaWJsZVRvdWNoQmFyTWVkaWFTZWxlY3Rpb25PcHRpb25zOl0p OgorICAgICAgICAoLVtXZWJQbGF5YmFja0NvbnRyb2xzTWFuYWdlciBjdXJyZW50TGVnaWJsZVRv dWNoQmFyTWVkaWFTZWxlY3Rpb25PcHRpb25dKToKKyAgICAgICAgKC1bV2ViUGxheWJhY2tDb250 cm9sc01hbmFnZXIgc2V0Q3VycmVudExlZ2libGVUb3VjaEJhck1lZGlhU2VsZWN0aW9uT3B0aW9u Ol0pOgorICAgICAgICAoLVtXZWJQbGF5YmFja0NvbnRyb2xzTWFuYWdlciBzZXRBdWRpb01lZGlh U2VsZWN0aW9uT3B0aW9uczp3aXRoU2VsZWN0ZWRJbmRleDpdKToKKyAgICAgICAgKC1bV2ViUGxh eWJhY2tDb250cm9sc01hbmFnZXIgc2V0TGVnaWJsZU1lZGlhU2VsZWN0aW9uT3B0aW9uczp3aXRo U2VsZWN0ZWRJbmRleDpdKToKKyAgICAgICAgKC1bV2ViUGxheWJhY2tDb250cm9sc01hbmFnZXIg YXVkaW9GdW5jdGlvbkJhck1lZGlhU2VsZWN0aW9uT3B0aW9uc10pOiBEZWxldGVkLgorICAgICAg ICAoLVtXZWJQbGF5YmFja0NvbnRyb2xzTWFuYWdlciBzZXRBdWRpb0Z1bmN0aW9uQmFyTWVkaWFT ZWxlY3Rpb25PcHRpb25zOl0pOiBEZWxldGVkLgorICAgICAgICAoLVtXZWJQbGF5YmFja0NvbnRy b2xzTWFuYWdlciBjdXJyZW50QXVkaW9GdW5jdGlvbkJhck1lZGlhU2VsZWN0aW9uT3B0aW9uXSk6 IERlbGV0ZWQuCisgICAgICAgICgtW1dlYlBsYXliYWNrQ29udHJvbHNNYW5hZ2VyIHNldEN1cnJl bnRBdWRpb0Z1bmN0aW9uQmFyTWVkaWFTZWxlY3Rpb25PcHRpb246XSk6IERlbGV0ZWQuCisgICAg ICAgICgtW1dlYlBsYXliYWNrQ29udHJvbHNNYW5hZ2VyIGxlZ2libGVGdW5jdGlvbkJhck1lZGlh U2VsZWN0aW9uT3B0aW9uc10pOiBEZWxldGVkLgorICAgICAgICAoLVtXZWJQbGF5YmFja0NvbnRy b2xzTWFuYWdlciBzZXRMZWdpYmxlRnVuY3Rpb25CYXJNZWRpYVNlbGVjdGlvbk9wdGlvbnM6XSk6 IERlbGV0ZWQuCisgICAgICAgICgtW1dlYlBsYXliYWNrQ29udHJvbHNNYW5hZ2VyIGN1cnJlbnRM ZWdpYmxlRnVuY3Rpb25CYXJNZWRpYVNlbGVjdGlvbk9wdGlvbl0pOiBEZWxldGVkLgorICAgICAg ICAoLVtXZWJQbGF5YmFja0NvbnRyb2xzTWFuYWdlciBzZXRDdXJyZW50TGVnaWJsZUZ1bmN0aW9u QmFyTWVkaWFTZWxlY3Rpb25PcHRpb246XSk6IERlbGV0ZWQuCisKIDIwMTctMDQtMjEgIEFuZGVy cyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KIAogICAgICAgICBSZW1vdmUgYW5vdGhl ciB1c2Ugb2YgdG9QYXltZW50QXV0aG9yaXphdGlvblN0YXR1cwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vbWFjL1dlYlBsYXliYWNrQ29udHJvbHNNYW5hZ2VyLmggYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvV2ViUGxheWJhY2tDb250cm9sc01hbmFnZXIuaAppbmRl eCA4Y2NjYTE0ZGYzMDA1ZDc1MDE1NTU1NjFhYWFmMTVhZDZhMWVmNzFhLi45NTI2NjJmNmJkMmI0 MmI4ZGQ3OGU4NDY1NDljNmYyNjg0ODc2M2QyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9tYWMvV2ViUGxheWJhY2tDb250cm9sc01hbmFnZXIuaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9tYWMvV2ViUGxheWJhY2tDb250cm9sc01hbmFnZXIuaApAQCAtNDYsMTAg KzQ2LDEwIEBAIFdFQkNPUkVfRVhQT1JUCiAgICAgUmV0YWluUHRyPE5TQXJyYXk+IF9zZWVrYWJs ZVRpbWVSYW5nZXM7CiAgICAgQk9PTCBfaGFzRW5hYmxlZEF1ZGlvOwogICAgIEJPT0wgX2hhc0Vu YWJsZWRWaWRlbzsKLSAgICBSZXRhaW5QdHI8TlNBcnJheTxBVlRvdWNoQmFyTWVkaWFTZWxlY3Rp b25PcHRpb24gKj4+IF9hdWRpb0Z1bmN0aW9uQmFyTWVkaWFTZWxlY3Rpb25PcHRpb25zOwotICAg IFJldGFpblB0cjxBVlRvdWNoQmFyTWVkaWFTZWxlY3Rpb25PcHRpb24+IF9jdXJyZW50QXVkaW9G dW5jdGlvbkJhck1lZGlhU2VsZWN0aW9uT3B0aW9uOwotICAgIFJldGFpblB0cjxOU0FycmF5PEFW VG91Y2hCYXJNZWRpYVNlbGVjdGlvbk9wdGlvbiAqPj4gX2xlZ2libGVGdW5jdGlvbkJhck1lZGlh U2VsZWN0aW9uT3B0aW9uczsKLSAgICBSZXRhaW5QdHI8QVZUb3VjaEJhck1lZGlhU2VsZWN0aW9u T3B0aW9uPiBfY3VycmVudExlZ2libGVGdW5jdGlvbkJhck1lZGlhU2VsZWN0aW9uT3B0aW9uOwor ICAgIFJldGFpblB0cjxOU0FycmF5PEFWVG91Y2hCYXJNZWRpYVNlbGVjdGlvbk9wdGlvbiAqPj4g X2F1ZGlvVG91Y2hCYXJNZWRpYVNlbGVjdGlvbk9wdGlvbnM7CisgICAgUmV0YWluUHRyPEFWVG91 Y2hCYXJNZWRpYVNlbGVjdGlvbk9wdGlvbj4gX2N1cnJlbnRBdWRpb1RvdWNoQmFyTWVkaWFTZWxl Y3Rpb25PcHRpb247CisgICAgUmV0YWluUHRyPE5TQXJyYXk8QVZUb3VjaEJhck1lZGlhU2VsZWN0 aW9uT3B0aW9uICo+PiBfbGVnaWJsZVRvdWNoQmFyTWVkaWFTZWxlY3Rpb25PcHRpb25zOworICAg IFJldGFpblB0cjxBVlRvdWNoQmFyTWVkaWFTZWxlY3Rpb25PcHRpb24+IF9jdXJyZW50TGVnaWJs ZVRvdWNoQmFyTWVkaWFTZWxlY3Rpb25PcHRpb247CiAgICAgZmxvYXQgX3JhdGU7CiAgICAgQk9P TCBfY2FuVG9nZ2xlUGxheWJhY2s7CiAKQEAgLTY5LDEwICs2OSwxMCBAQCBXRUJDT1JFX0VYUE9S VAogCiBAcHJvcGVydHkgKG5vbmF0b21pYykgZmxvYXQgcmF0ZTsKIAotLSAoQVZUb3VjaEJhck1l ZGlhU2VsZWN0aW9uT3B0aW9uICopY3VycmVudEF1ZGlvRnVuY3Rpb25CYXJNZWRpYVNlbGVjdGlv bk9wdGlvbjsKLS0gKHZvaWQpc2V0Q3VycmVudEF1ZGlvRnVuY3Rpb25CYXJNZWRpYVNlbGVjdGlv bk9wdGlvbjooQVZUb3VjaEJhck1lZGlhU2VsZWN0aW9uT3B0aW9uICopb3B0aW9uOwotLSAoQVZU b3VjaEJhck1lZGlhU2VsZWN0aW9uT3B0aW9uICopY3VycmVudExlZ2libGVGdW5jdGlvbkJhck1l ZGlhU2VsZWN0aW9uT3B0aW9uOwotLSAodm9pZClzZXRDdXJyZW50TGVnaWJsZUZ1bmN0aW9uQmFy TWVkaWFTZWxlY3Rpb25PcHRpb246KEFWVG91Y2hCYXJNZWRpYVNlbGVjdGlvbk9wdGlvbiAqKW9w dGlvbjsKKy0gKEFWVG91Y2hCYXJNZWRpYVNlbGVjdGlvbk9wdGlvbiAqKWN1cnJlbnRBdWRpb1Rv dWNoQmFyTWVkaWFTZWxlY3Rpb25PcHRpb247CistICh2b2lkKXNldEN1cnJlbnRBdWRpb1RvdWNo QmFyTWVkaWFTZWxlY3Rpb25PcHRpb246KEFWVG91Y2hCYXJNZWRpYVNlbGVjdGlvbk9wdGlvbiAq KW9wdGlvbjsKKy0gKEFWVG91Y2hCYXJNZWRpYVNlbGVjdGlvbk9wdGlvbiAqKWN1cnJlbnRMZWdp YmxlVG91Y2hCYXJNZWRpYVNlbGVjdGlvbk9wdGlvbjsKKy0gKHZvaWQpc2V0Q3VycmVudExlZ2li bGVUb3VjaEJhck1lZGlhU2VsZWN0aW9uT3B0aW9uOihBVlRvdWNoQmFyTWVkaWFTZWxlY3Rpb25P cHRpb24gKilvcHRpb247CiAtICh2b2lkKXNldEF1ZGlvTWVkaWFTZWxlY3Rpb25PcHRpb25zOihj b25zdCBWZWN0b3I8V1RGOjpTdHJpbmc+JilvcHRpb25zIHdpdGhTZWxlY3RlZEluZGV4OihOU1VJ bnRlZ2VyKXNlbGVjdGVkSW5kZXg7CiAtICh2b2lkKXNldExlZ2libGVNZWRpYVNlbGVjdGlvbk9w dGlvbnM6KGNvbnN0IFZlY3RvcjxXVEY6OlN0cmluZz4mKW9wdGlvbnMgd2l0aFNlbGVjdGVkSW5k ZXg6KE5TVUludGVnZXIpc2VsZWN0ZWRJbmRleDsKIEBlbmQKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL21hYy9XZWJQbGF5YmFja0NvbnRyb2xzTWFuYWdlci5tbSBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9XZWJQbGF5YmFja0NvbnRyb2xzTWFuYWdlci5tbQppbmRl eCA4Njk0MzI4YmZmOWMwM2Q0ZWJhMTY3ZTQ2NzQxZDc5OGVmM2U3YTg4Li43ZDI0YzExMTVmMDkx YTY1ZWIyYTM5YTk0NzI5Njk2M2M2NDZiODI3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9tYWMvV2ViUGxheWJhY2tDb250cm9sc01hbmFnZXIubW0KKysrIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vbWFjL1dlYlBsYXliYWNrQ29udHJvbHNNYW5hZ2VyLm1tCkBAIC05NCwy MCArOTQsMjEgQEAgLSAodm9pZCljYW5jZWxUaHVtYm5haWxBbmRBdWRpb0FtcGxpdHVkZVNhbXBs ZUdlbmVyYXRpb24KIHsKIH0KIAotLSAodm9pZClnZW5lcmF0ZUZ1bmN0aW9uQmFyVGh1bWJuYWls c0ZvclRpbWVzOihOU0FycmF5PE5TTnVtYmVyICo+ICopdGh1bWJuYWlsVGltZXMgc2l6ZTooTlNT aXplKXNpemUgY29tcGxldGlvbkhhbmRsZXI6KHZvaWQgKF4pKE5TQXJyYXk8QVZUaHVtYm5haWwg Kj4gKnRodW1ibmFpbHMsIE5TRXJyb3IgKmVycm9yKSljb21wbGV0aW9uSGFuZGxlcgorLSAodm9p ZClnZW5lcmF0ZVRvdWNoQmFyVGh1bWJuYWlsc0ZvclRpbWVzOihOU0FycmF5PE5TTnVtYmVyICo+ ICopdGh1bWJuYWlsVGltZXMgdG9sZXJhbmNlOihOU1RpbWVJbnRlcnZhbCl0b2xlcmFuY2Ugc2l6 ZTooTlNTaXplKXNpemUgdGh1bWJuYWlsSGFuZGxlcjoodm9pZCAoXikoTlNBcnJheTxBVlRodW1i bmFpbCAqPiAqdGh1bWJuYWlscywgQk9PTCB0aHVtYm5haWxHZW5lcmF0aW9uRmFpbGVkKSl0aHVt Ym5haWxIYW5kbGVyCiB7CiAgICAgVU5VU0VEX1BBUkFNKHRodW1ibmFpbFRpbWVzKTsKKyAgICBV TlVTRURfUEFSQU0odG9sZXJhbmNlKTsKICAgICBVTlVTRURfUEFSQU0oc2l6ZSk7Ci0gICAgY29t cGxldGlvbkhhbmRsZXIoQFsgXSwgbmlsKTsKKyAgICB0aHVtYm5haWxIYW5kbGVyKEBbIF0sIFlF Uyk7CiB9CiAKLS0gKHZvaWQpZ2VuZXJhdGVGdW5jdGlvbkJhckF1ZGlvQW1wbGl0dWRlU2FtcGxl czooTlNJbnRlZ2VyKW51bWJlck9mU2FtcGxlcyBjb21wbGV0aW9uSGFuZGxlcjoodm9pZCAoXiko TlNBcnJheTxOU051bWJlciAqPiAqYXVkaW9BbXBsaXR1ZGVTYW1wbGVzLCAgTlNFcnJvciAqZXJy b3IpKWNvbXBsZXRpb25IYW5kbGVyCistICh2b2lkKWdlbmVyYXRlVG91Y2hCYXJBdWRpb0FtcGxp dHVkZVNhbXBsZXM6KE5TSW50ZWdlciludW1iZXJPZlNhbXBsZXMgY29tcGxldGlvbkhhbmRsZXI6 KHZvaWQgKF4pKE5TQXJyYXk8TlNOdW1iZXIgKj4gKmF1ZGlvQW1wbGl0dWRlU2FtcGxlcykpY29t cGxldGlvbkhhbmRsZXIKIHsKICAgICBVTlVTRURfUEFSQU0obnVtYmVyT2ZTYW1wbGVzKTsKLSAg ICBjb21wbGV0aW9uSGFuZGxlcihAWyBdLCBuaWwpOworICAgIGNvbXBsZXRpb25IYW5kbGVyKEBb IF0pOwogfQogCi0tKEJPT0wpY2FuQmVnaW5GdW5jdGlvbkJhclNjcnViYmluZworLSAoQk9PTClj YW5CZWdpblRvdWNoQmFyU2NydWJiaW5nCiB7CiAgICAgLy8gSXQncyBub3QgaWRlYWwgdG8gcmV0 dXJuIFlFUyBhbGwgdGhlIHRpbWUgaGVyZS4gVGhlIGludGVudCBvZiB0aGUgQVBJIGlzIHRoYXQg d2UgcmV0dXJuIE5PIHdoZW4gdGhlCiAgICAgLy8gbWVkaWEgaXMgYmVpbmcgc2NydWJiZWQgdmlh IHRoZSBvbi1zY3JlZW4gc2NydWJiZXIuIEJ1dCB3ZSBjYW4gb25seSBwb3NzaWJseSBnZXQgdGhl IHJpZ2h0IGFuc3dlciBmb3IKQEAgLTExNSw3MiArMTE2LDEwNCBAQCAtKEJPT0wpY2FuQmVnaW5G dW5jdGlvbkJhclNjcnViYmluZwogICAgIHJldHVybiBZRVM7CiB9CiAKLS0gKHZvaWQpYmVnaW5G dW5jdGlvbkJhclNjcnViYmluZworLSAodm9pZCliZWdpblRvdWNoQmFyU2NydWJiaW5nCiB7CiAg ICAgX3dlYlBsYXliYWNrU2Vzc2lvbkludGVyZmFjZU1hYy0+YmVnaW5TY3J1YmJpbmcoKTsKIH0K IAotLSAodm9pZCllbmRGdW5jdGlvbkJhclNjcnViYmluZworLSAodm9pZCllbmRUb3VjaEJhclNj cnViYmluZwogewogICAgIF93ZWJQbGF5YmFja1Nlc3Npb25JbnRlcmZhY2VNYWMtPmVuZFNjcnVi YmluZygpOwogfQogCi0tIChOU0FycmF5PEFWVG91Y2hCYXJNZWRpYVNlbGVjdGlvbk9wdGlvbiAq PiAqKWF1ZGlvRnVuY3Rpb25CYXJNZWRpYVNlbGVjdGlvbk9wdGlvbnMKKyNpZiBfX01BQ19PU19Y X1ZFUlNJT05fTUlOX1JFUVVJUkVEIDwgMTAxMzAwCisKKy0gKHZvaWQpZ2VuZXJhdGVGdW5jdGlv bkJhclRodW1ibmFpbHNGb3JUaW1lczooTlNBcnJheTxOU051bWJlciAqPiAqKXRodW1ibmFpbFRp bWVzIHNpemU6KE5TU2l6ZSlzaXplIGNvbXBsZXRpb25IYW5kbGVyOih2b2lkICheKShOU0FycmF5 PEFWVGh1bWJuYWlsICo+ICp0aHVtYm5haWxzLCBOU0Vycm9yICplcnJvcikpY29tcGxldGlvbkhh bmRsZXIKK3sKKyAgICBVTlVTRURfUEFSQU0odGh1bWJuYWlsVGltZXMpOworICAgIFVOVVNFRF9Q QVJBTShzaXplKTsKKyAgICBjb21wbGV0aW9uSGFuZGxlcihAWyBdLCBuaWwpOworfQorCistICh2 b2lkKWdlbmVyYXRlRnVuY3Rpb25CYXJBdWRpb0FtcGxpdHVkZVNhbXBsZXM6KE5TSW50ZWdlcilu dW1iZXJPZlNhbXBsZXMgY29tcGxldGlvbkhhbmRsZXI6KHZvaWQgKF4pKE5TQXJyYXk8TlNOdW1i ZXIgKj4gKmF1ZGlvQW1wbGl0dWRlU2FtcGxlcywgIE5TRXJyb3IgKmVycm9yKSljb21wbGV0aW9u SGFuZGxlcgoreworICAgIFVOVVNFRF9QQVJBTShudW1iZXJPZlNhbXBsZXMpOworICAgIGNvbXBs ZXRpb25IYW5kbGVyKEBbIF0sIG5pbCk7Cit9CisKKy0gKEJPT0wpY2FuQmVnaW5GdW5jdGlvbkJh clNjcnViYmluZworeworICAgIHJldHVybiBbc2VsZiBjYW5CZWdpblRvdWNoQmFyU2NydWJiaW5n XTsKK30KKworLSAodm9pZCliZWdpbkZ1bmN0aW9uQmFyU2NydWJiaW5nCit7CisgICAgW3NlbGYg YmVnaW5Ub3VjaEJhclNjcnViYmluZ107Cit9CisKKy0gKHZvaWQpZW5kRnVuY3Rpb25CYXJTY3J1 YmJpbmcKK3sKKyAgICBbc2VsZiBlbmRUb3VjaEJhclNjcnViYmluZ107Cit9CisKKyNlbmRpZgor CistIChOU0FycmF5PEFWVG91Y2hCYXJNZWRpYVNlbGVjdGlvbk9wdGlvbiAqPiAqKWF1ZGlvVG91 Y2hCYXJNZWRpYVNlbGVjdGlvbk9wdGlvbnMKIHsKLSAgICByZXR1cm4gX2F1ZGlvRnVuY3Rpb25C YXJNZWRpYVNlbGVjdGlvbk9wdGlvbnMuZ2V0KCk7CisgICAgcmV0dXJuIF9hdWRpb1RvdWNoQmFy TWVkaWFTZWxlY3Rpb25PcHRpb25zLmdldCgpOwogfQogCi0tICh2b2lkKXNldEF1ZGlvRnVuY3Rp b25CYXJNZWRpYVNlbGVjdGlvbk9wdGlvbnM6KE5TQXJyYXk8QVZUb3VjaEJhck1lZGlhU2VsZWN0 aW9uT3B0aW9uICo+ICopYXVkaW9PcHRpb25zCistICh2b2lkKXNldEF1ZGlvVG91Y2hCYXJNZWRp YVNlbGVjdGlvbk9wdGlvbnM6KE5TQXJyYXk8QVZUb3VjaEJhck1lZGlhU2VsZWN0aW9uT3B0aW9u ICo+ICopYXVkaW9PcHRpb25zCiB7Ci0gICAgX2F1ZGlvRnVuY3Rpb25CYXJNZWRpYVNlbGVjdGlv bk9wdGlvbnMgPSBhdWRpb09wdGlvbnM7CisgICAgX2F1ZGlvVG91Y2hCYXJNZWRpYVNlbGVjdGlv bk9wdGlvbnMgPSBhdWRpb09wdGlvbnM7CiB9CiAKLS0gKEFWVG91Y2hCYXJNZWRpYVNlbGVjdGlv bk9wdGlvbiAqKWN1cnJlbnRBdWRpb0Z1bmN0aW9uQmFyTWVkaWFTZWxlY3Rpb25PcHRpb24KKy0g KEFWVG91Y2hCYXJNZWRpYVNlbGVjdGlvbk9wdGlvbiAqKWN1cnJlbnRBdWRpb1RvdWNoQmFyTWVk aWFTZWxlY3Rpb25PcHRpb24KIHsKLSAgICByZXR1cm4gX2N1cnJlbnRBdWRpb0Z1bmN0aW9uQmFy TWVkaWFTZWxlY3Rpb25PcHRpb24uZ2V0KCk7CisgICAgcmV0dXJuIF9jdXJyZW50QXVkaW9Ub3Vj aEJhck1lZGlhU2VsZWN0aW9uT3B0aW9uLmdldCgpOwogfQogCi0tICh2b2lkKXNldEN1cnJlbnRB dWRpb0Z1bmN0aW9uQmFyTWVkaWFTZWxlY3Rpb25PcHRpb246KEFWVG91Y2hCYXJNZWRpYVNlbGVj dGlvbk9wdGlvbiAqKWF1ZGlvTWVkaWFTZWxlY3Rpb25PcHRpb24KKy0gKHZvaWQpc2V0Q3VycmVu dEF1ZGlvVG91Y2hCYXJNZWRpYVNlbGVjdGlvbk9wdGlvbjooQVZUb3VjaEJhck1lZGlhU2VsZWN0 aW9uT3B0aW9uICopYXVkaW9NZWRpYVNlbGVjdGlvbk9wdGlvbgogewotICAgIGlmIChhdWRpb01l ZGlhU2VsZWN0aW9uT3B0aW9uID09IF9jdXJyZW50QXVkaW9GdW5jdGlvbkJhck1lZGlhU2VsZWN0 aW9uT3B0aW9uKQorICAgIGlmIChhdWRpb01lZGlhU2VsZWN0aW9uT3B0aW9uID09IF9jdXJyZW50 QXVkaW9Ub3VjaEJhck1lZGlhU2VsZWN0aW9uT3B0aW9uKQogICAgICAgICByZXR1cm47CiAKLSAg ICBfY3VycmVudEF1ZGlvRnVuY3Rpb25CYXJNZWRpYVNlbGVjdGlvbk9wdGlvbiA9IGF1ZGlvTWVk aWFTZWxlY3Rpb25PcHRpb247CisgICAgX2N1cnJlbnRBdWRpb1RvdWNoQmFyTWVkaWFTZWxlY3Rp b25PcHRpb24gPSBhdWRpb01lZGlhU2VsZWN0aW9uT3B0aW9uOwogCiAgICAgTlNJbnRlZ2VyIGlu ZGV4ID0gTlNOb3RGb3VuZDsKIAotICAgIGlmIChhdWRpb01lZGlhU2VsZWN0aW9uT3B0aW9uICYm IF9hdWRpb0Z1bmN0aW9uQmFyTWVkaWFTZWxlY3Rpb25PcHRpb25zKQotICAgICAgICBpbmRleCA9 IFtfYXVkaW9GdW5jdGlvbkJhck1lZGlhU2VsZWN0aW9uT3B0aW9ucyBpbmRleE9mT2JqZWN0OmF1 ZGlvTWVkaWFTZWxlY3Rpb25PcHRpb25dOworICAgIGlmIChhdWRpb01lZGlhU2VsZWN0aW9uT3B0 aW9uICYmIF9hdWRpb1RvdWNoQmFyTWVkaWFTZWxlY3Rpb25PcHRpb25zKQorICAgICAgICBpbmRl eCA9IFtfYXVkaW9Ub3VjaEJhck1lZGlhU2VsZWN0aW9uT3B0aW9ucyBpbmRleE9mT2JqZWN0OmF1 ZGlvTWVkaWFTZWxlY3Rpb25PcHRpb25dOwogCiAgICAgX3dlYlBsYXliYWNrU2Vzc2lvbkludGVy ZmFjZU1hYy0+d2ViUGxheWJhY2tTZXNzaW9uTW9kZWwoKS0+c2VsZWN0QXVkaW9NZWRpYU9wdGlv bihpbmRleCAhPSBOU05vdEZvdW5kID8gaW5kZXggOiBVSU5UNjRfTUFYKTsKIH0KIAotLSAoTlNB cnJheTxBVlRvdWNoQmFyTWVkaWFTZWxlY3Rpb25PcHRpb24gKj4gKilsZWdpYmxlRnVuY3Rpb25C YXJNZWRpYVNlbGVjdGlvbk9wdGlvbnMKKy0gKE5TQXJyYXk8QVZUb3VjaEJhck1lZGlhU2VsZWN0 aW9uT3B0aW9uICo+ICopbGVnaWJsZVRvdWNoQmFyTWVkaWFTZWxlY3Rpb25PcHRpb25zCiB7Ci0g ICAgcmV0dXJuIF9sZWdpYmxlRnVuY3Rpb25CYXJNZWRpYVNlbGVjdGlvbk9wdGlvbnMuZ2V0KCk7 CisgICAgcmV0dXJuIF9sZWdpYmxlVG91Y2hCYXJNZWRpYVNlbGVjdGlvbk9wdGlvbnMuZ2V0KCk7 CiB9CiAKLS0gKHZvaWQpc2V0TGVnaWJsZUZ1bmN0aW9uQmFyTWVkaWFTZWxlY3Rpb25PcHRpb25z OihOU0FycmF5PEFWVG91Y2hCYXJNZWRpYVNlbGVjdGlvbk9wdGlvbiAqPiAqKWxlZ2libGVPcHRp b25zCistICh2b2lkKXNldExlZ2libGVUb3VjaEJhck1lZGlhU2VsZWN0aW9uT3B0aW9uczooTlNB cnJheTxBVlRvdWNoQmFyTWVkaWFTZWxlY3Rpb25PcHRpb24gKj4gKilsZWdpYmxlT3B0aW9ucwog ewotICAgIF9sZWdpYmxlRnVuY3Rpb25CYXJNZWRpYVNlbGVjdGlvbk9wdGlvbnMgPSBsZWdpYmxl T3B0aW9uczsKKyAgICBfbGVnaWJsZVRvdWNoQmFyTWVkaWFTZWxlY3Rpb25PcHRpb25zID0gbGVn aWJsZU9wdGlvbnM7CiB9CiAKLS0gKEFWVG91Y2hCYXJNZWRpYVNlbGVjdGlvbk9wdGlvbiAqKWN1 cnJlbnRMZWdpYmxlRnVuY3Rpb25CYXJNZWRpYVNlbGVjdGlvbk9wdGlvbgorLSAoQVZUb3VjaEJh ck1lZGlhU2VsZWN0aW9uT3B0aW9uICopY3VycmVudExlZ2libGVUb3VjaEJhck1lZGlhU2VsZWN0 aW9uT3B0aW9uCiB7Ci0gICAgcmV0dXJuIF9jdXJyZW50TGVnaWJsZUZ1bmN0aW9uQmFyTWVkaWFT ZWxlY3Rpb25PcHRpb24uZ2V0KCk7CisgICAgcmV0dXJuIF9jdXJyZW50TGVnaWJsZVRvdWNoQmFy TWVkaWFTZWxlY3Rpb25PcHRpb24uZ2V0KCk7CiB9CiAKLS0gKHZvaWQpc2V0Q3VycmVudExlZ2li bGVGdW5jdGlvbkJhck1lZGlhU2VsZWN0aW9uT3B0aW9uOihBVlRvdWNoQmFyTWVkaWFTZWxlY3Rp b25PcHRpb24gKilsZWdpYmxlTWVkaWFTZWxlY3Rpb25PcHRpb24KKy0gKHZvaWQpc2V0Q3VycmVu dExlZ2libGVUb3VjaEJhck1lZGlhU2VsZWN0aW9uT3B0aW9uOihBVlRvdWNoQmFyTWVkaWFTZWxl Y3Rpb25PcHRpb24gKilsZWdpYmxlTWVkaWFTZWxlY3Rpb25PcHRpb24KIHsKLSAgICBpZiAobGVn aWJsZU1lZGlhU2VsZWN0aW9uT3B0aW9uID09IF9jdXJyZW50TGVnaWJsZUZ1bmN0aW9uQmFyTWVk aWFTZWxlY3Rpb25PcHRpb24pCisgICAgaWYgKGxlZ2libGVNZWRpYVNlbGVjdGlvbk9wdGlvbiA9 PSBfY3VycmVudExlZ2libGVUb3VjaEJhck1lZGlhU2VsZWN0aW9uT3B0aW9uKQogICAgICAgICBy ZXR1cm47CiAKLSAgICBfY3VycmVudExlZ2libGVGdW5jdGlvbkJhck1lZGlhU2VsZWN0aW9uT3B0 aW9uID0gbGVnaWJsZU1lZGlhU2VsZWN0aW9uT3B0aW9uOworICAgIF9jdXJyZW50TGVnaWJsZVRv dWNoQmFyTWVkaWFTZWxlY3Rpb25PcHRpb24gPSBsZWdpYmxlTWVkaWFTZWxlY3Rpb25PcHRpb247 CiAKICAgICBOU0ludGVnZXIgaW5kZXggPSBOU05vdEZvdW5kOwogCi0gICAgaWYgKGxlZ2libGVN ZWRpYVNlbGVjdGlvbk9wdGlvbiAmJiBfbGVnaWJsZUZ1bmN0aW9uQmFyTWVkaWFTZWxlY3Rpb25P cHRpb25zKQotICAgICAgICBpbmRleCA9IFtfbGVnaWJsZUZ1bmN0aW9uQmFyTWVkaWFTZWxlY3Rp b25PcHRpb25zIGluZGV4T2ZPYmplY3Q6bGVnaWJsZU1lZGlhU2VsZWN0aW9uT3B0aW9uXTsKKyAg ICBpZiAobGVnaWJsZU1lZGlhU2VsZWN0aW9uT3B0aW9uICYmIF9sZWdpYmxlVG91Y2hCYXJNZWRp YVNlbGVjdGlvbk9wdGlvbnMpCisgICAgICAgIGluZGV4ID0gW19sZWdpYmxlVG91Y2hCYXJNZWRp YVNlbGVjdGlvbk9wdGlvbnMgaW5kZXhPZk9iamVjdDpsZWdpYmxlTWVkaWFTZWxlY3Rpb25PcHRp b25dOwogCiAgICAgX3dlYlBsYXliYWNrU2Vzc2lvbkludGVyZmFjZU1hYy0+d2ViUGxheWJhY2tT ZXNzaW9uTW9kZWwoKS0+c2VsZWN0TGVnaWJsZU1lZGlhT3B0aW9uKGluZGV4ICE9IE5TTm90Rm91 bmQgPyBpbmRleCA6IFVJTlQ2NF9NQVgpOwogfQpAQCAtMjAyLDE3ICsyMzUsMTcgQEAgc3RhdGlj IFJldGFpblB0cjxOU011dGFibGVBcnJheT4gbWVkaWFTZWxlY3Rpb25PcHRpb25zKGNvbnN0IFZl Y3RvcjxTdHJpbmc+JiBvcHQKIC0gKHZvaWQpc2V0QXVkaW9NZWRpYVNlbGVjdGlvbk9wdGlvbnM6 KGNvbnN0IFZlY3RvcjxXVEY6OlN0cmluZz4mKW9wdGlvbnMgd2l0aFNlbGVjdGVkSW5kZXg6KE5T VUludGVnZXIpc2VsZWN0ZWRJbmRleAogewogICAgIFJldGFpblB0cjxOU011dGFibGVBcnJheT4g d2ViT3B0aW9ucyA9IG1lZGlhU2VsZWN0aW9uT3B0aW9ucyhvcHRpb25zKTsKLSAgICBbc2VsZiBz ZXRBdWRpb0Z1bmN0aW9uQmFyTWVkaWFTZWxlY3Rpb25PcHRpb25zOndlYk9wdGlvbnMuZ2V0KCld OworICAgIFtzZWxmIHNldEF1ZGlvVG91Y2hCYXJNZWRpYVNlbGVjdGlvbk9wdGlvbnM6d2ViT3B0 aW9ucy5nZXQoKV07CiAgICAgaWYgKHNlbGVjdGVkSW5kZXggPCBbd2ViT3B0aW9ucyBjb3VudF0p Ci0gICAgICAgIFtzZWxmIHNldEN1cnJlbnRBdWRpb0Z1bmN0aW9uQmFyTWVkaWFTZWxlY3Rpb25P cHRpb246W3dlYk9wdGlvbnMgb2JqZWN0QXRJbmRleDpzZWxlY3RlZEluZGV4XV07CisgICAgICAg IFtzZWxmIHNldEN1cnJlbnRBdWRpb1RvdWNoQmFyTWVkaWFTZWxlY3Rpb25PcHRpb246W3dlYk9w dGlvbnMgb2JqZWN0QXRJbmRleDpzZWxlY3RlZEluZGV4XV07CiB9CiAKIC0gKHZvaWQpc2V0TGVn aWJsZU1lZGlhU2VsZWN0aW9uT3B0aW9uczooY29uc3QgVmVjdG9yPFdURjo6U3RyaW5nPiYpb3B0 aW9ucyB3aXRoU2VsZWN0ZWRJbmRleDooTlNVSW50ZWdlcilzZWxlY3RlZEluZGV4CiB7CiAgICAg UmV0YWluUHRyPE5TTXV0YWJsZUFycmF5PiB3ZWJPcHRpb25zID0gbWVkaWFTZWxlY3Rpb25PcHRp b25zKG9wdGlvbnMpOwotICAgIFtzZWxmIHNldExlZ2libGVGdW5jdGlvbkJhck1lZGlhU2VsZWN0 aW9uT3B0aW9uczp3ZWJPcHRpb25zLmdldCgpXTsKKyAgICBbc2VsZiBzZXRMZWdpYmxlVG91Y2hC YXJNZWRpYVNlbGVjdGlvbk9wdGlvbnM6d2ViT3B0aW9ucy5nZXQoKV07CiAgICAgaWYgKHNlbGVj dGVkSW5kZXggPCBbd2ViT3B0aW9ucyBjb3VudF0pCi0gICAgICAgIFtzZWxmIHNldEN1cnJlbnRM ZWdpYmxlRnVuY3Rpb25CYXJNZWRpYVNlbGVjdGlvbk9wdGlvbjpbd2ViT3B0aW9ucyBvYmplY3RB dEluZGV4OnNlbGVjdGVkSW5kZXhdXTsKKyAgICAgICAgW3NlbGYgc2V0Q3VycmVudExlZ2libGVU b3VjaEJhck1lZGlhU2VsZWN0aW9uT3B0aW9uOlt3ZWJPcHRpb25zIG9iamVjdEF0SW5kZXg6c2Vs ZWN0ZWRJbmRleF1dOwogfQogCiAtIChXZWJDb3JlOjpXZWJQbGF5YmFja1Nlc3Npb25JbnRlcmZh Y2VNYWMqKXdlYlBsYXliYWNrU2Vzc2lvbkludGVyZmFjZU1hYwo=