173505 2017-06-16 19:06:49 -0700 [MSE] Seeking or entering fullscreen can cause extreme CPU usage 2017-06-18 08:56:01 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 173515 1 jer.noble jer.noble commit-queue eric.carlson thorton webkit-bug-importer oldest_to_newest 1320293 0 jer.noble 2017-06-16 19:06:49 -0700 [MSE] Seeking or entering fullscreen can cause extreme CPU usage 1320294 1 jer.noble 2017-06-16 19:11:40 -0700 <rdar://problem/32623694> 1320295 2 313175 jer.noble 2017-06-16 19:11:45 -0700 Created attachment 313175 Patch 1320297 3 313175 thorton 2017-06-16 19:13:41 -0700 Comment on attachment 313175 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=313175&action=review > Source/WebCore/ChangeLog:11 > + performance regression in the normal playback path, where WebKit will effective effective append? 1320301 4 jer.noble 2017-06-16 19:20:15 -0700 Committed r218438: <http://trac.webkit.org/changeset/218438> 1320414 5 commit-queue 2017-06-17 12:47:43 -0700 Re-opened since this is blocked by bug 173515 1320483 6 jer.noble 2017-06-17 23:00:26 -0700 I found the underlying issue behind the test failures, and it has nothing to do with this patch, except in that this patch causes it to happen much more frequently. When a client specifies a timestamp offset, the SourceBuffer code stores the current presentation time as a float (because a MediaTime + float = float). But the sample itself store it as a MediaTime. Generally speaking, we use the sample's presentation time as the key to our storage, but in one instance (the decodeQueue) we are using the local value of presentation time (the float). This leads to a mismatch later when it comes time to remove those samples from the decode queue, so the samples are left in the decode queue, which causes a decode error, which breaks this test. (BTW, I'm pretty sure that this is the cause of some existing flakiness of some of these tests.) 1320485 7 313224 jer.noble 2017-06-17 23:36:32 -0700 Created attachment 313224 Patch for landing 1320498 8 313224 commit-queue 2017-06-18 08:55:59 -0700 Comment on attachment 313224 Patch for landing Clearing flags on attachment: 313224 Committed r218463: <http://trac.webkit.org/changeset/218463> 1320499 9 commit-queue 2017-06-18 08:56:01 -0700 All reviewed patches have been landed. Closing bug. 313175 2017-06-16 19:11:45 -0700 2017-06-17 23:36:31 -0700 Patch bug-173505-20170616191145.patch text/plain 2730 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMjE4NDE2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjAyM2RhODRlOTVjZDQz MjM3OTEyNWYzZDAxY2MxYjZkZTdmYzEzOC4uMDk1NzE1NzcxZjIxNWQyZmE2ODM4ZjIyOGU5ZTA1 NDRjZTcxMTQ5OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI2IEBACiAyMDE3LTA2LTE2ICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgogCisgICAgICAgIFtNU0VdIFNlZWtpbmcgb3Ig ZW50ZXJpbmcgZnVsbHNjcmVlbiBjYW4gY2F1c2UgZXh0cmVtZSBDUFUgdXNhZ2UKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3MzUwNQorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdoZW4gc3VwcG9ydCBmb3Ig cGFpbnRpbmcgTVNFIHRvIFdlYkdMIHdhcyBhZGRlZCBpbiByMjE3MTg1LCB0aGUgaW1wbGVtZW50 YXRpb24gb2YKKyAgICAgICAgU291cmNlQnVmZmVyUHJpdmF0ZUFWRk9iakM6OmlzUmVhZHlGb3JN b3JlU2FtcGxlcygpIHdhcyBtb2RpZmllZCB0byBzdXBwb3J0IGFza2luZworICAgICAgICB0aGUg ZGVjb21wcmVzc2lvbiBzZXNzaW9uIGlmIGl0IHdhcyByZWFkeS4gVGhhdCBjaGFuZ2UsIGhvd2V2 ZXIsIGNhdXNlZCBhbiBleHRyZW1lCisgICAgICAgIHBlcmZvcm1hbmNlIHJlZ3Jlc3Npb24gaW4g dGhlIG5vcm1hbCBwbGF5YmFjayBwYXRoLCB3aGVyZSBXZWJLaXQgd2lsbCBlZmZlY3RpdmUgCisg ICAgICAgIGFwcGVuZCBzYW1wbGVzIGVuZGxlc3NseSB0byB0aGUgQVZTYW1wbGVCdWZmZXJEaXNw bGF5TGF5ZXIsIHdoaWNoIGFkbWlyYWJseSBlbnF1ZXVlZAorICAgICAgICBlYWNoIG9mIHRoZW0g Zm9yIGRlY29kaW5nLiBFdmVudHVhbGx5LCB0aGUgY29zdCBvZiBpdGVyYXRpbmcgb3ZlciB0aGUg Q01CdWZmZXJRdWV1ZQorICAgICAgICBvdmVyd2hlbG1lZCB0aGUgY29zdCBvZiBkZWNvZGluZywg YW5kIGNhdXNlZCB0aGUgZXh0cmVtZSBsYWcgc2VlbiB3aGVuIHNlZWtpbmcuCisKKyAgICAgICAg TWFrZSBzdXJlIHRvIHByb3BlcnR5IHF1ZXJ5IHRoZSBBVlNhbXBsZUJ1ZmZlckRpc3BsYXlMYXll ciBmb3IgaXNSZWFkeUZvck1vcmVNZWRpYURhdGEKKyAgICAgICAgYmVmb3JlIGVucXVldWluZy4K KworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL1NvdXJjZUJ1 ZmZlclByaXZhdGVBVkZPYmpDLm1tOgorICAgICAgICAoV2ViQ29yZTo6U291cmNlQnVmZmVyUHJp dmF0ZUFWRk9iakM6OmlzUmVhZHlGb3JNb3JlU2FtcGxlcyk6CisKKzIwMTctMDYtMTYgIEplciBO b2JsZSAgPGplci5ub2JsZUBhcHBsZS5jb20+CisKICAgICAgICAgW2lPU10gRG8gbm90IHBhdXNl IHBsYXlpbmcgdmlkZW8gd2hlbiBhcHBsaWNhdGlvbiByZXNpZ25zIGFjdGl2ZSBzdGF0ZS4KICAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3MzQ3NAogCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24v b2JqYy9Tb3VyY2VCdWZmZXJQcml2YXRlQVZGT2JqQy5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL1NvdXJjZUJ1ZmZlclByaXZhdGVBVkZPYmpD Lm1tCmluZGV4IDMwMDgyYjdjZWFmOGJkYjQ0NjkzNDM5OTAyMGM3MGQxOTk1NjlmYjIuLjg5OGRk MjdjNjEwNTA2OGNhYjJlYjUyMjM0ZDZkN2YxYjI5ODEyOGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL1NvdXJjZUJ1ZmZlclBy aXZhdGVBVkZPYmpDLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2 Zm91bmRhdGlvbi9vYmpjL1NvdXJjZUJ1ZmZlclByaXZhdGVBVkZPYmpDLm1tCkBAIC0xMDAyLDgg KzEwMDIsMTIgQEAgdm9pZCBTb3VyY2VCdWZmZXJQcml2YXRlQVZGT2JqQzo6YnVmZmVyV2FzQ29u c3VtZWQoKQogYm9vbCBTb3VyY2VCdWZmZXJQcml2YXRlQVZGT2JqQzo6aXNSZWFkeUZvck1vcmVT YW1wbGVzKGNvbnN0IEF0b21pY1N0cmluZyYgdHJhY2tJRFN0cmluZykKIHsKICAgICBpbnQgdHJh Y2tJRCA9IHRyYWNrSURTdHJpbmcudG9JbnQoKTsKLSAgICBpZiAodHJhY2tJRCA9PSBtX2VuYWJs ZWRWaWRlb1RyYWNrSUQpCi0gICAgICAgIHJldHVybiAhbV9kZWNvbXByZXNzaW9uU2Vzc2lvbiB8 fCBtX2RlY29tcHJlc3Npb25TZXNzaW9uLT5pc1JlYWR5Rm9yTW9yZU1lZGlhRGF0YSgpOworICAg IGlmICh0cmFja0lEID09IG1fZW5hYmxlZFZpZGVvVHJhY2tJRCkgeworICAgICAgICBpZiAobV9k ZWNvbXByZXNzaW9uU2Vzc2lvbikKKyAgICAgICAgICAgIHJldHVybiBtX2RlY29tcHJlc3Npb25T ZXNzaW9uLT5pc1JlYWR5Rm9yTW9yZU1lZGlhRGF0YSgpOworCisgICAgICAgIHJldHVybiBbbV9k aXNwbGF5TGF5ZXIgaXNSZWFkeUZvck1vcmVNZWRpYURhdGFdOworICAgIH0KIAogICAgIGlmICht X2F1ZGlvUmVuZGVyZXJzLmNvbnRhaW5zKHRyYWNrSUQpKQogICAgICAgICByZXR1cm4gW21fYXVk aW9SZW5kZXJlcnMuZ2V0KHRyYWNrSUQpIGlzUmVhZHlGb3JNb3JlTWVkaWFEYXRhXTsK 313224 2017-06-17 23:36:32 -0700 2017-06-18 08:55:59 -0700 Patch for landing bug-173505-20170617233632.patch text/plain 5128 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMjE4NDM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGVhMzJjYzIxZGI2ODhj ZTJkNzkxNThkMWU3YmI1Y2VlM2Y3N2NkMi4uNjFhMWU3NjdiNzM2ZjI1ZjYyMTc2NGY5NDRiYjEw M2RiMzE3OWNlYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQyIEBACisyMDE3LTA2LTE2ICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIFtNU0VdIFNlZWtpbmcgb3Ig ZW50ZXJpbmcgZnVsbHNjcmVlbiBjYW4gY2F1c2UgZXh0cmVtZSBDUFUgdXNhZ2UKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3MzUwNQorCisgICAgICAg IFJldmlld2VkIGJ5IFRpbSBIb3J0b24uCisKKyAgICAgICAgV2hlbiBzdXBwb3J0IGZvciBwYWlu dGluZyBNU0UgdG8gV2ViR0wgd2FzIGFkZGVkIGluIHIyMTcxODUsIHRoZSBpbXBsZW1lbnRhdGlv biBvZgorICAgICAgICBTb3VyY2VCdWZmZXJQcml2YXRlQVZGT2JqQzo6aXNSZWFkeUZvck1vcmVT YW1wbGVzKCkgd2FzIG1vZGlmaWVkIHRvIHN1cHBvcnQgYXNraW5nCisgICAgICAgIHRoZSBkZWNv bXByZXNzaW9uIHNlc3Npb24gaWYgaXQgd2FzIHJlYWR5LiBUaGF0IGNoYW5nZSwgaG93ZXZlciwg Y2F1c2VkIGFuIGV4dHJlbWUKKyAgICAgICAgcGVyZm9ybWFuY2UgcmVncmVzc2lvbiBpbiB0aGUg bm9ybWFsIHBsYXliYWNrIHBhdGgsIHdoZXJlIFdlYktpdCB3aWxsIGVmZmVjdGl2ZWx5CisgICAg ICAgIGFwcGVuZCBzYW1wbGVzIGVuZGxlc3NseSB0byB0aGUgQVZTYW1wbGVCdWZmZXJEaXNwbGF5 TGF5ZXIsIHdoaWNoIGFkbWlyYWJseSBlbnF1ZXVlZAorICAgICAgICBlYWNoIG9mIHRoZW0gZm9y IGRlY29kaW5nLiBFdmVudHVhbGx5LCB0aGUgY29zdCBvZiBpdGVyYXRpbmcgb3ZlciB0aGUgQ01C dWZmZXJRdWV1ZQorICAgICAgICBvdmVyd2hlbG1lZCB0aGUgY29zdCBvZiBkZWNvZGluZywgYW5k IGNhdXNlZCB0aGUgZXh0cmVtZSBsYWcgc2VlbiB3aGVuIHNlZWtpbmcuCisKKyAgICAgICAgTWFr ZSBzdXJlIHRvIHByb3BlcnR5IHF1ZXJ5IHRoZSBBVlNhbXBsZUJ1ZmZlckRpc3BsYXlMYXllciBm b3IgaXNSZWFkeUZvck1vcmVNZWRpYURhdGEKKyAgICAgICAgYmVmb3JlIGVucXVldWluZy4KKwor ICAgICAgICBBIHByZXZpb3VzIHZlcnNpb24gb2YgdGhpcyBwYXRjaCBleHBvc2VkIHNvbWUgZXJy b3JzIHdoaWNoIGNhdXNlZCBmYWlsaW5nIHRlc3RzOgorCisgICAgICAgIEluIHNvdXJjZUJ1ZmZl clByaXZhdGVEaWRSZWNlaXZlU2FtcGxlKCksIHdlIHdlcmUgdXNpbmcgbG9jYWwgdmVyc2lvbnMg b2YKKyAgICAgICAgcHJlc2VudGF0aW9uVGltZXN0YW1wIGFuZCBkZWNvZGVUaW1lc3RhbXAgYXMg a2V5cyB0byB0aGUgZGVjb2RlUXVldWU7IHRob3NlIGxvY2FsIHZlcnNpb25zCisgICAgICAgIHdl cmUgZmxvYXRpbmcgcG9pbnQgdmFsdWVzIChiZWNhdXNlIE1lZGlhVGltZSArIGZsb2F0ID0gZmxv YXQpLCBidXQgdGhlIHNhbXBsZSBpdHNlbGYgdXNlcworICAgICAgICBub24tZmxvYXRpbmcgcG9p bnQgTWVkaWFUaW1lcy4gVGhpcyBjYXVzZXMgc2FtcGxlcyB0byBiZSBsZWZ0IGluIHRoZSBxdWV1 ZSB3aGVuIHRoZXkgc2hvdWxkCisgICAgICAgIGJlIHJlbW92ZWQuCisKKyAgICAgICAgSW4gZGlk QmVjb21lUmVhZHlGb3JNb3JlU2FtcGxlcygpLCB3ZSB3ZXJlIGdldHRpbmcgc3B1cmlvdXMgYXNz ZXJ0aW9ucyB3aGVuIGEKKyAgICAgICAgQVZTYW1wbGVCdWZmZXJEaXNwbGF5TGF5ZXIgb3IgYSBB VlNhbXBsZUJ1ZmZlckF1ZGlvUmVuZGVyZXIgd291bGQgZmlyZSBhIGNhbGxiYWNrIGZyb20KKyAg ICAgICAgLXJlcXVlc3RNZWRpYURhdGFXaGVuUmVhZHlPblF1ZXVlOnVzaW5nQmxvY2s6IGV2ZW4g YWZ0ZXIgaXQgaGFkIGJlZW4gdG9sZCB0bworICAgICAgICAtc3RvcFJlcXVlc3RpbmdNZWRpYURh dGEuIEFwcGFyZW50bHkgaXQncyBleHBlY3RlZCBiZWhhdmlvciBhbmQgc28gYW4gQVNTRVJUX05P VF9SRUFDSEVEIGlzCisgICAgICAgIGluYXBwcm9wcmlhdGUgaGVyZS4KKworICAgICAgICAqIE1v ZHVsZXMvbWVkaWFzb3VyY2UvU291cmNlQnVmZmVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNv dXJjZUJ1ZmZlcjo6c291cmNlQnVmZmVyUHJpdmF0ZURpZFJlY2VpdmVTYW1wbGUpOgorICAgICAg ICAqIHBsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL1NvdXJjZUJ1ZmZlclByaXZh dGVBVkZPYmpDLm1tOgorICAgICAgICAoV2ViQ29yZTo6U291cmNlQnVmZmVyUHJpdmF0ZUFWRk9i akM6OmlzUmVhZHlGb3JNb3JlU2FtcGxlcyk6CisgICAgICAgIChXZWJDb3JlOjpTb3VyY2VCdWZm ZXJQcml2YXRlQVZGT2JqQzo6ZGlkQmVjb21lUmVhZHlGb3JNb3JlU2FtcGxlcyk6CisKKwogMjAx Ny0wNi0xNiAgU2FtIFdlaW5pZyAgPHNhbUB3ZWJraXQub3JnPgogCiAgICAgICAgIFtXZWJJRExd IFJlbW92ZSBjdXN0b20gYmluZGluZ3MgZm9yIEhUTUxEb2N1bWVudApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXNvdXJjZS9Tb3VyY2VCdWZmZXIuY3BwIGIvU291cmNl L1dlYkNvcmUvTW9kdWxlcy9tZWRpYXNvdXJjZS9Tb3VyY2VCdWZmZXIuY3BwCmluZGV4IDA4NmZl NmFmNGIwM2ZkOTUzYmNiMTA2ZGI4YmE5NWZhNjQ4MWYxZWEuLjRlZjMyNTZjOTQyMDEwYjVjYThj OTMyZTc1NzU5ZjQ4MTAwODlkYjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMv bWVkaWFzb3VyY2UvU291cmNlQnVmZmVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVz L21lZGlhc291cmNlL1NvdXJjZUJ1ZmZlci5jcHAKQEAgLTE1OTUsNyArMTU5NSw3IEBAIHZvaWQg U291cmNlQnVmZmVyOjpzb3VyY2VCdWZmZXJQcml2YXRlRGlkUmVjZWl2ZVNhbXBsZShNZWRpYVNh bXBsZSYgc2FtcGxlKQogICAgICAgICB0cmFja0J1ZmZlci5zYW1wbGVzLmFkZFNhbXBsZShzYW1w bGUpOwogCiAgICAgICAgIGlmICh0cmFja0J1ZmZlci5sYXN0RW5xdWV1ZWREZWNvZGVFbmRUaW1l LmlzSW52YWxpZCgpIHx8IGRlY29kZVRpbWVzdGFtcCA+PSB0cmFja0J1ZmZlci5sYXN0RW5xdWV1 ZWREZWNvZGVFbmRUaW1lKSB7Ci0gICAgICAgICAgICBEZWNvZGVPcmRlclNhbXBsZU1hcDo6S2V5 VHlwZSBkZWNvZGVLZXkoZGVjb2RlVGltZXN0YW1wLCBwcmVzZW50YXRpb25UaW1lc3RhbXApOwor ICAgICAgICAgICAgRGVjb2RlT3JkZXJTYW1wbGVNYXA6OktleVR5cGUgZGVjb2RlS2V5KHNhbXBs ZS5kZWNvZGVUaW1lKCksIHNhbXBsZS5wcmVzZW50YXRpb25UaW1lKCkpOwogICAgICAgICAgICAg dHJhY2tCdWZmZXIuZGVjb2RlUXVldWUuaW5zZXJ0KERlY29kZU9yZGVyU2FtcGxlTWFwOjpNYXBU eXBlOjp2YWx1ZV90eXBlKGRlY29kZUtleSwgJnNhbXBsZSkpOwogICAgICAgICB9CiAKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpj L1NvdXJjZUJ1ZmZlclByaXZhdGVBVkZPYmpDLm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvU291cmNlQnVmZmVyUHJpdmF0ZUFWRk9iakMubW0K aW5kZXggMzAwODJiN2NlYWY4YmRiNDQ2OTM0Mzk5MDIwYzcwZDE5OTU2OWZiMi4uOWFkYTcwYjVi ZDM4MTE5YmY3NTQyNjdkOWRmYzE0MzM1NjI0M2FhNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvU291cmNlQnVmZmVyUHJpdmF0 ZUFWRk9iakMubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3Vu ZGF0aW9uL29iamMvU291cmNlQnVmZmVyUHJpdmF0ZUFWRk9iakMubW0KQEAgLTEwMDIsOCArMTAw MiwxMiBAQCB2b2lkIFNvdXJjZUJ1ZmZlclByaXZhdGVBVkZPYmpDOjpidWZmZXJXYXNDb25zdW1l ZCgpCiBib29sIFNvdXJjZUJ1ZmZlclByaXZhdGVBVkZPYmpDOjppc1JlYWR5Rm9yTW9yZVNhbXBs ZXMoY29uc3QgQXRvbWljU3RyaW5nJiB0cmFja0lEU3RyaW5nKQogewogICAgIGludCB0cmFja0lE ID0gdHJhY2tJRFN0cmluZy50b0ludCgpOwotICAgIGlmICh0cmFja0lEID09IG1fZW5hYmxlZFZp ZGVvVHJhY2tJRCkKLSAgICAgICAgcmV0dXJuICFtX2RlY29tcHJlc3Npb25TZXNzaW9uIHx8IG1f ZGVjb21wcmVzc2lvblNlc3Npb24tPmlzUmVhZHlGb3JNb3JlTWVkaWFEYXRhKCk7CisgICAgaWYg KHRyYWNrSUQgPT0gbV9lbmFibGVkVmlkZW9UcmFja0lEKSB7CisgICAgICAgIGlmIChtX2RlY29t cHJlc3Npb25TZXNzaW9uKQorICAgICAgICAgICAgcmV0dXJuIG1fZGVjb21wcmVzc2lvblNlc3Np b24tPmlzUmVhZHlGb3JNb3JlTWVkaWFEYXRhKCk7CisKKyAgICAgICAgcmV0dXJuIFttX2Rpc3Bs YXlMYXllciBpc1JlYWR5Rm9yTW9yZU1lZGlhRGF0YV07CisgICAgfQogCiAgICAgaWYgKG1fYXVk aW9SZW5kZXJlcnMuY29udGFpbnModHJhY2tJRCkpCiAgICAgICAgIHJldHVybiBbbV9hdWRpb1Jl bmRlcmVycy5nZXQodHJhY2tJRCkgaXNSZWFkeUZvck1vcmVNZWRpYURhdGFdOwpAQCAtMTA0OSwx MCArMTA1Myw4IEBAIHZvaWQgU291cmNlQnVmZmVyUHJpdmF0ZUFWRk9iakM6OmRpZEJlY29tZVJl YWR5Rm9yTW9yZVNhbXBsZXMoaW50IHRyYWNrSUQpCiAgICAgICAgIFttX2Rpc3BsYXlMYXllciBz dG9wUmVxdWVzdGluZ01lZGlhRGF0YV07CiAgICAgfSBlbHNlIGlmIChtX2F1ZGlvUmVuZGVyZXJz LmNvbnRhaW5zKHRyYWNrSUQpKQogICAgICAgICBbbV9hdWRpb1JlbmRlcmVycy5nZXQodHJhY2tJ RCkgc3RvcFJlcXVlc3RpbmdNZWRpYURhdGFdOwotICAgIGVsc2UgewotICAgICAgICBBU1NFUlRf Tk9UX1JFQUNIRUQoKTsKKyAgICBlbHNlCiAgICAgICAgIHJldHVybjsKLSAgICB9CiAKICAgICBp ZiAobV9jbGllbnQpCiAgICAgICAgIG1fY2xpZW50LT5zb3VyY2VCdWZmZXJQcml2YXRlRGlkQmVj b21lUmVhZHlGb3JNb3JlU2FtcGxlcyhBdG9taWNTdHJpbmc6Om51bWJlcih0cmFja0lEKSk7Cg==