138705 2014-11-13 13:32:13 -0800 [iOS] update optimized fullscreen media controls artwork 2014-11-13 14:11:18 -0800 1 1 1 Unclassified WebKit Media 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 eric.carlson eric.carlson oldest_to_newest 1048475 0 eric.carlson 2014-11-13 13:32:13 -0800 Update artwork and change the way it is inserted. 1048476 1 241499 eric.carlson 2014-11-13 13:50:19 -0800 Created attachment 241499 Proposed patch. 1048482 2 eric.carlson 2014-11-13 14:11:18 -0800 Committed r176090: https://trac.webkit.org/r176090 241499 2014-11-13 13:50:19 -0800 2014-11-13 14:00:31 -0800 Proposed patch. open_source_patch_3.txt text/plain 7365 eric.carlson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3NjA4NikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI5IEBACisyMDE0LTExLTEzICBFcmljIENh cmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIFtpT1NdIHVwZGF0ZSBv cHRpbWl6ZWQgZnVsbHNjcmVlbiBtZWRpYSBjb250cm9scyBhcnR3b3JrCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzg3MDUKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIE1vZHVsZXMvbWVkaWFjb250cm9s cy9NZWRpYUNvbnRyb2xzSG9zdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYUNvbnRyb2xz SG9zdDo6bWVkaWFVSUltYWdlRGF0YSk6IFJlbW92ZSBvbmUgYnV0dG9uLgorICAgICAgICAqIE1v ZHVsZXMvbWVkaWFjb250cm9scy9NZWRpYUNvbnRyb2xzSG9zdC5pZGw6CisKKyAgICAgICAgKiBN b2R1bGVzL21lZGlhY29udHJvbHMvbWVkaWFDb250cm9sc0FwcGxlLmpzOgorICAgICAgICAoQ29u dHJvbGxlci5wcm90b3R5cGUuY29udHJvbHNBcmVIaWRkZW4pOiBBZGQgcGFyZW50aGVzZXMgdG8g Zml4IHRoZSBsb2dpYy4KKworICAgICAgICAqIE1vZHVsZXMvbWVkaWFjb250cm9scy9tZWRpYUNv bnRyb2xzaU9TLmpzOgorICAgICAgICAoQ29udHJvbGxlcklPUy5wcm90b3R5cGUuc2hvdWxkSGF2 ZVN0YXJ0UGxheWJhY2tCdXR0b24pOiBUaGUgYmlnIHBsYXkgYnV0dG9uIHNob3VsZCBub3QgYmUK KyAgICAgICAgICAgIHZpc2libGUgZHVyaW5nIHBsYXliYWNrLgorICAgICAgICAoQ29udHJvbGxl cklPUy5wcm90b3R5cGUuY3JlYXRlQ29udHJvbHMpOiBObyBsb25nZXIgbmVjZXNzYXJ5IHRvIGlu c2VydCBzdHlsZSBkeW5hbWljYWxseSwKKyAgICAgICAgKENvbnRyb2xsZXJJT1MucHJvdG90eXBl LnNldFBsYXlpbmcpOiBDYWxsIHRoZSBiYXNlIGNsYXNzIGZpcnN0IHNvICJpc1BsYXlpbmciIGlz IHNldCBiZWZvcmUKKyAgICAgICAgICAgIGNhbGxpbmcgdXBkYXRlQ29udHJvbHMsIHdoaWNoIGNh bGxzIHNob3VsZEhhdmVTdGFydFBsYXliYWNrQnV0dG9uLgorCisgICAgICAgICogcGxhdGZvcm0v aW9zL1dlYkNvcmVTeXN0ZW1JbnRlcmZhY2VJT1MuaDogVXBkYXRlIGNvbnN0YW50cy4KKworICAg ICAgICAqIHJlbmRlcmluZy9SZW5kZXJUaGVtZUlPUy5tbToKKyAgICAgICAgKFdlYkNvcmU6OlJl bmRlclRoZW1lSU9TOjptZWRpYUNvbnRyb2xzU3R5bGVTaGVldCk6IEFkZCBidXR0b24gc3R5bGUg dG8gdGhlIG1lZGlhIGNvbnRyb2xzIHNoZWV0LgorCiAyMDE0LTExLTEzICBCZW5qYW1pbiBQb3Vs YWluICA8YnBvdWxhaW5AYXBwbGUuY29tPgogCiAgICAgICAgIEltcGxlbWVudCB0aGUgbWF0Y2hp bmcgZm9yIDpudGgtbGFzdC1jaGlsZChBbitCIG9mIHNlbGVjdG9yLWxpc3QpCkluZGV4OiBTb3Vy Y2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhY29udHJvbHMvTWVkaWFDb250cm9sc0hvc3QuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFjb250cm9scy9NZWRpYUNv bnRyb2xzSG9zdC5jcHAJKHJldmlzaW9uIDE3NTk5MCkKKysrIFNvdXJjZS9XZWJDb3JlL01vZHVs ZXMvbWVkaWFjb250cm9scy9NZWRpYUNvbnRyb2xzSG9zdC5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTMxOCw5ICszMTgsNiBAQCBTdHJpbmcgTWVkaWFDb250cm9sc0hvc3Q6Om1lZGlhVUlJbWFnZURh CiAgICAgaWYgKHBhcnRJRCA9PSAib3B0aW1pemVkLWZ1bGxzY3JlZW4tYnV0dG9uIikKICAgICAg ICAgcmV0dXJuIHdrR2V0TWVkaWFVSUltYWdlRGF0YSh3a01lZGlhVUlQYXJ0T3B0aW1pemVkRnVs bHNjcmVlbkJ1dHRvbik7CiAKLSAgICBpZiAocGFydElEID09ICJvcHRpbWl6ZWQtZnVsbHNjcmVl bi1idXR0b24taGlsaXRlZCIpCi0gICAgICAgIHJldHVybiB3a0dldE1lZGlhVUlJbWFnZURhdGEo d2tNZWRpYVVJUGFydE9wdGltaXplZEZ1bGxzY3JlZW5CdXR0b25IaWxpdGVkKTsKLQogICAgIGlm IChwYXJ0SUQgPT0gIm9wdGltaXplZC1mdWxsc2NyZWVuLXBsYWNlaG9sZGVyIikKICAgICAgICAg cmV0dXJuIHdrR2V0TWVkaWFVSUltYWdlRGF0YSh3a01lZGlhVUlQYXJ0T3B0aW1pemVkRnVsbHNj cmVlblBsYWNlaG9sZGVyKTsKICNlbHNlCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21l ZGlhY29udHJvbHMvTWVkaWFDb250cm9sc0hvc3QuaWRsCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL01vZHVsZXMvbWVkaWFjb250cm9scy9NZWRpYUNvbnRyb2xzSG9zdC5pZGwJKHJldmlz aW9uIDE3NTk5MCkKKysrIFNvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFjb250cm9scy9NZWRp YUNvbnRyb2xzSG9zdC5pZGwJKHdvcmtpbmcgY29weSkKQEAgLTM3LDcgKzM3LDYgQEAgZW51bSBG dWxsc2NyZWVuTW9kZSB7CiAKIGVudW0gTWVkaWFVSVBhcnRJRCB7CiAgICAgIm9wdGltaXplZC1m dWxsc2NyZWVuLWJ1dHRvbiIsCi0gICAgIm9wdGltaXplZC1mdWxsc2NyZWVuLWJ1dHRvbi1oaWxp dGVkIiwKICAgICAib3B0aW1pemVkLWZ1bGxzY3JlZW4tcGxhY2Vob2xkZXIiCiB9OwogCkluZGV4 OiBTb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhY29udHJvbHMvbWVkaWFDb250cm9sc0FwcGxl LmpzCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFjb250cm9scy9t ZWRpYUNvbnRyb2xzQXBwbGUuanMJKHJldmlzaW9uIDE3NTk5MCkKKysrIFNvdXJjZS9XZWJDb3Jl L01vZHVsZXMvbWVkaWFjb250cm9scy9tZWRpYUNvbnRyb2xzQXBwbGUuanMJKHdvcmtpbmcgY29w eSkKQEAgLTEwNDgsNyArMTA0OCw3IEBAIENvbnRyb2xsZXIucHJvdG90eXBlID0gewogCiAgICAg Y29udHJvbHNBcmVIaWRkZW46IGZ1bmN0aW9uKCkKICAgICB7Ci0gICAgICAgIHJldHVybiAhdGhp cy5pc0F1ZGlvKCkgJiYgIXRoaXMuY29udHJvbHMucGFuZWwuY2xhc3NMaXN0LmNvbnRhaW5zKHRo aXMuQ2xhc3NOYW1lcy5zaG93KSB8fCB0aGlzLmNvbnRyb2xzLnBhbmVsLmNsYXNzTGlzdC5jb250 YWlucyh0aGlzLkNsYXNzTmFtZXMuaGlkZGVuKTsKKyAgICAgICAgcmV0dXJuICF0aGlzLmlzQXVk aW8oKSAmJiAoIXRoaXMuY29udHJvbHMucGFuZWwuY2xhc3NMaXN0LmNvbnRhaW5zKHRoaXMuQ2xh c3NOYW1lcy5zaG93KSB8fCB0aGlzLmNvbnRyb2xzLnBhbmVsLmNsYXNzTGlzdC5jb250YWlucyh0 aGlzLkNsYXNzTmFtZXMuaGlkZGVuKSk7CiAgICAgfSwKIAogICAgIHJlbW92ZUNvbnRyb2xzOiBm dW5jdGlvbigpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhY29udHJvbHMvbWVk aWFDb250cm9sc2lPUy5qcwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21l ZGlhY29udHJvbHMvbWVkaWFDb250cm9sc2lPUy5qcwkocmV2aXNpb24gMTc1OTkwKQorKysgU291 cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYWNvbnRyb2xzL21lZGlhQ29udHJvbHNpT1MuanMJKHdv cmtpbmcgY29weSkKQEAgLTY1LDYgKzY1LDkgQEAgQ29udHJvbGxlcklPUy5wcm90b3R5cGUgPSB7 CiAgICAgc2hvdWxkSGF2ZVN0YXJ0UGxheWJhY2tCdXR0b246IGZ1bmN0aW9uKCkgewogICAgICAg ICB2YXIgYWxsb3dzSW5saW5lID0gdGhpcy5ob3N0Lm1lZGlhUGxheWJhY2tBbGxvd3NJbmxpbmU7 CiAKKyAgICAgICAgaWYgKHRoaXMuaXNQbGF5aW5nKQorICAgICAgICAgICAgcmV0dXJuIGZhbHNl OworCiAgICAgICAgIGlmICh0aGlzLmlzQXVkaW8oKSAmJiBhbGxvd3NJbmxpbmUpCiAgICAgICAg ICAgICByZXR1cm4gZmFsc2U7CiAKQEAgLTE0OCwxMiArMTUxLDYgQEAgQ29udHJvbGxlcklPUy5w cm90b3R5cGUgPSB7CiAgICAgICAgIGlubGluZVBsYXliYWNrUGxhY2Vob2xkZXIuY2xhc3NMaXN0 LmFkZCh0aGlzLkNsYXNzTmFtZXMuaGlkZGVuKTsKICAgICAgICAgaW5saW5lUGxheWJhY2tQbGFj ZWhvbGRlci5zZXRBdHRyaWJ1dGUoJ2FyaWEtbGFiZWwnLCB0aGlzLlVJU3RyaW5nKCdEaXNwbGF5 IE9wdGltaXplZCBGdWxsIFNjcmVlbicpKTsKIAotICAgICAgICB2YXIgYnV0dG9uSW1hZ2VTVkcg PSAiYmFja2dyb3VuZC1pbWFnZTogdXJsKCciICsgdGhpcy5ob3N0Lm1lZGlhVUlJbWFnZURhdGEo Im9wdGltaXplZC1mdWxsc2NyZWVuLWJ1dHRvbiIpICsgIicpIjsKLSAgICAgICAgZG9jdW1lbnQu c3R5bGVTaGVldHNbMF0uaW5zZXJ0UnVsZSgndmlkZW86Oi13ZWJraXQtbWVkaWEtY29udHJvbHMt b3B0aW1pemVkLWZ1bGxzY3JlZW4tYnV0dG9uIHsgJyArIGJ1dHRvbkltYWdlU1ZHICsgJzsgfScs IDApOwotCi0gICAgICAgIGJ1dHRvbkltYWdlU1ZHID0gImJhY2tncm91bmQtaW1hZ2U6IHVybCgn IiArIHRoaXMuaG9zdC5tZWRpYVVJSW1hZ2VEYXRhKCJvcHRpbWl6ZWQtZnVsbHNjcmVlbi1idXR0 b24taGlsaXRlZCIpICsgIicpIjsKLSAgICAgICAgZG9jdW1lbnQuc3R5bGVTaGVldHNbMF0uaW5z ZXJ0UnVsZSgndmlkZW86Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtb3B0aW1pemVkLWZ1bGxzY3Jl ZW4tYnV0dG9uOmFjdGl2ZSB7ICcgKyBidXR0b25JbWFnZVNWRyArICc7IH0nLCAwKTsKLQogICAg ICAgICB2YXIgd2lyZWxlc3NUYXJnZXRQaWNrZXIgPSB0aGlzLmNvbnRyb2xzLndpcmVsZXNzVGFy Z2V0UGlja2VyID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgnYnV0dG9uJyk7CiAgICAgICAgIHdp cmVsZXNzVGFyZ2V0UGlja2VyLnNldEF0dHJpYnV0ZSgncHNldWRvJywgJy13ZWJraXQtbWVkaWEt Y29udHJvbHMtd2lyZWxlc3MtcGxheWJhY2stcGlja2VyLWJ1dHRvbicpOwogICAgICAgICB3aXJl bGVzc1RhcmdldFBpY2tlci5zZXRBdHRyaWJ1dGUoJ2FyaWEtbGFiZWwnLCB0aGlzLlVJU3RyaW5n KCdDaG9vc2UgV2lyZWxlc3MgRGlzcGxheScpKTsKQEAgLTU0Myw4ICs1NDAsOCBAQCBDb250cm9s bGVySU9TLnByb3RvdHlwZSA9IHsKIAogICAgIHNldFBsYXlpbmc6IGZ1bmN0aW9uKGlzUGxheWlu ZykKICAgICB7Ci0gICAgICAgIHRoaXMudXBkYXRlQ29udHJvbHMoKTsKICAgICAgICAgQ29udHJv bGxlci5wcm90b3R5cGUuc2V0UGxheWluZy5jYWxsKHRoaXMsIGlzUGxheWluZyk7CisgICAgICAg IHRoaXMudXBkYXRlQ29udHJvbHMoKTsKICAgICB9LAogCiAgICAgc2V0U2hvdWxkTGlzdGVuRm9y UGxheWJhY2tUYXJnZXRBdmFpbGFiaWxpdHlFdmVudDogZnVuY3Rpb24oc2hvdWxkTGlzdGVuKQpJ bmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1dlYkNvcmVTeXN0ZW1JbnRlcmZhY2VJ T1MuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvV2ViQ29yZVN5 c3RlbUludGVyZmFjZUlPUy5oCShyZXZpc2lvbiAxNzU5OTApCisrKyBTb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9pb3MvV2ViQ29yZVN5c3RlbUludGVyZmFjZUlPUy5oCSh3b3JraW5nIGNvcHkpCkBA IC03Nyw3ICs3Nyw2IEBAIGV4dGVybiBib29sICgqd2tJc09wdGltaXplZEZ1bGxzY3JlZW5TdXAK IAogdHlwZWRlZiBlbnVtIHsKICAgICB3a01lZGlhVUlQYXJ0T3B0aW1pemVkRnVsbHNjcmVlbkJ1 dHRvbiA9IDAsCi0gICAgd2tNZWRpYVVJUGFydE9wdGltaXplZEZ1bGxzY3JlZW5CdXR0b25IaWxp dGVkLAogICAgIHdrTWVkaWFVSVBhcnRPcHRpbWl6ZWRGdWxsc2NyZWVuUGxhY2Vob2xkZXIKIH0g d2tNZWRpYVVJUGFydDsKIGV4dGVybiBDRlN0cmluZ1JlZiAoKndrR2V0TWVkaWFVSUltYWdlRGF0 YSkoaW50IHdrTWVkaWFVSVBhcnQpOwpJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlclRoZW1lSU9TLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJUaGVtZUlPUy5tbQkocmV2aXNpb24gMTc1OTkwKQorKysgU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlclRoZW1lSU9TLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0xMjUxLDggKzEyNTEs MTIgQEAgdm9pZCBSZW5kZXJUaGVtZUlPUzo6c3lzdGVtRm9udChDU1NWYWx1ZQogU3RyaW5nIFJl bmRlclRoZW1lSU9TOjptZWRpYUNvbnRyb2xzU3R5bGVTaGVldCgpCiB7CiAjaWYgRU5BQkxFKE1F RElBX0NPTlRST0xTX1NDUklQVCkKLSAgICBpZiAobV9tZWRpYUNvbnRyb2xzU3R5bGVTaGVldC5p c0VtcHR5KCkpCi0gICAgICAgIG1fbWVkaWFDb250cm9sc1N0eWxlU2hlZXQgPSBbTlNTdHJpbmcg c3RyaW5nV2l0aENvbnRlbnRzT2ZGaWxlOltbTlNCdW5kbGUgYnVuZGxlRm9yQ2xhc3M6W1dlYkNv cmVSZW5kZXJUaGVtZUJ1bmRsZSBjbGFzc11dIHBhdGhGb3JSZXNvdXJjZTpAIm1lZGlhQ29udHJv bHNpT1MiIG9mVHlwZTpAImNzcyJdIGVuY29kaW5nOk5TVVRGOFN0cmluZ0VuY29kaW5nIGVycm9y Om5pbF07CisgICAgaWYgKG1fbWVkaWFDb250cm9sc1N0eWxlU2hlZXQuaXNFbXB0eSgpKSB7Cisg ICAgICAgIFN0cmluZ0J1aWxkZXIgYnVpbGRlcjsKKyAgICAgICAgYnVpbGRlci5hcHBlbmQoW05T U3RyaW5nIHN0cmluZ1dpdGhDb250ZW50c09mRmlsZTpbW05TQnVuZGxlIGJ1bmRsZUZvckNsYXNz OltXZWJDb3JlUmVuZGVyVGhlbWVCdW5kbGUgY2xhc3NdXSBwYXRoRm9yUmVzb3VyY2U6QCJtZWRp YUNvbnRyb2xzaU9TIiBvZlR5cGU6QCJjc3MiXSBlbmNvZGluZzpOU1VURjhTdHJpbmdFbmNvZGlu ZyBlcnJvcjpuaWxdKTsKKyAgICAgICAgYnVpbGRlci5hcHBlbmQod2tHZXRNZWRpYVVJSW1hZ2VE YXRhKHdrTWVkaWFVSVBhcnRPcHRpbWl6ZWRGdWxsc2NyZWVuQnV0dG9uKSk7CisgICAgICAgIG1f bWVkaWFDb250cm9sc1N0eWxlU2hlZXQgPSBidWlsZGVyLnRvU3RyaW5nKCk7CisgICAgfQogICAg IHJldHVybiBtX21lZGlhQ29udHJvbHNTdHlsZVNoZWV0OwogI2Vsc2UKICAgICByZXR1cm4gZW1w dHlTdHJpbmcoKTsK