204461 2019-11-21 11:01:31 -0800 Ignore the requests to enter/exit video fullscreen/picture-in-picture if the requesting mode is the same as the current mode 2019-11-21 16:32:54 -0800 1 1 1 Unclassified WebKit Media WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 peng.liu6 peng.liu6 calvaris cdumez commit-queue eric.carlson esprehn+autocc ews-watchlist glenn gyuyoung.kim jer.noble kondapallykalyan philipj sergio webkit-bug-importer oldest_to_newest 1592445 0 peng.liu6 2019-11-21 11:01:31 -0800 AIgnore the requests to enter/exit video fullscreen/picture-in-picture if the requesting mode is the same as the current mode 1592446 1 webkit-bug-importer 2019-11-21 11:02:37 -0800 <rdar://problem/57400791> 1592514 2 384084 peng.liu6 2019-11-21 13:15:08 -0800 Created attachment 384084 Patch 1592581 3 384084 commit-queue 2019-11-21 16:32:52 -0800 Comment on attachment 384084 Patch Clearing flags on attachment: 384084 Committed r252755: <https://trac.webkit.org/changeset/252755> 1592582 4 commit-queue 2019-11-21 16:32:54 -0800 All reviewed patches have been landed. Closing bug. 384084 2019-11-21 13:15:08 -0800 2019-11-21 16:32:52 -0800 Patch bug-204461-20191121131507.patch text/plain 9492 peng.liu6 U3VidmVyc2lvbiBSZXZpc2lvbjogMjUyNzM5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzQ4OTA0NDNjMTJhY2I1 MWQ2NTBlYjY1MWFmYzNlMjFjYzRlZDUwOS4uZjJkMWQ3ZDc0NzA2YjBlODE4NTQ4Y2FmOTdiOGFl ZWM1MDliY2NiMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE5LTExLTIxICBQZW5n IExpdSAgPHBlbmcubGl1NkBhcHBsZS5jb20+CisKKyAgICAgICAgSWdub3JlIHRoZSByZXF1ZXN0 cyB0byBlbnRlci9leGl0IHZpZGVvIGZ1bGxzY3JlZW4vcGljdHVyZS1pbi1waWN0dXJlIGlmIHRo ZSByZXF1ZXN0aW5nIG1vZGUgaXMgdGhlIHNhbWUgYXMgdGhlIGN1cnJlbnQgbW9kZQorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA0NDYxCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ2hhbmdlIHRoZSBvcmRl ciBvZiBlbnVtIFZpZGVvUHJlc2VudGF0aW9uTW9kZSBhbmQgYWRkIHNvbWUgbG9nIG1lc3NhZ2Vz IHJlZ2FyZGluZyBwcmVzZW50YXRpb24gbW9kZSBjaGFuZ2UuCisgICAgICAgIFRob3NlIGNoYW5n ZXMgbWFrZSB0aGUgZGVidWdnaW5nIGVhc2llci4KKworICAgICAgICBDb3ZlcmVkIGJ5IGV4aXN0 aW5nIHRlc3QgY2FzZXMuCisKKyAgICAgICAgKiBodG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6SFRNTE1lZGlhRWxlbWVudDo6ZW50ZXJGdWxsc2NyZWVuKToKKyAg ICAgICAgKFdlYkNvcmU6OkhUTUxNZWRpYUVsZW1lbnQ6OmRpZEJlY29tZUZ1bGxzY3JlZW5FbGVt ZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxNZWRpYUVsZW1lbnQ6OndhaXRGb3JQcmVwYXJl ZEZvcklubGluZVRoZW4pOgorICAgICAgICAoV2ViQ29yZTo6SFRNTE1lZGlhRWxlbWVudDo6c2V0 VmlkZW9GdWxsc2NyZWVuTGF5ZXIpOgorICAgICAgICAqIGh0bWwvSFRNTFZpZGVvRWxlbWVudC5j cHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MVmlkZW9FbGVtZW50Ojp3ZWJraXRTZXRQcmVzZW50 YXRpb25Nb2RlKToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxWaWRlb0VsZW1lbnQ6OnNldEZ1bGxz Y3JlZW5Nb2RlKToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxWaWRlb0VsZW1lbnQ6OmZ1bGxzY3Jl ZW5Nb2RlQ2hhbmdlZCk6CisgICAgICAgICogaHRtbC9IVE1MVmlkZW9FbGVtZW50Lmg6CisgICAg ICAgICogaHRtbC9IVE1MVmlkZW9FbGVtZW50LmlkbDoKKwogMjAxOS0xMS0yMSAgWW91ZW5uIEZh YmxldCAgPHlvdWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgUmVncmVzc2lvbiAocjI1MjY2MCk6 IExheW91dCBUZXN0IHBsYXRmb3JtL2lvcy9tZWRpYXN0cmVhbS9hdWRpby1tdXRlZC1pbi1iYWNr Z3JvdW5kLXRhYi5odG1sIGlzIGZhaWxpbmcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hh bmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXggOTlmY2MwNjI2M2U3OGNhMjc2 YWFjNDYxMDRkNzY3ODZkYzAwYTg0ZC4uOTNhYTM4MTAwYzFlZWQwMTY4YmQxYTE5OGY5NDYzZjM3 MzUzNzc0YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNl L1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxOS0xMS0yMSAgUGVuZyBMaXUg IDxwZW5nLmxpdTZAYXBwbGUuY29tPgorCisgICAgICAgIElnbm9yZSB0aGUgcmVxdWVzdHMgdG8g ZW50ZXIvZXhpdCB2aWRlbyBmdWxsc2NyZWVuL3BpY3R1cmUtaW4tcGljdHVyZSBpZiB0aGUgcmVx dWVzdGluZyBtb2RlIGlzIHRoZSBzYW1lIGFzIHRoZSBjdXJyZW50IG1vZGUKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwNDQ2MQorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEluIGVudGVyVmlkZW9GdWxsc2Ny ZWVuRm9yVmlkZW9FbGVtZW50KCkgYW5kIGV4aXRWaWRlb0Z1bGxzY3JlZW5Gb3JWaWRlb0VsZW1l bnQoKSwKKyAgICAgICAgd2UgY2FuIGlnbm9yZSB0aGUgcmVxdWVzdCBpZiB0aGUgdGFyZ2V0aW5n IG1vZGUgaXMgdGhlIHNhbWUgYXMgdGhlIGN1cnJlbnQgb25lLgorCisgICAgICAgICogV2ViUHJv Y2Vzcy9jb2NvYS9WaWRlb0Z1bGxzY3JlZW5NYW5hZ2VyLm1tOgorICAgICAgICAoV2ViS2l0OjpW aWRlb0Z1bGxzY3JlZW5NYW5hZ2VyOjplbnRlclZpZGVvRnVsbHNjcmVlbkZvclZpZGVvRWxlbWVu dCk6CisgICAgICAgIChXZWJLaXQ6OlZpZGVvRnVsbHNjcmVlbk1hbmFnZXI6OmV4aXRWaWRlb0Z1 bGxzY3JlZW5Gb3JWaWRlb0VsZW1lbnQpOgorCiAyMDE5LTExLTIwICBDaGFuZ1Nlb2sgT2ggIDxj aGFuZ3Nlb2tAd2Via2l0Lm9yZz4KIAogICAgICAgICBbR1RLXSBBZGQgQU5HTEUgYmFja2VuZCB0 byBHVEsgcG9ydApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVt ZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAKaW5kZXgg ZjRlN2Q1MWNmMGUyY2JkMTRmZjZmZTg3YjMxYmVmOGY2MWUxNTIwMy4uM2Y4N2FlZTQwMjUyZTI5 ZWQwNjQzZmFjOWU3OTRjZGIxYWI2Mjk5NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRt bC9IVE1MTWVkaWFFbGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRp YUVsZW1lbnQuY3BwCkBAIC02MDQ5LDcgKzYwNDksNyBAQCB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6 OnRvZ2dsZVN0YW5kYXJkRnVsbHNjcmVlblN0YXRlKCkKIAogdm9pZCBIVE1MTWVkaWFFbGVtZW50 OjplbnRlckZ1bGxzY3JlZW4oVmlkZW9GdWxsc2NyZWVuTW9kZSBtb2RlKQogewotICAgIElORk9f TE9HKExPR0lERU5USUZJRVIpOworICAgIElORk9fTE9HKExPR0lERU5USUZJRVIsICIsIG1fdmlk ZW9GdWxsc2NyZWVuTW9kZSA9ICIsIG1fdmlkZW9GdWxsc2NyZWVuTW9kZSwgIiwgbW9kZSA9ICIs IG1vZGUpOwogICAgIEFTU0VSVChtb2RlICE9IFZpZGVvRnVsbHNjcmVlbk1vZGVOb25lKTsKIAog ICAgIGlmIChtX3ZpZGVvRnVsbHNjcmVlbk1vZGUgPT0gbW9kZSkKQEAgLTYwNzgsNiArNjA3OCw3 IEBAIHZvaWQgSFRNTE1lZGlhRWxlbWVudDo6ZW50ZXJGdWxsc2NyZWVuKFZpZGVvRnVsbHNjcmVl bk1vZGUgbW9kZSkKICAgICAgICAgaWYgKGlzPEhUTUxWaWRlb0VsZW1lbnQ+KCp0aGlzKSkgewog ICAgICAgICAgICAgSFRNTFZpZGVvRWxlbWVudCYgYXNWaWRlbyA9IGRvd25jYXN0PEhUTUxWaWRl b0VsZW1lbnQ+KCp0aGlzKTsKICAgICAgICAgICAgIGlmIChkb2N1bWVudCgpLnBhZ2UoKS0+Y2hy b21lKCkuY2xpZW50KCkuc3VwcG9ydHNWaWRlb0Z1bGxzY3JlZW4obV92aWRlb0Z1bGxzY3JlZW5N b2RlKSkgeworICAgICAgICAgICAgICAgIElORk9fTE9HKExPR0lERU5USUZJRVIsICJFbnRlcmlu ZyBmdWxsc2NyZWVuIG1vZGUgIiwgbV92aWRlb0Z1bGxzY3JlZW5Nb2RlLCAiLCBtX3ZpZGVvRnVs bHNjcmVlblN0YW5kYnkgPSAiLCBtX3ZpZGVvRnVsbHNjcmVlblN0YW5kYnkpOwogICAgICAgICAg ICAgICAgIGRvY3VtZW50KCkucGFnZSgpLT5jaHJvbWUoKS5jbGllbnQoKS5lbnRlclZpZGVvRnVs bHNjcmVlbkZvclZpZGVvRWxlbWVudChhc1ZpZGVvLCBtX3ZpZGVvRnVsbHNjcmVlbk1vZGUsIG1f dmlkZW9GdWxsc2NyZWVuU3RhbmRieSk7CiAgICAgICAgICAgICAgICAgc2NoZWR1bGVFdmVudChl dmVudE5hbWVzKCkud2Via2l0YmVnaW5mdWxsc2NyZWVuRXZlbnQpOwogICAgICAgICAgICAgfQpA QCAtNjE5Niw2ICs2MTk3LDcgQEAgdm9pZCBIVE1MTWVkaWFFbGVtZW50Ojp3aWxsQmVjb21lRnVs bHNjcmVlbkVsZW1lbnQoKQogCiB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6OmRpZEJlY29tZUZ1bGxz Y3JlZW5FbGVtZW50KCkKIHsKKyAgICBJTkZPX0xPRyhMT0dJREVOVElGSUVSLCAiLCBmdWxsc2Ny ZWVuIG1vZGUgPSAiLCBmdWxsc2NyZWVuTW9kZSgpKTsKICAgICBtX3dhaXRpbmdUb0VudGVyRnVs bHNjcmVlbiA9IGZhbHNlOwogICAgIGlmIChoYXNNZWRpYUNvbnRyb2xzKCkpCiAgICAgICAgIG1l ZGlhQ29udHJvbHMoKS0+ZW50ZXJlZEZ1bGxzY3JlZW4oKTsKQEAgLTYyMjcsNiArNjIyOSw3IEBA IHZvaWQgSFRNTE1lZGlhRWxlbWVudDo6c2V0UHJlcGFyZWRUb1JldHVyblZpZGVvTGF5ZXJUb0lu bGluZShib29sIHZhbHVlKQogCiB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6OndhaXRGb3JQcmVwYXJl ZEZvcklubGluZVRoZW4oV1RGOjpGdW5jdGlvbjx2b2lkKCk+JiYgY29tcGxldGlvbkhhbmRsZXIp CiB7CisgICAgSU5GT19MT0coTE9HSURFTlRJRklFUik7CiAgICAgQVNTRVJUKCFtX3ByZXBhcmVk Rm9ySW5saW5lQ29tcGxldGlvbkhhbmRsZXIpOwogICAgIGlmIChtX3ByZXBhcmVkRm9ySW5saW5l KSAgewogICAgICAgICBjb21wbGV0aW9uSGFuZGxlcigpOwpAQCAtNjI1MSw2ICs2MjU0LDcgQEAg Ym9vbCBIVE1MTWVkaWFFbGVtZW50Ojppc1ZpZGVvTGF5ZXJJbmxpbmUoKQogCiB2b2lkIEhUTUxN ZWRpYUVsZW1lbnQ6OnNldFZpZGVvRnVsbHNjcmVlbkxheWVyKFBsYXRmb3JtTGF5ZXIqIHBsYXRm b3JtTGF5ZXIsIFdURjo6RnVuY3Rpb248dm9pZCgpPiYmIGNvbXBsZXRpb25IYW5kbGVyKQogewor ICAgIElORk9fTE9HKExPR0lERU5USUZJRVIpOwogICAgIG1fdmlkZW9GdWxsc2NyZWVuTGF5ZXIg PSBwbGF0Zm9ybUxheWVyOwogICAgIGlmICghbV9wbGF5ZXIpIHsKICAgICAgICAgY29tcGxldGlv bkhhbmRsZXIoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTFZpZGVvRWxl bWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxWaWRlb0VsZW1lbnQuY3BwCmluZGV4 IDY2Mjg2NmI4ZjNmODQwNDc4N2E0YjA4MDMzNGU5NzRlZDc2NmY5ZGIuLjFlOWY1MGQyMmI1ZDJj ZjgxZTgzNzI1NzdiYmJkMDAzYWQ3YzJkMTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0 bWwvSFRNTFZpZGVvRWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MVmlk ZW9FbGVtZW50LmNwcApAQCAtNDUyLDEyICs0NTIsMTMgQEAgc3RhdGljIGlubGluZSBIVE1MTWVk aWFFbGVtZW50RW51bXM6OlZpZGVvRnVsbHNjcmVlbk1vZGUgdG9GdWxsc2NyZWVuTW9kZShIVE1M VmkKIAogdm9pZCBIVE1MVmlkZW9FbGVtZW50Ojp3ZWJraXRTZXRQcmVzZW50YXRpb25Nb2RlKFZp ZGVvUHJlc2VudGF0aW9uTW9kZSBtb2RlKQogewotICAgIEFMV0FZU19MT0coTE9HSURFTlRJRklF UiwgbW9kZSk7CisgICAgSU5GT19MT0coTE9HSURFTlRJRklFUiwgIiwgbW9kZSA9ICIsICBtb2Rl KTsKICAgICBzZXRGdWxsc2NyZWVuTW9kZSh0b0Z1bGxzY3JlZW5Nb2RlKG1vZGUpKTsKIH0KIAog dm9pZCBIVE1MVmlkZW9FbGVtZW50OjpzZXRGdWxsc2NyZWVuTW9kZShIVE1MTWVkaWFFbGVtZW50 RW51bXM6OlZpZGVvRnVsbHNjcmVlbk1vZGUgbW9kZSkKIHsKKyAgICBJTkZPX0xPRyhMT0dJREVO VElGSUVSLCAiLCBtb2RlID0gIiwgbW9kZSk7CiAjaWYgRU5BQkxFKFBJQ1RVUkVfSU5fUElDVFVS RV9BUEkpCiAgICAgaWYgKG1fcGljdHVyZUluUGljdHVyZUFQSVRlc3RFbmFibGVkKSB7CiAgICAg ICAgIGlmIChtb2RlID09IFZpZGVvRnVsbHNjcmVlbk1vZGVQaWN0dXJlSW5QaWN0dXJlKSB7CkBA IC01MTAsNyArNTExLDcgQEAgYXV0byBIVE1MVmlkZW9FbGVtZW50Ojp3ZWJraXRQcmVzZW50YXRp b25Nb2RlKCkgY29uc3QgLT4gVmlkZW9QcmVzZW50YXRpb25Nb2RlCiB2b2lkIEhUTUxWaWRlb0Vs ZW1lbnQ6OmZ1bGxzY3JlZW5Nb2RlQ2hhbmdlZChWaWRlb0Z1bGxzY3JlZW5Nb2RlIG1vZGUpCiB7 CiAgICAgaWYgKG1vZGUgIT0gZnVsbHNjcmVlbk1vZGUoKSkgewotICAgICAgICBBTFdBWVNfTE9H KExPR0lERU5USUZJRVIsICJjaGFuZ2VkIGZyb20gIiwgZnVsbHNjcmVlbk1vZGUoKSwgIiwgdG8g IiwgbW9kZSk7CisgICAgICAgIElORk9fTE9HKExPR0lERU5USUZJRVIsICJjaGFuZ2VkIGZyb20g IiwgZnVsbHNjcmVlbk1vZGUoKSwgIiwgdG8gIiwgbW9kZSk7CiAgICAgICAgIHNjaGVkdWxlRXZl bnQoZXZlbnROYW1lcygpLndlYmtpdHByZXNlbnRhdGlvbm1vZGVjaGFuZ2VkRXZlbnQpOwogCiAj aWYgRU5BQkxFKFBJQ1RVUkVfSU5fUElDVFVSRV9BUEkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9odG1sL0hUTUxWaWRlb0VsZW1lbnQuaCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTFZp ZGVvRWxlbWVudC5oCmluZGV4IDdhMDI5Y2I1M2MzM2U2YTY0MzhhZWU3M2NlODRlMmI2YjBmNjA5 OGIuLmIzYTA2ZGRjZjZjNmEwYTU0ZDJkNzc5YzI5NDdmNTYyNmYwNGMwOTQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTFZpZGVvRWxlbWVudC5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL2h0bWwvSFRNTFZpZGVvRWxlbWVudC5oCkBAIC04Miw3ICs4Miw3IEBAIHB1YmxpYzoKICAg ICBSZW5kZXJQdHI8UmVuZGVyRWxlbWVudD4gY3JlYXRlRWxlbWVudFJlbmRlcmVyKFJlbmRlclN0 eWxlJiYsIGNvbnN0IFJlbmRlclRyZWVQb3NpdGlvbiYpIGZpbmFsOwogCiAjaWYgRU5BQkxFKFZJ REVPX1BSRVNFTlRBVElPTl9NT0RFKQotICAgIGVudW0gY2xhc3MgVmlkZW9QcmVzZW50YXRpb25N b2RlIHsgRnVsbHNjcmVlbiwgUGljdHVyZUluUGljdHVyZSwgSW5saW5lIH07CisgICAgZW51bSBj bGFzcyBWaWRlb1ByZXNlbnRhdGlvbk1vZGUgeyBJbmxpbmUsIEZ1bGxzY3JlZW4sIFBpY3R1cmVJ blBpY3R1cmV9OwogICAgIFdFQkNPUkVfRVhQT1JUIGJvb2wgd2Via2l0U3VwcG9ydHNQcmVzZW50 YXRpb25Nb2RlKFZpZGVvUHJlc2VudGF0aW9uTW9kZSkgY29uc3Q7CiAgICAgdm9pZCB3ZWJraXRT ZXRQcmVzZW50YXRpb25Nb2RlKFZpZGVvUHJlc2VudGF0aW9uTW9kZSk7CiAgICAgVmlkZW9QcmVz ZW50YXRpb25Nb2RlIHdlYmtpdFByZXNlbnRhdGlvbk1vZGUoKSBjb25zdDsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTFZpZGVvRWxlbWVudC5pZGwgYi9Tb3VyY2UvV2ViQ29y ZS9odG1sL0hUTUxWaWRlb0VsZW1lbnQuaWRsCmluZGV4IDUxOTQzMTdjMTNkMGFmYmViZDdiNmFh Njc2OTQyNDI3NWE2MDAxNzIuLjI4YzI1MmY0ZDQxMDc2OGE1Y2FhNzFkNDQyZDJmZTJmODZhNzJl NzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTFZpZGVvRWxlbWVudC5pZGwK KysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MVmlkZW9FbGVtZW50LmlkbApAQCAtNTksNCAr NTksNCBAQAogICAgIFtDb25kaXRpb25hbD1WSURFT19QUkVTRU5UQVRJT05fTU9ERV0gdm9pZCB3 ZWJraXRTZXRQcmVzZW50YXRpb25Nb2RlKFZpZGVvUHJlc2VudGF0aW9uTW9kZSBtb2RlKTsKIH07 CiAKLVtDb25kaXRpb25hbD1WSURFT19QUkVTRU5UQVRJT05fTU9ERV0gZW51bSBWaWRlb1ByZXNl bnRhdGlvbk1vZGUgeyAiZnVsbHNjcmVlbiIsICJwaWN0dXJlLWluLXBpY3R1cmUiLCAiaW5saW5l IiB9OworW0NvbmRpdGlvbmFsPVZJREVPX1BSRVNFTlRBVElPTl9NT0RFXSBlbnVtIFZpZGVvUHJl c2VudGF0aW9uTW9kZSB7ICJpbmxpbmUiLCAiZnVsbHNjcmVlbiIsICJwaWN0dXJlLWluLXBpY3R1 cmUiIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvY29jb2EvVmlkZW9G dWxsc2NyZWVuTWFuYWdlci5tbSBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9jb2NvYS9WaWRl b0Z1bGxzY3JlZW5NYW5hZ2VyLm1tCmluZGV4IDhiMjNmNGYzYWE3YWVmM2QwN2E2N2VlZTkyODgy NTFkN2FkMzdjMWYuLjUzYTA1NjQ5MzIwYTU4ODhlYzE1MzMzZGYzYWRlODk1ODhhNDcyZTEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9jb2NvYS9WaWRlb0Z1bGxzY3JlZW5N YW5hZ2VyLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9jb2NvYS9WaWRlb0Z1bGxz Y3JlZW5NYW5hZ2VyLm1tCkBAIC0yNDgsNiArMjQ4LDEwIEBAIHZvaWQgVmlkZW9GdWxsc2NyZWVu TWFuYWdlcjo6ZW50ZXJWaWRlb0Z1bGxzY3JlZW5Gb3JWaWRlb0VsZW1lbnQoSFRNTFZpZGVvRWxl bWVuCiAgICAgQVNTRVJUKGFkZFJlc3VsdC5pdGVyYXRvci0+dmFsdWUgPT0gY29udGV4dElkKTsK IAogICAgIGF1dG8gW21vZGVsLCBpbnRlcmZhY2VdID0gZW5zdXJlTW9kZWxBbmRJbnRlcmZhY2Uo Y29udGV4dElkKTsKKyAgICBIVE1MTWVkaWFFbGVtZW50RW51bXM6OlZpZGVvRnVsbHNjcmVlbk1v ZGUgb2xkTW9kZSA9IGludGVyZmFjZS0+ZnVsbHNjcmVlbk1vZGUoKTsKKyAgICBpZiAob2xkTW9k ZSA9PSBtb2RlKQorICAgICAgICByZXR1cm47CisKICAgICBhZGRDbGllbnRGb3JDb250ZXh0KGNv bnRleHRJZCk7CiAgICAgaWYgKCFpbnRlcmZhY2UtPmxheWVySG9zdGluZ0NvbnRleHQoKSkKICAg ICAgICAgaW50ZXJmYWNlLT5zZXRMYXllckhvc3RpbmdDb250ZXh0KExheWVySG9zdGluZ0NvbnRl eHQ6OmNyZWF0ZUZvckV4dGVybmFsSG9zdGluZ1Byb2Nlc3MoKSk7CkBAIC0yNTUsNyArMjU5LDYg QEAgdm9pZCBWaWRlb0Z1bGxzY3JlZW5NYW5hZ2VyOjplbnRlclZpZGVvRnVsbHNjcmVlbkZvclZp ZGVvRWxlbWVudChIVE1MVmlkZW9FbGVtZW4KICAgICBhdXRvIHZpZGVvUmVjdCA9IGlubGluZVZp ZGVvRnJhbWUodmlkZW9FbGVtZW50KTsKICAgICBGbG9hdFJlY3QgdmlkZW9MYXllckZyYW1lID0g RmxvYXRSZWN0KDAsIDAsIHZpZGVvUmVjdC53aWR0aCgpLCB2aWRlb1JlY3QuaGVpZ2h0KCkpOwog Ci0gICAgSFRNTE1lZGlhRWxlbWVudEVudW1zOjpWaWRlb0Z1bGxzY3JlZW5Nb2RlIG9sZE1vZGUg PSBpbnRlcmZhY2UtPmZ1bGxzY3JlZW5Nb2RlKCk7CiAgICAgaW50ZXJmYWNlLT5zZXRUYXJnZXRJ c0Z1bGxzY3JlZW4odHJ1ZSk7CiAgICAgaW50ZXJmYWNlLT5zZXRGdWxsc2NyZWVuTW9kZShtb2Rl KTsKICAgICBpbnRlcmZhY2UtPnNldEZ1bGxzY3JlZW5TdGFuZGJ5KHN0YW5kYnkpOwpAQCAtMjk2 LDYgKzI5OSw5IEBAIHZvaWQgVmlkZW9GdWxsc2NyZWVuTWFuYWdlcjo6ZXhpdFZpZGVvRnVsbHNj cmVlbkZvclZpZGVvRWxlbWVudChXZWJDb3JlOjpIVE1MVmlkCiAKICAgICB1aW50NjRfdCBjb250 ZXh0SWQgPSBtX3ZpZGVvRWxlbWVudHMuZ2V0KCZ2aWRlb0VsZW1lbnQpOwogICAgIGF1dG8mIGlu dGVyZmFjZSA9IGVuc3VyZUludGVyZmFjZShjb250ZXh0SWQpOworICAgIEhUTUxNZWRpYUVsZW1l bnRFbnVtczo6VmlkZW9GdWxsc2NyZWVuTW9kZSBvbGRNb2RlID0gaW50ZXJmYWNlLmZ1bGxzY3Jl ZW5Nb2RlKCk7CisgICAgaWYgKG9sZE1vZGUgPT0gSFRNTE1lZGlhRWxlbWVudEVudW1zOjpWaWRl b0Z1bGxzY3JlZW5Nb2RlTm9uZSkKKyAgICAgICAgcmV0dXJuOwogCiAgICAgaW50ZXJmYWNlLnNl dFRhcmdldElzRnVsbHNjcmVlbihmYWxzZSk7CiAK