238763 2022-04-04 13:59:37 -0700 Remove lots of WebCore:: in RemoteRenderingBackend 2022-04-04 18:43:16 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser simon.fraser webkit-bug-importer wenson_hsieh oldest_to_newest 1858047 0 simon.fraser 2022-04-04 13:59:37 -0700 Remove lots of WebCore:: in RemoteRenderingBackend 1858049 1 456625 simon.fraser 2022-04-04 14:00:18 -0700 Created attachment 456625 Patch 1858051 2 456625 wenson_hsieh 2022-04-04 14:01:12 -0700 Comment on attachment 456625 Patch rs=me 1858182 3 ews-feeder 2022-04-04 18:42:21 -0700 Committed r292360 (249225@main): <https://commits.webkit.org/249225@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 456625. 1858183 4 webkit-bug-importer 2022-04-04 18:43:16 -0700 <rdar://problem/91272355> 456625 2022-04-04 14:00:18 -0700 2022-04-04 18:42:22 -0700 Patch bug-238763-20220404140017.patch text/plain 13208 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjkyMjkyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDkzYmUzNzc3N2YyNDM1NDEz NzFkN2I3MmU4ZjkzMWViZTcyMzE1NzYuLjczZDUzYmU3OGQ2ZTk5MTkxZDZhZGUzYzBkMWU5NzNl N2EyMzY2OWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjggQEAKKzIwMjItMDQtMDQgIFNpbW9uIEZy YXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CisKKyAgICAgICAgUmVtb3ZlIGxvdHMgb2Yg V2ViQ29yZTo6IGluIFJlbW90ZVJlbmRlcmluZ0JhY2tlbmQKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzODc2MworCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlbW90ZVJlbmRlcmluZ0JhY2tlbmQgYWxyZWFk eSBoYXMgYSBgdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmVgIHNvIHJlbW92ZSB0aGUgZXhwbGljaXQg bmFtZXNwYWNpbmcuCisKKyAgICAgICAgQWxzbyBjbGVhbiB1cCBzb21lIGluY2x1ZGVzIGluIHRo ZSBoZWFkZXIuCisKKyAgICAgICAgKiBHUFVQcm9jZXNzL2dyYXBoaWNzL1JlbW90ZVJlbmRlcmlu Z0JhY2tlbmQuY3BwOgorICAgICAgICAoV2ViS2l0OjpSZW1vdGVSZW5kZXJpbmdCYWNrZW5kOjpn ZXRQaXhlbEJ1ZmZlckZvckltYWdlQnVmZmVyKToKKyAgICAgICAgKFdlYktpdDo6UmVtb3RlUmVu ZGVyaW5nQmFja2VuZDo6Z2V0UGl4ZWxCdWZmZXJGb3JJbWFnZUJ1ZmZlcldpdGhOZXdNZW1vcnkp OgorICAgICAgICAoV2ViS2l0OjpSZW1vdGVSZW5kZXJpbmdCYWNrZW5kOjpwdXRQaXhlbEJ1ZmZl ckZvckltYWdlQnVmZmVyKToKKyAgICAgICAgKFdlYktpdDo6UmVtb3RlUmVuZGVyaW5nQmFja2Vu ZDo6Z2V0RGF0YVVSTEZvckltYWdlQnVmZmVyKToKKyAgICAgICAgKFdlYktpdDo6UmVtb3RlUmVu ZGVyaW5nQmFja2VuZDo6Z2V0RGF0YVVSTEZvckltYWdlQnVmZmVyV2l0aFF1YWxpZmllZElkZW50 aWZpZXIpOgorICAgICAgICAoV2ViS2l0OjpSZW1vdGVSZW5kZXJpbmdCYWNrZW5kOjpnZXREYXRh Rm9ySW1hZ2VCdWZmZXIpOgorICAgICAgICAoV2ViS2l0OjpSZW1vdGVSZW5kZXJpbmdCYWNrZW5k OjpnZXRTaGFyZWFibGVCaXRtYXBGb3JJbWFnZUJ1ZmZlcik6CisgICAgICAgIChXZWJLaXQ6OlJl bW90ZVJlbmRlcmluZ0JhY2tlbmQ6OmdldFNoYXJlYWJsZUJpdG1hcEZvckltYWdlQnVmZmVyV2l0 aFF1YWxpZmllZElkZW50aWZpZXIpOgorICAgICAgICAoV2ViS2l0OjpSZW1vdGVSZW5kZXJpbmdC YWNrZW5kOjpjYWNoZUZvbnQpOgorICAgICAgICAoV2ViS2l0OjpoYW5kbGVGcm9tQnVmZmVyKToK KyAgICAgICAgKFdlYktpdDo6UmVtb3RlUmVuZGVyaW5nQmFja2VuZDo6bWFya1N1cmZhY2VzVm9s YXRpbGUpOgorICAgICAgICAqIEdQVVByb2Nlc3MvZ3JhcGhpY3MvUmVtb3RlUmVuZGVyaW5nQmFj a2VuZC5oOgorCiAyMDIyLTA0LTA0ICBFbGxpb3R0IFdpbGxpYW1zICA8ZW13QGFwcGxlLmNvbT4K IAogICAgICAgICBbWENCdWlsZF0gV2ViS2l0TGVnYWN5J3MgIk1pZ3JhdGVkIGhlYWRlcnMiIHNj cmlwdCBkb2VzIG5vdCBlbWl0IHRhc2sgaW5mb3JtYXRpb24KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvR1BVUHJvY2Vzcy9ncmFwaGljcy9SZW1vdGVSZW5kZXJpbmdCYWNrZW5kLmNwcCBiL1Nv dXJjZS9XZWJLaXQvR1BVUHJvY2Vzcy9ncmFwaGljcy9SZW1vdGVSZW5kZXJpbmdCYWNrZW5kLmNw cAppbmRleCAxZGM4MmZkMTNhMjdlNjNlMmE0YmU3NTRlNzFlMjNlMDVhYzk5ZTAxLi4xNjIyYjlm ODQ3NTVlMjEwMjZlNzcxZjA4OTEwZjc5NmVjYzM1NjhmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L0dQVVByb2Nlc3MvZ3JhcGhpY3MvUmVtb3RlUmVuZGVyaW5nQmFja2VuZC5jcHAKKysrIGIv U291cmNlL1dlYktpdC9HUFVQcm9jZXNzL2dyYXBoaWNzL1JlbW90ZVJlbmRlcmluZ0JhY2tlbmQu Y3BwCkBAIC0yMDIsNyArMjAyLDcgQEAgdm9pZCBSZW1vdGVSZW5kZXJpbmdCYWNrZW5kOjpjcmVh dGVJbWFnZUJ1ZmZlcldpdGhRdWFsaWZpZWRJZGVudGlmaWVyKGNvbnN0IEZsb2EKICAgICB1cGRh dGVSZW5kZXJpbmdSZXNvdXJjZVJlcXVlc3QoKTsKIH0KIAotdm9pZCBSZW1vdGVSZW5kZXJpbmdC YWNrZW5kOjpnZXRQaXhlbEJ1ZmZlckZvckltYWdlQnVmZmVyKFJlbmRlcmluZ1Jlc291cmNlSWRl bnRpZmllciBpbWFnZUJ1ZmZlciwgV2ViQ29yZTo6UGl4ZWxCdWZmZXJGb3JtYXQmJiBkZXN0aW5h dGlvbkZvcm1hdCwgV2ViQ29yZTo6SW50UmVjdCYmIHNyY1JlY3QsIENvbXBsZXRpb25IYW5kbGVy PHZvaWQoKT4mJiBjb21wbGV0aW9uSGFuZGxlcikKK3ZvaWQgUmVtb3RlUmVuZGVyaW5nQmFja2Vu ZDo6Z2V0UGl4ZWxCdWZmZXJGb3JJbWFnZUJ1ZmZlcihSZW5kZXJpbmdSZXNvdXJjZUlkZW50aWZp ZXIgaW1hZ2VCdWZmZXIsIFBpeGVsQnVmZmVyRm9ybWF0JiYgZGVzdGluYXRpb25Gb3JtYXQsIElu dFJlY3QmJiBzcmNSZWN0LCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKCk+JiYgY29tcGxldGlvbkhh bmRsZXIpCiB7CiAgICAgTUVTU0FHRV9DSEVDSyhtX2dldFBpeGVsQnVmZmVyU2hhcmVkTWVtb3J5 LCAiTm8gc2hhcmVkIG1lbW9yeSBmb3IgZ2V0UGl4ZWxCdWZmZXJGb3JJbWFnZUJ1ZmZlciIpOwog ICAgIFF1YWxpZmllZFJlbmRlcmluZ1Jlc291cmNlSWRlbnRpZmllciBxdWFsaWZpZWRJbWFnZUJ1 ZmZlciB7IGltYWdlQnVmZmVyLCBtX2dwdUNvbm5lY3Rpb25Ub1dlYlByb2Nlc3MtPndlYlByb2Nl c3NJZGVudGlmaWVyKCkgfTsKQEAgLTIxNyw3ICsyMTcsNyBAQCB2b2lkIFJlbW90ZVJlbmRlcmlu Z0JhY2tlbmQ6OmdldFBpeGVsQnVmZmVyRm9ySW1hZ2VCdWZmZXIoUmVuZGVyaW5nUmVzb3VyY2VJ ZGVudAogICAgIGNvbXBsZXRpb25IYW5kbGVyKCk7CiB9CiAKLXZvaWQgUmVtb3RlUmVuZGVyaW5n QmFja2VuZDo6Z2V0UGl4ZWxCdWZmZXJGb3JJbWFnZUJ1ZmZlcldpdGhOZXdNZW1vcnkoUmVuZGVy aW5nUmVzb3VyY2VJZGVudGlmaWVyIGltYWdlQnVmZmVyLCBTaGFyZWRNZW1vcnk6OklQQ0hhbmRs ZSYmIGhhbmRsZSwgV2ViQ29yZTo6UGl4ZWxCdWZmZXJGb3JtYXQmJiBkZXN0aW5hdGlvbkZvcm1h dCwgV2ViQ29yZTo6SW50UmVjdCYmIHNyY1JlY3QsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoKT4m JiBjb21wbGV0aW9uSGFuZGxlcikKK3ZvaWQgUmVtb3RlUmVuZGVyaW5nQmFja2VuZDo6Z2V0UGl4 ZWxCdWZmZXJGb3JJbWFnZUJ1ZmZlcldpdGhOZXdNZW1vcnkoUmVuZGVyaW5nUmVzb3VyY2VJZGVu dGlmaWVyIGltYWdlQnVmZmVyLCBTaGFyZWRNZW1vcnk6OklQQ0hhbmRsZSYmIGhhbmRsZSwgUGl4 ZWxCdWZmZXJGb3JtYXQmJiBkZXN0aW5hdGlvbkZvcm1hdCwgSW50UmVjdCYmIHNyY1JlY3QsIENv bXBsZXRpb25IYW5kbGVyPHZvaWQoKT4mJiBjb21wbGV0aW9uSGFuZGxlcikKIHsKICAgICBtX2dl dFBpeGVsQnVmZmVyU2hhcmVkTWVtb3J5ID0gbnVsbHB0cjsKICAgICBhdXRvIHNoYXJlZE1lbW9y eSA9IFdlYktpdDo6U2hhcmVkTWVtb3J5OjptYXAoaGFuZGxlLmhhbmRsZSwgV2ViS2l0OjpTaGFy ZWRNZW1vcnk6OlByb3RlY3Rpb246OlJlYWRXcml0ZSk7CkBAIC0yMzIsMjEgKzIzMiwyMSBAQCB2 b2lkIFJlbW90ZVJlbmRlcmluZ0JhY2tlbmQ6OmRlc3Ryb3lHZXRQaXhlbEJ1ZmZlclNoYXJlZE1l bW9yeSgpCiAgICAgbV9nZXRQaXhlbEJ1ZmZlclNoYXJlZE1lbW9yeSA9IG51bGxwdHI7CiB9CiAK LXZvaWQgUmVtb3RlUmVuZGVyaW5nQmFja2VuZDo6cHV0UGl4ZWxCdWZmZXJGb3JJbWFnZUJ1ZmZl cihXZWJDb3JlOjpSZW5kZXJpbmdSZXNvdXJjZUlkZW50aWZpZXIgaW1hZ2VCdWZmZXIsIFdlYkNv cmU6OlBpeGVsQnVmZmVyJiYgcGl4ZWxCdWZmZXIsIFdlYkNvcmU6OkludFJlY3QmJiBzcmNSZWN0 LCBXZWJDb3JlOjpJbnRQb2ludCYmIGRlc3RQb2ludCwgV2ViQ29yZTo6QWxwaGFQcmVtdWx0aXBs aWNhdGlvbiBkZXN0Rm9ybWF0KQordm9pZCBSZW1vdGVSZW5kZXJpbmdCYWNrZW5kOjpwdXRQaXhl bEJ1ZmZlckZvckltYWdlQnVmZmVyKFJlbmRlcmluZ1Jlc291cmNlSWRlbnRpZmllciBpbWFnZUJ1 ZmZlciwgUGl4ZWxCdWZmZXImJiBwaXhlbEJ1ZmZlciwgSW50UmVjdCYmIHNyY1JlY3QsIEludFBv aW50JiYgZGVzdFBvaW50LCBBbHBoYVByZW11bHRpcGxpY2F0aW9uIGRlc3RGb3JtYXQpCiB7CiAg ICAgUXVhbGlmaWVkUmVuZGVyaW5nUmVzb3VyY2VJZGVudGlmaWVyIHF1YWxpZmllZEltYWdlQnVm ZmVyIHsgaW1hZ2VCdWZmZXIsIG1fZ3B1Q29ubmVjdGlvblRvV2ViUHJvY2Vzcy0+d2ViUHJvY2Vz c0lkZW50aWZpZXIoKSB9OwogICAgIGlmIChhdXRvIGltYWdlQnVmZmVyID0gbV9yZW1vdGVSZXNv dXJjZUNhY2hlLmNhY2hlZEltYWdlQnVmZmVyKHF1YWxpZmllZEltYWdlQnVmZmVyKSkKICAgICAg ICAgaW1hZ2VCdWZmZXItPnB1dFBpeGVsQnVmZmVyKHBpeGVsQnVmZmVyLCBzcmNSZWN0LCBkZXN0 UG9pbnQsIGRlc3RGb3JtYXQpOwogfQogCi12b2lkIFJlbW90ZVJlbmRlcmluZ0JhY2tlbmQ6Omdl dERhdGFVUkxGb3JJbWFnZUJ1ZmZlcihjb25zdCBTdHJpbmcmIG1pbWVUeXBlLCBzdGQ6Om9wdGlv bmFsPGRvdWJsZT4gcXVhbGl0eSwgV2ViQ29yZTo6UHJlc2VydmVSZXNvbHV0aW9uIHByZXNlcnZl UmVzb2x1dGlvbiwgV2ViQ29yZTo6UmVuZGVyaW5nUmVzb3VyY2VJZGVudGlmaWVyIHJlbmRlcmlu Z1Jlc291cmNlSWRlbnRpZmllciwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChTdHJpbmcmJik+JiYg Y29tcGxldGlvbkhhbmRsZXIpCit2b2lkIFJlbW90ZVJlbmRlcmluZ0JhY2tlbmQ6OmdldERhdGFV UkxGb3JJbWFnZUJ1ZmZlcihjb25zdCBTdHJpbmcmIG1pbWVUeXBlLCBzdGQ6Om9wdGlvbmFsPGRv dWJsZT4gcXVhbGl0eSwgUHJlc2VydmVSZXNvbHV0aW9uIHByZXNlcnZlUmVzb2x1dGlvbiwgUmVu ZGVyaW5nUmVzb3VyY2VJZGVudGlmaWVyIHJlbmRlcmluZ1Jlc291cmNlSWRlbnRpZmllciwgQ29t cGxldGlvbkhhbmRsZXI8dm9pZChTdHJpbmcmJik+JiYgY29tcGxldGlvbkhhbmRsZXIpCiB7CiAg ICAgLy8gSW1tZWRpYXRlbHkgdHVybiB0aGUgUmVuZGVyaW5nUmVzb3VyY2VJZGVudGlmaWVyICh3 aGljaCBpcyBlcnJvci1wcm9uZSkgdG8gYSBRdWFsaWZpZWRSZW5kZXJpbmdSZXNvdXJjZUlkZW50 aWZpZXIsCiAgICAgLy8gYW5kIHVzZSBhIGhlbHBlciBmdW5jdGlvbiB0byBtYWtlIHN1cmUgdGhh dCBkb24ndCBhY2NpZGVudGFsbHkgdXNlIHRoZSBSZW5kZXJpbmdSZXNvdXJjZUlkZW50aWZpZXIg KGJlY2F1c2UgdGhlIGhlbHBlciBmdW5jdGlvbiBjYW4ndCBzZWUgaXQpLgogICAgIGdldERhdGFV UkxGb3JJbWFnZUJ1ZmZlcldpdGhRdWFsaWZpZWRJZGVudGlmaWVyKG1pbWVUeXBlLCBxdWFsaXR5 LCBwcmVzZXJ2ZVJlc29sdXRpb24sIHsgcmVuZGVyaW5nUmVzb3VyY2VJZGVudGlmaWVyLCBtX2dw dUNvbm5lY3Rpb25Ub1dlYlByb2Nlc3MtPndlYlByb2Nlc3NJZGVudGlmaWVyKCkgfSwgV1RGTW92 ZShjb21wbGV0aW9uSGFuZGxlcikpOwogfQogCi12b2lkIFJlbW90ZVJlbmRlcmluZ0JhY2tlbmQ6 OmdldERhdGFVUkxGb3JJbWFnZUJ1ZmZlcldpdGhRdWFsaWZpZWRJZGVudGlmaWVyKGNvbnN0IFN0 cmluZyYgbWltZVR5cGUsIHN0ZDo6b3B0aW9uYWw8ZG91YmxlPiBxdWFsaXR5LCBXZWJDb3JlOjpQ cmVzZXJ2ZVJlc29sdXRpb24gcHJlc2VydmVSZXNvbHV0aW9uLCBRdWFsaWZpZWRSZW5kZXJpbmdS ZXNvdXJjZUlkZW50aWZpZXIgcmVuZGVyaW5nUmVzb3VyY2VJZGVudGlmaWVyLCBDb21wbGV0aW9u SGFuZGxlcjx2b2lkKFN0cmluZyYmKT4mJiBjb21wbGV0aW9uSGFuZGxlcikKK3ZvaWQgUmVtb3Rl UmVuZGVyaW5nQmFja2VuZDo6Z2V0RGF0YVVSTEZvckltYWdlQnVmZmVyV2l0aFF1YWxpZmllZElk ZW50aWZpZXIoY29uc3QgU3RyaW5nJiBtaW1lVHlwZSwgc3RkOjpvcHRpb25hbDxkb3VibGU+IHF1 YWxpdHksIFByZXNlcnZlUmVzb2x1dGlvbiBwcmVzZXJ2ZVJlc29sdXRpb24sIFF1YWxpZmllZFJl bmRlcmluZ1Jlc291cmNlSWRlbnRpZmllciByZW5kZXJpbmdSZXNvdXJjZUlkZW50aWZpZXIsIENv bXBsZXRpb25IYW5kbGVyPHZvaWQoU3RyaW5nJiYpPiYmIGNvbXBsZXRpb25IYW5kbGVyKQogewog ICAgIEFTU0VSVCghUnVuTG9vcDo6aXNNYWluKCkpOwogCkBAIC0yNTYsNyArMjU2LDcgQEAgdm9p ZCBSZW1vdGVSZW5kZXJpbmdCYWNrZW5kOjpnZXREYXRhVVJMRm9ySW1hZ2VCdWZmZXJXaXRoUXVh bGlmaWVkSWRlbnRpZmllcihjb24KICAgICBjb21wbGV0aW9uSGFuZGxlcihXVEZNb3ZlKHVybFN0 cmluZykpOwogfQogCi12b2lkIFJlbW90ZVJlbmRlcmluZ0JhY2tlbmQ6OmdldERhdGFGb3JJbWFn ZUJ1ZmZlcihjb25zdCBTdHJpbmcmIG1pbWVUeXBlLCBzdGQ6Om9wdGlvbmFsPGRvdWJsZT4gcXVh bGl0eSwgV2ViQ29yZTo6UmVuZGVyaW5nUmVzb3VyY2VJZGVudGlmaWVyIHJlbmRlcmluZ1Jlc291 cmNlSWRlbnRpZmllciwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChWZWN0b3I8dWludDhfdD4mJik+ JiYgY29tcGxldGlvbkhhbmRsZXIpCit2b2lkIFJlbW90ZVJlbmRlcmluZ0JhY2tlbmQ6OmdldERh dGFGb3JJbWFnZUJ1ZmZlcihjb25zdCBTdHJpbmcmIG1pbWVUeXBlLCBzdGQ6Om9wdGlvbmFsPGRv dWJsZT4gcXVhbGl0eSwgUmVuZGVyaW5nUmVzb3VyY2VJZGVudGlmaWVyIHJlbmRlcmluZ1Jlc291 cmNlSWRlbnRpZmllciwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChWZWN0b3I8dWludDhfdD4mJik+ JiYgY29tcGxldGlvbkhhbmRsZXIpCiB7CiAgICAgLy8gSW1tZWRpYXRlbHkgdHVybiB0aGUgUmVu ZGVyaW5nUmVzb3VyY2VJZGVudGlmaWVyICh3aGljaCBpcyBlcnJvci1wcm9uZSkgdG8gYSBRdWFs aWZpZWRSZW5kZXJpbmdSZXNvdXJjZUlkZW50aWZpZXIsCiAgICAgLy8gYW5kIHVzZSBhIGhlbHBl ciBmdW5jdGlvbiB0byBtYWtlIHN1cmUgdGhhdCBkb24ndCBhY2NpZGVudGFsbHkgdXNlIHRoZSBS ZW5kZXJpbmdSZXNvdXJjZUlkZW50aWZpZXIgKGJlY2F1c2UgdGhlIGhlbHBlciBmdW5jdGlvbiBj YW4ndCBzZWUgaXQpLgpAQCAtMjczLDE0ICsyNzMsMTQgQEAgdm9pZCBSZW1vdGVSZW5kZXJpbmdC YWNrZW5kOjpnZXREYXRhRm9ySW1hZ2VCdWZmZXJXaXRoUXVhbGlmaWVkSWRlbnRpZmllcihjb25z dAogICAgIGNvbXBsZXRpb25IYW5kbGVyKFdURk1vdmUoZGF0YSkpOwogfQogCi12b2lkIFJlbW90 ZVJlbmRlcmluZ0JhY2tlbmQ6OmdldFNoYXJlYWJsZUJpdG1hcEZvckltYWdlQnVmZmVyKFdlYkNv cmU6OlJlbmRlcmluZ1Jlc291cmNlSWRlbnRpZmllciBpZGVudGlmaWVyLCBXZWJDb3JlOjpQcmVz ZXJ2ZVJlc29sdXRpb24gcHJlc2VydmVSZXNvbHV0aW9uLCBDb21wbGV0aW9uSGFuZGxlcjx2b2lk KFNoYXJlYWJsZUJpdG1hcDo6SGFuZGxlJiYpPiYmIGNvbXBsZXRpb25IYW5kbGVyKQordm9pZCBS ZW1vdGVSZW5kZXJpbmdCYWNrZW5kOjpnZXRTaGFyZWFibGVCaXRtYXBGb3JJbWFnZUJ1ZmZlcihS ZW5kZXJpbmdSZXNvdXJjZUlkZW50aWZpZXIgaWRlbnRpZmllciwgUHJlc2VydmVSZXNvbHV0aW9u IHByZXNlcnZlUmVzb2x1dGlvbiwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChTaGFyZWFibGVCaXRt YXA6OkhhbmRsZSYmKT4mJiBjb21wbGV0aW9uSGFuZGxlcikKIHsKICAgICAvLyBJbW1lZGlhdGVs eSB0dXJuIHRoZSBSZW5kZXJpbmdSZXNvdXJjZUlkZW50aWZpZXIgKHdoaWNoIGlzIGVycm9yLXBy b25lKSB0byBhIFF1YWxpZmllZFJlbmRlcmluZ1Jlc291cmNlSWRlbnRpZmllciwKICAgICAvLyBh bmQgdXNlIGEgaGVscGVyIGZ1bmN0aW9uIHRvIG1ha2Ugc3VyZSB0aGF0IGRvbid0IGFjY2lkZW50 YWxseSB1c2UgdGhlIFJlbmRlcmluZ1Jlc291cmNlSWRlbnRpZmllciAoYmVjYXVzZSB0aGUgaGVs cGVyIGZ1bmN0aW9uIGNhbid0IHNlZSBpdCkuCiAgICAgZ2V0U2hhcmVhYmxlQml0bWFwRm9ySW1h Z2VCdWZmZXJXaXRoUXVhbGlmaWVkSWRlbnRpZmllcih7IGlkZW50aWZpZXIsIG1fZ3B1Q29ubmVj dGlvblRvV2ViUHJvY2Vzcy0+d2ViUHJvY2Vzc0lkZW50aWZpZXIoKSB9LCBwcmVzZXJ2ZVJlc29s dXRpb24sIFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpKTsKIH0KIAotdm9pZCBSZW1vdGVSZW5k ZXJpbmdCYWNrZW5kOjpnZXRTaGFyZWFibGVCaXRtYXBGb3JJbWFnZUJ1ZmZlcldpdGhRdWFsaWZp ZWRJZGVudGlmaWVyKFF1YWxpZmllZFJlbmRlcmluZ1Jlc291cmNlSWRlbnRpZmllciBpZGVudGlm aWVyLCBXZWJDb3JlOjpQcmVzZXJ2ZVJlc29sdXRpb24gcHJlc2VydmVSZXNvbHV0aW9uLCBDb21w bGV0aW9uSGFuZGxlcjx2b2lkKFNoYXJlYWJsZUJpdG1hcDo6SGFuZGxlJiYpPiYmIGNvbXBsZXRp b25IYW5kbGVyKQordm9pZCBSZW1vdGVSZW5kZXJpbmdCYWNrZW5kOjpnZXRTaGFyZWFibGVCaXRt YXBGb3JJbWFnZUJ1ZmZlcldpdGhRdWFsaWZpZWRJZGVudGlmaWVyKFF1YWxpZmllZFJlbmRlcmlu Z1Jlc291cmNlSWRlbnRpZmllciBpZGVudGlmaWVyLCBQcmVzZXJ2ZVJlc29sdXRpb24gcHJlc2Vy dmVSZXNvbHV0aW9uLCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKFNoYXJlYWJsZUJpdG1hcDo6SGFu ZGxlJiYpPiYmIGNvbXBsZXRpb25IYW5kbGVyKQogewogICAgIEFTU0VSVCghUnVuTG9vcDo6aXNN YWluKCkpOwogCkBAIC0yOTAsMTQgKzI5MCwxNCBAQCB2b2lkIFJlbW90ZVJlbmRlcmluZ0JhY2tl bmQ6OmdldFNoYXJlYWJsZUJpdG1hcEZvckltYWdlQnVmZmVyV2l0aFF1YWxpZmllZElkZW50aQog ICAgICAgICBpZiAoIWltYWdlQnVmZmVyKQogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICBh dXRvIGJhY2tlbmRTaXplID0gaW1hZ2VCdWZmZXItPmJhY2tlbmRTaXplKCk7Ci0gICAgICAgIGF1 dG8gcmVzdWx0U2l6ZSA9IHByZXNlcnZlUmVzb2x1dGlvbiA9PSBXZWJDb3JlOjpQcmVzZXJ2ZVJl c29sdXRpb246OlllcyA/IGJhY2tlbmRTaXplIDogaW1hZ2VCdWZmZXItPnRydW5jYXRlZExvZ2lj YWxTaXplKCk7CisgICAgICAgIGF1dG8gcmVzdWx0U2l6ZSA9IHByZXNlcnZlUmVzb2x1dGlvbiA9 PSBQcmVzZXJ2ZVJlc29sdXRpb246OlllcyA/IGJhY2tlbmRTaXplIDogaW1hZ2VCdWZmZXItPnRy dW5jYXRlZExvZ2ljYWxTaXplKCk7CiAgICAgICAgIGF1dG8gYml0bWFwID0gU2hhcmVhYmxlQml0 bWFwOjpjcmVhdGVTaGFyZWFibGUocmVzdWx0U2l6ZSwgeyBpbWFnZUJ1ZmZlci0+Y29sb3JTcGFj ZSgpIH0pOwogICAgICAgICBpZiAoIWJpdG1hcCkKICAgICAgICAgICAgIHJldHVybjsKICAgICAg ICAgYXV0byBjb250ZXh0ID0gYml0bWFwLT5jcmVhdGVHcmFwaGljc0NvbnRleHQoKTsKICAgICAg ICAgaWYgKCFjb250ZXh0KQogICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICBjb250ZXh0LT5k cmF3SW1hZ2VCdWZmZXIoKmltYWdlQnVmZmVyLCBGbG9hdFJlY3QgeyB7IH0sIHJlc3VsdFNpemUg fSwgRmxvYXRSZWN0IHsgeyB9LCBiYWNrZW5kU2l6ZSB9LCB7IFdlYkNvcmU6OkNvbXBvc2l0ZU9w ZXJhdG9yOjpDb3B5IH0pOworICAgICAgICBjb250ZXh0LT5kcmF3SW1hZ2VCdWZmZXIoKmltYWdl QnVmZmVyLCBGbG9hdFJlY3QgeyB7IH0sIHJlc3VsdFNpemUgfSwgRmxvYXRSZWN0IHsgeyB9LCBi YWNrZW5kU2l6ZSB9LCB7IENvbXBvc2l0ZU9wZXJhdG9yOjpDb3B5IH0pOwogICAgICAgICBiaXRt YXAtPmNyZWF0ZUhhbmRsZShoYW5kbGUpOwogICAgIH0oKTsKICAgICBjb21wbGV0aW9uSGFuZGxl cihXVEZNb3ZlKGhhbmRsZSkpOwpAQCAtMzUyLDcgKzM1Miw3IEBAIHZvaWQgUmVtb3RlUmVuZGVy aW5nQmFja2VuZDo6Y2FjaGVOYXRpdmVJbWFnZVdpdGhRdWFsaWZpZWRJZGVudGlmaWVyKGNvbnN0 IFNoYXJlCiAgICAgbV9yZW1vdGVSZXNvdXJjZUNhY2hlLmNhY2hlTmF0aXZlSW1hZ2UoKmltYWdl LCBuYXRpdmVJbWFnZVJlc291cmNlSWRlbnRpZmllcik7CiB9CiAKLXZvaWQgUmVtb3RlUmVuZGVy aW5nQmFja2VuZDo6Y2FjaGVGb250KFJlZjxXZWJDb3JlOjpGb250PiYmIGZvbnQpCit2b2lkIFJl bW90ZVJlbmRlcmluZ0JhY2tlbmQ6OmNhY2hlRm9udChSZWY8Rm9udD4mJiBmb250KQogewogICAg IC8vIEltbWVkaWF0ZWx5IHR1cm4gdGhlIFJlbmRlcmluZ1Jlc291cmNlSWRlbnRpZmllciAod2hp Y2ggaXMgZXJyb3ItcHJvbmUpIHRvIGEgUXVhbGlmaWVkUmVuZGVyaW5nUmVzb3VyY2VJZGVudGlm aWVyLAogICAgIC8vIGFuZCB1c2UgYSBoZWxwZXIgZnVuY3Rpb24gdG8gbWFrZSBzdXJlIHRoYXQg ZG9uJ3QgYWNjaWRlbnRhbGx5IHVzZSB0aGUgUmVuZGVyaW5nUmVzb3VyY2VJZGVudGlmaWVyIChi ZWNhdXNlIHRoZSBoZWxwZXIgZnVuY3Rpb24gY2FuJ3Qgc2VlIGl0KS4KQEAgLTM5MSw3ICszOTEs NyBAQCB2b2lkIFJlbW90ZVJlbmRlcmluZ0JhY2tlbmQ6OnJlbGVhc2VSZW1vdGVSZXNvdXJjZVdp dGhRdWFsaWZpZWRJZGVudGlmaWVyKFF1YWxpZgogICAgIG1fcmVtb3RlRGlzcGxheUxpc3RzLnJl bW92ZShyZW5kZXJpbmdSZXNvdXJjZUlkZW50aWZpZXIpOwogfQogCi1zdGF0aWMgc3RkOjpvcHRp b25hbDxJbWFnZUJ1ZmZlckJhY2tlbmRIYW5kbGU+IGhhbmRsZUZyb21CdWZmZXIoV2ViQ29yZTo6 SW1hZ2VCdWZmZXImIGJ1ZmZlcikKK3N0YXRpYyBzdGQ6Om9wdGlvbmFsPEltYWdlQnVmZmVyQmFj a2VuZEhhbmRsZT4gaGFuZGxlRnJvbUJ1ZmZlcihJbWFnZUJ1ZmZlciYgYnVmZmVyKQogewogICAg IGF1dG8qIGJhY2tlbmQgPSBidWZmZXIuZW5zdXJlQmFja2VuZENyZWF0ZWQoKTsKICAgICBpZiAo IWJhY2tlbmQpCkBAIC00ODUsNyArNDg1LDcgQEAgdm9pZCBSZW1vdGVSZW5kZXJpbmdCYWNrZW5k OjpwcmVwYXJlTGF5ZXJCdWZmZXJzRm9yRGlzcGxheShjb25zdCBQcmVwYXJlQmFja2luZ1MKICAg ICBvdXRwdXREYXRhLmRpc3BsYXlSZXF1aXJlbWVudCA9IG5lZWRzRnVsbERpc3BsYXkgPyBTd2Fw QnVmZmVyc0Rpc3BsYXlSZXF1aXJlbWVudDo6TmVlZHNGdWxsRGlzcGxheSA6IFN3YXBCdWZmZXJz RGlzcGxheVJlcXVpcmVtZW50OjpOZWVkc05vcm1hbERpc3BsYXk7CiB9CiAKLXZvaWQgUmVtb3Rl UmVuZGVyaW5nQmFja2VuZDo6bWFya1N1cmZhY2VzVm9sYXRpbGUoY29uc3QgVmVjdG9yPFdlYkNv cmU6OlJlbmRlcmluZ1Jlc291cmNlSWRlbnRpZmllcj4mIGlkZW50aWZpZXJzLCBDb21wbGV0aW9u SGFuZGxlcjx2b2lkKGNvbnN0IFZlY3RvcjxXZWJDb3JlOjpSZW5kZXJpbmdSZXNvdXJjZUlkZW50 aWZpZXI+JiBtYXJrZWRWb2xhdGlsZUJ1ZmZlcklkZW50aWZpZXJzKT4mJiBjb21wbGV0aW9uSGFu ZGxlcikKK3ZvaWQgUmVtb3RlUmVuZGVyaW5nQmFja2VuZDo6bWFya1N1cmZhY2VzVm9sYXRpbGUo Y29uc3QgVmVjdG9yPFJlbmRlcmluZ1Jlc291cmNlSWRlbnRpZmllcj4mIGlkZW50aWZpZXJzLCBD b21wbGV0aW9uSGFuZGxlcjx2b2lkKGNvbnN0IFZlY3RvcjxSZW5kZXJpbmdSZXNvdXJjZUlkZW50 aWZpZXI+JiBtYXJrZWRWb2xhdGlsZUJ1ZmZlcklkZW50aWZpZXJzKT4mJiBjb21wbGV0aW9uSGFu ZGxlcikKIHsKICAgICBMT0dfV0lUSF9TVFJFQU0oUmVtb3RlUmVuZGVyaW5nQnVmZmVyVm9sYXRp bGl0eSwgc3RyZWFtIDw8ICJHUFUgUHJvY2VzczogUmVtb3RlUmVuZGVyaW5nQmFja2VuZDo6bWFy a1N1cmZhY2VzVm9sYXRpbGUgIiA8PCBpZGVudGlmaWVycyk7CiAKQEAgLTQ5NCw3ICs0OTQsNyBA QCB2b2lkIFJlbW90ZVJlbmRlcmluZ0JhY2tlbmQ6Om1hcmtTdXJmYWNlc1ZvbGF0aWxlKGNvbnN0 IFZlY3RvcjxXZWJDb3JlOjpSZW5kZXJpbgogICAgICAgICByZXR1cm4gaW1hZ2VCdWZmZXIuc2V0 Vm9sYXRpbGUoKTsKICAgICB9OwogCi0gICAgVmVjdG9yPFdlYkNvcmU6OlJlbmRlcmluZ1Jlc291 cmNlSWRlbnRpZmllcj4gbWFya2VkVm9sYXRpbGVCdWZmZXJJZGVudGlmaWVyczsKKyAgICBWZWN0 b3I8UmVuZGVyaW5nUmVzb3VyY2VJZGVudGlmaWVyPiBtYXJrZWRWb2xhdGlsZUJ1ZmZlcklkZW50 aWZpZXJzOwogICAgIGZvciAoYXV0byBpZGVudGlmaWVyIDogaWRlbnRpZmllcnMpIHsKICAgICAg ICAgYXV0byBpbWFnZUJ1ZmZlciA9IG1fcmVtb3RlUmVzb3VyY2VDYWNoZS5jYWNoZWRJbWFnZUJ1 ZmZlcih7IGlkZW50aWZpZXIsIG1fZ3B1Q29ubmVjdGlvblRvV2ViUHJvY2Vzcy0+d2ViUHJvY2Vz c0lkZW50aWZpZXIoKSB9KTsKICAgICAgICAgaWYgKGltYWdlQnVmZmVyKSB7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L0dQVVByb2Nlc3MvZ3JhcGhpY3MvUmVtb3RlUmVuZGVyaW5nQmFja2Vu ZC5oIGIvU291cmNlL1dlYktpdC9HUFVQcm9jZXNzL2dyYXBoaWNzL1JlbW90ZVJlbmRlcmluZ0Jh Y2tlbmQuaAppbmRleCBkMTUwYzU2ZTc1YTg0ZDE4NjU3ZDhkMjA4ODkxMTkzNGM0MTM4ZjI2Li5m NDM4M2JlZmZlNDcyNTU5ZTU1NDRmM2JhNGVjNzBiZjVhNTRiNDk0IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L0dQVVByb2Nlc3MvZ3JhcGhpY3MvUmVtb3RlUmVuZGVyaW5nQmFja2VuZC5oCisr KyBiL1NvdXJjZS9XZWJLaXQvR1BVUHJvY2Vzcy9ncmFwaGljcy9SZW1vdGVSZW5kZXJpbmdCYWNr ZW5kLmgKQEAgLTQyLDkgKzQyLDggQEAKICNpbmNsdWRlICJTdHJlYW1NZXNzYWdlUmVjZWl2ZXIu aCIKICNpbmNsdWRlICJTdHJlYW1TZXJ2ZXJDb25uZWN0aW9uLmgiCiAjaW5jbHVkZSA8V2ViQ29y ZS9Db2xvclNwYWNlLmg+Ci0jaW5jbHVkZSA8V2ViQ29yZS9EaXNwbGF5TGlzdC5oPgotI2luY2x1 ZGUgPFdlYkNvcmUvRGlzcGxheUxpc3RJdGVtcy5oPgotI2luY2x1ZGUgPFdlYkNvcmUvRGlzcGxh eUxpc3RSZXBsYXllci5oPgorI2luY2x1ZGUgPFdlYkNvcmUvRGlzcGxheUxpc3RJdGVtQnVmZmVy SWRlbnRpZmllci5oPgorI2luY2x1ZGUgPFdlYkNvcmUvTWVkaWFQbGF5ZXJJZGVudGlmaWVyLmg+ CiAjaW5jbHVkZSA8V2ViQ29yZS9Qcm9jZXNzSWRlbnRpZmllci5oPgogI2luY2x1ZGUgPFdlYkNv cmUvUHJvY2Vzc0lkZW50aXR5Lmg+CiAjaW5jbHVkZSA8d3RmL1dlYWtQdHIuaD4KQEAgLTUzLDYg KzUyLDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiBjbGFzcyBEZXN0aW5hdGlvbkNvbG9yU3Bh Y2U7CiBjbGFzcyBGbG9hdFNpemU7CitjbGFzcyBNZWRpYVBsYXllcjsKIGNsYXNzIE5hdGl2ZUlt YWdlOwogCiBlbnVtIGNsYXNzIFJlbmRlcmluZ01vZGUgOiBib29sOwo=