229242 2021-08-18 11:39:17 -0700 Rename WebPageProxy::headerHeight() and related to make it clear they are for printing 2021-08-19 09:24:58 -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 thorton webkit-bug-importer oldest_to_newest 1785181 0 simon.fraser 2021-08-18 11:39:17 -0700 Rename WebPageProxy::headerHeight() and related to make it clear they are for printing 1785182 1 435786 simon.fraser 2021-08-18 11:40:09 -0700 Created attachment 435786 Patch 1785481 2 ews-feeder 2021-08-19 09:23:45 -0700 Committed r281243 (240680@main): <https://commits.webkit.org/240680@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 435786. 1785482 3 webkit-bug-importer 2021-08-19 09:24:58 -0700 <rdar://problem/82128586> 435786 2021-08-18 11:40:09 -0700 2021-08-19 09:23:46 -0700 Patch bug-229242-20210818114008.patch text/plain 8038 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxMTY3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDg4YzJkZWUwMWViMTUzNDhm ZGNkZjQ3OTE3OTdmY2JiODFmOWQ4MGEuLjA4MDcyNTAzZGYwNzQwYTBjNWZmYTVlYjc5YmEzMjUx YjQ3YzUwZjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjggQEAKKzIwMjEtMDgtMTggIFNpbW9uIEZy YXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CisKKyAgICAgICAgUmVuYW1lIFdlYlBhZ2VQ cm94eTo6aGVhZGVySGVpZ2h0KCkgYW5kIHJlbGF0ZWQgdG8gbWFrZSBpdCBjbGVhciB0aGV5IGFy ZSBmb3IgcHJpbnRpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTIyOTI0MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIERpc2FtYmlndWF0ZSBXZWJQYWdlUHJveHk6OmhlYWRlckhlaWdodCgpLCB1c2VkIGZv ciBwcmludGluZywgZnJvbSBGcmFtZVZpZXc6OmhlYWRlckhlaWdodCgpCisgICAgICAgIHdoaWNo IGlzIG5vdC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9Db2NvYS9VSURlbGVnYXRlLmg6CisgICAg ICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBh Z2VQcm94eTo6aGVhZGVySGVpZ2h0Rm9yUHJpbnRpbmcpOgorICAgICAgICAoV2ViS2l0OjpXZWJQ YWdlUHJveHk6OmZvb3RlckhlaWdodEZvclByaW50aW5nKToKKyAgICAgICAgKFdlYktpdDo6V2Vi UGFnZVByb3h5OjpkcmF3SGVhZGVyRm9yUHJpbnRpbmcpOgorICAgICAgICAoV2ViS2l0OjpXZWJQ YWdlUHJveHk6OmRyYXdGb290ZXJGb3JQcmludGluZyk6CisgICAgICAgIChXZWJLaXQ6OldlYlBh Z2VQcm94eTo6aGVhZGVySGVpZ2h0KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYktpdDo6V2ViUGFn ZVByb3h5Ojpmb290ZXJIZWlnaHQpOiBEZWxldGVkLgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdl UHJveHk6OmRyYXdIZWFkZXIpOiBEZWxldGVkLgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJv eHk6OmRyYXdGb290ZXIpOiBEZWxldGVkLgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJv eHkuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvbWFjL1dLUHJpbnRpbmdWaWV3Lm1tOgorICAgICAg ICAoLVtXS1ByaW50aW5nVmlldyBfYWRqdXN0UHJpbnRpbmdNYXJnaW5zRm9ySGVhZGVyQW5kRm9v dGVyXSk6CisgICAgICAgICgtW1dLUHJpbnRpbmdWaWV3IGRyYXdQYWdlQm9yZGVyV2l0aFNpemU6 XSk6CisKIDIwMjEtMDgtMTcgIEZ1amlpIEhpcm9ub3JpICA8SGlyb25vcmkuRnVqaWlAc29ueS5j b20+CiAKICAgICAgICAgW2N1cmxdIEtlcHQgYWxpdmUgTmV0d29ya1Jlc291cmNlTG9hZGVycyBz aG91bGQgYmUgY2FuY2VsbGVkIGJ5IE5ldHdvcmtMb2FkOjpkaWRDb21wbGV0ZVdpdGhFcnJvciBv biBQb2xpY3lBY3Rpb246Oklnbm9yZSBvZiBkaWRSZWNlaXZlUmVzcG9uc2UKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1VJRGVsZWdhdGUuaCBiL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL0NvY29hL1VJRGVsZWdhdGUuaAppbmRleCA1NzhhYzk0OTRiZTUyMTlmNGMz NGZjNDllNGE0ZDUzN2NjZThkNTYyLi41ZDU3NWQwNTQ0OTIyZDQ3NWY0NTc2YzQ3YzViMGEzYTIw MmJlM2M0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9VSURlbGVn YXRlLmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvVUlEZWxlZ2F0ZS5oCkBA IC0xMTUsMTAgKzExNSwxMyBAQCBwcml2YXRlOgogICAgICAgICB2b2lkIHNldFdpbmRvd0ZyYW1l KFdlYlBhZ2VQcm94eSYsIGNvbnN0IFdlYkNvcmU6OkZsb2F0UmVjdCYpIGZpbmFsOwogICAgICAg ICB2b2lkIHdpbmRvd0ZyYW1lKFdlYlBhZ2VQcm94eSYsIEZ1bmN0aW9uPHZvaWQoV2ViQ29yZTo6 RmxvYXRSZWN0KT4mJikgZmluYWw7CiAgICAgICAgIHZvaWQgZGlkTm90SGFuZGxlV2hlZWxFdmVu dChXZWJQYWdlUHJveHkqLCBjb25zdCBOYXRpdmVXZWJXaGVlbEV2ZW50JikgZmluYWw7CisKKyAg ICAgICAgLy8gUHJpbnRpbmcuCiAgICAgICAgIGZsb2F0IGhlYWRlckhlaWdodChXZWJQYWdlUHJv eHkmLCBXZWJGcmFtZVByb3h5JikgZmluYWw7CiAgICAgICAgIGZsb2F0IGZvb3RlckhlaWdodChX ZWJQYWdlUHJveHkmLCBXZWJGcmFtZVByb3h5JikgZmluYWw7CiAgICAgICAgIHZvaWQgZHJhd0hl YWRlcihXZWJQYWdlUHJveHkmLCBXZWJGcmFtZVByb3h5JiwgV2ViQ29yZTo6RmxvYXRSZWN0JiYp IGZpbmFsOwogICAgICAgICB2b2lkIGRyYXdGb290ZXIoV2ViUGFnZVByb3h5JiwgV2ViRnJhbWVQ cm94eSYsIFdlYkNvcmU6OkZsb2F0UmVjdCYmKSBmaW5hbDsKKwogICAgICAgICB2b2lkIGRlY2lk ZVBvbGljeUZvck5vdGlmaWNhdGlvblBlcm1pc3Npb25SZXF1ZXN0KFdlYlBhZ2VQcm94eSYsIEFQ STo6U2VjdXJpdHlPcmlnaW4mLCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKGJvb2wgYWxsb3dlZCk+ JiYpIGZpbmFsOwogICAgICAgICB2b2lkIHVuYXZhaWxhYmxlUGx1Z2luQnV0dG9uQ2xpY2tlZChX ZWJQYWdlUHJveHkmLCBXS1BsdWdpblVuYXZhaWxhYmlsaXR5UmVhc29uLCBBUEk6OkRpY3Rpb25h cnkmKSBmaW5hbDsKICAgICAgICAgdm9pZCBtb3VzZURpZE1vdmVPdmVyRWxlbWVudChXZWJQYWdl UHJveHkmLCBjb25zdCBXZWJIaXRUZXN0UmVzdWx0RGF0YSYsIE9wdGlvblNldDxXZWJFdmVudDo6 TW9kaWZpZXI+LCBBUEk6Ok9iamVjdCopOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvV2ViUGFnZVByb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQ cm94eS5jcHAKaW5kZXggZjE5MDkyMjUwOWM3ZGFiNGJjMWQyZGUyM2Q0M2ZkY2I0ZTgyMjBlYy4u MjY3ZGI5OTI4NjNjNTBkMDk0YjI0ZmM0MjU2YzM2NjJkYTdlZmI0ZSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCkBAIC04NjYyLDI4ICs4NjYyLDI4IEBAIHZvaWQg V2ViUGFnZVByb3h5OjpkaWREZXN0cm95Tm90aWZpY2F0aW9uKHVpbnQ2NF90IG5vdGlmaWNhdGlv bklEKQogICAgIG1fcHJvY2Vzcy0+cHJvY2Vzc1Bvb2woKS5zdXBwbGVtZW50PFdlYk5vdGlmaWNh dGlvbk1hbmFnZXJQcm94eT4oKS0+ZGlkRGVzdHJveU5vdGlmaWNhdGlvbih0aGlzLCBub3RpZmlj YXRpb25JRCk7CiB9CiAKLWZsb2F0IFdlYlBhZ2VQcm94eTo6aGVhZGVySGVpZ2h0KFdlYkZyYW1l UHJveHkmIGZyYW1lKQorZmxvYXQgV2ViUGFnZVByb3h5OjpoZWFkZXJIZWlnaHRGb3JQcmludGlu ZyhXZWJGcmFtZVByb3h5JiBmcmFtZSkKIHsKICAgICBpZiAoZnJhbWUuaXNEaXNwbGF5aW5nUERG RG9jdW1lbnQoKSkKICAgICAgICAgcmV0dXJuIDA7CiAgICAgcmV0dXJuIG1fdWlDbGllbnQtPmhl YWRlckhlaWdodCgqdGhpcywgZnJhbWUpOwogfQogCi1mbG9hdCBXZWJQYWdlUHJveHk6OmZvb3Rl ckhlaWdodChXZWJGcmFtZVByb3h5JiBmcmFtZSkKK2Zsb2F0IFdlYlBhZ2VQcm94eTo6Zm9vdGVy SGVpZ2h0Rm9yUHJpbnRpbmcoV2ViRnJhbWVQcm94eSYgZnJhbWUpCiB7CiAgICAgaWYgKGZyYW1l LmlzRGlzcGxheWluZ1BERkRvY3VtZW50KCkpCiAgICAgICAgIHJldHVybiAwOwogICAgIHJldHVy biBtX3VpQ2xpZW50LT5mb290ZXJIZWlnaHQoKnRoaXMsIGZyYW1lKTsKIH0KIAotdm9pZCBXZWJQ YWdlUHJveHk6OmRyYXdIZWFkZXIoV2ViRnJhbWVQcm94eSYgZnJhbWUsIEZsb2F0UmVjdCYmIHJl Y3QpCit2b2lkIFdlYlBhZ2VQcm94eTo6ZHJhd0hlYWRlckZvclByaW50aW5nKFdlYkZyYW1lUHJv eHkmIGZyYW1lLCBGbG9hdFJlY3QmJiByZWN0KQogewogICAgIGlmIChmcmFtZS5pc0Rpc3BsYXlp bmdQREZEb2N1bWVudCgpKQogICAgICAgICByZXR1cm47CiAgICAgbV91aUNsaWVudC0+ZHJhd0hl YWRlcigqdGhpcywgZnJhbWUsIFdURk1vdmUocmVjdCkpOwogfQogCi12b2lkIFdlYlBhZ2VQcm94 eTo6ZHJhd0Zvb3RlcihXZWJGcmFtZVByb3h5JiBmcmFtZSwgRmxvYXRSZWN0JiYgcmVjdCkKK3Zv aWQgV2ViUGFnZVByb3h5OjpkcmF3Rm9vdGVyRm9yUHJpbnRpbmcoV2ViRnJhbWVQcm94eSYgZnJh bWUsIEZsb2F0UmVjdCYmIHJlY3QpCiB7CiAgICAgaWYgKGZyYW1lLmlzRGlzcGxheWluZ1BERkRv Y3VtZW50KCkpCiAgICAgICAgIHJldHVybjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL1dlYlBhZ2VQcm94eS5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVBy b3h5LmgKaW5kZXggM2JkY2RmZGUxNTcyYTA1ZTI0NDI2OTc2NjI0MzNmZjJlOTY4MDRhNS4uM2I0 NjhlYzY0ODZjNDZmZDdmNTU3MGVmZmFkNjIwOGVmMmE1YTRkNCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKKysrIGIvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvV2ViUGFnZVByb3h5LmgKQEAgLTExOTYsMTAgKzExOTYsMTAgQEAgcHVibGljOgogICAg IHZvaWQgcnVuSmF2YVNjcmlwdEluRnJhbWVJblNjcmlwdFdvcmxkKFdlYkNvcmU6OlJ1bkphdmFT Y3JpcHRQYXJhbWV0ZXJzJiYsIHN0ZDo6b3B0aW9uYWw8V2ViQ29yZTo6RnJhbWVJZGVudGlmaWVy PiwgQVBJOjpDb250ZW50V29ybGQmLCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKEV4cGVjdGVkPFJl ZlB0cjxBUEk6OlNlcmlhbGl6ZWRTY3JpcHRWYWx1ZT4sIFdlYkNvcmU6OkV4Y2VwdGlvbkRldGFp bHM+JiYpPiYmKTsKICAgICB2b2lkIGZvcmNlUmVwYWludChDb21wbGV0aW9uSGFuZGxlcjx2b2lk KCk+JiYpOwogCi0gICAgZmxvYXQgaGVhZGVySGVpZ2h0KFdlYkZyYW1lUHJveHkmKTsKLSAgICBm bG9hdCBmb290ZXJIZWlnaHQoV2ViRnJhbWVQcm94eSYpOwotICAgIHZvaWQgZHJhd0hlYWRlcihX ZWJGcmFtZVByb3h5JiwgV2ViQ29yZTo6RmxvYXRSZWN0JiYpOwotICAgIHZvaWQgZHJhd0Zvb3Rl cihXZWJGcmFtZVByb3h5JiwgV2ViQ29yZTo6RmxvYXRSZWN0JiYpOworICAgIGZsb2F0IGhlYWRl ckhlaWdodEZvclByaW50aW5nKFdlYkZyYW1lUHJveHkmKTsKKyAgICBmbG9hdCBmb290ZXJIZWln aHRGb3JQcmludGluZyhXZWJGcmFtZVByb3h5Jik7CisgICAgdm9pZCBkcmF3SGVhZGVyRm9yUHJp bnRpbmcoV2ViRnJhbWVQcm94eSYsIFdlYkNvcmU6OkZsb2F0UmVjdCYmKTsKKyAgICB2b2lkIGRy YXdGb290ZXJGb3JQcmludGluZyhXZWJGcmFtZVByb3h5JiwgV2ViQ29yZTo6RmxvYXRSZWN0JiYp OwogCiAjaWYgUExBVEZPUk0oQ09DT0EpCiAgICAgLy8gRGljdGlvbmFyeS4KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL21hYy9XS1ByaW50aW5nVmlldy5tbSBiL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL21hYy9XS1ByaW50aW5nVmlldy5tbQppbmRleCBkMDNlNjQzNGIxYWIy ZmJkNWU1NTQzMjk2OGIzZTlmNTY1OTJiYWM3Li41ZmNmYjVjMGY0MWQzYzg4OWNhNjlmNDE5MWZj M2YxYThlZmUxMjBmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9tYWMvV0tQ cmludGluZ1ZpZXcubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvbWFjL1dLUHJpbnRp bmdWaWV3Lm1tCkBAIC0xNTgsOCArMTU4LDggQEAgLSAodm9pZClfYWRqdXN0UHJpbnRpbmdNYXJn aW5zRm9ySGVhZGVyQW5kRm9vdGVyCiAgICAgfQogICAgIAogICAgIENHRmxvYXQgc2NhbGUgPSBb aW5mbyBzY2FsaW5nRmFjdG9yXTsKLSAgICBbaW5mbyBzZXRUb3BNYXJnaW46b3JpZ2luYWxUb3BN YXJnaW4gKyBfd2ViRnJhbWUtPnBhZ2UoKS0+aGVhZGVySGVpZ2h0KCpfd2ViRnJhbWUpICogc2Nh bGVdOwotICAgIFtpbmZvIHNldEJvdHRvbU1hcmdpbjpvcmlnaW5hbEJvdHRvbU1hcmdpbiArIF93 ZWJGcmFtZS0+cGFnZSgpLT5mb290ZXJIZWlnaHQoKl93ZWJGcmFtZSkgKiBzY2FsZV07CisgICAg W2luZm8gc2V0VG9wTWFyZ2luOm9yaWdpbmFsVG9wTWFyZ2luICsgX3dlYkZyYW1lLT5wYWdlKCkt PmhlYWRlckhlaWdodEZvclByaW50aW5nKCpfd2ViRnJhbWUpICogc2NhbGVdOworICAgIFtpbmZv IHNldEJvdHRvbU1hcmdpbjpvcmlnaW5hbEJvdHRvbU1hcmdpbiArIF93ZWJGcmFtZS0+cGFnZSgp LT5mb290ZXJIZWlnaHRGb3JQcmludGluZygqX3dlYkZyYW1lKSAqIHNjYWxlXTsKIH0KIAogLSAo Qk9PTClfaXNQcmludGluZ1ByZXZpZXcKQEAgLTY2MiwxOCArNjYyLDIwIEBAIC0gKHZvaWQpZHJh d1BhZ2VCb3JkZXJXaXRoU2l6ZTooTlNTaXplKWJvcmRlclNpemUKICAgICBOU1NpemUgcGFwZXJT aXplID0gW3ByaW50SW5mbyBwYXBlclNpemVdOwogICAgIENHRmxvYXQgaGVhZGVyRm9vdGVyTGVm dCA9IFtwcmludEluZm8gbGVmdE1hcmdpbl0gLyBzY2FsZTsKICAgICBDR0Zsb2F0IGhlYWRlckZv b3RlcldpZHRoID0gKHBhcGVyU2l6ZS53aWR0aCAtIChbcHJpbnRJbmZvIGxlZnRNYXJnaW5dICsg W3ByaW50SW5mbyByaWdodE1hcmdpbl0pKSAvIHNjYWxlOwotICAgIE5TUmVjdCBmb290ZXJSZWN0 ID0gTlNNYWtlUmVjdChoZWFkZXJGb290ZXJMZWZ0LCBbcHJpbnRJbmZvIGJvdHRvbU1hcmdpbl0g LyBzY2FsZSAtIF93ZWJGcmFtZS0+cGFnZSgpLT5mb290ZXJIZWlnaHQoKl93ZWJGcmFtZSksIGhl YWRlckZvb3RlcldpZHRoLCBfd2ViRnJhbWUtPnBhZ2UoKS0+Zm9vdGVySGVpZ2h0KCpfd2ViRnJh bWUpKTsKLSAgICBOU1JlY3QgaGVhZGVyUmVjdCA9IE5TTWFrZVJlY3QoaGVhZGVyRm9vdGVyTGVm dCwgKHBhcGVyU2l6ZS5oZWlnaHQgLSBbcHJpbnRJbmZvIHRvcE1hcmdpbl0pIC8gc2NhbGUsIGhl YWRlckZvb3RlcldpZHRoLCBfd2ViRnJhbWUtPnBhZ2UoKS0+aGVhZGVySGVpZ2h0KCpfd2ViRnJh bWUpKTsKKyAgICBDR0Zsb2F0IGhlYWRlckhlaWdodCA9IF93ZWJGcmFtZS0+cGFnZSgpLT5oZWFk ZXJIZWlnaHRGb3JQcmludGluZygqX3dlYkZyYW1lKTsKKyAgICBDR0Zsb2F0IGZvb3RlckhlaWdo dCA9IF93ZWJGcmFtZS0+cGFnZSgpLT5mb290ZXJIZWlnaHRGb3JQcmludGluZygqX3dlYkZyYW1l KTsKKyAgICBOU1JlY3QgZm9vdGVyUmVjdCA9IE5TTWFrZVJlY3QoaGVhZGVyRm9vdGVyTGVmdCwg W3ByaW50SW5mbyBib3R0b21NYXJnaW5dIC8gc2NhbGUgLSBmb290ZXJIZWlnaHQsIGhlYWRlckZv b3RlcldpZHRoLCBmb290ZXJIZWlnaHQpOworICAgIE5TUmVjdCBoZWFkZXJSZWN0ID0gTlNNYWtl UmVjdChoZWFkZXJGb290ZXJMZWZ0LCAocGFwZXJTaXplLmhlaWdodCAtIFtwcmludEluZm8gdG9w TWFyZ2luXSkgLyBzY2FsZSwgaGVhZGVyRm9vdGVyV2lkdGgsIGhlYWRlckhlaWdodCk7CiAKICAg ICBOU0dyYXBoaWNzQ29udGV4dCAqY3VycmVudENvbnRleHQgPSBbTlNHcmFwaGljc0NvbnRleHQg Y3VycmVudENvbnRleHRdOwogICAgIFtjdXJyZW50Q29udGV4dCBzYXZlR3JhcGhpY3NTdGF0ZV07 CiAgICAgTlNSZWN0Q2xpcChoZWFkZXJSZWN0KTsKLSAgICBfd2ViRnJhbWUtPnBhZ2UoKS0+ZHJh d0hlYWRlcigqX3dlYkZyYW1lLCBoZWFkZXJSZWN0KTsKKyAgICBfd2ViRnJhbWUtPnBhZ2UoKS0+ ZHJhd0hlYWRlckZvclByaW50aW5nKCpfd2ViRnJhbWUsIGhlYWRlclJlY3QpOwogICAgIFtjdXJy ZW50Q29udGV4dCByZXN0b3JlR3JhcGhpY3NTdGF0ZV07CiAKICAgICBbY3VycmVudENvbnRleHQg c2F2ZUdyYXBoaWNzU3RhdGVdOwogICAgIE5TUmVjdENsaXAoZm9vdGVyUmVjdCk7Ci0gICAgX3dl YkZyYW1lLT5wYWdlKCktPmRyYXdGb290ZXIoKl93ZWJGcmFtZSwgZm9vdGVyUmVjdCk7CisgICAg X3dlYkZyYW1lLT5wYWdlKCktPmRyYXdGb290ZXJGb3JQcmludGluZygqX3dlYkZyYW1lLCBmb290 ZXJSZWN0KTsKICAgICBbY3VycmVudENvbnRleHQgcmVzdG9yZUdyYXBoaWNzU3RhdGVdOwogfQog Cg==