156630 2016-04-15 10:51:25 -0700 Audio elements should be able to have a controls manager. 2016-04-15 12:06:25 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jer.noble jer.noble darin webkit-bug-importer oldest_to_newest 1184125 0 jer.noble 2016-04-15 10:51:25 -0700 Audio elements should be able to have a controls manager. 1184126 1 jer.noble 2016-04-15 10:51:47 -0700 rdar://problem/25537071 1184131 2 276487 jer.noble 2016-04-15 10:55:28 -0700 Created attachment 276487 Patch 1184135 3 276487 darin 2016-04-15 11:01:58 -0700 Comment on attachment 276487 Patch Why no regression test? 1184136 4 276487 bdakin 2016-04-15 11:03:36 -0700 Comment on attachment 276487 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=276487&action=review > Source/WebCore/html/MediaElementSession.cpp:-234 > - if (ScriptController::processingUserGestureForMedia()) Don't we want to keep this case? Any media that a user chooses to start playing should get a controls manager, no? With this change a small video will never get a controls manager. > Source/WebCore/html/MediaElementSession.cpp:230 > + return true; Why did this switch? 1184138 5 276487 bdakin 2016-04-15 11:06:28 -0700 Comment on attachment 276487 Patch Adding back Darin's r+ that I overrode with my comments. Though I would like to see those comments addressed, as we discussed on irc. :) 1184147 6 darin 2016-04-15 11:31:04 -0700 For the record, it was totally OK with me to remove my review+ and replace it with either review- or review+ of your own. Part of the informal "what happens when two people review around the same time" system. 1184148 7 276487 jer.noble 2016-04-15 11:39:39 -0700 Comment on attachment 276487 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=276487&action=review >> Source/WebCore/html/MediaElementSession.cpp:-234 >> - if (ScriptController::processingUserGestureForMedia()) > > Don't we want to keep this case? Any media that a user chooses to start playing should get a controls manager, no? With this change a small video will never get a controls manager. Sure, i'll leave this in. >> Source/WebCore/html/MediaElementSession.cpp:230 >> + return true; > > Why did this switch? We only want the width and height check if the element hasVIdeo(). Audio elements should just fall through to the "true" case. But I can move this back up to its original location. 1184150 8 276488 jer.noble 2016-04-15 11:46:00 -0700 Created attachment 276488 Patch for landing 1184153 9 276489 jer.noble 2016-04-15 12:01:44 -0700 Created attachment 276489 Patch for landing 1184154 10 jer.noble 2016-04-15 12:06:25 -0700 Committed r199603: <http://trac.webkit.org/changeset/199603> 276487 2016-04-15 10:55:28 -0700 2016-04-15 11:06:28 -0700 Patch bug-156630-20160415105542.patch text/plain 5071 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMTk5NTk0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWEzYTU5YzY0MTRjOTBi N2U2YWI0OTgzYmJhMzE1NGY4ZTZkZmY2Mi4uNjg5Y2JkZjYzOTc3M2UzOGVjMDU4OWZmOGY4NjU4 NTcwNTRiYjFlMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDE2LTA0LTE1ICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIEF1ZGlvIGVsZW1lbnRzIHNo b3VsZCBiZSBhYmxlIHRvIGhhdmUgYSBjb250cm9scyBtYW5hZ2VyLgorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU2NjMwCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm93IHRoYXQgdGhlcmUgaXMgbm8gbG9u Z2VyIGEgYXJjaGl0ZWN0dXJhbCByZXN0cmljdGlvbiBhYm91dCB3aGF0IGtpbmQgb2YgbWVkaWEg ZWxlbWVudHMKKyAgICAgICAgY2FuIGJlIHVzZWQgd2l0aCBXZWJQbGF5YmFja1Nlc3Npb25NYW5h Z2VyLCBhbGxvdyBhdWRpbyBlbGVtZW50cyB0byBjcmVhdGUgYSBjb250cm9scworICAgICAgICBt YW5hZ2VyLgorCisgICAgICAgIERyaXZlLWJ5IGZpeDogY2xlYXIgdGhlIGNvbnRyb2xzIG1hbmFn ZXIgd2hlbiBkZXN0cm95aW5nIHRoZSBtZWRpYSBwbGF5ZXIgZHVlIHRvIGVudGVyaW5nCisgICAg ICAgIHRoZSBwYWdlIGNhY2hlLCBhbmQgd2hlbiBkZXN0cm95aW5nIHRoZSBtZWRpYSBlbGVtZW50 LgorCisgICAgICAgICogaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkhUTUxNZWRpYUVsZW1lbnQ6On5IVE1MTWVkaWFFbGVtZW50KToKKyAgICAgICAgKFdlYkNv cmU6OkhUTUxNZWRpYUVsZW1lbnQ6OnVwZGF0ZVBsYXlTdGF0ZSk6CisgICAgICAgIChXZWJDb3Jl OjpIVE1MTWVkaWFFbGVtZW50OjpzdG9wV2l0aG91dERlc3Ryb3lpbmdNZWRpYVBsYXllcik6Cisg ICAgICAgICogaHRtbC9NZWRpYUVsZW1lbnRTZXNzaW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 Ok1lZGlhRWxlbWVudFNlc3Npb246OmNhbkNvbnRyb2xDb250cm9sc01hbmFnZXIpOgorCiAyMDE2 LTA0LTE0ICBKZXIgTm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgogCiAgICAgICAgIEFsbG93 IFdlYlZpZGVvRnVsbHNjcmVlbk1hbmFnZXIgYW5kIFByb3h5IHRvIGJlIHVzZWQgYnkgYXVkaW8g ZWxlbWVudHMuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1l bnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcAppbmRleCA4 NzExZTI3MDcxODVkZTI5M2UxODgzZWI2Njg0Yjc0N2I0NDIyMDQwLi4xYjUyYzdhNGY0MjIyMDM4 MGZjNDQxZTg4YmFlYThhYjM1ZWJjYjgwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1s L0hUTUxNZWRpYUVsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlh RWxlbWVudC5jcHAKQEAgLTQ5OSw2ICs0OTksOSBAQCBIVE1MTWVkaWFFbGVtZW50Ojp+SFRNTE1l ZGlhRWxlbWVudCgpCiAgICAgc2V0U2hvdWxkRGVsYXlMb2FkRXZlbnQoZmFsc2UpOwogICAgIHVu cmVnaXN0ZXJXaXRoRG9jdW1lbnQoZG9jdW1lbnQoKSk7CiAKKyAgICBpZiAoZG9jdW1lbnQoKS5w YWdlKCkpCisgICAgICAgIGRvY3VtZW50KCkucGFnZSgpLT5jaHJvbWUoKS5jbGllbnQoKS5jbGVh clBsYXliYWNrQ29udHJvbHNNYW5hZ2VyKCp0aGlzKTsKKwogI2lmIEVOQUJMRShWSURFT19UUkFD SykKICAgICBpZiAobV9hdWRpb1RyYWNrcykgewogICAgICAgICBtX2F1ZGlvVHJhY2tzLT5jbGVh ckVsZW1lbnQoKTsKQEAgLTQ4MjQsMTAgKzQ4MjcsOCBAQCB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6 OnVwZGF0ZVBsYXlTdGF0ZSgpCiAgICAgTE9HKE1lZGlhLCAiSFRNTE1lZGlhRWxlbWVudDo6dXBk YXRlUGxheVN0YXRlKCVwKSAtIHNob3VsZEJlUGxheWluZyA9ICVzLCBwbGF5ZXJQYXVzZWQgPSAl cyIsIHRoaXMsIGJvb2xTdHJpbmcoc2hvdWxkQmVQbGF5aW5nKSwgYm9vbFN0cmluZyhwbGF5ZXJQ YXVzZWQpKTsKIAogICAgIGlmIChzaG91bGRCZVBsYXlpbmcpIHsKLSAgICAgICAgaWYgKGRvY3Vt ZW50KCkucGFnZSgpICYmIG1fbWVkaWFTZXNzaW9uLT5jYW5Db250cm9sQ29udHJvbHNNYW5hZ2Vy KCp0aGlzKSkgewotICAgICAgICAgICAgSFRNTFZpZGVvRWxlbWVudCYgYXNWaWRlbyA9IGRvd25j YXN0PEhUTUxWaWRlb0VsZW1lbnQ+KCp0aGlzKTsKLSAgICAgICAgICAgIGRvY3VtZW50KCkucGFn ZSgpLT5jaHJvbWUoKS5jbGllbnQoKS5zZXRVcFBsYXliYWNrQ29udHJvbHNNYW5hZ2VyKGFzVmlk ZW8pOwotICAgICAgICB9CisgICAgICAgIGlmIChkb2N1bWVudCgpLnBhZ2UoKSAmJiBtX21lZGlh U2Vzc2lvbi0+Y2FuQ29udHJvbENvbnRyb2xzTWFuYWdlcigqdGhpcykpCisgICAgICAgICAgICBk b2N1bWVudCgpLnBhZ2UoKS0+Y2hyb21lKCkuY2xpZW50KCkuc2V0VXBQbGF5YmFja0NvbnRyb2xz TWFuYWdlcigqdGhpcyk7CiAKICAgICAgICAgc2V0RGlzcGxheU1vZGUoVmlkZW8pOwogICAgICAg ICBpbnZhbGlkYXRlQ2FjaGVkVGltZSgpOwpAQCAtNDg2MSw3ICs0ODYyLDcgQEAgdm9pZCBIVE1M TWVkaWFFbGVtZW50Ojp1cGRhdGVQbGF5U3RhdGUoKQogICAgICAgICBzdGFydFBsYXliYWNrUHJv Z3Jlc3NUaW1lcigpOwogICAgICAgICBzZXRQbGF5aW5nKHRydWUpOwogICAgIH0gZWxzZSB7Ci0g ICAgICAgIGlmIChlbmRlZFBsYXliYWNrKCkgJiYgZG9jdW1lbnQoKS5wYWdlKCkgJiYgaXM8SFRN TFZpZGVvRWxlbWVudD4oKnRoaXMpKQorICAgICAgICBpZiAoZW5kZWRQbGF5YmFjaygpICYmIGRv Y3VtZW50KCkucGFnZSgpKQogICAgICAgICAgICAgZG9jdW1lbnQoKS5wYWdlKCktPmNocm9tZSgp LmNsaWVudCgpLmNsZWFyUGxheWJhY2tDb250cm9sc01hbmFnZXIoKnRoaXMpOwogCiAgICAgICAg IGlmICghcGxheWVyUGF1c2VkKQpAQCAtNTAzMCw3ICs1MDMxLDEwIEBAIHZvaWQgSFRNTE1lZGlh RWxlbWVudDo6c3RvcFdpdGhvdXREZXN0cm95aW5nTWVkaWFQbGF5ZXIoKQogCiAgICAgaWYgKG1f dmlkZW9GdWxsc2NyZWVuTW9kZSAhPSBWaWRlb0Z1bGxzY3JlZW5Nb2RlTm9uZSkKICAgICAgICAg ZXhpdEZ1bGxzY3JlZW4oKTsKLSAgICAKKworICAgIGlmIChkb2N1bWVudCgpLnBhZ2UoKSkKKyAg ICAgICAgZG9jdW1lbnQoKS5wYWdlKCktPmNocm9tZSgpLmNsaWVudCgpLmNsZWFyUGxheWJhY2tD b250cm9sc01hbmFnZXIoKnRoaXMpOworCiAgICAgbV9pbkFjdGl2ZURvY3VtZW50ID0gZmFsc2U7 CiAKICAgICAvLyBTdG9wIHRoZSBwbGF5YmFjayB3aXRob3V0IGdlbmVyYXRpbmcgZXZlbnRzCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL01lZGlhRWxlbWVudFNlc3Npb24uY3BwIGIv U291cmNlL1dlYkNvcmUvaHRtbC9NZWRpYUVsZW1lbnRTZXNzaW9uLmNwcAppbmRleCAyN2Y1OGJk ZmQ3YmUzZTM2MjFmNmQyZTBiMGM4OGZiZWU1ODU2NWY2Li4xODJmNWNmZmRmNmM5ODk2NzlhYTAz OTc2OGI2OGMzM2JhNDQ5ZjhmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL01lZGlh RWxlbWVudFNlc3Npb24uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvTWVkaWFFbGVtZW50 U2Vzc2lvbi5jcHAKQEAgLTIxNCwxMSArMjE0LDYgQEAgYm9vbCBNZWRpYUVsZW1lbnRTZXNzaW9u OjpwYWdlQWxsb3dzUGxheWJhY2tBZnRlclJlc3VtaW5nKGNvbnN0IEhUTUxNZWRpYUVsZW1lbnQK IAogYm9vbCBNZWRpYUVsZW1lbnRTZXNzaW9uOjpjYW5Db250cm9sQ29udHJvbHNNYW5hZ2VyKGNv bnN0IEhUTUxNZWRpYUVsZW1lbnQmIGVsZW1lbnQpIGNvbnN0CiB7Ci0gICAgLy8gRklYTUU6IHJk YXI6Ly9wcm9ibGVtLzI1NTM3MDcxIEF1ZGlvIGVsZW1lbnRzIHNob3VsZCBiZSBhYmxlIHRvIGhh dmUgYSBjb250cm9scyBtYW5hZ2VyIGFzIHdlbGwuCi0gICAgLy8gQXVkaW8gZWxlbWVudHMgc2hv dWxkIHByb2JhYmx5IG9ubHkgaGF2ZSBhIGNvbnRyb2xzIG1hbmFnZXIgaWYgdGhleSBzdGFydGVk IHBsYXlpbmcgdmlhIGEgdXNlciBnZXN0dXJlLgotICAgIGlmICghZWxlbWVudC5pc1ZpZGVvKCkp Ci0gICAgICAgIHJldHVybiBmYWxzZTsKLQogICAgIGlmICghcGxheWJhY2tQZXJtaXR0ZWQoZWxl bWVudCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIApAQCAtMjI2LDE1ICsyMjEsMTMgQEAgYm9v bCBNZWRpYUVsZW1lbnRTZXNzaW9uOjpjYW5Db250cm9sQ29udHJvbHNNYW5hZ2VyKGNvbnN0IEhU TUxNZWRpYUVsZW1lbnQmIGVsZW0KICAgICBpZiAoIXJlbmRlcmVyKQogICAgICAgICByZXR1cm4g ZmFsc2U7CiAKLSAgICBpZiAocmVuZGVyZXItPmNsaWVudFdpZHRoKCkgPj0gZWxlbWVudE1haW5D b250ZW50TWluaW11bVdpZHRoICYmIHJlbmRlcmVyLT5jbGllbnRIZWlnaHQoKSA+PSBlbGVtZW50 TWFpbkNvbnRlbnRNaW5pbXVtSGVpZ2h0KSB7Ci0gICAgICAgIGlmIChlbGVtZW50Lmhhc0F1ZGlv KCkgJiYgZWxlbWVudC5oYXNWaWRlbygpKQotICAgICAgICAgICAgcmV0dXJuIHRydWU7Ci0gICAg fQorICAgIGlmICghZWxlbWVudC5oYXNBdWRpbygpKQorICAgICAgICByZXR1cm4gZmFsc2U7CiAK LSAgICBpZiAoU2NyaXB0Q29udHJvbGxlcjo6cHJvY2Vzc2luZ1VzZXJHZXN0dXJlRm9yTWVkaWEo KSkKLSAgICAgICAgcmV0dXJuIHRydWU7CisgICAgaWYgKGVsZW1lbnQuaGFzVmlkZW8oKSAmJiAo cmVuZGVyZXItPmNsaWVudFdpZHRoKCkgPCBlbGVtZW50TWFpbkNvbnRlbnRNaW5pbXVtV2lkdGgg fHwgcmVuZGVyZXItPmNsaWVudEhlaWdodCgpIDwgZWxlbWVudE1haW5Db250ZW50TWluaW11bUhl aWdodCkpCisgICAgICAgIHJldHVybiBmYWxzZTsKIAotICAgIHJldHVybiBmYWxzZTsKKyAgICBy ZXR1cm4gdHJ1ZTsKIH0KIAogI2lmIEVOQUJMRShXSVJFTEVTU19QTEFZQkFDS19UQVJHRVQpCg== 276488 2016-04-15 11:46:00 -0700 2016-04-15 12:01:31 -0700 Patch for landing bug-156630-20160415114614.patch text/plain 4869 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMTk5NjAwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGFjMDM1MTAyMjA1NjUz NjljOGM5MzkxOTllY2EyYzJhMWZhNGZjZS4uZGUyZmQzZmNiNzk2NmIwZGExMzUwMTFlNzVjNjhi NDIxYmFkNjJjYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDE2LTA0LTE1ICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIEF1ZGlvIGVsZW1lbnRzIHNo b3VsZCBiZSBhYmxlIHRvIGhhdmUgYSBjb250cm9scyBtYW5hZ2VyLgorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU2NjMwCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgQmV0aCBEYWtpbi4KKworICAgICAgICBOb3cgdGhhdCB0aGVyZSBpcyBubyBsb25nZXIg YSBhcmNoaXRlY3R1cmFsIHJlc3RyaWN0aW9uIGFib3V0IHdoYXQga2luZCBvZiBtZWRpYSBlbGVt ZW50cworICAgICAgICBjYW4gYmUgdXNlZCB3aXRoIFdlYlBsYXliYWNrU2Vzc2lvbk1hbmFnZXIs IGFsbG93IGF1ZGlvIGVsZW1lbnRzIHRvIGNyZWF0ZSBhIGNvbnRyb2xzCisgICAgICAgIG1hbmFn ZXIuCisKKyAgICAgICAgRHJpdmUtYnkgZml4OiBjbGVhciB0aGUgY29udHJvbHMgbWFuYWdlciB3 aGVuIGRlc3Ryb3lpbmcgdGhlIG1lZGlhIHBsYXllciBkdWUgdG8gZW50ZXJpbmcKKyAgICAgICAg dGhlIHBhZ2UgY2FjaGUsIGFuZCB3aGVuIGRlc3Ryb3lpbmcgdGhlIG1lZGlhIGVsZW1lbnQuCisK KyAgICAgICAgKiBodG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 SFRNTE1lZGlhRWxlbWVudDo6fkhUTUxNZWRpYUVsZW1lbnQpOgorICAgICAgICAoV2ViQ29yZTo6 SFRNTE1lZGlhRWxlbWVudDo6dXBkYXRlUGxheVN0YXRlKToKKyAgICAgICAgKFdlYkNvcmU6OkhU TUxNZWRpYUVsZW1lbnQ6OnN0b3BXaXRob3V0RGVzdHJveWluZ01lZGlhUGxheWVyKToKKyAgICAg ICAgKiBodG1sL01lZGlhRWxlbWVudFNlc3Npb24uY3BwOgorICAgICAgICAoV2ViQ29yZTo6TWVk aWFFbGVtZW50U2Vzc2lvbjo6Y2FuQ29udHJvbENvbnRyb2xzTWFuYWdlcik6CisKIDIwMTYtMDQt MTUgIFNhaWQgQWJvdS1IYWxsYXdhICA8c2Fib3VoYWxsYXdhQGFwcGxlLmNvbT4KIAogICAgICAg ICBDYWxsaW5nIFNWR0FuaW1hdGVkUHJvcGVydHlUZWFyT2ZmOjphbmltYXRpb25FbmRlZCgpIHdp bGwgY3Jhc2ggaWYgdGhlIFNWRyBwcm9wZXJ0eSBpcyBub3QgYW5pbWF0aW5nCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwIGIvU291cmNlL1dlYkNv cmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcAppbmRleCA4NzExZTI3MDcxODVkZTI5M2UxODgz ZWI2Njg0Yjc0N2I0NDIyMDQwLi4xYjUyYzdhNGY0MjIyMDM4MGZjNDQxZTg4YmFlYThhYjM1ZWJj YjgwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAKQEAgLTQ5OSw2 ICs0OTksOSBAQCBIVE1MTWVkaWFFbGVtZW50Ojp+SFRNTE1lZGlhRWxlbWVudCgpCiAgICAgc2V0 U2hvdWxkRGVsYXlMb2FkRXZlbnQoZmFsc2UpOwogICAgIHVucmVnaXN0ZXJXaXRoRG9jdW1lbnQo ZG9jdW1lbnQoKSk7CiAKKyAgICBpZiAoZG9jdW1lbnQoKS5wYWdlKCkpCisgICAgICAgIGRvY3Vt ZW50KCkucGFnZSgpLT5jaHJvbWUoKS5jbGllbnQoKS5jbGVhclBsYXliYWNrQ29udHJvbHNNYW5h Z2VyKCp0aGlzKTsKKwogI2lmIEVOQUJMRShWSURFT19UUkFDSykKICAgICBpZiAobV9hdWRpb1Ry YWNrcykgewogICAgICAgICBtX2F1ZGlvVHJhY2tzLT5jbGVhckVsZW1lbnQoKTsKQEAgLTQ4MjQs MTAgKzQ4MjcsOCBAQCB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6OnVwZGF0ZVBsYXlTdGF0ZSgpCiAg ICAgTE9HKE1lZGlhLCAiSFRNTE1lZGlhRWxlbWVudDo6dXBkYXRlUGxheVN0YXRlKCVwKSAtIHNo b3VsZEJlUGxheWluZyA9ICVzLCBwbGF5ZXJQYXVzZWQgPSAlcyIsIHRoaXMsIGJvb2xTdHJpbmco c2hvdWxkQmVQbGF5aW5nKSwgYm9vbFN0cmluZyhwbGF5ZXJQYXVzZWQpKTsKIAogICAgIGlmIChz aG91bGRCZVBsYXlpbmcpIHsKLSAgICAgICAgaWYgKGRvY3VtZW50KCkucGFnZSgpICYmIG1fbWVk aWFTZXNzaW9uLT5jYW5Db250cm9sQ29udHJvbHNNYW5hZ2VyKCp0aGlzKSkgewotICAgICAgICAg ICAgSFRNTFZpZGVvRWxlbWVudCYgYXNWaWRlbyA9IGRvd25jYXN0PEhUTUxWaWRlb0VsZW1lbnQ+ KCp0aGlzKTsKLSAgICAgICAgICAgIGRvY3VtZW50KCkucGFnZSgpLT5jaHJvbWUoKS5jbGllbnQo KS5zZXRVcFBsYXliYWNrQ29udHJvbHNNYW5hZ2VyKGFzVmlkZW8pOwotICAgICAgICB9CisgICAg ICAgIGlmIChkb2N1bWVudCgpLnBhZ2UoKSAmJiBtX21lZGlhU2Vzc2lvbi0+Y2FuQ29udHJvbENv bnRyb2xzTWFuYWdlcigqdGhpcykpCisgICAgICAgICAgICBkb2N1bWVudCgpLnBhZ2UoKS0+Y2hy b21lKCkuY2xpZW50KCkuc2V0VXBQbGF5YmFja0NvbnRyb2xzTWFuYWdlcigqdGhpcyk7CiAKICAg ICAgICAgc2V0RGlzcGxheU1vZGUoVmlkZW8pOwogICAgICAgICBpbnZhbGlkYXRlQ2FjaGVkVGlt ZSgpOwpAQCAtNDg2MSw3ICs0ODYyLDcgQEAgdm9pZCBIVE1MTWVkaWFFbGVtZW50Ojp1cGRhdGVQ bGF5U3RhdGUoKQogICAgICAgICBzdGFydFBsYXliYWNrUHJvZ3Jlc3NUaW1lcigpOwogICAgICAg ICBzZXRQbGF5aW5nKHRydWUpOwogICAgIH0gZWxzZSB7Ci0gICAgICAgIGlmIChlbmRlZFBsYXli YWNrKCkgJiYgZG9jdW1lbnQoKS5wYWdlKCkgJiYgaXM8SFRNTFZpZGVvRWxlbWVudD4oKnRoaXMp KQorICAgICAgICBpZiAoZW5kZWRQbGF5YmFjaygpICYmIGRvY3VtZW50KCkucGFnZSgpKQogICAg ICAgICAgICAgZG9jdW1lbnQoKS5wYWdlKCktPmNocm9tZSgpLmNsaWVudCgpLmNsZWFyUGxheWJh Y2tDb250cm9sc01hbmFnZXIoKnRoaXMpOwogCiAgICAgICAgIGlmICghcGxheWVyUGF1c2VkKQpA QCAtNTAzMCw3ICs1MDMxLDEwIEBAIHZvaWQgSFRNTE1lZGlhRWxlbWVudDo6c3RvcFdpdGhvdXRE ZXN0cm95aW5nTWVkaWFQbGF5ZXIoKQogCiAgICAgaWYgKG1fdmlkZW9GdWxsc2NyZWVuTW9kZSAh PSBWaWRlb0Z1bGxzY3JlZW5Nb2RlTm9uZSkKICAgICAgICAgZXhpdEZ1bGxzY3JlZW4oKTsKLSAg ICAKKworICAgIGlmIChkb2N1bWVudCgpLnBhZ2UoKSkKKyAgICAgICAgZG9jdW1lbnQoKS5wYWdl KCktPmNocm9tZSgpLmNsaWVudCgpLmNsZWFyUGxheWJhY2tDb250cm9sc01hbmFnZXIoKnRoaXMp OworCiAgICAgbV9pbkFjdGl2ZURvY3VtZW50ID0gZmFsc2U7CiAKICAgICAvLyBTdG9wIHRoZSBw bGF5YmFjayB3aXRob3V0IGdlbmVyYXRpbmcgZXZlbnRzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9odG1sL01lZGlhRWxlbWVudFNlc3Npb24uY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9N ZWRpYUVsZW1lbnRTZXNzaW9uLmNwcAppbmRleCAyN2Y1OGJkZmQ3YmUzZTM2MjFmNmQyZTBiMGM4 OGZiZWU1ODU2NWY2Li5mNzczODc5MzQ3Mjc4MmEyZDc4NzM2MzY4MWE4YjQ5MDczOTU3ZmEzIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL01lZGlhRWxlbWVudFNlc3Npb24uY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvTWVkaWFFbGVtZW50U2Vzc2lvbi5jcHAKQEAgLTIxNCw5 ICsyMTQsNyBAQCBib29sIE1lZGlhRWxlbWVudFNlc3Npb246OnBhZ2VBbGxvd3NQbGF5YmFja0Fm dGVyUmVzdW1pbmcoY29uc3QgSFRNTE1lZGlhRWxlbWVudAogCiBib29sIE1lZGlhRWxlbWVudFNl c3Npb246OmNhbkNvbnRyb2xDb250cm9sc01hbmFnZXIoY29uc3QgSFRNTE1lZGlhRWxlbWVudCYg ZWxlbWVudCkgY29uc3QKIHsKLSAgICAvLyBGSVhNRTogcmRhcjovL3Byb2JsZW0vMjU1MzcwNzEg QXVkaW8gZWxlbWVudHMgc2hvdWxkIGJlIGFibGUgdG8gaGF2ZSBhIGNvbnRyb2xzIG1hbmFnZXIg YXMgd2VsbC4KLSAgICAvLyBBdWRpbyBlbGVtZW50cyBzaG91bGQgcHJvYmFibHkgb25seSBoYXZl IGEgY29udHJvbHMgbWFuYWdlciBpZiB0aGV5IHN0YXJ0ZWQgcGxheWluZyB2aWEgYSB1c2VyIGdl c3R1cmUuCi0gICAgaWYgKCFlbGVtZW50LmlzVmlkZW8oKSkKKyAgICBpZiAoIWVsZW1lbnQuaGFz QXVkaW8oKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgaWYgKCFwbGF5YmFja1Blcm1p dHRlZChlbGVtZW50KSkKQEAgLTIyNiw4ICsyMjQsNyBAQCBib29sIE1lZGlhRWxlbWVudFNlc3Np b246OmNhbkNvbnRyb2xDb250cm9sc01hbmFnZXIoY29uc3QgSFRNTE1lZGlhRWxlbWVudCYgZWxl bQogICAgIGlmICghcmVuZGVyZXIpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAotICAgIGlmIChy ZW5kZXJlci0+Y2xpZW50V2lkdGgoKSA+PSBlbGVtZW50TWFpbkNvbnRlbnRNaW5pbXVtV2lkdGgg JiYgcmVuZGVyZXItPmNsaWVudEhlaWdodCgpID49IGVsZW1lbnRNYWluQ29udGVudE1pbmltdW1I ZWlnaHQpIHsKLSAgICAgICAgaWYgKGVsZW1lbnQuaGFzQXVkaW8oKSAmJiBlbGVtZW50Lmhhc1Zp ZGVvKCkpCisgICAgaWYgKGVsZW1lbnQuaGFzVmlkZW8oKSAmJiByZW5kZXJlci0+Y2xpZW50V2lk dGgoKSA+PSBlbGVtZW50TWFpbkNvbnRlbnRNaW5pbXVtV2lkdGggJiYgcmVuZGVyZXItPmNsaWVu dEhlaWdodCgpID49IGVsZW1lbnRNYWluQ29udGVudE1pbmltdW1IZWlnaHQpCiAgICAgICAgICAg ICByZXR1cm4gdHJ1ZTsKICAgICB9CiAK 276489 2016-04-15 12:01:44 -0700 2016-04-15 12:01:44 -0700 Patch for landing bug-156630-20160415120158.patch text/plain 4952 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMTk5NjAwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGFjMDM1MTAyMjA1NjUz NjljOGM5MzkxOTllY2EyYzJhMWZhNGZjZS4uZGUyZmQzZmNiNzk2NmIwZGExMzUwMTFlNzVjNjhi NDIxYmFkNjJjYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDE2LTA0LTE1ICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIEF1ZGlvIGVsZW1lbnRzIHNo b3VsZCBiZSBhYmxlIHRvIGhhdmUgYSBjb250cm9scyBtYW5hZ2VyLgorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU2NjMwCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgQmV0aCBEYWtpbi4KKworICAgICAgICBOb3cgdGhhdCB0aGVyZSBpcyBubyBsb25nZXIg YSBhcmNoaXRlY3R1cmFsIHJlc3RyaWN0aW9uIGFib3V0IHdoYXQga2luZCBvZiBtZWRpYSBlbGVt ZW50cworICAgICAgICBjYW4gYmUgdXNlZCB3aXRoIFdlYlBsYXliYWNrU2Vzc2lvbk1hbmFnZXIs IGFsbG93IGF1ZGlvIGVsZW1lbnRzIHRvIGNyZWF0ZSBhIGNvbnRyb2xzCisgICAgICAgIG1hbmFn ZXIuCisKKyAgICAgICAgRHJpdmUtYnkgZml4OiBjbGVhciB0aGUgY29udHJvbHMgbWFuYWdlciB3 aGVuIGRlc3Ryb3lpbmcgdGhlIG1lZGlhIHBsYXllciBkdWUgdG8gZW50ZXJpbmcKKyAgICAgICAg dGhlIHBhZ2UgY2FjaGUsIGFuZCB3aGVuIGRlc3Ryb3lpbmcgdGhlIG1lZGlhIGVsZW1lbnQuCisK KyAgICAgICAgKiBodG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 SFRNTE1lZGlhRWxlbWVudDo6fkhUTUxNZWRpYUVsZW1lbnQpOgorICAgICAgICAoV2ViQ29yZTo6 SFRNTE1lZGlhRWxlbWVudDo6dXBkYXRlUGxheVN0YXRlKToKKyAgICAgICAgKFdlYkNvcmU6OkhU TUxNZWRpYUVsZW1lbnQ6OnN0b3BXaXRob3V0RGVzdHJveWluZ01lZGlhUGxheWVyKToKKyAgICAg ICAgKiBodG1sL01lZGlhRWxlbWVudFNlc3Npb24uY3BwOgorICAgICAgICAoV2ViQ29yZTo6TWVk aWFFbGVtZW50U2Vzc2lvbjo6Y2FuQ29udHJvbENvbnRyb2xzTWFuYWdlcik6CisKIDIwMTYtMDQt MTUgIFNhaWQgQWJvdS1IYWxsYXdhICA8c2Fib3VoYWxsYXdhQGFwcGxlLmNvbT4KIAogICAgICAg ICBDYWxsaW5nIFNWR0FuaW1hdGVkUHJvcGVydHlUZWFyT2ZmOjphbmltYXRpb25FbmRlZCgpIHdp bGwgY3Jhc2ggaWYgdGhlIFNWRyBwcm9wZXJ0eSBpcyBub3QgYW5pbWF0aW5nCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwIGIvU291cmNlL1dlYkNv cmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcAppbmRleCA4NzExZTI3MDcxODVkZTI5M2UxODgz ZWI2Njg0Yjc0N2I0NDIyMDQwLi4xYjUyYzdhNGY0MjIyMDM4MGZjNDQxZTg4YmFlYThhYjM1ZWJj YjgwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAKQEAgLTQ5OSw2 ICs0OTksOSBAQCBIVE1MTWVkaWFFbGVtZW50Ojp+SFRNTE1lZGlhRWxlbWVudCgpCiAgICAgc2V0 U2hvdWxkRGVsYXlMb2FkRXZlbnQoZmFsc2UpOwogICAgIHVucmVnaXN0ZXJXaXRoRG9jdW1lbnQo ZG9jdW1lbnQoKSk7CiAKKyAgICBpZiAoZG9jdW1lbnQoKS5wYWdlKCkpCisgICAgICAgIGRvY3Vt ZW50KCkucGFnZSgpLT5jaHJvbWUoKS5jbGllbnQoKS5jbGVhclBsYXliYWNrQ29udHJvbHNNYW5h Z2VyKCp0aGlzKTsKKwogI2lmIEVOQUJMRShWSURFT19UUkFDSykKICAgICBpZiAobV9hdWRpb1Ry YWNrcykgewogICAgICAgICBtX2F1ZGlvVHJhY2tzLT5jbGVhckVsZW1lbnQoKTsKQEAgLTQ4MjQs MTAgKzQ4MjcsOCBAQCB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6OnVwZGF0ZVBsYXlTdGF0ZSgpCiAg ICAgTE9HKE1lZGlhLCAiSFRNTE1lZGlhRWxlbWVudDo6dXBkYXRlUGxheVN0YXRlKCVwKSAtIHNo b3VsZEJlUGxheWluZyA9ICVzLCBwbGF5ZXJQYXVzZWQgPSAlcyIsIHRoaXMsIGJvb2xTdHJpbmco c2hvdWxkQmVQbGF5aW5nKSwgYm9vbFN0cmluZyhwbGF5ZXJQYXVzZWQpKTsKIAogICAgIGlmIChz aG91bGRCZVBsYXlpbmcpIHsKLSAgICAgICAgaWYgKGRvY3VtZW50KCkucGFnZSgpICYmIG1fbWVk aWFTZXNzaW9uLT5jYW5Db250cm9sQ29udHJvbHNNYW5hZ2VyKCp0aGlzKSkgewotICAgICAgICAg ICAgSFRNTFZpZGVvRWxlbWVudCYgYXNWaWRlbyA9IGRvd25jYXN0PEhUTUxWaWRlb0VsZW1lbnQ+ KCp0aGlzKTsKLSAgICAgICAgICAgIGRvY3VtZW50KCkucGFnZSgpLT5jaHJvbWUoKS5jbGllbnQo KS5zZXRVcFBsYXliYWNrQ29udHJvbHNNYW5hZ2VyKGFzVmlkZW8pOwotICAgICAgICB9CisgICAg ICAgIGlmIChkb2N1bWVudCgpLnBhZ2UoKSAmJiBtX21lZGlhU2Vzc2lvbi0+Y2FuQ29udHJvbENv bnRyb2xzTWFuYWdlcigqdGhpcykpCisgICAgICAgICAgICBkb2N1bWVudCgpLnBhZ2UoKS0+Y2hy b21lKCkuY2xpZW50KCkuc2V0VXBQbGF5YmFja0NvbnRyb2xzTWFuYWdlcigqdGhpcyk7CiAKICAg ICAgICAgc2V0RGlzcGxheU1vZGUoVmlkZW8pOwogICAgICAgICBpbnZhbGlkYXRlQ2FjaGVkVGlt ZSgpOwpAQCAtNDg2MSw3ICs0ODYyLDcgQEAgdm9pZCBIVE1MTWVkaWFFbGVtZW50Ojp1cGRhdGVQ bGF5U3RhdGUoKQogICAgICAgICBzdGFydFBsYXliYWNrUHJvZ3Jlc3NUaW1lcigpOwogICAgICAg ICBzZXRQbGF5aW5nKHRydWUpOwogICAgIH0gZWxzZSB7Ci0gICAgICAgIGlmIChlbmRlZFBsYXli YWNrKCkgJiYgZG9jdW1lbnQoKS5wYWdlKCkgJiYgaXM8SFRNTFZpZGVvRWxlbWVudD4oKnRoaXMp KQorICAgICAgICBpZiAoZW5kZWRQbGF5YmFjaygpICYmIGRvY3VtZW50KCkucGFnZSgpKQogICAg ICAgICAgICAgZG9jdW1lbnQoKS5wYWdlKCktPmNocm9tZSgpLmNsaWVudCgpLmNsZWFyUGxheWJh Y2tDb250cm9sc01hbmFnZXIoKnRoaXMpOwogCiAgICAgICAgIGlmICghcGxheWVyUGF1c2VkKQpA QCAtNTAzMCw3ICs1MDMxLDEwIEBAIHZvaWQgSFRNTE1lZGlhRWxlbWVudDo6c3RvcFdpdGhvdXRE ZXN0cm95aW5nTWVkaWFQbGF5ZXIoKQogCiAgICAgaWYgKG1fdmlkZW9GdWxsc2NyZWVuTW9kZSAh PSBWaWRlb0Z1bGxzY3JlZW5Nb2RlTm9uZSkKICAgICAgICAgZXhpdEZ1bGxzY3JlZW4oKTsKLSAg ICAKKworICAgIGlmIChkb2N1bWVudCgpLnBhZ2UoKSkKKyAgICAgICAgZG9jdW1lbnQoKS5wYWdl KCktPmNocm9tZSgpLmNsaWVudCgpLmNsZWFyUGxheWJhY2tDb250cm9sc01hbmFnZXIoKnRoaXMp OworCiAgICAgbV9pbkFjdGl2ZURvY3VtZW50ID0gZmFsc2U7CiAKICAgICAvLyBTdG9wIHRoZSBw bGF5YmFjayB3aXRob3V0IGdlbmVyYXRpbmcgZXZlbnRzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9odG1sL01lZGlhRWxlbWVudFNlc3Npb24uY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9N ZWRpYUVsZW1lbnRTZXNzaW9uLmNwcAppbmRleCAyN2Y1OGJkZmQ3YmUzZTM2MjFmNmQyZTBiMGM4 OGZiZWU1ODU2NWY2Li5kMjZiNWNmMWRjN2VkYTVjY2QyZDgzYmEzNzE2YTljNWVhM2Q5NGNhIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL01lZGlhRWxlbWVudFNlc3Npb24uY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvTWVkaWFFbGVtZW50U2Vzc2lvbi5jcHAKQEAgLTIxNCw5 ICsyMTQsNyBAQCBib29sIE1lZGlhRWxlbWVudFNlc3Npb246OnBhZ2VBbGxvd3NQbGF5YmFja0Fm dGVyUmVzdW1pbmcoY29uc3QgSFRNTE1lZGlhRWxlbWVudAogCiBib29sIE1lZGlhRWxlbWVudFNl c3Npb246OmNhbkNvbnRyb2xDb250cm9sc01hbmFnZXIoY29uc3QgSFRNTE1lZGlhRWxlbWVudCYg ZWxlbWVudCkgY29uc3QKIHsKLSAgICAvLyBGSVhNRTogcmRhcjovL3Byb2JsZW0vMjU1MzcwNzEg QXVkaW8gZWxlbWVudHMgc2hvdWxkIGJlIGFibGUgdG8gaGF2ZSBhIGNvbnRyb2xzIG1hbmFnZXIg YXMgd2VsbC4KLSAgICAvLyBBdWRpbyBlbGVtZW50cyBzaG91bGQgcHJvYmFibHkgb25seSBoYXZl IGEgY29udHJvbHMgbWFuYWdlciBpZiB0aGV5IHN0YXJ0ZWQgcGxheWluZyB2aWEgYSB1c2VyIGdl c3R1cmUuCi0gICAgaWYgKCFlbGVtZW50LmlzVmlkZW8oKSkKKyAgICBpZiAoIWVsZW1lbnQuaGFz QXVkaW8oKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgaWYgKCFwbGF5YmFja1Blcm1p dHRlZChlbGVtZW50KSkKQEAgLTIyNiwxMCArMjI0LDggQEAgYm9vbCBNZWRpYUVsZW1lbnRTZXNz aW9uOjpjYW5Db250cm9sQ29udHJvbHNNYW5hZ2VyKGNvbnN0IEhUTUxNZWRpYUVsZW1lbnQmIGVs ZW0KICAgICBpZiAoIXJlbmRlcmVyKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICBpZiAo cmVuZGVyZXItPmNsaWVudFdpZHRoKCkgPj0gZWxlbWVudE1haW5Db250ZW50TWluaW11bVdpZHRo ICYmIHJlbmRlcmVyLT5jbGllbnRIZWlnaHQoKSA+PSBlbGVtZW50TWFpbkNvbnRlbnRNaW5pbXVt SGVpZ2h0KSB7Ci0gICAgICAgIGlmIChlbGVtZW50Lmhhc0F1ZGlvKCkgJiYgZWxlbWVudC5oYXNW aWRlbygpKQorICAgIGlmIChlbGVtZW50Lmhhc1ZpZGVvKCkgJiYgcmVuZGVyZXItPmNsaWVudFdp ZHRoKCkgPj0gZWxlbWVudE1haW5Db250ZW50TWluaW11bVdpZHRoICYmIHJlbmRlcmVyLT5jbGll bnRIZWlnaHQoKSA+PSBlbGVtZW50TWFpbkNvbnRlbnRNaW5pbXVtSGVpZ2h0KQogICAgICAgICAg ICAgcmV0dXJuIHRydWU7Ci0gICAgfQogCiAgICAgaWYgKFNjcmlwdENvbnRyb2xsZXI6OnByb2Nl c3NpbmdVc2VyR2VzdHVyZUZvck1lZGlhKCkpCiAgICAgICAgIHJldHVybiB0cnVlOwo=