184364 2018-04-06 12:42:02 -0700 WebCore::screenSupportsExtendedColor improperly calls NSScreen functions in the WebContent process 2018-04-10 09:15:53 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 184367 1 bfulgham bfulgham bfulgham commit-queue pvollan webkit-bug-importer oldest_to_newest 1412450 0 bfulgham 2018-04-06 12:42:02 -0700 WebCore::screenSupportsExtendedColor is interacting with the NSScreen/NSDisplay system in the WebContent process. This should be brokered from the UIProcess. 1412455 1 bfulgham 2018-04-06 12:51:28 -0700 Tested by fast/media/mq-color-gamut.html. 1412456 2 webkit-bug-importer 2018-04-06 12:52:07 -0700 <rdar://problem/39246314> 1412467 3 337386 bfulgham 2018-04-06 13:31:15 -0700 Created attachment 337386 Patch 1412474 4 337386 pvollan 2018-04-06 13:59:24 -0700 Comment on attachment 337386 Patch Very nice! R=me. 1412484 5 337391 bfulgham 2018-04-06 14:54:40 -0700 Created attachment 337391 Patch for landing 1412504 6 bfulgham 2018-04-06 15:54:39 -0700 Committed r230356: <https://trac.webkit.org/changeset/230356> 337386 2018-04-06 13:31:15 -0700 2018-04-06 14:54:39 -0700 Patch bug-184364-20180406133114.patch text/plain 5014 bfulgham SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIzMDM1NCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI0IEBACisyMDE4LTA0LTA2ICBCcmVudCBG dWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgorCisgICAgICAgIFdlYkNvcmU6OnNjcmVlblN1 cHBvcnRzRXh0ZW5kZWRDb2xvciBpbXByb3Blcmx5IGNhbGxzIE5TU2NyZWVuIGZ1bmN0aW9ucyBp biB0aGUgV2ViQ29udGVudCBwcm9jZXNzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xODQzNjQKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzM5MjQ2MzE0 PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSBX ZWJDb250ZW50IHByb2Nlc3MgaXMgaW50ZXJhY3RpbmcgZGlyZWN0bHkgd2l0aCBOU1NjcmVlbiB0 byBkZXRlcm1pbmUgaWYgdGhlIGN1cnJlbnQgc2NyZWVuCisgICAgICAgIGhhcyBleHRlbmRlZCBj b2xvciBzdXBwb3J0LiBUaGlzIHNob3VsZCBiZSBicm9rZXJlZCBmcm9tIHRoZSBVSVByb2Nlc3Mu CisgICAgICAgIAorICAgICAgICBUZXN0ZWQgYnkgZmFzdC9tZWRpYS9tcS1jb2xvci1nYW11dC5o dG1sLgorCisgICAgICAgICogcGxhdGZvcm0vU2NyZWVuUHJvcGVydGllcy5oOgorICAgICAgICAo V2ViQ29yZTo6U2NyZWVuUHJvcGVydGllczo6ZW5jb2RlIGNvbnN0KTogQWRkIHNjcmVlblN1cHBv cnRzRXh0ZW5kZWRDb2xvci4KKyAgICAgICAgKFdlYkNvcmU6OlNjcmVlblByb3BlcnRpZXM6OmRl Y29kZSk6IERpdHRvLgorICAgICAgICAqIHBsYXRmb3JtL21hYy9QbGF0Zm9ybVNjcmVlbk1hYy5t bToKKyAgICAgICAgKFdlYkNvcmU6OmdldFNjcmVlblByb3BlcnRpZXMpOiBSZXRyaWV2ZSBleHRl bmRlZCBjb2xvciBzdXBwb3J0LgorICAgICAgICAoV2ViQ29yZTo6c2NyZWVuU3VwcG9ydHNFeHRl bmRlZENvbG9yKTogUmV0cmlldmUgY2FjaGVkIHZlcnNpb24gd2hlbiBpbiB0aGUgV2ViQ29udGVu dAorICAgICAgICBwcm9jZXNzLiBBc3NlcnQgdGhhdCBOU1NjcmVlbiBpcyBub3QgYWNjZXNzZWQg aW4gdGhlIFdlYkNvbnRlbnQgcHJvY2Vzcy4KKwogMjAxOC0wNC0wNiAgQnJlbnQgRnVsZ2hhbSAg PGJmdWxnaGFtQGFwcGxlLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkIHRlc3QgZml4IGFmdGVy IHIyMzAzMjMKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1NjcmVlblByb3BlcnRpZXMu aAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JlZW5Qcm9wZXJ0aWVz LmgJKHJldmlzaW9uIDIzMDM1NCkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1NjcmVlblBy b3BlcnRpZXMuaAkod29ya2luZyBjb3B5KQpAQCAtNDEsNiArNDEsNyBAQCBzdHJ1Y3QgU2NyZWVu UHJvcGVydGllcyB7CiAgICAgUmV0YWluUHRyPENHQ29sb3JTcGFjZVJlZj4gY29sb3JTcGFjZTsK ICAgICBpbnQgc2NyZWVuRGVwdGggeyAwIH07CiAgICAgaW50IHNjcmVlbkRlcHRoUGVyQ29tcG9u ZW50IHsgMCB9OworICAgIGJvb2wgc2NyZWVuU3VwcG9ydHNFeHRlbmRlZENvbG9yIHsgZmFsc2Ug fTsKICAgICBib29sIHNjcmVlbkhhc0ludmVydGVkQ29sb3JzIHsgZmFsc2UgfTsKICAgICBib29s IHNjcmVlbklzTW9ub2Nocm9tZSB7IGZhbHNlIH07CiAKQEAgLTU3LDcgKzU4LDcgQEAgc3RydWN0 IFNjcmVlblByb3BlcnRpZXMgewogdGVtcGxhdGU8Y2xhc3MgRW5jb2Rlcj4KIHZvaWQgU2NyZWVu UHJvcGVydGllczo6ZW5jb2RlKEVuY29kZXImIGVuY29kZXIpIGNvbnN0CiB7Ci0gICAgZW5jb2Rl ciA8PCBzY3JlZW5BdmFpbGFibGVSZWN0IDw8IHNjcmVlblJlY3QgPDwgc2NyZWVuRGVwdGggPDwg c2NyZWVuRGVwdGhQZXJDb21wb25lbnQgPDwgc2NyZWVuSGFzSW52ZXJ0ZWRDb2xvcnMgPDwgc2Ny ZWVuSXNNb25vY2hyb21lOworICAgIGVuY29kZXIgPDwgc2NyZWVuQXZhaWxhYmxlUmVjdCA8PCBz Y3JlZW5SZWN0IDw8IHNjcmVlbkRlcHRoIDw8IHNjcmVlbkRlcHRoUGVyQ29tcG9uZW50IDw8IHNj cmVlblN1cHBvcnRzRXh0ZW5kZWRDb2xvciA8PCBzY3JlZW5IYXNJbnZlcnRlZENvbG9ycyA8PCBz Y3JlZW5Jc01vbm9jaHJvbWU7CiAKICAgICBpZiAoY29sb3JTcGFjZSkgewogICAgICAgICAvLyBU cnkgdG8gZW5jb2RlIHRoZSBuYW1lLgpAQCAtMTA2LDYgKzEwNywxMSBAQCBzdGQ6Om9wdGlvbmFs PFNjcmVlblByb3BlcnRpZXM+IFNjcmVlblByCiAgICAgaWYgKCFzY3JlZW5EZXB0aFBlckNvbXBv bmVudCkKICAgICAgICAgcmV0dXJuIHN0ZDo6bnVsbG9wdDsKIAorICAgIHN0ZDo6b3B0aW9uYWw8 Ym9vbD4gc2NyZWVuU3VwcG9ydHNFeHRlbmRlZENvbG9yOworICAgIGRlY29kZXIgPj4gc2NyZWVu U3VwcG9ydHNFeHRlbmRlZENvbG9yOworICAgIGlmICghc2NyZWVuU3VwcG9ydHNFeHRlbmRlZENv bG9yKQorICAgICAgICByZXR1cm4gc3RkOjpudWxsb3B0OworCiAgICAgc3RkOjpvcHRpb25hbDxi b29sPiBzY3JlZW5IYXNJbnZlcnRlZENvbG9yczsKICAgICBkZWNvZGVyID4+IHNjcmVlbkhhc0lu dmVydGVkQ29sb3JzOwogICAgIGlmICghc2NyZWVuSGFzSW52ZXJ0ZWRDb2xvcnMpCkBAIC0xNTEs NyArMTU3LDcgQEAgc3RkOjpvcHRpb25hbDxTY3JlZW5Qcm9wZXJ0aWVzPiBTY3JlZW5QcgogICAg IH0KICAgICB9CiAKLSAgICByZXR1cm4geyB7IFdURk1vdmUoKnNjcmVlbkF2YWlsYWJsZVJlY3Qp LCBXVEZNb3ZlKCpzY3JlZW5SZWN0KSwgV1RGTW92ZShjZ0NvbG9yU3BhY2UpLCBXVEZNb3ZlKCpz Y3JlZW5EZXB0aCksIFdURk1vdmUoKnNjcmVlbkRlcHRoUGVyQ29tcG9uZW50KSwgV1RGTW92ZSgq c2NyZWVuSGFzSW52ZXJ0ZWRDb2xvcnMpLCBXVEZNb3ZlKCpzY3JlZW5Jc01vbm9jaHJvbWUpIH0g fTsKKyAgICByZXR1cm4geyB7IFdURk1vdmUoKnNjcmVlbkF2YWlsYWJsZVJlY3QpLCBXVEZNb3Zl KCpzY3JlZW5SZWN0KSwgV1RGTW92ZShjZ0NvbG9yU3BhY2UpLCBXVEZNb3ZlKCpzY3JlZW5EZXB0 aCksIFdURk1vdmUoKnNjcmVlbkRlcHRoUGVyQ29tcG9uZW50KSwgV1RGTW92ZSgqc2NyZWVuU3Vw cG9ydHNFeHRlbmRlZENvbG9yKSwgV1RGTW92ZSgqc2NyZWVuSGFzSW52ZXJ0ZWRDb2xvcnMpLCBX VEZNb3ZlKCpzY3JlZW5Jc01vbm9jaHJvbWUpIH0gfTsKIH0KIAogfSAvLyBuYW1lc3BhY2UgV2Vi Q29yZQpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1BsYXRmb3JtU2NyZWVuTWFj Lm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9QbGF0Zm9ybVNj cmVlbk1hYy5tbQkocmV2aXNpb24gMjMwMzU0KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v bWFjL1BsYXRmb3JtU2NyZWVuTWFjLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0xMTIsMTAgKzExMiwx MSBAQCB2b2lkIGdldFNjcmVlblByb3BlcnRpZXMoSGFzaE1hcDxQbGF0Zm9yCiAKICAgICAgICAg aW50IHNjcmVlbkRlcHRoID0gTlNCaXRzUGVyUGl4ZWxGcm9tRGVwdGgoc2NyZWVuLmRlcHRoKTsK ICAgICAgICAgaW50IHNjcmVlbkRlcHRoUGVyQ29tcG9uZW50ID0gTlNCaXRzUGVyU2FtcGxlRnJv bURlcHRoKHNjcmVlbi5kZXB0aCk7CisgICAgICAgIGJvb2wgc2NyZWVuU3VwcG9ydHNFeHRlbmRl ZENvbG9yID0gW3NjcmVlbiBjYW5SZXByZXNlbnREaXNwbGF5R2FtdXQ6TlNEaXNwbGF5R2FtdXRQ M107CiAgICAgICAgIGJvb2wgc2NyZWVuSGFzSW52ZXJ0ZWRDb2xvcnMgPSBDR0Rpc3BsYXlVc2Vz SW52ZXJ0ZWRQb2xhcml0eSgpOwogICAgICAgICBib29sIHNjcmVlbklzTW9ub2Nocm9tZSA9IENH RGlzcGxheVVzZXNGb3JjZVRvR3JheSgpOwogCi0gICAgICAgIHNjcmVlblByb3BlcnRpZXMuc2V0 KFdlYkNvcmU6OmRpc3BsYXlJRChzY3JlZW4pLCBTY3JlZW5Qcm9wZXJ0aWVzIHsgc2NyZWVuQXZh aWxhYmxlUmVjdCwgc2NyZWVuUmVjdCwgY29sb3JTcGFjZSwgc2NyZWVuRGVwdGgsIHNjcmVlbkRl cHRoUGVyQ29tcG9uZW50LCBzY3JlZW5IYXNJbnZlcnRlZENvbG9ycywgc2NyZWVuSXNNb25vY2hy b21lIH0pOworICAgICAgICBzY3JlZW5Qcm9wZXJ0aWVzLnNldChXZWJDb3JlOjpkaXNwbGF5SUQo c2NyZWVuKSwgU2NyZWVuUHJvcGVydGllcyB7IHNjcmVlbkF2YWlsYWJsZVJlY3QsIHNjcmVlblJl Y3QsIGNvbG9yU3BhY2UsIHNjcmVlbkRlcHRoLCBzY3JlZW5EZXB0aFBlckNvbXBvbmVudCwgc2Ny ZWVuU3VwcG9ydHNFeHRlbmRlZENvbG9yLCBzY3JlZW5IYXNJbnZlcnRlZENvbG9ycywgc2NyZWVu SXNNb25vY2hyb21lIH0pOwogICAgIH0KIH0KIApAQCAtMjI5LDcgKzIzMCwxMCBAQCBib29sIHNj cmVlblN1cHBvcnRzRXh0ZW5kZWRDb2xvcihXaWRnZXQqCiAgICAgaWYgKCF3aWRnZXQpCiAgICAg ICAgIHJldHVybiBmYWxzZTsKIAotICAgIC8vIEZJWE1FOiA8aHR0cHM6Ly93ZWJraXQub3JnL2Iv MTg0MzY0PiBXZSBzaG91bGQgYXNzZXJ0IGhlcmUgaWYgaW4gV2ViQ29udGVudCBwcm9jZXNzLgor ICAgIGlmICghc2NyZWVuUHJvcGVydGllcygpLmlzRW1wdHkoKSkKKyAgICAgICAgcmV0dXJuIGdl dFNjcmVlblByb3BlcnRpZXMod2lkZ2V0KS5zY3JlZW5TdXBwb3J0c0V4dGVuZGVkQ29sb3I7CisK KyAgICBSRUxFQVNFX0FTU0VSVChoYXNQcm9jZXNzUHJpdmlsZWdlKFByb2Nlc3NQcml2aWxlZ2U6 OkNhbkNvbW11bmljYXRlV2l0aFdpbmRvd1NlcnZlcikpOwogICAgIHJldHVybiBbc2NyZWVuKHdp ZGdldCkgY2FuUmVwcmVzZW50RGlzcGxheUdhbXV0Ok5TRGlzcGxheUdhbXV0UDNdOwogfQogCg== 337391 2018-04-06 14:54:40 -0700 2018-04-06 14:54:40 -0700 Patch for landing bug-184364-20180406145439.patch text/plain 5386 bfulgham SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIzMDM1NCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI0IEBACisyMDE4LTA0LTA2ICBCcmVudCBG dWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgorCisgICAgICAgIFdlYkNvcmU6OnNjcmVlblN1 cHBvcnRzRXh0ZW5kZWRDb2xvciBpbXByb3Blcmx5IGNhbGxzIE5TU2NyZWVuIGZ1bmN0aW9ucyBp biB0aGUgV2ViQ29udGVudCBwcm9jZXNzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xODQzNjQKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzM5MjQ2MzE0 PgorCisgICAgICAgIFJldmlld2VkIGJ5IFBlciBBcm5lIFZvbGxhbi4KKworICAgICAgICBUaGUg V2ViQ29udGVudCBwcm9jZXNzIGlzIGludGVyYWN0aW5nIGRpcmVjdGx5IHdpdGggTlNTY3JlZW4g dG8gZGV0ZXJtaW5lIGlmIHRoZSBjdXJyZW50IHNjcmVlbgorICAgICAgICBoYXMgZXh0ZW5kZWQg Y29sb3Igc3VwcG9ydC4gVGhpcyBzaG91bGQgYmUgYnJva2VyZWQgZnJvbSB0aGUgVUlQcm9jZXNz LgorICAgICAgICAKKyAgICAgICAgVGVzdGVkIGJ5IGZhc3QvbWVkaWEvbXEtY29sb3ItZ2FtdXQu aHRtbC4KKworICAgICAgICAqIHBsYXRmb3JtL1NjcmVlblByb3BlcnRpZXMuaDoKKyAgICAgICAg KFdlYkNvcmU6OlNjcmVlblByb3BlcnRpZXM6OmVuY29kZSBjb25zdCk6IEFkZCBzY3JlZW5TdXBw b3J0c0V4dGVuZGVkQ29sb3IuCisgICAgICAgIChXZWJDb3JlOjpTY3JlZW5Qcm9wZXJ0aWVzOjpk ZWNvZGUpOiBEaXR0by4KKyAgICAgICAgKiBwbGF0Zm9ybS9tYWMvUGxhdGZvcm1TY3JlZW5NYWMu bW06CisgICAgICAgIChXZWJDb3JlOjpnZXRTY3JlZW5Qcm9wZXJ0aWVzKTogUmV0cmlldmUgZXh0 ZW5kZWQgY29sb3Igc3VwcG9ydC4KKyAgICAgICAgKFdlYkNvcmU6OnNjcmVlblN1cHBvcnRzRXh0 ZW5kZWRDb2xvcik6IFJldHJpZXZlIGNhY2hlZCB2ZXJzaW9uIHdoZW4gaW4gdGhlIFdlYkNvbnRl bnQKKyAgICAgICAgcHJvY2Vzcy4gQXNzZXJ0IHRoYXQgTlNTY3JlZW4gaXMgbm90IGFjY2Vzc2Vk IGluIHRoZSBXZWJDb250ZW50IHByb2Nlc3MuCisKIDIwMTgtMDQtMDYgIEJyZW50IEZ1bGdoYW0g IDxiZnVsZ2hhbUBhcHBsZS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCB0ZXN0IGZpeCBhZnRl ciByMjMwMzIzCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JlZW5Qcm9wZXJ0aWVz LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2NyZWVuUHJvcGVydGll cy5oCShyZXZpc2lvbiAyMzAzNTQpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JlZW5Q cm9wZXJ0aWVzLmgJKHdvcmtpbmcgY29weSkKQEAgLTQxLDYgKzQxLDcgQEAgc3RydWN0IFNjcmVl blByb3BlcnRpZXMgewogICAgIFJldGFpblB0cjxDR0NvbG9yU3BhY2VSZWY+IGNvbG9yU3BhY2U7 CiAgICAgaW50IHNjcmVlbkRlcHRoIHsgMCB9OwogICAgIGludCBzY3JlZW5EZXB0aFBlckNvbXBv bmVudCB7IDAgfTsKKyAgICBib29sIHNjcmVlblN1cHBvcnRzRXh0ZW5kZWRDb2xvciB7IGZhbHNl IH07CiAgICAgYm9vbCBzY3JlZW5IYXNJbnZlcnRlZENvbG9ycyB7IGZhbHNlIH07CiAgICAgYm9v bCBzY3JlZW5Jc01vbm9jaHJvbWUgeyBmYWxzZSB9OwogCkBAIC01Nyw3ICs1OCw3IEBAIHN0cnVj dCBTY3JlZW5Qcm9wZXJ0aWVzIHsKIHRlbXBsYXRlPGNsYXNzIEVuY29kZXI+CiB2b2lkIFNjcmVl blByb3BlcnRpZXM6OmVuY29kZShFbmNvZGVyJiBlbmNvZGVyKSBjb25zdAogewotICAgIGVuY29k ZXIgPDwgc2NyZWVuQXZhaWxhYmxlUmVjdCA8PCBzY3JlZW5SZWN0IDw8IHNjcmVlbkRlcHRoIDw8 IHNjcmVlbkRlcHRoUGVyQ29tcG9uZW50IDw8IHNjcmVlbkhhc0ludmVydGVkQ29sb3JzIDw8IHNj cmVlbklzTW9ub2Nocm9tZTsKKyAgICBlbmNvZGVyIDw8IHNjcmVlbkF2YWlsYWJsZVJlY3QgPDwg c2NyZWVuUmVjdCA8PCBzY3JlZW5EZXB0aCA8PCBzY3JlZW5EZXB0aFBlckNvbXBvbmVudCA8PCBz Y3JlZW5TdXBwb3J0c0V4dGVuZGVkQ29sb3IgPDwgc2NyZWVuSGFzSW52ZXJ0ZWRDb2xvcnMgPDwg c2NyZWVuSXNNb25vY2hyb21lOwogCiAgICAgaWYgKGNvbG9yU3BhY2UpIHsKICAgICAgICAgLy8g VHJ5IHRvIGVuY29kZSB0aGUgbmFtZS4KQEAgLTEwNiw2ICsxMDcsMTEgQEAgc3RkOjpvcHRpb25h bDxTY3JlZW5Qcm9wZXJ0aWVzPiBTY3JlZW5QcgogICAgIGlmICghc2NyZWVuRGVwdGhQZXJDb21w b25lbnQpCiAgICAgICAgIHJldHVybiBzdGQ6Om51bGxvcHQ7CiAKKyAgICBzdGQ6Om9wdGlvbmFs PGJvb2w+IHNjcmVlblN1cHBvcnRzRXh0ZW5kZWRDb2xvcjsKKyAgICBkZWNvZGVyID4+IHNjcmVl blN1cHBvcnRzRXh0ZW5kZWRDb2xvcjsKKyAgICBpZiAoIXNjcmVlblN1cHBvcnRzRXh0ZW5kZWRD b2xvcikKKyAgICAgICAgcmV0dXJuIHN0ZDo6bnVsbG9wdDsKKwogICAgIHN0ZDo6b3B0aW9uYWw8 Ym9vbD4gc2NyZWVuSGFzSW52ZXJ0ZWRDb2xvcnM7CiAgICAgZGVjb2RlciA+PiBzY3JlZW5IYXNJ bnZlcnRlZENvbG9yczsKICAgICBpZiAoIXNjcmVlbkhhc0ludmVydGVkQ29sb3JzKQpAQCAtMTUx LDcgKzE1Nyw3IEBAIHN0ZDo6b3B0aW9uYWw8U2NyZWVuUHJvcGVydGllcz4gU2NyZWVuUHIKICAg ICB9CiAgICAgfQogCi0gICAgcmV0dXJuIHsgeyBXVEZNb3ZlKCpzY3JlZW5BdmFpbGFibGVSZWN0 KSwgV1RGTW92ZSgqc2NyZWVuUmVjdCksIFdURk1vdmUoY2dDb2xvclNwYWNlKSwgV1RGTW92ZSgq c2NyZWVuRGVwdGgpLCBXVEZNb3ZlKCpzY3JlZW5EZXB0aFBlckNvbXBvbmVudCksIFdURk1vdmUo KnNjcmVlbkhhc0ludmVydGVkQ29sb3JzKSwgV1RGTW92ZSgqc2NyZWVuSXNNb25vY2hyb21lKSB9 IH07CisgICAgcmV0dXJuIHsgeyBXVEZNb3ZlKCpzY3JlZW5BdmFpbGFibGVSZWN0KSwgV1RGTW92 ZSgqc2NyZWVuUmVjdCksIFdURk1vdmUoY2dDb2xvclNwYWNlKSwgV1RGTW92ZSgqc2NyZWVuRGVw dGgpLCBXVEZNb3ZlKCpzY3JlZW5EZXB0aFBlckNvbXBvbmVudCksIFdURk1vdmUoKnNjcmVlblN1 cHBvcnRzRXh0ZW5kZWRDb2xvciksIFdURk1vdmUoKnNjcmVlbkhhc0ludmVydGVkQ29sb3JzKSwg V1RGTW92ZSgqc2NyZWVuSXNNb25vY2hyb21lKSB9IH07CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdl YkNvcmUKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9QbGF0Zm9ybVNjcmVlbk1h Yy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvUGxhdGZvcm1T Y3JlZW5NYWMubW0JKHJldmlzaW9uIDIzMDM1NCkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L21hYy9QbGF0Zm9ybVNjcmVlbk1hYy5tbQkod29ya2luZyBjb3B5KQpAQCAtNDgsNyArNDgsNyBA QCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIHN0YXRpYyBQbGF0Zm9ybURpc3BsYXlJRCBkaXNwbGF5 SUQoTlNTY3JlZW4gKnNjcmVlbikKIHsKLSAgICBSRUxFQVNFX0FTU0VSVChoYXNQcm9jZXNzUHJp dmlsZWdlKFByb2Nlc3NQcml2aWxlZ2U6OkNhbkNvbW11bmljYXRlV2l0aFdpbmRvd1NlcnZlcikp OworICAgIC8vIEZJWE1FOiA8aHR0cHM6Ly93ZWJraXQub3JnL2IvMTg0MzQ0PiBXZSBzaG91bGQg YXNzZXJ0IGhlcmUgaWYgaW4gV2ViQ29udGVudCBwcm9jZXNzLgogICAgIHJldHVybiBbW1tzY3Jl ZW4gZGV2aWNlRGVzY3JpcHRpb25dIG9iamVjdEZvcktleTpAIk5TU2NyZWVuTnVtYmVyIl0gaW50 VmFsdWVdOwogfQogCkBAIC0xMTIsMTAgKzExMiwxMSBAQCB2b2lkIGdldFNjcmVlblByb3BlcnRp ZXMoSGFzaE1hcDxQbGF0Zm9yCiAKICAgICAgICAgaW50IHNjcmVlbkRlcHRoID0gTlNCaXRzUGVy UGl4ZWxGcm9tRGVwdGgoc2NyZWVuLmRlcHRoKTsKICAgICAgICAgaW50IHNjcmVlbkRlcHRoUGVy Q29tcG9uZW50ID0gTlNCaXRzUGVyU2FtcGxlRnJvbURlcHRoKHNjcmVlbi5kZXB0aCk7CisgICAg ICAgIGJvb2wgc2NyZWVuU3VwcG9ydHNFeHRlbmRlZENvbG9yID0gW3NjcmVlbiBjYW5SZXByZXNl bnREaXNwbGF5R2FtdXQ6TlNEaXNwbGF5R2FtdXRQM107CiAgICAgICAgIGJvb2wgc2NyZWVuSGFz SW52ZXJ0ZWRDb2xvcnMgPSBDR0Rpc3BsYXlVc2VzSW52ZXJ0ZWRQb2xhcml0eSgpOwogICAgICAg ICBib29sIHNjcmVlbklzTW9ub2Nocm9tZSA9IENHRGlzcGxheVVzZXNGb3JjZVRvR3JheSgpOwog Ci0gICAgICAgIHNjcmVlblByb3BlcnRpZXMuc2V0KFdlYkNvcmU6OmRpc3BsYXlJRChzY3JlZW4p LCBTY3JlZW5Qcm9wZXJ0aWVzIHsgc2NyZWVuQXZhaWxhYmxlUmVjdCwgc2NyZWVuUmVjdCwgY29s b3JTcGFjZSwgc2NyZWVuRGVwdGgsIHNjcmVlbkRlcHRoUGVyQ29tcG9uZW50LCBzY3JlZW5IYXNJ bnZlcnRlZENvbG9ycywgc2NyZWVuSXNNb25vY2hyb21lIH0pOworICAgICAgICBzY3JlZW5Qcm9w ZXJ0aWVzLnNldChXZWJDb3JlOjpkaXNwbGF5SUQoc2NyZWVuKSwgU2NyZWVuUHJvcGVydGllcyB7 IHNjcmVlbkF2YWlsYWJsZVJlY3QsIHNjcmVlblJlY3QsIGNvbG9yU3BhY2UsIHNjcmVlbkRlcHRo LCBzY3JlZW5EZXB0aFBlckNvbXBvbmVudCwgc2NyZWVuU3VwcG9ydHNFeHRlbmRlZENvbG9yLCBz Y3JlZW5IYXNJbnZlcnRlZENvbG9ycywgc2NyZWVuSXNNb25vY2hyb21lIH0pOwogICAgIH0KIH0K IApAQCAtMjI5LDcgKzIzMCwxMCBAQCBib29sIHNjcmVlblN1cHBvcnRzRXh0ZW5kZWRDb2xvcihX aWRnZXQqCiAgICAgaWYgKCF3aWRnZXQpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAotICAgIC8v IEZJWE1FOiA8aHR0cHM6Ly93ZWJraXQub3JnL2IvMTg0MzY0PiBXZSBzaG91bGQgYXNzZXJ0IGhl cmUgaWYgaW4gV2ViQ29udGVudCBwcm9jZXNzLgorICAgIGlmICghc2NyZWVuUHJvcGVydGllcygp LmlzRW1wdHkoKSkKKyAgICAgICAgcmV0dXJuIGdldFNjcmVlblByb3BlcnRpZXMod2lkZ2V0KS5z Y3JlZW5TdXBwb3J0c0V4dGVuZGVkQ29sb3I7CisKKyAgICBSRUxFQVNFX0FTU0VSVChoYXNQcm9j ZXNzUHJpdmlsZWdlKFByb2Nlc3NQcml2aWxlZ2U6OkNhbkNvbW11bmljYXRlV2l0aFdpbmRvd1Nl cnZlcikpOwogICAgIHJldHVybiBbc2NyZWVuKHdpZGdldCkgY2FuUmVwcmVzZW50RGlzcGxheUdh bXV0Ok5TRGlzcGxheUdhbXV0UDNdOwogfQogCg==