112080 2013-03-11 16:55:42 -0700 FrameLoader::didChangeIcons isn't called when the favicon is changed. 2013-03-19 18:12:03 -0700 1 1 1 Unclassified WebKit DOM 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 112614 112647 1 levin levin beidson buildbot esprehn+autocc groby ojan.autocc petewil rniwa stevenjb webkit.review.bot oldest_to_newest 852884 0 levin 2013-03-11 16:55:42 -0700 In Document::addIconURL, the check against iconURL fails. IconURL iconURL = f->loader()->icon()->iconURL(iconType); if (iconURL == newURL) This is because IconController::iconURL as of http://trac.webkit.org/changeset/122806 returns the least favored favicon as opposed to the most favored. A simple fix is the change the if in IconController::iconURL from if (result.m_iconURL.isEmpty() || !iter->m_mimeType.isEmpty()) to if (result.m_iconURL.isEmpty() || (result->m_mimeType.isEmpty() && !iter->m_mimeType.isEmpty()) { so that the result is only set if it is empty or if it can be updated to have a mimeType when it doesn't already have one. Related: As of r122806, caching m_iconURLs doesn't really do anything, so we should consider removing it (but that may take more work because it is returned by reference at the moment). 854577 1 levin 2013-03-13 13:34:56 -0700 It turns out that it is hard for webkit to determine what favicon will be used by the host so the filtering "if (iconURL == newURL)" ideally wouldn't be done at all and the host would have to figure out if the event is relevant or not. Of course, it may not be ideal to send a bunch of events if there is a batch of favicon being processed so that should likely be coalesced into one notification. 858758 2 193928 levin 2013-03-19 14:46:46 -0700 Created attachment 193928 Patch 858830 3 193928 buildbot 2013-03-19 15:56:01 -0700 Comment on attachment 193928 Patch Attachment 193928 did not pass mac-wk2-ews (mac-wk2): Output: http://webkit-commit-queue.appspot.com/results/17252116 858875 4 193951 levin 2013-03-19 16:54:09 -0700 Created attachment 193951 Patch 858936 5 193951 webkit.review.bot 2013-03-19 18:12:00 -0700 Comment on attachment 193951 Patch Clearing flags on attachment: 193951 Committed r146284: <http://trac.webkit.org/changeset/146284> 858937 6 webkit.review.bot 2013-03-19 18:12:03 -0700 All reviewed patches have been landed. Closing bug. 193928 2013-03-19 14:46:46 -0700 2013-03-19 16:54:06 -0700 Patch bug-112080-20130319144236.patch text/plain 5106 levin U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ2MTg5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTVkNTIxZmIwMDliOTNi MDdiZjdlMjNiYTNkZWQzNDYwYjM1NDA0Ny4uNmQ5YjcyYzE0MWViMDg1Y2VkMGY5NGRlYjJlNDdl NzA2NGM0YzhlOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEzLTAzLTE5ICBEYXZp ZCBMZXZpbiAgPGxldmluQGNocm9taXVtLm9yZz4KKworICAgICAgICBGcmFtZUxvYWRlcjo6ZGlk Q2hhbmdlSWNvbnMgaXNuJ3QgY2FsbGVkIHdoZW4gdGhlIGZhdmljb24gaXMgY2hhbmdlZC4KKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMjA4MAorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRlc3Q6IGZhc3Qv ZG9tL2ljb24tdXJsLXByb3BlcnR5Lmh0bWwKKworICAgICAgICAqIGRvbS9Eb2N1bWVudC5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudDo6YWRkSWNvblVSTCk6IE1hZGUgdGhlIGNhbGxi YWNrIGZvciBkaWRDaGFuZ2VJY29ucworICAgICAgICBoYXBwZW4gd2hlbmV2ZXIgdGhlcmUgYXJl IGZhdmljb24gY2hhbmdlcyBpbnN0ZWFkIG9mIGZpbHRlcmluZyBpdAorICAgICAgICBhbmQgaGF2 ZSB0byBiZSBpbiBzeW5jIGFib3V0IHdoYXQgaG9zdHMgY2FyZSBhYm91dC4gQXMgZmFyIGFzIEkg Y291bGQKKyAgICAgICAgdGVsbCBubyBob3N0cyByZWx5IG9uIHRoaXMgY2FsbGJhY2sgZXhjZXB0 IGZvciBDaHJvbWl1bSwgc28gaW4gZ2VuZXJhbAorICAgICAgICBkb2luZyBsZXNzIHdvcmsgaGVy ZSBtYXkgcG90ZW50aWFsbHkgaGVscCBhIHNtYWxsIGFtb3VudCBmb3Igb3RoZXIKKyAgICAgICAg cG9ydHMuCisKIDIwMTMtMDMtMTkgIEFuZHJleSBMdXNobmlrb3YgIDxsdXNobmlrb3ZAY2hyb21p dW0ub3JnPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IFtDb2RlTWlycm9yXSBhZGQgc21hcnQg YnJhY2VzIGZ1bmN0aW9uYWxpdHkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1 bWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCmluZGV4IDBmN2UyY2Q1 ODgyYTIxOWI3ZGRlZjUwMWQ4MjUyOTMzZWNjNDA1OWUuLjM1YmNkMjYxNzFiMzFkYTBkZjFiZmU1 MTVhNGIzYWIwNjcyMjBkNjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVu dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcApAQCAtNDU4OCwxNCAr NDU4OCwxMSBAQCB2b2lkIERvY3VtZW50OjphZGRJY29uVVJMKGNvbnN0IFN0cmluZyYgdXJsLCBj b25zdCBTdHJpbmcmIG1pbWVUeXBlLCBjb25zdCBTdHJpbgogICAgIGlmICh1cmwuaXNFbXB0eSgp KQogICAgICAgICByZXR1cm47CiAKLSAgICAvLyBGSVhNRSAtIDxyZGFyOi8vcHJvYmxlbS80NzI3 NjQ1PiAtIEF0IHNvbWUgcG9pbnQgaW4gdGhlIGZ1dHVyZSwgd2UgbWlnaHQgYWN0dWFsbHkgaG9u b3IgdGhlICJtaW1lVHlwZSIKLSAgICBJY29uVVJMIG5ld1VSTChLVVJMKFBhcnNlZFVSTFN0cmlu ZywgdXJsKSwgc2l6ZXMsIG1pbWVUeXBlLCBpY29uVHlwZSk7CisgICAgRnJhbWUqIGYgPSBmcmFt ZSgpOworICAgIGlmICghZikKKyAgICAgICAgcmV0dXJuOwogCi0gICAgaWYgKEZyYW1lKiBmID0g ZnJhbWUoKSkgewotICAgICAgICBJY29uVVJMIGljb25VUkwgPSBmLT5sb2FkZXIoKS0+aWNvbigp LT5pY29uVVJMKGljb25UeXBlKTsKLSAgICAgICAgaWYgKGljb25VUkwgPT0gbmV3VVJMKQotICAg ICAgICAgICAgZi0+bG9hZGVyKCktPmRpZENoYW5nZUljb25zKGljb25UeXBlKTsKLSAgICB9Cisg ICAgZi0+bG9hZGVyKCktPmRpZENoYW5nZUljb25zKGljb25UeXBlKTsKIH0KIAogdm9pZCBEb2N1 bWVudDo6c2V0VXNlU2VjdXJlS2V5Ym9hcmRFbnRyeVdoZW5BY3RpdmUoYm9vbCB1c2VzU2VjdXJl S2V5Ym9hcmQpCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKaW5kZXggOTljNDAyZTE2ZTY0NWMwNTdhNDU3NGM5MTNlMGE0OGEzZGJiYzNm Yy4uZjlkYWM3NWNkMjJkMTExOGU0ZWEzYmUwZDkxOWJmN2ZmNGVjMmU0OCAxMDA2NDQKLS0tIGEv TGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwz ICsxLDE0IEBACisyMDEzLTAzLTE5ICBEYXZpZCBMZXZpbiAgPGxldmluQGNocm9taXVtLm9yZz4K KworICAgICAgICBGcmFtZUxvYWRlcjo6ZGlkQ2hhbmdlSWNvbnMgaXNuJ3QgY2FsbGVkIHdoZW4g dGhlIGZhdmljb24gaXMgY2hhbmdlZC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTExMjA4MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgICogZmFzdC9kb20vaWNvbi11cmwtcHJvcGVydHktZXhwZWN0ZWQudHh0 OgorICAgICAgICAqIGZhc3QvZG9tL2ljb24tdXJsLXByb3BlcnR5Lmh0bWw6IEFkZCBzb21lIG1v cmUgY2FsbHMKKyAgICAgICAgdG8gdHJpZ2dlciBkaWRDaGFuZ2VJY29ucyBjYWxsYmFja3MuCisK IDIwMTMtMDMtMTkgIEdyemVnb3J6IEN6YWprb3dza2kgIDxnLmN6YWprb3dza2lAc2Ftc3VuZy5j b20+CiAKICAgICAgICAgVW5yZXZpZXdlZCBFRkwgZ2FyZGVuaW5nLgpkaWZmIC0tZ2l0IGEvTGF5 b3V0VGVzdHMvZmFzdC9kb20vaWNvbi11cmwtcHJvcGVydHktZXhwZWN0ZWQudHh0IGIvTGF5b3V0 VGVzdHMvZmFzdC9kb20vaWNvbi11cmwtcHJvcGVydHktZXhwZWN0ZWQudHh0CmluZGV4IDU1ZjRl NGRkYzRjNjBjZDdlZGM1MmM4YTg2NWVjNDA0N2M4MzVkOGYuLjkwZTg2NGNmNmIzYjA3YmNlZjRl MTkwZDcwMzAzYjY2OWVjYTE4NWEgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2Zhc3QvZG9tL2lj b24tdXJsLXByb3BlcnR5LWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2RvbS9p Y29uLXVybC1wcm9wZXJ0eS1leHBlY3RlZC50eHQKQEAgLTEsNCArMSw2IEBACiBtYWluIGZyYW1l IC0gZGlkQ2hhbmdlSWNvbnMKK21haW4gZnJhbWUgLSBkaWRDaGFuZ2VJY29ucworbWFpbiBmcmFt ZSAtIGRpZENoYW5nZUljb25zCiBPcmlnaW5hbCBpY29uVVJMIGlzOiBodHRwOi8vdGVzdC5jb20v b2xkZmF2aWNvbi5pY28KIFNldHRpbmcgbmV3IGljb24gVVJMIHRvOiBodHRwOi8vdGVzdC5jb20v bmV3ZmF2aWNvbi5pY28KIE5ldyBpY29uVVJMIGlzOiBodHRwOi8vdGVzdC5jb20vbmV3ZmF2aWNv bi5pY28KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvZG9tL2ljb24tdXJsLXByb3BlcnR5 Lmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2RvbS9pY29uLXVybC1wcm9wZXJ0eS5odG1sCmluZGV4 IDg3ZWZjYmQ4ZGVhZDI2OTAyOWE0MWM2NTc5YzAzMzM4MzcxOGQyMTEuLmZmNzE3MTJlOTNhMTBl OTMzNjkyMmQxNTUxZjc5NjEyYWFhOTk3ZDEgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2Zhc3Qv ZG9tL2ljb24tdXJsLXByb3BlcnR5Lmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9kb20vaWNv bi11cmwtcHJvcGVydHkuaHRtbApAQCAtMTEsOCArMTEsMjAgQEAgZnVuY3Rpb24gZGVidWdPdXRw dXQoc3RyKSB7CiAgICAgZGVidWdEaXYuYXBwZW5kQ2hpbGQoZGl2KTsKIH0KIAorZnVuY3Rpb24g Y3JlYXRlRmF2SWNvbkVsZW1lbnQoaWNvblVSTCkgeworICAgIHZhciBsaW5rID0gZG9jdW1lbnQu Y3JlYXRlRWxlbWVudCgibGluayIpOworICAgIGxpbmsudHlwZSA9ICJpbWFnZS94LWljb24iOwor ICAgIGxpbmsucmVsID0gInNob3J0Y3V0IGljb24iOworICAgIGxpbmsuaHJlZiA9IGljb25VUkw7 CisgICAgcmV0dXJuIGxpbms7Cit9CisKK2Z1bmN0aW9uIGdldEhlYWRFbGVtZW50KCkgeworICAg IHJldHVybiBkb2N1bWVudC5nZXRFbGVtZW50c0J5VGFnTmFtZSgiaGVhZCIpWzBdOworfQorCiBm dW5jdGlvbiBzZXRGYXZJY29uKGljb25VUkwpIHsKLSAgICB2YXIgZG9jSGVhZCA9IGRvY3VtZW50 LmdldEVsZW1lbnRzQnlUYWdOYW1lKCJoZWFkIilbMF07CisgICAgdmFyIGRvY0hlYWQgPSBnZXRI ZWFkRWxlbWVudCgpOwogICAgIHZhciBsaW5rcyA9IGRvY0hlYWQuZ2V0RWxlbWVudHNCeVRhZ05h bWUoImxpbmsiKTsKICAgICBmb3IgKHZhciBpID0gMDsgaSA8IGxpbmtzLmxlbmd0aDsgKytpKSB7 CiAgICAgICB2YXIgbGluayA9IGxpbmtzW2ldOwpAQCAtMjEsMTEgKzMzLDcgQEAgZnVuY3Rpb24g c2V0RmF2SWNvbihpY29uVVJMKSB7CiAgICAgICAgIGJyZWFrOyAvLyBBc3N1bWluZyBvbmx5IG9u ZSBtYXRjaCBhdCBtb3N0LgogICAgICAgfQogICAgIH0KLSAgICB2YXIgbGluayA9IGRvY3VtZW50 LmNyZWF0ZUVsZW1lbnQoImxpbmsiKTsKLSAgICBsaW5rLnR5cGUgPSAiaW1hZ2UveC1pY29uIjsK LSAgICBsaW5rLnJlbCA9ICJzaG9ydGN1dCBpY29uIjsKLSAgICBsaW5rLmhyZWYgPSBpY29uVVJM OwotICAgIGRvY0hlYWQuYXBwZW5kQ2hpbGQobGluayk7CisgICAgZG9jSGVhZC5hcHBlbmRDaGls ZChjcmVhdGVGYXZJY29uRWxlbWVudChpY29uVVJMKSk7CiB9CiAKIGZ1bmN0aW9uIHJ1blRlc3Rz KCkgewpAQCAtNTIsNiArNjAsMTAgQEAgZnVuY3Rpb24gcnVuVGVzdHMoKSB7CiAgICAgZWxzZQog ICAgICAgICBkZWJ1Z091dHB1dCgnRkFJTCAtIFVSTCBsaXN0IGRvZXMgbm90IG1hdGNoIGV4cGVj dGVkJyk7CiAKKyAgICAvLyBBZGQgc29tZSBtb3JlIGZhdiBpY29ucyB0byB2ZXJpZnkgdGhhdCBk aWRDaGFuZ2VJY29ucyBnZXRzIGNhbGxlZC4KKyAgICB2YXIgZG9jSGVhZCA9IGdldEhlYWRFbGVt ZW50KCk7CisgICAgZG9jSGVhZC5pbnNlcnRCZWZvcmUoY3JlYXRlRmF2SWNvbkVsZW1lbnQoImh0 dHA6Ly9leGFtcGxlLm9yZy9pY29uMS5pY28iKSwgZG9jSGVhZC5maXJzdENoaWxkKTsKKyAgICBk b2NIZWFkLmFwcGVuZENoaWxkKGNyZWF0ZUZhdkljb25FbGVtZW50KCJodHRwOi8vZXhhbXBsZS5v cmcvaWNvbjIuaWNvIikpOwogfQogCiA8L3NjcmlwdD4K 193951 2013-03-19 16:54:09 -0700 2013-03-19 18:12:00 -0700 Patch bug-112080-20130319164959.patch text/plain 5323 levin U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ2MTg5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTVkNTIxZmIwMDliOTNi MDdiZjdlMjNiYTNkZWQzNDYwYjM1NDA0Ny4uNmQ5YjcyYzE0MWViMDg1Y2VkMGY5NGRlYjJlNDdl NzA2NGM0YzhlOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEzLTAzLTE5ICBEYXZp ZCBMZXZpbiAgPGxldmluQGNocm9taXVtLm9yZz4KKworICAgICAgICBGcmFtZUxvYWRlcjo6ZGlk Q2hhbmdlSWNvbnMgaXNuJ3QgY2FsbGVkIHdoZW4gdGhlIGZhdmljb24gaXMgY2hhbmdlZC4KKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMjA4MAorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRlc3Q6IGZhc3Qv ZG9tL2ljb24tdXJsLXByb3BlcnR5Lmh0bWwKKworICAgICAgICAqIGRvbS9Eb2N1bWVudC5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudDo6YWRkSWNvblVSTCk6IE1hZGUgdGhlIGNhbGxi YWNrIGZvciBkaWRDaGFuZ2VJY29ucworICAgICAgICBoYXBwZW4gd2hlbmV2ZXIgdGhlcmUgYXJl IGZhdmljb24gY2hhbmdlcyBpbnN0ZWFkIG9mIGZpbHRlcmluZyBpdAorICAgICAgICBhbmQgaGF2 ZSB0byBiZSBpbiBzeW5jIGFib3V0IHdoYXQgaG9zdHMgY2FyZSBhYm91dC4gQXMgZmFyIGFzIEkg Y291bGQKKyAgICAgICAgdGVsbCBubyBob3N0cyByZWx5IG9uIHRoaXMgY2FsbGJhY2sgZXhjZXB0 IGZvciBDaHJvbWl1bSwgc28gaW4gZ2VuZXJhbAorICAgICAgICBkb2luZyBsZXNzIHdvcmsgaGVy ZSBtYXkgcG90ZW50aWFsbHkgaGVscCBhIHNtYWxsIGFtb3VudCBmb3Igb3RoZXIKKyAgICAgICAg cG9ydHMuCisKIDIwMTMtMDMtMTkgIEFuZHJleSBMdXNobmlrb3YgIDxsdXNobmlrb3ZAY2hyb21p dW0ub3JnPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IFtDb2RlTWlycm9yXSBhZGQgc21hcnQg YnJhY2VzIGZ1bmN0aW9uYWxpdHkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1 bWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCmluZGV4IDBmN2UyY2Q1 ODgyYTIxOWI3ZGRlZjUwMWQ4MjUyOTMzZWNjNDA1OWUuLmE0Y2ZhMTM3N2YyNWRmYmE3MzVkMTE5 ZTZhOTFkNDg1ZjM2MWYxMjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVu dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcApAQCAtNDU4MywxOSAr NDU4MywxNiBAQCBjb25zdCBWZWN0b3I8SWNvblVSTD4mIERvY3VtZW50OjppY29uVVJMcyhpbnQg aWNvblR5cGVzTWFzaykKICAgICByZXR1cm4gbV9pY29uVVJMczsKIH0KIAotdm9pZCBEb2N1bWVu dDo6YWRkSWNvblVSTChjb25zdCBTdHJpbmcmIHVybCwgY29uc3QgU3RyaW5nJiBtaW1lVHlwZSwg Y29uc3QgU3RyaW5nJiBzaXplcywgSWNvblR5cGUgaWNvblR5cGUpCit2b2lkIERvY3VtZW50Ojph ZGRJY29uVVJMKGNvbnN0IFN0cmluZyYgdXJsLCBjb25zdCBTdHJpbmcmLCBjb25zdCBTdHJpbmcm LCBJY29uVHlwZSBpY29uVHlwZSkKIHsKICAgICBpZiAodXJsLmlzRW1wdHkoKSkKICAgICAgICAg cmV0dXJuOwogCi0gICAgLy8gRklYTUUgLSA8cmRhcjovL3Byb2JsZW0vNDcyNzY0NT4gLSBBdCBz b21lIHBvaW50IGluIHRoZSBmdXR1cmUsIHdlIG1pZ2h0IGFjdHVhbGx5IGhvbm9yIHRoZSAibWlt ZVR5cGUiCi0gICAgSWNvblVSTCBuZXdVUkwoS1VSTChQYXJzZWRVUkxTdHJpbmcsIHVybCksIHNp emVzLCBtaW1lVHlwZSwgaWNvblR5cGUpOworICAgIEZyYW1lKiBmID0gZnJhbWUoKTsKKyAgICBp ZiAoIWYpCisgICAgICAgIHJldHVybjsKIAotICAgIGlmIChGcmFtZSogZiA9IGZyYW1lKCkpIHsK LSAgICAgICAgSWNvblVSTCBpY29uVVJMID0gZi0+bG9hZGVyKCktPmljb24oKS0+aWNvblVSTChp Y29uVHlwZSk7Ci0gICAgICAgIGlmIChpY29uVVJMID09IG5ld1VSTCkKLSAgICAgICAgICAgIGYt PmxvYWRlcigpLT5kaWRDaGFuZ2VJY29ucyhpY29uVHlwZSk7Ci0gICAgfQorICAgIGYtPmxvYWRl cigpLT5kaWRDaGFuZ2VJY29ucyhpY29uVHlwZSk7CiB9CiAKIHZvaWQgRG9jdW1lbnQ6OnNldFVz ZVNlY3VyZUtleWJvYXJkRW50cnlXaGVuQWN0aXZlKGJvb2wgdXNlc1NlY3VyZUtleWJvYXJkKQpk aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9n CmluZGV4IDk5YzQwMmUxNmU2NDVjMDU3YTQ1NzRjOTEzZTBhNDhhM2RiYmMzZmMuLmY5ZGFjNzVj ZDIyZDExMThlNGVhM2JlMGQ5MTliZjdmZjRlYzJlNDggMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz L0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAor MjAxMy0wMy0xOSAgRGF2aWQgTGV2aW4gIDxsZXZpbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAg RnJhbWVMb2FkZXI6OmRpZENoYW5nZUljb25zIGlzbid0IGNhbGxlZCB3aGVuIHRoZSBmYXZpY29u IGlzIGNoYW5nZWQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xMTIwODAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIGZhc3QvZG9tL2ljb24tdXJsLXByb3BlcnR5LWV4cGVjdGVkLnR4dDoKKyAgICAgICAg KiBmYXN0L2RvbS9pY29uLXVybC1wcm9wZXJ0eS5odG1sOiBBZGQgc29tZSBtb3JlIGNhbGxzCisg ICAgICAgIHRvIHRyaWdnZXIgZGlkQ2hhbmdlSWNvbnMgY2FsbGJhY2tzLgorCiAyMDEzLTAzLTE5 ICBHcnplZ29yeiBDemFqa293c2tpICA8Zy5jemFqa293c2tpQHNhbXN1bmcuY29tPgogCiAgICAg ICAgIFVucmV2aWV3ZWQgRUZMIGdhcmRlbmluZy4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zh c3QvZG9tL2ljb24tdXJsLXByb3BlcnR5LWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2Zhc3Qv ZG9tL2ljb24tdXJsLXByb3BlcnR5LWV4cGVjdGVkLnR4dAppbmRleCA1NWY0ZTRkZGM0YzYwY2Q3 ZWRjNTJjOGE4NjVlYzQwNDdjODM1ZDhmLi45MGU4NjRjZjZiM2IwN2JjZWY0ZTE5MGQ3MDMwM2I2 NjllY2ExODVhIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9mYXN0L2RvbS9pY29uLXVybC1wcm9w ZXJ0eS1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9kb20vaWNvbi11cmwtcHJv cGVydHktZXhwZWN0ZWQudHh0CkBAIC0xLDQgKzEsNiBAQAogbWFpbiBmcmFtZSAtIGRpZENoYW5n ZUljb25zCittYWluIGZyYW1lIC0gZGlkQ2hhbmdlSWNvbnMKK21haW4gZnJhbWUgLSBkaWRDaGFu Z2VJY29ucwogT3JpZ2luYWwgaWNvblVSTCBpczogaHR0cDovL3Rlc3QuY29tL29sZGZhdmljb24u aWNvCiBTZXR0aW5nIG5ldyBpY29uIFVSTCB0bzogaHR0cDovL3Rlc3QuY29tL25ld2Zhdmljb24u aWNvCiBOZXcgaWNvblVSTCBpczogaHR0cDovL3Rlc3QuY29tL25ld2Zhdmljb24uaWNvCmRpZmYg LS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2RvbS9pY29uLXVybC1wcm9wZXJ0eS5odG1sIGIvTGF5 b3V0VGVzdHMvZmFzdC9kb20vaWNvbi11cmwtcHJvcGVydHkuaHRtbAppbmRleCA4N2VmY2JkOGRl YWQyNjkwMjlhNDFjNjU3OWMwMzMzODM3MThkMjExLi5mZjcxNzEyZTkzYTEwZTkzMzY5MjJkMTU1 MWY3OTYxMmFhYTk5N2QxIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9mYXN0L2RvbS9pY29uLXVy bC1wcm9wZXJ0eS5odG1sCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvZG9tL2ljb24tdXJsLXByb3Bl cnR5Lmh0bWwKQEAgLTExLDggKzExLDIwIEBAIGZ1bmN0aW9uIGRlYnVnT3V0cHV0KHN0cikgewog ICAgIGRlYnVnRGl2LmFwcGVuZENoaWxkKGRpdik7CiB9CiAKK2Z1bmN0aW9uIGNyZWF0ZUZhdklj b25FbGVtZW50KGljb25VUkwpIHsKKyAgICB2YXIgbGluayA9IGRvY3VtZW50LmNyZWF0ZUVsZW1l bnQoImxpbmsiKTsKKyAgICBsaW5rLnR5cGUgPSAiaW1hZ2UveC1pY29uIjsKKyAgICBsaW5rLnJl bCA9ICJzaG9ydGN1dCBpY29uIjsKKyAgICBsaW5rLmhyZWYgPSBpY29uVVJMOworICAgIHJldHVy biBsaW5rOworfQorCitmdW5jdGlvbiBnZXRIZWFkRWxlbWVudCgpIHsKKyAgICByZXR1cm4gZG9j dW1lbnQuZ2V0RWxlbWVudHNCeVRhZ05hbWUoImhlYWQiKVswXTsKK30KKwogZnVuY3Rpb24gc2V0 RmF2SWNvbihpY29uVVJMKSB7Ci0gICAgdmFyIGRvY0hlYWQgPSBkb2N1bWVudC5nZXRFbGVtZW50 c0J5VGFnTmFtZSgiaGVhZCIpWzBdOworICAgIHZhciBkb2NIZWFkID0gZ2V0SGVhZEVsZW1lbnQo KTsKICAgICB2YXIgbGlua3MgPSBkb2NIZWFkLmdldEVsZW1lbnRzQnlUYWdOYW1lKCJsaW5rIik7 CiAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBsaW5rcy5sZW5ndGg7ICsraSkgewogICAgICAgdmFy IGxpbmsgPSBsaW5rc1tpXTsKQEAgLTIxLDExICszMyw3IEBAIGZ1bmN0aW9uIHNldEZhdkljb24o aWNvblVSTCkgewogICAgICAgICBicmVhazsgLy8gQXNzdW1pbmcgb25seSBvbmUgbWF0Y2ggYXQg bW9zdC4KICAgICAgIH0KICAgICB9Ci0gICAgdmFyIGxpbmsgPSBkb2N1bWVudC5jcmVhdGVFbGVt ZW50KCJsaW5rIik7Ci0gICAgbGluay50eXBlID0gImltYWdlL3gtaWNvbiI7Ci0gICAgbGluay5y ZWwgPSAic2hvcnRjdXQgaWNvbiI7Ci0gICAgbGluay5ocmVmID0gaWNvblVSTDsKLSAgICBkb2NI ZWFkLmFwcGVuZENoaWxkKGxpbmspOworICAgIGRvY0hlYWQuYXBwZW5kQ2hpbGQoY3JlYXRlRmF2 SWNvbkVsZW1lbnQoaWNvblVSTCkpOwogfQogCiBmdW5jdGlvbiBydW5UZXN0cygpIHsKQEAgLTUy LDYgKzYwLDEwIEBAIGZ1bmN0aW9uIHJ1blRlc3RzKCkgewogICAgIGVsc2UKICAgICAgICAgZGVi dWdPdXRwdXQoJ0ZBSUwgLSBVUkwgbGlzdCBkb2VzIG5vdCBtYXRjaCBleHBlY3RlZCcpOwogCisg ICAgLy8gQWRkIHNvbWUgbW9yZSBmYXYgaWNvbnMgdG8gdmVyaWZ5IHRoYXQgZGlkQ2hhbmdlSWNv bnMgZ2V0cyBjYWxsZWQuCisgICAgdmFyIGRvY0hlYWQgPSBnZXRIZWFkRWxlbWVudCgpOworICAg IGRvY0hlYWQuaW5zZXJ0QmVmb3JlKGNyZWF0ZUZhdkljb25FbGVtZW50KCJodHRwOi8vZXhhbXBs ZS5vcmcvaWNvbjEuaWNvIiksIGRvY0hlYWQuZmlyc3RDaGlsZCk7CisgICAgZG9jSGVhZC5hcHBl bmRDaGlsZChjcmVhdGVGYXZJY29uRWxlbWVudCgiaHR0cDovL2V4YW1wbGUub3JnL2ljb24yLmlj byIpKTsKIH0KIAogPC9zY3JpcHQ+Cg==