18573 2008-04-18 00:20:21 -0700 Use supplemental transformations for <animateMotion> 2008-04-18 00:42:49 -0700 1 1 1 Unclassified WebKit SVG 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED P2 Normal --- 1 koivisto webkit-unassigned oldest_to_newest 78070 0 koivisto 2008-04-18 00:20:21 -0700 Use supplemental transformations for <animateMotion> 78071 1 20661 koivisto 2008-04-18 00:22:15 -0700 Created attachment 20661 patch 78075 2 koivisto 2008-04-18 00:42:49 -0700 Sending WebCore/ChangeLog Sending WebCore/svg/SVGAnimateMotionElement.cpp Sending WebCore/svg/SVGElement.h Sending WebCore/svg/SVGStyledTransformableElement.cpp Sending WebCore/svg/SVGStyledTransformableElement.h Sending WebCore/svg/SVGTextElement.cpp Sending WebCore/svg/SVGTextElement.h Transmitting file data ....... Committed revision 32197. 20661 2008-04-18 00:22:15 -0700 2008-04-18 00:32:47 -0700 patch svg-animation-supplemental.patch text/plain 8559 koivisto SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAzMjExNikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjcgQEAKKzIwMDgtMDQtMTcgIEFudHRpIEtvaXZpc3RvICA8YW50dGlAYXBwbGUu Y29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorICAgICAgICAKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4NTczCisKKyAg ICAgICAgSW1wbGVtZW50IHN1cHBsZW1lbnRhbCB0cmFuc2Zvcm1zIGFuZCB1c2UgdGhlbSBmb3Ig PGFuaW1hdGVNb3Rpb24+IGluc3RlYWQgb2YgdGhlIHRyYW5zZm9ybSBsaXN0LgorICAgICAgICBU aGlzIHdpbGwgYWxsb3cgPGFuaW1hdGVUcmFuc2Zvcm0+IGFuZCA8YW5pbWF0ZU1vdGlvbj4gY29t YmluZSBwcm9wZXJseS4KKworICAgICAgICAqIHN2Zy9TVkdBbmltYXRlTW90aW9uRWxlbWVudC5j cHA6CisgICAgICAgIChXZWJDb3JlOjpTVkdBbmltYXRlTW90aW9uRWxlbWVudDo6cmVzZXRUb0Jh c2VWYWx1ZSk6CisgICAgICAgIChXZWJDb3JlOjpTVkdBbmltYXRlTW90aW9uRWxlbWVudDo6Y2Fs Y3VsYXRlQW5pbWF0ZWRWYWx1ZSk6CisgICAgICAgIChXZWJDb3JlOjpTVkdBbmltYXRlTW90aW9u RWxlbWVudDo6YXBwbHlSZXN1bHRzVG9UYXJnZXQpOgorICAgICAgICAqIHN2Zy9TVkdFbGVtZW50 Lmg6CisgICAgICAgIChXZWJDb3JlOjpTVkdFbGVtZW50OjpzdXBwbGVtZW50YWxUcmFuc2Zvcm0p OgorICAgICAgICAqIHN2Zy9TVkdTdHlsZWRUcmFuc2Zvcm1hYmxlRWxlbWVudC5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpTVkdTdHlsZWRUcmFuc2Zvcm1hYmxlRWxlbWVudDo6YW5pbWF0ZWRMb2Nh bFRyYW5zZm9ybSk6CisgICAgICAgICogc3ZnL1NWR1N0eWxlZFRyYW5zZm9ybWFibGVFbGVtZW50 Lmg6CisgICAgICAgIChXZWJDb3JlOjpTVkdTdHlsZWRUcmFuc2Zvcm1hYmxlRWxlbWVudDo6c3Vw cGxlbWVudGFsVHJhbnNmb3JtKToKKyAgICAgICAgKiBzdmcvU1ZHVGV4dEVsZW1lbnQuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6U1ZHVGV4dEVsZW1lbnQ6OmFuaW1hdGVkTG9jYWxUcmFuc2Zvcm0p OgorICAgICAgICAqIHN2Zy9TVkdUZXh0RWxlbWVudC5oOgorICAgICAgICAoV2ViQ29yZTo6U1ZH VGV4dEVsZW1lbnQ6OnN1cHBsZW1lbnRhbFRyYW5zZm9ybSk6CisKIDIwMDgtMDQtMTcgIEFudHRp IEtvaXZpc3RvICA8YW50dGlAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IE9saXZl ci4KSW5kZXg6IFdlYkNvcmUvc3ZnL1NWR0FuaW1hdGVNb3Rpb25FbGVtZW50LmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBXZWJDb3JlL3N2Zy9TVkdBbmltYXRlTW90aW9uRWxlbWVudC5jcHAJKHJldmlzaW9u IDMyMDQ4KQorKysgV2ViQ29yZS9zdmcvU1ZHQW5pbWF0ZU1vdGlvbkVsZW1lbnQuY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC0xNDQsMTAgKzE0NCwxMSBAQCB2b2lkIFNWR0FuaW1hdGVNb3Rpb25FbGVt ZW50OjpyZXNldFRvQmFzCiB7CiAgICAgaWYgKCFoYXNWYWxpZFRhcmdldCgpKQogICAgICAgICBy ZXR1cm47Ci0gICAgU1ZHU3R5bGVkVHJhbnNmb3JtYWJsZUVsZW1lbnQqIHRyYW5zZm9ybWFibGVF bGVtZW50ID0gc3RhdGljX2Nhc3Q8U1ZHU3R5bGVkVHJhbnNmb3JtYWJsZUVsZW1lbnQqPih0YXJn ZXRFbGVtZW50KCkpOwotICAgIC8vIEZJWE1FOiBUaGlzIHNob3VsZCBtb2RpZnkgc3VwcGxlbWVu dGFsIHRyYW5zZm9ybSwgbm90IHRoZSB0cmFuc2Zvcm0gYXR0cmlidXRlIQotICAgIEV4Y2VwdGlv bkNvZGUgZWM7Ci0gICAgdHJhbnNmb3JtYWJsZUVsZW1lbnQtPnRyYW5zZm9ybSgpLT5jbGVhcihl Yyk7CisgICAgU1ZHRWxlbWVudCogdGFyZ2V0ID0gdGFyZ2V0RWxlbWVudCgpOworICAgIEFmZmlu ZVRyYW5zZm9ybSogdHJhbnNmb3JtID0gdGFyZ2V0LT5zdXBwbGVtZW50YWxUcmFuc2Zvcm0oKTsK KyAgICBpZiAoIXRyYW5zZm9ybSkKKyAgICAgICAgcmV0dXJuOworICAgIHRyYW5zZm9ybS0+cmVz ZXQoKTsKIH0KIAogYm9vbCBTVkdBbmltYXRlTW90aW9uRWxlbWVudDo6Y2FsY3VsYXRlRnJvbUFu ZFRvVmFsdWVzKGNvbnN0IFN0cmluZyYgZnJvbVN0cmluZywgY29uc3QgU3RyaW5nJiB0b1N0cmlu ZykKQEAgLTE2Niw0MCArMTY3LDI4IEBAIGJvb2wgU1ZHQW5pbWF0ZU1vdGlvbkVsZW1lbnQ6OmNh bGN1bGF0ZUYKICAgICByZXR1cm4gdHJ1ZTsKIH0KIAotdm9pZCBTVkdBbmltYXRlTW90aW9uRWxl bWVudDo6Y2FsY3VsYXRlQW5pbWF0ZWRWYWx1ZShmbG9hdCBwZXJjZW50YWdlLCB1bnNpZ25lZCBy ZXBlYXQsIFNWR1NNSUxFbGVtZW50KiByZXN1bHRFbGVtZW50KQordm9pZCBTVkdBbmltYXRlTW90 aW9uRWxlbWVudDo6Y2FsY3VsYXRlQW5pbWF0ZWRWYWx1ZShmbG9hdCBwZXJjZW50YWdlLCB1bnNp Z25lZCByZXBlYXQsIFNWR1NNSUxFbGVtZW50KikKIHsKLSAgICBpZiAoIXJlc3VsdEVsZW1lbnQt PnRhcmdldEVsZW1lbnQoKS0+aXNTdHlsZWRUcmFuc2Zvcm1hYmxlKCkpCisgICAgU1ZHRWxlbWVu dCogdGFyZ2V0ID0gdGFyZ2V0RWxlbWVudCgpOworICAgIGlmICghdGFyZ2V0KQogICAgICAgICBy ZXR1cm47Ci0gICAgCi0gICAgLy8gRklYTUU6IFRoaXMgc2hvdWxkIG1vZGlmeSBzdXBwbGVtZW50 YWwgdHJhbnNmb3JtLCBub3QgdGhlIHRyYW5zZm9ybSBhdHRyaWJ1dGUhCi0gICAgU1ZHU3R5bGVk VHJhbnNmb3JtYWJsZUVsZW1lbnQqIHRyYW5zZm9ybWFibGVFbGVtZW50ID0gc3RhdGljX2Nhc3Q8 U1ZHU3R5bGVkVHJhbnNmb3JtYWJsZUVsZW1lbnQqPihyZXN1bHRFbGVtZW50LT50YXJnZXRFbGVt ZW50KCkpOwotICAgIFJlZlB0cjxTVkdUcmFuc2Zvcm1MaXN0PiB0cmFuc2Zvcm1MaXN0ID0gdHJh bnNmb3JtYWJsZUVsZW1lbnQtPnRyYW5zZm9ybSgpOwotICAgIGlmICghdHJhbnNmb3JtTGlzdCkK KyAgICBBZmZpbmVUcmFuc2Zvcm0qIHRyYW5zZm9ybSA9IHRhcmdldC0+c3VwcGxlbWVudGFsVHJh bnNmb3JtKCk7CisgICAgaWYgKCF0cmFuc2Zvcm0pCiAgICAgICAgIHJldHVybjsKICAgICAKLSAg ICBFeGNlcHRpb25Db2RlIGVjOwotICAgIGlmICghaXNBZGRpdGl2ZSgpKSB7Ci0gICAgICAgIEFT U0VSVCh0aGlzID09IHJlc3VsdEVsZW1lbnQpOwotICAgICAgICB0cmFuc2Zvcm1MaXN0LT5jbGVh cihlYyk7Ci0gICAgfQorICAgIGlmICghaXNBZGRpdGl2ZSgpKQorICAgICAgICB0cmFuc2Zvcm0t PnJlc2V0KCk7CiAgICAgCisgICAgLy8gRklYTUU6IFRoaXMgbmVlZHMgdG8gZG8gcGF0aHMgYW5k IGFsbCB0aGF0LgogICAgIEZsb2F0U2l6ZSBkaWZmID0gbV90b1BvaW50IC0gbV9mcm9tUG9pbnQ7 Ci0gICAgQWZmaW5lVHJhbnNmb3JtIHRyYW5zZm9ybTsKLSAgICAvLyBGSVhNRTogQW5pbWF0ZSBh bmdsZXMKLSAgICB0cmFuc2Zvcm0udHJhbnNsYXRlKGRpZmYud2lkdGgoKSAqIHBlcmNlbnRhZ2Ug KyBtX2Zyb21Qb2ludC54KCksIGRpZmYuaGVpZ2h0KCkgKiBwZXJjZW50YWdlICsgbV9mcm9tUG9p bnQueSgpKTsKLSAgICAKLSAgICAvLyBGSVhNRTogQWNjdW11bGF0ZS4KLQotICAgIGlmICghdHJh bnNmb3JtLmlzSWRlbnRpdHkoKSkKLSAgICAgICAgdHJhbnNmb3JtTGlzdC0+YXBwZW5kSXRlbShT VkdUcmFuc2Zvcm0odHJhbnNmb3JtKSwgZWMpOwotCi0gICAgaWYgKHRyYW5zZm9ybWFibGVFbGVt ZW50LT5yZW5kZXJlcigpKQotICAgICAgICB0cmFuc2Zvcm1hYmxlRWxlbWVudC0+cmVuZGVyZXIo KS0+c2V0TmVlZHNMYXlvdXQodHJ1ZSk7IC8vIHNob3VsZCBiZSBwYXJ0IG9mIHNldFRyYW5zZm9y bQorICAgIHRyYW5zZm9ybS0+dHJhbnNsYXRlKGRpZmYud2lkdGgoKSAqIHBlcmNlbnRhZ2UgKyBt X2Zyb21Qb2ludC54KCksIGRpZmYuaGVpZ2h0KCkgKiBwZXJjZW50YWdlICsgbV9mcm9tUG9pbnQu eSgpKTsKIH0KICAgICAKIHZvaWQgU1ZHQW5pbWF0ZU1vdGlvbkVsZW1lbnQ6OmFwcGx5UmVzdWx0 c1RvVGFyZ2V0KCkKIHsKLSAgICAKKyAgICBTVkdFbGVtZW50KiB0YXJnZXQgPSB0YXJnZXRFbGVt ZW50KCk7CisgICAgaWYgKHRhcmdldCAmJiB0YXJnZXQtPnJlbmRlcmVyKCkpCisgICAgICAgIHRh cmdldC0+cmVuZGVyZXIoKS0+c2V0TmVlZHNMYXlvdXQodHJ1ZSk7CiB9CiAKIGZsb2F0IFNWR0Fu aW1hdGVNb3Rpb25FbGVtZW50OjpjYWxjdWxhdGVEaXN0YW5jZShjb25zdCBTdHJpbmcmIGZyb21T dHJpbmcsIGNvbnN0IFN0cmluZyYgdG9TdHJpbmcpCkluZGV4OiBXZWJDb3JlL3N2Zy9TVkdFbGVt ZW50LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9zdmcvU1ZHRWxlbWVudC5oCShyZXZpc2lvbiAz MTkyNSkKKysrIFdlYkNvcmUvc3ZnL1NWR0VsZW1lbnQuaAkod29ya2luZyBjb3B5KQpAQCAtMjI0 LDYgKzIyNCw4IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgdmlydHVhbCB2b2lkIGF0 dHJpYnV0ZUNoYW5nZWQoQXR0cmlidXRlKiwgYm9vbCBwcmVzZXJ2ZURlY2xzID0gZmFsc2UpOwog CiAgICAgICAgIHZvaWQgc2VuZFNWR0xvYWRFdmVudElmUG9zc2libGUoYm9vbCBzZW5kUGFyZW50 TG9hZEV2ZW50cyA9IGZhbHNlKTsKKyAgICAgICAgCisgICAgICAgIHZpcnR1YWwgQWZmaW5lVHJh bnNmb3JtKiBzdXBwbGVtZW50YWxUcmFuc2Zvcm0oKSB7IHJldHVybiAwOyB9CiAKICAgICAgICAg Ly8gRm9yd2FyZGVkIHByb3BlcnRpZXMgKGRlY2xhcmVkL2RlZmluZWQgYW55d2hlcmUgZWxzZSBp biB0aGUgaW5oZXJpdGFuY2Ugc3RydWN0dXJlKQogCkluZGV4OiBXZWJDb3JlL3N2Zy9TVkdTdHls ZWRUcmFuc2Zvcm1hYmxlRWxlbWVudC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9zdmcvU1ZH U3R5bGVkVHJhbnNmb3JtYWJsZUVsZW1lbnQuY3BwCShyZXZpc2lvbiAzMTkyNSkKKysrIFdlYkNv cmUvc3ZnL1NWR1N0eWxlZFRyYW5zZm9ybWFibGVFbGVtZW50LmNwcAkod29ya2luZyBjb3B5KQpA QCAtNjAsNyArNjAsMTQgQEAgQWZmaW5lVHJhbnNmb3JtIFNWR1N0eWxlZFRyYW5zZm9ybWFibGVF bAogCiBBZmZpbmVUcmFuc2Zvcm0gU1ZHU3R5bGVkVHJhbnNmb3JtYWJsZUVsZW1lbnQ6OmFuaW1h dGVkTG9jYWxUcmFuc2Zvcm0oKSBjb25zdAogewotICAgIHJldHVybiB0cmFuc2Zvcm0oKS0+Y29u Y2F0ZW5hdGUoKS5tYXRyaXgoKTsKKyAgICByZXR1cm4gbV9zdXBwbGVtZW50YWxUcmFuc2Zvcm0g PyB0cmFuc2Zvcm0oKS0+Y29uY2F0ZW5hdGUoKS5tYXRyaXgoKSAqICptX3N1cHBsZW1lbnRhbFRy YW5zZm9ybSA6IHRyYW5zZm9ybSgpLT5jb25jYXRlbmF0ZSgpLm1hdHJpeCgpOworfQorICAgIAor QWZmaW5lVHJhbnNmb3JtKiBTVkdTdHlsZWRUcmFuc2Zvcm1hYmxlRWxlbWVudDo6c3VwcGxlbWVu dGFsVHJhbnNmb3JtKCkKK3sKKyAgICBpZiAoIW1fc3VwcGxlbWVudGFsVHJhbnNmb3JtKQorICAg ICAgICBtX3N1cHBsZW1lbnRhbFRyYW5zZm9ybS5zZXQobmV3IEFmZmluZVRyYW5zZm9ybSgpKTsK KyAgICByZXR1cm4gbV9zdXBwbGVtZW50YWxUcmFuc2Zvcm0uZ2V0KCk7CiB9CiAKIHZvaWQgU1ZH U3R5bGVkVHJhbnNmb3JtYWJsZUVsZW1lbnQ6OnBhcnNlTWFwcGVkQXR0cmlidXRlKE1hcHBlZEF0 dHJpYnV0ZSogYXR0cikKSW5kZXg6IFdlYkNvcmUvc3ZnL1NWR1N0eWxlZFRyYW5zZm9ybWFibGVF bGVtZW50LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9zdmcvU1ZHU3R5bGVkVHJhbnNmb3JtYWJs ZUVsZW1lbnQuaAkocmV2aXNpb24gMzE5MjUpCisrKyBXZWJDb3JlL3N2Zy9TVkdTdHlsZWRUcmFu c2Zvcm1hYmxlRWxlbWVudC5oCSh3b3JraW5nIGNvcHkpCkBAIC00Niw2ICs0Niw3IEBAIG5hbWVz cGFjZSBXZWJDb3JlIHsKICAgICAgICAgdmlydHVhbCBTVkdFbGVtZW50KiBmYXJ0aGVzdFZpZXdw b3J0RWxlbWVudCgpIGNvbnN0OwogICAgICAgICAKICAgICAgICAgdmlydHVhbCBBZmZpbmVUcmFu c2Zvcm0gYW5pbWF0ZWRMb2NhbFRyYW5zZm9ybSgpIGNvbnN0OworICAgICAgICB2aXJ0dWFsIEFm ZmluZVRyYW5zZm9ybSogc3VwcGxlbWVudGFsVHJhbnNmb3JtKCk7CiAKICAgICAgICAgdmlydHVh bCBGbG9hdFJlY3QgZ2V0QkJveCgpIGNvbnN0OwogCkBAIC01OSw2ICs2MCw5IEBAIG5hbWVzcGFj ZSBXZWJDb3JlIHsKIAogICAgIHByb3RlY3RlZDoKICAgICAgICAgQU5JTUFURURfUFJPUEVSVFlf REVDTEFSQVRJT05TKFNWR1N0eWxlZFRyYW5zZm9ybWFibGVFbGVtZW50LCBTVkdUcmFuc2Zvcm1M aXN0KiwgUmVmUHRyPFNWR1RyYW5zZm9ybUxpc3Q+LCBUcmFuc2Zvcm0sIHRyYW5zZm9ybSkKKyAg ICBwcml2YXRlOgorICAgICAgICAvLyBVc2VkIGJ5IDxhbmltYXRlTW90aW9uPgorICAgICAgICBP d25QdHI8QWZmaW5lVHJhbnNmb3JtPiBtX3N1cHBsZW1lbnRhbFRyYW5zZm9ybTsKICAgICB9Owog CiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCkluZGV4OiBXZWJDb3JlL3N2Zy9TVkdUZXh0RWxlbWVu dC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9zdmcvU1ZHVGV4dEVsZW1lbnQuY3BwCShyZXZp c2lvbiAzMTkyNSkKKysrIFdlYkNvcmUvc3ZnL1NWR1RleHRFbGVtZW50LmNwcAkod29ya2luZyBj b3B5KQpAQCAtOTQsNyArOTQsMTQgQEAgQWZmaW5lVHJhbnNmb3JtIFNWR1RleHRFbGVtZW50Ojpn ZXRDVE0oKQogCiBBZmZpbmVUcmFuc2Zvcm0gU1ZHVGV4dEVsZW1lbnQ6OmFuaW1hdGVkTG9jYWxU cmFuc2Zvcm0oKSBjb25zdAogewotICAgIHJldHVybiB0cmFuc2Zvcm0oKS0+Y29uY2F0ZW5hdGUo KS5tYXRyaXgoKTsKKyAgICByZXR1cm4gbV9zdXBwbGVtZW50YWxUcmFuc2Zvcm0gPyB0cmFuc2Zv cm0oKS0+Y29uY2F0ZW5hdGUoKS5tYXRyaXgoKSAqICptX3N1cHBsZW1lbnRhbFRyYW5zZm9ybSA6 IHRyYW5zZm9ybSgpLT5jb25jYXRlbmF0ZSgpLm1hdHJpeCgpOworfQorCitBZmZpbmVUcmFuc2Zv cm0qIFNWR1RleHRFbGVtZW50OjpzdXBwbGVtZW50YWxUcmFuc2Zvcm0oKQoreworICAgIGlmICgh bV9zdXBwbGVtZW50YWxUcmFuc2Zvcm0pCisgICAgICAgIG1fc3VwcGxlbWVudGFsVHJhbnNmb3Jt LnNldChuZXcgQWZmaW5lVHJhbnNmb3JtKCkpOworICAgIHJldHVybiBtX3N1cHBsZW1lbnRhbFRy YW5zZm9ybS5nZXQoKTsKIH0KIAogUmVuZGVyT2JqZWN0KiBTVkdUZXh0RWxlbWVudDo6Y3JlYXRl UmVuZGVyZXIoUmVuZGVyQXJlbmEqIGFyZW5hLCBSZW5kZXJTdHlsZSogc3R5bGUpCkluZGV4OiBX ZWJDb3JlL3N2Zy9TVkdUZXh0RWxlbWVudC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvc3ZnL1NW R1RleHRFbGVtZW50LmgJKHJldmlzaW9uIDMxOTI1KQorKysgV2ViQ29yZS9zdmcvU1ZHVGV4dEVs ZW1lbnQuaAkod29ya2luZyBjb3B5KQpAQCAtNDQsNiArNDQsNyBAQCBuYW1lc3BhY2UgV2ViQ29y ZSB7CiAgICAgICAgIHZpcnR1YWwgQWZmaW5lVHJhbnNmb3JtIGdldENUTSgpIGNvbnN0OwogICAg ICAgICB2aXJ0dWFsIEFmZmluZVRyYW5zZm9ybSBnZXRTY3JlZW5DVE0oKSBjb25zdDsKICAgICAg ICAgdmlydHVhbCBBZmZpbmVUcmFuc2Zvcm0gYW5pbWF0ZWRMb2NhbFRyYW5zZm9ybSgpIGNvbnN0 OworICAgICAgICB2aXJ0dWFsIEFmZmluZVRyYW5zZm9ybSogc3VwcGxlbWVudGFsVHJhbnNmb3Jt KCk7CiAKICAgICAgICAgdmlydHVhbCBSZW5kZXJPYmplY3QqIGNyZWF0ZVJlbmRlcmVyKFJlbmRl ckFyZW5hKiwgUmVuZGVyU3R5bGUqKTsKICAgICAgICAgdmlydHVhbCBib29sIGNoaWxkU2hvdWxk Q3JlYXRlUmVuZGVyZXIoTm9kZSopIGNvbnN0OwpAQCAtNTQsOCArNTUsMTAgQEAgbmFtZXNwYWNl IFdlYkNvcmUgewogICAgICAgICB2aXJ0dWFsIGNvbnN0IFNWR0VsZW1lbnQqIGNvbnRleHRFbGVt ZW50KCkgY29uc3QgeyByZXR1cm4gdGhpczsgfQogCiAgICAgcHJpdmF0ZToKLSAgICAgICAgbXV0 YWJsZSBBZmZpbmVUcmFuc2Zvcm0gbV9sb2NhbE1hdHJpeDsKICAgICAgICAgQU5JTUFURURfUFJP UEVSVFlfREVDTEFSQVRJT05TKFNWR1RleHRFbGVtZW50LCBTVkdUcmFuc2Zvcm1MaXN0KiwgUmVm UHRyPFNWR1RyYW5zZm9ybUxpc3Q+LCBUcmFuc2Zvcm0sIHRyYW5zZm9ybSkKKyAgICAgICAKKyAg ICAgICAvLyBVc2VkIGJ5IDxhbmltYXRlTW90aW9uPgorICAgICAgIE93blB0cjxBZmZpbmVUcmFu c2Zvcm0+IG1fc3VwcGxlbWVudGFsVHJhbnNmb3JtOwogICAgIH07CiAKIH0gLy8gbmFtZXNwYWNl IFdlYkNvcmUK