142188 2015-03-02 14:48:21 -0800 Update backgrounds of sliders for inline media controls on OS X 2015-03-02 15:12:18 -0800 1 1 1 Unclassified WebKit Media 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 roger_fong webkit-unassigned oldest_to_newest 1073445 0 roger_fong 2015-03-02 14:48:21 -0800 Draw sliders for media controls using 2d canvases instead. rdar://problem/20012413 1073449 1 247701 roger_fong 2015-03-02 14:53:09 -0800 Created attachment 247701 patch Patch already reviewed by dino. Just moving it to this bug. 1073455 2 roger_fong 2015-03-02 14:55:49 -0800 https://bugs.webkit.org/show_bug.cgi?id=142138 1073456 3 roger_fong 2015-03-02 14:56:02 -0800 (In reply to comment #2) > https://bugs.webkit.org/show_bug.cgi?id=142138 was where the patch was reviewed. 1073461 4 roger_fong 2015-03-02 15:12:18 -0800 Landed: http://trac.webkit.org/changeset/180898 247701 2015-03-02 14:53:09 -0800 2015-03-02 14:53:09 -0800 patch patch.patch text/plain 16146 roger_fong SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4MDg5NSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMyIEBACisyMDE1LTAzLTAyICBSb2dlciBG b25nICA8cm9nZXJfZm9uZ0BhcHBsZS5jb20+CisKKyAgICAgICAgVXBkYXRlIGJhY2tncm91bmRz IG9mIHNsaWRlcnMgZm9yIGlubGluZSBtZWRpYSBjb250cm9scyBvbiBPUyBYLgorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQyMTg4LgorICAgICAgICA8 cmRhcjovL3Byb2JsZW0vMjAwMTI0MTM+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRGVhbiBKYWNr c29uLgorCisgICAgICAgIERvbuKAmXQgdXNlIENTUyB0byBkcmF3IHZvbHVtZSBhbmQgdGltZWxp bmUgc2xpZGVyIGJhY2tncm91bmRzLgorICAgICAgICAqIE1vZHVsZXMvbWVkaWFjb250cm9scy9t ZWRpYUNvbnRyb2xzQXBwbGUuY3NzOgorICAgICAgICAodmlkZW86Oi13ZWJraXQtbWVkaWEtY29u dHJvbHMtdm9sdW1lLXNsaWRlcik6CisgICAgICAgIChhdWRpbzo6LXdlYmtpdC1tZWRpYS1jb250 cm9scy12b2x1bWUtc2xpZGVyOjotd2Via2l0LXNsaWRlci10aHVtYik6CisgICAgICAgIChhdWRp bzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy10aW1lbGluZSk6CisgICAgICAgIChhdWRpbzo6LXdl YmtpdC1tZWRpYS1jb250cm9scy10aW1lbGluZTo6LXdlYmtpdC1zbGlkZXItdGh1bWIpOgorICAg ICAgICAoYXVkaW86Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtcGFuZWwgLnRodW1ibmFpbC10cmFj ayk6CisgICAgICAgIChhdWRpbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy12b2x1bWUtc2xpZGVy Ojotd2Via2l0LXNsaWRlci10aHVtYjphY3RpdmU6Oi13ZWJraXQtc2xpZGVyLXRodW1iKTogRGVs ZXRlZC4KKyAgICAgICAgKGF1ZGlvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLXRpbWVsaW5lOmFj dGl2ZTo6LXdlYmtpdC1zbGlkZXItdGh1bWIsKTogRGVsZXRlZC4KKworICAgICAgICBEcmF3IHZv bHVtZSBhbmQgdGltZWxpbmUgc2xpZGVyIGJhY2tncm91bmRzIHVzaW5nIDJkIGNhbnZhc2VzLgor ICAgICAgICAqIE1vZHVsZXMvbWVkaWFjb250cm9scy9tZWRpYUNvbnRyb2xzQXBwbGUuanM6Cisg ICAgICAgIChDb250cm9sbGVyLnByb3RvdHlwZS5jcmVhdGVDb250cm9scyk6CisgICAgICAgIChD b250cm9sbGVyLnByb3RvdHlwZS5oYW5kbGVWb2x1bWVTbGlkZXJJbnB1dCk6CisgICAgICAgIChD b250cm9sbGVyLnByb3RvdHlwZS5hZGRSb3VuZGVkUmVjdCk6CisgICAgICAgIChDb250cm9sbGVy LnByb3RvdHlwZS5kcmF3VGltZWxpbmVCYWNrZ3JvdW5kKToKKyAgICAgICAgKENvbnRyb2xsZXIu cHJvdG90eXBlLmRyYXdWb2x1bWVCYWNrZ3JvdW5kKToKKyAgICAgICAgKENvbnRyb2xsZXIucHJv dG90eXBlLnNob3dDb250cm9scyk6CisgICAgICAgICogTW9kdWxlcy9tZWRpYWNvbnRyb2xzL21l ZGlhQ29udHJvbHNpT1MuanM6CisgICAgICAgIChDb250cm9sbGVySU9TLnByb3RvdHlwZS5hZGRS b3VuZGVkUmVjdCk6IERlbGV0ZWQuCisKIDIwMTUtMDMtMDEgIFJvZ2VyIEZvbmcgIDxyb2dlcl9m b25nQGFwcGxlLmNvbT4KIAogICAgICAgICBVcGRhdGUgaW5saW5lIG1lZGlhIGVsZW1lbnQgY29u dHJvbHMgYXBwZWFyYW5jZSBQYXJ0IDEuCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21l ZGlhY29udHJvbHMvbWVkaWFDb250cm9sc0FwcGxlLmNzcwo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViQ29yZS9Nb2R1bGVzL21lZGlhY29udHJvbHMvbWVkaWFDb250cm9sc0FwcGxlLmNzcwkocmV2 aXNpb24gMTgwODkzKQorKysgU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYWNvbnRyb2xzL21l ZGlhQ29udHJvbHNBcHBsZS5jc3MJKHdvcmtpbmcgY29weSkKQEAgLTIwNiw0MyArMjA2LDE2IEBA IHZpZGVvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLXZvbHVtZS1zbGkKICAgICBtYXJnaW4tcmln aHQ6IDEwcHggIWltcG9ydGFudDsKIAogICAgIGJhY2tncm91bmQtY29sb3I6IHRyYW5zcGFyZW50 ICFpbXBvcnRhbnQ7Ci0gICAgYmFja2dyb3VuZC1pbWFnZTogLXdlYmtpdC1saW5lYXItZ3JhZGll bnQoCi0gICAgICAgIHRvcCwKLSAgICAgICAgcmdiYSgxNSwgMTUsIDE1LCAuODUpIDAsCi0gICAg ICAgIHJnYmEoMjMsIDIzLCAyMywgLjg1KSA1MCUsCi0gICAgICAgIHJnYmEoMTUsIDE1LCAxNSwg Ljg1KSAxMDAlCi0gICAgKSAhaW1wb3J0YW50OwotICAgIGJvcmRlcjogMXB4IHNvbGlkIHJnYmEo MCwgMCwgMCwgMC44NzUpICFpbXBvcnRhbnQ7CisgICAgYmFja2dyb3VuZC1zaXplOiAxMDAlIDEw MCU7CisgICAgYmFja2dyb3VuZC1yZXBlYXQ6IG5vLXJlcGVhdDsKIH0KIAogdmlkZW86Oi13ZWJr aXQtbWVkaWEtY29udHJvbHMtdm9sdW1lLXNsaWRlcjo6LXdlYmtpdC1zbGlkZXItdGh1bWIsCiBh dWRpbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy12b2x1bWUtc2xpZGVyOjotd2Via2l0LXNsaWRl ci10aHVtYiB7CiAgICAgLXdlYmtpdC1hcHBlYXJhbmNlOiBub25lICFpbXBvcnRhbnQ7Ci0gICAg d2lkdGg6IDhweCAhaW1wb3J0YW50OwotICAgIGhlaWdodDogOHB4ICFpbXBvcnRhbnQ7Ci0gICAg Ym9yZGVyLXJhZGl1czogNHB4ICFpbXBvcnRhbnQ7Ci0gICAgYmFja2dyb3VuZC1jb2xvcjogdHJh bnNwYXJlbnQgIWltcG9ydGFudDsKLQotICAgIC8qIHJvdGF0ZVooKSBmb3JjZXMgdGhlIGxheWVy IGludG8gY29tcG9zaXRpbmcgbW9kZS4KLSAgICBTbGlkZXIgdGh1bWJzIGFyZSBzbWFsbCwgc28g Zm9yY2luZyBhIGNvbXBvc2l0aW5nIGxheWVyIGlzIGluZXhwZW5zaXZlLAotICAgICAgIGFuZCBp dCBrZWVwcyB0aGUgc2xpZGVyIGZyb20gaGF2aW5nIHRvIHJlcGFpbnQgd2hpbGUgc2xpZGluZy4g Ki8KLSAgICAtd2Via2l0LXRyYW5zZm9ybTogcm90YXRlWigwKSAhaW1wb3J0YW50OwotICAgIGJh Y2tncm91bmQtaW1hZ2U6IC13ZWJraXQtbGluZWFyLWdyYWRpZW50KAotICAgICAgICBsZWZ0LAot ICAgICAgICByZ2JhKDk5LCA5OSwgOTksIDEpLAotICAgICAgICByZ2JhKDE0NCwgMTQ0LCAxNDQs IDEpCi0gICAgKSAhaW1wb3J0YW50OwotICAgIGJveC1zaGFkb3c6IGluc2V0IC0xcHggMCAwIHJn YmEoMjU1LCAyNTUsIDI1NSwgLjUpLCAwIDFweCByZ2JhKDI1NSwgMjU1LCAyNTUsIC4xNCkgIWlt cG9ydGFudDsKLX0KLXZpZGVvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLXZvbHVtZS1zbGlkZXI6 Oi13ZWJraXQtc2xpZGVyLXRodW1iOjotd2Via2l0LXNsaWRlci10aHVtYjphY3RpdmUsCi12aWRl bzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy12b2x1bWUtc2xpZGVyOjotd2Via2l0LXNsaWRlci10 aHVtYjphY3RpdmU6Oi13ZWJraXQtc2xpZGVyLXRodW1iLAotYXVkaW86Oi13ZWJraXQtbWVkaWEt Y29udHJvbHMtdm9sdW1lLXNsaWRlcjo6LXdlYmtpdC1zbGlkZXItdGh1bWI6Oi13ZWJraXQtc2xp ZGVyLXRodW1iOmFjdGl2ZSwKLWF1ZGlvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLXZvbHVtZS1z bGlkZXI6Oi13ZWJraXQtc2xpZGVyLXRodW1iOmFjdGl2ZTo6LXdlYmtpdC1zbGlkZXItdGh1bWIg ewotICAgIGJhY2tncm91bmQtaW1hZ2U6IC13ZWJraXQtbGluZWFyLWdyYWRpZW50KAotICAgICAg ICByaWdodCB0b3AsCi0gICAgICAgIHJnYmEoMTYwLCAxNjAsIDE2MCwgMSksCi0gICAgICAgIHJn YmEoMjIxLCAyMjEsIDIyMSwgMSkKLSAgICApICFpbXBvcnRhbnQ7CisgICAgd2lkdGg6IDdweCAh aW1wb3J0YW50OworICAgIGhlaWdodDogN3B4ICFpbXBvcnRhbnQ7CisgICAgdmlzaWJpbGl0eTog aGlkZGVuOwogfQogCiB2aWRlbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy1tdXRlLWJ1dHRvbi5t dXRlZCwKQEAgLTM5NSw0NyArMzY4LDIwIEBAIHZpZGVvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xz LXRpbWVsaW5lLAogYXVkaW86Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtdGltZWxpbmUgewogICAg IC13ZWJraXQtYXBwZWFyYW5jZTogbm9uZSAhaW1wb3J0YW50OwogICAgIC13ZWJraXQtZmxleDog MSAxIDAgIWltcG9ydGFudDsKLSAgICBoZWlnaHQ6IDlweCAhaW1wb3J0YW50OworICAgIGhlaWdo dDogMTdweCAhaW1wb3J0YW50OwogICAgIG1hcmdpbjogMCAhaW1wb3J0YW50OwotICAgIGJhY2tn cm91bmQtc2l6ZTogMTAwJSA5cHggIWltcG9ydGFudDsKKyAgICBiYWNrZ3JvdW5kLXNpemU6IDEw MCUgMTAwJSAhaW1wb3J0YW50OworICAgIGJhY2tncm91bmQtcmVwZWF0OiBuby1yZXBlYXQ7Cisg ICAgYmFja2dyb3VuZC1jb2xvcjogdHJhbnNwYXJlbnQ7CiAKLSAgICBib3JkZXItcmFkaXVzOiA0 LjVweCAhaW1wb3J0YW50OwotICAgIGJhY2tncm91bmQtY29sb3I6IHJnYig3NCwgNzQsIDc0KSAh aW1wb3J0YW50OwotICAgIGJveC1zaGFkb3c6IGluc2V0IC0xcHggMCAwIHJnYmEoMCwgMCwgMCwg LjY4KSwgMCAxcHggcmdiYSgyNTUsIDI1NSwgMjU1LCAuMDgpICFpbXBvcnRhbnQ7CiB9CiB2aWRl bzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy10aW1lbGluZTo6LXdlYmtpdC1zbGlkZXItdGh1bWIs CiBhdWRpbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy10aW1lbGluZTo6LXdlYmtpdC1zbGlkZXIt dGh1bWIgewogICAgIC13ZWJraXQtYXBwZWFyYW5jZTogbm9uZSAhaW1wb3J0YW50OwotICAgIHdp ZHRoOjZweCAhaW1wb3J0YW50OwotICAgIGhlaWdodDogNnB4ICFpbXBvcnRhbnQ7Ci0gICAgYmFj a2dyb3VuZC1jb2xvcjogd2hpdGUgIWltcG9ydGFudDsKLQotICAgIC8qIHJvdGF0ZVooKSBmb3Jj ZXMgdGhlIGxheWVyIGludG8gY29tcG9zaXRpbmcgbW9kZS4KLSAgICBTbGlkZXIgdGh1bWJzIGFy ZSBzbWFsbCwgc28gZm9yY2luZyBhIGNvbXBvc2l0aW5nIGxheWVyIGlzIGluZXhwZW5zaXZlLAot ICAgICAgIGFuZCBpdCBrZWVwcyB0aGUgc2xpZGVyIGZyb20gaGF2aW5nIHRvIHJlcGFpbnQgd2hp bGUgc2xpZGluZy4gKi8KLSAgICAtd2Via2l0LXRyYW5zZm9ybTogdHJhbnNsYXRlWSgxcHgpIHJv dGF0ZVooLTQ1ZGVnKSAhaW1wb3J0YW50OwotCi0gICAgYmFja2dyb3VuZC1pbWFnZTogLXdlYmtp dC1ncmFkaWVudCgKLSAgICAgICAgbGluZWFyLAotICAgICAgICBsZWZ0IGJvdHRvbSwKLSAgICAg ICAgcmlnaHQgdG9wLAotICAgICAgICBjb2xvci1zdG9wKDAsIHJnYmEoOTksICA5OSwgIDk5LCAg MSkpLAotICAgICAgICBjb2xvci1zdG9wKDEsIHJnYmEoMTQ0LCAxNDQsIDE0NCwgMSkpCi0gICAg KSAhaW1wb3J0YW50OwotfQotdmlkZW86Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtdGltZWxpbmU6 Oi13ZWJraXQtc2xpZGVyLXRodW1iOmFjdGl2ZSwKLXZpZGVvOjotd2Via2l0LW1lZGlhLWNvbnRy b2xzLXRpbWVsaW5lOmFjdGl2ZTo6LXdlYmtpdC1zbGlkZXItdGh1bWIsCi1hdWRpbzo6LXdlYmtp dC1tZWRpYS1jb250cm9scy10aW1lbGluZTo6LXdlYmtpdC1zbGlkZXItdGh1bWI6YWN0aXZlLAot YXVkaW86Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtdGltZWxpbmU6YWN0aXZlOjotd2Via2l0LXNs aWRlci10aHVtYiwKLSB7Ci0gICAgYmFja2dyb3VuZC1pbWFnZTogLXdlYmtpdC1ncmFkaWVudCgK LSAgICAgICAgbGluZWFyLAotICAgICAgICBsZWZ0IGJvdHRvbSwKLSAgICAgICAgcmlnaHQgdG9w LAotICAgICAgICBjb2xvci1zdG9wKDAsIHJnYmEoMTYwLCAxNjAsIDE2MCwgMSkpLAotICAgICAg ICBjb2xvci1zdG9wKDEsIHJnYmEoMjIxLCAyMjEsIDIyMSwgMSkpCi0gICAgKSAhaW1wb3J0YW50 OworICAgIHdpZHRoOjNweCAhaW1wb3J0YW50OworICAgIGhlaWdodDogMTVweCAhaW1wb3J0YW50 OwogfQorIAogdmlkZW86Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtY3VycmVudC10aW1lLWRpc3Bs YXksCiB2aWRlbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy10aW1lLXJlbWFpbmluZy1kaXNwbGF5 LAogYXVkaW86Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtY3VycmVudC10aW1lLWRpc3BsYXksCkBA IC00ODksNyArNDM1LDcgQEAgdmlkZW86Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtcGFuZWwgLnRo dQogYXVkaW86Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtcGFuZWwgLnRodW1ibmFpbC10cmFjayB7 CiAgICAgcG9zaXRpb246IHJlbGF0aXZlOwogICAgIC13ZWJraXQtZmxleDogMSAxIDA7Ci0gICAg aGVpZ2h0OiA5cHg7CisgICAgaGVpZ2h0OiAxNyBweDsKICAgICBtYXJnaW46IDAgMnB4OwogICAg IGRpc3BsYXk6IC13ZWJraXQtZmxleDsKICAgICAtd2Via2l0LWFsaWduLWl0ZW1zOiBzdHJldGNo OwpJbmRleDogU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYWNvbnRyb2xzL21lZGlhQ29udHJv bHNBcHBsZS5qcwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhY29u dHJvbHMvbWVkaWFDb250cm9sc0FwcGxlLmpzCShyZXZpc2lvbiAxODA4OTMpCisrKyBTb3VyY2Uv V2ViQ29yZS9Nb2R1bGVzL21lZGlhY29udHJvbHMvbWVkaWFDb250cm9sc0FwcGxlLmpzCSh3b3Jr aW5nIGNvcHkpCkBAIC0zOSw2ICszOSw3IEBAIENvbnRyb2xsZXIuRnVsbFNjcmVlbkNvbnRyb2xz ID0gMTsKIAogQ29udHJvbGxlci5QbGF5QWZ0ZXJTZWVraW5nID0gMDsKIENvbnRyb2xsZXIuUGF1 c2VBZnRlclNlZWtpbmcgPSAxOworQ29udHJvbGxlci5nTGFzdFRpbWVsaW5lSWQgPSAwOwogCiBD b250cm9sbGVyLnByb3RvdHlwZSA9IHsKIApAQCAtMzQ0LDYgKzM0NSw5IEBAIENvbnRyb2xsZXIu cHJvdG90eXBlID0gewogICAgICAgICB0aGlzLmxpc3RlbkZvcih0aW1lbGluZSwgJ21vdXNldXAn LCB0aGlzLmhhbmRsZVRpbWVsaW5lTW91c2VVcCk7CiAgICAgICAgIHRpbWVsaW5lLnN0ZXAgPSAu MDE7CiAKKyAgICAgICAgdGhpcy50aW1lbGluZUNvbnRleHROYW1lID0gIl93ZWJraXQtbWVkaWEt Y29udHJvbHMtdGltZWxpbmUtIiArIENvbnRyb2xsZXIuZ0xhc3RUaW1lbGluZUlkOworICAgICAg ICB0aW1lbGluZS5zdHlsZS5iYWNrZ3JvdW5kSW1hZ2UgPSAnLXdlYmtpdC1jYW52YXMoJyArIHRo aXMudGltZWxpbmVDb250ZXh0TmFtZSArICcpJzsKKyAgICAgICAgCiAgICAgICAgIHZhciB0aHVt Ym5haWxUcmFjayA9IHRoaXMuY29udHJvbHMudGh1bWJuYWlsVHJhY2sgPSBkb2N1bWVudC5jcmVh dGVFbGVtZW50KCdkaXYnKTsKICAgICAgICAgdGh1bWJuYWlsVHJhY2suY2xhc3NMaXN0LmFkZCh0 aGlzLkNsYXNzTmFtZXMudGh1bWJuYWlsVHJhY2spOwogCkBAIC0zODksNiArMzkzLDEwIEBAIENv bnRyb2xsZXIucHJvdG90eXBlID0gewogICAgICAgICB2b2x1bWUuc3RlcCA9IC4wMTsKICAgICAg ICAgdGhpcy5saXN0ZW5Gb3Iodm9sdW1lLCAnaW5wdXQnLCB0aGlzLmhhbmRsZVZvbHVtZVNsaWRl cklucHV0KTsKIAorICAgICAgICB0aGlzLnZvbHVtZUNvbnRleHROYW1lID0gIl93ZWJraXQtbWVk aWEtY29udHJvbHMtdm9sdW1lLSIgKyBDb250cm9sbGVyLmdMYXN0VGltZWxpbmVJZDsKKyAgICAg ICAgdm9sdW1lLnN0eWxlLmJhY2tncm91bmRJbWFnZSA9ICctd2Via2l0LWNhbnZhcygnICsgdGhp cy52b2x1bWVDb250ZXh0TmFtZSArICcpJzsKKyAgICAgICAgQ29udHJvbGxlci5nTGFzdFRpbWVs aW5lSWQrKzsKKyAgICAgICAgCiAgICAgICAgIHZhciBjYXB0aW9uQnV0dG9uID0gdGhpcy5jb250 cm9scy5jYXB0aW9uQnV0dG9uID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgnYnV0dG9uJyk7CiAg ICAgICAgIGNhcHRpb25CdXR0b24uc2V0QXR0cmlidXRlKCdwc2V1ZG8nLCAnLXdlYmtpdC1tZWRp YS1jb250cm9scy10b2dnbGUtY2xvc2VkLWNhcHRpb25zLWJ1dHRvbicpOwogICAgICAgICBjYXB0 aW9uQnV0dG9uLnNldEF0dHJpYnV0ZSgnYXJpYS1sYWJlbCcsIHRoaXMuVUlTdHJpbmcoJ0NhcHRp b25zJykpOwpAQCAtODUzLDYgKzg2MSw3IEBAIENvbnRyb2xsZXIucHJvdG90eXBlID0gewogICAg ICAgICAgICAgdGhpcy5jb250cm9scy5tdXRlQnV0dG9uLnNldEF0dHJpYnV0ZSgnYXJpYS1sYWJl bCcsIHRoaXMuVUlTdHJpbmcoJ011dGUnKSk7CiAgICAgICAgIH0KICAgICAgICAgdGhpcy52aWRl by52b2x1bWUgPSB0aGlzLmNvbnRyb2xzLnZvbHVtZS52YWx1ZTsKKyAgICAgICAgdGhpcy5kcmF3 Vm9sdW1lQmFja2dyb3VuZCgpOwogICAgIH0sCiAKICAgICBoYW5kbGVDYXB0aW9uQnV0dG9uQ2xp Y2tlZDogZnVuY3Rpb24oZXZlbnQpCkBAIC05NzgsMjQgKzk4NywxNDkgQEAgQ29udHJvbGxlci5w cm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMuZHJhd1RpbWVsaW5lQmFja2dyb3VuZCgpOwogICAg IH0sCiAKKyAgICBhZGRSb3VuZGVkUmVjdDogZnVuY3Rpb24oY3R4LCB4LCB5LCB3aWR0aCwgaGVp Z2h0LCByYWRpdXMpIHsKKyAgICAgICAgY3R4Lm1vdmVUbyh4ICsgcmFkaXVzLCB5KTsKKyAgICAg ICAgY3R4LmFyY1RvKHggKyB3aWR0aCwgeSwgeCArIHdpZHRoLCB5ICsgcmFkaXVzLCByYWRpdXMp OworICAgICAgICBjdHgubGluZVRvKHggKyB3aWR0aCwgeSArIGhlaWdodCAtIHJhZGl1cyk7Cisg ICAgICAgIGN0eC5hcmNUbyh4ICsgd2lkdGgsIHkgKyBoZWlnaHQsIHggKyB3aWR0aCAtIHJhZGl1 cywgeSArIGhlaWdodCwgcmFkaXVzKTsKKyAgICAgICAgY3R4LmxpbmVUbyh4ICsgcmFkaXVzLCB5 ICsgaGVpZ2h0KTsKKyAgICAgICAgY3R4LmFyY1RvKHgsIHkgKyBoZWlnaHQsIHgsIHkgKyBoZWln aHQgLSByYWRpdXMsIHJhZGl1cyk7CisgICAgICAgIGN0eC5saW5lVG8oeCwgeSArIHJhZGl1cyk7 CisgICAgICAgIGN0eC5hcmNUbyh4LCB5LCB4ICsgcmFkaXVzLCB5LCByYWRpdXMpOworICAgIH0s CisKICAgICBkcmF3VGltZWxpbmVCYWNrZ3JvdW5kOiBmdW5jdGlvbigpIHsKLSAgICAgICAgdmFy IGJhY2tncm91bmQgPSAndXJsKFwnZGF0YTppbWFnZS9zdmcreG1sLDxzdmcgeG1sbnM9Imh0dHA6 Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB2aWV3Qm94PSIwIDAgMSAxIiBwcmVzZXJ2ZUFzcGVjdFJh dGlvPSJub25lIj48bGluZWFyR3JhZGllbnQgaWQ9ImdyYWRpZW50IiB4Mj0iMCIgeTI9IjEwMCUi IGdyYWRpZW50VW5pdHM9InVzZXJTcGFjZU9uVXNlIj48c3RvcCBvZmZzZXQ9IjAiIHN0b3AtY29s b3I9InJnYigyLCAyLCAyKSIvPjxzdG9wIG9mZnNldD0iMSIgc3RvcC1jb2xvcj0icmdiKDIzLCAy MywgMjMpIi8+PC9saW5lYXJHcmFkaWVudD48ZyBzdHlsZT0iZmlsbDp1cmwoI2dyYWRpZW50KSI+ JworICAgICAgICB2YXIgZHByID0gd2luZG93LmRldmljZVBpeGVsUmF0aW87CisgICAgICAgIHZh ciB3aWR0aCA9IHRoaXMuY29udHJvbHMudGltZWxpbmUub2Zmc2V0V2lkdGggKiBkcHI7CisgICAg ICAgIHZhciBoZWlnaHQgPSB0aGlzLmNvbnRyb2xzLnRpbWVsaW5lLm9mZnNldEhlaWdodCAqIGRw cjsKKyAgICAgICAgCisgICAgICAgIGlmICghd2lkdGggfHwgIWhlaWdodCkKKyAgICAgICAgICAg IHJldHVybjsKKyAgICAgICAgCisgICAgICAgIHZhciBwbGF5ZWQgPSB0aGlzLnZpZGVvLmN1cnJl bnRUaW1lIC8gdGhpcy52aWRlby5kdXJhdGlvbjsKKyAgICAgICAgdmFyIGJ1ZmZlcmVkID0gMDsK KyAgICAgICAgZm9yICh2YXIgaSA9IDAsIGVuZCA9IHRoaXMudmlkZW8uYnVmZmVyZWQubGVuZ3Ro OyBpIDwgZW5kOyArK2kpCisgICAgICAgICAgICBidWZmZXJlZCA9IE1hdGgubWF4KHRoaXMudmlk ZW8uYnVmZmVyZWQuZW5kKGkpLCBidWZmZXJlZCk7CisgICAgICAgIAorICAgICAgICBidWZmZXJl ZCAvPSB0aGlzLnZpZGVvLmR1cmF0aW9uOworICAgICAgICAKKyAgICAgICAgdmFyIGN0eCA9IGRv Y3VtZW50LmdldENTU0NhbnZhc0NvbnRleHQoJzJkJywgdGhpcy50aW1lbGluZUNvbnRleHROYW1l LCB3aWR0aCwgaGVpZ2h0KTsKKyAgICAgICAgCisgICAgICAgIHdpZHRoIC89IGRwcjsKKyAgICAg ICAgaGVpZ2h0IC89IGRwcjsKKyAgICAgICAgCisgICAgICAgIGN0eC5zYXZlKCk7CisgICAgICAg IGN0eC5zY2FsZShkcHIsIGRwcik7CisgICAgICAgIGN0eC5jbGVhclJlY3QoMCwgMCwgd2lkdGgs IGhlaWdodCk7CisgICAgICAgIAorICAgICAgICB2YXIgdGltZWxpbmVIZWlnaHQgPSAzOworICAg ICAgICB2YXIgdHJhY2tIZWlnaHQgPSAxOworICAgICAgICB2YXIgc2NydWJiZXJXaWR0aCA9IDM7 CisgICAgICAgIHZhciBzY3J1YmJlckhlaWdodCA9IDE1OworICAgICAgICB2YXIgYm9yZGVyU2l6 ZSA9IDI7CisgICAgICAgIHZhciBzY3J1YmJlclBvc2l0aW9uID0gTWF0aC5tYXgoMCwgTWF0aC5t aW4od2lkdGggLSBzY3J1YmJlcldpZHRoLCBNYXRoLnJvdW5kKHdpZHRoICogcGxheWVkKSkpOwor ICAgICAgICAKKyAgICAgICAgLy8gRHJhdyBidWZmZXJlZCBzZWN0aW9uLgorICAgICAgICBjdHgu c2F2ZSgpOworICAgICAgICBjdHguZmlsbFN0eWxlID0gInJnYigxMDAsIDEwMCwgMTAwKSI7Cisg ICAgICAgIGN0eC5maWxsUmVjdCgxLCA4LCBNYXRoLnJvdW5kKHdpZHRoICogYnVmZmVyZWQpIC0g Ym9yZGVyU2l6ZSwgdHJhY2tIZWlnaHQpOworICAgICAgICBjdHgucmVzdG9yZSgpOworICAgICAg ICAKKyAgICAgICAgLy8gRHJhdyB0aW1lbGluZSBib3JkZXIuCisgICAgICAgIGN0eC5zYXZlKCk7 CisgICAgICAgIGN0eC5iZWdpblBhdGgoKTsKKyAgICAgICAgdGhpcy5hZGRSb3VuZGVkUmVjdChj dHgsIHNjcnViYmVyUG9zaXRpb24sIDcsIHdpZHRoIC0gc2NydWJiZXJQb3NpdGlvbiwgdGltZWxp bmVIZWlnaHQsIHRpbWVsaW5lSGVpZ2h0IC8gMi4wKTsKKyAgICAgICAgdGhpcy5hZGRSb3VuZGVk UmVjdChjdHgsIHNjcnViYmVyUG9zaXRpb24gKyAxLCA4LCB3aWR0aCAtIHNjcnViYmVyUG9zaXRp b24gLSBib3JkZXJTaXplICwgdHJhY2tIZWlnaHQsIHRyYWNrSGVpZ2h0IC8gMi4wKTsKKyAgICAg ICAgY3R4LmNsb3NlUGF0aCgpOworICAgICAgICBjdHguY2xpcCgiZXZlbm9kZCIpOworICAgICAg ICBjdHguZmlsbFN0eWxlID0gInJnYigzMCwgMzAsIDMwKSI7CisgICAgICAgIGN0eC5maWxsUmVj dCgwLCAwLCB3aWR0aCwgaGVpZ2h0KTsKKyAgICAgICAgY3R4LnJlc3RvcmUoKTsKKyAgICAgICAg CisgICAgICAgIC8vIERyYXcgcGxheWVkIHNlY3Rpb24uCisgICAgICAgIGN0eC5zYXZlKCk7IAor ICAgICAgICBjdHguYmVnaW5QYXRoKCk7CisgICAgICAgIHRoaXMuYWRkUm91bmRlZFJlY3QoY3R4 LCAwLCA3LCB3aWR0aCwgdGltZWxpbmVIZWlnaHQsIHRpbWVsaW5lSGVpZ2h0IC8gMi4wKTsKKyAg ICAgICAgY3R4LmNsb3NlUGF0aCgpOworICAgICAgICBjdHguY2xpcCgpOworICAgICAgICBjdHgu ZmlsbFN0eWxlID0gInJnYig3NSwgNzUsIDc1KSI7CisgICAgICAgIGN0eC5maWxsUmVjdCgwLCAw LCB3aWR0aCAqIHBsYXllZCwgaGVpZ2h0KTsKKyAgICAgICAgY3R4LnJlc3RvcmUoKTsKKyAgICAg ICAgCisgICAgICAgIC8vIERyYXcgdGhlIHNjcnViYmVyLgorICAgICAgICBjdHguc2F2ZSgpOwor ICAgICAgICBjdHguY2xlYXJSZWN0KHNjcnViYmVyUG9zaXRpb24gLSAxLCAwLCBzY3J1YmJlcldp ZHRoICsgYm9yZGVyU2l6ZSwgaGVpZ2h0LCAwKTsKKyAgICAgICAgY3R4LmJlZ2luUGF0aCgpOwor ICAgICAgICB0aGlzLmFkZFJvdW5kZWRSZWN0KGN0eCwgc2NydWJiZXJQb3NpdGlvbiwgMSwgc2Ny dWJiZXJXaWR0aCwgc2NydWJiZXJIZWlnaHQsIDEpOworICAgICAgICBjdHguY2xvc2VQYXRoKCk7 CisgICAgICAgIGN0eC5jbGlwKCk7CisgICAgICAgIGN0eC5maWxsU3R5bGUgPSAicmdiKDE0MCwg MTQwLCAxNDApIjsKKyAgICAgICAgY3R4LmZpbGxSZWN0KDAsIDAsIHdpZHRoLCBoZWlnaHQpOwor ICAgICAgICBjdHgucmVzdG9yZSgpOworICAgICAgICAKKyAgICAgICAgY3R4LnJlc3RvcmUoKTsK KyAgICB9LAogCi0gICAgICAgIHZhciBkdXJhdGlvbiA9IHRoaXMudmlkZW8uZHVyYXRpb247Ci0g ICAgICAgIHZhciBidWZmZXJlZCA9IHRoaXMudmlkZW8uYnVmZmVyZWQ7Ci0gICAgICAgIGZvciAo dmFyIGkgPSAwLCBlbmQgPSBidWZmZXJlZC5sZW5ndGg7IGkgPCBlbmQ7ICsraSkgewotICAgICAg ICAgICAgdmFyIHN0YXJ0VGltZSA9IGJ1ZmZlcmVkLnN0YXJ0KGkpOwotICAgICAgICAgICAgdmFy IGVuZFRpbWUgPSBidWZmZXJlZC5lbmQoaSk7Ci0KLSAgICAgICAgICAgIHZhciBzdGFydFggPSBz dGFydFRpbWUgLyBkdXJhdGlvbjsKLSAgICAgICAgICAgIHZhciB3aWR0aFggPSAoZW5kVGltZSAt IHN0YXJ0VGltZSkgLyBkdXJhdGlvbjsKLSAgICAgICAgICAgIGJhY2tncm91bmQgKz0gJzxyZWN0 IHg9IicgKyBzdGFydFggKyAnIiB5PSIwIiB3aWR0aD0iJyArIHdpZHRoWCArICciIGhlaWdodD0i MSIvPic7Ci0gICAgICAgIH0KKyAgICBkcmF3Vm9sdW1lQmFja2dyb3VuZDogZnVuY3Rpb24oKSB7 CisgICAgICAgIHZhciBkcHIgPSB3aW5kb3cuZGV2aWNlUGl4ZWxSYXRpbzsKKyAgICAgICAgdmFy IHdpZHRoID0gdGhpcy5jb250cm9scy52b2x1bWUub2Zmc2V0V2lkdGggKiBkcHI7CisgICAgICAg IHZhciBoZWlnaHQgPSB0aGlzLmNvbnRyb2xzLnZvbHVtZS5vZmZzZXRIZWlnaHQgKiBkcHI7CiAK LSAgICAgICAgYmFja2dyb3VuZCArPSAnPC9nPjwvc3ZnPlwnKScKLSAgICAgICAgdGhpcy5jb250 cm9scy50aW1lbGluZS5zdHlsZS5iYWNrZ3JvdW5kSW1hZ2UgPSBiYWNrZ3JvdW5kOworICAgICAg ICBpZiAoIXdpZHRoIHx8ICFoZWlnaHQpCisgICAgICAgICAgICByZXR1cm47CisgICAgICAgICAg ICAKKyAgICAgICAgdmFyIGN0eCA9IGRvY3VtZW50LmdldENTU0NhbnZhc0NvbnRleHQoJzJkJywg dGhpcy52b2x1bWVDb250ZXh0TmFtZSwgd2lkdGgsIGhlaWdodCk7CisgICAgICAgIAorICAgICAg ICB3aWR0aCAvPSBkcHI7CisgICAgICAgIGhlaWdodCAvPSBkcHI7CisgICAgICAgIAorICAgICAg ICBjdHguc2F2ZSgpOworICAgICAgICBjdHguc2NhbGUoZHByLCBkcHIpOworICAgICAgICBjdHgu Y2xlYXJSZWN0KDAsIDAsIHdpZHRoLCBoZWlnaHQpOworICAgICAgICAKKyAgICAgICAgdmFyIHNl ZWtlclBvc2l0aW9uID0gdGhpcy5jb250cm9scy52b2x1bWUudmFsdWU7CisgICAgICAgIHZhciB0 cmFja0hlaWdodCA9IDE7CisgICAgICAgIHZhciB0aW1lbGluZUhlaWdodCA9IDM7CisgICAgICAg IHZhciBzY3J1YmJlclJhZGl1cyA9IDMuNTsKKyAgICAgICAgdmFyIHNjcnViYmVyRGlhbWV0ZXIg PSAyICogc2NydWJiZXJSYWRpdXM7CisgICAgICAgIHZhciBib3JkZXJTaXplID0gMjsKKyAgICAg ICAgCisgICAgICAgIHZhciBzY3J1YmJlclBvc2l0aW9uID0gTWF0aC5yb3VuZChzZWVrZXJQb3Np dGlvbiAqICh3aWR0aCAtIHNjcnViYmVyRGlhbWV0ZXIgLSBib3JkZXJTaXplKSk7CisgICAgICAg IAorICAgICAgICAvLyBEcmF3IHZvbHVtZSB0cmFjayBib3JkZXIuCisgICAgICAgIGN0eC5zYXZl KCk7CisgICAgICAgIGN0eC5iZWdpblBhdGgoKTsKKyAgICAgICAgdGhpcy5hZGRSb3VuZGVkUmVj dChjdHgsIDAsIDMsIHdpZHRoLCB0aW1lbGluZUhlaWdodCwgdGltZWxpbmVIZWlnaHQgLyAyLjAp OworICAgICAgICB0aGlzLmFkZFJvdW5kZWRSZWN0KGN0eCwgMSwgNCwgd2lkdGggLSBib3JkZXJT aXplLCB0cmFja0hlaWdodCwgdHJhY2tIZWlnaHQgLyAyLjApOworICAgICAgICBjdHguY2xvc2VQ YXRoKCk7CisgICAgICAgIGN0eC5jbGlwKCJldmVub2RkIik7CisgICAgICAgIGN0eC5maWxsU3R5 bGUgPSAicmdiKDMwLCAzMCwgMzApIjsKKyAgICAgICAgY3R4LmZpbGxSZWN0KDAsIDAsIHdpZHRo LCBoZWlnaHQpOworICAgICAgICBjdHgucmVzdG9yZSgpOworICAgICAgICAKKyAgICAgICAgLy8g Q2xlYXIgYSBob2xlIGluIHRoZSBzbGlkZXIgZm9yIHRoZSBzY3J1YmJlci4KKyAgICAgICAgY3R4 LnNhdmUoKTsKKyAgICAgICAgY3R4LmJlZ2luUGF0aCgpOworICAgICAgICB0aGlzLmFkZFJvdW5k ZWRSZWN0KGN0eCwgc2NydWJiZXJQb3NpdGlvbiwgMCwgc2NydWJiZXJEaWFtZXRlciArIGJvcmRl clNpemUsIGhlaWdodCwgKHNjcnViYmVyRGlhbWV0ZXIgKyBib3JkZXJTaXplKSAvIDIuMCk7Cisg ICAgICAgIGN0eC5jbG9zZVBhdGgoKTsKKyAgICAgICAgY3R4LmNsaXAoKTsKKyAgICAgICAgY3R4 LmNsZWFyUmVjdCgwLCAwLCB3aWR0aCwgaGVpZ2h0KTsKKyAgICAgICAgY3R4LnJlc3RvcmUoKTsK KyAgICAgICAgCisgICAgICAgIC8vIERyYXcgc2NydWJiZXIuCisgICAgICAgIGN0eC5zYXZlKCk7 CisgICAgICAgIGN0eC5iZWdpblBhdGgoKTsKKyAgICAgICAgdGhpcy5hZGRSb3VuZGVkUmVjdChj dHgsIHNjcnViYmVyUG9zaXRpb24gKyAxLCAxLCBzY3J1YmJlckRpYW1ldGVyLCBzY3J1YmJlckRp YW1ldGVyLCBzY3J1YmJlclJhZGl1cyk7CisgICAgICAgIGN0eC5jbG9zZVBhdGgoKTsKKyAgICAg ICAgY3R4LmNsaXAoKTsKKyAgICAgICAgY3R4LmZpbGxTdHlsZSA9ICJyZ2IoMTQwLCAxNDAsIDE0 MCkiOworICAgICAgICBjdHguZmlsbFJlY3QoMCwgMCwgd2lkdGgsIGhlaWdodCk7CisgICAgICAg IGN0eC5yZXN0b3JlKCk7CisgICAgICAgIAorICAgICAgICBjdHgucmVzdG9yZSgpOworICAgICAg ICAKICAgICB9LAotCisgICAgCiAgICAgZm9ybWF0VGltZTogZnVuY3Rpb24odGltZSkKICAgICB7 CiAgICAgICAgIGlmIChpc05hTih0aW1lKSkKQEAgLTEwNDEsNiArMTE3NSw3IEBAIENvbnRyb2xs ZXIucHJvdG90eXBlID0gewogCiAgICAgICAgIHRoaXMudXBkYXRlVGltZSgpOwogICAgICAgICB0 aGlzLnVwZGF0ZVByb2dyZXNzKHRydWUpOworICAgICAgICB0aGlzLmRyYXdWb2x1bWVCYWNrZ3Jv dW5kKCk7CiAKICAgICAgICAgdGhpcy5jb250cm9scy5wYW5lbC5jbGFzc0xpc3QuYWRkKHRoaXMu Q2xhc3NOYW1lcy5zaG93KTsKICAgICAgICAgdGhpcy5jb250cm9scy5wYW5lbC5jbGFzc0xpc3Qu cmVtb3ZlKHRoaXMuQ2xhc3NOYW1lcy5oaWRkZW4pOwpJbmRleDogU291cmNlL1dlYkNvcmUvTW9k dWxlcy9tZWRpYWNvbnRyb2xzL21lZGlhQ29udHJvbHNpT1MuanMKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYWNvbnRyb2xzL21lZGlhQ29udHJvbHNpT1MuanMJKHJl dmlzaW9uIDE4MDg5MykKKysrIFNvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFjb250cm9scy9t ZWRpYUNvbnRyb2xzaU9TLmpzCSh3b3JraW5nIGNvcHkpCkBAIC0yOTIsMTcgKzI5Miw2IEBAIENv bnRyb2xsZXJJT1MucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLnVwZGF0ZVByb2dyZXNzKCk7 CiAgICAgfSwKIAotICAgIGFkZFJvdW5kZWRSZWN0OiBmdW5jdGlvbihjdHgsIHgsIHksIHdpZHRo LCBoZWlnaHQsIHJhZGl1cykgewotICAgICAgICBjdHgubW92ZVRvKHggKyByYWRpdXMsIHkpOwot ICAgICAgICBjdHguYXJjVG8oeCArIHdpZHRoLCB5LCB4ICsgd2lkdGgsIHkgKyByYWRpdXMsIHJh ZGl1cyk7Ci0gICAgICAgIGN0eC5saW5lVG8oeCArIHdpZHRoLCB5ICsgaGVpZ2h0IC0gcmFkaXVz KTsKLSAgICAgICAgY3R4LmFyY1RvKHggKyB3aWR0aCwgeSArIGhlaWdodCwgeCArIHdpZHRoIC0g cmFkaXVzLCB5ICsgaGVpZ2h0LCByYWRpdXMpOwotICAgICAgICBjdHgubGluZVRvKHggKyByYWRp dXMsIHkgKyBoZWlnaHQpOwotICAgICAgICBjdHguYXJjVG8oeCwgeSArIGhlaWdodCwgeCwgeSAr IGhlaWdodCAtIHJhZGl1cywgcmFkaXVzKTsKLSAgICAgICAgY3R4LmxpbmVUbyh4LCB5ICsgcmFk aXVzKTsKLSAgICAgICAgY3R4LmFyY1RvKHgsIHksIHggKyByYWRpdXMsIHksIHJhZGl1cyk7Ci0g ICAgfSwKLQogICAgIGRyYXdUaW1lbGluZUJhY2tncm91bmQ6IGZ1bmN0aW9uKCkgewogICAgICAg ICB2YXIgd2lkdGggPSB0aGlzLnRpbWVsaW5lV2lkdGggKiB3aW5kb3cuZGV2aWNlUGl4ZWxSYXRp bzsKICAgICAgICAgdmFyIGhlaWdodCA9IHRoaXMudGltZWxpbmVIZWlnaHQgKiB3aW5kb3cuZGV2 aWNlUGl4ZWxSYXRpbzsK