189260 2018-09-04 08:41:57 -0700 Remove pointless RenderSVGResourceMode::ApplyToDefault enum value 2018-09-04 21:34:16 -0700 1 1 1 Unclassified WebKit SVG WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 koivisto webkit-unassigned commit-queue sam webkit-bug-importer zimmermann oldest_to_newest 1456314 0 koivisto 2018-09-04 08:41:57 -0700 Default is better represented with an empty OptionSet. 1456326 1 348818 koivisto 2018-09-04 09:35:43 -0700 Created attachment 348818 patch 1456618 2 348818 commit-queue 2018-09-04 21:33:06 -0700 Comment on attachment 348818 patch Clearing flags on attachment: 348818 Committed r235657: <https://trac.webkit.org/changeset/235657> 1456619 3 commit-queue 2018-09-04 21:33:07 -0700 All reviewed patches have been landed. Closing bug. 1456621 4 webkit-bug-importer 2018-09-04 21:34:16 -0700 <rdar://problem/44126081> 348818 2018-09-04 09:35:43 -0700 2018-09-04 21:33:06 -0700 patch remove-svg-applytodefault.patch text/plain 15268 koivisto SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIzNTYxMikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQwIEBACisyMDE4LTA5LTA0ICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBSZW1vdmUgcG9pbnRsZXNzIFJl bmRlclNWR1Jlc291cmNlTW9kZTo6QXBwbHlUb0RlZmF1bHQgZW51bSB2YWx1ZQorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg5MjYwCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRGVmYXVsdCBkb2VzIG5vdCBu ZWVkIGEgYml0LCBpdCBpcyBiZXR0ZXIgcmVwcmVzZW50ZWQgd2l0aCBhbiBlbXB0eSBPcHRpb25T ZXQuCisKKyAgICAgICAgKiByZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jlc291cmNlLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OnJlcXVlc3RQYWludGluZ1Jlc291cmNlKToKKyAgICAgICAgKiByZW5k ZXJpbmcvc3ZnL1JlbmRlclNWR1Jlc291cmNlLmg6CisgICAgICAgICogcmVuZGVyaW5nL3N2Zy9S ZW5kZXJTVkdSZXNvdXJjZUNsaXBwZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyU1ZH UmVzb3VyY2VDbGlwcGVyOjphcHBseVJlc291cmNlKToKKyAgICAgICAgKiByZW5kZXJpbmcvc3Zn L1JlbmRlclNWR1Jlc291cmNlRmlsdGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclNW R1Jlc291cmNlRmlsdGVyOjphcHBseVJlc291cmNlKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl clNWR1Jlc291cmNlRmlsdGVyOjpwb3N0QXBwbHlSZXNvdXJjZSk6CisgICAgICAgICogcmVuZGVy aW5nL3N2Zy9SZW5kZXJTVkdSZXNvdXJjZUdyYWRpZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OlJlbmRlclNWR1Jlc291cmNlR3JhZGllbnQ6OmFwcGx5UmVzb3VyY2UpOgorICAgICAgICAqIHJl bmRlcmluZy9zdmcvUmVuZGVyU1ZHUmVzb3VyY2VNYXNrZXIuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6UmVuZGVyU1ZHUmVzb3VyY2VNYXNrZXI6OmFwcGx5UmVzb3VyY2UpOgorICAgICAgICAqIHJl bmRlcmluZy9zdmcvUmVuZGVyU1ZHUmVzb3VyY2VQYXR0ZXJuLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OlJlbmRlclNWR1Jlc291cmNlUGF0dGVybjo6YXBwbHlSZXNvdXJjZSk6CisgICAgICAgIChX ZWJDb3JlOjpSZW5kZXJTVkdSZXNvdXJjZVBhdHRlcm46OnBvc3RBcHBseVJlc291cmNlKToKKyAg ICAgICAgKiByZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jlc291cmNlU29saWRDb2xvci5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpSZW5kZXJTVkdSZXNvdXJjZVNvbGlkQ29sb3I6OmFwcGx5UmVzb3Vy Y2UpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyU1ZHUmVzb3VyY2VTb2xpZENvbG9yOjpwb3N0 QXBwbHlSZXNvdXJjZSk6CisgICAgICAgICogcmVuZGVyaW5nL3N2Zy9TVkdJbmxpbmVUZXh0Qm94 LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNWR0lubGluZVRleHRCb3g6OlNWR0lubGluZVRleHRC b3gpOgorICAgICAgICAoV2ViQ29yZTo6U1ZHSW5saW5lVGV4dEJveDo6cGFpbnRTZWxlY3Rpb25C YWNrZ3JvdW5kKToKKyAgICAgICAgKFdlYkNvcmU6OlNWR0lubGluZVRleHRCb3g6OnBhaW50KToK KyAgICAgICAgKFdlYkNvcmU6OlNWR0lubGluZVRleHRCb3g6OmFjcXVpcmVQYWludGluZ1Jlc291 cmNlKToKKyAgICAgICAgKFdlYkNvcmU6OlNWR0lubGluZVRleHRCb3g6OnBhaW50RGVjb3JhdGlv bldpdGhTdHlsZSk6CisgICAgICAgICogcmVuZGVyaW5nL3N2Zy9TVkdSZW5kZXJpbmdDb250ZXh0 LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNWR1JlbmRlcmluZ0NvbnRleHQ6On5TVkdSZW5kZXJp bmdDb250ZXh0KToKKyAgICAgICAgKFdlYkNvcmU6OlNWR1JlbmRlcmluZ0NvbnRleHQ6OnByZXBh cmVUb1JlbmRlclNWR0NvbnRlbnQpOgorCiAyMDE4LTA5LTA0ICBaYW4gRG9iZXJzZWsgIDx6ZG9i ZXJzZWtAaWdhbGlhLmNvbT4gYW5kIE1zMmdlciAgPE1zMmdlckBpZ2FsaWEuY29tPgogCiAgICAg ICAgIEltcGxlbWVudCBzdXBwb3J0IGZvciBwYXNzaW5nIEltYWdlQml0bWFwIHRvIHRleEltYWdl MkQvdGV4U3ViSW1hZ2UyRApJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5k ZXJTVkdSZXNvdXJjZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L3N2Zy9SZW5kZXJTVkdSZXNvdXJjZS5jcHAJKHJldmlzaW9uIDIzNTYwNCkKKysrIFNvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZHUmVzb3VyY2UuY3BwCSh3b3JraW5nIGNvcHkp CkBAIC00Nyw3ICs0Nyw3IEBAIHN0YXRpYyBpbmxpbmUgYm9vbCBpbmhlcml0Q29sb3JGcm9tUGFy ZW4KICAgICByZXR1cm4gdHJ1ZTsKIH0KIAotc3RhdGljIGlubGluZSBSZW5kZXJTVkdSZXNvdXJj ZSogcmVxdWVzdFBhaW50aW5nUmVzb3VyY2UoT3B0aW9uU2V0PFJlbmRlclNWR1Jlc291cmNlTW9k ZT4gbW9kZSwgUmVuZGVyRWxlbWVudCYgcmVuZGVyZXIsIGNvbnN0IFJlbmRlclN0eWxlJiBzdHls ZSwgQ29sb3ImIGZhbGxiYWNrQ29sb3IpCitzdGF0aWMgaW5saW5lIFJlbmRlclNWR1Jlc291cmNl KiByZXF1ZXN0UGFpbnRpbmdSZXNvdXJjZShSZW5kZXJTVkdSZXNvdXJjZU1vZGUgbW9kZSwgUmVu ZGVyRWxlbWVudCYgcmVuZGVyZXIsIGNvbnN0IFJlbmRlclN0eWxlJiBzdHlsZSwgQ29sb3ImIGZh bGxiYWNrQ29sb3IpCiB7CiAgICAgY29uc3QgU1ZHUmVuZGVyU3R5bGUmIHN2Z1N0eWxlID0gc3R5 bGUuc3ZnU3R5bGUoKTsKIApJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5k ZXJTVkdSZXNvdXJjZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9z dmcvUmVuZGVyU1ZHUmVzb3VyY2UuaAkocmV2aXNpb24gMjM1NjA0KQorKysgU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdSZXNvdXJjZS5oCSh3b3JraW5nIGNvcHkpCkBAIC0z OCwxMCArMzgsOSBAQCBlbnVtIFJlbmRlclNWR1Jlc291cmNlVHlwZSB7CiAKIC8vIElmIHRoaXMg ZW51bSBjaGFuZ2VzIGNoYW5nZSB0aGUgdW5zaWduZWQgYml0ZmllbGRzIHVzaW5nIGl0LgogZW51 bSBjbGFzcyBSZW5kZXJTVkdSZXNvdXJjZU1vZGUgewotICAgIEFwcGx5VG9EZWZhdWx0ID0gMSA8 PCAwLCAvLyB1c2VkIGZvciBhbGwgcmVzb3VyY2VzIGV4Y2VwdCBncmFkaWVudC9wYXR0ZXJuCi0g ICAgQXBwbHlUb0ZpbGwgICAgPSAxIDw8IDEsCi0gICAgQXBwbHlUb1N0cm9rZSAgPSAxIDw8IDIs Ci0gICAgQXBwbHlUb1RleHQgICAgPSAxIDw8IDMgLy8gdXNlZCBpbiBjb21iaW5hdGlvbiB3aXRo IEFwcGx5VG97RmlsbHxTdHJva2V9TW9kZQorICAgIEFwcGx5VG9GaWxsICAgID0gMSA8PCAwLAor ICAgIEFwcGx5VG9TdHJva2UgID0gMSA8PCAxLAorICAgIEFwcGx5VG9UZXh0ICAgID0gMSA8PCAy IC8vIHVzZWQgaW4gY29tYmluYXRpb24gd2l0aCBBcHBseVRve0ZpbGx8U3Ryb2tlfU1vZGUKIH07 CiAKIGNsYXNzIENvbG9yOwpJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5k ZXJTVkdSZXNvdXJjZUNsaXBwZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9zdmcvUmVuZGVyU1ZHUmVzb3VyY2VDbGlwcGVyLmNwcAkocmV2aXNpb24gMjM1NjA0 KQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdSZXNvdXJjZUNsaXBw ZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC02OCw3ICs2OCw3IEBAIHZvaWQgUmVuZGVyU1ZHUmVz b3VyY2VDbGlwcGVyOjpyZW1vdmVDbGkKIGJvb2wgUmVuZGVyU1ZHUmVzb3VyY2VDbGlwcGVyOjph cHBseVJlc291cmNlKFJlbmRlckVsZW1lbnQmIHJlbmRlcmVyLCBjb25zdCBSZW5kZXJTdHlsZSYs IEdyYXBoaWNzQ29udGV4dComIGNvbnRleHQsIE9wdGlvblNldDxSZW5kZXJTVkdSZXNvdXJjZU1v ZGU+IHJlc291cmNlTW9kZSkKIHsKICAgICBBU1NFUlQoY29udGV4dCk7Ci0gICAgQVNTRVJUX1VO VVNFRChyZXNvdXJjZU1vZGUsIHJlc291cmNlTW9kZSA9PSBSZW5kZXJTVkdSZXNvdXJjZU1vZGU6 OkFwcGx5VG9EZWZhdWx0KTsKKyAgICBBU1NFUlRfVU5VU0VEKHJlc291cmNlTW9kZSwgIXJlc291 cmNlTW9kZSk7CiAKICAgICByZXR1cm4gYXBwbHlDbGlwcGluZ1RvQ29udGV4dChyZW5kZXJlciwg cmVuZGVyZXIub2JqZWN0Qm91bmRpbmdCb3goKSwgcmVuZGVyZXIucmVwYWludFJlY3RJbkxvY2Fs Q29vcmRpbmF0ZXMoKSwgKmNvbnRleHQpOwogfQpJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL3N2Zy9SZW5kZXJTVkdSZXNvdXJjZUZpbHRlci5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdSZXNvdXJjZUZpbHRlci5jcHAJKHJldmlz aW9uIDIzNTYwNCkKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZHUmVz b3VyY2VGaWx0ZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMTEsNyArMTExLDcgQEAgc3RkOjp1 bmlxdWVfcHRyPFNWR0ZpbHRlckJ1aWxkZXI+IFJlbmRlcgogYm9vbCBSZW5kZXJTVkdSZXNvdXJj ZUZpbHRlcjo6YXBwbHlSZXNvdXJjZShSZW5kZXJFbGVtZW50JiByZW5kZXJlciwgY29uc3QgUmVu ZGVyU3R5bGUmLCBHcmFwaGljc0NvbnRleHQqJiBjb250ZXh0LCBPcHRpb25TZXQ8UmVuZGVyU1ZH UmVzb3VyY2VNb2RlPiByZXNvdXJjZU1vZGUpCiB7CiAgICAgQVNTRVJUKGNvbnRleHQpOwotICAg IEFTU0VSVF9VTlVTRUQocmVzb3VyY2VNb2RlLCByZXNvdXJjZU1vZGUgPT0gUmVuZGVyU1ZHUmVz b3VyY2VNb2RlOjpBcHBseVRvRGVmYXVsdCk7CisgICAgQVNTRVJUX1VOVVNFRChyZXNvdXJjZU1v ZGUsICFyZXNvdXJjZU1vZGUpOwogCiAgICAgTE9HKEZpbHRlcnMsICJSZW5kZXJTVkdSZXNvdXJj ZUZpbHRlciAlcCBhcHBseVJlc291cmNlIHJlbmRlcmVyICVwIiwgdGhpcywgJnJlbmRlcmVyKTsK IApAQCAtMjI5LDcgKzIyOSw3IEBAIGJvb2wgUmVuZGVyU1ZHUmVzb3VyY2VGaWx0ZXI6OmFwcGx5 UmVzb3UKIHZvaWQgUmVuZGVyU1ZHUmVzb3VyY2VGaWx0ZXI6OnBvc3RBcHBseVJlc291cmNlKFJl bmRlckVsZW1lbnQmIHJlbmRlcmVyLCBHcmFwaGljc0NvbnRleHQqJiBjb250ZXh0LCBPcHRpb25T ZXQ8UmVuZGVyU1ZHUmVzb3VyY2VNb2RlPiByZXNvdXJjZU1vZGUsIGNvbnN0IFBhdGgqLCBjb25z dCBSZW5kZXJTVkdTaGFwZSopCiB7CiAgICAgQVNTRVJUKGNvbnRleHQpOwotICAgIEFTU0VSVF9V TlVTRUQocmVzb3VyY2VNb2RlLCByZXNvdXJjZU1vZGUgPT0gUmVuZGVyU1ZHUmVzb3VyY2VNb2Rl OjpBcHBseVRvRGVmYXVsdCk7CisgICAgQVNTRVJUX1VOVVNFRChyZXNvdXJjZU1vZGUsICFyZXNv dXJjZU1vZGUpOwogCiAgICAgYXV0byBmaW5kUmVzdWx0ID0gbV9yZW5kZXJlckZpbHRlckRhdGFN YXAuZmluZCgmcmVuZGVyZXIpOwogICAgIGlmIChmaW5kUmVzdWx0ID09IG1fcmVuZGVyZXJGaWx0 ZXJEYXRhTWFwLmVuZCgpKQpJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5k ZXJTVkdSZXNvdXJjZUdyYWRpZW50LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jlc291cmNlR3JhZGllbnQuY3BwCShyZXZpc2lvbiAyMzU2 MDQpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jlc291cmNlR3Jh ZGllbnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC05Nyw3ICs5Nyw3IEBAIHN0YXRpYyBpbmxpbmUg QWZmaW5lVHJhbnNmb3JtIGNsaXBUb1RleHQKIGJvb2wgUmVuZGVyU1ZHUmVzb3VyY2VHcmFkaWVu dDo6YXBwbHlSZXNvdXJjZShSZW5kZXJFbGVtZW50JiByZW5kZXJlciwgY29uc3QgUmVuZGVyU3R5 bGUmIHN0eWxlLCBHcmFwaGljc0NvbnRleHQqJiBjb250ZXh0LCBPcHRpb25TZXQ8UmVuZGVyU1ZH UmVzb3VyY2VNb2RlPiByZXNvdXJjZU1vZGUpCiB7CiAgICAgQVNTRVJUKGNvbnRleHQpOwotICAg IEFTU0VSVChyZXNvdXJjZU1vZGUgIT0gUmVuZGVyU1ZHUmVzb3VyY2VNb2RlOjpBcHBseVRvRGVm YXVsdCk7CisgICAgQVNTRVJUKCFyZXNvdXJjZU1vZGUuaXNFbXB0eSgpKTsKIAogICAgIC8vIEJl IHN1cmUgdG8gc3luY2hyb25pemUgYWxsIFNWRyBwcm9wZXJ0aWVzIG9uIHRoZSBncmFkaWVudEVs ZW1lbnQgX2JlZm9yZV8gcHJvY2Vzc2luZyBhbnkgZnVydGhlci4KICAgICAvLyBPdGhlcndoaXNl IHRoZSBjYWxsIHRvIGNvbGxlY3RHcmFkaWVudEF0dHJpYnV0ZXMoKSBpbiBjcmVhdGVUaWxlSW1h Z2UoKSwgbWF5IGNhdXNlIHRoZSBTVkcgRE9NIHByb3BlcnR5CkBAIC0xOTAsNyArMTkwLDcgQEAg Ym9vbCBSZW5kZXJTVkdSZXNvdXJjZUdyYWRpZW50OjphcHBseVJlcwogdm9pZCBSZW5kZXJTVkdS ZXNvdXJjZUdyYWRpZW50Ojpwb3N0QXBwbHlSZXNvdXJjZShSZW5kZXJFbGVtZW50JiByZW5kZXJl ciwgR3JhcGhpY3NDb250ZXh0KiYgY29udGV4dCwgT3B0aW9uU2V0PFJlbmRlclNWR1Jlc291cmNl TW9kZT4gcmVzb3VyY2VNb2RlLCBjb25zdCBQYXRoKiBwYXRoLCBjb25zdCBSZW5kZXJTVkdTaGFw ZSogc2hhcGUpCiB7CiAgICAgQVNTRVJUKGNvbnRleHQpOwotICAgIEFTU0VSVChyZXNvdXJjZU1v ZGUgIT0gUmVuZGVyU1ZHUmVzb3VyY2VNb2RlOjpBcHBseVRvRGVmYXVsdCk7CisgICAgQVNTRVJU KCFyZXNvdXJjZU1vZGUuaXNFbXB0eSgpKTsKIAogICAgIGlmIChyZXNvdXJjZU1vZGUuY29udGFp bnMoUmVuZGVyU1ZHUmVzb3VyY2VNb2RlOjpBcHBseVRvVGV4dCkpIHsKICNpZiBVU0UoQ0cpCklu ZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jlc291cmNlTWFza2Vy LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNW R1Jlc291cmNlTWFza2VyLmNwcAkocmV2aXNpb24gMjM1NjA0KQorKysgU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdSZXNvdXJjZU1hc2tlci5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTU3LDcgKzU3LDcgQEAgdm9pZCBSZW5kZXJTVkdSZXNvdXJjZU1hc2tlcjo6cmVtb3ZlQ2xp ZQogYm9vbCBSZW5kZXJTVkdSZXNvdXJjZU1hc2tlcjo6YXBwbHlSZXNvdXJjZShSZW5kZXJFbGVt ZW50JiByZW5kZXJlciwgY29uc3QgUmVuZGVyU3R5bGUmLCBHcmFwaGljc0NvbnRleHQqJiBjb250 ZXh0LCBPcHRpb25TZXQ8UmVuZGVyU1ZHUmVzb3VyY2VNb2RlPiByZXNvdXJjZU1vZGUpCiB7CiAg ICAgQVNTRVJUKGNvbnRleHQpOwotICAgIEFTU0VSVF9VTlVTRUQocmVzb3VyY2VNb2RlLCByZXNv dXJjZU1vZGUgPT0gUmVuZGVyU1ZHUmVzb3VyY2VNb2RlOjpBcHBseVRvRGVmYXVsdCk7CisgICAg QVNTRVJUX1VOVVNFRChyZXNvdXJjZU1vZGUsICFyZXNvdXJjZU1vZGUpOwogCiAgICAgYm9vbCBt aXNzaW5nTWFza2VyRGF0YSA9ICFtX21hc2tlci5jb250YWlucygmcmVuZGVyZXIpOwogICAgIGlm IChtaXNzaW5nTWFza2VyRGF0YSkKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcv UmVuZGVyU1ZHUmVzb3VyY2VQYXR0ZXJuLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jlc291cmNlUGF0dGVybi5jcHAJKHJldmlzaW9uIDIz NTYwNCkKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZHUmVzb3VyY2VQ YXR0ZXJuLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTQ2LDcgKzE0Niw3IEBAIFBhdHRlcm5EYXRh KiBSZW5kZXJTVkdSZXNvdXJjZVBhdHRlcm46OmIKIGJvb2wgUmVuZGVyU1ZHUmVzb3VyY2VQYXR0 ZXJuOjphcHBseVJlc291cmNlKFJlbmRlckVsZW1lbnQmIHJlbmRlcmVyLCBjb25zdCBSZW5kZXJT dHlsZSYgc3R5bGUsIEdyYXBoaWNzQ29udGV4dComIGNvbnRleHQsIE9wdGlvblNldDxSZW5kZXJT VkdSZXNvdXJjZU1vZGU+IHJlc291cmNlTW9kZSkKIHsKICAgICBBU1NFUlQoY29udGV4dCk7Ci0g ICAgQVNTRVJUKHJlc291cmNlTW9kZSAhPSBSZW5kZXJTVkdSZXNvdXJjZU1vZGU6OkFwcGx5VG9E ZWZhdWx0KTsKKyAgICBBU1NFUlQoIXJlc291cmNlTW9kZS5pc0VtcHR5KCkpOwogCiAgICAgaWYg KG1fc2hvdWxkQ29sbGVjdFBhdHRlcm5BdHRyaWJ1dGVzKSB7CiAgICAgICAgIHBhdHRlcm5FbGVt ZW50KCkuc3luY2hyb25pemVBbmltYXRlZFNWR0F0dHJpYnV0ZShhbnlRTmFtZSgpKTsKQEAgLTIw NSw3ICsyMDUsNyBAQCBib29sIFJlbmRlclNWR1Jlc291cmNlUGF0dGVybjo6YXBwbHlSZXNvCiB2 b2lkIFJlbmRlclNWR1Jlc291cmNlUGF0dGVybjo6cG9zdEFwcGx5UmVzb3VyY2UoUmVuZGVyRWxl bWVudCYsIEdyYXBoaWNzQ29udGV4dComIGNvbnRleHQsIE9wdGlvblNldDxSZW5kZXJTVkdSZXNv dXJjZU1vZGU+IHJlc291cmNlTW9kZSwgY29uc3QgUGF0aCogcGF0aCwgY29uc3QgUmVuZGVyU1ZH U2hhcGUqIHNoYXBlKQogewogICAgIEFTU0VSVChjb250ZXh0KTsKLSAgICBBU1NFUlQocmVzb3Vy Y2VNb2RlICE9IFJlbmRlclNWR1Jlc291cmNlTW9kZTo6QXBwbHlUb0RlZmF1bHQpOworICAgIEFT U0VSVCghcmVzb3VyY2VNb2RlLmlzRW1wdHkoKSk7CiAKICAgICBpZiAocmVzb3VyY2VNb2RlLmNv bnRhaW5zKFJlbmRlclNWR1Jlc291cmNlTW9kZTo6QXBwbHlUb0ZpbGwpKSB7CiAgICAgICAgIGlm IChwYXRoKQpJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdSZXNv dXJjZVNvbGlkQ29sb3IuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9zdmcvUmVuZGVyU1ZHUmVzb3VyY2VTb2xpZENvbG9yLmNwcAkocmV2aXNpb24gMjM1NjA0KQor KysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdSZXNvdXJjZVNvbGlkQ29s b3IuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zNSw3ICszNSw3IEBAIFJlbmRlclNWR1Jlc291cmNl U29saWRDb2xvcjo6flJlbmRlclNWR1IKIGJvb2wgUmVuZGVyU1ZHUmVzb3VyY2VTb2xpZENvbG9y OjphcHBseVJlc291cmNlKFJlbmRlckVsZW1lbnQmIHJlbmRlcmVyLCBjb25zdCBSZW5kZXJTdHls ZSYgc3R5bGUsIEdyYXBoaWNzQ29udGV4dComIGNvbnRleHQsIE9wdGlvblNldDxSZW5kZXJTVkdS ZXNvdXJjZU1vZGU+IHJlc291cmNlTW9kZSkKIHsKICAgICBBU1NFUlQoY29udGV4dCk7Ci0gICAg QVNTRVJUKHJlc291cmNlTW9kZSAhPSBSZW5kZXJTVkdSZXNvdXJjZU1vZGU6OkFwcGx5VG9EZWZh dWx0KTsKKyAgICBBU1NFUlQoIXJlc291cmNlTW9kZS5pc0VtcHR5KCkpOwogCiAgICAgY29uc3Qg U1ZHUmVuZGVyU3R5bGUmIHN2Z1N0eWxlID0gc3R5bGUuc3ZnU3R5bGUoKTsKIApAQCAtNzAsNyAr NzAsNyBAQCBib29sIFJlbmRlclNWR1Jlc291cmNlU29saWRDb2xvcjo6YXBwbHlSCiB2b2lkIFJl bmRlclNWR1Jlc291cmNlU29saWRDb2xvcjo6cG9zdEFwcGx5UmVzb3VyY2UoUmVuZGVyRWxlbWVu dCYsIEdyYXBoaWNzQ29udGV4dComIGNvbnRleHQsIE9wdGlvblNldDxSZW5kZXJTVkdSZXNvdXJj ZU1vZGU+IHJlc291cmNlTW9kZSwgY29uc3QgUGF0aCogcGF0aCwgY29uc3QgUmVuZGVyU1ZHU2hh cGUqIHNoYXBlKQogewogICAgIEFTU0VSVChjb250ZXh0KTsKLSAgICBBU1NFUlQocmVzb3VyY2VN b2RlICE9IFJlbmRlclNWR1Jlc291cmNlTW9kZTo6QXBwbHlUb0RlZmF1bHQpOworICAgIEFTU0VS VCghcmVzb3VyY2VNb2RlLmlzRW1wdHkoKSk7CiAKICAgICBpZiAocmVzb3VyY2VNb2RlLmNvbnRh aW5zKFJlbmRlclNWR1Jlc291cmNlTW9kZTo6QXBwbHlUb0ZpbGwpKSB7CiAgICAgICAgIGlmIChw YXRoKQpJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9TVkdJbmxpbmVUZXh0Qm94 LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1NWR0lubGlu ZVRleHRCb3guY3BwCShyZXZpc2lvbiAyMzU2MDQpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvc3ZnL1NWR0lubGluZVRleHRCb3guY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01Myw3ICs1Myw3 IEBAIENPTVBJTEVfQVNTRVJUKHNpemVvZihTVkdJbmxpbmVUZXh0Qm94KSAKIAogU1ZHSW5saW5l VGV4dEJveDo6U1ZHSW5saW5lVGV4dEJveChSZW5kZXJTVkdJbmxpbmVUZXh0JiByZW5kZXJlcikK ICAgICA6IElubGluZVRleHRCb3gocmVuZGVyZXIpCi0gICAgLCBtX3BhaW50aW5nUmVzb3VyY2VN b2RlKE9wdGlvblNldDxSZW5kZXJTVkdSZXNvdXJjZU1vZGU+KFJlbmRlclNWR1Jlc291cmNlTW9k ZTo6QXBwbHlUb0RlZmF1bHQpLnRvUmF3KCkpCisgICAgLCBtX3BhaW50aW5nUmVzb3VyY2VNb2Rl KE9wdGlvblNldDxSZW5kZXJTVkdSZXNvdXJjZU1vZGU+KCkudG9SYXcoKSkKICAgICAsIG1fc3Rh cnRzTmV3VGV4dENodW5rKGZhbHNlKQogewogfQpAQCAtMjI3LDcgKzIyNyw3IEBAIHZvaWQgU1ZH SW5saW5lVGV4dEJveDo6cGFpbnRTZWxlY3Rpb25CYWMKICAgICAgICAgcGFpbnRJbmZvLmNvbnRl eHQoKS5zZXRGaWxsQ29sb3IoYmFja2dyb3VuZENvbG9yKTsKICAgICAgICAgcGFpbnRJbmZvLmNv bnRleHQoKS5maWxsUmVjdChzZWxlY3Rpb25SZWN0Rm9yVGV4dEZyYWdtZW50KGZyYWdtZW50LCBm cmFnbWVudFN0YXJ0UG9zaXRpb24sIGZyYWdtZW50RW5kUG9zaXRpb24sIHN0eWxlKSwgYmFja2dy b3VuZENvbG9yKTsKIAotICAgICAgICBzZXRQYWludGluZ1Jlc291cmNlTW9kZShSZW5kZXJTVkdS ZXNvdXJjZU1vZGU6OkFwcGx5VG9EZWZhdWx0KTsKKyAgICAgICAgc2V0UGFpbnRpbmdSZXNvdXJj ZU1vZGUoeyB9KTsKICAgICB9CiAKICAgICBBU1NFUlQoIW1fcGFpbnRpbmdSZXNvdXJjZSk7CkBA IC0zMjYsNyArMzI2LDcgQEAgdm9pZCBTVkdJbmxpbmVUZXh0Qm94OjpwYWludChQYWludEluZm8m IAogICAgICAgICBpZiAoZGVjb3JhdGlvbnMgJiBUZXh0RGVjb3JhdGlvbjo6TGluZVRocm91Z2gp CiAgICAgICAgICAgICBwYWludERlY29yYXRpb24ocGFpbnRJbmZvLmNvbnRleHQoKSwgVGV4dERl Y29yYXRpb246OkxpbmVUaHJvdWdoLCBmcmFnbWVudCk7CiAKLSAgICAgICAgc2V0UGFpbnRpbmdS ZXNvdXJjZU1vZGUoUmVuZGVyU1ZHUmVzb3VyY2VNb2RlOjpBcHBseVRvRGVmYXVsdCk7CisgICAg ICAgIHNldFBhaW50aW5nUmVzb3VyY2VNb2RlKHsgfSk7CiAgICAgfQogCiAgICAgLy8gRmluYWxs eSwgcGFpbnQgdGhlIG91dGxpbmUgaWYgYW55LgpAQCAtMzM5LDcgKzMzOSw3IEBAIHZvaWQgU1ZH SW5saW5lVGV4dEJveDo6cGFpbnQoUGFpbnRJbmZvJiAKIGJvb2wgU1ZHSW5saW5lVGV4dEJveDo6 YWNxdWlyZVBhaW50aW5nUmVzb3VyY2UoR3JhcGhpY3NDb250ZXh0KiYgY29udGV4dCwgZmxvYXQg c2NhbGluZ0ZhY3RvciwgUmVuZGVyQm94TW9kZWxPYmplY3QmIHJlbmRlcmVyLCBjb25zdCBSZW5k ZXJTdHlsZSYgc3R5bGUpCiB7CiAgICAgQVNTRVJUKHNjYWxpbmdGYWN0b3IpOwotICAgIEFTU0VS VChwYWludGluZ1Jlc291cmNlTW9kZSgpICE9IFJlbmRlclNWR1Jlc291cmNlTW9kZTo6QXBwbHlU b0RlZmF1bHQpOworICAgIEFTU0VSVCghcGFpbnRpbmdSZXNvdXJjZU1vZGUoKS5pc0VtcHR5KCkp OwogCiAgICAgQ29sb3IgZmFsbGJhY2tDb2xvcjsKICAgICBpZiAocGFpbnRpbmdSZXNvdXJjZU1v ZGUoKS5jb250YWlucyhSZW5kZXJTVkdSZXNvdXJjZU1vZGU6OkFwcGx5VG9GaWxsKSkKQEAgLTUw Miw3ICs1MDIsNyBAQCB2b2lkIFNWR0lubGluZVRleHRCb3g6OnBhaW50RGVjb3JhdGlvbihHCiB2 b2lkIFNWR0lubGluZVRleHRCb3g6OnBhaW50RGVjb3JhdGlvbldpdGhTdHlsZShHcmFwaGljc0Nv bnRleHQmIGNvbnRleHQsIE9wdGlvblNldDxUZXh0RGVjb3JhdGlvbj4gZGVjb3JhdGlvbiwgY29u c3QgU1ZHVGV4dEZyYWdtZW50JiBmcmFnbWVudCwgUmVuZGVyQm94TW9kZWxPYmplY3QmIGRlY29y YXRpb25SZW5kZXJlcikKIHsKICAgICBBU1NFUlQoIW1fcGFpbnRpbmdSZXNvdXJjZSk7Ci0gICAg QVNTRVJUKHBhaW50aW5nUmVzb3VyY2VNb2RlKCkgIT0gUmVuZGVyU1ZHUmVzb3VyY2VNb2RlOjpB cHBseVRvRGVmYXVsdCk7CisgICAgQVNTRVJUKCFwYWludGluZ1Jlc291cmNlTW9kZSgpLmlzRW1w dHkoKSk7CiAKICAgICBhdXRvJiBkZWNvcmF0aW9uU3R5bGUgPSBkZWNvcmF0aW9uUmVuZGVyZXIu c3R5bGUoKTsKIApJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9TVkdSZW5kZXJp bmdDb250ZXh0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3Zn L1NWR1JlbmRlcmluZ0NvbnRleHQuY3BwCShyZXZpc2lvbiAyMzU2MDQpCisrKyBTb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvc3ZnL1NWR1JlbmRlcmluZ0NvbnRleHQuY3BwCSh3b3JraW5nIGNvcHkp CkBAIC01Nyw3ICs1Nyw3IEBAIFNWR1JlbmRlcmluZ0NvbnRleHQ6On5TVkdSZW5kZXJpbmdDb250 ZXgKICAgICBpZiAobV9yZW5kZXJpbmdGbGFncyAmIEVuZEZpbHRlckxheWVyKSB7CiAgICAgICAg IEFTU0VSVChtX2ZpbHRlcik7CiAgICAgICAgIEdyYXBoaWNzQ29udGV4dCogY29udGV4dFB0ciA9 ICZtX3BhaW50SW5mby0+Y29udGV4dCgpOwotICAgICAgICBtX2ZpbHRlci0+cG9zdEFwcGx5UmVz b3VyY2UoKm1fcmVuZGVyZXIsIGNvbnRleHRQdHIsIFJlbmRlclNWR1Jlc291cmNlTW9kZTo6QXBw bHlUb0RlZmF1bHQsIG51bGxwdHIsIG51bGxwdHIpOworICAgICAgICBtX2ZpbHRlci0+cG9zdEFw cGx5UmVzb3VyY2UoKm1fcmVuZGVyZXIsIGNvbnRleHRQdHIsIHsgfSwgbnVsbHB0ciwgbnVsbHB0 cik7CiAgICAgICAgIG1fcGFpbnRJbmZvLT5zZXRDb250ZXh0KCptX3NhdmVkQ29udGV4dCk7CiAg ICAgICAgIG1fcGFpbnRJbmZvLT5yZWN0ID0gbV9zYXZlZFBhaW50UmVjdDsKICAgICB9CkBAIC0x NTEsNyArMTUxLDcgQEAgdm9pZCBTVkdSZW5kZXJpbmdDb250ZXh0OjpwcmVwYXJlVG9SZW5kZQog ICAgIGlmICghaXNSZW5kZXJpbmdNYXNrKSB7CiAgICAgICAgIGlmIChSZW5kZXJTVkdSZXNvdXJj ZU1hc2tlciogbWFza2VyID0gcmVzb3VyY2VzLT5tYXNrZXIoKSkgewogICAgICAgICAgICAgR3Jh cGhpY3NDb250ZXh0KiBjb250ZXh0UHRyID0gJm1fcGFpbnRJbmZvLT5jb250ZXh0KCk7Ci0gICAg ICAgICAgICBib29sIHJlc3VsdCA9IG1hc2tlci0+YXBwbHlSZXNvdXJjZSgqbV9yZW5kZXJlciwg c3R5bGUsIGNvbnRleHRQdHIsIFJlbmRlclNWR1Jlc291cmNlTW9kZTo6QXBwbHlUb0RlZmF1bHQp OworICAgICAgICAgICAgYm9vbCByZXN1bHQgPSBtYXNrZXItPmFwcGx5UmVzb3VyY2UoKm1fcmVu ZGVyZXIsIHN0eWxlLCBjb250ZXh0UHRyLCB7IH0pOwogICAgICAgICAgICAgbV9wYWludEluZm8t PnNldENvbnRleHQoKmNvbnRleHRQdHIpOwogICAgICAgICAgICAgaWYgKCFyZXN1bHQpCiAgICAg ICAgICAgICAgICAgcmV0dXJuOwpAQCAtMTYxLDcgKzE2MSw3IEBAIHZvaWQgU1ZHUmVuZGVyaW5n Q29udGV4dDo6cHJlcGFyZVRvUmVuZGUKICAgICBSZW5kZXJTVkdSZXNvdXJjZUNsaXBwZXIqIGNs aXBwZXIgPSByZXNvdXJjZXMtPmNsaXBwZXIoKTsKICAgICBpZiAoIWhhc0NTU0NsaXBwaW5nICYm IGNsaXBwZXIpIHsKICAgICAgICAgR3JhcGhpY3NDb250ZXh0KiBjb250ZXh0UHRyID0gJm1fcGFp bnRJbmZvLT5jb250ZXh0KCk7Ci0gICAgICAgIGJvb2wgcmVzdWx0ID0gY2xpcHBlci0+YXBwbHlS ZXNvdXJjZSgqbV9yZW5kZXJlciwgc3R5bGUsIGNvbnRleHRQdHIsIFJlbmRlclNWR1Jlc291cmNl TW9kZTo6QXBwbHlUb0RlZmF1bHQpOworICAgICAgICBib29sIHJlc3VsdCA9IGNsaXBwZXItPmFw cGx5UmVzb3VyY2UoKm1fcmVuZGVyZXIsIHN0eWxlLCBjb250ZXh0UHRyLCB7IH0pOwogICAgICAg ICBtX3BhaW50SW5mby0+c2V0Q29udGV4dCgqY29udGV4dFB0cik7CiAgICAgICAgIGlmICghcmVz dWx0KQogICAgICAgICAgICAgcmV0dXJuOwpAQCAtMTc2LDcgKzE3Niw3IEBAIHZvaWQgU1ZHUmVu ZGVyaW5nQ29udGV4dDo6cHJlcGFyZVRvUmVuZGUKICAgICAgICAgICAgIC8vIChiZWNhdXNlIGl0 IHdhcyBlaXRoZXIgZHJhd24gYmVmb3JlIG9yIGVtcHR5KSBidXQgd2Ugc3RpbGwgbmVlZCB0byBh cHBseSB0aGUgZmlsdGVyLgogICAgICAgICAgICAgbV9yZW5kZXJpbmdGbGFncyB8PSBFbmRGaWx0 ZXJMYXllcjsKICAgICAgICAgICAgIEdyYXBoaWNzQ29udGV4dCogY29udGV4dFB0ciA9ICZtX3Bh aW50SW5mby0+Y29udGV4dCgpOwotICAgICAgICAgICAgYm9vbCByZXN1bHQgPSBtX2ZpbHRlci0+ YXBwbHlSZXNvdXJjZSgqbV9yZW5kZXJlciwgc3R5bGUsIGNvbnRleHRQdHIsIFJlbmRlclNWR1Jl c291cmNlTW9kZTo6QXBwbHlUb0RlZmF1bHQpOworICAgICAgICAgICAgYm9vbCByZXN1bHQgPSBt X2ZpbHRlci0+YXBwbHlSZXNvdXJjZSgqbV9yZW5kZXJlciwgc3R5bGUsIGNvbnRleHRQdHIsIHsg fSk7CiAgICAgICAgICAgICBtX3BhaW50SW5mby0+c2V0Q29udGV4dCgqY29udGV4dFB0cik7CiAg ICAgICAgICAgICBpZiAoIXJlc3VsdCkKICAgICAgICAgICAgICAgICByZXR1cm47Cg==