137768 2014-10-15 20:54:59 -0700 Use is<>() / downcast<>() for ContentData subclasses 2014-10-16 17:36:04 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 137424 1 cdumez cdumez benjamin commit-queue darin kling mihnea rniwa oldest_to_newest 1042059 0 cdumez 2014-10-15 20:54:59 -0700 Use is<>() / downcast<>() for ContentData subclasses. 1042062 1 239926 cdumez 2014-10-15 21:03:54 -0700 Created attachment 239926 Patch 1042253 2 239926 commit-queue 2014-10-16 17:35:59 -0700 Comment on attachment 239926 Patch Clearing flags on attachment: 239926 Committed r174801: <http://trac.webkit.org/changeset/174801> 1042254 3 commit-queue 2014-10-16 17:36:04 -0700 All reviewed patches have been landed. Closing bug. 239926 2014-10-15 21:03:54 -0700 2014-10-16 17:35:59 -0700 Patch bug-137768-20141015210358.patch text/plain 9820 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMTc0NzU1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTM4ZmIyZjk5NjJlZTUx MjA3OTFmMDFlZGJmMjQwMzI3MDc5YWJkMi4uODc4OWUzZmNjNDc1NmY0MTk5NmI0MTVhOWFhZGJi NjFhNmE4YjliMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI3IEBACiAyMDE0LTEwLTE1ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKKyAgICAgICAgVXNlIGlzPD4oKSAvIGRvd25j YXN0PD4oKSBmb3IgQ29udGVudERhdGEgc3ViY2xhc3NlcworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM3NzY4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVXNlIGlzPD4oKSAvIGRvd25jYXN0PD4oKSBmb3Ig Q29udGVudERhdGEgc3ViY2xhc3Nlcy4KKworICAgICAgICBObyBuZXcgdGVzdHMsIG5vIGJlaGF2 aW9yIGNoYW5nZS4KKworICAgICAgICAqIGNzcy9DU1NDb21wdXRlZFN0eWxlRGVjbGFyYXRpb24u Y3BwOgorICAgICAgICAoV2ViQ29yZTo6Y29udGVudFRvQ1NTVmFsdWUpOgorICAgICAgICAqIGNz cy9TdHlsZVJlc29sdmVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlUmVzb2x2ZXI6Omxv YWRQZW5kaW5nSW1hZ2VzKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyRWxlbWVudC5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJFbGVtZW50OjpjcmVhdGVGb3IpOgorICAgICAgICAq IHJlbmRlcmluZy9zdHlsZS9Db250ZW50RGF0YS5oOgorICAgICAgICAoV2ViQ29yZTo6b3BlcmF0 b3I9PSk6CisgICAgICAgICogcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OlJlbmRlclN0eWxlOjpzZXRDb250ZW50KToKKworMjAxNC0xMC0xNSAgQ2hy aXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgorCiAgICAgICAgIFtNYWNdIEZpeCBpbmVmZmlj aWVuY2llcyBpbiBSZXNvdXJjZVJlc3BvbnNlOjpwbGF0Zm9ybUxhenlJbml0KEluaXRMZXZlbCkg LSBQYXJ0IDIKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTEzNzcyMQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTQ29tcHV0ZWRTdHls ZURlY2xhcmF0aW9uLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NDb21wdXRlZFN0eWxlRGVj bGFyYXRpb24uY3BwCmluZGV4IGIxYjg4OGNjZGE3MmNjNTY5MmZhMDZhYjBhNTM2OWVlZDFlY2Fj MGUuLjRkM2M2ZDBhMjY0MThjZDc4N2YwODU5NGU3ZDRhYmUzYzFhZTVjZTcgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NDb21wdXRlZFN0eWxlRGVjbGFyYXRpb24uY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NDb21wdXRlZFN0eWxlRGVjbGFyYXRpb24uY3BwCkBAIC0x NDYyLDEyICsxNDYyLDEyIEBAIHN0YXRpYyBQYXNzUmVmPENTU1ZhbHVlTGlzdD4gY29udGVudFRv Q1NTVmFsdWUoY29uc3QgUmVuZGVyU3R5bGUqIHN0eWxlKQogewogICAgIGF1dG8gbGlzdCA9IENT U1ZhbHVlTGlzdDo6Y3JlYXRlU3BhY2VTZXBhcmF0ZWQoKTsKICAgICBmb3IgKGNvbnN0IENvbnRl bnREYXRhKiBjb250ZW50RGF0YSA9IHN0eWxlLT5jb250ZW50RGF0YSgpOyBjb250ZW50RGF0YTsg Y29udGVudERhdGEgPSBjb250ZW50RGF0YS0+bmV4dCgpKSB7Ci0gICAgICAgIGlmIChjb250ZW50 RGF0YS0+aXNDb3VudGVyKCkpCi0gICAgICAgICAgICBsaXN0LmdldCgpLmFwcGVuZChjc3NWYWx1 ZVBvb2woKS5jcmVhdGVWYWx1ZSh0b0NvdW50ZXJDb250ZW50RGF0YShjb250ZW50RGF0YSktPmNv dW50ZXIoKS5pZGVudGlmaWVyKCksIENTU1ByaW1pdGl2ZVZhbHVlOjpDU1NfQ09VTlRFUl9OQU1F KSk7Ci0gICAgICAgIGVsc2UgaWYgKGNvbnRlbnREYXRhLT5pc0ltYWdlKCkpCi0gICAgICAgICAg ICBsaXN0LmdldCgpLmFwcGVuZCgqdG9JbWFnZUNvbnRlbnREYXRhKGNvbnRlbnREYXRhKS0+aW1h Z2UoKS5jc3NWYWx1ZSgpKTsKLSAgICAgICAgZWxzZSBpZiAoY29udGVudERhdGEtPmlzVGV4dCgp KQotICAgICAgICAgICAgbGlzdC5nZXQoKS5hcHBlbmQoY3NzVmFsdWVQb29sKCkuY3JlYXRlVmFs dWUodG9UZXh0Q29udGVudERhdGEoY29udGVudERhdGEpLT50ZXh0KCksIENTU1ByaW1pdGl2ZVZh bHVlOjpDU1NfU1RSSU5HKSk7CisgICAgICAgIGlmIChpczxDb3VudGVyQ29udGVudERhdGE+KCpj b250ZW50RGF0YSkpCisgICAgICAgICAgICBsaXN0LmdldCgpLmFwcGVuZChjc3NWYWx1ZVBvb2wo KS5jcmVhdGVWYWx1ZShkb3duY2FzdDxDb3VudGVyQ29udGVudERhdGE+KCpjb250ZW50RGF0YSku Y291bnRlcigpLmlkZW50aWZpZXIoKSwgQ1NTUHJpbWl0aXZlVmFsdWU6OkNTU19DT1VOVEVSX05B TUUpKTsKKyAgICAgICAgZWxzZSBpZiAoaXM8SW1hZ2VDb250ZW50RGF0YT4oKmNvbnRlbnREYXRh KSkKKyAgICAgICAgICAgIGxpc3QuZ2V0KCkuYXBwZW5kKCpkb3duY2FzdDxJbWFnZUNvbnRlbnRE YXRhPigqY29udGVudERhdGEpLmltYWdlKCkuY3NzVmFsdWUoKSk7CisgICAgICAgIGVsc2UgaWYg KGlzPFRleHRDb250ZW50RGF0YT4oKmNvbnRlbnREYXRhKSkKKyAgICAgICAgICAgIGxpc3QuZ2V0 KCkuYXBwZW5kKGNzc1ZhbHVlUG9vbCgpLmNyZWF0ZVZhbHVlKGRvd25jYXN0PFRleHRDb250ZW50 RGF0YT4oKmNvbnRlbnREYXRhKS50ZXh0KCksIENTU1ByaW1pdGl2ZVZhbHVlOjpDU1NfU1RSSU5H KSk7CiAgICAgfQogICAgIGlmIChzdHlsZS0+aGFzRmxvd0Zyb20oKSkKICAgICAgICAgbGlzdC5n ZXQoKS5hcHBlbmQoY3NzVmFsdWVQb29sKCkuY3JlYXRlVmFsdWUoc3R5bGUtPnJlZ2lvblRocmVh ZCgpLCBDU1NQcmltaXRpdmVWYWx1ZTo6Q1NTX1NUUklORykpOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvY3NzL1N0eWxlUmVzb2x2ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxl UmVzb2x2ZXIuY3BwCmluZGV4IGZmNGUyODg2NjMzNzI5MDYyODJkMWNjNzhkNGRkYjY1NGVjYTZj YmYuLjU3MTNjOWZjOWU2ZjY1OTQzOWVjNGVjMmY0ZTUwMTU3ZGQyNTg3MTIgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVJlc29sdmVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9jc3MvU3R5bGVSZXNvbHZlci5jcHAKQEAgLTM3MTMsMTIgKzM3MTMsMTIgQEAgdm9pZCBTdHls ZVJlc29sdmVyOjpsb2FkUGVuZGluZ0ltYWdlcygpCiAgICAgICAgIH0KICAgICAgICAgY2FzZSBD U1NQcm9wZXJ0eUNvbnRlbnQ6IHsKICAgICAgICAgICAgIGZvciAoQ29udGVudERhdGEqIGNvbnRl bnREYXRhID0gY29uc3RfY2FzdDxDb250ZW50RGF0YSo+KG1fc3RhdGUuc3R5bGUoKS0+Y29udGVu dERhdGEoKSk7IGNvbnRlbnREYXRhOyBjb250ZW50RGF0YSA9IGNvbnRlbnREYXRhLT5uZXh0KCkp IHsKLSAgICAgICAgICAgICAgICBpZiAoY29udGVudERhdGEtPmlzSW1hZ2UoKSkgewotICAgICAg ICAgICAgICAgICAgICBhdXRvJiBzdHlsZUltYWdlID0gdG9JbWFnZUNvbnRlbnREYXRhKGNvbnRl bnREYXRhKS0+aW1hZ2UoKTsKKyAgICAgICAgICAgICAgICBpZiAoaXM8SW1hZ2VDb250ZW50RGF0 YT4oKmNvbnRlbnREYXRhKSkgeworICAgICAgICAgICAgICAgICAgICBhdXRvJiBzdHlsZUltYWdl ID0gZG93bmNhc3Q8SW1hZ2VDb250ZW50RGF0YT4oKmNvbnRlbnREYXRhKS5pbWFnZSgpOwogICAg ICAgICAgICAgICAgICAgICBpZiAoc3R5bGVJbWFnZS5pc1BlbmRpbmdJbWFnZSgpKSB7CiAgICAg ICAgICAgICAgICAgICAgICAgICBSZWZQdHI8U3R5bGVJbWFnZT4gbG9hZGVkSW1hZ2UgPSBsb2Fk UGVuZGluZ0ltYWdlKHRvU3R5bGVQZW5kaW5nSW1hZ2Uoc3R5bGVJbWFnZSkpOwogICAgICAgICAg ICAgICAgICAgICAgICAgaWYgKGxvYWRlZEltYWdlKQotICAgICAgICAgICAgICAgICAgICAgICAg ICAgIHRvSW1hZ2VDb250ZW50RGF0YShjb250ZW50RGF0YSktPnNldEltYWdlKGxvYWRlZEltYWdl LnJlbGVhc2UoKSk7CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgZG93bmNhc3Q8SW1hZ2VD b250ZW50RGF0YT4oKmNvbnRlbnREYXRhKS5zZXRJbWFnZShsb2FkZWRJbWFnZS5yZWxlYXNlKCkp OwogICAgICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAg fQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckVsZW1lbnQuY3Bw IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckVsZW1lbnQuY3BwCmluZGV4IGU2YWEz Y2FmMDBiNTc3Y2NmMTliZTMxMGIxNDZmMGMxY2JhY2M3ODMuLmUzMTgyNDQyNjIzZjg4ZTE3ZTYw ZTdmNDQyYzk2NTRlMmMyNDY5NDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJFbGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy RWxlbWVudC5jcHAKQEAgLTEzOSw4ICsxMzksOCBAQCBSZW5kZXJQdHI8UmVuZGVyRWxlbWVudD4g UmVuZGVyRWxlbWVudDo6Y3JlYXRlRm9yKEVsZW1lbnQmIGVsZW1lbnQsIFBhc3NSZWY8UmVuZAog ICAgIC8vIFdvcmtzIG9ubHkgaWYgd2UgaGF2ZSBleGFjdGx5IG9uZSBwaWVjZSBvZiBjb250ZW50 IGFuZCBpdCdzIGEgVVJMLgogICAgIC8vIE90aGVyd2lzZSBhY3RzIGFzIGlmIHdlIGRpZG4ndCBz dXBwb3J0IHRoaXMgZmVhdHVyZS4KICAgICBjb25zdCBDb250ZW50RGF0YSogY29udGVudERhdGEg PSBzdHlsZS5nZXQoKS5jb250ZW50RGF0YSgpOwotICAgIGlmIChjb250ZW50RGF0YSAmJiAhY29u dGVudERhdGEtPm5leHQoKSAmJiBjb250ZW50RGF0YS0+aXNJbWFnZSgpICYmICFlbGVtZW50Lmlz UHNldWRvRWxlbWVudCgpKSB7Ci0gICAgICAgIGF1dG8mIHN0eWxlSW1hZ2UgPSB0b0ltYWdlQ29u dGVudERhdGEoY29udGVudERhdGEpLT5pbWFnZSgpOworICAgIGlmIChjb250ZW50RGF0YSAmJiAh Y29udGVudERhdGEtPm5leHQoKSAmJiBpczxJbWFnZUNvbnRlbnREYXRhPigqY29udGVudERhdGEp ICYmICFlbGVtZW50LmlzUHNldWRvRWxlbWVudCgpKSB7CisgICAgICAgIGF1dG8mIHN0eWxlSW1h Z2UgPSBkb3duY2FzdDxJbWFnZUNvbnRlbnREYXRhPigqY29udGVudERhdGEpLmltYWdlKCk7CiAg ICAgICAgIGF1dG8gaW1hZ2UgPSBjcmVhdGVSZW5kZXJlcjxSZW5kZXJJbWFnZT4oZWxlbWVudCwg V1RGOjptb3ZlKHN0eWxlKSwgY29uc3RfY2FzdDxTdHlsZUltYWdlKj4oJnN0eWxlSW1hZ2UpKTsK ICAgICAgICAgaW1hZ2UtPnNldElzR2VuZXJhdGVkQ29udGVudCgpOwogICAgICAgICByZXR1cm4g V1RGOjptb3ZlKGltYWdlKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9z dHlsZS9Db250ZW50RGF0YS5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL0NvbnRl bnREYXRhLmgKaW5kZXggYzA2NWNiZWE0NTI5MTU0ZjUzNzQ4MDY1ZjE5NDQ4MWEzMjA5YzBjMC4u YWE0N2U1OGE0M2FmYzRhMTE0YTA5NmVhNzliYjkxOGQ0YWQzNjFiOCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL0NvbnRlbnREYXRhLmgKKysrIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL3N0eWxlL0NvbnRlbnREYXRhLmgKQEAgLTI4LDYgKzI4LDcgQEAKICNp bmNsdWRlICJDb3VudGVyQ29udGVudC5oIgogI2luY2x1ZGUgIlN0eWxlSW1hZ2UuaCIKICNpbmNs dWRlICJSZW5kZXJQdHIuaCIKKyNpbmNsdWRlIDx3dGYvVHlwZUNhc3RzLmg+CiAKIG5hbWVzcGFj ZSBXZWJDb3JlIHsKIApAQCAtNzcsOSArNzgsNiBAQCBwcml2YXRlOgogICAgIFR5cGUgbV90eXBl OwogfTsKIAotI2RlZmluZSBDT05URU5UX0RBVEFfVFlQRV9DQVNUUyhUb0NsYXNzTmFtZSwgRnJv bUNsYXNzTmFtZSwgQ29udGVudERhdGFOYW1lKSBcCi0gICAgVFlQRV9DQVNUU19CQVNFKFRvQ2xh c3NOYW1lLCBGcm9tQ2xhc3NOYW1lLCByZXNvdXJjZSwgcmVzb3VyY2UtPmlzIyNDb250ZW50RGF0 YU5hbWUoKSwgcmVzb3VyY2UuaXMjI0NvbnRlbnREYXRhTmFtZSgpKQotCiBjbGFzcyBJbWFnZUNv bnRlbnREYXRhIGZpbmFsIDogcHVibGljIENvbnRlbnREYXRhIHsKIHB1YmxpYzoKICAgICBleHBs aWNpdCBJbWFnZUNvbnRlbnREYXRhKFBhc3NSZWZQdHI8U3R5bGVJbWFnZT4gaW1hZ2UpCkBAIC0x MDcsOCArMTA1LDYgQEAgcHJpdmF0ZToKICAgICBSZWZQdHI8U3R5bGVJbWFnZT4gbV9pbWFnZTsK IH07CiAKLUNPTlRFTlRfREFUQV9UWVBFX0NBU1RTKEltYWdlQ29udGVudERhdGEsIENvbnRlbnRE YXRhLCBJbWFnZSkKLQogaW5saW5lIGJvb2wgb3BlcmF0b3I9PShjb25zdCBJbWFnZUNvbnRlbnRE YXRhJiBhLCBjb25zdCBJbWFnZUNvbnRlbnREYXRhJiBiKQogewogICAgIHJldHVybiBhLmltYWdl KCkgPT0gYi5pbWFnZSgpOwpAQCAtMTM4LDggKzEzNCw2IEBAIHByaXZhdGU6CiAgICAgU3RyaW5n IG1fdGV4dDsKIH07CiAKLUNPTlRFTlRfREFUQV9UWVBFX0NBU1RTKFRleHRDb250ZW50RGF0YSwg Q29udGVudERhdGEsIFRleHQpCi0KIGlubGluZSBib29sIG9wZXJhdG9yPT0oY29uc3QgVGV4dENv bnRlbnREYXRhJiBhLCBjb25zdCBUZXh0Q29udGVudERhdGEmIGIpCiB7CiAgICAgcmV0dXJuIGEu dGV4dCgpID09IGIudGV4dCgpOwpAQCAtMTc4LDggKzE3Miw2IEBAIHByaXZhdGU6CiAgICAgc3Rk Ojp1bmlxdWVfcHRyPENvdW50ZXJDb250ZW50PiBtX2NvdW50ZXI7CiB9OwogCi1DT05URU5UX0RB VEFfVFlQRV9DQVNUUyhDb3VudGVyQ29udGVudERhdGEsIENvbnRlbnREYXRhLCBDb3VudGVyKQot CiBpbmxpbmUgYm9vbCBvcGVyYXRvcj09KGNvbnN0IENvdW50ZXJDb250ZW50RGF0YSYgYSwgY29u c3QgQ291bnRlckNvbnRlbnREYXRhJiBiKQogewogICAgIHJldHVybiBhLmNvdW50ZXIoKSA9PSBi LmNvdW50ZXIoKTsKQEAgLTIwOSw4ICsyMDEsNiBAQCBwcml2YXRlOgogICAgIFF1b3RlVHlwZSBt X3F1b3RlOwogfTsKIAotQ09OVEVOVF9EQVRBX1RZUEVfQ0FTVFMoUXVvdGVDb250ZW50RGF0YSwg Q29udGVudERhdGEsIFF1b3RlKQotCiBpbmxpbmUgYm9vbCBvcGVyYXRvcj09KGNvbnN0IFF1b3Rl Q29udGVudERhdGEmIGEsIGNvbnN0IFF1b3RlQ29udGVudERhdGEmIGIpCiB7CiAgICAgcmV0dXJu IGEucXVvdGUoKSA9PSBiLnF1b3RlKCk7CkBAIC0yMjgsMTMgKzIxOCwxMyBAQCBpbmxpbmUgYm9v bCBvcGVyYXRvcj09KGNvbnN0IENvbnRlbnREYXRhJiBhLCBjb25zdCBDb250ZW50RGF0YSYgYikK IAogICAgIHN3aXRjaCAoYS50eXBlKCkpIHsKICAgICBjYXNlIENvbnRlbnREYXRhOjpDb3VudGVy RGF0YVR5cGU6Ci0gICAgICAgIHJldHVybiB0b0NvdW50ZXJDb250ZW50RGF0YShhKSA9PSB0b0Nv dW50ZXJDb250ZW50RGF0YShiKTsKKyAgICAgICAgcmV0dXJuIGRvd25jYXN0PENvdW50ZXJDb250 ZW50RGF0YT4oYSkgPT0gZG93bmNhc3Q8Q291bnRlckNvbnRlbnREYXRhPihiKTsKICAgICBjYXNl IENvbnRlbnREYXRhOjpJbWFnZURhdGFUeXBlOgotICAgICAgICByZXR1cm4gdG9JbWFnZUNvbnRl bnREYXRhKGEpID09IHRvSW1hZ2VDb250ZW50RGF0YShiKTsKKyAgICAgICAgcmV0dXJuIGRvd25j YXN0PEltYWdlQ29udGVudERhdGE+KGEpID09IGRvd25jYXN0PEltYWdlQ29udGVudERhdGE+KGIp OwogICAgIGNhc2UgQ29udGVudERhdGE6OlF1b3RlRGF0YVR5cGU6Ci0gICAgICAgIHJldHVybiB0 b1F1b3RlQ29udGVudERhdGEoYSkgPT0gdG9RdW90ZUNvbnRlbnREYXRhKGIpOworICAgICAgICBy ZXR1cm4gZG93bmNhc3Q8UXVvdGVDb250ZW50RGF0YT4oYSkgPT0gZG93bmNhc3Q8UXVvdGVDb250 ZW50RGF0YT4oYik7CiAgICAgY2FzZSBDb250ZW50RGF0YTo6VGV4dERhdGFUeXBlOgotICAgICAg ICByZXR1cm4gdG9UZXh0Q29udGVudERhdGEoYSkgPT0gdG9UZXh0Q29udGVudERhdGEoYik7Cisg ICAgICAgIHJldHVybiBkb3duY2FzdDxUZXh0Q29udGVudERhdGE+KGEpID09IGRvd25jYXN0PFRl eHRDb250ZW50RGF0YT4oYik7CiAgICAgfQogCiAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CkBA IC0yNDgsNCArMjM4LDE0IEBAIGlubGluZSBib29sIG9wZXJhdG9yIT0oY29uc3QgQ29udGVudERh dGEmIGEsIGNvbnN0IENvbnRlbnREYXRhJiBiKQogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCiAK KyNkZWZpbmUgU1BFQ0lBTElaRV9UWVBFX1RSQUlUU19DT05URU5UX0RBVEEoVG9DbGFzc05hbWUs IENvbnRlbnREYXRhTmFtZSkgXAorU1BFQ0lBTElaRV9UWVBFX1RSQUlUU19CRUdJTihXZWJDb3Jl OjpUb0NsYXNzTmFtZSkgXAorICAgIHN0YXRpYyBib29sIGlzVHlwZShjb25zdCBXZWJDb3JlOjpD b250ZW50RGF0YSYgY29udGVudERhdGEpIHsgcmV0dXJuIGNvbnRlbnREYXRhLmlzIyNDb250ZW50 RGF0YU5hbWUoKTsgfSBcCitTUEVDSUFMSVpFX1RZUEVfVFJBSVRTX0VORCgpCisKK1NQRUNJQUxJ WkVfVFlQRV9UUkFJVFNfQ09OVEVOVF9EQVRBKEltYWdlQ29udGVudERhdGEsIEltYWdlKQorU1BF Q0lBTElaRV9UWVBFX1RSQUlUU19DT05URU5UX0RBVEEoVGV4dENvbnRlbnREYXRhLCBUZXh0KQor U1BFQ0lBTElaRV9UWVBFX1RSQUlUU19DT05URU5UX0RBVEEoQ291bnRlckNvbnRlbnREYXRhLCBD b3VudGVyKQorU1BFQ0lBTElaRV9UWVBFX1RSQUlUU19DT05URU5UX0RBVEEoUXVvdGVDb250ZW50 RGF0YSwgUXVvdGUpCisKICNlbmRpZiAvLyBDb250ZW50RGF0YV9oCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuY3BwIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmNwcAppbmRleCA3ODJlMWRkMjU1YjljODdl YjJkYjQ0MGFkYzBlMDY0ZTIwM2RkYzNjLi4zNzNmM2Y0NGNlMzI4M2UyNzZhYmU2YTYxMzRiNzkw ZmZmZmIzMDYzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVu ZGVyU3R5bGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJT dHlsZS5jcHAKQEAgLTkwNCw5ICs5MDQsOSBAQCB2b2lkIFJlbmRlclN0eWxlOjpzZXRDb250ZW50 KGNvbnN0IFN0cmluZyYgc3RyaW5nLCBib29sIGFkZCkKIAogICAgICAgICBpZiAobGFzdENvbnRl bnQpIHsKICAgICAgICAgICAgIC8vIFdlIGF0dGVtcHQgdG8gbWVyZ2Ugd2l0aCB0aGUgbGFzdCBD b250ZW50RGF0YSBpZiBwb3NzaWJsZS4KLSAgICAgICAgICAgIGlmIChsYXN0Q29udGVudC0+aXNU ZXh0KCkpIHsKLSAgICAgICAgICAgICAgICBUZXh0Q29udGVudERhdGEqIHRleHRDb250ZW50ID0g dG9UZXh0Q29udGVudERhdGEobGFzdENvbnRlbnQpOwotICAgICAgICAgICAgICAgIHRleHRDb250 ZW50LT5zZXRUZXh0KHRleHRDb250ZW50LT50ZXh0KCkgKyBzdHJpbmcpOworICAgICAgICAgICAg aWYgKGlzPFRleHRDb250ZW50RGF0YT4oKmxhc3RDb250ZW50KSkgeworICAgICAgICAgICAgICAg IFRleHRDb250ZW50RGF0YSYgdGV4dENvbnRlbnQgPSBkb3duY2FzdDxUZXh0Q29udGVudERhdGE+ KCpsYXN0Q29udGVudCk7CisgICAgICAgICAgICAgICAgdGV4dENvbnRlbnQuc2V0VGV4dCh0ZXh0 Q29udGVudC50ZXh0KCkgKyBzdHJpbmcpOwogICAgICAgICAgICAgfSBlbHNlCiAgICAgICAgICAg ICAgICAgbGFzdENvbnRlbnQtPnNldE5leHQoc3RkOjptYWtlX3VuaXF1ZTxUZXh0Q29udGVudERh dGE+KHN0cmluZykpOwogCg==