145959 2015-06-13 17:21:17 -0700 [Mac] Clear current AirPlay source before setting another 2015-07-02 15:32:24 -0700 1 1 1 Unclassified WebKit Media 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 eric.carlson eric.carlson bfulgham commit-queue webkit-bug-importer oldest_to_newest 1101834 0 eric.carlson 2015-06-13 17:21:17 -0700 It is an error to set the same output context on two AVPlayers simultaneously, so always clear an active player before setting the context on another. 1101835 1 eric.carlson 2015-06-13 17:21:38 -0700 <rdar://problem/21331156> 1101837 2 254857 eric.carlson 2015-06-13 17:25:36 -0700 Created attachment 254857 Proposed patch. 1101840 3 254857 bfulgham 2015-06-13 20:22:09 -0700 Comment on attachment 254857 Proposed patch. r=me 1106439 4 256023 eric.carlson 2015-07-02 12:34:47 -0700 Created attachment 256023 Updated patch. 1106440 5 commit-queue 2015-07-02 12:37:40 -0700 Attachment 256023 did not pass style-queue: ERROR: Source/WebCore/ChangeLog:8: You should remove the 'No new tests' and either add and list tests, or explain why no new tests were possible. [changelog/nonewtests] [5] Total errors found: 1 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 1106443 6 256025 eric.carlson 2015-07-02 12:58:38 -0700 Created attachment 256025 Updated patch. 1106466 7 256025 bfulgham 2015-07-02 14:15:32 -0700 Comment on attachment 256025 Updated patch. r=me. I don't think the Windows build issue is due to this patch. 1106495 8 256025 commit-queue 2015-07-02 15:32:21 -0700 Comment on attachment 256025 Updated patch. Clearing flags on attachment: 256025 Committed r186238: <http://trac.webkit.org/changeset/186238> 1106496 9 commit-queue 2015-07-02 15:32:24 -0700 All reviewed patches have been landed. Closing bug. 254857 2015-06-13 17:25:36 -0700 2015-07-02 12:34:47 -0700 Proposed patch. deactivate_target_patch.txt text/plain 2249 eric.carlson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4NTU0MCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE0IEBACisyMDE1LTA2LTEzICBFcmljIENh cmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIFtNYWNdIENsZWFyIGN1 cnJlbnQgQWlyUGxheSBzb3VyY2UgYmVmb3JlIHNldHRpbmcgYW5vdGhlcgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ1OTU5CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBNb2R1bGVzL21lZGlhc2Vzc2lv bi9XZWJNZWRpYVNlc3Npb25NYW5hZ2VyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OldlYk1lZGlh U2Vzc2lvbk1hbmFnZXI6OmNvbmZpZ3VyZVBsYXliYWNrVGFyZ2V0Q2xpZW50cyk6IENhbGwgc2V0 U2hvdWxkUGxheVRvUGxheWJhY2tUYXJnZXQodHJ1ZSkKKyAgICAgICAgICBhZnRlciBhbGwgY2xp ZW50cyBoYXZlIGJlZW4gdG9sZCB0byBzdG9wIHBsYXlpbmcgdG8gdGhlIHRhcmdldC4KKwogMjAx NS0wNi0xMyAgWGFiaWVyIFJvZHJpZ3VleiBDYWx2YXIgIDxjYWx2YXJpc0BpZ2FsaWEuY29tPiBh bmQgWW91ZW5uIEZhYmxldCA8eW91ZW5uLmZhYmxldEBjcmYuY2Fub24uZnI+CiAKICAgICAgICAg W1N0cmVhbXMgQVBJXSBSZWFkYWJsZUpTU3RyZWFtIHNob3VsZCBoYW5kbGUgcHJvbWlzZXMgcmV0 dXJuZWQgYnkgSlMgc291cmNlIHN0YXJ0IGNhbGxiYWNrCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9N b2R1bGVzL21lZGlhc2Vzc2lvbi9XZWJNZWRpYVNlc3Npb25NYW5hZ2VyLmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc2Vzc2lvbi9XZWJNZWRpYVNlc3Npb25N YW5hZ2VyLmNwcAkocmV2aXNpb24gMTg1NTE5KQorKysgU291cmNlL1dlYkNvcmUvTW9kdWxlcy9t ZWRpYXNlc3Npb24vV2ViTWVkaWFTZXNzaW9uTWFuYWdlci5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTI2MSwxNCArMjYxLDE4IEBAIHZvaWQgV2ViTWVkaWFTZXNzaW9uTWFuYWdlcjo6Y29uZmlndXJl UGwKICAgICAgICAgaWYgKG1fcGxheWJhY2tUYXJnZXQpCiAgICAgICAgICAgICBzdGF0ZS0+Y2xp ZW50LnNldFBsYXliYWNrVGFyZ2V0KHN0YXRlLT5jb250ZXh0SWQsICptX3BsYXliYWNrVGFyZ2V0 LmNvcHlSZWYoKSk7CiAKLSAgICAgICAgaWYgKGkgIT0gaW5kZXhPZkNsaWVudFdpbGxQbGF5VG9U YXJnZXQpCisgICAgICAgIGlmIChpICE9IGluZGV4T2ZDbGllbnRXaWxsUGxheVRvVGFyZ2V0IHx8 ICFoYXZlQWN0aXZlUm91dGUpCiAgICAgICAgICAgICBzdGF0ZS0+Y2xpZW50LnNldFNob3VsZFBs YXlUb1BsYXliYWNrVGFyZ2V0KHN0YXRlLT5jb250ZXh0SWQsIGZhbHNlKTsKLSAgICAgICAgZWxz ZSBpZiAoIWZsYWdzQXJlU2V0KHN0YXRlLT5mbGFncywgTWVkaWFQcm9kdWNlcjo6SXNQbGF5aW5n VG9FeHRlcm5hbERldmljZSkpCi0gICAgICAgICAgICBzdGF0ZS0+Y2xpZW50LnNldFNob3VsZFBs YXlUb1BsYXliYWNrVGFyZ2V0KHN0YXRlLT5jb250ZXh0SWQsIGhhdmVBY3RpdmVSb3V0ZSk7CiAK ICAgICAgICAgc3RhdGUtPmNvbmZpZ3VyYXRpb25SZXF1aXJlZCA9IGZhbHNlOwogICAgICAgICBz dGF0ZS0+cmVxdWVzdGVkUGlja2VyID0gZmFsc2U7CiAgICAgfQorCisgICAgaWYgKGhhdmVBY3Rp dmVSb3V0ZSAmJiBpbmRleE9mQ2xpZW50V2lsbFBsYXlUb1RhcmdldCAhPSBub3RGb3VuZCkgewor ICAgICAgICBhdXRvJiBzdGF0ZSA9IG1fY2xpZW50U3RhdGVbaW5kZXhPZkNsaWVudFdpbGxQbGF5 VG9UYXJnZXRdOworICAgICAgICBpZiAoIWZsYWdzQXJlU2V0KHN0YXRlLT5mbGFncywgTWVkaWFQ cm9kdWNlcjo6SXNQbGF5aW5nVG9FeHRlcm5hbERldmljZSkpCisgICAgICAgICAgICBzdGF0ZS0+ Y2xpZW50LnNldFNob3VsZFBsYXlUb1BsYXliYWNrVGFyZ2V0KHN0YXRlLT5jb250ZXh0SWQsIHRy dWUpOworICAgIH0KIH0KIAogdm9pZCBXZWJNZWRpYVNlc3Npb25NYW5hZ2VyOjpjb25maWd1cmVQ bGF5YmFja1RhcmdldE1vbml0b3JpbmcoKQo= 256023 2015-07-02 12:34:47 -0700 2015-07-02 12:58:38 -0700 Updated patch. client_selection_order_patch.txt text/plain 4414 eric.carlson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4NjIzMCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDE1LTA3LTAyICBFcmljIENh cmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIFtNYWNdIENsZWFyIGN1 cnJlbnQgQWlyUGxheSBzb3VyY2UgYmVmb3JlIHNldHRpbmcgYW5vdGhlcgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ1OTU5CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIChPT1BTISku CisKKyAgICAgICAgKiBNb2R1bGVzL21lZGlhc2Vzc2lvbi9XZWJNZWRpYVNlc3Npb25NYW5hZ2Vy LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OldlYk1lZGlhU2Vzc2lvbk1hbmFnZXI6OmNsaWVudFN0 YXRlRGlkQ2hhbmdlKTogRG9uJ3QgbWFrZSBhIGNsaWVudCBiZWdpbiBwbGF5aW5nIAorICAgICAg ICAgIHRvIHRoZSB0YXJnZXQganVzdCBiZWNhdXNlIGl0IGhhcyBwYXVzZWQuCisgICAgICAgIChX ZWJDb3JlOjpXZWJNZWRpYVNlc3Npb25NYW5hZ2VyOjpjb25maWd1cmVQbGF5YmFja1RhcmdldENs aWVudHMpOiBBbHdheXMgc2VsZWN0IGEgY2xpZW50IHRoYXQKKyAgICAgICAgICByZXF1cmVzdGVk IHRoZSBwaWNrZXIsIGFuZCBuZXZlciBjb25zaWRlciBwYXVzZWQgY2xpZW50cyB3aGVuIGNob29z aW5nIGEgY2xpZW50IHRvIGJlZ2luCisgICAgICAgICAgcGxheWluZyB0byB0aGUgdGFyZ2VyLiBD YWxsIHNldFNob3VsZFBsYXlUb1BsYXliYWNrVGFyZ2V0KHRydWUpIGFmdGVyIGFsbCBvZiB0aGUg b3RoZXIgCisgICAgICAgICAgY2xpZW50cyBoYXZlIGJlZW4gdG9sZCB0byBzdG9wIHBsYXlpbmcg dG8gdGhlIHRhcmdldC4KKwogMjAxNS0wNy0wMiAgQnJhZHkgRWlkc29uICA8YmVpZHNvbkBhcHBs ZS5jb20+CiAKICAgICAgICAgW0NvbnRlbnQgRXh0ZW5zaW9uc10gQmxvY2sgc3luY2hyb25vdXMg WE1MSFRUUFJlcXVlc3QuCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc2Vzc2lv bi9XZWJNZWRpYVNlc3Npb25NYW5hZ2VyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29y ZS9Nb2R1bGVzL21lZGlhc2Vzc2lvbi9XZWJNZWRpYVNlc3Npb25NYW5hZ2VyLmNwcAkocmV2aXNp b24gMTg2MjI1KQorKysgU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXNlc3Npb24vV2ViTWVk aWFTZXNzaW9uTWFuYWdlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE3MSwxNSArMTcxLDE4IEBA IHZvaWQgV2ViTWVkaWFTZXNzaW9uTWFuYWdlcjo6Y2xpZW50U3RhdGUKICAgICBpZiAoIWZsYWdz QXJlU2V0KG9sZEZsYWdzLCBNZWRpYVByb2R1Y2VyOjpSZXF1aXJlc1BsYXliYWNrVGFyZ2V0TW9u aXRvcmluZykgJiYgZmxhZ3NBcmVTZXQobmV3RmxhZ3MsIE1lZGlhUHJvZHVjZXI6OlJlcXVpcmVz UGxheWJhY2tUYXJnZXRNb25pdG9yaW5nKSkKICAgICAgICAgc2NoZWR1bGVEZWxheWVkVGFzayhU YXJnZXRNb25pdG9yaW5nQ29uZmlndXJhdGlvblRhc2spOwogCi0gICAgaWYgKCFmbGFnc0FyZVNl dChuZXdGbGFncywgTWVkaWFQcm9kdWNlcjo6RXh0ZXJuYWxEZXZpY2VBdXRvUGxheUNhbmRpZGF0 ZSkpCisgICAgaWYgKCFtX3BsYXliYWNrVGFyZ2V0IHx8ICFtX3BsYXliYWNrVGFyZ2V0LT5oYXNB Y3RpdmVSb3V0ZSgpKQogICAgICAgICByZXR1cm47CiAKLSAgICBpZiAoIW1fcGxheWJhY2tUYXJn ZXQgfHwgIW1fcGxheWJhY2tUYXJnZXQtPmhhc0FjdGl2ZVJvdXRlKCkpCisgICAgaWYgKCFmbGFn c0FyZVNldChuZXdGbGFncywgTWVkaWFQcm9kdWNlcjo6RXh0ZXJuYWxEZXZpY2VBdXRvUGxheUNh bmRpZGF0ZSkgfHwgIWZsYWdzQXJlU2V0KG5ld0ZsYWdzLCBNZWRpYVByb2R1Y2VyOjpJc1BsYXlp bmdWaWRlbykpCiAgICAgICAgIHJldHVybjsKIAogICAgIC8vIERvIG5vdCBpbnRlcnJ1cHQgYW5v dGhlciBlbGVtZW50IGFscmVhZHkgcGxheWluZyB0byBhIGRldmljZS4KICAgICBib29sIGFub3Ro ZXJDbGllbnRIYXNBY3RpdmVUYXJnZXQgPSBmYWxzZTsKICAgICBmb3IgKGF1dG8mIHN0YXRlIDog bV9jbGllbnRTdGF0ZSkgeworICAgICAgICBpZiAoc3RhdGUgPT0gY2hhbmdlZENsaWVudFN0YXRl KQorICAgICAgICAgICAgY29udGludWU7CisKICAgICAgICAgaWYgKGZsYWdzQXJlU2V0KHN0YXRl LT5mbGFncywgTWVkaWFQcm9kdWNlcjo6SXNQbGF5aW5nVG9FeHRlcm5hbERldmljZSkpIHsKICAg ICAgICAgICAgIGlmIChmbGFnc0FyZVNldChzdGF0ZS0+ZmxhZ3MsIE1lZGlhUHJvZHVjZXI6Oklz UGxheWluZ1ZpZGVvKSkKICAgICAgICAgICAgICAgICByZXR1cm47CkBAIC0yNDMsMTQgKzI0Niwx MSBAQCB2b2lkIFdlYk1lZGlhU2Vzc2lvbk1hbmFnZXI6OmNvbmZpZ3VyZVBsCiAgICAgZm9yIChz aXplX3QgaSA9IDA7IGkgPCBtX2NsaWVudFN0YXRlLnNpemUoKTsgKytpKSB7CiAgICAgICAgIGF1 dG8mIHN0YXRlID0gbV9jbGllbnRTdGF0ZVtpXTsKIAotICAgICAgICBpZiAoaW5kZXhPZkNsaWVu dFRoYXRSZXF1ZXN0ZWRQaWNrZXIgPT0gbm90Rm91bmQgJiYgc3RhdGUtPnJlcXVlc3RlZFBpY2tl cikKKyAgICAgICAgaWYgKHN0YXRlLT5yZXF1ZXN0ZWRQaWNrZXIpCiAgICAgICAgICAgICBpbmRl eE9mQ2xpZW50VGhhdFJlcXVlc3RlZFBpY2tlciA9IGk7CiAKICAgICAgICAgaWYgKGluZGV4T2ZD bGllbnRXaWxsUGxheVRvVGFyZ2V0ID09IG5vdEZvdW5kICYmIGZsYWdzQXJlU2V0KHN0YXRlLT5m bGFncywgTWVkaWFQcm9kdWNlcjo6SXNQbGF5aW5nVG9FeHRlcm5hbERldmljZSkpCiAgICAgICAg ICAgICBpbmRleE9mQ2xpZW50V2lsbFBsYXlUb1RhcmdldCA9IGk7Ci0KLSAgICAgICAgaWYgKGlu ZGV4T2ZBdXRvUGxheUNhbmRpZGF0ZSA9PSBub3RGb3VuZCAmJiBmbGFnc0FyZVNldChzdGF0ZS0+ ZmxhZ3MsIE1lZGlhUHJvZHVjZXI6OkV4dGVybmFsRGV2aWNlQXV0b1BsYXlDYW5kaWRhdGUpICYm ICFmbGFnc0FyZVNldChzdGF0ZS0+ZmxhZ3MsIE1lZGlhUHJvZHVjZXI6OklzUGxheWluZ1ZpZGVv KSkKLSAgICAgICAgICAgIGluZGV4T2ZBdXRvUGxheUNhbmRpZGF0ZSA9IGk7CiAgICAgfQogCiAg ICAgaWYgKGluZGV4T2ZDbGllbnRUaGF0UmVxdWVzdGVkUGlja2VyICE9IG5vdEZvdW5kKQpAQCAt MjY0LDE0ICsyNjQsMTggQEAgdm9pZCBXZWJNZWRpYVNlc3Npb25NYW5hZ2VyOjpjb25maWd1cmVQ bAogICAgICAgICBpZiAobV9wbGF5YmFja1RhcmdldCkKICAgICAgICAgICAgIHN0YXRlLT5jbGll bnQuc2V0UGxheWJhY2tUYXJnZXQoc3RhdGUtPmNvbnRleHRJZCwgKm1fcGxheWJhY2tUYXJnZXQu Y29weVJlZigpKTsKIAotICAgICAgICBpZiAoaSAhPSBpbmRleE9mQ2xpZW50V2lsbFBsYXlUb1Rh cmdldCkKKyAgICAgICAgaWYgKGkgIT0gaW5kZXhPZkNsaWVudFdpbGxQbGF5VG9UYXJnZXQgfHwg IWhhdmVBY3RpdmVSb3V0ZSkKICAgICAgICAgICAgIHN0YXRlLT5jbGllbnQuc2V0U2hvdWxkUGxh eVRvUGxheWJhY2tUYXJnZXQoc3RhdGUtPmNvbnRleHRJZCwgZmFsc2UpOwotICAgICAgICBlbHNl IGlmICghZmxhZ3NBcmVTZXQoc3RhdGUtPmZsYWdzLCBNZWRpYVByb2R1Y2VyOjpJc1BsYXlpbmdU b0V4dGVybmFsRGV2aWNlKSkKLSAgICAgICAgICAgIHN0YXRlLT5jbGllbnQuc2V0U2hvdWxkUGxh eVRvUGxheWJhY2tUYXJnZXQoc3RhdGUtPmNvbnRleHRJZCwgaGF2ZUFjdGl2ZVJvdXRlKTsKIAog ICAgICAgICBzdGF0ZS0+Y29uZmlndXJhdGlvblJlcXVpcmVkID0gZmFsc2U7CiAgICAgICAgIHN0 YXRlLT5yZXF1ZXN0ZWRQaWNrZXIgPSBmYWxzZTsKICAgICB9CisKKyAgICBpZiAoaGF2ZUFjdGl2 ZVJvdXRlICYmIGluZGV4T2ZDbGllbnRXaWxsUGxheVRvVGFyZ2V0ICE9IG5vdEZvdW5kKSB7Cisg ICAgICAgIGF1dG8mIHN0YXRlID0gbV9jbGllbnRTdGF0ZVtpbmRleE9mQ2xpZW50V2lsbFBsYXlU b1RhcmdldF07CisgICAgICAgIGlmICghZmxhZ3NBcmVTZXQoc3RhdGUtPmZsYWdzLCBNZWRpYVBy b2R1Y2VyOjpJc1BsYXlpbmdUb0V4dGVybmFsRGV2aWNlKSkKKyAgICAgICAgICAgIHN0YXRlLT5j bGllbnQuc2V0U2hvdWxkUGxheVRvUGxheWJhY2tUYXJnZXQoc3RhdGUtPmNvbnRleHRJZCwgdHJ1 ZSk7CisgICAgfQogfQogCiB2b2lkIFdlYk1lZGlhU2Vzc2lvbk1hbmFnZXI6OmNvbmZpZ3VyZVBs YXliYWNrVGFyZ2V0TW9uaXRvcmluZygpCg== 256025 2015-07-02 12:58:38 -0700 2015-07-02 15:32:21 -0700 Updated patch. client_selection_order_patch.txt text/plain 4381 eric.carlson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4NjIzMCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDE1LTA3LTAyICBFcmljIENh cmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIFtNYWNdIENsZWFyIGN1 cnJlbnQgQWlyUGxheSBzb3VyY2UgYmVmb3JlIHNldHRpbmcgYW5vdGhlcgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ1OTU5CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBNb2R1bGVzL21lZGlhc2Vzc2lv bi9XZWJNZWRpYVNlc3Npb25NYW5hZ2VyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OldlYk1lZGlh U2Vzc2lvbk1hbmFnZXI6OmNsaWVudFN0YXRlRGlkQ2hhbmdlKTogRG9uJ3QgbWFrZSBhIGNsaWVu dCBiZWdpbiBwbGF5aW5nIAorICAgICAgICAgIHRvIHRoZSB0YXJnZXQganVzdCBiZWNhdXNlIGl0 IGhhcyBwYXVzZWQuCisgICAgICAgIChXZWJDb3JlOjpXZWJNZWRpYVNlc3Npb25NYW5hZ2VyOjpj b25maWd1cmVQbGF5YmFja1RhcmdldENsaWVudHMpOiBBbHdheXMgc2VsZWN0IGEgY2xpZW50IHRo YXQKKyAgICAgICAgICByZXF1cmVzdGVkIHRoZSBwaWNrZXIsIGFuZCBuZXZlciBjb25zaWRlciBw YXVzZWQgY2xpZW50cyB3aGVuIGNob29zaW5nIGEgY2xpZW50IHRvIGJlZ2luCisgICAgICAgICAg cGxheWluZyB0byB0aGUgdGFyZ2VyLiBDYWxsIHNldFNob3VsZFBsYXlUb1BsYXliYWNrVGFyZ2V0 KHRydWUpIGFmdGVyIGFsbCBvZiB0aGUgb3RoZXIgCisgICAgICAgICAgY2xpZW50cyBoYXZlIGJl ZW4gdG9sZCB0byBzdG9wIHBsYXlpbmcgdG8gdGhlIHRhcmdldC4KKwogMjAxNS0wNy0wMiAgQnJh ZHkgRWlkc29uICA8YmVpZHNvbkBhcHBsZS5jb20+CiAKICAgICAgICAgW0NvbnRlbnQgRXh0ZW5z aW9uc10gQmxvY2sgc3luY2hyb25vdXMgWE1MSFRUUFJlcXVlc3QuCkluZGV4OiBTb3VyY2UvV2Vi Q29yZS9Nb2R1bGVzL21lZGlhc2Vzc2lvbi9XZWJNZWRpYVNlc3Npb25NYW5hZ2VyLmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc2Vzc2lvbi9XZWJNZWRpYVNl c3Npb25NYW5hZ2VyLmNwcAkocmV2aXNpb24gMTg2MjI1KQorKysgU291cmNlL1dlYkNvcmUvTW9k dWxlcy9tZWRpYXNlc3Npb24vV2ViTWVkaWFTZXNzaW9uTWFuYWdlci5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTE3MSwxNSArMTcxLDE4IEBAIHZvaWQgV2ViTWVkaWFTZXNzaW9uTWFuYWdlcjo6Y2xp ZW50U3RhdGUKICAgICBpZiAoIWZsYWdzQXJlU2V0KG9sZEZsYWdzLCBNZWRpYVByb2R1Y2VyOjpS ZXF1aXJlc1BsYXliYWNrVGFyZ2V0TW9uaXRvcmluZykgJiYgZmxhZ3NBcmVTZXQobmV3RmxhZ3Ms IE1lZGlhUHJvZHVjZXI6OlJlcXVpcmVzUGxheWJhY2tUYXJnZXRNb25pdG9yaW5nKSkKICAgICAg ICAgc2NoZWR1bGVEZWxheWVkVGFzayhUYXJnZXRNb25pdG9yaW5nQ29uZmlndXJhdGlvblRhc2sp OwogCi0gICAgaWYgKCFmbGFnc0FyZVNldChuZXdGbGFncywgTWVkaWFQcm9kdWNlcjo6RXh0ZXJu YWxEZXZpY2VBdXRvUGxheUNhbmRpZGF0ZSkpCisgICAgaWYgKCFtX3BsYXliYWNrVGFyZ2V0IHx8 ICFtX3BsYXliYWNrVGFyZ2V0LT5oYXNBY3RpdmVSb3V0ZSgpKQogICAgICAgICByZXR1cm47CiAK LSAgICBpZiAoIW1fcGxheWJhY2tUYXJnZXQgfHwgIW1fcGxheWJhY2tUYXJnZXQtPmhhc0FjdGl2 ZVJvdXRlKCkpCisgICAgaWYgKCFmbGFnc0FyZVNldChuZXdGbGFncywgTWVkaWFQcm9kdWNlcjo6 RXh0ZXJuYWxEZXZpY2VBdXRvUGxheUNhbmRpZGF0ZSkgfHwgIWZsYWdzQXJlU2V0KG5ld0ZsYWdz LCBNZWRpYVByb2R1Y2VyOjpJc1BsYXlpbmdWaWRlbykpCiAgICAgICAgIHJldHVybjsKIAogICAg IC8vIERvIG5vdCBpbnRlcnJ1cHQgYW5vdGhlciBlbGVtZW50IGFscmVhZHkgcGxheWluZyB0byBh IGRldmljZS4KICAgICBib29sIGFub3RoZXJDbGllbnRIYXNBY3RpdmVUYXJnZXQgPSBmYWxzZTsK ICAgICBmb3IgKGF1dG8mIHN0YXRlIDogbV9jbGllbnRTdGF0ZSkgeworICAgICAgICBpZiAoc3Rh dGUgPT0gY2hhbmdlZENsaWVudFN0YXRlKQorICAgICAgICAgICAgY29udGludWU7CisKICAgICAg ICAgaWYgKGZsYWdzQXJlU2V0KHN0YXRlLT5mbGFncywgTWVkaWFQcm9kdWNlcjo6SXNQbGF5aW5n VG9FeHRlcm5hbERldmljZSkpIHsKICAgICAgICAgICAgIGlmIChmbGFnc0FyZVNldChzdGF0ZS0+ ZmxhZ3MsIE1lZGlhUHJvZHVjZXI6OklzUGxheWluZ1ZpZGVvKSkKICAgICAgICAgICAgICAgICBy ZXR1cm47CkBAIC0yNDMsMTQgKzI0NiwxMSBAQCB2b2lkIFdlYk1lZGlhU2Vzc2lvbk1hbmFnZXI6 OmNvbmZpZ3VyZVBsCiAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBtX2NsaWVudFN0YXRlLnNp emUoKTsgKytpKSB7CiAgICAgICAgIGF1dG8mIHN0YXRlID0gbV9jbGllbnRTdGF0ZVtpXTsKIAot ICAgICAgICBpZiAoaW5kZXhPZkNsaWVudFRoYXRSZXF1ZXN0ZWRQaWNrZXIgPT0gbm90Rm91bmQg JiYgc3RhdGUtPnJlcXVlc3RlZFBpY2tlcikKKyAgICAgICAgaWYgKHN0YXRlLT5yZXF1ZXN0ZWRQ aWNrZXIpCiAgICAgICAgICAgICBpbmRleE9mQ2xpZW50VGhhdFJlcXVlc3RlZFBpY2tlciA9IGk7 CiAKICAgICAgICAgaWYgKGluZGV4T2ZDbGllbnRXaWxsUGxheVRvVGFyZ2V0ID09IG5vdEZvdW5k ICYmIGZsYWdzQXJlU2V0KHN0YXRlLT5mbGFncywgTWVkaWFQcm9kdWNlcjo6SXNQbGF5aW5nVG9F eHRlcm5hbERldmljZSkpCiAgICAgICAgICAgICBpbmRleE9mQ2xpZW50V2lsbFBsYXlUb1Rhcmdl dCA9IGk7Ci0KLSAgICAgICAgaWYgKGluZGV4T2ZBdXRvUGxheUNhbmRpZGF0ZSA9PSBub3RGb3Vu ZCAmJiBmbGFnc0FyZVNldChzdGF0ZS0+ZmxhZ3MsIE1lZGlhUHJvZHVjZXI6OkV4dGVybmFsRGV2 aWNlQXV0b1BsYXlDYW5kaWRhdGUpICYmICFmbGFnc0FyZVNldChzdGF0ZS0+ZmxhZ3MsIE1lZGlh UHJvZHVjZXI6OklzUGxheWluZ1ZpZGVvKSkKLSAgICAgICAgICAgIGluZGV4T2ZBdXRvUGxheUNh bmRpZGF0ZSA9IGk7CiAgICAgfQogCiAgICAgaWYgKGluZGV4T2ZDbGllbnRUaGF0UmVxdWVzdGVk UGlja2VyICE9IG5vdEZvdW5kKQpAQCAtMjY0LDE0ICsyNjQsMTggQEAgdm9pZCBXZWJNZWRpYVNl c3Npb25NYW5hZ2VyOjpjb25maWd1cmVQbAogICAgICAgICBpZiAobV9wbGF5YmFja1RhcmdldCkK ICAgICAgICAgICAgIHN0YXRlLT5jbGllbnQuc2V0UGxheWJhY2tUYXJnZXQoc3RhdGUtPmNvbnRl eHRJZCwgKm1fcGxheWJhY2tUYXJnZXQuY29weVJlZigpKTsKIAotICAgICAgICBpZiAoaSAhPSBp bmRleE9mQ2xpZW50V2lsbFBsYXlUb1RhcmdldCkKKyAgICAgICAgaWYgKGkgIT0gaW5kZXhPZkNs aWVudFdpbGxQbGF5VG9UYXJnZXQgfHwgIWhhdmVBY3RpdmVSb3V0ZSkKICAgICAgICAgICAgIHN0 YXRlLT5jbGllbnQuc2V0U2hvdWxkUGxheVRvUGxheWJhY2tUYXJnZXQoc3RhdGUtPmNvbnRleHRJ ZCwgZmFsc2UpOwotICAgICAgICBlbHNlIGlmICghZmxhZ3NBcmVTZXQoc3RhdGUtPmZsYWdzLCBN ZWRpYVByb2R1Y2VyOjpJc1BsYXlpbmdUb0V4dGVybmFsRGV2aWNlKSkKLSAgICAgICAgICAgIHN0 YXRlLT5jbGllbnQuc2V0U2hvdWxkUGxheVRvUGxheWJhY2tUYXJnZXQoc3RhdGUtPmNvbnRleHRJ ZCwgaGF2ZUFjdGl2ZVJvdXRlKTsKIAogICAgICAgICBzdGF0ZS0+Y29uZmlndXJhdGlvblJlcXVp cmVkID0gZmFsc2U7CiAgICAgICAgIHN0YXRlLT5yZXF1ZXN0ZWRQaWNrZXIgPSBmYWxzZTsKICAg ICB9CisKKyAgICBpZiAoaGF2ZUFjdGl2ZVJvdXRlICYmIGluZGV4T2ZDbGllbnRXaWxsUGxheVRv VGFyZ2V0ICE9IG5vdEZvdW5kKSB7CisgICAgICAgIGF1dG8mIHN0YXRlID0gbV9jbGllbnRTdGF0 ZVtpbmRleE9mQ2xpZW50V2lsbFBsYXlUb1RhcmdldF07CisgICAgICAgIGlmICghZmxhZ3NBcmVT ZXQoc3RhdGUtPmZsYWdzLCBNZWRpYVByb2R1Y2VyOjpJc1BsYXlpbmdUb0V4dGVybmFsRGV2aWNl KSkKKyAgICAgICAgICAgIHN0YXRlLT5jbGllbnQuc2V0U2hvdWxkUGxheVRvUGxheWJhY2tUYXJn ZXQoc3RhdGUtPmNvbnRleHRJZCwgdHJ1ZSk7CisgICAgfQogfQogCiB2b2lkIFdlYk1lZGlhU2Vz c2lvbk1hbmFnZXI6OmNvbmZpZ3VyZVBsYXliYWNrVGFyZ2V0TW9uaXRvcmluZygpCg==