143317 2015-04-01 13:47:29 -0700 Fixes to material of inline media controls on OSX. 2015-04-02 12:47:30 -0700 1 1 1 Unclassified WebKit Media 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 roger_fong webkit-unassigned oldest_to_newest 1082096 0 roger_fong 2015-04-01 13:47:29 -0700 rdar://problem/20357847 Things to fix: Too much blurring on the main inline controls. (where the time line scrubber lives) The blur is not appearing on the volume slider control. 1082123 1 249950 roger_fong 2015-04-01 15:39:21 -0700 Created attachment 249950 patch 1082310 2 roger_fong 2015-04-02 12:47:30 -0700 http://trac.webkit.org/changeset/182263 249950 2015-04-01 15:39:21 -0700 2015-04-01 15:52:21 -0700 patch patch.patch text/plain 10609 roger_fong SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4MjI1MykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM5IEBACisyMDE1LTA0LTAxICBSb2dlciBG b25nICA8cm9nZXJfZm9uZ0BhcHBsZS5jb20+CisKKyAgICAgICAgRml4ZXMgdG8gbWF0ZXJpYWwg b2YgaW5saW5lIG1lZGlhIGNvbnRyb2xzIG9uIE9TWC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0MzMxNworICAgICAgICA8cmRhcjovL3Byb2JsZW0v MjAzNTc4NDc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgVGhlcmUgYXJlIG1hbnkgZXhpc3RpbmcgdGVzdHMgZm9yIHRoZSBtZWRpYSBjb250cm9scyBh cHBlYXJhbmNlLgorICAgICAgICBUaGV5IGFyZSBjdXJyZW50bHkgc2tpcHBlZCB3aGlsZSB3ZSBh cmUgc3RpbGwgdXBkYXRpbmcgdGhlIGNvbnRyb2xzLgorCisgICAgICAgIEV4cGFuZCBiYWNrZ3Jv dW5kcyBvZiBjb250cm9sIHBhbmVsIGFuZCB2b2x1bWUgYm94LgorICAgICAgICBDbGlwIHRoZSBk YXJrZXIgZWRnZXMgYXdheS4KKyAgICAgICAgKiBNb2R1bGVzL21lZGlhY29udHJvbHMvbWVkaWFD b250cm9sc0FwcGxlLmNzczoKKyAgICAgICAgKGF1ZGlvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xz LXBhbmVsKToKKyAgICAgICAgKGF1ZGlvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLXBhbmVsLWJh Y2tncm91bmQtY29udGFpbmVyKToKKyAgICAgICAgKGF1ZGlvOjotd2Via2l0LW1lZGlhLWNvbnRy b2xzLXBhbmVsLXRpbnQpOgorICAgICAgICAoYXVkaW86Oi13ZWJraXQtbWVkaWEtY29udHJvbHMt cGFuZWwtYmFja2dyb3VuZCk6CisgICAgICAgIChhdWRpbzo6LXdlYmtpdC1tZWRpYS1jb250cm9s cy1wYW5lbCAudm9sdW1lLWJveCk6CisgICAgICAgIChhdWRpbzo6LXdlYmtpdC1tZWRpYS1jb250 cm9scy12b2x1bWUtc2xpZGVyLWNvbnRhaW5lci1iYWNrZ3JvdW5kKToKKyAgICAgICAgKGF1ZGlv Ojotd2Via2l0LW1lZGlhLWNvbnRyb2xzLXZvbHVtZS1zbGlkZXItY29udGFpbmVyLXRpbnQpOgor ICAgICAgICAoYXVkaW86Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtcGFuZWwgLnZvbHVtZS1ib3g6 YWN0aXZlKToKKyAgICAgICAgKHZpZGVvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLXZvbHVtZS1z bGlkZXIpOiAKKyAgICAgICAgVGhpcyBuZWVkcyB0byBiZSBhYm92ZSB0aGUgYmFja2dyb3VuZCBz byBpdCBjYW4gYmUgaW50ZXJhY3RlZCB3aXRoLgorICAgICAgICAodmlkZW86LXdlYmtpdC1mdWxs LXNjcmVlbjo6LXdlYmtpdC1tZWRpYS1jb250cm9scy1wYW5lbCAudm9sdW1lLWJveCk6CisgICAg ICAgICogTW9kdWxlcy9tZWRpYWNvbnRyb2xzL21lZGlhQ29udHJvbHNBcHBsZS5qczoKKyAgICAg ICAgKENvbnRyb2xsZXIucHJvdG90eXBlLmNyZWF0ZUNvbnRyb2xzKTogQ3JlYXRlIGEgbmV3IGRp diBmb3IgdGhlIGNvbnRyb2wgbWF0ZXJpYWwuCisgICAgICAgIFdlIG5lZWQgdG8gY2xpcCB0aGUg bWF0ZXJpYWwgYW5kIG5vdCB0aGUgY29udHJvbHMgdGhlbXNlbHZlcy4KKyAgICAgICAgKENvbnRy b2xsZXIucHJvdG90eXBlLmNvbmZpZ3VyZUlubGluZUNvbnRyb2xzKTogVXNlIG5ldyBkaXYuCisg ICAgICAgIFJlbW92ZSBzb21lIHVubmVjZXNzYXJ5IGxvZ2ljIGludm9sdmluZyBoaWRpbmcgbWF0 ZXJpYWxzIGhlcmUuCisgICAgICAgIEl0IGp1c3QgY2F1c2VzIHRoZSBtYXRlcmlhbHMgdG8gdHVy biBvbiBhbmQgb2ZmIGF0IHRoZSB3cm9uZyB0aW1lcy4gCisgICAgICAgIChDb250cm9sbGVyLnBy b3RvdHlwZS5oYW5kbGVQYW5lbFRyYW5zaXRpb25FbmQpOgorICAgICAgICAoQ29udHJvbGxlci5w cm90b3R5cGUuc2V0UGxheWluZyk6CisgICAgICAgIChDb250cm9sbGVyLnByb3RvdHlwZS5zaG93 Q29udHJvbHMpOgorICAgICAgICAoQ29udHJvbGxlci5wcm90b3R5cGUuaGlkZUNvbnRyb2xzKToK KwogMjAxNS0wNC0wMSAgRXJpYyBDYXJsc29uICA8ZXJpYy5jYXJsc29uQGFwcGxlLmNvbT4KIAog ICAgICAgICBGaXggdGhlIGlPUyBidWlsZCBhZnRlciByMTgyMjQwLgpJbmRleDogU291cmNlL1dl YkNvcmUvTW9kdWxlcy9tZWRpYWNvbnRyb2xzL21lZGlhQ29udHJvbHNBcHBsZS5jc3MKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYWNvbnRyb2xzL21lZGlhQ29udHJv bHNBcHBsZS5jc3MJKHJldmlzaW9uIDE4MjAzNikKKysrIFNvdXJjZS9XZWJDb3JlL01vZHVsZXMv bWVkaWFjb250cm9scy9tZWRpYUNvbnRyb2xzQXBwbGUuY3NzCSh3b3JraW5nIGNvcHkpCkBAIC03 MywxMiArNzMsMTMgQEAgYXVkaW86Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtcGFuZWwgewogICAg IHotaW5kZXg6IDA7CiAgICAgYm90dG9tOiAwOwogICAgIHdpZHRoOiAxMDAlOwotICAgIG1pbi1o ZWlnaHQ6IDI1cHg7Ci0gICAgaGVpZ2h0OiAyNXB4OworICAgIG1pbi1oZWlnaHQ6IDQ1cHg7Cisg ICAgaGVpZ2h0OiA0NXB4OwogICAgIGxpbmUtaGVpZ2h0OiAyNXB4OwogICAgIC13ZWJraXQtdXNl ci1zZWxlY3Q6IG5vbmU7CiAgICAgLXdlYmtpdC11c2VyLWRyYWc6IGVsZW1lbnQ7CiAgICAgYmFj a2dyb3VuZC1jb2xvcjogdHJhbnNwYXJlbnQ7CisgICAgcGFkZGluZy10b3A6IDIwcHg7CiAKICAg ICBkaXNwbGF5OiAtd2Via2l0LWZsZXg7CiAgICAgLXdlYmtpdC1mbGV4LWRpcmVjdGlvbjogcm93 OwpAQCAtOTEsMTQgKzkyLDI1IEBAIGF1ZGlvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLXBhbmVs IHsKICAgICB0cmFuc2l0aW9uOiBvcGFjaXR5IDAuMjVzIGxpbmVhcjsKIH0KIAordmlkZW86Oi13 ZWJraXQtbWVkaWEtY29udHJvbHMtcGFuZWwtYmFja2dyb3VuZC1jb250YWluZXIsCithdWRpbzo6 LXdlYmtpdC1tZWRpYS1jb250cm9scy1wYW5lbC1iYWNrZ3JvdW5kLWNvbnRhaW5lciB7CisgICAg cG9zaXRpb246IGFic29sdXRlOworICAgIGxlZnQ6IDA7CisgICAgdG9wOiAwOworICAgIHdpZHRo OiAxMDAlOworICAgIG1pbi1oZWlnaHQ6IDQ1cHg7CisgICAgaGVpZ2h0OiA0NXB4OworICAgIC13 ZWJraXQtY2xpcC1wYXRoOiBpbnNldCgyMHB4IDBweCAwcHggMHB4KTsKK30KKwogdmlkZW86Oi13 ZWJraXQtbWVkaWEtY29udHJvbHMtcGFuZWwtdGludCwKIGF1ZGlvOjotd2Via2l0LW1lZGlhLWNv bnRyb2xzLXBhbmVsLXRpbnQgewogICAgIHBvc2l0aW9uOiBhYnNvbHV0ZTsKICAgICBsZWZ0OiAw OwogICAgIHRvcDogMDsKICAgICB3aWR0aDogMTAwJTsKLSAgICBtaW4taGVpZ2h0OiAyNXB4Owot ICAgIGhlaWdodDogMjVweDsKKyAgICBtaW4taGVpZ2h0OiA0NXB4OworICAgIGhlaWdodDogNDVw eDsKICAgICBiYWNrZ3JvdW5kLWNvbG9yOiByZ2IoNDEsIDQxLCA0MSk7CiAgICAgbWl4LWJsZW5k LW1vZGU6IGxpZ2h0ZW47CiB9CkBAIC0xMDksOCArMTIxLDggQEAgYXVkaW86Oi13ZWJraXQtbWVk aWEtY29udHJvbHMtcGFuZWwtYmFjawogICAgIGxlZnQ6IDA7CiAgICAgdG9wOiAwOwogICAgIHdp ZHRoOiAxMDAlOwotICAgIG1pbi1oZWlnaHQ6IDI1cHg7Ci0gICAgaGVpZ2h0OiAyNXB4OworICAg IG1pbi1oZWlnaHQ6IDQ1cHg7CisgICAgaGVpZ2h0OiA0NXB4OwogICAgIGJhY2tncm91bmQtY29s b3I6IHJnYmEoMzAsIDMwLCAzMCwgMC40NSk7CiAgICAgLXdlYmtpdC1iYWNrZHJvcC1maWx0ZXI6 IHNhdHVyYXRlKDE4MCUpIGJsdXIoMjBweCk7CiB9CkBAIC0xOTEsMTEgKzIwMywxMiBAQCB2aWRl bzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy1wYW5lbCAudm9sCiBhdWRpbzo6LXdlYmtpdC1tZWRp YS1jb250cm9scy1wYW5lbCAudm9sdW1lLWJveCB7CiAgICAgcG9zaXRpb246IGFic29sdXRlOwog ICAgIGJveC1zaXppbmc6IGJvcmRlci1ib3g7Ci0gICAgaGVpZ2h0OiAyM3B4OworICAgIGhlaWdo dDogNjNweDsKICAgICBib3R0b206IDA7CiAgICAgbGVmdDogMDsKLQotICAgIC13ZWJraXQtdHJh bnNmb3JtOiByb3RhdGUoLTkwZGVnKSB0cmFuc2xhdGVZKC0zMS41cHgpIHRyYW5zbGF0ZVgoNTEu NXB4KTsKKyAgICAKKyAgICAtd2Via2l0LWNsaXAtcGF0aDogaW5zZXQoMjBweCAyMHB4IDIwcHgg MjBweCByb3VuZCAwcHggNHB4IDRweCAwcHgpOworICAgIC13ZWJraXQtdHJhbnNmb3JtOiByb3Rh dGUoLTkwZGVnKSB0cmFuc2xhdGVZKC01MS41cHgpIHRyYW5zbGF0ZVgoMzEuNXB4KTsKIAogICAg IGJhY2tncm91bmQtY29sb3I6IHRyYW5zcGFyZW50OwogICAgIGJvcmRlci1ib3R0b20tcmlnaHQt cmFkaXVzOiA0cHg7CkBAIC0yMTcsNyArMjMwLDggQEAgYXVkaW86Oi13ZWJraXQtbWVkaWEtY29u dHJvbHMtdm9sdW1lLXNsaQogICAgIHBvc2l0aW9uOiBhYnNvbHV0ZTsKICAgICBsZWZ0OiAwOwog ICAgIHRvcDogMDsKLSAgICBoZWlnaHQ6IDIzcHg7CisgICAgd2lkdGg6IDExNnB4OworICAgIGhl aWdodDogNjNweDsKICAgICBib3JkZXItYm90dG9tLXJpZ2h0LXJhZGl1czogNHB4OwogICAgIGJv cmRlci10b3AtcmlnaHQtcmFkaXVzOiA0cHg7CiAgICAgYmFja2dyb3VuZC1jb2xvcjogcmdiYSgz MCwgMzAsIDMwLCAwLjQ1KTsKQEAgLTIyOSw3ICsyNDMsOCBAQCBhdWRpbzo6LXdlYmtpdC1tZWRp YS1jb250cm9scy12b2x1bWUtc2xpCiAgICAgcG9zaXRpb246IGFic29sdXRlOwogICAgIGxlZnQ6 IDA7CiAgICAgdG9wOiAwOwotICAgIGhlaWdodDogMjNweDsKKyAgICBoZWlnaHQ6IDYzcHg7Cisg ICAgd2lkdGg6IDExNnB4OwogICAgIGJvcmRlci1ib3R0b20tcmlnaHQtcmFkaXVzOiA0cHg7CiAg ICAgYm9yZGVyLXRvcC1yaWdodC1yYWRpdXM6IDRweDsKICAgICBiYWNrZ3JvdW5kLWNvbG9yOiBy Z2IoNDEsIDQxLCA0MSk7CkBAIC0yNDQsMTIgKzI1OSwxMCBAQCB2aWRlbzo6LXdlYmtpdC1tZWRp YS1jb250cm9scy12b2x1bWUtc2xpCiB2aWRlbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy12b2x1 bWUtc2xpZGVyLWNvbnRhaW5lci10aW50LAogYXVkaW86Oi13ZWJraXQtbWVkaWEtY29udHJvbHMt cGFuZWwgLm11dGUtYm94OmhvdmVyIC52b2x1bWUtYm94LAogYXVkaW86Oi13ZWJraXQtbWVkaWEt Y29udHJvbHMtcGFuZWwgLnZvbHVtZS1ib3g6aG92ZXIsCi1hdWRpbzo6LXdlYmtpdC1tZWRpYS1j b250cm9scy1wYW5lbCAudm9sdW1lLWJveDphY3RpdmUKLWF1ZGlvOjotd2Via2l0LW1lZGlhLWNv bnRyb2xzLXZvbHVtZS1zbGlkZXItY29udGFpbmVyLWJhY2tncm91bmQsCi1hdWRpbzo6LXdlYmtp dC1tZWRpYS1jb250cm9scy12b2x1bWUtc2xpZGVyLWNvbnRhaW5lci10aW50IHsKK2F1ZGlvOjot d2Via2l0LW1lZGlhLWNvbnRyb2xzLXBhbmVsIC52b2x1bWUtYm94OmFjdGl2ZSB7CiAgICAgb3Bh Y2l0eTogMTsKICAgICAvKiByZXNpemUgdG8gdXNhYmxlIGFtb3VudCAocmF0aGVyIHRoYW4gZGlz cGxheTpub25lKSBmb3IgQVggYW5kIEZLQSAqLwotICAgIHdpZHRoOiA3NnB4OworICAgIHdpZHRo OiAxMTZweDsKIH0KIAogYXVkaW86Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtdm9sdW1lLXNsaWRl ciwKQEAgLTI1OSwxMSArMjcyLDEyIEBAIHZpZGVvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLXZv bHVtZS1zbGkKICAgICBoZWlnaHQ6IDlweCAhaW1wb3J0YW50OwogICAgIHdpZHRoOiA2NHB4ICFp bXBvcnRhbnQ7CiAgICAgcGFkZGluZzogMCAhaW1wb3J0YW50OwotICAgIG1hcmdpbi1yaWdodDog MTBweCAhaW1wb3J0YW50OworICAgIG1hcmdpbi1yaWdodDogMzBweCAhaW1wb3J0YW50OwogCiAg ICAgYmFja2dyb3VuZC1jb2xvcjogdHJhbnNwYXJlbnQgIWltcG9ydGFudDsKICAgICBiYWNrZ3Jv dW5kLXNpemU6IDEwMCUgMTAwJTsKICAgICBiYWNrZ3JvdW5kLXJlcGVhdDogbm8tcmVwZWF0Owor ICAgIHotaW5kZXg6IDE7CiB9CiAKIHZpZGVvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLXZvbHVt ZS1zbGlkZXI6Oi13ZWJraXQtc2xpZGVyLXRodW1iLApAQCAtNjI2LDYgKzY0MCw3IEBAIHZpZGVv Oi13ZWJraXQtYW5pbWF0aW5nLWZ1bGwtc2NyZWVuLXRyYW4KIAogdmlkZW86LXdlYmtpdC1mdWxs LXNjcmVlbjo6LXdlYmtpdC1tZWRpYS1jb250cm9scy1wYW5lbCAudm9sdW1lLWJveCB7CiAgICAg LXdlYmtpdC10cmFuc2Zvcm06IG5vbmU7CisgICAgLXdlYmtpdC1jbGlwLXBhdGg6IG5vbmU7CiAg ICAgb3BhY2l0eTogMTsKICAgICBsZWZ0OiAzMnB4OwogICAgIHRvcDogMzVweDsKSW5kZXg6IFNv dXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFjb250cm9scy9tZWRpYUNvbnRyb2xzQXBwbGUuanMK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYWNvbnRyb2xzL21lZGlh Q29udHJvbHNBcHBsZS5qcwkocmV2aXNpb24gMTgyMDM2KQorKysgU291cmNlL1dlYkNvcmUvTW9k dWxlcy9tZWRpYWNvbnRyb2xzL21lZGlhQ29udHJvbHNBcHBsZS5qcwkod29ya2luZyBjb3B5KQpA QCAtMzEzLDYgKzMxMyw5IEBAIENvbnRyb2xsZXIucHJvdG90eXBlID0gewogICAgICAgICB0aGlz Lmxpc3RlbkZvcihwYW5lbCwgJ2RibGNsaWNrJywgdGhpcy5oYW5kbGVQYW5lbENsaWNrKTsKICAg ICAgICAgdGhpcy5saXN0ZW5Gb3IocGFuZWwsICdkcmFnc3RhcnQnLCB0aGlzLmhhbmRsZVBhbmVs RHJhZ1N0YXJ0KTsKICAgICAgICAgCisgICAgICAgIHZhciBwYW5lbEJhY2tncm91bmRDb250YWlu ZXIgPSB0aGlzLmNvbnRyb2xzLnBhbmVsQmFja2dyb3VuZENvbnRhaW5lciA9IGRvY3VtZW50LmNy ZWF0ZUVsZW1lbnQoJ2RpdicpOworICAgICAgICBwYW5lbEJhY2tncm91bmRDb250YWluZXIuc2V0 QXR0cmlidXRlKCdwc2V1ZG8nLCAnLXdlYmtpdC1tZWRpYS1jb250cm9scy1wYW5lbC1iYWNrZ3Jv dW5kLWNvbnRhaW5lcicpOworICAgICAgICAKICAgICAgICAgdmFyIHBhbmVsVGludCA9IHRoaXMu Y29udHJvbHMucGFuZWxUaW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgnZGl2Jyk7CiAgICAg ICAgIHBhbmVsVGludC5zZXRBdHRyaWJ1dGUoJ3BzZXVkbycsICctd2Via2l0LW1lZGlhLWNvbnRy b2xzLXBhbmVsLXRpbnQnKTsKICAgICAgICAgdGhpcy5saXN0ZW5Gb3IocGFuZWxUaW50LCAnbW91 c2Vkb3duJywgdGhpcy5oYW5kbGVQYW5lbE1vdXNlRG93bik7CkBAIC01MDUsOCArNTA4LDkgQEAg Q29udHJvbGxlci5wcm90b3R5cGUgPSB7CiAKICAgICBjb25maWd1cmVJbmxpbmVDb250cm9sczog ZnVuY3Rpb24oKQogICAgIHsKLSAgICAgICAgdGhpcy5jb250cm9scy5wYW5lbC5hcHBlbmRDaGls ZCh0aGlzLmNvbnRyb2xzLnBhbmVsQmFja2dyb3VuZCk7Ci0gICAgICAgIHRoaXMuY29udHJvbHMu cGFuZWwuYXBwZW5kQ2hpbGQodGhpcy5jb250cm9scy5wYW5lbFRpbnQpOworICAgICAgICB0aGlz LmNvbnRyb2xzLnBhbmVsLmFwcGVuZENoaWxkKHRoaXMuY29udHJvbHMucGFuZWxCYWNrZ3JvdW5k Q29udGFpbmVyKTsKKyAgICAgICAgdGhpcy5jb250cm9scy5wYW5lbEJhY2tncm91bmRDb250YWlu ZXIuYXBwZW5kQ2hpbGQodGhpcy5jb250cm9scy5wYW5lbEJhY2tncm91bmQpOworICAgICAgICB0 aGlzLmNvbnRyb2xzLnBhbmVsQmFja2dyb3VuZENvbnRhaW5lci5hcHBlbmRDaGlsZCh0aGlzLmNv bnRyb2xzLnBhbmVsVGludCk7CiAgICAgICAgIHRoaXMuY29udHJvbHMucGFuZWwuYXBwZW5kQ2hp bGQodGhpcy5jb250cm9scy5wbGF5QnV0dG9uKTsKICAgICAgICAgaWYgKCF0aGlzLmlzTGl2ZSkK ICAgICAgICAgICAgIHRoaXMuY29udHJvbHMucGFuZWwuYXBwZW5kQ2hpbGQodGhpcy5jb250cm9s cy5yZXdpbmRCdXR0b24pOwpAQCAtNzc3LDEyICs3ODEsOCBAQCBDb250cm9sbGVyLnByb3RvdHlw ZSA9IHsKICAgICAgICAgdmFyIG9wYWNpdHkgPSB3aW5kb3cuZ2V0Q29tcHV0ZWRTdHlsZSh0aGlz LmNvbnRyb2xzLnBhbmVsKS5vcGFjaXR5OwogICAgICAgICBpZiAocGFyc2VJbnQob3BhY2l0eSkg PiAwKSB7CiAgICAgICAgICAgICB0aGlzLmNvbnRyb2xzLnBhbmVsLmNsYXNzTGlzdC5yZW1vdmUo dGhpcy5DbGFzc05hbWVzLmhpZGRlbik7Ci0gICAgICAgICAgICBpZiAodGhpcy5jb250cm9scy5w YW5lbEJhY2tncm91bmQpCi0gICAgICAgICAgICAgICAgdGhpcy5jb250cm9scy5wYW5lbEJhY2tn cm91bmQuY2xhc3NMaXN0LnJlbW92ZSh0aGlzLkNsYXNzTmFtZXMuaGlkZGVuKTsKICAgICAgICAg fSBlbHNlIHsKICAgICAgICAgICAgIHRoaXMuY29udHJvbHMucGFuZWwuY2xhc3NMaXN0LmFkZCh0 aGlzLkNsYXNzTmFtZXMuaGlkZGVuKTsKLSAgICAgICAgICAgIGlmICh0aGlzLmNvbnRyb2xzLnBh bmVsQmFja2dyb3VuZCkKLSAgICAgICAgICAgICAgICB0aGlzLmNvbnRyb2xzLnBhbmVsQmFja2dy b3VuZC5jbGFzc0xpc3QuYWRkKHRoaXMuQ2xhc3NOYW1lcy5oaWRkZW4pOwogICAgICAgICB9CiAg ICAgfSwKIApAQCAtMTI0NiwxOCArMTI0NiwxMCBAQCBDb250cm9sbGVyLnByb3RvdHlwZSA9IHsK IAogICAgICAgICBpZiAoIWlzUGxheWluZykgewogICAgICAgICAgICAgdGhpcy5jb250cm9scy5w YW5lbC5jbGFzc0xpc3QuYWRkKHRoaXMuQ2xhc3NOYW1lcy5wYXVzZWQpOwotICAgICAgICAgICAg aWYgKHRoaXMuY29udHJvbHMucGFuZWxCYWNrZ3JvdW5kKQotICAgICAgICAgICAgICAgIHRoaXMu Y29udHJvbHMucGFuZWxCYWNrZ3JvdW5kLmNsYXNzTGlzdC5hZGQodGhpcy5DbGFzc05hbWVzLnBh dXNlZCk7Ci0gICAgICAgICAgICBpZiAodGhpcy5jb250cm9scy5wYW5lbFRpbnQpCi0gICAgICAg ICAgICAgICAgdGhpcy5jb250cm9scy5wYW5lbFRpbnQuY2xhc3NMaXN0LmFkZCh0aGlzLkNsYXNz TmFtZXMucGF1c2VkKTsKICAgICAgICAgICAgIHRoaXMuY29udHJvbHMucGxheUJ1dHRvbi5jbGFz c0xpc3QuYWRkKHRoaXMuQ2xhc3NOYW1lcy5wYXVzZWQpOwogICAgICAgICAgICAgdGhpcy5jb250 cm9scy5wbGF5QnV0dG9uLnNldEF0dHJpYnV0ZSgnYXJpYS1sYWJlbCcsIHRoaXMuVUlTdHJpbmco J1BsYXknKSk7CiAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICB0aGlzLmNvbnRyb2xzLnBh bmVsLmNsYXNzTGlzdC5yZW1vdmUodGhpcy5DbGFzc05hbWVzLnBhdXNlZCk7Ci0gICAgICAgICAg ICBpZiAodGhpcy5jb250cm9scy5wYW5lbEJhY2tncm91bmQpCi0gICAgICAgICAgICAgICAgdGhp cy5jb250cm9scy5wYW5lbEJhY2tncm91bmQuY2xhc3NMaXN0LnJlbW92ZSh0aGlzLkNsYXNzTmFt ZXMucGF1c2VkKTsKLSAgICAgICAgICAgIGlmICh0aGlzLmNvbnRyb2xzLnBhbmVsVGludCkKLSAg ICAgICAgICAgICAgICB0aGlzLmNvbnRyb2xzLnBhbmVsVGludC5jbGFzc0xpc3QuYWRkKHRoaXMu Q2xhc3NOYW1lcy5wYXVzZWQpOwogICAgICAgICAgICAgdGhpcy5jb250cm9scy5wbGF5QnV0dG9u LmNsYXNzTGlzdC5yZW1vdmUodGhpcy5DbGFzc05hbWVzLnBhdXNlZCk7CiAgICAgICAgICAgICB0 aGlzLmNvbnRyb2xzLnBsYXlCdXR0b24uc2V0QXR0cmlidXRlKCdhcmlhLWxhYmVsJywgdGhpcy5V SVN0cmluZygnUGF1c2UnKSk7CiAgICAgICAgICAgICB0aGlzLnJlc2V0SGlkZUNvbnRyb2xzVGlt ZXIoKTsKQEAgLTEyNzUsMTEgKzEyNjcsNiBAQCBDb250cm9sbGVyLnByb3RvdHlwZSA9IHsKICAg ICAgICAgdGhpcy5jb250cm9scy5wYW5lbC5jbGFzc0xpc3QuYWRkKHRoaXMuQ2xhc3NOYW1lcy5z aG93KTsKICAgICAgICAgdGhpcy5jb250cm9scy5wYW5lbC5jbGFzc0xpc3QucmVtb3ZlKHRoaXMu Q2xhc3NOYW1lcy5oaWRkZW4pOwogCi0gICAgICAgIGlmICh0aGlzLmNvbnRyb2xzLnBhbmVsQmFj a2dyb3VuZCkgewotICAgICAgICAgICAgdGhpcy5jb250cm9scy5wYW5lbEJhY2tncm91bmQuY2xh c3NMaXN0LmFkZCh0aGlzLkNsYXNzTmFtZXMuc2hvdyk7Ci0gICAgICAgICAgICB0aGlzLmNvbnRy b2xzLnBhbmVsQmFja2dyb3VuZC5jbGFzc0xpc3QucmVtb3ZlKHRoaXMuQ2xhc3NOYW1lcy5oaWRk ZW4pOwotICAgICAgICB9Ci0KICAgICAgICAgdGhpcy51cGRhdGVTaG91bGRMaXN0ZW5Gb3JQbGF5 YmFja1RhcmdldEF2YWlsYWJpbGl0eUV2ZW50KCk7CiAgICAgfSwKIApAQCAtMTI4Nyw4ICsxMjc0 LDYgQEAgQ29udHJvbGxlci5wcm90b3R5cGUgPSB7CiAgICAgewogICAgICAgICB0aGlzLnVwZGF0 ZVNob3VsZExpc3RlbkZvclBsYXliYWNrVGFyZ2V0QXZhaWxhYmlsaXR5RXZlbnQoKTsKICAgICAg ICAgdGhpcy5jb250cm9scy5wYW5lbC5jbGFzc0xpc3QucmVtb3ZlKHRoaXMuQ2xhc3NOYW1lcy5z aG93KTsKLSAgICAgICAgaWYgKHRoaXMuY29udHJvbHMucGFuZWxCYWNrZ3JvdW5kKQotICAgICAg ICAgICAgdGhpcy5jb250cm9scy5wYW5lbEJhY2tncm91bmQuY2xhc3NMaXN0LnJlbW92ZSh0aGlz LkNsYXNzTmFtZXMuc2hvdyk7CiAgICAgfSwKIAogICAgIGNvbnRyb2xzQXJlSGlkZGVuOiBmdW5j dGlvbigpCg==