65167 2011-07-26 00:46:07 -0700 Prepare animVal support - phase 2 2011-07-26 03:08:06 -0700 1 1 1 Unclassified WebKit SVG 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 12437 1 zimmermann zimmermann zimmermann oldest_to_newest 442142 0 zimmermann 2011-07-26 00:46:07 -0700 Prepare animVal support - phase 2. Phase 1 is done, now that all (but one) types have been converted to the SVGAnimatedType concept. Next step is to adjust the macros to return the animVal, when the property is animated. The third step is to move SVGAnimateElement to use the new updateAnimVal functionality. 442147 1 101978 zimmermann 2011-07-26 01:03:45 -0700 Created attachment 101978 Patch 442152 2 101978 krit 2011-07-26 01:43:44 -0700 Comment on attachment 101978 Patch I needed some time to review this. But it looks good to me. r=me 442164 3 zimmermann 2011-07-26 03:08:06 -0700 Thanks! Landed in r91748. 101978 2011-07-26 01:03:45 -0700 2011-07-26 01:43:44 -0700 Patch PrepAnimVal.diff text/plain 15353 zimmermann SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDkxNzQ1KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsNDIgQEAKKzIwMTEtMDctMjYgIE5pa29sYXMg WmltbWVybWFubiAgPG56aW1tZXJtYW5uQHJpbS5jb20+CisKKyAgICAgICAgUHJlcGFyZSBhbmlt VmFsIHN1cHBvcnQgLSBwaGFzZSAyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD02NTE2NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIE5leHQgcGF0Y2ggcHJlcGFyaW5nIGFuaW1WYWwgc3VwcG9ydC4gTW9kaWZ5 IHRoZSBTVkdBbmltYXRlZFByb3BlcnR5KiBjbGFzc2VzICYgbWFjcm9zIHRvIGFzc3VyZSB0aGF0 IGNhbGxpbmcgc29tZUVsZW1lbnQtPnNvbWVQcm9wZXJ0eSgpCisgICAgICAgIHdpbGwgcmV0dXJu IHRoZSBhbmltVmFsLCB3aGVuIHRoZSBwcm9wZXJ0eSBpcyBiZWluZyBhbmltYXRlZC4gTm90IHll dCBob29rZWQgaW50byBTVkdBbmltYXRlRWxlbWVudCwgdGhpcyBpcyBqdXN0IGEgcHJlcGFyYXRp b24uCisKKyAgICAgICAgRG9lc24ndCBhZmZlY3QgYW55IHRlc3RzLCB5ZXQuCisKKyAgICAgICAg KiBzdmcvU1ZHUGF0aEVsZW1lbnQuY3BwOiBBZGFwdCB0byBTVkdBbmltYXRlZFByb3BlcnR5Ojps b29rdXBXcmFwcGVyIGNoYW5nZXMgKG5ldyB0ZW1wbGF0ZSBwYXJhbWV0ZXJzIGhhdmUgYmVlbiBh ZGRlZCkuCisgICAgICAgIChXZWJDb3JlOjpTVkdQYXRoRWxlbWVudDo6c3ZnQXR0cmlidXRlQ2hh bmdlZCk6CisgICAgICAgICogc3ZnL1NWR1BhdGhTZWdXaXRoQ29udGV4dC5oOiBEaXR0by4KKyAg ICAgICAgKFdlYkNvcmU6OlNWR1BhdGhTZWdXaXRoQ29udGV4dDo6YW5pbWF0ZWRQcm9wZXJ0eSk6 CisgICAgICAgICogc3ZnL1NWR1BvbHlFbGVtZW50LmNwcDogRGl0dG8uCisgICAgICAgIChXZWJD b3JlOjpTVkdQb2x5RWxlbWVudDo6cGFyc2VNYXBwZWRBdHRyaWJ1dGUpOgorICAgICAgICAqIHN2 Zy9wcm9wZXJ0aWVzL1NWR0FuaW1hdGVkRW51bWVyYXRpb25Qcm9wZXJ0eVRlYXJPZmYuaDogSW1w bGVtZW50IGN1cnJlbnRBbmltYXRlZFZhbHVlLCBhbiBhYnN0cmFjdCB3YXkgdG8gcmV0cmlldmUg dGhlIHVuZGVybHlpbmcgYW5pbWF0ZWQgdmFsdWUgZm9yIGFueSBhbmltYXRlZCB0eXBlLgorICAg ICAgICAoV2ViQ29yZTo6U1ZHQW5pbWF0ZWRFbnVtZXJhdGlvblByb3BlcnR5VGVhck9mZjo6Y3Vy cmVudEFuaW1hdGVkVmFsdWUpOiBGb3J3YXJkIGNhbGwgdG8gU1ZHQW5pbWF0ZWRTdGF0aWNQcm9w ZXJ0eVRlYXJPZmY8aW50Piwgb3VyIGJhc2UuCisgICAgICAgICogc3ZnL3Byb3BlcnRpZXMvU1ZH QW5pbWF0ZWRMaXN0UHJvcGVydHlUZWFyT2ZmLmg6CisgICAgICAgIChXZWJDb3JlOjpTVkdBbmlt YXRlZExpc3RQcm9wZXJ0eVRlYXJPZmY6OmlzQW5pbWF0aW5nKTogUmV0dXJucyB3aGV0aGVyIHRo aXMgcHJvcGVydHkgaXMgYmVpbmcgYW5pbWF0ZWQgb3Igbm90LgorICAgICAgICAoV2ViQ29yZTo6 U1ZHQW5pbWF0ZWRMaXN0UHJvcGVydHlUZWFyT2ZmOjpjdXJyZW50QW5pbWF0ZWRWYWx1ZSk6Cisg ICAgICAgICogc3ZnL3Byb3BlcnRpZXMvU1ZHQW5pbWF0ZWRQcm9wZXJ0eS5oOgorICAgICAgICAo V2ViQ29yZTo6U1ZHQW5pbWF0ZWRQcm9wZXJ0eTo6dXBkYXRlQW5pbVZhbCk6IFdpbGwgYmUgdXNl ZCBmcm9tIFNWR0FuaW0qRWxlbWVudCB0byB1cGRhdGUgdGhlIGN1cnJlbnQgYW5pbVZhbCwgZXhw b3NlZCB0byBKUy4KKyAgICAgICAgKFdlYkNvcmU6OlNWR0FuaW1hdGVkUHJvcGVydHk6Omxvb2t1 cE9yQ3JlYXRlV3JhcHBlcik6IFNoYXJlIG1vcmUgY29kZSB3aXRoIGxvb2t1cFdyYXBwZXIuCisg ICAgICAgIChXZWJDb3JlOjpTVkdBbmltYXRlZFByb3BlcnR5Ojpsb29rdXBXcmFwcGVyKTogQ2xl YW51cCBjb2RlLCBhdm9pZCBkb2luZyBhbnkgd29yayBmb3Igbm9uLVNWR0VsZW1lbnQgZGVyaXZl ZCBvYmplY3RzLCBsaWtlIFNWR1ZpZXdTcGVjLgorICAgICAgICAqIHN2Zy9wcm9wZXJ0aWVzL1NW R0FuaW1hdGVkUHJvcGVydHlNYWNyb3MuaDogTWFrZSBhbGwgbG93ZXJQcm9wZXJ0eSgpIGNhbGxz IChlZy4gbXlSZWN0RWxlbWVudC0+eCgpKSByZXR1cm4gdGhlIGFuaW1WYWwsIGlmIHRoZSBwcm9w ZXJ0eSBpcyBiZWluZyBhbmltYXRlZC4KKyAgICAgICAgKiBzdmcvcHJvcGVydGllcy9TVkdBbmlt YXRlZFByb3BlcnR5VGVhck9mZi5oOiBNYWluIGxvZ2ljIGZvciB0aGUgbmV3IGFuaW1WYWwgc3R1 ZmYuCisgICAgICAgIChXZWJDb3JlOjpTVkdBbmltYXRlZFByb3BlcnR5VGVhck9mZjo6aXNBbmlt YXRpbmcpOgorICAgICAgICAoV2ViQ29yZTo6U1ZHQW5pbWF0ZWRQcm9wZXJ0eVRlYXJPZmY6OmN1 cnJlbnRBbmltYXRlZFZhbHVlKToKKyAgICAgICAgKFdlYkNvcmU6OlNWR0FuaW1hdGVkUHJvcGVy dHlUZWFyT2ZmOjp1cGRhdGVBbmltVmFsKToKKyAgICAgICAgKFdlYkNvcmU6OlNWR0FuaW1hdGVk UHJvcGVydHlUZWFyT2ZmOjpTVkdBbmltYXRlZFByb3BlcnR5VGVhck9mZik6CisgICAgICAgICog c3ZnL3Byb3BlcnRpZXMvU1ZHQW5pbWF0ZWRTdGF0aWNQcm9wZXJ0eVRlYXJPZmYuaDoKKyAgICAg ICAgKFdlYkNvcmU6OlNWR0FuaW1hdGVkU3RhdGljUHJvcGVydHlUZWFyT2ZmOjppc0FuaW1hdGlu Zyk6CisgICAgICAgIChXZWJDb3JlOjpTVkdBbmltYXRlZFN0YXRpY1Byb3BlcnR5VGVhck9mZjo6 Y3VycmVudEFuaW1hdGVkVmFsdWUpOgorICAgICAgICAqIHN2Zy9wcm9wZXJ0aWVzL1NWR1Byb3Bl cnR5VGVhck9mZi5oOgorICAgICAgICAoV2ViQ29yZTo6U1ZHUHJvcGVydHlUZWFyT2ZmOjp1cGRh dGVBbmltVmFsKToKKwogMjAxMS0wNy0yNSAgUnl1YW4gQ2hvaSAgPHJ5dWFuLmNob2lAc2Ftc3Vu Zy5jb20+CiAKICAgICAgICAgW0NNQUtFXSBTcGxpdCBKU0MgcmVsYXRlZCBmaWxlcyBmcm9tIFdl YkNvcmUvQ01ha2VMaXN0cy50eHQKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3N2Zy9TVkdQYXRoRWxl bWVudC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvc3ZnL1NWR1BhdGhFbGVtZW50 LmNwcAkocmV2aXNpb24gOTE3NDMpCisrKyBTb3VyY2UvV2ViQ29yZS9zdmcvU1ZHUGF0aEVsZW1l bnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yNjEsNyArMjYxLDcgQEAgdm9pZCBTVkdQYXRoRWxl bWVudDo6c3ZnQXR0cmlidXRlQ2hhbmdlZAogICAgIFJlbmRlclNWR1BhdGgqIHJlbmRlcmVyID0g c3RhdGljX2Nhc3Q8UmVuZGVyU1ZHUGF0aCo+KHRoaXMtPnJlbmRlcmVyKCkpOwogCiAgICAgaWYg KGF0dHJOYW1lID09IFNWR05hbWVzOjpkQXR0cikgewotICAgICAgICBpZiAoU1ZHQW5pbWF0ZWRQ cm9wZXJ0eTo6bG9va3VwV3JhcHBlcjxTVkdBbmltYXRlZFBhdGhTZWdMaXN0UHJvcGVydHlUZWFy T2ZmPih0aGlzLCBkUHJvcGVydHlJbmZvKCkpKSB7CisgICAgICAgIGlmIChTVkdBbmltYXRlZFBy b3BlcnR5Ojpsb29rdXBXcmFwcGVyPFNWR1BhdGhFbGVtZW50LCBTVkdBbmltYXRlZFBhdGhTZWdM aXN0UHJvcGVydHlUZWFyT2ZmLCB0cnVlPih0aGlzLCBkUHJvcGVydHlJbmZvKCkpKSB7CiAgICAg ICAgICAgICBTVkdQYXRoU2VnTGlzdCBuZXdMaXN0KFBhdGhTZWdVbmFsdGVyZWRSb2xlKTsKICAg ICAgICAgICAgIFNWR1BhdGhQYXJzZXJGYWN0b3J5KiBmYWN0b3J5ID0gU1ZHUGF0aFBhcnNlckZh Y3Rvcnk6OnNlbGYoKTsKICAgICAgICAgICAgIGZhY3RvcnktPmJ1aWxkU1ZHUGF0aFNlZ0xpc3RG cm9tQnl0ZVN0cmVhbShtX3BhdGhCeXRlU3RyZWFtLmdldCgpLCB0aGlzLCBuZXdMaXN0LCBVbmFs dGVyZWRQYXJzaW5nKTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3N2Zy9TVkdQYXRoU2VnV2l0aENv bnRleHQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9zdmcvU1ZHUGF0aFNlZ1dpdGhD b250ZXh0LmgJKHJldmlzaW9uIDkxNzQzKQorKysgU291cmNlL1dlYkNvcmUvc3ZnL1NWR1BhdGhT ZWdXaXRoQ29udGV4dC5oCSh3b3JraW5nIGNvcHkpCkBAIC0zOSw3ICszOSw3IEBAIHB1YmxpYzoK ICAgICAgICAgY2FzZSBQYXRoU2VnVW5kZWZpbmVkUm9sZToKICAgICAgICAgICAgIHJldHVybiAw OwogICAgICAgICBjYXNlIFBhdGhTZWdVbmFsdGVyZWRSb2xlOgotICAgICAgICAgICAgcmV0dXJu IFNWR0FuaW1hdGVkUHJvcGVydHk6Omxvb2t1cFdyYXBwZXI8U1ZHQW5pbWF0ZWRQYXRoU2VnTGlz dFByb3BlcnR5VGVhck9mZj4obV9lbGVtZW50LmdldCgpLCBTVkdQYXRoRWxlbWVudDo6ZFByb3Bl cnR5SW5mbygpKTsKKyAgICAgICAgICAgIHJldHVybiBTVkdBbmltYXRlZFByb3BlcnR5Ojpsb29r dXBXcmFwcGVyPFNWR1BhdGhFbGVtZW50LCBTVkdBbmltYXRlZFBhdGhTZWdMaXN0UHJvcGVydHlU ZWFyT2ZmLCB0cnVlPihtX2VsZW1lbnQuZ2V0KCksIFNWR1BhdGhFbGVtZW50OjpkUHJvcGVydHlJ bmZvKCkpOwogICAgICAgICBjYXNlIFBhdGhTZWdOb3JtYWxpemVkUm9sZToKICAgICAgICAgICAg IC8vIEZJWE1FOiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU0MTIg LSBJbXBsZW1lbnQgbm9ybWFsaXplZCBwYXRoIHNlZ21lbnQgbGlzdHMhCiAgICAgICAgICAgICBy ZXR1cm4gMDsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3N2Zy9TVkdQb2x5RWxlbWVudC5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvc3ZnL1NWR1BvbHlFbGVtZW50LmNwcAkocmV2aXNp b24gOTE3NDMpCisrKyBTb3VyY2UvV2ViQ29yZS9zdmcvU1ZHUG9seUVsZW1lbnQuY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC05MCw3ICs5MCw3IEBAIHZvaWQgU1ZHUG9seUVsZW1lbnQ6OnBhcnNlTWFw cGVkQXR0cmlidXQKICAgICAgICAgaWYgKCFwb2ludHNMaXN0RnJvbVNWR0RhdGEobmV3TGlzdCwg dmFsdWUpKQogICAgICAgICAgICAgZG9jdW1lbnQoKS0+YWNjZXNzU1ZHRXh0ZW5zaW9ucygpLT5y ZXBvcnRFcnJvcigiUHJvYmxlbSBwYXJzaW5nIHBvaW50cz1cIiIgKyB2YWx1ZSArICJcIiIpOwog Ci0gICAgICAgIGlmIChTVkdBbmltYXRlZFByb3BlcnR5KiB3cmFwcGVyID0gU1ZHQW5pbWF0ZWRQ cm9wZXJ0eTo6bG9va3VwV3JhcHBlcjxTVkdBbmltYXRlZExpc3RQcm9wZXJ0eVRlYXJPZmY8U1ZH UG9pbnRMaXN0PiA+KHRoaXMsIHBvaW50c1Byb3BlcnR5SW5mbygpKSkKKyAgICAgICAgaWYgKFNW R0FuaW1hdGVkUHJvcGVydHkqIHdyYXBwZXIgPSBTVkdBbmltYXRlZFByb3BlcnR5Ojpsb29rdXBX cmFwcGVyPFNWR1BvbHlFbGVtZW50LCBTVkdBbmltYXRlZExpc3RQcm9wZXJ0eVRlYXJPZmY8U1ZH UG9pbnRMaXN0PiwgdHJ1ZT4odGhpcywgcG9pbnRzUHJvcGVydHlJbmZvKCkpKQogICAgICAgICAg ICAgc3RhdGljX2Nhc3Q8U1ZHQW5pbWF0ZWRMaXN0UHJvcGVydHlUZWFyT2ZmPFNWR1BvaW50TGlz dD4qPih3cmFwcGVyKS0+ZGV0YWNoTGlzdFdyYXBwZXJzKG5ld0xpc3Quc2l6ZSgpKTsKIAogICAg ICAgICBtX3BvaW50cy52YWx1ZSA9IG5ld0xpc3Q7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9zdmcv cHJvcGVydGllcy9TVkdBbmltYXRlZEVudW1lcmF0aW9uUHJvcGVydHlUZWFyT2ZmLmgKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYkNvcmUvc3ZnL3Byb3BlcnRpZXMvU1ZHQW5pbWF0ZWRFbnVtZXJh dGlvblByb3BlcnR5VGVhck9mZi5oCShyZXZpc2lvbiA5MTc0MykKKysrIFNvdXJjZS9XZWJDb3Jl L3N2Zy9wcm9wZXJ0aWVzL1NWR0FuaW1hdGVkRW51bWVyYXRpb25Qcm9wZXJ0eVRlYXJPZmYuaAko d29ya2luZyBjb3B5KQpAQCAtNDYsNiArNDYsOCBAQCBwdWJsaWM6CiAgICAgICAgIHJldHVybiBh ZG9wdFJlZihuZXcgU1ZHQW5pbWF0ZWRFbnVtZXJhdGlvblByb3BlcnR5VGVhck9mZjxFbnVtVHlw ZT4oY29udGV4dEVsZW1lbnQsIGF0dHJpYnV0ZU5hbWUsIHJlaW50ZXJwcmV0X2Nhc3Q8aW50Jj4o cHJvcGVydHkpKSk7CiAgICAgfQogCisgICAgRW51bVR5cGUmIGN1cnJlbnRBbmltYXRlZFZhbHVl KCkgeyByZXR1cm4gcmVpbnRlcnByZXRfY2FzdDxFbnVtVHlwZSY+KFNWR0FuaW1hdGVkU3RhdGlj UHJvcGVydHlUZWFyT2ZmPGludD46OmN1cnJlbnRBbmltYXRlZFZhbHVlKCkpOyB9CisKIHByaXZh dGU6CiAgICAgU1ZHQW5pbWF0ZWRFbnVtZXJhdGlvblByb3BlcnR5VGVhck9mZihTVkdFbGVtZW50 KiBjb250ZXh0RWxlbWVudCwgY29uc3QgUXVhbGlmaWVkTmFtZSYgYXR0cmlidXRlTmFtZSwgaW50 JiBwcm9wZXJ0eSkKICAgICAgICAgOiBTVkdBbmltYXRlZFN0YXRpY1Byb3BlcnR5VGVhck9mZjxp bnQ+KGNvbnRleHRFbGVtZW50LCBhdHRyaWJ1dGVOYW1lLCBwcm9wZXJ0eSkKSW5kZXg6IFNvdXJj ZS9XZWJDb3JlL3N2Zy9wcm9wZXJ0aWVzL1NWR0FuaW1hdGVkTGlzdFByb3BlcnR5VGVhck9mZi5o Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3N2Zy9wcm9wZXJ0aWVzL1NWR0FuaW1hdGVk TGlzdFByb3BlcnR5VGVhck9mZi5oCShyZXZpc2lvbiA5MTc0MykKKysrIFNvdXJjZS9XZWJDb3Jl L3N2Zy9wcm9wZXJ0aWVzL1NWR0FuaW1hdGVkTGlzdFByb3BlcnR5VGVhck9mZi5oCSh3b3JraW5n IGNvcHkpCkBAIC04Miw2ICs4MiwxMCBAQCBwdWJsaWM6CiAgICAgUHJvcGVydHlUeXBlJiB2YWx1 ZXMoKSB7IHJldHVybiBtX3ZhbHVlczsgfQogICAgIExpc3RXcmFwcGVyQ2FjaGUmIHdyYXBwZXJz KCkgeyByZXR1cm4gbV93cmFwcGVyczsgfQogCisgICAgLy8gRklYTUU6IGFuaW1WYWwgc3VwcG9y dC4KKyAgICBib29sIGlzQW5pbWF0aW5nKCkgY29uc3QgeyByZXR1cm4gZmFsc2U7IH0KKyAgICBQ cm9wZXJ0eVR5cGUmIGN1cnJlbnRBbmltYXRlZFZhbHVlKCkgeyByZXR1cm4gbV92YWx1ZXM7IH0K KwogICAgIHN0YXRpYyBQYXNzUmVmUHRyPFNWR0FuaW1hdGVkTGlzdFByb3BlcnR5VGVhck9mZjxQ cm9wZXJ0eVR5cGU+ID4gY3JlYXRlKFNWR0VsZW1lbnQqIGNvbnRleHRFbGVtZW50LCBjb25zdCBR dWFsaWZpZWROYW1lJiBhdHRyaWJ1dGVOYW1lLCBQcm9wZXJ0eVR5cGUmIHZhbHVlcykKICAgICB7 CiAgICAgICAgIEFTU0VSVChjb250ZXh0RWxlbWVudCk7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9z dmcvcHJvcGVydGllcy9TVkdBbmltYXRlZFByb3BlcnR5LmgKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYkNvcmUvc3ZnL3Byb3BlcnRpZXMvU1ZHQW5pbWF0ZWRQcm9wZXJ0eS5oCShyZXZpc2lvbiA5 MTc0MykKKysrIFNvdXJjZS9XZWJDb3JlL3N2Zy9wcm9wZXJ0aWVzL1NWR0FuaW1hdGVkUHJvcGVy dHkuaAkod29ya2luZyBjb3B5KQpAQCAtNDMsNiArNDMsNyBAQCBwdWJsaWM6CiAgICAgfQogCiAg ICAgdmlydHVhbCBib29sIGlzQW5pbWF0ZWRMaXN0VGVhck9mZigpIGNvbnN0IHsgcmV0dXJuIGZh bHNlOyB9CisgICAgdmlydHVhbCB2b2lkIHVwZGF0ZUFuaW1WYWwodm9pZCopIHsgQVNTRVJUX05P VF9SRUFDSEVEKCk7IH0KIAogICAgIC8vIENhY2hpbmcgZmFjaWxpdGllcy4KICAgICB0eXBlZGVm IEhhc2hNYXA8U1ZHQW5pbWF0ZWRQcm9wZXJ0eURlc2NyaXB0aW9uLCBSZWZQdHI8U1ZHQW5pbWF0 ZWRQcm9wZXJ0eT4sIFNWR0FuaW1hdGVkUHJvcGVydHlEZXNjcmlwdGlvbkhhc2gsIFNWR0FuaW1h dGVkUHJvcGVydHlEZXNjcmlwdGlvbkhhc2hUcmFpdHM+IENhY2hlOwpAQCAtNjAsMTEgKzYxLDEy IEBAIHB1YmxpYzoKICAgICAgICAgfQogICAgIH0KIAorICAgIC8vIGxvb2t1cE9yQ3JlYXRlV3Jh cHBlciAmIGhlbHBlciBtZXRob2RzLgogICAgIHRlbXBsYXRlPHR5cGVuYW1lIFRlYXJPZmZUeXBl LCB0eXBlbmFtZSBQcm9wZXJ0eVR5cGUsIGJvb2wgaXNEZXJpdmVkRnJvbVNWR0VsZW1lbnQ+Ci0g ICAgc3RydWN0IEhlbHBlcjsKKyAgICBzdHJ1Y3QgTG9va3VwT3JDcmVhdGVIZWxwZXI7CiAKICAg ICB0ZW1wbGF0ZTx0eXBlbmFtZSBUZWFyT2ZmVHlwZSwgdHlwZW5hbWUgUHJvcGVydHlUeXBlPgot ICAgIHN0cnVjdCBIZWxwZXI8VGVhck9mZlR5cGUsIFByb3BlcnR5VHlwZSwgZmFsc2U+IHsKKyAg ICBzdHJ1Y3QgTG9va3VwT3JDcmVhdGVIZWxwZXI8VGVhck9mZlR5cGUsIFByb3BlcnR5VHlwZSwg ZmFsc2U+IHsKICAgICAgICAgc3RhdGljIFBhc3NSZWZQdHI8VGVhck9mZlR5cGU+IGxvb2t1cE9y Q3JlYXRlV3JhcHBlcih2b2lkKiwgY29uc3QgU1ZHUHJvcGVydHlJbmZvKiwgUHJvcGVydHlUeXBl JikKICAgICAgICAgewogICAgICAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CkBAIC03Myw3 ICs3NSw3IEBAIHB1YmxpYzoKICAgICB9OwogCiAgICAgdGVtcGxhdGU8dHlwZW5hbWUgVGVhck9m ZlR5cGUsIHR5cGVuYW1lIFByb3BlcnR5VHlwZT4KLSAgICBzdHJ1Y3QgSGVscGVyPFRlYXJPZmZU eXBlLCBQcm9wZXJ0eVR5cGUsIHRydWU+IHsKKyAgICBzdHJ1Y3QgTG9va3VwT3JDcmVhdGVIZWxw ZXI8VGVhck9mZlR5cGUsIFByb3BlcnR5VHlwZSwgdHJ1ZT4gewogICAgICAgICBzdGF0aWMgUGFz c1JlZlB0cjxUZWFyT2ZmVHlwZT4gbG9va3VwT3JDcmVhdGVXcmFwcGVyKFNWR0VsZW1lbnQqIGVs ZW1lbnQsIGNvbnN0IFNWR1Byb3BlcnR5SW5mbyogaW5mbywgUHJvcGVydHlUeXBlJiBwcm9wZXJ0 eSkKICAgICAgICAgewogICAgICAgICAgICAgQVNTRVJUKGluZm8pOwpAQCAtOTAsMTUgKzkyLDM1 IEBAIHB1YmxpYzoKICAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBPd25lclR5cGUsIHR5cGVuYW1lIFRl YXJPZmZUeXBlLCB0eXBlbmFtZSBQcm9wZXJ0eVR5cGUsIGJvb2wgaXNEZXJpdmVkRnJvbVNWR0Vs ZW1lbnQ+CiAgICAgc3RhdGljIFBhc3NSZWZQdHI8VGVhck9mZlR5cGU+IGxvb2t1cE9yQ3JlYXRl V3JhcHBlcihPd25lclR5cGUqIGVsZW1lbnQsIGNvbnN0IFNWR1Byb3BlcnR5SW5mbyogaW5mbywg UHJvcGVydHlUeXBlJiBwcm9wZXJ0eSkKICAgICB7Ci0gICAgICAgIHJldHVybiBIZWxwZXI8VGVh ck9mZlR5cGUsIFByb3BlcnR5VHlwZSwgaXNEZXJpdmVkRnJvbVNWR0VsZW1lbnQ+Ojpsb29rdXBP ckNyZWF0ZVdyYXBwZXIoZWxlbWVudCwgaW5mbywgcHJvcGVydHkpOworICAgICAgICByZXR1cm4g TG9va3VwT3JDcmVhdGVIZWxwZXI8VGVhck9mZlR5cGUsIFByb3BlcnR5VHlwZSwgaXNEZXJpdmVk RnJvbVNWR0VsZW1lbnQ+Ojpsb29rdXBPckNyZWF0ZVdyYXBwZXIoZWxlbWVudCwgaW5mbywgcHJv cGVydHkpOwogICAgIH0KIAorICAgIC8vIGxvb2t1cFdyYXBwZXIgJiBoZWxwZXIgbWV0aG9kcy4K KyAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBUZWFyT2ZmVHlwZSwgYm9vbCBpc0Rlcml2ZWRGcm9tU1ZH RWxlbWVudD4KKyAgICBzdHJ1Y3QgTG9va3VwSGVscGVyOworCisgICAgdGVtcGxhdGU8dHlwZW5h bWUgVGVhck9mZlR5cGU+CisgICAgc3RydWN0IExvb2t1cEhlbHBlcjxUZWFyT2ZmVHlwZSwgZmFs c2U+IHsKKyAgICAgICAgc3RhdGljIFRlYXJPZmZUeXBlKiBsb29rdXBXcmFwcGVyKGNvbnN0IHZv aWQqLCBjb25zdCBTVkdQcm9wZXJ0eUluZm8qKQorICAgICAgICB7CisgICAgICAgICAgICByZXR1 cm4gMDsKKyAgICAgICAgfQorICAgIH07CisKICAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBUZWFyT2Zm VHlwZT4KLSAgICBzdGF0aWMgVGVhck9mZlR5cGUqIGxvb2t1cFdyYXBwZXIoU1ZHRWxlbWVudCog ZWxlbWVudCwgY29uc3QgU1ZHUHJvcGVydHlJbmZvKiBpbmZvKQorICAgIHN0cnVjdCBMb29rdXBI ZWxwZXI8VGVhck9mZlR5cGUsIHRydWU+IHsKKyAgICAgICAgc3RhdGljIFRlYXJPZmZUeXBlKiBs b29rdXBXcmFwcGVyKGNvbnN0IFNWR0VsZW1lbnQqIGVsZW1lbnQsIGNvbnN0IFNWR1Byb3BlcnR5 SW5mbyogaW5mbykKKyAgICAgICAgeworICAgICAgICAgICAgQVNTRVJUKGluZm8pOworICAgICAg ICAgICAgU1ZHQW5pbWF0ZWRQcm9wZXJ0eURlc2NyaXB0aW9uIGtleShjb25zdF9jYXN0PFNWR0Vs ZW1lbnQqPihlbGVtZW50KSwgaW5mby0+cHJvcGVydHlJZGVudGlmaWVyKTsKKyAgICAgICAgICAg IHJldHVybiBzdGF0aWNfcG9pbnRlcl9jYXN0PFRlYXJPZmZUeXBlPihhbmltYXRlZFByb3BlcnR5 Q2FjaGUoKS0+Z2V0KGtleSkpLmdldCgpOworICAgICAgICB9CisgICAgfTsKKworICAgIHRlbXBs YXRlPHR5cGVuYW1lIE93bmVyVHlwZSwgdHlwZW5hbWUgVGVhck9mZlR5cGUsIGJvb2wgaXNEZXJp dmVkRnJvbVNWR0VsZW1lbnQ+CisgICAgc3RhdGljIFRlYXJPZmZUeXBlKiBsb29rdXBXcmFwcGVy KGNvbnN0IE93bmVyVHlwZSogZWxlbWVudCwgY29uc3QgU1ZHUHJvcGVydHlJbmZvKiBpbmZvKQog ICAgIHsKLSAgICAgICAgQVNTRVJUKGluZm8pOwotICAgICAgICBTVkdBbmltYXRlZFByb3BlcnR5 RGVzY3JpcHRpb24ga2V5KGVsZW1lbnQsIGluZm8tPnByb3BlcnR5SWRlbnRpZmllcik7Ci0gICAg ICAgIHJldHVybiBzdGF0aWNfcG9pbnRlcl9jYXN0PFRlYXJPZmZUeXBlPihhbmltYXRlZFByb3Bl cnR5Q2FjaGUoKS0+Z2V0KGtleSkpLmdldCgpOworICAgICAgICByZXR1cm4gTG9va3VwSGVscGVy PFRlYXJPZmZUeXBlLCBpc0Rlcml2ZWRGcm9tU1ZHRWxlbWVudD46Omxvb2t1cFdyYXBwZXIoZWxl bWVudCwgaW5mbyk7CiAgICAgfQogCiBwcm90ZWN0ZWQ6CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9z dmcvcHJvcGVydGllcy9TVkdBbmltYXRlZFByb3BlcnR5TWFjcm9zLmgKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYkNvcmUvc3ZnL3Byb3BlcnRpZXMvU1ZHQW5pbWF0ZWRQcm9wZXJ0eU1hY3Jvcy5o CShyZXZpc2lvbiA5MTc0MykKKysrIFNvdXJjZS9XZWJDb3JlL3N2Zy9wcm9wZXJ0aWVzL1NWR0Fu aW1hdGVkUHJvcGVydHlNYWNyb3MuaAkod29ya2luZyBjb3B5KQpAQCAtMTI0LDYgKzEyNCwxMCBA QCBwdWJsaWM6IFwKICAgICBzdGF0aWMgY29uc3QgU1ZHUHJvcGVydHlJbmZvKiBMb3dlclByb3Bl cnR5IyNQcm9wZXJ0eUluZm8oKTsgXAogICAgIFByb3BlcnR5VHlwZSYgTG93ZXJQcm9wZXJ0eSgp IGNvbnN0IFwKICAgICB7IFwKKyAgICAgICAgaWYgKFRlYXJPZmZUeXBlKiB3cmFwcGVyID0gU1ZH QW5pbWF0ZWRQcm9wZXJ0eTo6bG9va3VwV3JhcHBlcjxVc2VPd25lclR5cGUsIFRlYXJPZmZUeXBl LCBJc0Rlcml2ZWRGcm9tU1ZHRWxlbWVudDxVc2VPd25lclR5cGU+Ojp2YWx1ZT4odGhpcywgTG93 ZXJQcm9wZXJ0eSMjUHJvcGVydHlJbmZvKCkpKSB7IFwKKyAgICAgICAgICAgIGlmICh3cmFwcGVy LT5pc0FuaW1hdGluZygpKSBcCisgICAgICAgICAgICAgICAgcmV0dXJuIHdyYXBwZXItPmN1cnJl bnRBbmltYXRlZFZhbHVlKCk7IFwKKyAgICAgICAgfSBcCiAgICAgICAgIHJldHVybiBtXyMjTG93 ZXJQcm9wZXJ0eS52YWx1ZTsgXAogICAgIH0gXAogXApAQCAtMTc1LDggKzE3OSw4IEBAIHByaXZh dGU6IFwKIERFQ0xBUkVfQU5JTUFURURfUFJPUEVSVFkoVGVhck9mZlR5cGUsIFByb3BlcnR5VHlw ZSwgVXBwZXJQcm9wZXJ0eSwgTG93ZXJQcm9wZXJ0eSkgXAogdm9pZCBkZXRhY2hBbmltYXRlZCMj VXBwZXJQcm9wZXJ0eSMjTGlzdFdyYXBwZXJzKHVuc2lnbmVkIG5ld0xpc3RTaXplKSBcCiB7IFwK LSAgICBpZiAoU1ZHQW5pbWF0ZWRQcm9wZXJ0eSogd3JhcHBlciA9IFNWR0FuaW1hdGVkUHJvcGVy dHk6Omxvb2t1cFdyYXBwZXI8VGVhck9mZlR5cGU+KHRoaXMsIExvd2VyUHJvcGVydHkjI1Byb3Bl cnR5SW5mbygpKSkgXAotICAgICAgICBzdGF0aWNfY2FzdDxUZWFyT2ZmVHlwZSo+KHdyYXBwZXIp LT5kZXRhY2hMaXN0V3JhcHBlcnMobmV3TGlzdFNpemUpOyBcCisgICAgaWYgKFRlYXJPZmZUeXBl KiB3cmFwcGVyID0gU1ZHQW5pbWF0ZWRQcm9wZXJ0eTo6bG9va3VwV3JhcHBlcjxVc2VPd25lclR5 cGUsIFRlYXJPZmZUeXBlLCBJc0Rlcml2ZWRGcm9tU1ZHRWxlbWVudDxVc2VPd25lclR5cGU+Ojp2 YWx1ZT4odGhpcywgTG93ZXJQcm9wZXJ0eSMjUHJvcGVydHlJbmZvKCkpKSBcCisgICAgICAgIHdy YXBwZXItPmRldGFjaExpc3RXcmFwcGVycyhuZXdMaXN0U2l6ZSk7IFwKIH0KIAogfQpJbmRleDog U291cmNlL1dlYkNvcmUvc3ZnL3Byb3BlcnRpZXMvU1ZHQW5pbWF0ZWRQcm9wZXJ0eVRlYXJPZmYu aAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9zdmcvcHJvcGVydGllcy9TVkdBbmltYXRl ZFByb3BlcnR5VGVhck9mZi5oCShyZXZpc2lvbiA5MTc0MykKKysrIFNvdXJjZS9XZWJDb3JlL3N2 Zy9wcm9wZXJ0aWVzL1NWR0FuaW1hdGVkUHJvcGVydHlUZWFyT2ZmLmgJKHdvcmtpbmcgY29weSkK QEAgLTQ5LDE1ICs0OSwzNyBAQCBwdWJsaWM6CiAgICAgICAgIHJldHVybiBhZG9wdFJlZihuZXcg U1ZHQW5pbWF0ZWRQcm9wZXJ0eVRlYXJPZmY8UHJvcGVydHlUeXBlPihjb250ZXh0RWxlbWVudCwg YXR0cmlidXRlTmFtZSwgcHJvcGVydHkpKTsKICAgICB9CiAKKyAgICBib29sIGlzQW5pbWF0aW5n KCkgY29uc3QgeyByZXR1cm4gbV9pc0FuaW1hdGluZzsgfQorCisgICAgUHJvcGVydHlUeXBlJiBj dXJyZW50QW5pbWF0ZWRWYWx1ZSgpCisgICAgeworICAgICAgICBBU1NFUlQobV9hbmltVmFsKTsK KyAgICAgICAgQVNTRVJUKG1faXNBbmltYXRpbmcpOworICAgICAgICByZXR1cm4gc3RhdGljX2Nh c3Q8U1ZHUHJvcGVydHlUZWFyT2ZmPFByb3BlcnR5VHlwZT4qPihtX2FuaW1WYWwuZ2V0KCkpLT5w cm9wZXJ0eVJlZmVyZW5jZSgpOworICAgIH0KKworICAgIHZpcnR1YWwgdm9pZCB1cGRhdGVBbmlt VmFsKHZvaWQqIHZhbHVlKQorICAgIHsKKyAgICAgICAgaWYgKHZhbHVlKSB7CisgICAgICAgICAg ICBzdGF0aWNfY2FzdDxTVkdQcm9wZXJ0eVRlYXJPZmY8UHJvcGVydHlUeXBlPio+KGFuaW1WYWwo KSktPnVwZGF0ZUFuaW1WYWwocmVpbnRlcnByZXRfY2FzdDxQcm9wZXJ0eVR5cGUqPih2YWx1ZSkp OworICAgICAgICAgICAgbV9pc0FuaW1hdGluZyA9IHRydWU7CisgICAgICAgICAgICByZXR1cm47 CisgICAgICAgIH0KKworICAgICAgICBzdGF0aWNfY2FzdDxTVkdQcm9wZXJ0eVRlYXJPZmY8UHJv cGVydHlUeXBlPio+KGFuaW1WYWwoKSktPnVwZGF0ZUFuaW1WYWwoJm1fcHJvcGVydHkpOworICAg ICAgICBtX2lzQW5pbWF0aW5nID0gZmFsc2U7CisgICAgfQorCiBwcml2YXRlOgogICAgIFNWR0Fu aW1hdGVkUHJvcGVydHlUZWFyT2ZmKFNWR0VsZW1lbnQqIGNvbnRleHRFbGVtZW50LCBjb25zdCBR dWFsaWZpZWROYW1lJiBhdHRyaWJ1dGVOYW1lLCBQcm9wZXJ0eVR5cGUmIHByb3BlcnR5KQogICAg ICAgICA6IFNWR0FuaW1hdGVkUHJvcGVydHkoY29udGV4dEVsZW1lbnQsIGF0dHJpYnV0ZU5hbWUp CiAgICAgICAgICwgbV9wcm9wZXJ0eShwcm9wZXJ0eSkKKyAgICAgICAgLCBtX2lzQW5pbWF0aW5n KGZhbHNlKQogICAgIHsKICAgICB9CiAKICAgICBQcm9wZXJ0eVR5cGUmIG1fcHJvcGVydHk7Ci0K KyAgICBib29sIG1faXNBbmltYXRpbmc7CiAgICAgUmVmUHRyPFNWR1Byb3BlcnR5PiBtX2Jhc2VW YWw7CiAgICAgUmVmUHRyPFNWR1Byb3BlcnR5PiBtX2FuaW1WYWw7CiB9OwpJbmRleDogU291cmNl L1dlYkNvcmUvc3ZnL3Byb3BlcnRpZXMvU1ZHQW5pbWF0ZWRTdGF0aWNQcm9wZXJ0eVRlYXJPZmYu aAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9zdmcvcHJvcGVydGllcy9TVkdBbmltYXRl ZFN0YXRpY1Byb3BlcnR5VGVhck9mZi5oCShyZXZpc2lvbiA5MTc0MykKKysrIFNvdXJjZS9XZWJD b3JlL3N2Zy9wcm9wZXJ0aWVzL1NWR0FuaW1hdGVkU3RhdGljUHJvcGVydHlUZWFyT2ZmLmgJKHdv cmtpbmcgY29weSkKQEAgLTQ2LDcgKzQ2LDggQEAgcHVibGljOgogICAgIH0KIAogICAgIC8vIEZJ WE1FOiBObyBhbmltVmFsIHN1cHBvcnQuCi0gICAgdm9pZCBzZXRBbmltVmFsKGNvbnN0IFByb3Bl cnR5VHlwZSYpIHsgfQorICAgIGJvb2wgaXNBbmltYXRpbmcoKSBjb25zdCB7IHJldHVybiBmYWxz ZTsgfQorICAgIFByb3BlcnR5VHlwZSYgY3VycmVudEFuaW1hdGVkVmFsdWUoKSB7IHJldHVybiBt X3Byb3BlcnR5OyB9CiAKICAgICBzdGF0aWMgUGFzc1JlZlB0cjxTVkdBbmltYXRlZFN0YXRpY1By b3BlcnR5VGVhck9mZjxQcm9wZXJ0eVR5cGU+ID4gY3JlYXRlKFNWR0VsZW1lbnQqIGNvbnRleHRF bGVtZW50LCBjb25zdCBRdWFsaWZpZWROYW1lJiBhdHRyaWJ1dGVOYW1lLCBQcm9wZXJ0eVR5cGUm IHByb3BlcnR5KQogICAgIHsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3N2Zy9wcm9wZXJ0aWVzL1NW R1Byb3BlcnR5VGVhck9mZi5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3N2Zy9wcm9w ZXJ0aWVzL1NWR1Byb3BlcnR5VGVhck9mZi5oCShyZXZpc2lvbiA5MTc0MykKKysrIFNvdXJjZS9X ZWJDb3JlL3N2Zy9wcm9wZXJ0aWVzL1NWR1Byb3BlcnR5VGVhck9mZi5oCSh3b3JraW5nIGNvcHkp CkBAIC05Myw2ICs5MywxMyBAQCBwdWJsaWM6CiAKICAgICB2aXJ0dWFsIFNWR1Byb3BlcnR5Um9s ZSByb2xlKCkgY29uc3QgeyByZXR1cm4gbV9yb2xlOyB9CiAKKyAgICB2b2lkIHVwZGF0ZUFuaW1W YWwoUHJvcGVydHlUeXBlKiB2YWx1ZSkKKyAgICB7CisgICAgICAgIEFTU0VSVCghbV92YWx1ZUlz Q29weSk7CisgICAgICAgIEFTU0VSVChtX3JvbGUgPT0gQW5pbVZhbFJvbGUpOworICAgICAgICBt X3ZhbHVlID0gdmFsdWU7CisgICAgfQorCiBwcm90ZWN0ZWQ6CiAgICAgU1ZHUHJvcGVydHlUZWFy T2ZmKFNWR0FuaW1hdGVkUHJvcGVydHkqIGFuaW1hdGVkUHJvcGVydHksIFNWR1Byb3BlcnR5Um9s ZSByb2xlLCBQcm9wZXJ0eVR5cGUmIHZhbHVlKQogICAgICAgICA6IG1fYW5pbWF0ZWRQcm9wZXJ0 eShhbmltYXRlZFByb3BlcnR5KQo=