74922 2011-12-20 04:55:32 -0800 [Qt] Favicon support should work with multiple web contexts 2011-12-20 05:32:17 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 hausmann hausmann rafael.lobo vestbo webkit.review.bot zoltan oldest_to_newest 524537 0 hausmann 2011-12-20 04:55:32 -0800 [Qt] Favicon support should work with multiple web contexts 524540 1 120010 hausmann 2011-12-20 04:58:22 -0800 Created attachment 120010 Patch 524551 2 hausmann 2011-12-20 05:32:17 -0800 Committed r103323: <http://trac.webkit.org/changeset/103323> 120010 2011-12-20 04:58:22 -0800 2011-12-20 05:09:13 -0800 Patch bug-74922-20111220135821.patch text/plain 10281 hausmann U3VidmVyc2lvbiBSZXZpc2lvbjogMTAzMzE2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNzI0NzdjYjRhYmY2NTIw YjBiYjc4N2NhNDdhMzk5NzVlNGU0Nzc0YS4uZjA1YmNiOGZiNWM1ZDk3MDhlMjk5MjBlYzc4N2E3 OWM4Y2IyMDkzZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDExLTEyLTIwICBTaW1v biBIYXVzbWFubiAgPHNpbW9uLmhhdXNtYW5uQG5va2lhLmNvbT4KKworICAgICAgICBbUXRdIEZh dmljb24gc3VwcG9ydCBzaG91bGQgd29yayB3aXRoIG11bHRpcGxlIHdlYiBjb250ZXh0cworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzQ5MjIKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9B UEkvcXQvcXF1aWNrd2Vidmlldy5jcHA6CisgICAgICAgIChRUXVpY2tXZWJWaWV3UHJpdmF0ZTo6 aW5pdGlhbGl6ZSk6IFJlbW92ZSB1bm5lY2Vzc2FyeSB1c2Ugb2YgUXRXZWJDb250ZXh0OjpkZWZh dWx0Q29udGV4dCgpLiBUaGVyZSBpcworICAgICAgICBhbHJlYWR5IGEgbWVtYmVyIHZhcmlhYmxl ICJjb250ZXh0IiB3aGljaCBpcyB0aGUgY29ycmVjdCBvbmUuCisgICAgICAgIChRUXVpY2tXZWJW aWV3UHJpdmF0ZTo6c2V0SWNvbik6IERpdHRvLgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvcXQv cXdlYmljb25pbWFnZXByb3ZpZGVyLmNwcDoKKyAgICAgICAgKFFXZWJJY29uSW1hZ2VQcm92aWRl cjo6cmVxdWVzdEltYWdlKTogRXh0cmFjdCB0aGUgY29udGV4dCBpZCBmcm9tIHRoZSBpbWFnZSBp ZCBhbmQgdXNlIGl0IHRvCisgICAgICAgIHF1ZXJ5IHRoZSBjb3JyZWN0IGljb24gZGF0YWJhc2Uu CisgICAgICAgICogVUlQcm9jZXNzL3F0L1F0V2ViQ29udGV4dC5jcHA6IFByb3ZpZGUgYSBtYXBw aW5nIGZyb20gaWQgdG8gcXR3ZWJjb250ZXh0LgorICAgICAgICAoV2ViS2l0OjpnZW5lcmF0ZUNv bnRleHRJRCk6CisgICAgICAgIChXZWJLaXQ6OlF0V2ViQ29udGV4dDo6UXRXZWJDb250ZXh0KToK KyAgICAgICAgKFdlYktpdDo6UXRXZWJDb250ZXh0Ojp+UXRXZWJDb250ZXh0KToKKyAgICAgICAg KFdlYktpdDo6UXRXZWJDb250ZXh0Ojpjb250ZXh0QnlJRCk6CisgICAgICAgIChXZWJLaXQ6OlF0 V2ViQ29udGV4dDo6aW5pdGlhbGl6ZSk6CisgICAgICAgICogVUlQcm9jZXNzL3F0L1F0V2ViQ29u dGV4dC5oOgorICAgICAgICAoV2ViS2l0OjpRdFdlYkNvbnRleHQ6OmNvbnRleHQpOgorICAgICAg ICAoV2ViS2l0OjpRdFdlYkNvbnRleHQ6OmNvbnRleHRJRCk6CisgICAgICAgICogVUlQcm9jZXNz L3F0L1F0V2ViSWNvbkRhdGFiYXNlQ2xpZW50LmNwcDoKKyAgICAgICAgKFF0V2ViSWNvbkRhdGFi YXNlQ2xpZW50OjpRdFdlYkljb25EYXRhYmFzZUNsaWVudCk6CisgICAgICAgIChRdFdlYkljb25E YXRhYmFzZUNsaWVudDo6cmVxdWVzdEljb25Gb3JQYWdlVVJMKTogU3RvcmUgdGhlIGNvbnRleHQg aWQgaW4gdGhlIGljb24gdXJsLgorICAgICAgICAqIFVJUHJvY2Vzcy9xdC9RdFdlYkljb25EYXRh YmFzZUNsaWVudC5oOgorCiAyMDExLTEyLTIwICBSYWZhZWwgQnJhbmRhbyAgPHJhZmFlbC5sb2Jv QG9wZW5ib3NzYS5vcmc+CiAKICAgICAgICAgW1F0XVtXSzJdIEltcGxlbWVudCBmYXZpY29uIHN1 cHBvcnQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNr d2Vidmlldy5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnZp ZXcuY3BwCmluZGV4IDVlMTNhZTE5MmRmNjM4MjZlZTM4MGMyNmY2ODBlOTVhMTQ2ZTc4YTkuLjRk YmY5Mzg2ZGFiNzI0NWY4YWJmNGZhYTZjOTEwMzAwMTM0ODUzNGUgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2Vidmlldy5jcHAKKysrIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2aWV3LmNwcApAQCAtOTIsNyArOTIs NiBAQCB2b2lkIFFRdWlja1dlYlZpZXdQcml2YXRlOjppbml0aWFsaXplKFdLQ29udGV4dFJlZiBj b250ZXh0UmVmLCBXS1BhZ2VHcm91cFJlZiBwYQogICAgIHBhZ2VVSUNsaWVudC5yZXNldChuZXcg UXRXZWJQYWdlVUlDbGllbnQodG9BUEkod2ViUGFnZVByb3h5LmdldCgpKSwgcV9wdHIpKTsKICAg ICBuYXZpZ2F0aW9uSGlzdG9yeSA9IGFkb3B0UHRyKFFXZWJOYXZpZ2F0aW9uSGlzdG9yeVByaXZh dGU6OmNyZWF0ZUhpc3RvcnkodG9BUEkod2ViUGFnZVByb3h5LmdldCgpKSkpOwogCi0gICAgUmVm UHRyPFF0V2ViQ29udGV4dD4gY29udGV4dCA9IFF0V2ViQ29udGV4dDo6ZGVmYXVsdENvbnRleHQo KTsKICAgICBRdFdlYkljb25EYXRhYmFzZUNsaWVudCogaWNvbkRhdGFiYXNlID0gY29udGV4dC0+ aWNvbkRhdGFiYXNlKCk7CiAgICAgUU9iamVjdDo6Y29ubmVjdChpY29uRGF0YWJhc2UsIFNJR05B TChpY29uQ2hhbmdlZEZvclBhZ2VVUkwoUVVybCwgUVVybCkpLCBxX3B0ciwgU0xPVChfcV9vbklj b25DaGFuZ2VkRm9yUGFnZVVSTChRVXJsLCBRVXJsKSkpOwogICAgIFFPYmplY3Q6OmNvbm5lY3Qo cV9wdHIsIFNJR05BTCh1cmxDaGFuZ2VkKFFVcmwpKSwgaWNvbkRhdGFiYXNlLCBTTE9UKHJlcXVl c3RJY29uRm9yUGFnZVVSTChRVXJsKSkpOwpAQCAtNTI3LDcgKzUyNiw2IEBAIHZvaWQgUVF1aWNr V2ViVmlld1ByaXZhdGU6OnNldEljb24oY29uc3QgUVVybCYgaWNvblVSTCkKICAgICBTdHJpbmcg bmV3UGFnZVVSTCA9IHdlYlBhZ2VQcm94eS0+bWFpbkZyYW1lKCktPnVybCgpOwogCiAgICAgaWYg KG9sZFBhZ2VVUkwgIT0gbmV3UGFnZVVSTCkgewotICAgICAgICBSZWZQdHI8UXRXZWJDb250ZXh0 PiBjb250ZXh0ID0gUXRXZWJDb250ZXh0OjpkZWZhdWx0Q29udGV4dCgpOwogICAgICAgICBRdFdl Ykljb25EYXRhYmFzZUNsaWVudCogaWNvbkRhdGFiYXNlID0gY29udGV4dC0+aWNvbkRhdGFiYXNl KCk7CiAgICAgICAgIGlmICghb2xkUGFnZVVSTC5pc0VtcHR5KCkpCiAgICAgICAgICAgICBpY29u RGF0YWJhc2UtPnJlbGVhc2VJY29uRm9yUGFnZVVSTChvbGRQYWdlVVJMKTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXdlYmljb25pbWFnZXByb3ZpZGVyLmNw cCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXdlYmljb25pbWFnZXByb3ZpZGVy LmNwcAppbmRleCBmNjNjMzhlMTBmY2RmZjJjOWM0ZjkxM2IyMmY3YjBiNDlmOGE5YmE2Li5lZjYy MjRjZGFmODE2MDgyMWIwZjczMTBmZjgzNzAzMjgzZTBhMWQ2IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F3ZWJpY29uaW1hZ2Vwcm92aWRlci5jcHAKKysrIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xd2ViaWNvbmltYWdlcHJvdmlkZXIuY3Bw CkBAIC0zOSwxMyArMzksMjMgQEAgUVdlYkljb25JbWFnZVByb3ZpZGVyOjp+UVdlYkljb25JbWFn ZVByb3ZpZGVyKCkKIAogUUltYWdlIFFXZWJJY29uSW1hZ2VQcm92aWRlcjo6cmVxdWVzdEltYWdl KGNvbnN0IFFTdHJpbmcmIGlkLCBRU2l6ZSogc2l6ZSwgY29uc3QgUVNpemUmIHJlcXVlc3RlZFNp emUpCiB7Ci0gICAgUmVmUHRyPFF0V2ViQ29udGV4dD4gY29udGV4dCA9IFF0V2ViQ29udGV4dDo6 ZGVmYXVsdENvbnRleHQoKTsKLSAgICBRdFdlYkljb25EYXRhYmFzZUNsaWVudCogaWNvbkRhdGFi YXNlID0gY29udGV4dC0+aWNvbkRhdGFiYXNlKCk7Ci0KICAgICBRU3RyaW5nIGVuY29kZWRJY29u VXJsID0gaWQ7CiAgICAgZW5jb2RlZEljb25VcmwucmVtb3ZlKDAsIGVuY29kZWRJY29uVXJsLmlu ZGV4T2YoJyMnKSArIDEpOwogICAgIFN0cmluZyBwYWdlVVJMID0gUVVybDo6ZnJvbVBlcmNlbnRF bmNvZGluZyhlbmNvZGVkSWNvblVybC50b1V0ZjgoKSk7CiAKKyAgICAvLyBUaGUgc3RyaW5nIGlk ZW50aWZpZXIgaGFzIHRoZSBsZWFkaW5nIGltYWdlOi8vd2ViaWNvbi8gYWxyZWFkeSBzdHJpcHBl ZCwgc28gd2UganVzdAorICAgIC8vIG5lZWQgdG8gdHJ1bmNhdGUgZnJvbSB0aGUgZmlyc3Qgc2xh c2ggdG8gZ2V0IHRoZSBjb250ZXh0IGlkLgorICAgIFFTdHJpbmcgY29udGV4dElEQXNTdHJpbmcg PSBpZDsKKyAgICBjb250ZXh0SURBc1N0cmluZy50cnVuY2F0ZShjb250ZXh0SURBc1N0cmluZy5p bmRleE9mKFFMYXRpbjFDaGFyKCcvJykpKTsKKyAgICBib29sIG9rID0gZmFsc2U7CisgICAgdWlu dDY0X3QgY29udGV4dElkID0gY29udGV4dElEQXNTdHJpbmcudG9VSW50KCZvayk7CisgICAgaWYg KCFvaykKKyAgICAgICAgcmV0dXJuIFFJbWFnZSgpOworICAgIFF0V2ViQ29udGV4dCogY29udGV4 dCA9IFF0V2ViQ29udGV4dDo6Y29udGV4dEJ5SUQoY29udGV4dElkKTsKKyAgICBpZiAoIWNvbnRl eHQpCisgICAgICAgIHJldHVybiBRSW1hZ2UoKTsKKworICAgIFF0V2ViSWNvbkRhdGFiYXNlQ2xp ZW50KiBpY29uRGF0YWJhc2UgPSBjb250ZXh0LT5pY29uRGF0YWJhc2UoKTsKICAgICBRSW1hZ2Ug aWNvbiA9IHJlcXVlc3RlZFNpemUuaXNWYWxpZCgpID8gaWNvbkRhdGFiYXNlLT5pY29uSW1hZ2VG b3JQYWdlVVJMKHBhZ2VVUkwsIHJlcXVlc3RlZFNpemUpIDogaWNvbkRhdGFiYXNlLT5pY29uSW1h Z2VGb3JQYWdlVVJMKHBhZ2VVUkwpOwogICAgIEFTU0VSVCghaWNvbi5pc051bGwoKSk7CiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFdlYkNvbnRleHQuY3BwIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0V2ViQ29udGV4dC5jcHAKaW5kZXggYmMzMjY2 ODczZWZjNjQ2NzRmYWUzNTk3NTAyZjZkYzI3MmYxYmFmNC4uMjlhNTQ3YmE5OGQ4MTE2OGJkNGE5 N2ZlYTVjMzc2ODYwODNhMjcwZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L3F0L1F0V2ViQ29udGV4dC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0 V2ViQ29udGV4dC5jcHAKQEAgLTM0LDE3ICszNCwyOCBAQAogCiBuYW1lc3BhY2UgV2ViS2l0IHsK IAorc3RhdGljIHVpbnQ2NF90IGdlbmVyYXRlQ29udGV4dElEKCkKK3sKKyAgICBzdGF0aWMgdWlu dDY0X3QgdW5pcXVlQ29udGV4dElEID0gMTsKKyAgICByZXR1cm4gdW5pcXVlQ29udGV4dElEKys7 Cit9CisKK3N0YXRpYyBIYXNoTWFwPHVpbnQ2NF90LCBRdFdlYkNvbnRleHQqPiBjb250ZXh0TWFw OworCiBRdFdlYkNvbnRleHQqIFF0V2ViQ29udGV4dDo6c19kZWZhdWx0Q29udGV4dCA9IDA7CiAK IFF0V2ViQ29udGV4dDo6UXRXZWJDb250ZXh0KFdlYkNvbnRleHQqIGNvbnRleHQpCiAgICAgOiBt X2NvbnRleHQoY29udGV4dCkKIHsKKyAgICBtX2NvbnRleHRJRCA9IGdlbmVyYXRlQ29udGV4dElE KCk7CisgICAgY29udGV4dE1hcC5zZXQobV9jb250ZXh0SUQsIHRoaXMpOwogfQogCiBRdFdlYkNv bnRleHQ6On5RdFdlYkNvbnRleHQoKQogewogICAgIGlmIChzX2RlZmF1bHRDb250ZXh0ID09IHRo aXMpCiAgICAgICAgIHNfZGVmYXVsdENvbnRleHQgPSAwOworICAgIGNvbnRleHRNYXAucmVtb3Zl KG1fY29udGV4dElEKTsKIH0KIAogLy8gVXNlZCBvbmx5IGJ5IFdlYktpdFRlc3RSdW5uZXIuIEl0 IGF2b2lkcyBjYWxsaW5nIGluaXRpYWxpemUoKSwgc28gdGhhdCB3ZSBkb24ndCByZWdpc3RlciBh bnkgY2xpZW50cy4KQEAgLTkxLDEwICsxMDIsMTUgQEAgdm9pZCBRdFdlYkNvbnRleHQ6OnBvc3RN ZXNzYWdlVG9OYXZpZ2F0b3JRdE9iamVjdChXZWJQYWdlUHJveHkqIHdlYlBhZ2VQcm94eSwgY28K ICAgICBtX2NvbnRleHQtPnBvc3RNZXNzYWdlVG9JbmplY3RlZEJ1bmRsZShtZXNzYWdlTmFtZSwg Ym9keS5nZXQoKSk7CiB9CiAKK1F0V2ViQ29udGV4dCogUXRXZWJDb250ZXh0Ojpjb250ZXh0QnlJ RCh1aW50NjRfdCBpZCkKK3sKKyAgICByZXR1cm4gY29udGV4dE1hcC5nZXQoaWQpOworfQorCiB2 b2lkIFF0V2ViQ29udGV4dDo6aW5pdGlhbGl6ZSgpCiB7CiAgICAgbV9kb3dubG9hZE1hbmFnZXIg PSBhZG9wdFB0cihuZXcgUXREb3dubG9hZE1hbmFnZXIobV9jb250ZXh0LmdldCgpKSk7Ci0gICAg bV9pY29uRGF0YWJhc2UgPSBhZG9wdFB0cihuZXcgUXRXZWJJY29uRGF0YWJhc2VDbGllbnQobV9j b250ZXh0LmdldCgpKSk7CisgICAgbV9pY29uRGF0YWJhc2UgPSBhZG9wdFB0cihuZXcgUXRXZWJJ Y29uRGF0YWJhc2VDbGllbnQodGhpcykpOwogICAgIGluaXRpYWxpemVDb250ZXh0SW5qZWN0ZWRC dW5kbGVDbGllbnQoKTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L3F0L1F0V2ViQ29udGV4dC5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0V2ViQ29u dGV4dC5oCmluZGV4IGVhYjNkN2M0NzY4ODU5YWZmZmJjZjYyYmFkNmJlMThiM2RhYzZmMDkuLjIw MmRiMjI0MjY5OGJhM2U0YjdhM2M3YzQ5YWI2NDI3MWI1MGRmZTIgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFdlYkNvbnRleHQuaAorKysgYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvcXQvUXRXZWJDb250ZXh0LmgKQEAgLTQ5LDEyICs0OSwxNyBAQCBwdWJsaWM6 CiAKICAgICBQYXNzUmVmUHRyPFdlYlBhZ2VQcm94eT4gY3JlYXRlV2ViUGFnZShQYWdlQ2xpZW50 KiwgV2ViUGFnZUdyb3VwKik7CiAKKyAgICBXZWJDb250ZXh0KiBjb250ZXh0KCkgeyByZXR1cm4g bV9jb250ZXh0LmdldCgpOyB9CiAgICAgUXREb3dubG9hZE1hbmFnZXIqIGRvd25sb2FkTWFuYWdl cigpIHsgcmV0dXJuIG1fZG93bmxvYWRNYW5hZ2VyLmdldCgpOyB9CiAgICAgUXRXZWJJY29uRGF0 YWJhc2VDbGllbnQqIGljb25EYXRhYmFzZSgpIHsgcmV0dXJuIG1faWNvbkRhdGFiYXNlLmdldCgp OyB9CiAKICAgICB2b2lkIHNldE5hdmlnYXRvclF0T2JqZWN0RW5hYmxlZChXZWJQYWdlUHJveHkq LCBib29sKTsKICAgICB2b2lkIHBvc3RNZXNzYWdlVG9OYXZpZ2F0b3JRdE9iamVjdChXZWJQYWdl UHJveHkqLCBjb25zdCBRU3RyaW5nJik7CiAKKyAgICB1aW50NjRfdCBjb250ZXh0SUQoKSBjb25z dCB7IHJldHVybiBtX2NvbnRleHRJRDsgfQorCisgICAgc3RhdGljIFF0V2ViQ29udGV4dCogY29u dGV4dEJ5SUQodWludDY0X3QgaWQpOworCiBwcml2YXRlOgogICAgIGV4cGxpY2l0IFF0V2ViQ29u dGV4dChXZWJDb250ZXh0Kik7CiAKQEAgLTY2LDYgKzcxLDcgQEAgcHJpdmF0ZToKIAogICAgIHN0 YXRpYyBRdFdlYkNvbnRleHQqIHNfZGVmYXVsdENvbnRleHQ7CiAKKyAgICB1aW50NjRfdCBtX2Nv bnRleHRJRDsKICAgICBSZWZQdHI8V2ViQ29udGV4dD4gbV9jb250ZXh0OwogICAgIE93blB0cjxR dERvd25sb2FkTWFuYWdlcj4gbV9kb3dubG9hZE1hbmFnZXI7CiAgICAgT3duUHRyPFF0V2ViSWNv bkRhdGFiYXNlQ2xpZW50PiBtX2ljb25EYXRhYmFzZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9xdC9RdFdlYkljb25EYXRhYmFzZUNsaWVudC5jcHAgYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvcXQvUXRXZWJJY29uRGF0YWJhc2VDbGllbnQuY3BwCmluZGV4IDE3MWU5 NzFiNmE4ZTRmYmQwYjk2ZDkyNGQ0ZDhiNjQxZWUwNmFjODIuLjhiMDliMjBmMzBiYjNiNDExNGYz ODQ2ZjA2MTRiYzRmMDJmZDY1YzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9xdC9RdFdlYkljb25EYXRhYmFzZUNsaWVudC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL3F0L1F0V2ViSWNvbkRhdGFiYXNlQ2xpZW50LmNwcApAQCAtMjIsNiArMjIsNyBAQAog CiAjaW5jbHVkZSAiSW1hZ2UuaCIKICNpbmNsdWRlICJLVVJMLmgiCisjaW5jbHVkZSAiUXRXZWJD b250ZXh0LmgiCiAjaW5jbHVkZSAiU2hhcmVkQnVmZmVyLmgiCiAjaW5jbHVkZSAiV0tVUkxRdC5o IgogI2luY2x1ZGUgIldlYkNvbnRleHQuaCIKQEAgLTM5LDkgKzQwLDExIEBAIHN0YXRpYyBpbmxp bmUgUXRXZWJJY29uRGF0YWJhc2VDbGllbnQqIHRvUXRXZWJJY29uRGF0YWJhc2VDbGllbnQoY29u c3Qgdm9pZCogY2xpCiAgICAgcmV0dXJuIHJlaW50ZXJwcmV0X2Nhc3Q8UXRXZWJJY29uRGF0YWJh c2VDbGllbnQqPihjb25zdF9jYXN0PHZvaWQqPihjbGllbnRJbmZvKSk7CiB9CiAKLVF0V2ViSWNv bkRhdGFiYXNlQ2xpZW50OjpRdFdlYkljb25EYXRhYmFzZUNsaWVudChXZWJDb250ZXh0KiBjb250 ZXh0KQorUXRXZWJJY29uRGF0YWJhc2VDbGllbnQ6OlF0V2ViSWNvbkRhdGFiYXNlQ2xpZW50KFF0 V2ViQ29udGV4dCAqcXRXZWJDb250ZXh0KQogeworICAgIG1fY29udGV4dElkID0gcXRXZWJDb250 ZXh0LT5jb250ZXh0SUQoKTsKICAgICAvLyBUaGUgc2V0dGVyIGNhbGxzIHRoZSBnZXR0ZXIgaGVy ZSBhcyBpdCB0cmlnZ2VycyB0aGUgc3RhcnR1cCBvZiB0aGUgaWNvbiBkYXRhYmFzZS4KKyAgICBX ZWJDb250ZXh0KiBjb250ZXh0ID0gcXRXZWJDb250ZXh0LT5jb250ZXh0KCk7CiAgICAgY29udGV4 dC0+c2V0SWNvbkRhdGFiYXNlUGF0aChjb250ZXh0LT5pY29uRGF0YWJhc2VQYXRoKCkpOwogICAg IG1faWNvbkRhdGFiYXNlID0gY29udGV4dC0+aWNvbkRhdGFiYXNlKCk7CiAKQEAgLTk2LDcgKzk5 LDEyIEBAIHZvaWQgUXRXZWJJY29uRGF0YWJhc2VDbGllbnQ6OnJlcXVlc3RJY29uRm9yUGFnZVVS TChjb25zdCBRVXJsJiBwYWdlVVJMKQogICAgIFFVcmwgdXJsOwogICAgIHVybC5zZXRTY2hlbWUo UVN0cmluZ0xpdGVyYWwoImltYWdlIikpOwogICAgIHVybC5zZXRIb3N0KFFTdHJpbmdMaXRlcmFs KCJ3ZWJpY29uIikpOwotICAgIHVybC5zZXRQYXRoKFFTdHJpbmc6Om51bWJlcihpY29uSUQpLnBy ZXBlbmQoJy8nKSk7CisgICAgUVN0cmluZyBwYXRoOworICAgIHBhdGguYXBwZW5kKFFMYXRpbjFD aGFyKCcvJykpOworICAgIHBhdGguYXBwZW5kKFFTdHJpbmc6Om51bWJlcihtX2NvbnRleHRJZCkp OworICAgIHBhdGguYXBwZW5kKFFMYXRpbjFDaGFyKCcvJykpOworICAgIHBhdGguYXBwZW5kKFFT dHJpbmc6Om51bWJlcihpY29uSUQpKTsKKyAgICB1cmwuc2V0UGF0aChwYXRoKTsKICAgICB1cmwu c2V0RW5jb2RlZEZyYWdtZW50KHBhZ2VVUkwudG9FbmNvZGVkKCkpOwogICAgIGVtaXQgaWNvbkNo YW5nZWRGb3JQYWdlVVJMKHBhZ2VVUkwsIHVybCk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvcXQvUXRXZWJJY29uRGF0YWJhc2VDbGllbnQuaCBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9xdC9RdFdlYkljb25EYXRhYmFzZUNsaWVudC5oCmluZGV4IDJjZDBhOTBl Mzk4ZmIwNDEwZmI5ZDQyOGVlYzRjMTM5MWRlNjhlZWMuLmU4ZDA1NjI0ODgwZjhkZDQ3Y2ZkNjA1 OTIzYTY2ZTdmNWUxZjdmY2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9x dC9RdFdlYkljb25EYXRhYmFzZUNsaWVudC5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9xdC9RdFdlYkljb25EYXRhYmFzZUNsaWVudC5oCkBAIC0zNCwxNCArMzQsMTQgQEAgY2xhc3Mg UVVybDsKIFFUX0VORF9OQU1FU1BBQ0UKIAogbmFtZXNwYWNlIFdlYktpdCB7Ci1jbGFzcyBXZWJD b250ZXh0OworY2xhc3MgUXRXZWJDb250ZXh0OwogY2xhc3MgV2ViSWNvbkRhdGFiYXNlOwogCiBj bGFzcyBRdFdlYkljb25EYXRhYmFzZUNsaWVudCA6IHB1YmxpYyBRT2JqZWN0IHsKICAgICBRX09C SkVDVAogCiBwdWJsaWM6Ci0gICAgUXRXZWJJY29uRGF0YWJhc2VDbGllbnQoV2ViS2l0OjpXZWJD b250ZXh0Kik7CisgICAgUXRXZWJJY29uRGF0YWJhc2VDbGllbnQoUXRXZWJDb250ZXh0Kik7CiAg ICAgflF0V2ViSWNvbkRhdGFiYXNlQ2xpZW50KCk7CiAKICAgICBRSW1hZ2UgaWNvbkltYWdlRm9y UGFnZVVSTChjb25zdCBTdHJpbmcmIHBhZ2VVUkwsIGNvbnN0IFFTaXplJiBpY29uU2l6ZSA9IFFT aXplKDMyLCAzMikpOwpAQCAtNTcsNiArNTcsNyBAQCBwdWJsaWM6CiBwcml2YXRlOgogICAgIHVu c2lnbmVkIGljb25VUkxIYXNoRm9yUGFnZVVSTChjb25zdCBTdHJpbmcmKTsKICAgICBzdGF0aWMg dm9pZCBkaWRDaGFuZ2VJY29uRm9yUGFnZVVSTChXS0ljb25EYXRhYmFzZVJlZiwgV0tVUkxSZWYg cGFnZVVSTCwgY29uc3Qgdm9pZCogY2xpZW50SW5mbyk7CisgICAgdWludDY0X3QgbV9jb250ZXh0 SWQ7CiAgICAgV2ViS2l0OjpXZWJJY29uRGF0YWJhc2UqIG1faWNvbkRhdGFiYXNlOwogICAgIE11 dGV4IG1faW1hZ2VMb2NrOwogfTsK