165498 2016-12-06 16:17:36 -0800 [Modern Media Controls] Instantiate iOS media controls 2016-12-06 19:03:46 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 graouts graouts commit-queue oldest_to_newest 1257058 0 graouts 2016-12-06 16:17:36 -0800 [Modern Media Controls] Instantiate iOS media controls 1257059 1 296344 graouts 2016-12-06 16:19:01 -0800 Created attachment 296344 Patch 1257062 2 296344 dino 2016-12-06 16:25:37 -0800 Comment on attachment 296344 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=296344&action=review > Source/WebCore/ChangeLog:10 > + We add support for the modern media controls runtime flags in RenderThemeIOS so that we inject > + the modern media controls code when that flag is on for iOS. And in order to display iOS controls > + on iOS, we now return the IOSInlineMediaControls class when instantiating media controls on iOS. Just say: Add support for the modern media controls runtime flags in RenderThemeIOS. And when instantiating iOS controls, return an IOSInlineMediaControls class. 1257076 3 296349 graouts 2016-12-06 16:38:21 -0800 Created attachment 296349 Patch for landing 1257128 4 296349 commit-queue 2016-12-06 19:03:42 -0800 Comment on attachment 296349 Patch for landing Clearing flags on attachment: 296349 Committed r209441: <http://trac.webkit.org/changeset/209441> 1257129 5 commit-queue 2016-12-06 19:03:46 -0800 All reviewed patches have been landed. Closing bug. 296344 2016-12-06 16:19:01 -0800 2016-12-06 16:38:19 -0800 Patch bug-165498-20161206161824.patch text/plain 7662 graouts U3VidmVyc2lvbiBSZXZpc2lvbjogMjA5NDMyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjhmMjA3MzQ0NGZkYTcw NzdmYmQ4NzZlNmYxZTU0NzRhODEwZTJlMi4uY2IxM2JiZTBmMzI2M2U0YTRhYTc0NTZjOWRkNmIw YzVhODZhMWJiNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI1IEBACiAyMDE2LTEyLTA2ICBBbnRv aW5lIFF1aW50ICA8Z3Jhb3V0c0BhcHBsZS5jb20+CiAKKyAgICAgICAgW01vZGVybiBNZWRpYSBD b250cm9sc10gSW5zdGFudGlhdGUgaU9TIG1lZGlhIGNvbnRyb2xzCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjU0OTgKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZSBhZGQgc3VwcG9ydCBmb3IgdGhlIG1v ZGVybiBtZWRpYSBjb250cm9scyBydW50aW1lIGZsYWdzIGluIFJlbmRlclRoZW1lSU9TIHNvIHRo YXQgd2UgaW5qZWN0CisgICAgICAgIHRoZSBtb2Rlcm4gbWVkaWEgY29udHJvbHMgY29kZSB3aGVu IHRoYXQgZmxhZyBpcyBvbiBmb3IgaU9TLiBBbmQgaW4gb3JkZXIgdG8gZGlzcGxheSBpT1MgY29u dHJvbHMKKyAgICAgICAgb24gaU9TLCB3ZSBub3cgcmV0dXJuIHRoZSBJT1NJbmxpbmVNZWRpYUNv bnRyb2xzIGNsYXNzIHdoZW4gaW5zdGFudGlhdGluZyBtZWRpYSBjb250cm9scyBvbiBpT1MuCisK KyAgICAgICAgKiBNb2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9tZWRpYS9tZWRpYS1jb250 cm9sbGVyLmpzOgorICAgICAgICAoTWVkaWFDb250cm9sbGVyLnByb3RvdHlwZS5fY29udHJvbHND bGFzcyk6CisgICAgICAgIChNZWRpYUNvbnRyb2xsZXIpOgorICAgICAgICAqIHJlbmRlcmluZy9S ZW5kZXJUaGVtZUlPUy5oOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJUaGVtZUlPUy5tbToK KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lSU9TOjptZWRpYUNvbnRyb2xzU3R5bGVTaGVl dCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUaGVtZUlPUzo6bWVkaWFDb250cm9sc1Njcmlw dCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUaGVtZUlPUzo6bWVkaWFDb250cm9sc0Jhc2U2 NFN0cmluZ0Zvckljb25BbmRQbGF0Zm9ybSk6CisKKzIwMTYtMTItMDYgIEFudG9pbmUgUXVpbnQg IDxncmFvdXRzQGFwcGxlLmNvbT4KKwogICAgICAgICBbTW9kZXJuIE1lZGlhIENvbnRyb2xzXSBN ZWRpYSBjb250cm9scyB1c2UgdGhlIGZ1bGxzY3JlZW4gbGF5b3V0IGFmdGVyIGdvaW5nIGZyb20g aW5saW5lIHRvIGZ1bGxzY3JlZW4gdG8gUGlQIHRvIGlubGluZQogICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTY1NDk0CiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL01vZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL21lZGlhL21lZGlhLWNvbnRy b2xsZXIuanMgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9t ZWRpYS9tZWRpYS1jb250cm9sbGVyLmpzCmluZGV4IDUyMjA2ODUxMjRmMWVjYzE3ZWE1NzI3MjNj YjQ3MGNhZjFiOTM1ODAuLmEzOTcyYTFlZjhmYTVhM2EyZmE5NTYwYmYzMjgxYTYzYzE3ZjgwMWYg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xz L21lZGlhL21lZGlhLWNvbnRyb2xsZXIuanMKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9t b2Rlcm4tbWVkaWEtY29udHJvbHMvbWVkaWEvbWVkaWEtY29udHJvbGxlci5qcwpAQCAtMTI5LDYg KzEyOSw4IEBAIGNsYXNzIE1lZGlhQ29udHJvbGxlcgogICAgIF9jb250cm9sc0NsYXNzKCkKICAg ICB7CiAgICAgICAgIGNvbnN0IGxheW91dFRyYWl0cyA9IHRoaXMubGF5b3V0VHJhaXRzOworICAg ICAgICBpZiAobGF5b3V0VHJhaXRzICYgTGF5b3V0VHJhaXRzLmlPUykKKyAgICAgICAgICAgIHJl dHVybiBJT1NJbmxpbmVNZWRpYUNvbnRyb2xzOwogICAgICAgICBpZiAobGF5b3V0VHJhaXRzICYg TGF5b3V0VHJhaXRzLkZ1bGxzY3JlZW4pCiAgICAgICAgICAgICByZXR1cm4gTWFjT1NGdWxsc2Ny ZWVuTWVkaWFDb250cm9sczsKICAgICAgICAgcmV0dXJuIE1hY09TSW5saW5lTWVkaWFDb250cm9s czsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZUlPUy5o IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lSU9TLmgKaW5kZXggZmRkN2Mw YTdkMjBkZDU2OGM0MTc4ZjgyNWI5MzlmNDA5MzU3NmZlZC4uMzNhYTNiNDEwYmMxNzNlMDdkNjY1 OTE3MWNlNjM5OTA0NDJjODAzOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlclRoZW1lSU9TLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRo ZW1lSU9TLmgKQEAgLTEwOCw2ICsxMDgsNyBAQCBwcm90ZWN0ZWQ6CiAjaWYgRU5BQkxFKFZJREVP KQogICAgIFN0cmluZyBtZWRpYUNvbnRyb2xzU3R5bGVTaGVldCgpIG92ZXJyaWRlOwogICAgIFN0 cmluZyBtZWRpYUNvbnRyb2xzU2NyaXB0KCkgb3ZlcnJpZGU7CisgICAgU3RyaW5nIG1lZGlhQ29u dHJvbHNCYXNlNjRTdHJpbmdGb3JJY29uQW5kUGxhdGZvcm0oY29uc3QgU3RyaW5nJiwgY29uc3Qg U3RyaW5nJikgb3ZlcnJpZGU7CiAjZW5kaWYKIAogI2lmIEVOQUJMRShBVFRBQ0hNRU5UX0VMRU1F TlQpCkBAIC0xMjUsNyArMTI2LDkgQEAgcHJpdmF0ZToKIAogICAgIENvbG9yIHN5c3RlbUNvbG9y KENTU1ZhbHVlSUQpIGNvbnN0IG92ZXJyaWRlOwogCisgICAgU3RyaW5nIG1fbGVnYWN5TWVkaWFD b250cm9sc1NjcmlwdDsKICAgICBTdHJpbmcgbV9tZWRpYUNvbnRyb2xzU2NyaXB0OworICAgIFN0 cmluZyBtX2xlZ2FjeU1lZGlhQ29udHJvbHNTdHlsZVNoZWV0OwogICAgIFN0cmluZyBtX21lZGlh Q29udHJvbHNTdHlsZVNoZWV0OwogCiAgICAgbXV0YWJsZSBIYXNoTWFwPGludCwgQ29sb3I+IG1f c3lzdGVtQ29sb3JDYWNoZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJUaGVtZUlPUy5tbSBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZUlP Uy5tbQppbmRleCBmMTQwODEwMGQxZTk0NTAxZWQ3MjQ0ZWUwMjVjNjU3NDQzZGRhZDIwLi40MTI2 ODFjNjc1OTA2YTc4MDk5ODlmZjM5YzFkNTE5YjY0OTYwZTdlIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVJT1MubW0KKysrIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlclRoZW1lSU9TLm1tCkBAIC02Miw2ICs2Miw3IEBACiAjaW1wb3J0ICJS ZW5kZXJTdHlsZS5oIgogI2ltcG9ydCAiUmVuZGVyVGhlbWVJT1MuaCIKICNpbXBvcnQgIlJlbmRl clZpZXcuaCIKKyNpbXBvcnQgIlJ1bnRpbWVFbmFibGVkRmVhdHVyZXMuaCIKICNpbXBvcnQgIlNv ZnRMaW5raW5nLmgiCiAjaW1wb3J0ICJVSUtpdFNQSS5oIgogI2ltcG9ydCAiVVRJVXRpbGl0aWVz LmgiCkBAIC0xMjkwLDkgKzEyOTEsMTUgQEAgdm9pZCBSZW5kZXJUaGVtZUlPUzo6dXBkYXRlQ2Fj aGVkU3lzdGVtRm9udERlc2NyaXB0aW9uKENTU1ZhbHVlSUQgdmFsdWVJRCwgRm9udEMKIFN0cmlu ZyBSZW5kZXJUaGVtZUlPUzo6bWVkaWFDb250cm9sc1N0eWxlU2hlZXQoKQogewogI2lmIEVOQUJM RShNRURJQV9DT05UUk9MU19TQ1JJUFQpCi0gICAgaWYgKG1fbWVkaWFDb250cm9sc1N0eWxlU2hl ZXQuaXNFbXB0eSgpKQotICAgICAgICBtX21lZGlhQ29udHJvbHNTdHlsZVNoZWV0ID0gW05TU3Ry aW5nIHN0cmluZ1dpdGhDb250ZW50c09mRmlsZTpbW05TQnVuZGxlIGJ1bmRsZUZvckNsYXNzOltX ZWJDb3JlUmVuZGVyVGhlbWVCdW5kbGUgY2xhc3NdXSBwYXRoRm9yUmVzb3VyY2U6QCJtZWRpYUNv bnRyb2xzaU9TIiBvZlR5cGU6QCJjc3MiXSBlbmNvZGluZzpOU1VURjhTdHJpbmdFbmNvZGluZyBl cnJvcjpuaWxdOwotICAgIHJldHVybiBtX21lZGlhQ29udHJvbHNTdHlsZVNoZWV0OworICAgIGlm IChSdW50aW1lRW5hYmxlZEZlYXR1cmVzOjpzaGFyZWRGZWF0dXJlcygpLm1vZGVybk1lZGlhQ29u dHJvbHNFbmFibGVkKCkpIHsKKyAgICAgICAgaWYgKG1fbWVkaWFDb250cm9sc1N0eWxlU2hlZXQu aXNFbXB0eSgpKQorICAgICAgICAgICAgbV9tZWRpYUNvbnRyb2xzU3R5bGVTaGVldCA9IFtOU1N0 cmluZyBzdHJpbmdXaXRoQ29udGVudHNPZkZpbGU6W1tOU0J1bmRsZSBidW5kbGVGb3JDbGFzczpb V2ViQ29yZVJlbmRlclRoZW1lQnVuZGxlIGNsYXNzXV0gcGF0aEZvclJlc291cmNlOkAibW9kZXJu LW1lZGlhLWNvbnRyb2xzIiBvZlR5cGU6QCJjc3MiIGluRGlyZWN0b3J5OkAibW9kZXJuLW1lZGlh LWNvbnRyb2xzIl0gZW5jb2Rpbmc6TlNVVEY4U3RyaW5nRW5jb2RpbmcgZXJyb3I6bmlsXTsKKyAg ICAgICAgcmV0dXJuIG1fbWVkaWFDb250cm9sc1N0eWxlU2hlZXQ7CisgICAgfQorCisgICAgaWYg KG1fbGVnYWN5TWVkaWFDb250cm9sc1N0eWxlU2hlZXQuaXNFbXB0eSgpKQorICAgICAgICBtX2xl Z2FjeU1lZGlhQ29udHJvbHNTdHlsZVNoZWV0ID0gW05TU3RyaW5nIHN0cmluZ1dpdGhDb250ZW50 c09mRmlsZTpbW05TQnVuZGxlIGJ1bmRsZUZvckNsYXNzOltXZWJDb3JlUmVuZGVyVGhlbWVCdW5k bGUgY2xhc3NdXSBwYXRoRm9yUmVzb3VyY2U6QCJtZWRpYUNvbnRyb2xzaU9TIiBvZlR5cGU6QCJj c3MiXSBlbmNvZGluZzpOU1VURjhTdHJpbmdFbmNvZGluZyBlcnJvcjpuaWxdOworICAgIHJldHVy biBtX2xlZ2FjeU1lZGlhQ29udHJvbHNTdHlsZVNoZWV0OwogI2Vsc2UKICAgICByZXR1cm4gZW1w dHlTdHJpbmcoKTsKICNlbmRpZgpAQCAtMTMwMSwxOSArMTMwOCw0OSBAQCBTdHJpbmcgUmVuZGVy VGhlbWVJT1M6Om1lZGlhQ29udHJvbHNTdHlsZVNoZWV0KCkKIFN0cmluZyBSZW5kZXJUaGVtZUlP Uzo6bWVkaWFDb250cm9sc1NjcmlwdCgpCiB7CiAjaWYgRU5BQkxFKE1FRElBX0NPTlRST0xTX1ND UklQVCkKLSAgICBpZiAobV9tZWRpYUNvbnRyb2xzU2NyaXB0LmlzRW1wdHkoKSkgeworICAgIGlm IChSdW50aW1lRW5hYmxlZEZlYXR1cmVzOjpzaGFyZWRGZWF0dXJlcygpLm1vZGVybk1lZGlhQ29u dHJvbHNFbmFibGVkKCkpIHsKKyAgICAgICAgaWYgKG1fbWVkaWFDb250cm9sc1NjcmlwdC5pc0Vt cHR5KCkpIHsKKyAgICAgICAgICAgIE5TQnVuZGxlICpidW5kbGUgPSBbTlNCdW5kbGUgYnVuZGxl Rm9yQ2xhc3M6W1dlYkNvcmVSZW5kZXJUaGVtZUJ1bmRsZSBjbGFzc11dOworCisgICAgICAgICAg ICBTdHJpbmdCdWlsZGVyIHNjcmlwdEJ1aWxkZXI7CisgICAgICAgICAgICBzY3JpcHRCdWlsZGVy LmFwcGVuZChbTlNTdHJpbmcgc3RyaW5nV2l0aENvbnRlbnRzT2ZGaWxlOltidW5kbGUgcGF0aEZv clJlc291cmNlOkAibW9kZXJuLW1lZGlhLWNvbnRyb2xzLWxvY2FsaXplZC1zdHJpbmdzLmpzIiBv ZlR5cGU6QCJqcyJdIGVuY29kaW5nOk5TVVRGOFN0cmluZ0VuY29kaW5nIGVycm9yOm5pbF0pOwor ICAgICAgICAgICAgc2NyaXB0QnVpbGRlci5hcHBlbmQoW05TU3RyaW5nIHN0cmluZ1dpdGhDb250 ZW50c09mRmlsZTpbYnVuZGxlIHBhdGhGb3JSZXNvdXJjZTpAIm1vZGVybi1tZWRpYS1jb250cm9s cyIgb2ZUeXBlOkAianMiIGluRGlyZWN0b3J5OkAibW9kZXJuLW1lZGlhLWNvbnRyb2xzIl0gZW5j b2Rpbmc6TlNVVEY4U3RyaW5nRW5jb2RpbmcgZXJyb3I6bmlsXSk7CisgICAgICAgICAgICBtX21l ZGlhQ29udHJvbHNTY3JpcHQgPSBzY3JpcHRCdWlsZGVyLnRvU3RyaW5nKCk7CisgICAgICAgIH0K KyAgICAgICAgcmV0dXJuIG1fbWVkaWFDb250cm9sc1NjcmlwdDsKKyAgICB9CisKKyAgICBpZiAo bV9sZWdhY3lNZWRpYUNvbnRyb2xzU2NyaXB0LmlzRW1wdHkoKSkgeworICAgICAgICBOU0J1bmRs ZSAqYnVuZGxlID0gW05TQnVuZGxlIGJ1bmRsZUZvckNsYXNzOltXZWJDb3JlUmVuZGVyVGhlbWVC dW5kbGUgY2xhc3NdXTsKKwogICAgICAgICBTdHJpbmdCdWlsZGVyIHNjcmlwdEJ1aWxkZXI7CiAg ICAgICAgIE5TQnVuZGxlKiBidW5kbGUgPSBbTlNCdW5kbGUgYnVuZGxlRm9yQ2xhc3M6W1dlYkNv cmVSZW5kZXJUaGVtZUJ1bmRsZSBjbGFzc11dOwogICAgICAgICBzY3JpcHRCdWlsZGVyLmFwcGVu ZChbTlNTdHJpbmcgc3RyaW5nV2l0aENvbnRlbnRzT2ZGaWxlOltidW5kbGUgcGF0aEZvclJlc291 cmNlOkAibWVkaWFDb250cm9sc0xvY2FsaXplZFN0cmluZ3MiIG9mVHlwZTpAImpzIl0gZW5jb2Rp bmc6TlNVVEY4U3RyaW5nRW5jb2RpbmcgZXJyb3I6bmlsXSk7CiAgICAgICAgIHNjcmlwdEJ1aWxk ZXIuYXBwZW5kKFtOU1N0cmluZyBzdHJpbmdXaXRoQ29udGVudHNPZkZpbGU6W2J1bmRsZSBwYXRo Rm9yUmVzb3VyY2U6QCJtZWRpYUNvbnRyb2xzQXBwbGUiIG9mVHlwZTpAImpzIl0gZW5jb2Rpbmc6 TlNVVEY4U3RyaW5nRW5jb2RpbmcgZXJyb3I6bmlsXSk7CiAgICAgICAgIHNjcmlwdEJ1aWxkZXIu YXBwZW5kKFtOU1N0cmluZyBzdHJpbmdXaXRoQ29udGVudHNPZkZpbGU6W2J1bmRsZSBwYXRoRm9y UmVzb3VyY2U6QCJtZWRpYUNvbnRyb2xzaU9TIiBvZlR5cGU6QCJqcyJdIGVuY29kaW5nOk5TVVRG OFN0cmluZ0VuY29kaW5nIGVycm9yOm5pbF0pOwotICAgICAgICBtX21lZGlhQ29udHJvbHNTY3Jp cHQgPSBzY3JpcHRCdWlsZGVyLnRvU3RyaW5nKCk7CisKKyAgICAgICAgbV9sZWdhY3lNZWRpYUNv bnRyb2xzU2NyaXB0ID0gc2NyaXB0QnVpbGRlci50b1N0cmluZygpOwogICAgIH0KLSAgICByZXR1 cm4gbV9tZWRpYUNvbnRyb2xzU2NyaXB0OworICAgIHJldHVybiBtX2xlZ2FjeU1lZGlhQ29udHJv bHNTY3JpcHQ7CisjZWxzZQorICAgIHJldHVybiBlbXB0eVN0cmluZygpOworI2VuZGlmCit9CisK K1N0cmluZyBSZW5kZXJUaGVtZUlPUzo6bWVkaWFDb250cm9sc0Jhc2U2NFN0cmluZ0Zvckljb25B bmRQbGF0Zm9ybShjb25zdCBTdHJpbmcmIGljb25OYW1lLCBjb25zdCBTdHJpbmcmIHBsYXRmb3Jt KQoreworI2lmIEVOQUJMRShNRURJQV9DT05UUk9MU19TQ1JJUFQpCisgICAgaWYgKCFSdW50aW1l RW5hYmxlZEZlYXR1cmVzOjpzaGFyZWRGZWF0dXJlcygpLm1vZGVybk1lZGlhQ29udHJvbHNFbmFi bGVkKCkpCisgICAgICAgIHJldHVybiBlbXB0eVN0cmluZygpOworCisgICAgU3RyaW5nIGRpcmVj dG9yeSA9ICJtb2Rlcm4tbWVkaWEtY29udHJvbHMvaW1hZ2VzLyIgKyBwbGF0Zm9ybTsKKyAgICBO U0J1bmRsZSAqYnVuZGxlID0gW05TQnVuZGxlIGJ1bmRsZUZvckNsYXNzOltXZWJDb3JlUmVuZGVy VGhlbWVCdW5kbGUgY2xhc3NdXTsKKyAgICByZXR1cm4gW1tOU0RhdGEgZGF0YVdpdGhDb250ZW50 c09mRmlsZTpbYnVuZGxlIHBhdGhGb3JSZXNvdXJjZTppY29uTmFtZSBvZlR5cGU6QCJwbmciIGlu RGlyZWN0b3J5OmRpcmVjdG9yeV1dIGJhc2U2NEVuY29kZWRTdHJpbmdXaXRoT3B0aW9uczowXTsK ICNlbHNlCiAgICAgcmV0dXJuIGVtcHR5U3RyaW5nKCk7CiAjZW5kaWYKIH0KKwogI2VuZGlmIC8v IEVOQUJMRShWSURFTykKIAogQ29sb3IgUmVuZGVyVGhlbWVJT1M6OnN5c3RlbUNvbG9yKENTU1Zh bHVlSUQgY3NzVmFsdWVJRCkgY29uc3QK 296349 2016-12-06 16:38:21 -0800 2016-12-06 19:03:42 -0800 Patch for landing bug-165498-20161206163744.patch text/plain 7513 graouts U3VidmVyc2lvbiBSZXZpc2lvbjogMjA5NDMyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjhmMjA3MzQ0NGZkYTcw NzdmYmQ4NzZlNmYxZTU0NzRhODEwZTJlMi4uYzRjYmYyYzQxOTAwZjIzNTYyNmMwZDRlMjFkZWY1 ZDJiZTYyYWIzMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI0IEBACiAyMDE2LTEyLTA2ICBBbnRv aW5lIFF1aW50ICA8Z3Jhb3V0c0BhcHBsZS5jb20+CiAKKyAgICAgICAgW01vZGVybiBNZWRpYSBD b250cm9sc10gSW5zdGFudGlhdGUgaU9TIG1lZGlhIGNvbnRyb2xzCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjU0OTgKKworICAgICAgICBSZXZpZXdl ZCBieSBEZWFuIEphY2tzb24uCisKKyAgICAgICAgQWRkIHN1cHBvcnQgZm9yIHRoZSBtb2Rlcm4g bWVkaWEgY29udHJvbHMgcnVudGltZSBmbGFncyBpbiBSZW5kZXJUaGVtZUlPUyBhbmQsIHdoZW4g aW5zdGFudGlhdGluZyBpT1MgY29udHJvbHMsCisgICAgICAgIHJldHVybiBhbiBJT1NJbmxpbmVN ZWRpYUNvbnRyb2xzIGNsYXNzLgorCisgICAgICAgICogTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29u dHJvbHMvbWVkaWEvbWVkaWEtY29udHJvbGxlci5qczoKKyAgICAgICAgKE1lZGlhQ29udHJvbGxl ci5wcm90b3R5cGUuX2NvbnRyb2xzQ2xhc3MpOgorICAgICAgICAoTWVkaWFDb250cm9sbGVyKToK KyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyVGhlbWVJT1MuaDoKKyAgICAgICAgKiByZW5kZXJp bmcvUmVuZGVyVGhlbWVJT1MubW06CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUaGVtZUlPUzo6 bWVkaWFDb250cm9sc1N0eWxlU2hlZXQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGhlbWVJ T1M6Om1lZGlhQ29udHJvbHNTY3JpcHQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGhlbWVJ T1M6Om1lZGlhQ29udHJvbHNCYXNlNjRTdHJpbmdGb3JJY29uQW5kUGxhdGZvcm0pOgorCisyMDE2 LTEyLTA2ICBBbnRvaW5lIFF1aW50ICA8Z3Jhb3V0c0BhcHBsZS5jb20+CisKICAgICAgICAgW01v ZGVybiBNZWRpYSBDb250cm9sc10gTWVkaWEgY29udHJvbHMgdXNlIHRoZSBmdWxsc2NyZWVuIGxh eW91dCBhZnRlciBnb2luZyBmcm9tIGlubGluZSB0byBmdWxsc2NyZWVuIHRvIFBpUCB0byBpbmxp bmUKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2NTQ5 NAogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21vZGVybi1tZWRpYS1jb250 cm9scy9tZWRpYS9tZWRpYS1jb250cm9sbGVyLmpzIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9t b2Rlcm4tbWVkaWEtY29udHJvbHMvbWVkaWEvbWVkaWEtY29udHJvbGxlci5qcwppbmRleCA1MjIw Njg1MTI0ZjFlY2MxN2VhNTcyNzIzY2I0NzBjYWYxYjkzNTgwLi5hMzk3MmExZWY4ZmE1YTNhMmZh OTU2MGJmMzI4MWE2M2MxN2Y4MDFmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVz L21vZGVybi1tZWRpYS1jb250cm9scy9tZWRpYS9tZWRpYS1jb250cm9sbGVyLmpzCisrKyBiL1Nv dXJjZS9XZWJDb3JlL01vZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL21lZGlhL21lZGlhLWNv bnRyb2xsZXIuanMKQEAgLTEyOSw2ICsxMjksOCBAQCBjbGFzcyBNZWRpYUNvbnRyb2xsZXIKICAg ICBfY29udHJvbHNDbGFzcygpCiAgICAgewogICAgICAgICBjb25zdCBsYXlvdXRUcmFpdHMgPSB0 aGlzLmxheW91dFRyYWl0czsKKyAgICAgICAgaWYgKGxheW91dFRyYWl0cyAmIExheW91dFRyYWl0 cy5pT1MpCisgICAgICAgICAgICByZXR1cm4gSU9TSW5saW5lTWVkaWFDb250cm9sczsKICAgICAg ICAgaWYgKGxheW91dFRyYWl0cyAmIExheW91dFRyYWl0cy5GdWxsc2NyZWVuKQogICAgICAgICAg ICAgcmV0dXJuIE1hY09TRnVsbHNjcmVlbk1lZGlhQ29udHJvbHM7CiAgICAgICAgIHJldHVybiBN YWNPU0lubGluZU1lZGlhQ29udHJvbHM7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyVGhlbWVJT1MuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJU aGVtZUlPUy5oCmluZGV4IGZkZDdjMGE3ZDIwZGQ1NjhjNDE3OGY4MjViOTM5ZjQwOTM1NzZmZWQu LjMzYWEzYjQxMGJjMTczZTA3ZDY2NTkxNzFjZTYzOTkwNDQyYzgwMzggMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZUlPUy5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZUlPUy5oCkBAIC0xMDgsNiArMTA4LDcgQEAgcHJvdGVj dGVkOgogI2lmIEVOQUJMRShWSURFTykKICAgICBTdHJpbmcgbWVkaWFDb250cm9sc1N0eWxlU2hl ZXQoKSBvdmVycmlkZTsKICAgICBTdHJpbmcgbWVkaWFDb250cm9sc1NjcmlwdCgpIG92ZXJyaWRl OworICAgIFN0cmluZyBtZWRpYUNvbnRyb2xzQmFzZTY0U3RyaW5nRm9ySWNvbkFuZFBsYXRmb3Jt KGNvbnN0IFN0cmluZyYsIGNvbnN0IFN0cmluZyYpIG92ZXJyaWRlOwogI2VuZGlmCiAKICNpZiBF TkFCTEUoQVRUQUNITUVOVF9FTEVNRU5UKQpAQCAtMTI1LDcgKzEyNiw5IEBAIHByaXZhdGU6CiAK ICAgICBDb2xvciBzeXN0ZW1Db2xvcihDU1NWYWx1ZUlEKSBjb25zdCBvdmVycmlkZTsKIAorICAg IFN0cmluZyBtX2xlZ2FjeU1lZGlhQ29udHJvbHNTY3JpcHQ7CiAgICAgU3RyaW5nIG1fbWVkaWFD b250cm9sc1NjcmlwdDsKKyAgICBTdHJpbmcgbV9sZWdhY3lNZWRpYUNvbnRyb2xzU3R5bGVTaGVl dDsKICAgICBTdHJpbmcgbV9tZWRpYUNvbnRyb2xzU3R5bGVTaGVldDsKIAogICAgIG11dGFibGUg SGFzaE1hcDxpbnQsIENvbG9yPiBtX3N5c3RlbUNvbG9yQ2FjaGU7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVJT1MubW0gYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyVGhlbWVJT1MubW0KaW5kZXggZjE0MDgxMDBkMWU5NDUwMWVkNzI0NGVl MDI1YzY1NzQ0M2RkYWQyMC4uMDg1YzAwNTU1YTE5YTMxYmE0YTMyZTBhYTc1NGY2ODAzYzczODJh OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lSU9TLm1t CisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZUlPUy5tbQpAQCAtNjIs NiArNjIsNyBAQAogI2ltcG9ydCAiUmVuZGVyU3R5bGUuaCIKICNpbXBvcnQgIlJlbmRlclRoZW1l SU9TLmgiCiAjaW1wb3J0ICJSZW5kZXJWaWV3LmgiCisjaW1wb3J0ICJSdW50aW1lRW5hYmxlZEZl YXR1cmVzLmgiCiAjaW1wb3J0ICJTb2Z0TGlua2luZy5oIgogI2ltcG9ydCAiVUlLaXRTUEkuaCIK ICNpbXBvcnQgIlVUSVV0aWxpdGllcy5oIgpAQCAtMTI5MCw5ICsxMjkxLDE1IEBAIHZvaWQgUmVu ZGVyVGhlbWVJT1M6OnVwZGF0ZUNhY2hlZFN5c3RlbUZvbnREZXNjcmlwdGlvbihDU1NWYWx1ZUlE IHZhbHVlSUQsIEZvbnRDCiBTdHJpbmcgUmVuZGVyVGhlbWVJT1M6Om1lZGlhQ29udHJvbHNTdHls ZVNoZWV0KCkKIHsKICNpZiBFTkFCTEUoTUVESUFfQ09OVFJPTFNfU0NSSVBUKQotICAgIGlmICht X21lZGlhQ29udHJvbHNTdHlsZVNoZWV0LmlzRW1wdHkoKSkKLSAgICAgICAgbV9tZWRpYUNvbnRy b2xzU3R5bGVTaGVldCA9IFtOU1N0cmluZyBzdHJpbmdXaXRoQ29udGVudHNPZkZpbGU6W1tOU0J1 bmRsZSBidW5kbGVGb3JDbGFzczpbV2ViQ29yZVJlbmRlclRoZW1lQnVuZGxlIGNsYXNzXV0gcGF0 aEZvclJlc291cmNlOkAibWVkaWFDb250cm9sc2lPUyIgb2ZUeXBlOkAiY3NzIl0gZW5jb2Rpbmc6 TlNVVEY4U3RyaW5nRW5jb2RpbmcgZXJyb3I6bmlsXTsKLSAgICByZXR1cm4gbV9tZWRpYUNvbnRy b2xzU3R5bGVTaGVldDsKKyAgICBpZiAoUnVudGltZUVuYWJsZWRGZWF0dXJlczo6c2hhcmVkRmVh dHVyZXMoKS5tb2Rlcm5NZWRpYUNvbnRyb2xzRW5hYmxlZCgpKSB7CisgICAgICAgIGlmIChtX21l ZGlhQ29udHJvbHNTdHlsZVNoZWV0LmlzRW1wdHkoKSkKKyAgICAgICAgICAgIG1fbWVkaWFDb250 cm9sc1N0eWxlU2hlZXQgPSBbTlNTdHJpbmcgc3RyaW5nV2l0aENvbnRlbnRzT2ZGaWxlOltbTlNC dW5kbGUgYnVuZGxlRm9yQ2xhc3M6W1dlYkNvcmVSZW5kZXJUaGVtZUJ1bmRsZSBjbGFzc11dIHBh dGhGb3JSZXNvdXJjZTpAIm1vZGVybi1tZWRpYS1jb250cm9scyIgb2ZUeXBlOkAiY3NzIiBpbkRp cmVjdG9yeTpAIm1vZGVybi1tZWRpYS1jb250cm9scyJdIGVuY29kaW5nOk5TVVRGOFN0cmluZ0Vu Y29kaW5nIGVycm9yOm5pbF07CisgICAgICAgIHJldHVybiBtX21lZGlhQ29udHJvbHNTdHlsZVNo ZWV0OworICAgIH0KKworICAgIGlmIChtX2xlZ2FjeU1lZGlhQ29udHJvbHNTdHlsZVNoZWV0Lmlz RW1wdHkoKSkKKyAgICAgICAgbV9sZWdhY3lNZWRpYUNvbnRyb2xzU3R5bGVTaGVldCA9IFtOU1N0 cmluZyBzdHJpbmdXaXRoQ29udGVudHNPZkZpbGU6W1tOU0J1bmRsZSBidW5kbGVGb3JDbGFzczpb V2ViQ29yZVJlbmRlclRoZW1lQnVuZGxlIGNsYXNzXV0gcGF0aEZvclJlc291cmNlOkAibWVkaWFD b250cm9sc2lPUyIgb2ZUeXBlOkAiY3NzIl0gZW5jb2Rpbmc6TlNVVEY4U3RyaW5nRW5jb2Rpbmcg ZXJyb3I6bmlsXTsKKyAgICByZXR1cm4gbV9sZWdhY3lNZWRpYUNvbnRyb2xzU3R5bGVTaGVldDsK ICNlbHNlCiAgICAgcmV0dXJuIGVtcHR5U3RyaW5nKCk7CiAjZW5kaWYKQEAgLTEzMDEsMTkgKzEz MDgsNDggQEAgU3RyaW5nIFJlbmRlclRoZW1lSU9TOjptZWRpYUNvbnRyb2xzU3R5bGVTaGVldCgp CiBTdHJpbmcgUmVuZGVyVGhlbWVJT1M6Om1lZGlhQ29udHJvbHNTY3JpcHQoKQogewogI2lmIEVO QUJMRShNRURJQV9DT05UUk9MU19TQ1JJUFQpCi0gICAgaWYgKG1fbWVkaWFDb250cm9sc1Njcmlw dC5pc0VtcHR5KCkpIHsKKyAgICBpZiAoUnVudGltZUVuYWJsZWRGZWF0dXJlczo6c2hhcmVkRmVh dHVyZXMoKS5tb2Rlcm5NZWRpYUNvbnRyb2xzRW5hYmxlZCgpKSB7CisgICAgICAgIGlmIChtX21l ZGlhQ29udHJvbHNTY3JpcHQuaXNFbXB0eSgpKSB7CisgICAgICAgICAgICBOU0J1bmRsZSAqYnVu ZGxlID0gW05TQnVuZGxlIGJ1bmRsZUZvckNsYXNzOltXZWJDb3JlUmVuZGVyVGhlbWVCdW5kbGUg Y2xhc3NdXTsKKworICAgICAgICAgICAgU3RyaW5nQnVpbGRlciBzY3JpcHRCdWlsZGVyOworICAg ICAgICAgICAgc2NyaXB0QnVpbGRlci5hcHBlbmQoW05TU3RyaW5nIHN0cmluZ1dpdGhDb250ZW50 c09mRmlsZTpbYnVuZGxlIHBhdGhGb3JSZXNvdXJjZTpAIm1vZGVybi1tZWRpYS1jb250cm9scy1s b2NhbGl6ZWQtc3RyaW5ncy5qcyIgb2ZUeXBlOkAianMiXSBlbmNvZGluZzpOU1VURjhTdHJpbmdF bmNvZGluZyBlcnJvcjpuaWxdKTsKKyAgICAgICAgICAgIHNjcmlwdEJ1aWxkZXIuYXBwZW5kKFtO U1N0cmluZyBzdHJpbmdXaXRoQ29udGVudHNPZkZpbGU6W2J1bmRsZSBwYXRoRm9yUmVzb3VyY2U6 QCJtb2Rlcm4tbWVkaWEtY29udHJvbHMiIG9mVHlwZTpAImpzIiBpbkRpcmVjdG9yeTpAIm1vZGVy bi1tZWRpYS1jb250cm9scyJdIGVuY29kaW5nOk5TVVRGOFN0cmluZ0VuY29kaW5nIGVycm9yOm5p bF0pOworICAgICAgICAgICAgbV9tZWRpYUNvbnRyb2xzU2NyaXB0ID0gc2NyaXB0QnVpbGRlci50 b1N0cmluZygpOworICAgICAgICB9CisgICAgICAgIHJldHVybiBtX21lZGlhQ29udHJvbHNTY3Jp cHQ7CisgICAgfQorCisgICAgaWYgKG1fbGVnYWN5TWVkaWFDb250cm9sc1NjcmlwdC5pc0VtcHR5 KCkpIHsKKyAgICAgICAgTlNCdW5kbGUgKmJ1bmRsZSA9IFtOU0J1bmRsZSBidW5kbGVGb3JDbGFz czpbV2ViQ29yZVJlbmRlclRoZW1lQnVuZGxlIGNsYXNzXV07CisKICAgICAgICAgU3RyaW5nQnVp bGRlciBzY3JpcHRCdWlsZGVyOwotICAgICAgICBOU0J1bmRsZSogYnVuZGxlID0gW05TQnVuZGxl IGJ1bmRsZUZvckNsYXNzOltXZWJDb3JlUmVuZGVyVGhlbWVCdW5kbGUgY2xhc3NdXTsKICAgICAg ICAgc2NyaXB0QnVpbGRlci5hcHBlbmQoW05TU3RyaW5nIHN0cmluZ1dpdGhDb250ZW50c09mRmls ZTpbYnVuZGxlIHBhdGhGb3JSZXNvdXJjZTpAIm1lZGlhQ29udHJvbHNMb2NhbGl6ZWRTdHJpbmdz IiBvZlR5cGU6QCJqcyJdIGVuY29kaW5nOk5TVVRGOFN0cmluZ0VuY29kaW5nIGVycm9yOm5pbF0p OwogICAgICAgICBzY3JpcHRCdWlsZGVyLmFwcGVuZChbTlNTdHJpbmcgc3RyaW5nV2l0aENvbnRl bnRzT2ZGaWxlOltidW5kbGUgcGF0aEZvclJlc291cmNlOkAibWVkaWFDb250cm9sc0FwcGxlIiBv ZlR5cGU6QCJqcyJdIGVuY29kaW5nOk5TVVRGOFN0cmluZ0VuY29kaW5nIGVycm9yOm5pbF0pOwog ICAgICAgICBzY3JpcHRCdWlsZGVyLmFwcGVuZChbTlNTdHJpbmcgc3RyaW5nV2l0aENvbnRlbnRz T2ZGaWxlOltidW5kbGUgcGF0aEZvclJlc291cmNlOkAibWVkaWFDb250cm9sc2lPUyIgb2ZUeXBl OkAianMiXSBlbmNvZGluZzpOU1VURjhTdHJpbmdFbmNvZGluZyBlcnJvcjpuaWxdKTsKLSAgICAg ICAgbV9tZWRpYUNvbnRyb2xzU2NyaXB0ID0gc2NyaXB0QnVpbGRlci50b1N0cmluZygpOworCisg ICAgICAgIG1fbGVnYWN5TWVkaWFDb250cm9sc1NjcmlwdCA9IHNjcmlwdEJ1aWxkZXIudG9TdHJp bmcoKTsKICAgICB9Ci0gICAgcmV0dXJuIG1fbWVkaWFDb250cm9sc1NjcmlwdDsKKyAgICByZXR1 cm4gbV9sZWdhY3lNZWRpYUNvbnRyb2xzU2NyaXB0OworI2Vsc2UKKyAgICByZXR1cm4gZW1wdHlT dHJpbmcoKTsKKyNlbmRpZgorfQorCitTdHJpbmcgUmVuZGVyVGhlbWVJT1M6Om1lZGlhQ29udHJv bHNCYXNlNjRTdHJpbmdGb3JJY29uQW5kUGxhdGZvcm0oY29uc3QgU3RyaW5nJiBpY29uTmFtZSwg Y29uc3QgU3RyaW5nJiBwbGF0Zm9ybSkKK3sKKyNpZiBFTkFCTEUoTUVESUFfQ09OVFJPTFNfU0NS SVBUKQorICAgIGlmICghUnVudGltZUVuYWJsZWRGZWF0dXJlczo6c2hhcmVkRmVhdHVyZXMoKS5t b2Rlcm5NZWRpYUNvbnRyb2xzRW5hYmxlZCgpKQorICAgICAgICByZXR1cm4gZW1wdHlTdHJpbmco KTsKKworICAgIFN0cmluZyBkaXJlY3RvcnkgPSAibW9kZXJuLW1lZGlhLWNvbnRyb2xzL2ltYWdl cy8iICsgcGxhdGZvcm07CisgICAgTlNCdW5kbGUgKmJ1bmRsZSA9IFtOU0J1bmRsZSBidW5kbGVG b3JDbGFzczpbV2ViQ29yZVJlbmRlclRoZW1lQnVuZGxlIGNsYXNzXV07CisgICAgcmV0dXJuIFtb TlNEYXRhIGRhdGFXaXRoQ29udGVudHNPZkZpbGU6W2J1bmRsZSBwYXRoRm9yUmVzb3VyY2U6aWNv bk5hbWUgb2ZUeXBlOkAicG5nIiBpbkRpcmVjdG9yeTpkaXJlY3RvcnldXSBiYXNlNjRFbmNvZGVk U3RyaW5nV2l0aE9wdGlvbnM6MF07CiAjZWxzZQogICAgIHJldHVybiBlbXB0eVN0cmluZygpOwog I2VuZGlmCiB9CisKICNlbmRpZiAvLyBFTkFCTEUoVklERU8pCiAKIENvbG9yIFJlbmRlclRoZW1l SU9TOjpzeXN0ZW1Db2xvcihDU1NWYWx1ZUlEIGNzc1ZhbHVlSUQpIGNvbnN0Cg==