134208 2014-06-23 12:36:25 -0700 Reduce synchronous layout triggered by JavaScript-based media controls 2014-06-23 14:01:48 -0700 1 1 1 Unclassified WebKit WebCore Misc. 412.x Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 joepeck webkit-unassigned calvaris commit-queue dino eric.carlson glenn jer.noble kling philipj sergio oldest_to_newest 1017645 0 joepeck 2014-06-23 12:36:25 -0700 JavaScript-based media controls are triggering synchronous layout potentially multiple times during page loads with media elements. This causes unnecessary work during page loads. Specifically, the Apple and iOS media controls updateProgress methods, querying the offsetWidth/offsetHeight of the timeline: > updateProgress: function() { > Controller.prototype.updateProgress.call(this); > > var width = this.controls.timeline.offsetWidth; > var height = this.controls.timeline.offsetHeight; > ... > } During a normal page load of a <video controls url="..."> this gets triggered 8 times. We should be able to reduce that. 1017650 1 233628 joepeck 2014-06-23 12:47:59 -0700 Created attachment 233628 [PATCH] Proposed Fix Based on measurements from Andreas this improved PLT by ~0.5%. It reduces the number of calls to offsetWidth from 8 to 3 when just loading a page with a video and controls. I see one possible issue with this patch, if the media element itself changes size the cached values may be wrong. That is because the timeline is flex based and we do not know when the element itself changed size. So that may be a regression that could be addressed later. 1017675 2 233628 commit-queue 2014-06-23 14:01:44 -0700 Comment on attachment 233628 [PATCH] Proposed Fix Clearing flags on attachment: 233628 Committed r170315: <http://trac.webkit.org/changeset/170315> 1017676 3 commit-queue 2014-06-23 14:01:48 -0700 All reviewed patches have been landed. Closing bug. 233628 2014-06-23 12:47:59 -0700 2014-06-23 14:01:44 -0700 [PATCH] Proposed Fix media-controls.patch text/plain 9425 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA1NmE2N2ZjLi5kMDY4NzBiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNTMg QEAKKzIwMTQtMDYtMjMgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKwor ICAgICAgICBSZWR1Y2Ugc3luY2hyb25vdXMgbGF5b3V0IHRyaWdnZXJlZCBieSBKYXZhU2NyaXB0 LWJhc2VkIG1lZGlhIGNvbnRyb2xzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xMzQyMDgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBBdm9pZCBhbHdheXMgcXVlcnlpbmcgdGhlIG9mZnNldFdpZHRoIGFuZCBv ZmZzZXRIZWlnaHQgb2YgdGhlIHRpbWVsaW5lCisgICAgICAgIGJ5IG9ubHkgY2FsY3VsYXRpbmcg dGhlc2UgdmFsdWVzIHdoZW4gdGhlIHRpbWVsaW5lIG1heSBjaGFuZ2Ugc2l6ZS4KKyAgICAgICAg QWxzbyBhdm9pZCBkb2luZyB3b3JrIGluIGEgZmV3IGNhc2VzIHdoZXJlIHByb3BlcnRpZXMgZGlk IG5vdAorICAgICAgICBhY3R1YWxseSBjaGFuZ2UuCisKKyAgICAgICAgKiBNb2R1bGVzL21lZGlh Y29udHJvbHMvbWVkaWFDb250cm9sc0FwcGxlLmpzOgorICAgICAgICAoQ29udHJvbGxlcik6CisK KyAgICAgICAgKENvbnRyb2xsZXIucHJvdG90eXBlLnNldE5lZWRzVGltZWxpbmVNZXRyaWNzVXBk YXRlKToKKyAgICAgICAgKENvbnRyb2xsZXIucHJvdG90eXBlLnVwZGF0ZVRpbWVsaW5lTWV0cmlj c0lmTmVlZGVkKToKKyAgICAgICAgT25seSB1cGRhdGUgdGhlIHRpbWVsaW5lIG1ldHJpY3Mgd2hl biB0aGV5IG1heSBoYXZlIGNoYW5nZWQuCisKKyAgICAgICAgKENvbnRyb2xsZXIucHJvdG90eXBl LnVwZGF0ZUNvbnRyb2xzKToKKyAgICAgICAgKENvbnRyb2xsZXIucHJvdG90eXBlLmhhbmRsZVRp bWVsaW5lTW91c2VNb3ZlKToKKyAgICAgICAgKENvbnRyb2xsZXIucHJvdG90eXBlLnByb2dyZXNz RmlsbFN0eWxlKToKKyAgICAgICAgKENvbnRyb2xsZXIucHJvdG90eXBlLnNob3dDb250cm9scyk6 CisgICAgICAgIChDb250cm9sbGVyLnByb3RvdHlwZS5hZGRDb250cm9scyk6CisgICAgICAgIE1h cmsgdGltZWxpbmUgbWV0cmljcyBuZWVkIHVwZGF0ZSBiYXNlZCBvbiB2YXJpb3VzIFVJIGNoYW5n ZXMuCisKKyAgICAgICAgKENvbnRyb2xsZXIucHJvdG90eXBlLnNldFN0YXR1c0hpZGRlbik6Cisg ICAgICAgIE9ubHkgZG8gd29yayBpZiB0aGUgaGlkZGVuIHN0YXR1cyBjaGFuZ2VkLgorICAgICAg ICBNYXJrIHRpbWVsaW5lIG1ldHJpY3MgbmVlZCB1cGRhdGUgaWYgdGhlIHRpbWVsaW5lIGlzIGNo YW5nZWQuCisKKyAgICAgICAgKENvbnRyb2xsZXIucHJvdG90eXBlLnVwZGF0ZVByb2dyZXNzKToK KyAgICAgICAgVXNlIGNhY2hlZCB0aW1lbGluZSBtZXRyaWNzIGluc3RlYWQgb2YgYWx3YXlzIHF1 ZXJ5aW5nIG9mZnNldFdpZHRoL29mZnNldEhlaWdodC4KKworICAgICAgICAqIE1vZHVsZXMvbWVk aWFjb250cm9scy9tZWRpYUNvbnRyb2xzaU9TLmpzOgorICAgICAgICAoQ29udHJvbGxlcklPUyk6 CisgICAgICAgIChDb250cm9sbGVySU9TLnByb3RvdHlwZS51cGRhdGVDb250cm9scyk6CisKKyAg ICAgICAgKENvbnRyb2xsZXJJT1MucHJvdG90eXBlLnVwZGF0ZVByb2dyZXNzKToKKyAgICAgICAg VXNlIGNhY2hlZCB0aW1lbGluZSBtZXRyaWNzIGluc3RlYWQgb2YgYWx3YXlzIHF1ZXJ5aW5nIG9m ZnNldFdpZHRoL29mZnNldEhlaWdodC4KKworICAgICAgICAoQ29udHJvbGxlcklPUy5wcm90b3R5 cGUuaGFuZGxlV2lyZWxlc3NQbGF5YmFja0NoYW5nZSk6CisgICAgICAgIE1hcmsgdGltZWxpbmUg bWV0cmljcyBuZWVkIHVwZGF0ZSBhcyBidXR0b24gbWF5IGhhdmUgY2hhbmdlZC4KKworICAgICAg ICAoQ29udHJvbGxlcklPUy5wcm90b3R5cGUuaGFuZGxlV2lyZWxlc3NUYXJnZXRBdmFpbGFibGVD aGFuZ2UpOgorICAgICAgICBPbmx5IGRvIHdvcmsgaWYgdGhlIGF2YWlsYWJpbGl0eSBjaGFuZ2Vk LgorICAgICAgICBNYXJrIHRpbWVsaW5lIG1ldHJpY3MgbmVlZCB1cGRhdGUgYXMgYSBuZXcgYnV0 dG9uIG1heSBoYXZlIGFwcGVhcmVkLgorCisgICAgICAgIChDb250cm9sbGVySU9TLnByb3RvdHlw ZS5zZXQgcGFnZVNjYWxlRmFjdG9yKToKKyAgICAgICAgT25seSBkbyB3b3JrIGlmIHRoZSBwYWdl IHNjYWxlIGZhY3RvciBjaGFuZ2VkLgorCiAyMDE0LTA2LTIzICBKZXIgTm9ibGUgIDxqZXIubm9i bGVAYXBwbGUuY29tPgogCiAgICAgICAgIFtNYWNdIFVuY2F1Z2h0IGV4Y2VwdGlvbiBjcmFzaCB3 aGVuIGRlc3Ryb3lpbmcgTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYWNvbnRyb2xzL21lZGlhQ29udHJvbHNB cHBsZS5qcyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFjb250cm9scy9tZWRpYUNvbnRy b2xzQXBwbGUuanMKaW5kZXggMTgzZjFhNC4uZDY3OGIxMCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvTW9kdWxlcy9tZWRpYWNvbnRyb2xzL21lZGlhQ29udHJvbHNBcHBsZS5qcworKysgYi9T b3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhY29udHJvbHMvbWVkaWFDb250cm9sc0FwcGxlLmpz CkBAIC0xMSw2ICsxMSw3IEBAIGZ1bmN0aW9uIENvbnRyb2xsZXIocm9vdCwgdmlkZW8sIGhvc3Qp CiAgICAgdGhpcy5jb250cm9scyA9IHt9OwogICAgIHRoaXMubGlzdGVuZXJzID0ge307CiAgICAg dGhpcy5pc0xpdmUgPSBmYWxzZTsKKyAgICB0aGlzLnN0YXR1c0hpZGRlbiA9IHRydWU7CiAKICAg ICB0aGlzLmFkZFZpZGVvTGlzdGVuZXJzKCk7CiAgICAgdGhpcy5jcmVhdGVCYXNlKCk7CkBAIC0y NTAsNiArMjUxLDIxIEBAIENvbnRyb2xsZXIucHJvdG90eXBlID0gewogICAgICAgICByZXR1cm4g dGhpcy52aWRlby5jb250cm9scyB8fCB0aGlzLmlzRnVsbFNjcmVlbigpOwogICAgIH0sCiAKKyAg ICBzZXROZWVkc1RpbWVsaW5lTWV0cmljc1VwZGF0ZTogZnVuY3Rpb24oKQorICAgIHsKKyAgICAg ICAgdGhpcy50aW1lbGluZU1ldHJpY3NOZWVkc1VwZGF0ZSA9IHRydWU7CisgICAgfSwKKworICAg IHVwZGF0ZVRpbWVsaW5lTWV0cmljc0lmTmVlZGVkOiBmdW5jdGlvbigpCisgICAgeworICAgICAg ICBpZiAodGhpcy50aW1lbGluZU1ldHJpY3NOZWVkc1VwZGF0ZSkgeworICAgICAgICAgICAgdGhp cy50aW1lbGluZUxlZnQgPSB0aGlzLmNvbnRyb2xzLnRpbWVsaW5lLm9mZnNldExlZnQ7CisgICAg ICAgICAgICB0aGlzLnRpbWVsaW5lV2lkdGggPSB0aGlzLmNvbnRyb2xzLnRpbWVsaW5lLm9mZnNl dFdpZHRoOworICAgICAgICAgICAgdGhpcy50aW1lbGluZUhlaWdodCA9IHRoaXMuY29udHJvbHMu dGltZWxpbmUub2Zmc2V0SGVpZ2h0OworICAgICAgICAgICAgdGhpcy50aW1lbGluZU1ldHJpY3NO ZWVkc1VwZGF0ZSA9IGZhbHNlOworICAgICAgICB9CisgICAgfSwKKwogICAgIHVwZGF0ZUJhc2U6 IGZ1bmN0aW9uKCkKICAgICB7CiAgICAgICAgIGlmICh0aGlzLnNob3VsZEhhdmVBbnlVSSgpKSB7 CkBAIC00ODAsNiArNDk2LDcgQEAgQ29udHJvbGxlci5wcm90b3R5cGUgPSB7CiAgICAgICAgIGVs c2UKICAgICAgICAgICAgIHRoaXMuc2V0Q29udHJvbHNUeXBlKENvbnRyb2xsZXIuSW5saW5lQ29u dHJvbHMpOwogCisgICAgICAgIHRoaXMuc2V0TmVlZHNUaW1lbGluZU1ldHJpY3NVcGRhdGUoKTsK ICAgICB9LAogCiAgICAgdXBkYXRlU3RhdHVzRGlzcGxheTogZnVuY3Rpb24oZXZlbnQpCkBAIC03 MjMsOSArNzQwLDEwIEBAIENvbnRyb2xsZXIucHJvdG90eXBlID0gewogICAgICAgICBpZiAodGhp cy5jb250cm9scy50aHVtYm5haWwuY2xhc3NMaXN0LmNvbnRhaW5zKHRoaXMuQ2xhc3NOYW1lcy5o aWRkZW4pKQogICAgICAgICAgICAgcmV0dXJuOwogCisgICAgICAgIHRoaXMudXBkYXRlVGltZWxp bmVNZXRyaWNzSWZOZWVkZWQoKTsKICAgICAgICAgdGhpcy5jb250cm9scy50aHVtYm5haWwuY2xh c3NMaXN0LmFkZCh0aGlzLkNsYXNzTmFtZXMuc2hvdyk7CiAgICAgICAgIHZhciBsb2NhbFBvaW50 ID0gd2Via2l0Q29udmVydFBvaW50RnJvbVBhZ2VUb05vZGUodGhpcy5jb250cm9scy50aW1lbGlu ZSwgbmV3IFdlYktpdFBvaW50KGV2ZW50LmNsaWVudFgsIGV2ZW50LmNsaWVudFkpKTsKLSAgICAg ICAgdmFyIHBlcmNlbnQgPSAobG9jYWxQb2ludC54IC0gdGhpcy5jb250cm9scy50aW1lbGluZS5v ZmZzZXRMZWZ0KSAvIHRoaXMuY29udHJvbHMudGltZWxpbmUub2Zmc2V0V2lkdGg7CisgICAgICAg IHZhciBwZXJjZW50ID0gKGxvY2FsUG9pbnQueCAtIHRoaXMudGltZWxpbmVMZWZ0KSAvIHRoaXMu dGltZWxpbmVXaWR0aDsKICAgICAgICAgcGVyY2VudCA9IE1hdGgubWF4KE1hdGgubWluKDEsIHBl cmNlbnQpLCAwKTsKICAgICAgICAgdGhpcy5jb250cm9scy50aHVtYm5haWwuc3R5bGUubGVmdCA9 IHBlcmNlbnQgKiAxMDAgKyAnJSc7CiAKQEAgLTg5Nyw3ICs5MTUsNyBAQCBDb250cm9sbGVyLnBy b3RvdHlwZSA9IHsKIAogICAgIHByb2dyZXNzRmlsbFN0eWxlOiBmdW5jdGlvbihjb250ZXh0KQog ICAgIHsKLSAgICAgICAgdmFyIGhlaWdodCA9IHRoaXMuY29udHJvbHMudGltZWxpbmUub2Zmc2V0 SGVpZ2h0OworICAgICAgICB2YXIgaGVpZ2h0ID0gdGhpcy50aW1lbGluZUhlaWdodDsKICAgICAg ICAgdmFyIGdyYWRpZW50ID0gY29udGV4dC5jcmVhdGVMaW5lYXJHcmFkaWVudCgwLCAwLCAwLCBo ZWlnaHQpOwogICAgICAgICBncmFkaWVudC5hZGRDb2xvclN0b3AoMCwgJ3JnYigyLCAyLCAyKScp OwogICAgICAgICBncmFkaWVudC5hZGRDb2xvclN0b3AoMSwgJ3JnYigyMywgMjMsIDIzKScpOwpA QCAtOTA2LDggKzkyNCwxMSBAQCBDb250cm9sbGVyLnByb3RvdHlwZSA9IHsKIAogICAgIHVwZGF0 ZVByb2dyZXNzOiBmdW5jdGlvbigpCiAgICAgewotICAgICAgICB2YXIgd2lkdGggPSB0aGlzLmNv bnRyb2xzLnRpbWVsaW5lLm9mZnNldFdpZHRoOwotICAgICAgICB2YXIgaGVpZ2h0ID0gdGhpcy5j b250cm9scy50aW1lbGluZS5vZmZzZXRIZWlnaHQ7CisgICAgICAgIHRoaXMudXBkYXRlVGltZWxp bmVNZXRyaWNzSWZOZWVkZWQoKTsKKworICAgICAgICB2YXIgd2lkdGggPSB0aGlzLnRpbWVsaW5l V2lkdGg7CisgICAgICAgIHZhciBoZWlnaHQgPSB0aGlzLnRpbWVsaW5lSGVpZ2h0OworCiAgICAg ICAgIHZhciBjb250ZXh0ID0gZG9jdW1lbnQuZ2V0Q1NTQ2FudmFzQ29udGV4dCgnMmQnLCAndGlt ZWxpbmUtJyArIHRoaXMudGltZWxpbmVJRCwgd2lkdGgsIGhlaWdodCk7CiAgICAgICAgIGNvbnRl eHQuY2xlYXJSZWN0KDAsIDAsIHdpZHRoLCBoZWlnaHQpOwogCkBAIC05NzAsNiArOTkxLDggQEAg Q29udHJvbGxlci5wcm90b3R5cGUgPSB7CiAgICAgewogICAgICAgICB0aGlzLmNvbnRyb2xzLnBh bmVsLmNsYXNzTGlzdC5hZGQodGhpcy5DbGFzc05hbWVzLnNob3cpOwogICAgICAgICB0aGlzLmNv bnRyb2xzLnBhbmVsLmNsYXNzTGlzdC5yZW1vdmUodGhpcy5DbGFzc05hbWVzLmhpZGRlbik7CisK KyAgICAgICAgdGhpcy5zZXROZWVkc1RpbWVsaW5lTWV0cmljc1VwZGF0ZSgpOwogICAgIH0sCiAK ICAgICBoaWRlQ29udHJvbHM6IGZ1bmN0aW9uKCkKQEAgLTk5Miw2ICsxMDE1LDcgQEAgQ29udHJv bGxlci5wcm90b3R5cGUgPSB7CiAgICAgYWRkQ29udHJvbHM6IGZ1bmN0aW9uKCkKICAgICB7CiAg ICAgICAgIHRoaXMuYmFzZS5hcHBlbmRDaGlsZCh0aGlzLmNvbnRyb2xzLnBhbmVsKTsKKyAgICAg ICAgdGhpcy5zZXROZWVkc1RpbWVsaW5lTWV0cmljc1VwZGF0ZSgpOwogICAgIH0sCiAKICAgICB1 cGRhdGVUaW1lOiBmdW5jdGlvbigpCkBAIC0xMDEwLDExICsxMDM0LDE3IEBAIENvbnRyb2xsZXIu cHJvdG90eXBlID0gewogCiAgICAgc2V0U3RhdHVzSGlkZGVuOiBmdW5jdGlvbihoaWRkZW4pCiAg ICAgeworICAgICAgICBpZiAodGhpcy5zdGF0dXNIaWRkZW4gPT09IGhpZGRlbikKKyAgICAgICAg ICAgIHJldHVybjsKKworICAgICAgICB0aGlzLnN0YXR1c0hpZGRlbiA9IGhpZGRlbjsKKwogICAg ICAgICBpZiAoaGlkZGVuKSB7CiAgICAgICAgICAgICB0aGlzLmNvbnRyb2xzLnN0YXR1c0Rpc3Bs YXkuY2xhc3NMaXN0LmFkZCh0aGlzLkNsYXNzTmFtZXMuaGlkZGVuKTsKICAgICAgICAgICAgIHRo aXMuY29udHJvbHMuY3VycmVudFRpbWUuY2xhc3NMaXN0LnJlbW92ZSh0aGlzLkNsYXNzTmFtZXMu aGlkZGVuKTsKICAgICAgICAgICAgIHRoaXMuY29udHJvbHMudGltZWxpbmUuY2xhc3NMaXN0LnJl bW92ZSh0aGlzLkNsYXNzTmFtZXMuaGlkZGVuKTsKICAgICAgICAgICAgIHRoaXMuY29udHJvbHMu cmVtYWluaW5nVGltZS5jbGFzc0xpc3QucmVtb3ZlKHRoaXMuQ2xhc3NOYW1lcy5oaWRkZW4pOwor ICAgICAgICAgICAgdGhpcy5zZXROZWVkc1RpbWVsaW5lTWV0cmljc1VwZGF0ZSgpOwogICAgICAg ICB9IGVsc2UgewogICAgICAgICAgICAgdGhpcy5jb250cm9scy5zdGF0dXNEaXNwbGF5LmNsYXNz TGlzdC5yZW1vdmUodGhpcy5DbGFzc05hbWVzLmhpZGRlbik7CiAgICAgICAgICAgICB0aGlzLmNv bnRyb2xzLmN1cnJlbnRUaW1lLmNsYXNzTGlzdC5hZGQodGhpcy5DbGFzc05hbWVzLmhpZGRlbik7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhY29udHJvbHMvbWVkaWFD b250cm9sc2lPUy5qcyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFjb250cm9scy9tZWRp YUNvbnRyb2xzaU9TLmpzCmluZGV4IDQxNDA5NzIuLjgwN2ZkZWIgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFjb250cm9scy9tZWRpYUNvbnRyb2xzaU9TLmpzCisrKyBi L1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFjb250cm9scy9tZWRpYUNvbnRyb2xzaU9TLmpz CkBAIC0xMSw2ICsxMSw3IEBAIGZ1bmN0aW9uIENvbnRyb2xsZXJJT1Mocm9vdCwgdmlkZW8sIGhv c3QpCiAKICAgICB0aGlzLnVwZGF0ZVdpcmVsZXNzVGFyZ2V0QXZhaWxhYmxlKCk7CiAgICAgdGhp cy51cGRhdGVXaXJlbGVzc1BsYXliYWNrU3RhdHVzKCk7CisgICAgdGhpcy5zZXROZWVkc1RpbWVs aW5lTWV0cmljc1VwZGF0ZSgpOwogCiAgICAgaG9zdC5jb250cm9sc0RlcGVuZE9uUGFnZVNjYWxl RmFjdG9yID0gdHJ1ZTsKIH07CkBAIC0yMTUsNiArMjE2LDcgQEAgQ29udHJvbGxlcklPUy5wcm90 b3R5cGUgPSB7CiAgICAgICAgIGVsc2UKICAgICAgICAgICAgIHRoaXMuc2V0Q29udHJvbHNUeXBl KENvbnRyb2xsZXIuSW5saW5lQ29udHJvbHMpOwogCisgICAgICAgIHRoaXMuc2V0TmVlZHNUaW1l bGluZU1ldHJpY3NVcGRhdGUoKTsKICAgICB9LAogCiAgICAgdXBkYXRlVGltZTogZnVuY3Rpb24o KSB7CkBAIC0yMjksOCArMjMxLDggQEAgQ29udHJvbGxlcklPUy5wcm90b3R5cGUgPSB7CiAgICAg dXBkYXRlUHJvZ3Jlc3M6IGZ1bmN0aW9uKCkgewogICAgICAgICBDb250cm9sbGVyLnByb3RvdHlw ZS51cGRhdGVQcm9ncmVzcy5jYWxsKHRoaXMpOwogCi0gICAgICAgIHZhciB3aWR0aCA9IHRoaXMu Y29udHJvbHMudGltZWxpbmUub2Zmc2V0V2lkdGg7Ci0gICAgICAgIHZhciBoZWlnaHQgPSB0aGlz LmNvbnRyb2xzLnRpbWVsaW5lLm9mZnNldEhlaWdodDsKKyAgICAgICAgdmFyIHdpZHRoID0gdGhp cy50aW1lbGluZVdpZHRoOworICAgICAgICB2YXIgaGVpZ2h0ID0gdGhpcy50aW1lbGluZUhlaWdo dDsKIAogICAgICAgICAvLyBNYWdpYyBudW1iZXIsIG1hdGNoaW5nIHRoZSB2YWx1ZSBmb3IgOjot d2Via2l0LW1lZGlhLWNvbnRyb2xzLXRpbWVsaW5lOjotd2Via2l0LXNsaWRlci10aHVtYgogICAg ICAgICAvLyBpbiBtZWRpYUNvbnRyb2xzaU9TLmNzcy4gU2luY2Ugd2UgY2Fubm90IGFzayB0aGUg dGh1bWIgZm9yIGl0cyBvZmZzZXRXaWR0aCBhcyBpdCdzIGluIGl0cyBvd24KQEAgLTM4OSwxMSAr MzkxLDE3IEBAIENvbnRyb2xsZXJJT1MucHJvdG90eXBlID0gewogCiAgICAgaGFuZGxlV2lyZWxl c3NQbGF5YmFja0NoYW5nZTogZnVuY3Rpb24oZXZlbnQpIHsKICAgICAgICAgdGhpcy51cGRhdGVX aXJlbGVzc1BsYXliYWNrU3RhdHVzKCk7CisgICAgICAgIHRoaXMuc2V0TmVlZHNUaW1lbGluZU1l dHJpY3NVcGRhdGUoKTsKICAgICB9LAogCiAgICAgaGFuZGxlV2lyZWxlc3NUYXJnZXRBdmFpbGFi bGVDaGFuZ2U6IGZ1bmN0aW9uKGV2ZW50KSB7Ci0gICAgICAgIHRoaXMuaGFzV2lyZWxlc3NQbGF5 YmFja1RhcmdldHMgPSBldmVudC5hdmFpbGFiaWxpdHkgPT0gImF2YWlsYWJsZSI7CisgICAgICAg IHZhciB3aXJlbGVzc1BsYXliYWNrVGFyZ2V0c0F2YWlsYWJsZSA9IGV2ZW50LmF2YWlsYWJpbGl0 eSA9PSAiYXZhaWxhYmxlIjsKKyAgICAgICAgaWYgKHRoaXMuaGFzV2lyZWxlc3NQbGF5YmFja1Rh cmdldHMgPT09IHdpcmVsZXNzUGxheWJhY2tUYXJnZXRzQXZhaWxhYmxlKQorICAgICAgICAgICAg cmV0dXJuOworCisgICAgICAgIHRoaXMuaGFzV2lyZWxlc3NQbGF5YmFja1RhcmdldHMgPSB3aXJl bGVzc1BsYXliYWNrVGFyZ2V0c0F2YWlsYWJsZTsKICAgICAgICAgdGhpcy51cGRhdGVXaXJlbGVz c1RhcmdldEF2YWlsYWJsZSgpOworICAgICAgICB0aGlzLnNldE5lZWRzVGltZWxpbmVNZXRyaWNz VXBkYXRlKCk7CiAgICAgfSwKIAogICAgIGhhbmRsZVdpcmVsZXNzUGlja2VyQnV0dG9uVG91Y2hT dGFydDogZnVuY3Rpb24oKSB7CkBAIC00MTYsNiArNDI0LDkgQEAgQ29udHJvbGxlcklPUy5wcm90 b3R5cGUgPSB7CiAgICAgfSwKIAogICAgIHNldCBwYWdlU2NhbGVGYWN0b3IobmV3U2NhbGVGYWN0 b3IpIHsKKyAgICAgICAgaWYgKHRoaXMuX3BhZ2VTY2FsZUZhY3RvciA9PT0gbmV3U2NhbGVGYWN0 b3IpCisgICAgICAgICAgICByZXR1cm47CisKICAgICAgICAgdGhpcy5fcGFnZVNjYWxlRmFjdG9y ID0gbmV3U2NhbGVGYWN0b3I7CiAKICAgICAgICAgaWYgKG5ld1NjYWxlRmFjdG9yKSB7CkBAIC00 MjUsNiArNDM2LDcgQEAgQ29udHJvbGxlcklPUy5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICBp ZiAodGhpcy5jb250cm9scy5wYW5lbCkgewogICAgICAgICAgICAgICAgIHRoaXMuY29udHJvbHMu cGFuZWwuc3R5bGUud2lkdGggPSAobmV3U2NhbGVGYWN0b3IgKiAxMDApICsgIiUiOwogICAgICAg ICAgICAgICAgIHRoaXMuY29udHJvbHMucGFuZWwuc3R5bGUud2Via2l0VHJhbnNmb3JtID0gc2Nh bGVUcmFuc2Zvcm07CisgICAgICAgICAgICAgICAgdGhpcy5zZXROZWVkc1RpbWVsaW5lTWV0cmlj c1VwZGF0ZSgpOwogICAgICAgICAgICAgICAgIHRoaXMudXBkYXRlUHJvZ3Jlc3MoKTsKICAgICAg ICAgICAgIH0KICAgICAgICAgfQo=