121205 2013-09-11 19:43:01 -0700 Encapsulate globals in CSSPropertyAnimation.cpp 2013-09-12 14:19:54 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 121199 1 rniwa rniwa andersca benjamin commit-queue dino dstockwell esprehn+autocc glenn kling koivisto kondapallykalyan simon.fraser webkit-ews oldest_to_newest 928114 0 rniwa 2013-09-11 19:43:01 -0700 We have three globals in this file. Encapsulate them inside a class in the preparation to fix the bug 121199. 928116 1 211390 rniwa 2013-09-11 19:56:30 -0700 Created attachment 211390 Cleanup 928117 2 211390 webkit-ews 2013-09-11 20:04:37 -0700 Comment on attachment 211390 Cleanup Attachment 211390 did not pass qt-ews (qt): Output: http://webkit-queues.appspot.com/results/1797027 928120 3 211390 webkit-ews 2013-09-11 20:08:50 -0700 Comment on attachment 211390 Cleanup Attachment 211390 did not pass qt-wk2-ews (qt-wk2): Output: http://webkit-queues.appspot.com/results/1830028 928330 4 211390 koivisto 2013-09-12 09:26:17 -0700 Comment on attachment 211390 Cleanup View in context: https://bugs.webkit.org/attachment.cgi?id=211390&action=review > Source/WebCore/page/animation/CSSPropertyAnimation.cpp:1086 > + map->ensurePropertyMap(); // FIXME: ensurePropertyMap() calls instance() inside addShorthandProperties(). initialize() might be a better name. We usually use ensure* for functions that return a value. 928474 5 rniwa 2013-09-12 13:51:08 -0700 Committed r155647: <http://trac.webkit.org/changeset/155647> 928488 6 rniwa 2013-09-12 14:19:54 -0700 (In reply to comment #4) > (From update of attachment 211390 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=211390&action=review > > > Source/WebCore/page/animation/CSSPropertyAnimation.cpp:1086 > > + map->ensurePropertyMap(); // FIXME: ensurePropertyMap() calls instance() inside addShorthandProperties(). > > initialize() might be a better name. We usually use ensure* for functions that return a value. I'm getting rid of this function in the bug 121199. 211390 2013-09-11 19:56:30 -0700 2013-09-12 09:26:17 -0700 Cleanup bug-121205-20130911195630.patch text/plain 14026 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1NTU4NykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM2IEBACisyMDEzLTA5LTExICBSeW9zdWtl IE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIEVuY2Fwc3VsYXRlIGdsb2JhbHMg aW4gQ1NTUHJvcGVydHlBbmltYXRpb24uY3BwCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xMjEyMDUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBFbmNhcHN1bGF0ZWQgdGhlIGdsb2JhbHMgaW5zaWRlIGEgbmV3 bHkgYWRkZWQgQ1NTUHJvcGVydHlBbmltYXRpb25XcmFwcGVyTWFwLiBBbHNvIHJlbW92ZWQgdGhl IGNpcmN1bGFyCisgICAgICAgIGRlcGVuZGVuY3kgZnJvbSBTaG9ydGhhbmRQcm9wZXJ0eVdyYXBw ZXIncyBjb25zdHJ1Y3RvciB0byBDU1NQcm9wZXJ0eUFuaW1hdGlvbldyYXBwZXJNYXA6Omluc3Rh bmNlKCkuCisgICAgICAgIFRoZSBjaXJjdWxhciBkZXBlbmRlbmN5IHN0aWxsIGV4aXN0cyBpbiBl bnN1cmVQcm9wZXJ0eU1hcCBidXQgSSdtIGdvaW5nIHRvIHJlbW92ZSBpdCBpbiB0aGUgYnVnIDEy MTE5OS4KKworICAgICAgICAqIHBhZ2UvYW5pbWF0aW9uL0NTU1Byb3BlcnR5QW5pbWF0aW9uLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OlNob3J0aGFuZFByb3BlcnR5V3JhcHBlcjo6U2hvcnRoYW5k UHJvcGVydHlXcmFwcGVyKTogVGFrZXMgYSBWZWN0b3Igb2YgbG9uZ2hhbmQgd3JhcHBlcnMgaW5z dGVhZCBvZgorICAgICAgICBjYWxsaW5nIHdyYXBwZXJGb3JQcm9wZXJ0eSBpbiB0aGUgbWlkZGxl IG9mIGNvbnN0cnVjdGluZyB0aGUgdmVyeSB0YWJsZS4gVGhpcyBjaXJjdWxhciBkZXBlbmRlbmN5 IGlzIG5vdworICAgICAgICBlbmNhcHN1bGF0ZWQgaW4gQ1NTUHJvcGVydHlBbmltYXRpb25XcmFw cGVyTWFwOjplbnN1cmVQcm9wZXJ0eU1hcC4KKyAgICAgICAgKFdlYkNvcmU6OkNTU1Byb3BlcnR5 QW5pbWF0aW9uV3JhcHBlck1hcDo6aW5zdGFuY2UpOiBBZGRlZC4KKyAgICAgICAgKFdlYkNvcmU6 OkNTU1Byb3BlcnR5QW5pbWF0aW9uV3JhcHBlck1hcDo6d3JhcHBlckZvclByb3BlcnR5KTogUmVu YW1lZCBmcm9tIFdlYkNvcmU6OndyYXBwZXJGb3JQcm9wZXJ0eS4KKyAgICAgICAgKFdlYkNvcmU6 OkNTU1Byb3BlcnR5QW5pbWF0aW9uV3JhcHBlck1hcDo6d3JhcHBlckZvckluZGV4KTogQWRkZWQu CisgICAgICAgIChXZWJDb3JlOjpDU1NQcm9wZXJ0eUFuaW1hdGlvbldyYXBwZXJNYXA6OnNpemUp OiBBZGRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkNTU1Byb3BlcnR5QW5pbWF0aW9uV3JhcHBlck1h cDo6YWRkUHJvcGVydHlXcmFwcGVyKTogUmVuYW1lZCBmcm9tIFdlYkNvcmU6OmFkZFByb3BlcnR5 V3JhcHBlci4gQWxzbworICAgICAgICBjbGVhbmVkIHVwIGJvb2xlYW4gbG9naWNzIHRvIHVzZSBl YXJseSBleGl0cyBpbnN0ZWFkIG9mIG5lc3RlZCBpZnMuCisgICAgICAgIChXZWJDb3JlOjpDU1NQ cm9wZXJ0eUFuaW1hdGlvbldyYXBwZXJNYXA6OmFkZFNob3J0aGFuZFByb3BlcnRpZXMpOiBSZW5h bWVkIGZyb20gV2ViQ29yZTo6YWRkU2hvcnRoYW5kUHJvcGVydGllcy4KKyAgICAgICAgKFdlYkNv cmU6OkNTU1Byb3BlcnR5QW5pbWF0aW9uV3JhcHBlck1hcDo6ZW5zdXJlUHJvcGVydHlNYXApOiBS ZW5hbWVkIGZyb20gV2ViQ29yZTo6ZW5zdXJlUHJvcGVydHlNYXAuCisgICAgICAgIEFkZGVkIGFu IGFsaWFzIGdQcm9wZXJ0eVdyYXBwZXJzIGZvciBtX3Byb3BlcnR5V3JhcHBlcnM7IHRoaXMgYWxp YXNpbmcgd2lsbCBiZSByZW1vdmVkIGluIHRoZSBidWcgMTIxMTk5LgorICAgICAgICAoV2ViQ29y ZTo6Q1NTUHJvcGVydHlBbmltYXRpb246OmJsZW5kUHJvcGVydGllcyk6CisgICAgICAgIChXZWJD b3JlOjpDU1NQcm9wZXJ0eUFuaW1hdGlvbjo6YW5pbWF0aW9uT2ZQcm9wZXJ0eUlzQWNjZWxlcmF0 ZWQpOgorICAgICAgICAoV2ViQ29yZTo6Q1NTUHJvcGVydHlBbmltYXRpb246OmFuaW1hdGFibGVT aG9ydGhhbmRzQWZmZWN0aW5nUHJvcGVydHkpOgorICAgICAgICAoV2ViQ29yZTo6Q1NTUHJvcGVy dHlBbmltYXRpb246OnByb3BlcnRpZXNFcXVhbCk6CisgICAgICAgIChXZWJDb3JlOjpDU1NQcm9w ZXJ0eUFuaW1hdGlvbjo6Z2V0UHJvcGVydHlBdEluZGV4KToKKyAgICAgICAgKFdlYkNvcmU6OkNT U1Byb3BlcnR5QW5pbWF0aW9uOjpnZXROdW1Qcm9wZXJ0aWVzKToKKyAgICAgICAgKiBwYWdlL2Fu aW1hdGlvbi9DU1NQcm9wZXJ0eUFuaW1hdGlvbi5oOgorICAgICAgICAqIHJlbmRlcmluZy9zdHls ZS9SZW5kZXJTdHlsZS5oOgorCiAyMDEzLTA5LTExICBWaXZlayBHYWxhdGFnZSAgPHZpdmVrLnZn QHNhbXN1bmcuY29tPgogCiAgICAgICAgIERPTVBhcnNlci5wYXJzZUZyb21TdHJpbmcoKSBzaG91 bGQgc3VwcG9ydCBjcmVhdGluZyBIVE1MIERvY3VtZW50IHdpdGggbWltZS10eXBlIHRleHQvaHRt bApJbmRleDogU291cmNlL1dlYkNvcmUvcGFnZS9hbmltYXRpb24vQ1NTUHJvcGVydHlBbmltYXRp b24uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BhZ2UvYW5pbWF0aW9uL0NTU1By b3BlcnR5QW5pbWF0aW9uLmNwcAkocmV2aXNpb24gMTU1NTU4KQorKysgU291cmNlL1dlYkNvcmUv cGFnZS9hbmltYXRpb24vQ1NTUHJvcGVydHlBbmltYXRpb24uY3BwCSh3b3JraW5nIGNvcHkpCkBA IC00MDEsMzIgKzQwMSw2IEBAIHByaXZhdGU6CiAgICAgQ1NTUHJvcGVydHlJRCBtX3Byb3A7CiB9 OwogCi1zdGF0aWMgaW50IGdQcm9wZXJ0eVdyYXBwZXJNYXBbbnVtQ1NTUHJvcGVydGllc107Ci1z dGF0aWMgY29uc3QgaW50IGNJbnZhbGlkUHJvcGVydHlXcmFwcGVySW5kZXggPSAtMTsKLXN0YXRp YyBWZWN0b3I8QW5pbWF0aW9uUHJvcGVydHlXcmFwcGVyQmFzZSo+KiBnUHJvcGVydHlXcmFwcGVy cyA9IDA7Ci0KLXN0YXRpYyB2b2lkIGFkZFByb3BlcnR5V3JhcHBlcihDU1NQcm9wZXJ0eUlEIHBy b3BlcnR5SUQsIEFuaW1hdGlvblByb3BlcnR5V3JhcHBlckJhc2UqIHdyYXBwZXIpCi17Ci0gICAg aW50IHByb3BJbmRleCA9IHByb3BlcnR5SUQgLSBmaXJzdENTU1Byb3BlcnR5OwotCi0gICAgQVNT RVJUKGdQcm9wZXJ0eVdyYXBwZXJNYXBbcHJvcEluZGV4XSA9PSBjSW52YWxpZFByb3BlcnR5V3Jh cHBlckluZGV4KTsKLQotICAgIHVuc2lnbmVkIHdyYXBwZXJJbmRleCA9IGdQcm9wZXJ0eVdyYXBw ZXJzLT5zaXplKCk7Ci0gICAgZ1Byb3BlcnR5V3JhcHBlcnMtPmFwcGVuZCh3cmFwcGVyKTsKLSAg ICBnUHJvcGVydHlXcmFwcGVyTWFwW3Byb3BJbmRleF0gPSB3cmFwcGVySW5kZXg7Ci19Ci0KLXN0 YXRpYyBBbmltYXRpb25Qcm9wZXJ0eVdyYXBwZXJCYXNlKiB3cmFwcGVyRm9yUHJvcGVydHkoQ1NT UHJvcGVydHlJRCBwcm9wZXJ0eUlEKQotewotICAgIGludCBwcm9wSW5kZXggPSBwcm9wZXJ0eUlE IC0gZmlyc3RDU1NQcm9wZXJ0eTsKLSAgICBpZiAocHJvcEluZGV4ID49IDAgJiYgcHJvcEluZGV4 IDwgbnVtQ1NTUHJvcGVydGllcykgewotICAgICAgICBpbnQgd3JhcHBlckluZGV4ID0gZ1Byb3Bl cnR5V3JhcHBlck1hcFtwcm9wSW5kZXhdOwotICAgICAgICBpZiAod3JhcHBlckluZGV4ID49IDAp Ci0gICAgICAgICAgICByZXR1cm4gKCpnUHJvcGVydHlXcmFwcGVycylbd3JhcHBlckluZGV4XTsK LSAgICB9Ci0gICAgcmV0dXJuIDA7Ci19Ci0KIHRlbXBsYXRlIDx0eXBlbmFtZSBUPgogY2xhc3Mg UHJvcGVydHlXcmFwcGVyR2V0dGVyIDogcHVibGljIEFuaW1hdGlvblByb3BlcnR5V3JhcHBlckJh c2UgewogcHVibGljOgpAQCAtOTgyLDE0ICs5NTYsMTAgQEAgcHJpdmF0ZToKIAogY2xhc3MgU2hv cnRoYW5kUHJvcGVydHlXcmFwcGVyIDogcHVibGljIEFuaW1hdGlvblByb3BlcnR5V3JhcHBlckJh c2UgewogcHVibGljOgotICAgIFNob3J0aGFuZFByb3BlcnR5V3JhcHBlcihDU1NQcm9wZXJ0eUlE IHByb3BlcnR5LCBjb25zdCBTdHlsZVByb3BlcnR5U2hvcnRoYW5kJiBzaG9ydGhhbmQpCisgICAg U2hvcnRoYW5kUHJvcGVydHlXcmFwcGVyKENTU1Byb3BlcnR5SUQgcHJvcGVydHksIFZlY3RvcjxB bmltYXRpb25Qcm9wZXJ0eVdyYXBwZXJCYXNlKj4gbG9uZ2hhbmRXcmFwcGVycykKICAgICAgICAg OiBBbmltYXRpb25Qcm9wZXJ0eVdyYXBwZXJCYXNlKHByb3BlcnR5KQogICAgIHsKLSAgICAgICAg Zm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IHNob3J0aGFuZC5sZW5ndGgoKTsgKytpKSB7Ci0gICAg ICAgICAgICBBbmltYXRpb25Qcm9wZXJ0eVdyYXBwZXJCYXNlKiB3cmFwcGVyID0gd3JhcHBlckZv clByb3BlcnR5KHNob3J0aGFuZC5wcm9wZXJ0aWVzKClbaV0pOwotICAgICAgICAgICAgaWYgKHdy YXBwZXIpCi0gICAgICAgICAgICAgICAgbV9wcm9wZXJ0eVdyYXBwZXJzLmFwcGVuZCh3cmFwcGVy KTsKLSAgICAgICAgfQorICAgICAgICBtX3Byb3BlcnR5V3JhcHBlcnMuc3dhcChsb25naGFuZFdy YXBwZXJzKTsKICAgICB9CiAKICAgICB2aXJ0dWFsIGJvb2wgaXNTaG9ydGhhbmRXcmFwcGVyKCkg Y29uc3QgeyByZXR1cm4gdHJ1ZTsgfQpAQCAtMTEwNSw3ICsxMDc1LDY2IEBAIHByaXZhdGU6CiB9 OwogI2VuZGlmCiAKLXN0YXRpYyB2b2lkIGFkZFNob3J0aGFuZFByb3BlcnRpZXMoKQorY2xhc3Mg Q1NTUHJvcGVydHlBbmltYXRpb25XcmFwcGVyTWFwIHsKK3B1YmxpYzoKKyAgICBzdGF0aWMgQ1NT UHJvcGVydHlBbmltYXRpb25XcmFwcGVyTWFwJiBpbnN0YW5jZSgpCisgICAgeworICAgICAgICAv LyBGSVhNRTogVGhpcyBkYXRhIGlzIG5ldmVyIGRlc3Ryb3llZC4gTWF5YmUgd2Ugc2hvdWxkIHJl ZiBjb3VudCBpdCBhbmQgdG9zcyBpdCB3aGVuIHRoZSBsYXN0IEFuaW1hdGlvbkNvbnRyb2xsZXIg aXMgZGVzdHJveWVkPworICAgICAgICBERUZJTkVfU1RBVElDX0xPQ0FMKE93blB0cjxDU1NQcm9w ZXJ0eUFuaW1hdGlvbldyYXBwZXJNYXA+LCBtYXAsICgpKTsKKyAgICAgICAgaWYgKCFtYXApIHsK KyAgICAgICAgICAgIG1hcCA9IGFkb3B0UHRyKG5ldyBDU1NQcm9wZXJ0eUFuaW1hdGlvbldyYXBw ZXJNYXApOworICAgICAgICAgICAgbWFwLT5lbnN1cmVQcm9wZXJ0eU1hcCgpOyAvLyBGSVhNRTog ZW5zdXJlUHJvcGVydHlNYXAoKSBjYWxscyBpbnN0YW5jZSgpIGluc2lkZSBhZGRTaG9ydGhhbmRQ cm9wZXJ0aWVzKCkuCisgICAgICAgIH0KKyAgICAgICAgcmV0dXJuICptYXA7CisgICAgfQorCisg ICAgQW5pbWF0aW9uUHJvcGVydHlXcmFwcGVyQmFzZSogd3JhcHBlckZvclByb3BlcnR5KENTU1By b3BlcnR5SUQgcHJvcGVydHlJRCkKKyAgICB7CisgICAgICAgIGludCBwcm9wSW5kZXggPSBwcm9w ZXJ0eUlEIC0gZmlyc3RDU1NQcm9wZXJ0eTsKKyAgICAgICAgaWYgKHByb3BlcnR5SUQgPCBmaXJz dENTU1Byb3BlcnR5IHx8IHByb3BlcnR5SUQgPiBsYXN0Q1NTUHJvcGVydHkpCisgICAgICAgICAg ICByZXR1cm4gMDsKKworICAgICAgICB1bnNpZ25lZCB3cmFwcGVySW5kZXggPSBtX3Byb3BlcnR5 VG9JZE1hcFtwcm9wSW5kZXhdOworICAgICAgICBpZiAod3JhcHBlckluZGV4ID09IGNJbnZhbGlk UHJvcGVydHlXcmFwcGVySW5kZXgpCisgICAgICAgICAgICByZXR1cm4gMDsKKworICAgICAgICBy ZXR1cm4gbV9wcm9wZXJ0eVdyYXBwZXJzW3dyYXBwZXJJbmRleF07CisgICAgfQorCisgICAgQW5p bWF0aW9uUHJvcGVydHlXcmFwcGVyQmFzZSogd3JhcHBlckZvckluZGV4KHVuc2lnbmVkIGluZGV4 KQorICAgIHsKKyAgICAgICAgQVNTRVJUKGluZGV4IDwgbV9wcm9wZXJ0eVdyYXBwZXJzLnNpemUo KSk7CisgICAgICAgIHJldHVybiBtX3Byb3BlcnR5V3JhcHBlcnNbaW5kZXhdOworICAgIH0KKwor ICAgIHVuc2lnbmVkIHNpemUoKQorICAgIHsKKyAgICAgICAgcmV0dXJuIG1fcHJvcGVydHlXcmFw cGVycy5zaXplKCk7CisgICAgfQorCisKK3ByaXZhdGU6CisgICAgdm9pZCBhZGRTaG9ydGhhbmRQ cm9wZXJ0aWVzKCk7CisgICAgdm9pZCBlbnN1cmVQcm9wZXJ0eU1hcCgpOworCisgICAgdm9pZCBh ZGRQcm9wZXJ0eVdyYXBwZXIoQ1NTUHJvcGVydHlJRCBwcm9wZXJ0eUlELCBBbmltYXRpb25Qcm9w ZXJ0eVdyYXBwZXJCYXNlKiB3cmFwcGVyKQorICAgIHsKKyAgICAgICAgaW50IHByb3BJbmRleCA9 IHByb3BlcnR5SUQgLSBmaXJzdENTU1Byb3BlcnR5OworCisgICAgICAgIEFTU0VSVChtX3Byb3Bl cnR5VG9JZE1hcFtwcm9wSW5kZXhdID09IGNJbnZhbGlkUHJvcGVydHlXcmFwcGVySW5kZXgpOwor CisgICAgICAgIHVuc2lnbmVkIHdyYXBwZXJJbmRleCA9IG1fcHJvcGVydHlXcmFwcGVycy5zaXpl KCk7CisgICAgICAgIG1fcHJvcGVydHlXcmFwcGVycy5hcHBlbmQod3JhcHBlcik7CisgICAgICAg IG1fcHJvcGVydHlUb0lkTWFwW3Byb3BJbmRleF0gPSB3cmFwcGVySW5kZXg7CisgICAgfQorCisg ICAgVmVjdG9yPEFuaW1hdGlvblByb3BlcnR5V3JhcHBlckJhc2UqPiBtX3Byb3BlcnR5V3JhcHBl cnM7CisgICAgdW5zaWduZWQgbV9wcm9wZXJ0eVRvSWRNYXBbbnVtQ1NTUHJvcGVydGllc107CisK KyAgICBjb25zdCB1bnNpZ25lZCBjSW52YWxpZFByb3BlcnR5V3JhcHBlckluZGV4ID0gVUlOVF9N QVg7Cit9OworCit2b2lkIENTU1Byb3BlcnR5QW5pbWF0aW9uV3JhcHBlck1hcDo6YWRkU2hvcnRo YW5kUHJvcGVydGllcygpCiB7CiAgICAgc3RhdGljIGNvbnN0IENTU1Byb3BlcnR5SUQgYW5pbWF0 YWJsZVNob3J0aGFuZFByb3BlcnRpZXNbXSA9IHsKICAgICAgICAgQ1NTUHJvcGVydHlCYWNrZ3Jv dW5kLCAvLyBmb3IgYmFja2dyb3VuZC1jb2xvciwgYmFja2dyb3VuZC1wb3NpdGlvbiwgYmFja2dy b3VuZC1pbWFnZQpAQCAtMTEzMCwyMSArMTE1OSwyNyBAQCBzdGF0aWMgdm9pZCBhZGRTaG9ydGhh bmRQcm9wZXJ0aWVzKCkKICAgICAgICAgQ1NTUHJvcGVydHlXZWJraXRUcmFuc2Zvcm1PcmlnaW4K ICAgICB9OwogCisgICAgQ1NTUHJvcGVydHlBbmltYXRpb25XcmFwcGVyTWFwJiBtYXAgPSBDU1NQ cm9wZXJ0eUFuaW1hdGlvbldyYXBwZXJNYXA6Omluc3RhbmNlKCk7CisKICAgICBmb3IgKHNpemVf dCBpID0gMDsgaSA8IFdURl9BUlJBWV9MRU5HVEgoYW5pbWF0YWJsZVNob3J0aGFuZFByb3BlcnRp ZXMpOyArK2kpIHsKICAgICAgICAgQ1NTUHJvcGVydHlJRCBwcm9wZXJ0eUlEID0gYW5pbWF0YWJs ZVNob3J0aGFuZFByb3BlcnRpZXNbaV07CiAgICAgICAgIFN0eWxlUHJvcGVydHlTaG9ydGhhbmQg c2hvcnRoYW5kID0gc2hvcnRoYW5kRm9yUHJvcGVydHkocHJvcGVydHlJRCk7Ci0gICAgICAgIGlm IChzaG9ydGhhbmQubGVuZ3RoKCkgPiAwKQotICAgICAgICAgICAgYWRkUHJvcGVydHlXcmFwcGVy KHByb3BlcnR5SUQsIG5ldyBTaG9ydGhhbmRQcm9wZXJ0eVdyYXBwZXIocHJvcGVydHlJRCwgc2hv cnRoYW5kKSk7CisgICAgICAgIGlmICghc2hvcnRoYW5kLmxlbmd0aCgpKQorICAgICAgICAgICAg Y29udGludWU7CisKKyAgICAgICAgVmVjdG9yPEFuaW1hdGlvblByb3BlcnR5V3JhcHBlckJhc2Uq PiBsb25naGFuZFdyYXBwZXJzOworICAgICAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgc2hv cnRoYW5kLmxlbmd0aCgpOyArK2kpIHsKKyAgICAgICAgICAgIGlmIChBbmltYXRpb25Qcm9wZXJ0 eVdyYXBwZXJCYXNlKiB3cmFwcGVyID0gbWFwLndyYXBwZXJGb3JQcm9wZXJ0eShzaG9ydGhhbmQu cHJvcGVydGllcygpW2ldKSkKKyAgICAgICAgICAgICAgICBsb25naGFuZFdyYXBwZXJzLmFwcGVu ZCh3cmFwcGVyKTsKKyAgICAgICAgfQorCisgICAgICAgIG1hcC5hZGRQcm9wZXJ0eVdyYXBwZXIo cHJvcGVydHlJRCwgbmV3IFNob3J0aGFuZFByb3BlcnR5V3JhcHBlcihwcm9wZXJ0eUlELCBsb25n aGFuZFdyYXBwZXJzKSk7CiAgICAgfQogfQogCi12b2lkIENTU1Byb3BlcnR5QW5pbWF0aW9uOjpl bnN1cmVQcm9wZXJ0eU1hcCgpCit2b2lkIENTU1Byb3BlcnR5QW5pbWF0aW9uV3JhcHBlck1hcDo6 ZW5zdXJlUHJvcGVydHlNYXAoKQogewotICAgIC8vIEZJWE1FOiBUaGlzIGRhdGEgaXMgbmV2ZXIg ZGVzdHJveWVkLiBNYXliZSB3ZSBzaG91bGQgcmVmIGNvdW50IGl0IGFuZCB0b3NzIGl0IHdoZW4g dGhlIGxhc3QgQW5pbWF0aW9uQ29udHJvbGxlciBpcyBkZXN0cm95ZWQ/Ci0gICAgaWYgKGdQcm9w ZXJ0eVdyYXBwZXJzKQotICAgICAgICByZXR1cm47Ci0KLSAgICBnUHJvcGVydHlXcmFwcGVycyA9 IG5ldyBWZWN0b3I8QW5pbWF0aW9uUHJvcGVydHlXcmFwcGVyQmFzZSo+KCk7CisgICAgVmVjdG9y PEFuaW1hdGlvblByb3BlcnR5V3JhcHBlckJhc2UqPiogZ1Byb3BlcnR5V3JhcHBlcnMgPSAmbV9w cm9wZXJ0eVdyYXBwZXJzOyAvLyBGSVhNRTogUmVtb3ZlIHRoaXMgYWxpYXNpbmcuCiAKICAgICAv LyBidWlsZCB0aGUgbGlzdCBvZiBwcm9wZXJ0eSB3cmFwcGVycyB0byBkbyB0aGUgY29tcGFyaXNv bnMgYW5kIGJsZW5kcwogICAgIGdQcm9wZXJ0eVdyYXBwZXJzLT5hcHBlbmQobmV3IFByb3BlcnR5 V3JhcHBlcjxMZW5ndGg+KENTU1Byb3BlcnR5TGVmdCwgJlJlbmRlclN0eWxlOjpsZWZ0LCAmUmVu ZGVyU3R5bGU6OnNldExlZnQpKTsKQEAgLTEzMDcsMTQgKzEzNDIsMTQgQEAgdm9pZCBDU1NQcm9w ZXJ0eUFuaW1hdGlvbjo6ZW5zdXJlUHJvcGVydAogCiAgICAgLy8gTWFrZSBzdXJlIHVudXNlZCBz bG90cyBoYXZlIGEgdmFsdWUKICAgICBmb3IgKHVuc2lnbmVkIGludCBpID0gMDsgaSA8IHN0YXRp Y19jYXN0PHVuc2lnbmVkIGludD4obnVtQ1NTUHJvcGVydGllcyk7ICsraSkKLSAgICAgICAgZ1By b3BlcnR5V3JhcHBlck1hcFtpXSA9IGNJbnZhbGlkUHJvcGVydHlXcmFwcGVySW5kZXg7CisgICAg ICAgIG1fcHJvcGVydHlUb0lkTWFwW2ldID0gY0ludmFsaWRQcm9wZXJ0eVdyYXBwZXJJbmRleDsK IAogICAgIC8vIEZpcnN0IHdlIHB1dCB0aGUgbm9uLXNob3J0aGFuZCBwcm9wZXJ0eSB3cmFwcGVy cyBpbnRvIHRoZSBtYXAsIHNvIHRoZSBzaG9ydGhhbmQtYnVpbGRpbmcKICAgICAvLyBjb2RlIGNh biBmaW5kIHRoZW0uCiAgICAgc2l6ZV90IG4gPSBnUHJvcGVydHlXcmFwcGVycy0+c2l6ZSgpOwog ICAgIGZvciAodW5zaWduZWQgaW50IGkgPSAwOyBpIDwgbjsgKytpKSB7Ci0gICAgICAgIEFTU0VS VCgoKmdQcm9wZXJ0eVdyYXBwZXJzKVtpXS0+cHJvcGVydHkoKSAtIGZpcnN0Q1NTUHJvcGVydHkg PCBudW1DU1NQcm9wZXJ0aWVzKTsKLSAgICAgICAgZ1Byb3BlcnR5V3JhcHBlck1hcFsoKmdQcm9w ZXJ0eVdyYXBwZXJzKVtpXS0+cHJvcGVydHkoKSAtIGZpcnN0Q1NTUHJvcGVydHldID0gaTsKKyAg ICAgICAgQVNTRVJUKG1fcHJvcGVydHlXcmFwcGVyc1tpXS0+cHJvcGVydHkoKSAtIGZpcnN0Q1NT UHJvcGVydHkgPCBudW1DU1NQcm9wZXJ0aWVzKTsKKyAgICAgICAgbV9wcm9wZXJ0eVRvSWRNYXBb bV9wcm9wZXJ0eVdyYXBwZXJzW2ldLT5wcm9wZXJ0eSgpIC0gZmlyc3RDU1NQcm9wZXJ0eV0gPSBp OwogICAgIH0KIAogICAgIC8vIE5vdyBhZGQgdGhlIHNob3J0aGFuZCB3cmFwcGVycy4KQEAgLTEz NDcsOSArMTM4Miw3IEBAIGJvb2wgQ1NTUHJvcGVydHlBbmltYXRpb246OmJsZW5kUHJvcGVydGkK IHsKICAgICBBU1NFUlQocHJvcCAhPSBDU1NQcm9wZXJ0eUludmFsaWQpOwogCi0gICAgZW5zdXJl UHJvcGVydHlNYXAoKTsKLQotICAgIEFuaW1hdGlvblByb3BlcnR5V3JhcHBlckJhc2UqIHdyYXBw ZXIgPSB3cmFwcGVyRm9yUHJvcGVydHkocHJvcCk7CisgICAgQW5pbWF0aW9uUHJvcGVydHlXcmFw cGVyQmFzZSogd3JhcHBlciA9IENTU1Byb3BlcnR5QW5pbWF0aW9uV3JhcHBlck1hcDo6aW5zdGFu Y2UoKS53cmFwcGVyRm9yUHJvcGVydHkocHJvcCk7CiAgICAgaWYgKHdyYXBwZXIpIHsKICAgICAg ICAgd3JhcHBlci0+YmxlbmQoYW5pbSwgZHN0LCBhLCBiLCBwcm9ncmVzcyk7CiAjaWYgVVNFKEFD Q0VMRVJBVEVEX0NPTVBPU0lUSU5HKQpAQCAtMTM2NSw4ICsxMzk4LDcgQEAgYm9vbCBDU1NQcm9w ZXJ0eUFuaW1hdGlvbjo6YmxlbmRQcm9wZXJ0aQogI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJ VElORykKIGJvb2wgQ1NTUHJvcGVydHlBbmltYXRpb246OmFuaW1hdGlvbk9mUHJvcGVydHlJc0Fj Y2VsZXJhdGVkKENTU1Byb3BlcnR5SUQgcHJvcCkKIHsKLSAgICBlbnN1cmVQcm9wZXJ0eU1hcCgp OwotICAgIEFuaW1hdGlvblByb3BlcnR5V3JhcHBlckJhc2UqIHdyYXBwZXIgPSB3cmFwcGVyRm9y UHJvcGVydHkocHJvcCk7CisgICAgQW5pbWF0aW9uUHJvcGVydHlXcmFwcGVyQmFzZSogd3JhcHBl ciA9IENTU1Byb3BlcnR5QW5pbWF0aW9uV3JhcHBlck1hcDo6aW5zdGFuY2UoKS53cmFwcGVyRm9y UHJvcGVydHkocHJvcCk7CiAgICAgcmV0dXJuIHdyYXBwZXIgPyB3cmFwcGVyLT5hbmltYXRpb25J c0FjY2VsZXJhdGVkKCkgOiBmYWxzZTsKIH0KICNlbmRpZgpAQCAtMTM3NCwyMCArMTQwNiwxOCBA QCBib29sIENTU1Byb3BlcnR5QW5pbWF0aW9uOjphbmltYXRpb25PZlByCiAvLyBOb3RlOiB0aGlz IGlzIGluZWZmaWNpZW50LiBJdCdzIG9ubHkgY2FsbGVkIGZyb20gcGF1c2VUcmFuc2l0aW9uQXRU aW1lKCkuCiBIYXNoU2V0PENTU1Byb3BlcnR5SUQ+IENTU1Byb3BlcnR5QW5pbWF0aW9uOjphbmlt YXRhYmxlU2hvcnRoYW5kc0FmZmVjdGluZ1Byb3BlcnR5KENTU1Byb3BlcnR5SUQgcHJvcGVydHkp CiB7Ci0gICAgZW5zdXJlUHJvcGVydHlNYXAoKTsKKyAgICBDU1NQcm9wZXJ0eUFuaW1hdGlvbldy YXBwZXJNYXAmIG1hcCA9IENTU1Byb3BlcnR5QW5pbWF0aW9uV3JhcHBlck1hcDo6aW5zdGFuY2Uo KTsKIAogICAgIEhhc2hTZXQ8Q1NTUHJvcGVydHlJRD4gZm91bmRQcm9wZXJ0aWVzOwotICAgIGZv ciAoaW50IGkgPSAwOyBpIDwgZ2V0TnVtUHJvcGVydGllcygpOyArK2kpCi0gICAgICAgIGdhdGhl ckVuY2xvc2luZ1Nob3J0aGFuZFByb3BlcnRpZXMocHJvcGVydHksICgqZ1Byb3BlcnR5V3JhcHBl cnMpW2ldLCBmb3VuZFByb3BlcnRpZXMpOworICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBt YXAuc2l6ZSgpOyArK2kpCisgICAgICAgIGdhdGhlckVuY2xvc2luZ1Nob3J0aGFuZFByb3BlcnRp ZXMocHJvcGVydHksIG1hcC53cmFwcGVyRm9ySW5kZXgoaSksIGZvdW5kUHJvcGVydGllcyk7CiAK ICAgICByZXR1cm4gZm91bmRQcm9wZXJ0aWVzOwogfQogCiBib29sIENTU1Byb3BlcnR5QW5pbWF0 aW9uOjpwcm9wZXJ0aWVzRXF1YWwoQ1NTUHJvcGVydHlJRCBwcm9wLCBjb25zdCBSZW5kZXJTdHls ZSogYSwgY29uc3QgUmVuZGVyU3R5bGUqIGIpCiB7Ci0gICAgZW5zdXJlUHJvcGVydHlNYXAoKTsK LQotICAgIEFuaW1hdGlvblByb3BlcnR5V3JhcHBlckJhc2UqIHdyYXBwZXIgPSB3cmFwcGVyRm9y UHJvcGVydHkocHJvcCk7CisgICAgQW5pbWF0aW9uUHJvcGVydHlXcmFwcGVyQmFzZSogd3JhcHBl ciA9IENTU1Byb3BlcnR5QW5pbWF0aW9uV3JhcHBlck1hcDo6aW5zdGFuY2UoKS53cmFwcGVyRm9y UHJvcGVydHkocHJvcCk7CiAgICAgaWYgKHdyYXBwZXIpCiAgICAgICAgIHJldHVybiB3cmFwcGVy LT5lcXVhbHMoYSwgYik7CiAgICAgcmV0dXJuIHRydWU7CkBAIC0xMzk1LDIxICsxNDI1LDE5IEBA IGJvb2wgQ1NTUHJvcGVydHlBbmltYXRpb246OnByb3BlcnRpZXNFcXUKIAogQ1NTUHJvcGVydHlJ RCBDU1NQcm9wZXJ0eUFuaW1hdGlvbjo6Z2V0UHJvcGVydHlBdEluZGV4KGludCBpLCBib29sJiBp c1Nob3J0aGFuZCkKIHsKLSAgICBlbnN1cmVQcm9wZXJ0eU1hcCgpOworICAgIENTU1Byb3BlcnR5 QW5pbWF0aW9uV3JhcHBlck1hcCYgbWFwID0gQ1NTUHJvcGVydHlBbmltYXRpb25XcmFwcGVyTWFw OjppbnN0YW5jZSgpOwogCi0gICAgaWYgKGkgPCAwIHx8IGkgPj0gZ2V0TnVtUHJvcGVydGllcygp KQorICAgIGlmIChpIDwgMCB8fCBzdGF0aWNfY2FzdDx1bnNpZ25lZD4oaSkgPj0gbWFwLnNpemUo KSkKICAgICAgICAgcmV0dXJuIENTU1Byb3BlcnR5SW52YWxpZDsKIAotICAgIEFuaW1hdGlvblBy b3BlcnR5V3JhcHBlckJhc2UqIHdyYXBwZXIgPSAoKmdQcm9wZXJ0eVdyYXBwZXJzKVtpXTsKKyAg ICBBbmltYXRpb25Qcm9wZXJ0eVdyYXBwZXJCYXNlKiB3cmFwcGVyID0gbWFwLndyYXBwZXJGb3JJ bmRleChpKTsKICAgICBpc1Nob3J0aGFuZCA9IHdyYXBwZXItPmlzU2hvcnRoYW5kV3JhcHBlcigp OwogICAgIHJldHVybiB3cmFwcGVyLT5wcm9wZXJ0eSgpOwogfQogCiBpbnQgQ1NTUHJvcGVydHlB bmltYXRpb246OmdldE51bVByb3BlcnRpZXMoKQogewotICAgIGVuc3VyZVByb3BlcnR5TWFwKCk7 Ci0KLSAgICByZXR1cm4gZ1Byb3BlcnR5V3JhcHBlcnMtPnNpemUoKTsKKyAgICByZXR1cm4gQ1NT UHJvcGVydHlBbmltYXRpb25XcmFwcGVyTWFwOjppbnN0YW5jZSgpLnNpemUoKTsKIH0KIAogfQpJ bmRleDogU291cmNlL1dlYkNvcmUvcGFnZS9hbmltYXRpb24vQ1NTUHJvcGVydHlBbmltYXRpb24u aAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdlL2FuaW1hdGlvbi9DU1NQcm9wZXJ0 eUFuaW1hdGlvbi5oCShyZXZpc2lvbiAxNTU1NTgpCisrKyBTb3VyY2UvV2ViQ29yZS9wYWdlL2Fu aW1hdGlvbi9DU1NQcm9wZXJ0eUFuaW1hdGlvbi5oCSh3b3JraW5nIGNvcHkpCkBAIC01MSw4ICs1 MSw2IEBAIHB1YmxpYzoKIAogICAgIC8vIFJldHVybiB0cnVlIGlmIHdlIG5lZWQgdG8gc3RhcnQg c29mdHdhcmUgYW5pbWF0aW9uIHRpbWVycwogICAgIHN0YXRpYyBib29sIGJsZW5kUHJvcGVydGll cyhjb25zdCBBbmltYXRpb25CYXNlKiwgQ1NTUHJvcGVydHlJRCwgUmVuZGVyU3R5bGUqIGRzdCwg Y29uc3QgUmVuZGVyU3R5bGUqIGEsIGNvbnN0IFJlbmRlclN0eWxlKiBiLCBkb3VibGUgcHJvZ3Jl c3MpOwotcHJpdmF0ZToKLSAgICBzdGF0aWMgdm9pZCBlbnN1cmVQcm9wZXJ0eU1hcCgpOwogfTsK IAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L3N0eWxlL1JlbmRlclN0eWxlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL3N0eWxlL1JlbmRlclN0eWxlLmgJKHJldmlzaW9uIDE1NTU1OCkKKysrIFNvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5oCSh3b3JraW5nIGNvcHkpCkBAIC0xMjcs NyArMTI3LDcgQEAgY2xhc3MgQ29udGVudERhdGE7CiB0eXBlZGVmIFZlY3RvcjxSZWZQdHI8UmVu ZGVyU3R5bGU+LCA0PiBQc2V1ZG9TdHlsZUNhY2hlOwogCiBjbGFzcyBSZW5kZXJTdHlsZTogcHVi bGljIFJlZkNvdW50ZWQ8UmVuZGVyU3R5bGU+IHsKLSAgICBmcmllbmQgY2xhc3MgQ1NTUHJvcGVy dHlBbmltYXRpb247IC8vIFVzZWQgYnkgQ1NTIGFuaW1hdGlvbnMuIFdlIGNhbid0IGFsbG93IHRo ZW0gdG8gYW5pbWF0ZSBiYXNlZCBvZmYgdmlzaXRlZCBjb2xvcnMuCisgICAgZnJpZW5kIGNsYXNz IENTU1Byb3BlcnR5QW5pbWF0aW9uV3JhcHBlck1hcDsgLy8gVXNlZCBieSBDU1MgYW5pbWF0aW9u cy4gV2UgY2FuJ3QgYWxsb3cgdGhlbSB0byBhbmltYXRlIGJhc2VkIG9mZiB2aXNpdGVkIGNvbG9y cy4KICAgICBmcmllbmQgY2xhc3MgQXBwbHlTdHlsZUNvbW1hbmQ7IC8vIEVkaXRpbmcgaGFzIHRv IG9ubHkgcmV2ZWFsIHVudmlzaXRlZCBpbmZvLgogICAgIGZyaWVuZCBjbGFzcyBEZXByZWNhdGVk U3R5bGVCdWlsZGVyOyAvLyBTZXRzIG1lbWJlcnMgZGlyZWN0bHkuCiAgICAgZnJpZW5kIGNsYXNz IEVkaXRpbmdTdHlsZTsgLy8gRWRpdGluZyBoYXMgdG8gb25seSByZXZlYWwgdW52aXNpdGVkIGlu Zm8uCg==