175494 2017-08-11 14:32:19 -0700 Some RenderSVGResource cleanup 2017-08-11 15:44:20 -0700 1 1 1 Unclassified WebKit SVG WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser commit-queue simon.fraser webkit-bug-importer zalan zimmermann oldest_to_newest 1338011 0 simon.fraser 2017-08-11 14:32:19 -0700 Some RenderSVGResource cleanup 1338012 1 317963 simon.fraser 2017-08-11 14:33:09 -0700 Created attachment 317963 Patch 1338036 2 317963 commit-queue 2017-08-11 15:43:06 -0700 Comment on attachment 317963 Patch Clearing flags on attachment: 317963 Committed r220616: <http://trac.webkit.org/changeset/220616> 1338037 3 commit-queue 2017-08-11 15:43:07 -0700 All reviewed patches have been landed. Closing bug. 1338038 4 webkit-bug-importer 2017-08-11 15:44:20 -0700 <rdar://problem/33857769> 317963 2017-08-11 14:33:09 -0700 2017-08-11 15:43:06 -0700 Patch bug-175494-20170811143308.patch text/plain 12148 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjIwNjA0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2ZlMTZmNTQzMWVlNDZk YTM0MDg3NWI5NWQ5MzlhNTVkZGU3ZDcwMC4uZTdlODc0YmJlY2JiMDRiYjJiMTNmMzA2ZjU5NjFi ODAwZjhlZmQ0ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDE3LTA4LTExICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFNvbWUgUmVuZGVy U1ZHUmVzb3VyY2UgY2xlYW51cAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTc1NDk0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgVXNlIG1vcmUgaW5pdGlhbGl6ZXJzLiBSZW1vdmUgc3B1cmlvdXMgdXNlIG9m IGJpdGZpZWxkcyB0aGF0IGRpZG4ndCBzYXZlIGFueSBzcGFjZSBhdCBhbGwuCisgICAgICAgIDAg LT4gbnVsbHB0ci4KKworICAgICAgICBObyBiZWhhdmlvciBjaGFuZ2UuCisKKyAgICAgICAgKiBy ZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jlc291cmNlQ29udGFpbmVyLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlJlbmRlclNWR1Jlc291cmNlQ29udGFpbmVyOjpSZW5kZXJTVkdSZXNvdXJjZUNvbnRh aW5lcik6CisgICAgICAgICogcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdSZXNvdXJjZUNvbnRhaW5l ci5oOgorICAgICAgICAqIHJlbmRlcmluZy9zdmcvUmVuZGVyU1ZHUmVzb3VyY2VHcmFkaWVudC5j cHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJTVkdSZXNvdXJjZUdyYWRpZW50OjpSZW5kZXJT VkdSZXNvdXJjZUdyYWRpZW50KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclNWR1Jlc291cmNl R3JhZGllbnQ6OmFwcGx5UmVzb3VyY2UpOgorICAgICAgICAqIHJlbmRlcmluZy9zdmcvUmVuZGVy U1ZHUmVzb3VyY2VHcmFkaWVudC5oOgorICAgICAgICAqIHJlbmRlcmluZy9zdmcvUmVuZGVyU1ZH UmVzb3VyY2VQYXR0ZXJuLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclNWR1Jlc291cmNl UGF0dGVybjo6UmVuZGVyU1ZHUmVzb3VyY2VQYXR0ZXJuKToKKyAgICAgICAgKiByZW5kZXJpbmcv c3ZnL1JlbmRlclNWR1Jlc291cmNlUGF0dGVybi5oOgorICAgICAgICAqIHJlbmRlcmluZy9zdmcv UmVuZGVyU1ZHU2hhcGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyU1ZHU2hhcGU6OmZp bGxTaGFwZSk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJTVkdTaGFwZTo6c3Ryb2tlU2hhcGUp OgorICAgICAgICAqIHJlbmRlcmluZy9zdmcvU1ZHUmVuZGVyaW5nQ29udGV4dC5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpTVkdSZW5kZXJpbmdDb250ZXh0Ojp+U1ZHUmVuZGVyaW5nQ29udGV4dCk6 CisgICAgICAgIChXZWJDb3JlOjpTVkdSZW5kZXJpbmdDb250ZXh0OjpwcmVwYXJlVG9SZW5kZXJT VkdDb250ZW50KToKKyAgICAgICAgKiByZW5kZXJpbmcvc3ZnL1NWR1JlbmRlcmluZ0NvbnRleHQu aDoKKyAgICAgICAgKFdlYkNvcmU6OlNWR1JlbmRlcmluZ0NvbnRleHQ6OlNWR1JlbmRlcmluZ0Nv bnRleHQpOgorCiAyMDE3LTA4LTEwICBTYW0gV2VpbmlnICA8c2FtQHdlYmtpdC5vcmc+CiAKICAg ICAgICAgV1RGOjpGdW5jdGlvbiBkb2VzIG5vdCBhbGxvdyBmb3IgcmVmZXJlbmNlIC8gbm9uLWRl ZmF1bHQgY29uc3RydWN0aWJsZSByZXR1cm4gdHlwZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZHUmVzb3VyY2VDb250YWluZXIuY3BwIGIvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdSZXNvdXJjZUNvbnRhaW5lci5jcHAKaW5k ZXggM2Q0NGM2YWFhMzcwNDllOTk0MzljMWQ4NDgxZTUwODY5NzFjMjAwMC4uMTgxODYwMzg1MDhj ODMwMjg4NzkzZWM4YTZlMzEwNjljOGU3MmMzMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdSZXNvdXJjZUNvbnRhaW5lci5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdSZXNvdXJjZUNvbnRhaW5lci5jcHAKQEAg LTM3LDggKzM3LDYgQEAgc3RhdGljIGlubGluZSBTVkdEb2N1bWVudEV4dGVuc2lvbnMmIHN2Z0V4 dGVuc2lvbnNGcm9tRWxlbWVudChTVkdFbGVtZW50JiBlbGVtZW4KIFJlbmRlclNWR1Jlc291cmNl Q29udGFpbmVyOjpSZW5kZXJTVkdSZXNvdXJjZUNvbnRhaW5lcihTVkdFbGVtZW50JiBlbGVtZW50 LCBSZW5kZXJTdHlsZSYmIHN0eWxlKQogICAgIDogUmVuZGVyU1ZHSGlkZGVuQ29udGFpbmVyKGVs ZW1lbnQsIFdURk1vdmUoc3R5bGUpKQogICAgICwgbV9pZChlbGVtZW50LmdldElkQXR0cmlidXRl KCkpCi0gICAgLCBtX3JlZ2lzdGVyZWQoZmFsc2UpCi0gICAgLCBtX2lzSW52YWxpZGF0aW5nKGZh bHNlKQogewogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1Jl bmRlclNWR1Jlc291cmNlQ29udGFpbmVyLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3Zn L1JlbmRlclNWR1Jlc291cmNlQ29udGFpbmVyLmgKaW5kZXggZmJmMzVkOTE3MzQwZmU4Yjk2NWMw Y2JlYmMwMTRkN2Y2YzJkYzg2Ny4uNjgwYTllMTQwMDQzY2ZjN2M3MGE2MmEyNjcyYWRiM2I1MTZi MGJhYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdS ZXNvdXJjZUNvbnRhaW5lci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVu ZGVyU1ZHUmVzb3VyY2VDb250YWluZXIuaApAQCAtNzAsMTAgKzcwLDEwIEBAIHByaXZhdGU6CiAg ICAgdm9pZCByZWdpc3RlclJlc291cmNlKCk7CiAKICAgICBBdG9taWNTdHJpbmcgbV9pZDsKLSAg ICBib29sIG1fcmVnaXN0ZXJlZCA6IDE7Ci0gICAgYm9vbCBtX2lzSW52YWxpZGF0aW5nIDogMTsK ICAgICBIYXNoU2V0PFJlbmRlckVsZW1lbnQqPiBtX2NsaWVudHM7CiAgICAgSGFzaFNldDxSZW5k ZXJMYXllcio+IG1fY2xpZW50TGF5ZXJzOworICAgIGJvb2wgbV9yZWdpc3RlcmVkIHsgZmFsc2Ug fTsKKyAgICBib29sIG1faXNJbnZhbGlkYXRpbmcgeyBmYWxzZSB9OwogfTsKIAogaW5saW5lIFJl bmRlclNWR1Jlc291cmNlQ29udGFpbmVyKiBnZXRSZW5kZXJTVkdSZXNvdXJjZUNvbnRhaW5lckJ5 SWQoRG9jdW1lbnQmIGRvY3VtZW50LCBjb25zdCBBdG9taWNTdHJpbmcmIGlkKQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdSZXNvdXJjZUdyYWRpZW50 LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZHUmVzb3VyY2VHcmFk aWVudC5jcHAKaW5kZXggMGUxZmJhM2JlMDRlN2ZhMDVjZjI1ZDIzZDdlODg0OTY2YWNjYjBlYi4u ZTU1MTM2ZDQ4MjA5NjI3Njk2NWY1MzBmNTI5OTc1YjczZWQ2OWRlOCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdSZXNvdXJjZUdyYWRpZW50LmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jlc291cmNlR3JhZGll bnQuY3BwCkBAIC0zMiwxMCArMzIsNiBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIFJlbmRlclNW R1Jlc291cmNlR3JhZGllbnQ6OlJlbmRlclNWR1Jlc291cmNlR3JhZGllbnQoU1ZHR3JhZGllbnRF bGVtZW50JiBub2RlLCBSZW5kZXJTdHlsZSYmIHN0eWxlKQogICAgIDogUmVuZGVyU1ZHUmVzb3Vy Y2VDb250YWluZXIobm9kZSwgV1RGTW92ZShzdHlsZSkpCi0gICAgLCBtX3Nob3VsZENvbGxlY3RH cmFkaWVudEF0dHJpYnV0ZXModHJ1ZSkKLSNpZiBVU0UoQ0cpCi0gICAgLCBtX3NhdmVkQ29udGV4 dCgwKQotI2VuZGlmCiB7CiB9CiAKQEAgLTIwMCw3ICsxOTYsNyBAQCB2b2lkIFJlbmRlclNWR1Jl c291cmNlR3JhZGllbnQ6OnBvc3RBcHBseVJlc291cmNlKFJlbmRlckVsZW1lbnQmIHJlbmRlcmVy LCBHcmFwaAogICAgICAgICBpZiAobV9zYXZlZENvbnRleHQgJiYgKGdyYWRpZW50RGF0YSA9IG1f Z3JhZGllbnRNYXAuZ2V0KCZyZW5kZXJlcikpKSB7CiAgICAgICAgICAgICAvLyBSZXN0b3JlIG9u LXNjcmVlbiBkcmF3aW5nIGNvbnRleHQKICAgICAgICAgICAgIGNvbnRleHQgPSBtX3NhdmVkQ29u dGV4dDsKLSAgICAgICAgICAgIG1fc2F2ZWRDb250ZXh0ID0gMDsKKyAgICAgICAgICAgIG1fc2F2 ZWRDb250ZXh0ID0gbnVsbHB0cjsKIAogICAgICAgICAgICAgQWZmaW5lVHJhbnNmb3JtIGdyYWRp ZW50VHJhbnNmb3JtOwogICAgICAgICAgICAgY2FsY3VsYXRlR3JhZGllbnRUcmFuc2Zvcm0oZ3Jh ZGllbnRUcmFuc2Zvcm0pOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2 Zy9SZW5kZXJTVkdSZXNvdXJjZUdyYWRpZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv c3ZnL1JlbmRlclNWR1Jlc291cmNlR3JhZGllbnQuaAppbmRleCBkNjA3OTVjMzQxMDNmNmNmYjNj ZjZjZGRmMDA1NThmZjU3Nzk4MWZhLi5lZTg1MjJhNmMzMjA4YjY3ZTFmMzg3YzU2YjkzYWUyNGMz YjFiYzRmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNW R1Jlc291cmNlR3JhZGllbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1Jl bmRlclNWR1Jlc291cmNlR3JhZGllbnQuaApAQCAtNjUsMTMgKzY1LDE0IEBAIHByb3RlY3RlZDoK ICAgICBHcmFkaWVudFNwcmVhZE1ldGhvZCBwbGF0Zm9ybVNwcmVhZE1ldGhvZEZyb21TVkdUeXBl KFNWR1NwcmVhZE1ldGhvZFR5cGUpIGNvbnN0OwogCiBwcml2YXRlOgotICAgIGJvb2wgbV9zaG91 bGRDb2xsZWN0R3JhZGllbnRBdHRyaWJ1dGVzIDogMTsKICAgICBIYXNoTWFwPFJlbmRlck9iamVj dCosIHN0ZDo6dW5pcXVlX3B0cjxHcmFkaWVudERhdGE+PiBtX2dyYWRpZW50TWFwOwogCiAjaWYg VVNFKENHKQotICAgIEdyYXBoaWNzQ29udGV4dCogbV9zYXZlZENvbnRleHQ7CisgICAgR3JhcGhp Y3NDb250ZXh0KiBtX3NhdmVkQ29udGV4dCB7IG51bGxwdHIgfTsKICAgICBzdGQ6OnVuaXF1ZV9w dHI8SW1hZ2VCdWZmZXI+IG1faW1hZ2VCdWZmZXI7CiAjZW5kaWYKKworICAgIGJvb2wgbV9zaG91 bGRDb2xsZWN0R3JhZGllbnRBdHRyaWJ1dGVzIHsgdHJ1ZSB9OwogfTsKIAogfSAvLyBuYW1lc3Bh Y2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5k ZXJTVkdSZXNvdXJjZVBhdHRlcm4uY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9S ZW5kZXJTVkdSZXNvdXJjZVBhdHRlcm4uY3BwCmluZGV4IDJjM2Q0ZWIzYjc1NTIxODJiYjZjNWRj MmE5NjUwNWE2NTIxMDUyNTMuLmQzYTFlM2M5MDkxNGYyZjU4ZDk2NDhlN2IyMWM3NWM3ODRiNDQx NzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZHUmVz b3VyY2VQYXR0ZXJuLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRl clNWR1Jlc291cmNlUGF0dGVybi5jcHAKQEAgLTM0LDcgKzM0LDYgQEAgbmFtZXNwYWNlIFdlYkNv cmUgewogCiBSZW5kZXJTVkdSZXNvdXJjZVBhdHRlcm46OlJlbmRlclNWR1Jlc291cmNlUGF0dGVy bihTVkdQYXR0ZXJuRWxlbWVudCYgZWxlbWVudCwgUmVuZGVyU3R5bGUmJiBzdHlsZSkKICAgICA6 IFJlbmRlclNWR1Jlc291cmNlQ29udGFpbmVyKGVsZW1lbnQsIFdURk1vdmUoc3R5bGUpKQotICAg ICwgbV9zaG91bGRDb2xsZWN0UGF0dGVybkF0dHJpYnV0ZXModHJ1ZSkKIHsKIH0KIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdSZXNvdXJjZVBhdHRl cm4uaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZHUmVzb3VyY2VQYXR0 ZXJuLmgKaW5kZXggM2E4MmFiMWQ4OGFhNTdlYzY4OTVlNGNhMzE2ZTcxOGEzN2M4YTU2Mi4uZmRh MDA0ODcyOTA1MTE1M2M0NDZmNGM2YjcwOTJkZmIwYTA2YTlmYiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdSZXNvdXJjZVBhdHRlcm4uaAorKysgYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jlc291cmNlUGF0dGVybi5oCkBA IC02Myw5ICs2Myw5IEBAIHByaXZhdGU6CiAKICAgICBQYXR0ZXJuRGF0YSogYnVpbGRQYXR0ZXJu KFJlbmRlckVsZW1lbnQmLCBPcHRpb25TZXQ8UmVuZGVyU1ZHUmVzb3VyY2VNb2RlPiwgR3JhcGhp Y3NDb250ZXh0Jik7CiAKLSAgICBib29sIG1fc2hvdWxkQ29sbGVjdFBhdHRlcm5BdHRyaWJ1dGVz IDogMTsKICAgICBQYXR0ZXJuQXR0cmlidXRlcyBtX2F0dHJpYnV0ZXM7CiAgICAgSGFzaE1hcDxS ZW5kZXJFbGVtZW50Kiwgc3RkOjp1bmlxdWVfcHRyPFBhdHRlcm5EYXRhPj4gbV9wYXR0ZXJuTWFw OworICAgIGJvb2wgbV9zaG91bGRDb2xsZWN0UGF0dGVybkF0dHJpYnV0ZXMgeyB0cnVlIH07CiB9 OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1NoYXBlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9zdmcvUmVuZGVyU1ZHU2hhcGUuY3BwCmluZGV4IGQ4NmU3OGY4ZDYxNjY5OTI3MDM0MTZkYzBh NWFkZDhmZjQ1NDhmMzkuLjE0M2I1Y2VhNmYxODI0OTBkZDgxNDA2NDJiNGUzZDEyNjQ3Y2E2Yzgg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZHU2hhcGUu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZHU2hhcGUuY3Bw CkBAIC0yMzYsMTIgKzIzNiwxMiBAQCB2b2lkIFJlbmRlclNWR1NoYXBlOjpmaWxsU2hhcGUoY29u c3QgUmVuZGVyU3R5bGUmIHN0eWxlLCBHcmFwaGljc0NvbnRleHQmIG9yaWdpbgogICAgIENvbG9y IGZhbGxiYWNrQ29sb3I7CiAgICAgaWYgKFJlbmRlclNWR1Jlc291cmNlKiBmaWxsUGFpbnRpbmdS ZXNvdXJjZSA9IFJlbmRlclNWR1Jlc291cmNlOjpmaWxsUGFpbnRpbmdSZXNvdXJjZSgqdGhpcywg c3R5bGUsIGZhbGxiYWNrQ29sb3IpKSB7CiAgICAgICAgIGlmIChmaWxsUGFpbnRpbmdSZXNvdXJj ZS0+YXBwbHlSZXNvdXJjZSgqdGhpcywgc3R5bGUsIGNvbnRleHQsIFJlbmRlclNWR1Jlc291cmNl TW9kZTo6QXBwbHlUb0ZpbGwpKQotICAgICAgICAgICAgZmlsbFBhaW50aW5nUmVzb3VyY2UtPnBv c3RBcHBseVJlc291cmNlKCp0aGlzLCBjb250ZXh0LCBSZW5kZXJTVkdSZXNvdXJjZU1vZGU6OkFw cGx5VG9GaWxsLCAwLCB0aGlzKTsKKyAgICAgICAgICAgIGZpbGxQYWludGluZ1Jlc291cmNlLT5w b3N0QXBwbHlSZXNvdXJjZSgqdGhpcywgY29udGV4dCwgUmVuZGVyU1ZHUmVzb3VyY2VNb2RlOjpB cHBseVRvRmlsbCwgbnVsbHB0ciwgdGhpcyk7CiAgICAgICAgIGVsc2UgaWYgKGZhbGxiYWNrQ29s b3IuaXNWYWxpZCgpKSB7CiAgICAgICAgICAgICBSZW5kZXJTVkdSZXNvdXJjZVNvbGlkQ29sb3Iq IGZhbGxiYWNrUmVzb3VyY2UgPSBSZW5kZXJTVkdSZXNvdXJjZTo6c2hhcmVkU29saWRQYWludGlu Z1Jlc291cmNlKCk7CiAgICAgICAgICAgICBmYWxsYmFja1Jlc291cmNlLT5zZXRDb2xvcihmYWxs YmFja0NvbG9yKTsKICAgICAgICAgICAgIGlmIChmYWxsYmFja1Jlc291cmNlLT5hcHBseVJlc291 cmNlKCp0aGlzLCBzdHlsZSwgY29udGV4dCwgUmVuZGVyU1ZHUmVzb3VyY2VNb2RlOjpBcHBseVRv RmlsbCkpCi0gICAgICAgICAgICAgICAgZmFsbGJhY2tSZXNvdXJjZS0+cG9zdEFwcGx5UmVzb3Vy Y2UoKnRoaXMsIGNvbnRleHQsIFJlbmRlclNWR1Jlc291cmNlTW9kZTo6QXBwbHlUb0ZpbGwsIDAs IHRoaXMpOworICAgICAgICAgICAgICAgIGZhbGxiYWNrUmVzb3VyY2UtPnBvc3RBcHBseVJlc291 cmNlKCp0aGlzLCBjb250ZXh0LCBSZW5kZXJTVkdSZXNvdXJjZU1vZGU6OkFwcGx5VG9GaWxsLCBu dWxscHRyLCB0aGlzKTsKICAgICAgICAgfQogICAgIH0KIH0KQEAgLTI1MiwxMiArMjUyLDEyIEBA IHZvaWQgUmVuZGVyU1ZHU2hhcGU6OnN0cm9rZVNoYXBlKGNvbnN0IFJlbmRlclN0eWxlJiBzdHls ZSwgR3JhcGhpY3NDb250ZXh0JiBvcmlnCiAgICAgQ29sb3IgZmFsbGJhY2tDb2xvcjsKICAgICBp ZiAoUmVuZGVyU1ZHUmVzb3VyY2UqIHN0cm9rZVBhaW50aW5nUmVzb3VyY2UgPSBSZW5kZXJTVkdS ZXNvdXJjZTo6c3Ryb2tlUGFpbnRpbmdSZXNvdXJjZSgqdGhpcywgc3R5bGUsIGZhbGxiYWNrQ29s b3IpKSB7CiAgICAgICAgIGlmIChzdHJva2VQYWludGluZ1Jlc291cmNlLT5hcHBseVJlc291cmNl KCp0aGlzLCBzdHlsZSwgY29udGV4dCwgUmVuZGVyU1ZHUmVzb3VyY2VNb2RlOjpBcHBseVRvU3Ry b2tlKSkKLSAgICAgICAgICAgIHN0cm9rZVBhaW50aW5nUmVzb3VyY2UtPnBvc3RBcHBseVJlc291 cmNlKCp0aGlzLCBjb250ZXh0LCBSZW5kZXJTVkdSZXNvdXJjZU1vZGU6OkFwcGx5VG9TdHJva2Us IDAsIHRoaXMpOworICAgICAgICAgICAgc3Ryb2tlUGFpbnRpbmdSZXNvdXJjZS0+cG9zdEFwcGx5 UmVzb3VyY2UoKnRoaXMsIGNvbnRleHQsIFJlbmRlclNWR1Jlc291cmNlTW9kZTo6QXBwbHlUb1N0 cm9rZSwgbnVsbHB0ciwgdGhpcyk7CiAgICAgICAgIGVsc2UgaWYgKGZhbGxiYWNrQ29sb3IuaXNW YWxpZCgpKSB7CiAgICAgICAgICAgICBSZW5kZXJTVkdSZXNvdXJjZVNvbGlkQ29sb3IqIGZhbGxi YWNrUmVzb3VyY2UgPSBSZW5kZXJTVkdSZXNvdXJjZTo6c2hhcmVkU29saWRQYWludGluZ1Jlc291 cmNlKCk7CiAgICAgICAgICAgICBmYWxsYmFja1Jlc291cmNlLT5zZXRDb2xvcihmYWxsYmFja0Nv bG9yKTsKICAgICAgICAgICAgIGlmIChmYWxsYmFja1Jlc291cmNlLT5hcHBseVJlc291cmNlKCp0 aGlzLCBzdHlsZSwgY29udGV4dCwgUmVuZGVyU1ZHUmVzb3VyY2VNb2RlOjpBcHBseVRvU3Ryb2tl KSkKLSAgICAgICAgICAgICAgICBmYWxsYmFja1Jlc291cmNlLT5wb3N0QXBwbHlSZXNvdXJjZSgq dGhpcywgY29udGV4dCwgUmVuZGVyU1ZHUmVzb3VyY2VNb2RlOjpBcHBseVRvU3Ryb2tlLCAwLCB0 aGlzKTsKKyAgICAgICAgICAgICAgICBmYWxsYmFja1Jlc291cmNlLT5wb3N0QXBwbHlSZXNvdXJj ZSgqdGhpcywgY29udGV4dCwgUmVuZGVyU1ZHUmVzb3VyY2VNb2RlOjpBcHBseVRvU3Ryb2tlLCBu dWxscHRyLCB0aGlzKTsKICAgICAgICAgfQogICAgIH0KIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9zdmcvU1ZHUmVuZGVyaW5nQ29udGV4dC5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvc3ZnL1NWR1JlbmRlcmluZ0NvbnRleHQuY3BwCmluZGV4IDMzYTQwYjJi NTJhMGUyZTYyNjRmYjBiMGIzY2YzNGNmOWJhZDgyZTQuLmM5YjBmNWU1YWM3MDZhODgxMWQyNWM0 NGYxNTRlM2MzMWYxNWI0NzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9z dmcvU1ZHUmVuZGVyaW5nQ29udGV4dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L3N2Zy9TVkdSZW5kZXJpbmdDb250ZXh0LmNwcApAQCAtNTYsNyArNTYsNyBAQCBTVkdSZW5kZXJp bmdDb250ZXh0Ojp+U1ZHUmVuZGVyaW5nQ29udGV4dCgpCiAgICAgaWYgKG1fcmVuZGVyaW5nRmxh Z3MgJiBFbmRGaWx0ZXJMYXllcikgewogICAgICAgICBBU1NFUlQobV9maWx0ZXIpOwogICAgICAg ICBHcmFwaGljc0NvbnRleHQqIGNvbnRleHRQdHIgPSAmbV9wYWludEluZm8tPmNvbnRleHQoKTsK LSAgICAgICAgbV9maWx0ZXItPnBvc3RBcHBseVJlc291cmNlKCptX3JlbmRlcmVyLCBjb250ZXh0 UHRyLCBSZW5kZXJTVkdSZXNvdXJjZU1vZGU6OkFwcGx5VG9EZWZhdWx0LCAwLCAwKTsKKyAgICAg ICAgbV9maWx0ZXItPnBvc3RBcHBseVJlc291cmNlKCptX3JlbmRlcmVyLCBjb250ZXh0UHRyLCBS ZW5kZXJTVkdSZXNvdXJjZU1vZGU6OkFwcGx5VG9EZWZhdWx0LCBudWxscHRyLCBudWxscHRyKTsK ICAgICAgICAgbV9wYWludEluZm8tPnNldENvbnRleHQoKm1fc2F2ZWRDb250ZXh0KTsKICAgICAg ICAgbV9wYWludEluZm8tPnJlY3QgPSBtX3NhdmVkUGFpbnRSZWN0OwogICAgIH0KQEAgLTgxLDcg KzgxLDcgQEAgdm9pZCBTVkdSZW5kZXJpbmdDb250ZXh0OjpwcmVwYXJlVG9SZW5kZXJTVkdDb250 ZW50KFJlbmRlckVsZW1lbnQmIHJlbmRlcmVyLCBQYWkKIAogICAgIG1fcmVuZGVyZXIgPSAmcmVu ZGVyZXI7CiAgICAgbV9wYWludEluZm8gPSAmcGFpbnRJbmZvOwotICAgIG1fZmlsdGVyID0gMDsK KyAgICBtX2ZpbHRlciA9IG51bGxwdHI7CiAKICAgICAvLyBXZSBuZWVkIHRvIHNhdmUgLyByZXN0 b3JlIHRoZSBjb250ZXh0IGV2ZW4gaWYgdGhlIGluaXRpYWxpemF0aW9uIGZhaWxlZC4KICAgICBp ZiAobmVlZHNHcmFwaGljc0NvbnRleHRTYXZlID09IFNhdmVHcmFwaGljc0NvbnRleHQpIHsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvU1ZHUmVuZGVyaW5nQ29udGV4 dC5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9TVkdSZW5kZXJpbmdDb250ZXh0LmgK aW5kZXggZmI2YzI5Yzk3ZTFhZGRkYjZiNzUzNWFkZTExYWE3MGVhZTFiOWRkYi4uOGI5Yjc0YWQ2 NzgyMTJlYjk2Mzc4NzMxODIwNzg1YjlmYTAxNWI4OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL3N2Zy9TVkdSZW5kZXJpbmdDb250ZXh0LmgKKysrIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL3N2Zy9TVkdSZW5kZXJpbmdDb250ZXh0LmgKQEAgLTQ1LDIwICs0NSwxMCBA QCBwdWJsaWM6CiAKICAgICAvLyBEb2VzIG5vdCBzdGFydCByZW5kZXJpbmcuCiAgICAgU1ZHUmVu ZGVyaW5nQ29udGV4dCgpCi0gICAgICAgIDogbV9yZW5kZXJpbmdGbGFncygwKQotICAgICAgICAs IG1fcmVuZGVyZXIobnVsbHB0cikKLSAgICAgICAgLCBtX3BhaW50SW5mbyhudWxscHRyKQotICAg ICAgICAsIG1fc2F2ZWRDb250ZXh0KG51bGxwdHIpCi0gICAgICAgICwgbV9maWx0ZXIobnVsbHB0 cikKICAgICB7CiAgICAgfQogCiAgICAgU1ZHUmVuZGVyaW5nQ29udGV4dChSZW5kZXJFbGVtZW50 JiBvYmplY3QsIFBhaW50SW5mbyYgcGFpbnRpbmZvLCBOZWVkc0dyYXBoaWNzQ29udGV4dFNhdmUg bmVlZHNHcmFwaGljc0NvbnRleHRTYXZlID0gRG9udFNhdmVHcmFwaGljc0NvbnRleHQpCi0gICAg ICAgIDogbV9yZW5kZXJpbmdGbGFncygwKQotICAgICAgICAsIG1fcmVuZGVyZXIobnVsbHB0cikK LSAgICAgICAgLCBtX3BhaW50SW5mbyhudWxscHRyKQotICAgICAgICAsIG1fc2F2ZWRDb250ZXh0 KG51bGxwdHIpCi0gICAgICAgICwgbV9maWx0ZXIobnVsbHB0cikKICAgICB7CiAgICAgICAgIHBy ZXBhcmVUb1JlbmRlclNWR0NvbnRlbnQob2JqZWN0LCBwYWludGluZm8sIG5lZWRzR3JhcGhpY3ND b250ZXh0U2F2ZSk7CiAgICAgfQpAQCAtMTAyLDEyICs5MiwxMiBAQCBwcml2YXRlOgogICAgIC8v IExpc3Qgb2YgdGhvc2UgZmxhZ3Mgd2hpY2ggcmVxdWlyZSBhY3Rpb25zIGR1cmluZyB0aGUgZGVz dHJ1Y3Rvci4KICAgICBjb25zdCBzdGF0aWMgaW50IEFjdGlvbnNOZWVkZWQgPSBSZXN0b3JlR3Jh cGhpY3NDb250ZXh0IHwgRW5kT3BhY2l0eUxheWVyIHwgRW5kU2hhZG93TGF5ZXIgfCBFbmRGaWx0 ZXJMYXllcjsKIAotICAgIGludCBtX3JlbmRlcmluZ0ZsYWdzOwotICAgIFJlbmRlckVsZW1lbnQq IG1fcmVuZGVyZXI7Ci0gICAgUGFpbnRJbmZvKiBtX3BhaW50SW5mbzsKLSAgICBHcmFwaGljc0Nv bnRleHQqIG1fc2F2ZWRDb250ZXh0OworICAgIFJlbmRlckVsZW1lbnQqIG1fcmVuZGVyZXIgeyBu dWxscHRyIH07CisgICAgUGFpbnRJbmZvKiBtX3BhaW50SW5mbyB7IG51bGxwdHIgfTsKKyAgICBH cmFwaGljc0NvbnRleHQqIG1fc2F2ZWRDb250ZXh0ICB7IG51bGxwdHIgfTsKKyAgICBSZW5kZXJT VkdSZXNvdXJjZUZpbHRlciogbV9maWx0ZXIgIHsgbnVsbHB0ciB9OwogICAgIExheW91dFJlY3Qg bV9zYXZlZFBhaW50UmVjdDsKLSAgICBSZW5kZXJTVkdSZXNvdXJjZUZpbHRlciogbV9maWx0ZXI7 CisgICAgaW50IG1fcmVuZGVyaW5nRmxhZ3MgeyAwIH07CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBX ZWJDb3JlCg==