173400 2017-06-14 21:03:56 -0700 Use the term icon instead of favicon 2017-06-16 09:12:44 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Local Build All All RESOLVED FIXED P2 Normal --- 1 dbates dbates achristensen buildbot cdumez commit-queue japhet mkwst sam oldest_to_newest 1319443 0 dbates 2017-06-14 21:03:56 -0700 Following up on bug #172733, comment #15, we should use the term "icon" instead of "favicon" when referring to a site icon. 1319444 1 312951 dbates 2017-06-14 21:05:50 -0700 Created attachment 312951 Patch 1319968 2 312951 commit-queue 2017-06-16 09:12:42 -0700 Comment on attachment 312951 Patch Clearing flags on attachment: 312951 Committed r218393: <http://trac.webkit.org/changeset/218393> 1319969 3 commit-queue 2017-06-16 09:12:44 -0700 All reviewed patches have been landed. Closing bug. 312951 2017-06-14 21:05:50 -0700 2017-06-16 09:12:42 -0700 Patch bug-173400-20170614210549.patch text/plain 15321 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMjE4MzEzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGJhOTA4ZmFlZDlkZjZj NDA2ZWQ4MmNiNWZjYWQzYzRhNjAxOTA4Zi4uZmJmZWI4NTBlMTg3M2UwODc4MmViY2RmZWJhYjQ1 YjgyNTk4ODVjNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQxIEBACisyMDE3LTA2LTE0ICBEYW5p ZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KKworICAgICAgICBVc2UgdGhlIHRlcm0gaWNv biBpbnN0ZWFkIG9mIGZhdmljb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTE3MzQwMAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvclBhZ2VBZ2VudC5jcHA6CisgICAgICAg IChXZWJDb3JlOjpJbnNwZWN0b3JQYWdlQWdlbnQ6OmNhY2hlZFJlc291cmNlQ29udGVudCk6Cisg ICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JQYWdlQWdlbnQ6OmNhY2hlZFJlc291cmNlVHlwZSk6 CisgICAgICAgICogbG9hZGVyL0xpbmtMb2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Y3Jl YXRlTGlua1ByZWxvYWRSZXNvdXJjZUNsaWVudCk6CisgICAgICAgICogbG9hZGVyL1Jlc291cmNl TG9hZEluZm8uY3BwOgorICAgICAgICAoV2ViQ29yZTo6dG9SZXNvdXJjZVR5cGUpOgorICAgICAg ICAqIGxvYWRlci9TdWJyZXNvdXJjZUxvYWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpsb2dS ZXNvdXJjZUxvYWRlZCk6CisgICAgICAgICogbG9hZGVyL2NhY2hlL0NhY2hlZFJhd1Jlc291cmNl LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNhY2hlZFJhd1Jlc291cmNlOjpDYWNoZWRSYXdSZXNv dXJjZSk6CisgICAgICAgICogbG9hZGVyL2NhY2hlL0NhY2hlZFJhd1Jlc291cmNlLmg6CisgICAg ICAgIChpc1R5cGUpOgorICAgICAgICAqIGxvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZS5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpDYWNoZWRSZXNvdXJjZTo6ZGVmYXVsdFByaW9yaXR5Rm9yUmVz b3VyY2VUeXBlKToKKyAgICAgICAgKiBsb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2UuaDoKKyAg ICAgICAgKFdlYkNvcmU6OkNhY2hlZFJlc291cmNlOjppc01haW5Pck1lZGlhT3JJY29uT3JSYXdS ZXNvdXJjZSk6CisgICAgICAgIChXZWJDb3JlOjpDYWNoZWRSZXNvdXJjZTo6aWdub3JlRm9yUmVx dWVzdENvdW50KToKKyAgICAgICAgKFdlYkNvcmU6OkNhY2hlZFJlc291cmNlOjppc01haW5Pck1l ZGlhT3JGYXZpY29uT3JSYXdSZXNvdXJjZSk6IERlbGV0ZWQuCisgICAgICAgICogbG9hZGVyL2Nh Y2hlL0NhY2hlZFJlc291cmNlTG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmNyZWF0ZVJl c291cmNlKToKKyAgICAgICAgKFdlYkNvcmU6OkNhY2hlZFJlc291cmNlTG9hZGVyOjpyZXF1ZXN0 SWNvbik6CisgICAgICAgIChXZWJDb3JlOjpjb250ZW50VHlwZUZyb21SZXNvdXJjZVR5cGUpOgor ICAgICAgICAoV2ViQ29yZTo6Q2FjaGVkUmVzb3VyY2VMb2FkZXI6OmNoZWNrSW5zZWN1cmVDb250 ZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkNhY2hlZFJlc291cmNlTG9hZGVyOjphbGxvd2VkQnlD b250ZW50U2VjdXJpdHlQb2xpY3kpOgorICAgICAgICAoV2ViQ29yZTo6Q2FjaGVkUmVzb3VyY2VM b2FkZXI6OmRldGVybWluZVJldmFsaWRhdGlvblBvbGljeSk6CisgICAgICAgIChXZWJDb3JlOjpD YWNoZWRSZXNvdXJjZUxvYWRlcjo6cmVxdWVzdEZhdmljb24pOiBEZWxldGVkLgorICAgICAgICAq IGxvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZUxvYWRlci5oOgorICAgICAgICAqIGxvYWRlci9p Y29uL0ljb25Mb2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SWNvbkxvYWRlcjo6c3RhcnRM b2FkaW5nKToKKwogMjAxNy0wNi0xNCAgQW50b2luZSBRdWludCAgPGdyYW91dHNAYXBwbGUuY29t PgogCiAgICAgICAgIFJlYmFzZWxpbmUgbWVkaWEvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL21lZGlh LWRvY3VtZW50cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nIGIvU291cmNl L1dlYktpdDIvQ2hhbmdlTG9nCmluZGV4IDQ2ZjFmYzU2MjA4Yjc3NjczMmZiZTkzNjJiMTI2ZmQz ZDIxMDJkZDAuLmJkMGQzNmMyMzM0MjQzZmU4OGU0NjQ5NDYwYmE2NTJmYzQ1ZGQ3OTcgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFu Z2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAxNy0wNi0xNCAgRGFuaWVsIEJhdGVzICA8ZGFiYXRl c0BhcHBsZS5jb20+CisKKyAgICAgICAgVXNlIHRoZSB0ZXJtIGljb24gaW5zdGVhZCBvZiBmYXZp Y29uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzM0 MDAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdl YlByb2Nlc3MvTmV0d29yay9XZWJMb2FkZXJTdHJhdGVneS5jcHA6CisgICAgICAgIChXZWJLaXQ6 Om1heGltdW1CdWZmZXJpbmdUaW1lKToKKwogMjAxNy0wNi0xNCAgQ29tbWl0IFF1ZXVlICA8Y29t bWl0LXF1ZXVlQHdlYmtpdC5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQg cjIxODI4NS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JQ YWdlQWdlbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclBhZ2VBZ2Vu dC5jcHAKaW5kZXggNWExYzUyMjczYjgzYTcwNzVhMzBmNjIxNjVkMjNiNjZhMzU1MjEyMC4uZTRl YWNhYWFjYjNhMmM5NWMzOTliMTM2NDAyYjBlYTE5Y2Y2ODZjNyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclBhZ2VBZ2VudC5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclBhZ2VBZ2VudC5jcHAKQEAgLTE0MCw3ICsxNDAsNyBA QCBib29sIEluc3BlY3RvclBhZ2VBZ2VudDo6Y2FjaGVkUmVzb3VyY2VDb250ZW50KENhY2hlZFJl c291cmNlKiBjYWNoZWRSZXNvdXJjZSwgUwogICAgICAgICAgICAgKnJlc3VsdCA9IGRvd25jYXN0 PENhY2hlZFNjcmlwdD4oKmNhY2hlZFJlc291cmNlKS5zY3JpcHQoKS50b1N0cmluZygpOwogICAg ICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgICAgIGNhc2UgQ2FjaGVkUmVzb3VyY2U6Ok1lZGlh UmVzb3VyY2U6Ci0gICAgICAgIGNhc2UgQ2FjaGVkUmVzb3VyY2U6OkZhdmljb246CisgICAgICAg IGNhc2UgQ2FjaGVkUmVzb3VyY2U6Okljb246CiAgICAgICAgIGNhc2UgQ2FjaGVkUmVzb3VyY2U6 OlJhd1Jlc291cmNlOiB7CiAgICAgICAgICAgICBhdXRvKiBidWZmZXIgPSBjYWNoZWRSZXNvdXJj ZS0+cmVzb3VyY2VCdWZmZXIoKTsKICAgICAgICAgICAgIGlmICghYnVmZmVyKQpAQCAtMjkyLDcg KzI5Miw3IEBAIEluc3BlY3RvclBhZ2VBZ2VudDo6UmVzb3VyY2VUeXBlIEluc3BlY3RvclBhZ2VB Z2VudDo6Y2FjaGVkUmVzb3VyY2VUeXBlKGNvbnN0IENhCiAgICAgY2FzZSBDYWNoZWRSZXNvdXJj ZTo6TWFpblJlc291cmNlOgogICAgICAgICByZXR1cm4gSW5zcGVjdG9yUGFnZUFnZW50OjpEb2N1 bWVudFJlc291cmNlOwogICAgIGNhc2UgQ2FjaGVkUmVzb3VyY2U6Ok1lZGlhUmVzb3VyY2U6Ci0g ICAgY2FzZSBDYWNoZWRSZXNvdXJjZTo6RmF2aWNvbjoKKyAgICBjYXNlIENhY2hlZFJlc291cmNl OjpJY29uOgogICAgIGNhc2UgQ2FjaGVkUmVzb3VyY2U6OlJhd1Jlc291cmNlOiB7CiAgICAgICAg IHN3aXRjaCAoY2FjaGVkUmVzb3VyY2UucmVzb3VyY2VSZXF1ZXN0KCkucmVxdWVzdGVyKCkpIHsK ICAgICAgICAgY2FzZSBSZXNvdXJjZVJlcXVlc3Q6OlJlcXVlc3Rlcjo6RmV0Y2g6CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvTGlua0xvYWRlci5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9sb2FkZXIvTGlua0xvYWRlci5jcHAKaW5kZXggZmQ0YWQ4OTdlZDE3YjMyZTYwYjMwYmJjY2M5 MDBlOTMwMTY0N2Q2Yi4uMzZmZTk3YmM1Y2UxOTc1MDUzYjg3MDVmYjcyZTNkNWRkYzgwN2UwZiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0xpbmtMb2FkZXIuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2xvYWRlci9MaW5rTG9hZGVyLmNwcApAQCAtMTUzLDcgKzE1Myw3IEBAIHN0 YXRpYyBzdGQ6OnVuaXF1ZV9wdHI8TGlua1ByZWxvYWRSZXNvdXJjZUNsaWVudD4gY3JlYXRlTGlu a1ByZWxvYWRSZXNvdXJjZUNsaWVuCiAgICAgY2FzZSBDYWNoZWRSZXNvdXJjZTo6UmF3UmVzb3Vy Y2U6CiAgICAgICAgIHJldHVybiBMaW5rUHJlbG9hZFJhd1Jlc291cmNlQ2xpZW50OjpjcmVhdGUo bG9hZGVyLCBzdGF0aWNfY2FzdDxDYWNoZWRSYXdSZXNvdXJjZSY+KHJlc291cmNlKSk7CiAgICAg Y2FzZSBDYWNoZWRSZXNvdXJjZTo6TWFpblJlc291cmNlOgotICAgIGNhc2UgQ2FjaGVkUmVzb3Vy Y2U6OkZhdmljb246CisgICAgY2FzZSBDYWNoZWRSZXNvdXJjZTo6SWNvbjoKICNpZiBFTkFCTEUo U1ZHX0ZPTlRTKQogICAgIGNhc2UgQ2FjaGVkUmVzb3VyY2U6OlNWR0ZvbnRSZXNvdXJjZToKICNl bmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZEluZm8u Y3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZEluZm8uY3BwCmluZGV4IDJi MDdiYzY4YjIwOTRjOTA0ZjA3MWU1MDM2M2NhZThmZGQxMWI3NzMuLjAyN2IzZjdkYzY2NWRiM2Y5 YTYxMmVmZWNhYjc2MjYzMTNiNzM0MjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRl ci9SZXNvdXJjZUxvYWRJbmZvLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvUmVzb3Vy Y2VMb2FkSW5mby5jcHAKQEAgLTU2LDcgKzU2LDcgQEAgUmVzb3VyY2VUeXBlIHRvUmVzb3VyY2VU eXBlKENhY2hlZFJlc291cmNlOjpUeXBlIHR5cGUpCiAgICAgICAgIHJldHVybiBSZXNvdXJjZVR5 cGU6OkZvbnQ7CiAKICAgICBjYXNlIENhY2hlZFJlc291cmNlOjpNZWRpYVJlc291cmNlOgotICAg IGNhc2UgQ2FjaGVkUmVzb3VyY2U6OkZhdmljb246CisgICAgY2FzZSBDYWNoZWRSZXNvdXJjZTo6 SWNvbjoKICAgICBjYXNlIENhY2hlZFJlc291cmNlOjpSYXdSZXNvdXJjZToKICAgICAgICAgcmV0 dXJuIFJlc291cmNlVHlwZTo6UmF3OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2Fk ZXIvU3VicmVzb3VyY2VMb2FkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL1N1YnJlc291 cmNlTG9hZGVyLmNwcAppbmRleCAyM2RiMDJkNGI4MDIwY2QwMThmNTc4NmI3ZTY4MGU0ZGUyODNh NGFjLi5jNzhlM2EwNDEzNDA1NGUzNDk3NDM2YmNhNmZmODM1Y2M0YzRiNTljIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvU3VicmVzb3VyY2VMb2FkZXIuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2xvYWRlci9TdWJyZXNvdXJjZUxvYWRlci5jcHAKQEAgLTQ0OCw3ICs0NDgsNyBA QCBzdGF0aWMgdm9pZCBsb2dSZXNvdXJjZUxvYWRlZChGcmFtZSogZnJhbWUsIENhY2hlZFJlc291 cmNlOjpUeXBlIHR5cGUpCiAgICAgICAgIHJlc291cmNlVHlwZSA9IERpYWdub3N0aWNMb2dnaW5n S2V5czo6Zm9udEtleSgpOwogICAgICAgICBicmVhazsKICAgICBjYXNlIENhY2hlZFJlc291cmNl OjpNZWRpYVJlc291cmNlOgotICAgIGNhc2UgQ2FjaGVkUmVzb3VyY2U6OkZhdmljb246CisgICAg Y2FzZSBDYWNoZWRSZXNvdXJjZTo6SWNvbjoKICAgICBjYXNlIENhY2hlZFJlc291cmNlOjpSYXdS ZXNvdXJjZToKICAgICAgICAgcmVzb3VyY2VUeXBlID0gRGlhZ25vc3RpY0xvZ2dpbmdLZXlzOjpy YXdLZXkoKTsKICAgICAgICAgYnJlYWs7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2Fk ZXIvY2FjaGUvQ2FjaGVkUmF3UmVzb3VyY2UuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2Nh Y2hlL0NhY2hlZFJhd1Jlc291cmNlLmNwcAppbmRleCA0YjExNzNmYzJiOTAwY2QxOWQ4NDM1NWNi OTA3ZWU4Zjg3NDNiYjdiLi4yOWI4ZDg3MWMwY2Y2NjFlNmYzNzBjNDA2MjA3NWNlMzFhYjkyNWY1 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmF3UmVzb3Vy Y2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRSYXdSZXNvdXJj ZS5jcHAKQEAgLTQxLDcgKzQxLDcgQEAgQ2FjaGVkUmF3UmVzb3VyY2U6OkNhY2hlZFJhd1Jlc291 cmNlKENhY2hlZFJlc291cmNlUmVxdWVzdCYmIHJlcXVlc3QsIFR5cGUgdHlwZSwKICAgICAsIG1f aWRlbnRpZmllcigwKQogICAgICwgbV9hbGxvd0VuY29kZWREYXRhUmVwbGFjZW1lbnQodHJ1ZSkK IHsKLSAgICBBU1NFUlQoaXNNYWluT3JNZWRpYU9yRmF2aWNvbk9yUmF3UmVzb3VyY2UoKSk7Cisg ICAgQVNTRVJUKGlzTWFpbk9yTWVkaWFPckljb25PclJhd1Jlc291cmNlKCkpOwogfQogCiBzdGQ6 Om9wdGlvbmFsPFNoYXJlZEJ1ZmZlckRhdGFWaWV3PiBDYWNoZWRSYXdSZXNvdXJjZTo6Y2FsY3Vs YXRlSW5jcmVtZW50YWxEYXRhQ2h1bmsoY29uc3QgU2hhcmVkQnVmZmVyKiBkYXRhKSBjb25zdApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFJhd1Jlc291cmNl LmggYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmF3UmVzb3VyY2UuaAppbmRl eCA4ZTQyMzljNTg5ZTI1OGUyZTc4MmIxMDM2NDRmZDJhOGU5MGJiZDM3Li5iYjVhNWI4ZGVlMzdj MmRkMDQwZDdhZTI4MTgwYjQ2N2M3NjQ2N2I4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9s b2FkZXIvY2FjaGUvQ2FjaGVkUmF3UmVzb3VyY2UuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2Fk ZXIvY2FjaGUvQ2FjaGVkUmF3UmVzb3VyY2UuaApAQCAtOTgsNSArOTgsNSBAQCBwcml2YXRlOgog fSAvLyBuYW1lc3BhY2UgV2ViQ29yZQogCiBTUEVDSUFMSVpFX1RZUEVfVFJBSVRTX0JFR0lOKFdl YkNvcmU6OkNhY2hlZFJhd1Jlc291cmNlKQotICAgIHN0YXRpYyBib29sIGlzVHlwZShjb25zdCBX ZWJDb3JlOjpDYWNoZWRSZXNvdXJjZSYgcmVzb3VyY2UpIHsgcmV0dXJuIHJlc291cmNlLmlzTWFp bk9yTWVkaWFPckZhdmljb25PclJhd1Jlc291cmNlKCk7IH0KKyAgICBzdGF0aWMgYm9vbCBpc1R5 cGUoY29uc3QgV2ViQ29yZTo6Q2FjaGVkUmVzb3VyY2UmIHJlc291cmNlKSB7IHJldHVybiByZXNv dXJjZS5pc01haW5Pck1lZGlhT3JJY29uT3JSYXdSZXNvdXJjZSgpOyB9CiBTUEVDSUFMSVpFX1RZ UEVfVFJBSVRTX0VORCgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUv Q2FjaGVkUmVzb3VyY2UuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFJl c291cmNlLmNwcAppbmRleCBmOWYyNjBlZGUxYTEwYmEzOTFiZjYyYjExOGViOGJiZDBkMTcyYjBi Li5kOGQ2OGZhNmI1ZWMzNjM1Mzg4N2Y2MDA2ZGY4Njc4MDFiZTEyYWM3IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2UuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZS5jcHAKQEAgLTc4LDcgKzc4LDcg QEAgUmVzb3VyY2VMb2FkUHJpb3JpdHkgQ2FjaGVkUmVzb3VyY2U6OmRlZmF1bHRQcmlvcml0eUZv clJlc291cmNlVHlwZShUeXBlIHR5cGUpCiAgICAgY2FzZSBDYWNoZWRSZXNvdXJjZTo6TWVkaWFS ZXNvdXJjZToKICAgICBjYXNlIENhY2hlZFJlc291cmNlOjpGb250UmVzb3VyY2U6CiAgICAgY2Fz ZSBDYWNoZWRSZXNvdXJjZTo6UmF3UmVzb3VyY2U6Ci0gICAgY2FzZSBDYWNoZWRSZXNvdXJjZTo6 RmF2aWNvbjoKKyAgICBjYXNlIENhY2hlZFJlc291cmNlOjpJY29uOgogICAgICAgICByZXR1cm4g UmVzb3VyY2VMb2FkUHJpb3JpdHk6Ok1lZGl1bTsKICAgICBjYXNlIENhY2hlZFJlc291cmNlOjpJ bWFnZVJlc291cmNlOgogICAgICAgICByZXR1cm4gUmVzb3VyY2VMb2FkUHJpb3JpdHk6OkxvdzsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZS5o IGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFJlc291cmNlLmgKaW5kZXggMzU0 NjY2OWMyZTIxN2JkY2NlZWViMjgxZTE4YTY1MmI5OTNiMWE4ZC4uMjQyZmZhY2EyN2RiYjUyMTky ZmZhNzAxY2UyM2MzOWE5ZTJjZDc0YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVy L2NhY2hlL0NhY2hlZFJlc291cmNlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hl L0NhY2hlZFJlc291cmNlLmgKQEAgLTcxLDcgKzcxLDcgQEAgcHVibGljOgogI2VuZGlmCiAgICAg ICAgIE1lZGlhUmVzb3VyY2UsCiAgICAgICAgIFJhd1Jlc291cmNlLAotICAgICAgICBGYXZpY29u LAorICAgICAgICBJY29uLAogICAgICAgICBTVkdEb2N1bWVudFJlc291cmNlCiAjaWYgRU5BQkxF KFhTTFQpCiAgICAgICAgICwgWFNMU3R5bGVTaGVldApAQCAtMTYyLDcgKzE2Miw3IEBAIHB1Ymxp YzoKIAogICAgIGJvb2wgaXNJbWFnZSgpIGNvbnN0IHsgcmV0dXJuIHR5cGUoKSA9PSBJbWFnZVJl c291cmNlOyB9CiAgICAgLy8gRklYTUU6IENhY2hlZFJhd1Jlc291cmNlIGNvdWxkIGJlIGEgbWFp biByZXNvdXJjZSwgYW4gYXVkaW8vdmlkZW8gcmVzb3VyY2UsIG9yIGEgcmF3IFhIUi9pY29uIHJl c291cmNlLgotICAgIGJvb2wgaXNNYWluT3JNZWRpYU9yRmF2aWNvbk9yUmF3UmVzb3VyY2UoKSBj b25zdCB7IHJldHVybiB0eXBlKCkgPT0gTWFpblJlc291cmNlIHx8IHR5cGUoKSA9PSBNZWRpYVJl c291cmNlIHx8IHR5cGUoKSA9PSBGYXZpY29uIHx8IHR5cGUoKSA9PSBSYXdSZXNvdXJjZTsgfQor ICAgIGJvb2wgaXNNYWluT3JNZWRpYU9ySWNvbk9yUmF3UmVzb3VyY2UoKSBjb25zdCB7IHJldHVy biB0eXBlKCkgPT0gTWFpblJlc291cmNlIHx8IHR5cGUoKSA9PSBNZWRpYVJlc291cmNlIHx8IHR5 cGUoKSA9PSBJY29uIHx8IHR5cGUoKSA9PSBSYXdSZXNvdXJjZTsgfQogICAgIGJvb2wgaWdub3Jl Rm9yUmVxdWVzdENvdW50KCkgY29uc3QKICAgICB7CiAgICAgICAgIHJldHVybiBtX3Jlc291cmNl UmVxdWVzdC5pZ25vcmVGb3JSZXF1ZXN0Q291bnQoKQpAQCAtMTcxLDcgKzE3MSw3IEBAIHB1Ymxp YzoKICAgICAgICAgICAgIHx8IHR5cGUoKSA9PSBMaW5rUHJlZmV0Y2gKICAgICAgICAgICAgIHx8 IHR5cGUoKSA9PSBMaW5rU3VicmVzb3VyY2UKICNlbmRpZgotICAgICAgICAgICAgfHwgdHlwZSgp ID09IEZhdmljb24KKyAgICAgICAgICAgIHx8IHR5cGUoKSA9PSBJY29uCiAgICAgICAgICAgICB8 fCB0eXBlKCkgPT0gUmF3UmVzb3VyY2U7CiAgICAgfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2VMb2FkZXIuY3BwIGIvU291cmNlL1dlYkNv cmUvbG9hZGVyL2NhY2hlL0NhY2hlZFJlc291cmNlTG9hZGVyLmNwcAppbmRleCBiOGJmZmZhZTYw YTcyZWE4ZTA4MTVjYWQwYTgzNTIyY2ZhZjc5NDgyLi5kZWE3YmM5MWM5YmRkMWY3ZTBlZGIzMmYw NzliZjk5ZGY0YjRjZjVkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUv Q2FjaGVkUmVzb3VyY2VMb2FkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNo ZS9DYWNoZWRSZXNvdXJjZUxvYWRlci5jcHAKQEAgLTEwNSw3ICsxMDUsNyBAQCBzdGF0aWMgQ2Fj aGVkUmVzb3VyY2UqIGNyZWF0ZVJlc291cmNlKENhY2hlZFJlc291cmNlOjpUeXBlIHR5cGUsIENh Y2hlZFJlc291cmNlUgogICAgICAgICByZXR1cm4gbmV3IENhY2hlZEZvbnQoV1RGTW92ZShyZXF1 ZXN0KSwgc2Vzc2lvbklEKTsKICAgICBjYXNlIENhY2hlZFJlc291cmNlOjpNZWRpYVJlc291cmNl OgogICAgIGNhc2UgQ2FjaGVkUmVzb3VyY2U6OlJhd1Jlc291cmNlOgotICAgIGNhc2UgQ2FjaGVk UmVzb3VyY2U6OkZhdmljb246CisgICAgY2FzZSBDYWNoZWRSZXNvdXJjZTo6SWNvbjoKICAgICBj YXNlIENhY2hlZFJlc291cmNlOjpNYWluUmVzb3VyY2U6CiAgICAgICAgIHJldHVybiBuZXcgQ2Fj aGVkUmF3UmVzb3VyY2UoV1RGTW92ZShyZXF1ZXN0KSwgdHlwZSwgc2Vzc2lvbklEKTsKICNpZiBF TkFCTEUoWFNMVCkKQEAgLTI3Nyw5ICsyNzcsOSBAQCBDYWNoZWRSZXNvdXJjZUhhbmRsZTxDYWNo ZWRSYXdSZXNvdXJjZT4gQ2FjaGVkUmVzb3VyY2VMb2FkZXI6OnJlcXVlc3RNZWRpYShDYWNoZQog ICAgIHJldHVybiBkb3duY2FzdDxDYWNoZWRSYXdSZXNvdXJjZT4ocmVxdWVzdFJlc291cmNlKENh Y2hlZFJlc291cmNlOjpNZWRpYVJlc291cmNlLCBXVEZNb3ZlKHJlcXVlc3QpKS5nZXQoKSk7CiB9 CiAKLUNhY2hlZFJlc291cmNlSGFuZGxlPENhY2hlZFJhd1Jlc291cmNlPiBDYWNoZWRSZXNvdXJj ZUxvYWRlcjo6cmVxdWVzdEZhdmljb24oQ2FjaGVkUmVzb3VyY2VSZXF1ZXN0JiYgcmVxdWVzdCkK K0NhY2hlZFJlc291cmNlSGFuZGxlPENhY2hlZFJhd1Jlc291cmNlPiBDYWNoZWRSZXNvdXJjZUxv YWRlcjo6cmVxdWVzdEljb24oQ2FjaGVkUmVzb3VyY2VSZXF1ZXN0JiYgcmVxdWVzdCkKIHsKLSAg ICByZXR1cm4gZG93bmNhc3Q8Q2FjaGVkUmF3UmVzb3VyY2U+KHJlcXVlc3RSZXNvdXJjZShDYWNo ZWRSZXNvdXJjZTo6RmF2aWNvbiwgV1RGTW92ZShyZXF1ZXN0KSkuZ2V0KCkpOworICAgIHJldHVy biBkb3duY2FzdDxDYWNoZWRSYXdSZXNvdXJjZT4ocmVxdWVzdFJlc291cmNlKENhY2hlZFJlc291 cmNlOjpJY29uLCBXVEZNb3ZlKHJlcXVlc3QpKS5nZXQoKSk7CiB9CiAKIENhY2hlZFJlc291cmNl SGFuZGxlPENhY2hlZFJhd1Jlc291cmNlPiBDYWNoZWRSZXNvdXJjZUxvYWRlcjo6cmVxdWVzdFJh d1Jlc291cmNlKENhY2hlZFJlc291cmNlUmVxdWVzdCYmIHJlcXVlc3QpCkBAIC0zMTMsNyArMzEz LDcgQEAgc3RhdGljIE1peGVkQ29udGVudENoZWNrZXI6OkNvbnRlbnRUeXBlIGNvbnRlbnRUeXBl RnJvbVJlc291cmNlVHlwZShDYWNoZWRSZXNvdXIKICNlbmRpZgogCiAgICAgY2FzZSBDYWNoZWRS ZXNvdXJjZTo6UmF3UmVzb3VyY2U6Ci0gICAgY2FzZSBDYWNoZWRSZXNvdXJjZTo6RmF2aWNvbjoK KyAgICBjYXNlIENhY2hlZFJlc291cmNlOjpJY29uOgogICAgIGNhc2UgQ2FjaGVkUmVzb3VyY2U6 OlNWR0RvY3VtZW50UmVzb3VyY2U6CiAgICAgICAgIHJldHVybiBNaXhlZENvbnRlbnRDaGVja2Vy OjpDb250ZW50VHlwZTo6QWN0aXZlOwogI2lmIEVOQUJMRShYU0xUKQpAQCAtMzY0LDcgKzM2NCw3 IEBAIGJvb2wgQ2FjaGVkUmVzb3VyY2VMb2FkZXI6OmNoZWNrSW5zZWN1cmVDb250ZW50KENhY2hl ZFJlc291cmNlOjpUeXBlIHR5cGUsIGNvbnN0CiAjZW5kaWYKICAgICBjYXNlIENhY2hlZFJlc291 cmNlOjpNZWRpYVJlc291cmNlOgogICAgIGNhc2UgQ2FjaGVkUmVzb3VyY2U6OlJhd1Jlc291cmNl OgotICAgIGNhc2UgQ2FjaGVkUmVzb3VyY2U6OkZhdmljb246CisgICAgY2FzZSBDYWNoZWRSZXNv dXJjZTo6SWNvbjoKICAgICBjYXNlIENhY2hlZFJlc291cmNlOjpJbWFnZVJlc291cmNlOgogI2lm IEVOQUJMRShTVkdfRk9OVFMpCiAgICAgY2FzZSBDYWNoZWRSZXNvdXJjZTo6U1ZHRm9udFJlc291 cmNlOgpAQCAtNDEyLDcgKzQxMiw3IEBAIGJvb2wgQ2FjaGVkUmVzb3VyY2VMb2FkZXI6OmFsbG93 ZWRCeUNvbnRlbnRTZWN1cml0eVBvbGljeShDYWNoZWRSZXNvdXJjZTo6VHlwZSB0CiAgICAgICAg ICAgICByZXR1cm4gZmFsc2U7CiAgICAgICAgIGJyZWFrOwogICAgIGNhc2UgQ2FjaGVkUmVzb3Vy Y2U6OlNWR0RvY3VtZW50UmVzb3VyY2U6Ci0gICAgY2FzZSBDYWNoZWRSZXNvdXJjZTo6RmF2aWNv bjoKKyAgICBjYXNlIENhY2hlZFJlc291cmNlOjpJY29uOgogICAgIGNhc2UgQ2FjaGVkUmVzb3Vy Y2U6OkltYWdlUmVzb3VyY2U6CiAgICAgICAgIGlmICghbV9kb2N1bWVudC0+Y29udGVudFNlY3Vy aXR5UG9saWN5KCktPmFsbG93SW1hZ2VGcm9tU291cmNlKHVybCwgcmVkaXJlY3RSZXNwb25zZVJl Y2VpdmVkKSkKICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKQEAgLTk1Myw3ICs5NTMsNyBAQCBD YWNoZWRSZXNvdXJjZUxvYWRlcjo6UmV2YWxpZGF0aW9uUG9saWN5IENhY2hlZFJlc291cmNlTG9h ZGVyOjpkZXRlcm1pbmVSZXZhbGlkYQogCiAgICAgLy8gRklYTUU6IFdlIHNob3VsZCB1c2UgdGhl IHNhbWUgY2FjaGUgcG9saWN5IGZvciBhbGwgcmVzb3VyY2UgdHlwZXMuIFRoZSByYXcgcmVzb3Vy Y2UgcG9saWN5IGlzIG92ZXJseSBzdHJpY3QKICAgICAvLyAgICAgICAgd2hpbGUgdGhlIG5vcm1h bCBzdWJyZXNvdXJjZSBwb2xpY3kgaXMgdG9vIGxvb3NlLgotICAgIGlmIChleGlzdGluZ1Jlc291 cmNlLT5pc01haW5Pck1lZGlhT3JGYXZpY29uT3JSYXdSZXNvdXJjZSgpICYmIGZyYW1lKCkpIHsK KyAgICBpZiAoZXhpc3RpbmdSZXNvdXJjZS0+aXNNYWluT3JNZWRpYU9ySWNvbk9yUmF3UmVzb3Vy Y2UoKSAmJiBmcmFtZSgpKSB7CiAgICAgICAgIGJvb2wgc3RyaWN0UG9saWN5RGlzYWJsZWQgPSBm cmFtZSgpLT5sb2FkZXIoKS5pc1N0cmljdFJhd1Jlc291cmNlVmFsaWRhdGlvblBvbGljeURpc2Fi bGVkRm9yVGVzdGluZygpOwogICAgICAgICBib29sIGNhblJldXNlUmF3UmVzb3VyY2UgPSBzdHJp Y3RQb2xpY3lEaXNhYmxlZCB8fCBkb3duY2FzdDxDYWNoZWRSYXdSZXNvdXJjZT4oKmV4aXN0aW5n UmVzb3VyY2UpLmNhblJldXNlKHJlcXVlc3QpOwogICAgICAgICBpZiAoIWNhblJldXNlUmF3UmVz b3VyY2UpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVz b3VyY2VMb2FkZXIuaCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJj ZUxvYWRlci5oCmluZGV4IGZmZmRjYjhkOTNmOTBlMGRiYmE5NDQyOTQ0ZDk3NDA0YjcwZTI2OWIu LjdhZTEzMDZiNDNlNzRmYTcwZGZhNTQxNjY3YzBjOGFhOGJmZDk4MGUgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZUxvYWRlci5oCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZUxvYWRlci5oCkBAIC03OSw3 ICs3OSw3IEBAIHB1YmxpYzoKICAgICBDYWNoZWRSZXNvdXJjZUhhbmRsZTxDYWNoZWRTY3JpcHQ+ IHJlcXVlc3RTY3JpcHQoQ2FjaGVkUmVzb3VyY2VSZXF1ZXN0JiYpOwogICAgIENhY2hlZFJlc291 cmNlSGFuZGxlPENhY2hlZEZvbnQ+IHJlcXVlc3RGb250KENhY2hlZFJlc291cmNlUmVxdWVzdCYm LCBib29sIGlzU1ZHKTsKICAgICBDYWNoZWRSZXNvdXJjZUhhbmRsZTxDYWNoZWRSYXdSZXNvdXJj ZT4gcmVxdWVzdE1lZGlhKENhY2hlZFJlc291cmNlUmVxdWVzdCYmKTsKLSAgICBDYWNoZWRSZXNv dXJjZUhhbmRsZTxDYWNoZWRSYXdSZXNvdXJjZT4gcmVxdWVzdEZhdmljb24oQ2FjaGVkUmVzb3Vy Y2VSZXF1ZXN0JiYpOworICAgIENhY2hlZFJlc291cmNlSGFuZGxlPENhY2hlZFJhd1Jlc291cmNl PiByZXF1ZXN0SWNvbihDYWNoZWRSZXNvdXJjZVJlcXVlc3QmJik7CiAgICAgQ2FjaGVkUmVzb3Vy Y2VIYW5kbGU8Q2FjaGVkUmF3UmVzb3VyY2U+IHJlcXVlc3RSYXdSZXNvdXJjZShDYWNoZWRSZXNv dXJjZVJlcXVlc3QmJik7CiAgICAgQ2FjaGVkUmVzb3VyY2VIYW5kbGU8Q2FjaGVkUmF3UmVzb3Vy Y2U+IHJlcXVlc3RNYWluUmVzb3VyY2UoQ2FjaGVkUmVzb3VyY2VSZXF1ZXN0JiYpOwogICAgIENh Y2hlZFJlc291cmNlSGFuZGxlPENhY2hlZFNWR0RvY3VtZW50PiByZXF1ZXN0U1ZHRG9jdW1lbnQo Q2FjaGVkUmVzb3VyY2VSZXF1ZXN0JiYpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9h ZGVyL2ljb24vSWNvbkxvYWRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvaWNvbi9JY29u TG9hZGVyLmNwcAppbmRleCAyYjQ3NzliMTgwNTczOTlmZjViMmVlZjE2MjI0YTE0N2U2OTE4MGNm Li5hMDQ4NjUxNzQ1YTJlMTc4MjhlZjBhOTVlY2M5ZjNlMDY3NTYxZTBlIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9sb2FkZXIvaWNvbi9JY29uTG9hZGVyLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9sb2FkZXIvaWNvbi9JY29uTG9hZGVyLmNwcApAQCAtODgsNyArODgsNyBAQCB2b2lkIElj b25Mb2FkZXI6OnN0YXJ0TG9hZGluZygpCiAgICAgcmVxdWVzdC5zZXRJbml0aWF0b3IoY2FjaGVk UmVzb3VyY2VSZXF1ZXN0SW5pdGlhdG9ycygpLmljb24pOwogCiAgICAgYXV0byogZnJhbWUgPSBt X2ZyYW1lID8gbV9mcmFtZSA6IG1fZG9jdW1lbnRMb2FkZXItPmZyYW1lKCk7Ci0gICAgbV9yZXNv dXJjZSA9IGZyYW1lLT5kb2N1bWVudCgpLT5jYWNoZWRSZXNvdXJjZUxvYWRlcigpLnJlcXVlc3RG YXZpY29uKFdURk1vdmUocmVxdWVzdCkpOworICAgIG1fcmVzb3VyY2UgPSBmcmFtZS0+ZG9jdW1l bnQoKS0+Y2FjaGVkUmVzb3VyY2VMb2FkZXIoKS5yZXF1ZXN0SWNvbihXVEZNb3ZlKHJlcXVlc3Qp KTsKICAgICBpZiAobV9yZXNvdXJjZSkKICAgICAgICAgbV9yZXNvdXJjZS0+YWRkQ2xpZW50KCp0 aGlzKTsKICAgICBlbHNlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL05l dHdvcmsvV2ViTG9hZGVyU3RyYXRlZ3kuY3BwIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9O ZXR3b3JrL1dlYkxvYWRlclN0cmF0ZWd5LmNwcAppbmRleCA2Nzk1YTNhODA1ZWJjZGI2NzZmNGZh ZGEzOTAwNTdmODBmN2UzOTdmLi42NjdiZGQxOTM0MDY2MDMwMTg2ZTg2MTg0NmVkNmVkNjhiNTVh M2RiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL05ldHdvcmsvV2ViTG9h ZGVyU3RyYXRlZ3kuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvTmV0d29yay9X ZWJMb2FkZXJTdHJhdGVneS5jcHAKQEAgLTExNyw3ICsxMTcsNyBAQCBzdGF0aWMgU2Vjb25kcyBt YXhpbXVtQnVmZmVyaW5nVGltZShDYWNoZWRSZXNvdXJjZSogcmVzb3VyY2UpCiAgICAgY2FzZSBD YWNoZWRSZXNvdXJjZTo6TWVkaWFSZXNvdXJjZToKICAgICAgICAgcmV0dXJuIDUwX21zOwogICAg IGNhc2UgQ2FjaGVkUmVzb3VyY2U6Ok1haW5SZXNvdXJjZToKLSAgICBjYXNlIENhY2hlZFJlc291 cmNlOjpGYXZpY29uOgorICAgIGNhc2UgQ2FjaGVkUmVzb3VyY2U6Okljb246CiAgICAgY2FzZSBD YWNoZWRSZXNvdXJjZTo6UmF3UmVzb3VyY2U6CiAgICAgY2FzZSBDYWNoZWRSZXNvdXJjZTo6U1ZH RG9jdW1lbnRSZXNvdXJjZToKICNpZiBFTkFCTEUoTElOS19QUkVGRVRDSCkK