147234 2015-07-23 12:54:35 -0700 Relax media playback restrictions if the allowsMediaDocumentInlinePlayback property is set. 2015-07-23 15:24:59 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 147181 1 jer.noble jer.noble oldest_to_newest 1111706 0 jer.noble 2015-07-23 12:54:35 -0700 Relax media playback restrictions if the allowsMediaDocumentInlinePlayback property is set. 1111728 1 257374 jer.noble 2015-07-23 13:45:23 -0700 Created attachment 257374 Patch 1111753 2 257383 jer.noble 2015-07-23 14:24:07 -0700 Created attachment 257383 Patch 1111758 3 257383 darin 2015-07-23 14:28:27 -0700 Comment on attachment 257383 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=257383&action=review > Source/WebCore/html/MediaElementSession.cpp:124 > + Page* page = element.document().page(); > + if (element.document().isMediaDocument() && !element.document().ownerElement() && page && page->allowsMediaDocumentInlinePlayback()) > + return true; Helper function for this? The code is repeated three times. I would put element.document() into a local variable since we use it three times. 1111782 4 jer.noble 2015-07-23 15:24:59 -0700 Committed r187262: <http://trac.webkit.org/changeset/187262> 257374 2015-07-23 13:45:23 -0700 2015-07-23 14:24:05 -0700 Patch bug-147234-20150723134407.patch text/plain 4946 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMTg3MDI4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2I2YTdkNGQwOTc0YTkw YmQzMjlhZTM0MDRlNTljZDg0YjMzYTE4OC4uYTYwNDkzMGFiMDgzMmNiZWI4ODUzYTJlYjY4Yjhk NDAyMGJlMmY4NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDE1LTA3LTIzICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIFJlbGF4IG1lZGlhIHBsYXli YWNrIHJlc3RyaWN0aW9ucyBpZiB0aGUgYWxsb3dzTWVkaWFEb2N1bWVudElubGluZVBsYXliYWNr IHByb3BlcnR5IGlzIHNldC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE0NzIzNAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgICogaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkhUTUxNZWRpYUVsZW1lbnQ6OnByZXBhcmVGb3JMb2FkKTogTW92ZWQgcmVzdHJpY3Rpb24gY2hl Y2sgaW50byBNZWRpYUVsZW1lbnRTZXNzaW9uLgorICAgICAgICAqIGh0bWwvTWVkaWFFbGVtZW50 U2Vzc2lvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYUVsZW1lbnRTZXNzaW9uOjpwbGF5 YmFja1Blcm1pdHRlZCk6IENoZWNrIGlmIGlzIGEgdG9wLWxldmVsIG1lZGlhIGRvY3VtZW50IGFu ZCBpZgorICAgICAgICAgICAgYWxsb3dzTWVkaWFEb2N1bWVudEluaWxuZVBsYXliYWNrIGlzIHNl dCwgYW5kIHJldHVybiBlYXJseS4KKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhRWxlbWVudFNlc3Np b246OmVmZmVjdGl2ZVByZWxvYWRGb3JFbGVtZW50KTogRGl0dG8uCisgICAgICAgIChXZWJDb3Jl OjpNZWRpYUVsZW1lbnRTZXNzaW9uOjphbGxvd3NBdXRvbWF0aWNNZWRpYURhdGFMb2FkaW5nKTog RGl0dG8uCisgICAgICAgICogaHRtbC9NZWRpYUVsZW1lbnRTZXNzaW9uLmg6CisKIDIwMTUtMDct MjEgIEplciBOb2JsZSAgPGplci5ub2JsZUBhcHBsZS5jb20+CiAKICAgICAgICAgTm90aWZ5IHRo ZSBVSSBkZWxlZ2F0ZSB3aGVuIGEgTWVkaWFEb2N1bWVudCdzIG5hdHVyYWwgc2l6ZSBjaGFuZ2Vz CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwIGIv U291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcAppbmRleCA0YTczNjRmMTNh NmFjYjg4M2VjODI5YWYwZmM2MzRiNDM2YzAwZTI4Li4yMGUwY2U3ZDk4YzU5NDY2NjYyN2QyYjEx Zjc1OWQxZmNiZDhhZmI1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRp YUVsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5j cHAKQEAgLTEwNDIsOCArMTA0Miw3IEBAIHZvaWQgSFRNTE1lZGlhRWxlbWVudDo6cHJlcGFyZUZv ckxvYWQoKQogICAgICAgICBzZXRTaG91bGREZWxheUxvYWRFdmVudCh0cnVlKTsKIAogI2lmIFBM QVRGT1JNKElPUykKLSAgICBTZXR0aW5ncyogc2V0dGluZ3MgPSBkb2N1bWVudCgpLnNldHRpbmdz KCk7Ci0gICAgaWYgKGVmZmVjdGl2ZVByZWxvYWQgIT0gTWVkaWFQbGF5ZXI6Ok5vbmUgJiYgc2V0 dGluZ3MgJiYgc2V0dGluZ3MtPm1lZGlhRGF0YUxvYWRzQXV0b21hdGljYWxseSgpKQorICAgIGlm IChlZmZlY3RpdmVQcmVsb2FkICE9IE1lZGlhUGxheWVyOjpOb25lICYmIG1fbWVkaWFTZXNzaW9u LT5hbGxvd3NBdXRvbWF0aWNNZWRpYURhdGFMb2FkaW5nKCp0aGlzKSkKICAgICAgICAgcHJlcGFy ZVRvUGxheSgpOwogI2VuZGlmCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvTWVk aWFFbGVtZW50U2Vzc2lvbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL01lZGlhRWxlbWVudFNl c3Npb24uY3BwCmluZGV4IGI3ZTU5NzI5ZTVlMTNkNzBmM2ZmMTE4NDJmOThjZGFhZmMzZGVjZDEu LjZhOTJkMTc5MDU4M2ExNzYzM2U2MmRjMmU5Mjg4YmY4NzIyNWFhNDEgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2h0bWwvTWVkaWFFbGVtZW50U2Vzc2lvbi5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvaHRtbC9NZWRpYUVsZW1lbnRTZXNzaW9uLmNwcApAQCAtMTE5LDYgKzExOSwxMCBAQCB2 b2lkIE1lZGlhRWxlbWVudFNlc3Npb246OnJlbW92ZUJlaGF2aW9yUmVzdHJpY3Rpb24oQmVoYXZp b3JSZXN0cmljdGlvbnMgcmVzdHJpYwogCiBib29sIE1lZGlhRWxlbWVudFNlc3Npb246OnBsYXli YWNrUGVybWl0dGVkKGNvbnN0IEhUTUxNZWRpYUVsZW1lbnQmIGVsZW1lbnQpIGNvbnN0CiB7Cisg ICAgUGFnZSogcGFnZSA9IGVsZW1lbnQuZG9jdW1lbnQoKS5wYWdlKCk7CisgICAgaWYgKGVsZW1l bnQuZG9jdW1lbnQoKS5pc01lZGlhRG9jdW1lbnQoKSAmJiAhZWxlbWVudC5kb2N1bWVudCgpLm93 bmVyRWxlbWVudCgpICYmIHBhZ2UgJiYgcGFnZS0+YWxsb3dzTWVkaWFEb2N1bWVudElubGluZVBs YXliYWNrKCkpCisgICAgICAgIHJldHVybiB0cnVlOworCiAgICAgaWYgKG1fcmVzdHJpY3Rpb25z ICYgUmVxdWlyZVVzZXJHZXN0dXJlRm9yUmF0ZUNoYW5nZSAmJiAhU2NyaXB0Q29udHJvbGxlcjo6 cHJvY2Vzc2luZ1VzZXJHZXN0dXJlKCkpIHsKICAgICAgICAgTE9HKE1lZGlhLCAiTWVkaWFFbGVt ZW50U2Vzc2lvbjo6cGxheWJhY2tQZXJtaXR0ZWQgLSByZXR1cm5pbmcgRkFMU0UiKTsKICAgICAg ICAgcmV0dXJuIGZhbHNlOwpAQCAtMzMxLDYgKzMzNSwxMCBAQCBNZWRpYVBsYXllcjo6UHJlbG9h ZCBNZWRpYUVsZW1lbnRTZXNzaW9uOjplZmZlY3RpdmVQcmVsb2FkRm9yRWxlbWVudChjb25zdCBI VE1MTQogICAgIFBsYXRmb3JtTWVkaWFTZXNzaW9uTWFuYWdlcjo6U2Vzc2lvblJlc3RyaWN0aW9u cyByZXN0cmljdGlvbnMgPSBQbGF0Zm9ybU1lZGlhU2Vzc2lvbk1hbmFnZXI6OnNoYXJlZE1hbmFn ZXIoKS5yZXN0cmljdGlvbnMobWVkaWFUeXBlKCkpOwogICAgIE1lZGlhUGxheWVyOjpQcmVsb2Fk IHByZWxvYWQgPSBlbGVtZW50LnByZWxvYWRWYWx1ZSgpOwogCisgICAgUGFnZSogcGFnZSA9IGVs ZW1lbnQuZG9jdW1lbnQoKS5wYWdlKCk7CisgICAgaWYgKGVsZW1lbnQuZG9jdW1lbnQoKS5pc01l ZGlhRG9jdW1lbnQoKSAmJiAhZWxlbWVudC5kb2N1bWVudCgpLm93bmVyRWxlbWVudCgpICYmIHBh Z2UgJiYgcGFnZS0+YWxsb3dzTWVkaWFEb2N1bWVudElubGluZVBsYXliYWNrKCkpCisgICAgICAg IHJldHVybiBwcmVsb2FkOworCiAgICAgaWYgKChyZXN0cmljdGlvbnMgJiBQbGF0Zm9ybU1lZGlh U2Vzc2lvbk1hbmFnZXI6Ok1ldGFkYXRhUHJlbG9hZGluZ05vdFBlcm1pdHRlZCkgPT0gUGxhdGZv cm1NZWRpYVNlc3Npb25NYW5hZ2VyOjpNZXRhZGF0YVByZWxvYWRpbmdOb3RQZXJtaXR0ZWQpCiAg ICAgICAgIHJldHVybiBNZWRpYVBsYXllcjo6Tm9uZTsKIApAQCAtMzY2LDYgKzM3NCwxOSBAQCBi b29sIE1lZGlhRWxlbWVudFNlc3Npb246OnJlcXVpcmVzRnVsbHNjcmVlbkZvclZpZGVvUGxheWJh Y2soY29uc3QgSFRNTE1lZGlhRWxlbQogICAgIHJldHVybiB0cnVlOwogfQogCitib29sIE1lZGlh RWxlbWVudFNlc3Npb246OmFsbG93c0F1dG9tYXRpY01lZGlhRGF0YUxvYWRpbmcoY29uc3QgSFRN TE1lZGlhRWxlbWVudCYgZWxlbWVudCkgY29uc3QKK3sKKyAgICBQYWdlKiBwYWdlID0gZWxlbWVu dC5kb2N1bWVudCgpLnBhZ2UoKTsKKyAgICBpZiAoZWxlbWVudC5kb2N1bWVudCgpLmlzTWVkaWFE b2N1bWVudCgpICYmICFlbGVtZW50LmRvY3VtZW50KCkub3duZXJFbGVtZW50KCkgJiYgcGFnZSAm JiBwYWdlLT5hbGxvd3NNZWRpYURvY3VtZW50SW5saW5lUGxheWJhY2soKSkKKyAgICAgICAgcmV0 dXJuIHRydWU7CisKKyAgICBTZXR0aW5ncyogc2V0dGluZ3MgPSBlbGVtZW50LmRvY3VtZW50KCku c2V0dGluZ3MoKTsKKyAgICBpZiAoc2V0dGluZ3MgJiYgc2V0dGluZ3MtPm1lZGlhRGF0YUxvYWRz QXV0b21hdGljYWxseSgpKQorICAgICAgICByZXR1cm4gdHJ1ZTsKKworICAgIHJldHVybiBmYWxz ZTsKK30KKwogdm9pZCBNZWRpYUVsZW1lbnRTZXNzaW9uOjptZWRpYUVuZ2luZVVwZGF0ZWQoY29u c3QgSFRNTE1lZGlhRWxlbWVudCYgZWxlbWVudCkKIHsKICAgICBMT0coTWVkaWEsICJNZWRpYUVs ZW1lbnRTZXNzaW9uOjptZWRpYUVuZ2luZVVwZGF0ZWQiKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2h0bWwvTWVkaWFFbGVtZW50U2Vzc2lvbi5oIGIvU291cmNlL1dlYkNvcmUvaHRtbC9N ZWRpYUVsZW1lbnRTZXNzaW9uLmgKaW5kZXggMGE5ODgxOTM4NGMwZWQ1OGQzZTlmYTcyNjdkNTY0 Zjg4ZGNlYTY3My4uZGY1Zjc5N2VkZDRkZDdmMmViYWFjNmNiY2ZmZjNkMWI1MzRkOGY5NSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9NZWRpYUVsZW1lbnRTZXNzaW9uLmgKKysrIGIv U291cmNlL1dlYkNvcmUvaHRtbC9NZWRpYUVsZW1lbnRTZXNzaW9uLmgKQEAgLTcxLDYgKzcxLDcg QEAgcHVibGljOgogICAgIGJvb2wgcmVxdWlyZXNGdWxsc2NyZWVuRm9yVmlkZW9QbGF5YmFjayhj b25zdCBIVE1MTWVkaWFFbGVtZW50JikgY29uc3Q7CiAgICAgV0VCQ09SRV9FWFBPUlQgYm9vbCBh bGxvd3NQaWN0dXJlSW5QaWN0dXJlKGNvbnN0IEhUTUxNZWRpYUVsZW1lbnQmKSBjb25zdDsKICAg ICBNZWRpYVBsYXllcjo6UHJlbG9hZCBlZmZlY3RpdmVQcmVsb2FkRm9yRWxlbWVudChjb25zdCBI VE1MTWVkaWFFbGVtZW50JikgY29uc3Q7CisgICAgYm9vbCBhbGxvd3NBdXRvbWF0aWNNZWRpYURh dGFMb2FkaW5nKGNvbnN0IEhUTUxNZWRpYUVsZW1lbnQmKSBjb25zdDsKIAogICAgIHZvaWQgbWVk aWFFbmdpbmVVcGRhdGVkKGNvbnN0IEhUTUxNZWRpYUVsZW1lbnQmKTsKIAo= 257383 2015-07-23 14:24:07 -0700 2015-07-23 14:28:27 -0700 Patch bug-147234-20150723142252.patch text/plain 4946 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMTg3MjUyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2RmNDcwYzk5NTgxOGQ3 MTQ1NWU4NGUxMDk3YjcyMDNmNzU4MGRmOC4uN2U2YThhZjU4MDZlMTM0OWFlZmE4MDc1NTVjNGJi ZjkzMmY3ZTM3OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDE1LTA3LTIzICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIFJlbGF4IG1lZGlhIHBsYXli YWNrIHJlc3RyaWN0aW9ucyBpZiB0aGUgYWxsb3dzTWVkaWFEb2N1bWVudElubGluZVBsYXliYWNr IHByb3BlcnR5IGlzIHNldC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE0NzIzNAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgICogaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkhUTUxNZWRpYUVsZW1lbnQ6OnByZXBhcmVGb3JMb2FkKTogTW92ZWQgcmVzdHJpY3Rpb24gY2hl Y2sgaW50byBNZWRpYUVsZW1lbnRTZXNzaW9uLgorICAgICAgICAqIGh0bWwvTWVkaWFFbGVtZW50 U2Vzc2lvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYUVsZW1lbnRTZXNzaW9uOjpwbGF5 YmFja1Blcm1pdHRlZCk6IENoZWNrIGlmIGlzIGEgdG9wLWxldmVsIG1lZGlhIGRvY3VtZW50IGFu ZCBpZgorICAgICAgICAgICAgYWxsb3dzTWVkaWFEb2N1bWVudEluaWxuZVBsYXliYWNrIGlzIHNl dCwgYW5kIHJldHVybiBlYXJseS4KKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhRWxlbWVudFNlc3Np b246OmVmZmVjdGl2ZVByZWxvYWRGb3JFbGVtZW50KTogRGl0dG8uCisgICAgICAgIChXZWJDb3Jl OjpNZWRpYUVsZW1lbnRTZXNzaW9uOjphbGxvd3NBdXRvbWF0aWNNZWRpYURhdGFMb2FkaW5nKTog RGl0dG8uCisgICAgICAgICogaHRtbC9NZWRpYUVsZW1lbnRTZXNzaW9uLmg6CisKIDIwMTUtMDct MjEgIEplciBOb2JsZSAgPGplci5ub2JsZUBhcHBsZS5jb20+CiAKICAgICAgICAgTm90aWZ5IHRo ZSBVSSBkZWxlZ2F0ZSB3aGVuIGEgTWVkaWFEb2N1bWVudCdzIG5hdHVyYWwgc2l6ZSBjaGFuZ2Vz CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwIGIv U291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcAppbmRleCAzNjk3OWE0Mzhi ZGI2NTk5OWEwYzIyOTY5ZTU1ZTk0NTBhMTBmMjhhLi5iNDZjMzU0Zjg0YzExMWVlZDI0ODM3ZTBm ZDViNTBmZGM1NWEyZTFkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRp YUVsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5j cHAKQEAgLTEwNDIsOCArMTA0Miw3IEBAIHZvaWQgSFRNTE1lZGlhRWxlbWVudDo6cHJlcGFyZUZv ckxvYWQoKQogICAgICAgICBzZXRTaG91bGREZWxheUxvYWRFdmVudCh0cnVlKTsKIAogI2lmIFBM QVRGT1JNKElPUykKLSAgICBTZXR0aW5ncyogc2V0dGluZ3MgPSBkb2N1bWVudCgpLnNldHRpbmdz KCk7Ci0gICAgaWYgKGVmZmVjdGl2ZVByZWxvYWQgIT0gTWVkaWFQbGF5ZXI6Ok5vbmUgJiYgc2V0 dGluZ3MgJiYgc2V0dGluZ3MtPm1lZGlhRGF0YUxvYWRzQXV0b21hdGljYWxseSgpKQorICAgIGlm IChlZmZlY3RpdmVQcmVsb2FkICE9IE1lZGlhUGxheWVyOjpOb25lICYmIG1fbWVkaWFTZXNzaW9u LT5hbGxvd3NBdXRvbWF0aWNNZWRpYURhdGFMb2FkaW5nKCp0aGlzKSkKICAgICAgICAgcHJlcGFy ZVRvUGxheSgpOwogI2VuZGlmCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvTWVk aWFFbGVtZW50U2Vzc2lvbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL01lZGlhRWxlbWVudFNl c3Npb24uY3BwCmluZGV4IGI3ZTU5NzI5ZTVlMTNkNzBmM2ZmMTE4NDJmOThjZGFhZmMzZGVjZDEu LjZhOTJkMTc5MDU4M2ExNzYzM2U2MmRjMmU5Mjg4YmY4NzIyNWFhNDEgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2h0bWwvTWVkaWFFbGVtZW50U2Vzc2lvbi5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvaHRtbC9NZWRpYUVsZW1lbnRTZXNzaW9uLmNwcApAQCAtMTE5LDYgKzExOSwxMCBAQCB2 b2lkIE1lZGlhRWxlbWVudFNlc3Npb246OnJlbW92ZUJlaGF2aW9yUmVzdHJpY3Rpb24oQmVoYXZp b3JSZXN0cmljdGlvbnMgcmVzdHJpYwogCiBib29sIE1lZGlhRWxlbWVudFNlc3Npb246OnBsYXli YWNrUGVybWl0dGVkKGNvbnN0IEhUTUxNZWRpYUVsZW1lbnQmIGVsZW1lbnQpIGNvbnN0CiB7Cisg ICAgUGFnZSogcGFnZSA9IGVsZW1lbnQuZG9jdW1lbnQoKS5wYWdlKCk7CisgICAgaWYgKGVsZW1l bnQuZG9jdW1lbnQoKS5pc01lZGlhRG9jdW1lbnQoKSAmJiAhZWxlbWVudC5kb2N1bWVudCgpLm93 bmVyRWxlbWVudCgpICYmIHBhZ2UgJiYgcGFnZS0+YWxsb3dzTWVkaWFEb2N1bWVudElubGluZVBs YXliYWNrKCkpCisgICAgICAgIHJldHVybiB0cnVlOworCiAgICAgaWYgKG1fcmVzdHJpY3Rpb25z ICYgUmVxdWlyZVVzZXJHZXN0dXJlRm9yUmF0ZUNoYW5nZSAmJiAhU2NyaXB0Q29udHJvbGxlcjo6 cHJvY2Vzc2luZ1VzZXJHZXN0dXJlKCkpIHsKICAgICAgICAgTE9HKE1lZGlhLCAiTWVkaWFFbGVt ZW50U2Vzc2lvbjo6cGxheWJhY2tQZXJtaXR0ZWQgLSByZXR1cm5pbmcgRkFMU0UiKTsKICAgICAg ICAgcmV0dXJuIGZhbHNlOwpAQCAtMzMxLDYgKzMzNSwxMCBAQCBNZWRpYVBsYXllcjo6UHJlbG9h ZCBNZWRpYUVsZW1lbnRTZXNzaW9uOjplZmZlY3RpdmVQcmVsb2FkRm9yRWxlbWVudChjb25zdCBI VE1MTQogICAgIFBsYXRmb3JtTWVkaWFTZXNzaW9uTWFuYWdlcjo6U2Vzc2lvblJlc3RyaWN0aW9u cyByZXN0cmljdGlvbnMgPSBQbGF0Zm9ybU1lZGlhU2Vzc2lvbk1hbmFnZXI6OnNoYXJlZE1hbmFn ZXIoKS5yZXN0cmljdGlvbnMobWVkaWFUeXBlKCkpOwogICAgIE1lZGlhUGxheWVyOjpQcmVsb2Fk IHByZWxvYWQgPSBlbGVtZW50LnByZWxvYWRWYWx1ZSgpOwogCisgICAgUGFnZSogcGFnZSA9IGVs ZW1lbnQuZG9jdW1lbnQoKS5wYWdlKCk7CisgICAgaWYgKGVsZW1lbnQuZG9jdW1lbnQoKS5pc01l ZGlhRG9jdW1lbnQoKSAmJiAhZWxlbWVudC5kb2N1bWVudCgpLm93bmVyRWxlbWVudCgpICYmIHBh Z2UgJiYgcGFnZS0+YWxsb3dzTWVkaWFEb2N1bWVudElubGluZVBsYXliYWNrKCkpCisgICAgICAg IHJldHVybiBwcmVsb2FkOworCiAgICAgaWYgKChyZXN0cmljdGlvbnMgJiBQbGF0Zm9ybU1lZGlh U2Vzc2lvbk1hbmFnZXI6Ok1ldGFkYXRhUHJlbG9hZGluZ05vdFBlcm1pdHRlZCkgPT0gUGxhdGZv cm1NZWRpYVNlc3Npb25NYW5hZ2VyOjpNZXRhZGF0YVByZWxvYWRpbmdOb3RQZXJtaXR0ZWQpCiAg ICAgICAgIHJldHVybiBNZWRpYVBsYXllcjo6Tm9uZTsKIApAQCAtMzY2LDYgKzM3NCwxOSBAQCBi b29sIE1lZGlhRWxlbWVudFNlc3Npb246OnJlcXVpcmVzRnVsbHNjcmVlbkZvclZpZGVvUGxheWJh Y2soY29uc3QgSFRNTE1lZGlhRWxlbQogICAgIHJldHVybiB0cnVlOwogfQogCitib29sIE1lZGlh RWxlbWVudFNlc3Npb246OmFsbG93c0F1dG9tYXRpY01lZGlhRGF0YUxvYWRpbmcoY29uc3QgSFRN TE1lZGlhRWxlbWVudCYgZWxlbWVudCkgY29uc3QKK3sKKyAgICBQYWdlKiBwYWdlID0gZWxlbWVu dC5kb2N1bWVudCgpLnBhZ2UoKTsKKyAgICBpZiAoZWxlbWVudC5kb2N1bWVudCgpLmlzTWVkaWFE b2N1bWVudCgpICYmICFlbGVtZW50LmRvY3VtZW50KCkub3duZXJFbGVtZW50KCkgJiYgcGFnZSAm JiBwYWdlLT5hbGxvd3NNZWRpYURvY3VtZW50SW5saW5lUGxheWJhY2soKSkKKyAgICAgICAgcmV0 dXJuIHRydWU7CisKKyAgICBTZXR0aW5ncyogc2V0dGluZ3MgPSBlbGVtZW50LmRvY3VtZW50KCku c2V0dGluZ3MoKTsKKyAgICBpZiAoc2V0dGluZ3MgJiYgc2V0dGluZ3MtPm1lZGlhRGF0YUxvYWRz QXV0b21hdGljYWxseSgpKQorICAgICAgICByZXR1cm4gdHJ1ZTsKKworICAgIHJldHVybiBmYWxz ZTsKK30KKwogdm9pZCBNZWRpYUVsZW1lbnRTZXNzaW9uOjptZWRpYUVuZ2luZVVwZGF0ZWQoY29u c3QgSFRNTE1lZGlhRWxlbWVudCYgZWxlbWVudCkKIHsKICAgICBMT0coTWVkaWEsICJNZWRpYUVs ZW1lbnRTZXNzaW9uOjptZWRpYUVuZ2luZVVwZGF0ZWQiKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2h0bWwvTWVkaWFFbGVtZW50U2Vzc2lvbi5oIGIvU291cmNlL1dlYkNvcmUvaHRtbC9N ZWRpYUVsZW1lbnRTZXNzaW9uLmgKaW5kZXggMGE5ODgxOTM4NGMwZWQ1OGQzZTlmYTcyNjdkNTY0 Zjg4ZGNlYTY3My4uZGY1Zjc5N2VkZDRkZDdmMmViYWFjNmNiY2ZmZjNkMWI1MzRkOGY5NSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9NZWRpYUVsZW1lbnRTZXNzaW9uLmgKKysrIGIv U291cmNlL1dlYkNvcmUvaHRtbC9NZWRpYUVsZW1lbnRTZXNzaW9uLmgKQEAgLTcxLDYgKzcxLDcg QEAgcHVibGljOgogICAgIGJvb2wgcmVxdWlyZXNGdWxsc2NyZWVuRm9yVmlkZW9QbGF5YmFjayhj b25zdCBIVE1MTWVkaWFFbGVtZW50JikgY29uc3Q7CiAgICAgV0VCQ09SRV9FWFBPUlQgYm9vbCBh bGxvd3NQaWN0dXJlSW5QaWN0dXJlKGNvbnN0IEhUTUxNZWRpYUVsZW1lbnQmKSBjb25zdDsKICAg ICBNZWRpYVBsYXllcjo6UHJlbG9hZCBlZmZlY3RpdmVQcmVsb2FkRm9yRWxlbWVudChjb25zdCBI VE1MTWVkaWFFbGVtZW50JikgY29uc3Q7CisgICAgYm9vbCBhbGxvd3NBdXRvbWF0aWNNZWRpYURh dGFMb2FkaW5nKGNvbnN0IEhUTUxNZWRpYUVsZW1lbnQmKSBjb25zdDsKIAogICAgIHZvaWQgbWVk aWFFbmdpbmVVcGRhdGVkKGNvbnN0IEhUTUxNZWRpYUVsZW1lbnQmKTsKIAo=