138283 2014-11-01 14:34:41 -0700 Move the -webkit-transform property to the new StyleBuilder 2014-11-01 18:25:00 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 137910 1 sam sam cdumez oldest_to_newest 1045532 0 sam 2014-11-01 14:34:41 -0700 Convert webkit-transform to use the new style builder 1045533 1 240794 sam 2014-11-01 14:39:23 -0700 Created attachment 240794 Patch 1045534 2 240795 sam 2014-11-01 14:39:55 -0700 Created attachment 240795 Patch 1045536 3 240795 cdumez 2014-11-01 14:45:15 -0700 Comment on attachment 240795 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=240795&action=review r=me with one thing to double-check. > Source/WebCore/css/CSSPropertyNames.in:492 > +-webkit-transform [NewStyleBuilder, NameForMethods=Transform, Converter=Transform] Do we really need to use the NameForMethods option here? makeprop.pl already strips the WebKit prefix for us so Transform should already be used. 1045538 4 sam 2014-11-01 15:18:46 -0700 (In reply to comment #3) > Comment on attachment 240795 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=240795&action=review > > r=me with one thing to double-check. > > > Source/WebCore/css/CSSPropertyNames.in:492 > > +-webkit-transform [NewStyleBuilder, NameForMethods=Transform, Converter=Transform] > > Do we really need to use the NameForMethods option here? makeprop.pl already > strips the WebKit prefix for us so Transform should already be used. Fixed. 1045539 5 sam 2014-11-01 15:18:55 -0700 Committed revision 175454. 240794 2014-11-01 14:39:23 -0700 2014-11-01 14:39:53 -0700 Patch bug-138283-20141101143933.patch text/plain 6200 sam SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3NTQ1MykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI0IEBACisyMDE0LTExLTAxICBTYW0gV2Vp bmlnICA8c2FtQHdlYmtpdC5vcmc+CisKKyAgICAgICAgTW92ZSB0aGUgLXdlYmtpdC10cmFuc2Zv cm0gcHJvcGVydHkgdG8gdGhlIG5ldyBTdHlsZUJ1aWxkZXIKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzODI4MworCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1vdmUgdGhlIC13ZWJraXQtdHJhbnNmb3JtIHBy b3BlcnR5IGZyb20gU3R5bGVSZXNvbHZlciB0byB0aGUgbmV3CisgICAgICAgIGdlbmVyYXRlZCBT dHlsZUJ1aWxkZXIuIEFkZHMgYSBjb252ZXJ0ZXIgZm9yIFRyYW5zZm9ybU9wZXJhdGlvbnMuCisK KyAgICAgICAgKiBjc3MvQ1NTUHJvcGVydHlOYW1lcy5pbjoKKyAgICAgICAgKiBjc3MvU3R5bGVC dWlsZGVyQ29udmVydGVyLmg6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZUJ1aWxkZXJDb252ZXJ0 ZXI6OmNvbnZlcnRUcmFuc2Zvcm0pOgorICAgICAgICAqIGNzcy9TdHlsZVJlc29sdmVyLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlN0eWxlUmVzb2x2ZXI6OmFwcGx5UHJvcGVydHkpOgorICAgICAg ICAqIGNzcy9UcmFuc2Zvcm1GdW5jdGlvbnMuY3BwOgorICAgICAgICAoV2ViQ29yZTo6dHJhbnNm b3Jtc0ZvclZhbHVlKToKKyAgICAgICAgKiBjc3MvVHJhbnNmb3JtRnVuY3Rpb25zLmg6CisgICAg ICAgICogY3NzL1dlYktpdENTU01hdHJpeC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpXZWJLaXRD U1NNYXRyaXg6OnNldE1hdHJpeFZhbHVlKToKKwogMjAxNC0xMS0wMSAgQmVuamFtaW4gUG91bGFp biAgPGJwb3VsYWluQGFwcGxlLmNvbT4KIAogICAgICAgICBGaXggdGhlIHNwZWNpZmljaXR5IG9m IHRoZSBleHRlbmRlZCA6bm90KCkgc2VsZWN0b3IKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2Nzcy9D U1NQcm9wZXJ0eU5hbWVzLmluCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQ cm9wZXJ0eU5hbWVzLmluCShyZXZpc2lvbiAxNzU0MTgpCisrKyBTb3VyY2UvV2ViQ29yZS9jc3Mv Q1NTUHJvcGVydHlOYW1lcy5pbgkod29ya2luZyBjb3B5KQpAQCAtNDc4LDcgKzQ3OCw3IEBAIHRl eHQtZW1waGFzaXMtc3R5bGUgPSAtd2Via2l0LXRleHQtZW1waGEKIC13ZWJraXQtdGV4dC1zdHJv a2UgW0luaGVyaXRlZF0KIC13ZWJraXQtdGV4dC1zdHJva2UtY29sb3IgW0luaGVyaXRlZF0KIC13 ZWJraXQtdGV4dC1zdHJva2Utd2lkdGggW0luaGVyaXRlZF0KLS13ZWJraXQtdHJhbnNmb3JtCist d2Via2l0LXRyYW5zZm9ybSBbTmV3U3R5bGVCdWlsZGVyLCBOYW1lRm9yTWV0aG9kcz1UcmFuc2Zv cm0sIENvbnZlcnRlcj1UcmFuc2Zvcm1dCiAtd2Via2l0LXRyYW5zZm9ybS1vcmlnaW4KIC13ZWJr aXQtdHJhbnNmb3JtLW9yaWdpbi14IFtOZXdTdHlsZUJ1aWxkZXIsIENvbnZlcnRlcj1MZW5ndGhd CiAtd2Via2l0LXRyYW5zZm9ybS1vcmlnaW4teSBbTmV3U3R5bGVCdWlsZGVyLCBDb252ZXJ0ZXI9 TGVuZ3RoXQpJbmRleDogU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlQnVpbGRlckNvbnZlcnRlci5o Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZUJ1aWxkZXJDb252ZXJ0ZXIu aAkocmV2aXNpb24gMTc1NDE4KQorKysgU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlQnVpbGRlckNv bnZlcnRlci5oCSh3b3JraW5nIGNvcHkpCkBAIC0zMiw2ICszMiw3IEBACiAjaW5jbHVkZSAiTGVu Z3RoLmgiCiAjaW5jbHVkZSAiUGFpci5oIgogI2luY2x1ZGUgIlN0eWxlUmVzb2x2ZXIuaCIKKyNp bmNsdWRlICJUcmFuc2Zvcm1GdW5jdGlvbnMuaCIKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCkBA IC01MCw2ICs1MSw3IEBAIHB1YmxpYzoKICAgICB0ZW1wbGF0ZSA8Q1NTUHJvcGVydHlJRCBwcm9w ZXJ0eT4gc3RhdGljIE5pbmVQaWVjZUltYWdlIGNvbnZlcnRCb3JkZXJJbWFnZShTdHlsZVJlc29s dmVyJiwgQ1NTVmFsdWUmKTsKICAgICB0ZW1wbGF0ZSA8Q1NTUHJvcGVydHlJRCBwcm9wZXJ0eT4g c3RhdGljIE5pbmVQaWVjZUltYWdlIGNvbnZlcnRCb3JkZXJNYXNrKFN0eWxlUmVzb2x2ZXImLCBD U1NWYWx1ZSYpOwogICAgIHRlbXBsYXRlIDxDU1NQcm9wZXJ0eUlEIHByb3BlcnR5PiBzdGF0aWMg UGFzc1JlZlB0cjxTdHlsZUltYWdlPiBjb252ZXJ0Qm9yZGVySW1hZ2VTb3VyY2UoU3R5bGVSZXNv bHZlciYsIENTU1ZhbHVlJik7CisgICAgc3RhdGljIFRyYW5zZm9ybU9wZXJhdGlvbnMgY29udmVy dFRyYW5zZm9ybShTdHlsZVJlc29sdmVyJiwgQ1NTVmFsdWUmKTsKIAogcHJpdmF0ZToKICAgICBz dGF0aWMgTGVuZ3RoIGNvbnZlcnRUb1JhZGl1c0xlbmd0aChDU1NUb0xlbmd0aENvbnZlcnNpb25E YXRhJiwgQ1NTUHJpbWl0aXZlVmFsdWUmKTsKQEAgLTIzMSw2ICsyMzMsMTMgQEAgaW5saW5lIFBh c3NSZWZQdHI8U3R5bGVJbWFnZT4gU3R5bGVCdWlsZAogICAgIHJldHVybiBzdHlsZVJlc29sdmVy LnN0eWxlSW1hZ2UocHJvcGVydHksICZ2YWx1ZSk7CiB9CiAKK2lubGluZSBUcmFuc2Zvcm1PcGVy YXRpb25zIFN0eWxlQnVpbGRlckNvbnZlcnRlcjo6Y29udmVydFRyYW5zZm9ybShTdHlsZVJlc29s dmVyJiBzdHlsZVJlc29sdmVyLCBDU1NWYWx1ZSYgdmFsdWUpCit7CisgICAgVHJhbnNmb3JtT3Bl cmF0aW9ucyBvcGVyYXRpb25zOworICAgIHRyYW5zZm9ybXNGb3JWYWx1ZSh2YWx1ZSwgc3R5bGVS ZXNvbHZlci5zdGF0ZSgpLmNzc1RvTGVuZ3RoQ29udmVyc2lvbkRhdGEoKSwgb3BlcmF0aW9ucyk7 CisgICAgcmV0dXJuIG9wZXJhdGlvbnM7Cit9CisKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKIAog I2VuZGlmIC8vIFN0eWxlQnVpbGRlckNvbnZlcnRlcl9oCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9j c3MvU3R5bGVSZXNvbHZlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvY3NzL1N0 eWxlUmVzb2x2ZXIuY3BwCShyZXZpc2lvbiAxNzU0MTgpCisrKyBTb3VyY2UvV2ViQ29yZS9jc3Mv U3R5bGVSZXNvbHZlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI1NTQsMTMgKzI1NTQsNiBAQCB2 b2lkIFN0eWxlUmVzb2x2ZXI6OmFwcGx5UHJvcGVydHkoQ1NTUHJvCiAgICAgICAgIHN0YXRlLnN0 eWxlKCktPnNldFRleHRTdHJva2VXaWR0aCh3aWR0aCk7CiAgICAgICAgIHJldHVybjsKICAgICB9 Ci0gICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdFRyYW5zZm9ybTogewotICAgICAgICBIQU5ETEVf SU5IRVJJVF9BTkRfSU5JVElBTCh0cmFuc2Zvcm0sIFRyYW5zZm9ybSk7Ci0gICAgICAgIFRyYW5z Zm9ybU9wZXJhdGlvbnMgb3BlcmF0aW9uczsKLSAgICAgICAgdHJhbnNmb3Jtc0ZvclZhbHVlKHZh bHVlLCBzdGF0ZS5jc3NUb0xlbmd0aENvbnZlcnNpb25EYXRhKCksIG9wZXJhdGlvbnMpOwotICAg ICAgICBzdGF0ZS5zdHlsZSgpLT5zZXRUcmFuc2Zvcm0ob3BlcmF0aW9ucyk7Ci0gICAgICAgIHJl dHVybjsKLSAgICB9CiAgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdFBlcnNwZWN0aXZlOiB7CiAg ICAgICAgIEhBTkRMRV9JTkhFUklUX0FORF9JTklUSUFMKHBlcnNwZWN0aXZlLCBQZXJzcGVjdGl2 ZSkKIApJbmRleDogU291cmNlL1dlYkNvcmUvY3NzL1RyYW5zZm9ybUZ1bmN0aW9ucy5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvY3NzL1RyYW5zZm9ybUZ1bmN0aW9ucy5jcHAJKHJl dmlzaW9uIDE3NTQxOCkKKysrIFNvdXJjZS9XZWJDb3JlL2Nzcy9UcmFuc2Zvcm1GdW5jdGlvbnMu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC04MSwxNSArODEsMTUgQEAgc3RhdGljIExlbmd0aCBjb252 ZXJ0VG9GbG9hdExlbmd0aChjb25zdAogICAgIHJldHVybiBwcmltaXRpdmVWYWx1ZSA/IHByaW1p dGl2ZVZhbHVlLT5jb252ZXJ0VG9MZW5ndGg8Rml4ZWRGbG9hdENvbnZlcnNpb24gfCBQZXJjZW50 Q29udmVyc2lvbiB8IENhbGN1bGF0ZWRDb252ZXJzaW9uPihjb252ZXJzaW9uRGF0YSkgOiBMZW5n dGgoVW5kZWZpbmVkKTsKIH0KIAotYm9vbCB0cmFuc2Zvcm1zRm9yVmFsdWUoQ1NTVmFsdWUqIHZh bHVlLCBjb25zdCBDU1NUb0xlbmd0aENvbnZlcnNpb25EYXRhJiBjb252ZXJzaW9uRGF0YSwgVHJh bnNmb3JtT3BlcmF0aW9ucyYgb3V0T3BlcmF0aW9ucykKK2Jvb2wgdHJhbnNmb3Jtc0ZvclZhbHVl KENTU1ZhbHVlJiB2YWx1ZSwgY29uc3QgQ1NTVG9MZW5ndGhDb252ZXJzaW9uRGF0YSYgY29udmVy c2lvbkRhdGEsIFRyYW5zZm9ybU9wZXJhdGlvbnMmIG91dE9wZXJhdGlvbnMpCiB7Ci0gICAgaWYg KCF2YWx1ZSB8fCAhdmFsdWUtPmlzVmFsdWVMaXN0KCkpIHsKKyAgICBpZiAoIXZhbHVlLmlzVmFs dWVMaXN0KCkpIHsKICAgICAgICAgb3V0T3BlcmF0aW9ucy5jbGVhcigpOwogICAgICAgICByZXR1 cm4gZmFsc2U7CiAgICAgfQogCiAgICAgVHJhbnNmb3JtT3BlcmF0aW9ucyBvcGVyYXRpb25zOwot ICAgIGZvciAoQ1NTVmFsdWVMaXN0SXRlcmF0b3IgaSA9IHZhbHVlOyBpLmhhc01vcmUoKTsgaS5h ZHZhbmNlKCkpIHsKKyAgICBmb3IgKENTU1ZhbHVlTGlzdEl0ZXJhdG9yIGkgPSAmdmFsdWU7IGku aGFzTW9yZSgpOyBpLmFkdmFuY2UoKSkgewogICAgICAgICBDU1NWYWx1ZSYgY3VyclZhbHVlID0g KmkudmFsdWUoKTsKIAogICAgICAgICBpZiAoIWlzPFdlYktpdENTU1RyYW5zZm9ybVZhbHVlPihj dXJyVmFsdWUpKQpJbmRleDogU291cmNlL1dlYkNvcmUvY3NzL1RyYW5zZm9ybUZ1bmN0aW9ucy5o Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2Nzcy9UcmFuc2Zvcm1GdW5jdGlvbnMuaAko cmV2aXNpb24gMTc1NDE4KQorKysgU291cmNlL1dlYkNvcmUvY3NzL1RyYW5zZm9ybUZ1bmN0aW9u cy5oCSh3b3JraW5nIGNvcHkpCkBAIC0zOSw3ICszOSw3IEBAIGNsYXNzIENTU1ZhbHVlOwogY2xh c3MgUmVuZGVyU3R5bGU7CiBjbGFzcyBXZWJLaXRDU1NUcmFuc2Zvcm1WYWx1ZTsKIAotYm9vbCB0 cmFuc2Zvcm1zRm9yVmFsdWUoQ1NTVmFsdWUqLCBjb25zdCBDU1NUb0xlbmd0aENvbnZlcnNpb25E YXRhJiwgVHJhbnNmb3JtT3BlcmF0aW9ucyYpOworYm9vbCB0cmFuc2Zvcm1zRm9yVmFsdWUoQ1NT VmFsdWUmLCBjb25zdCBDU1NUb0xlbmd0aENvbnZlcnNpb25EYXRhJiwgVHJhbnNmb3JtT3BlcmF0 aW9ucyYpOwogCiB9CiAjZW5kaWYKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2Nzcy9XZWJLaXRDU1NN YXRyaXguY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2Nzcy9XZWJLaXRDU1NNYXRy aXguY3BwCShyZXZpc2lvbiAxNzU0MTgpCisrKyBTb3VyY2UvV2ViQ29yZS9jc3MvV2ViS2l0Q1NT TWF0cml4LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNjcsNyArNjcsNyBAQCB2b2lkIFdlYktpdENT U01hdHJpeDo6c2V0TWF0cml4VmFsdWUoY29uCiAgICAgICAgICAgICByZXR1cm47CiAKICAgICAg ICAgVHJhbnNmb3JtT3BlcmF0aW9ucyBvcGVyYXRpb25zOwotICAgICAgICBpZiAoIXRyYW5zZm9y bXNGb3JWYWx1ZSh2YWx1ZS5nZXQoKSwgQ1NTVG9MZW5ndGhDb252ZXJzaW9uRGF0YSgpLCBvcGVy YXRpb25zKSkgeworICAgICAgICBpZiAoIXRyYW5zZm9ybXNGb3JWYWx1ZSgqdmFsdWUsIENTU1Rv TGVuZ3RoQ29udmVyc2lvbkRhdGEoKSwgb3BlcmF0aW9ucykpIHsKICAgICAgICAgICAgIGVjID0g U1lOVEFYX0VSUjsKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQo= 240795 2014-11-01 14:39:55 -0700 2014-11-01 14:45:15 -0700 Patch bug-138283-20141101144005.patch text/plain 6200 sam SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3NTQ1MykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI0IEBACisyMDE0LTExLTAxICBTYW0gV2Vp bmlnICA8c2FtQHdlYmtpdC5vcmc+CisKKyAgICAgICAgTW92ZSB0aGUgLXdlYmtpdC10cmFuc2Zv cm0gcHJvcGVydHkgdG8gdGhlIG5ldyBTdHlsZUJ1aWxkZXIKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzODI4MworCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1vdmUgdGhlIC13ZWJraXQtdHJhbnNmb3JtIHBy b3BlcnR5IGZyb20gU3R5bGVSZXNvbHZlciB0byB0aGUgbmV3CisgICAgICAgIGdlbmVyYXRlZCBT dHlsZUJ1aWxkZXIuIEFkZHMgYSBjb252ZXJ0ZXIgZm9yIFRyYW5zZm9ybU9wZXJhdGlvbnMuCisK KyAgICAgICAgKiBjc3MvQ1NTUHJvcGVydHlOYW1lcy5pbjoKKyAgICAgICAgKiBjc3MvU3R5bGVC dWlsZGVyQ29udmVydGVyLmg6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZUJ1aWxkZXJDb252ZXJ0 ZXI6OmNvbnZlcnRUcmFuc2Zvcm0pOgorICAgICAgICAqIGNzcy9TdHlsZVJlc29sdmVyLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlN0eWxlUmVzb2x2ZXI6OmFwcGx5UHJvcGVydHkpOgorICAgICAg ICAqIGNzcy9UcmFuc2Zvcm1GdW5jdGlvbnMuY3BwOgorICAgICAgICAoV2ViQ29yZTo6dHJhbnNm b3Jtc0ZvclZhbHVlKToKKyAgICAgICAgKiBjc3MvVHJhbnNmb3JtRnVuY3Rpb25zLmg6CisgICAg ICAgICogY3NzL1dlYktpdENTU01hdHJpeC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpXZWJLaXRD U1NNYXRyaXg6OnNldE1hdHJpeFZhbHVlKToKKwogMjAxNC0xMS0wMSAgQmVuamFtaW4gUG91bGFp biAgPGJwb3VsYWluQGFwcGxlLmNvbT4KIAogICAgICAgICBGaXggdGhlIHNwZWNpZmljaXR5IG9m IHRoZSBleHRlbmRlZCA6bm90KCkgc2VsZWN0b3IKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2Nzcy9D U1NQcm9wZXJ0eU5hbWVzLmluCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQ cm9wZXJ0eU5hbWVzLmluCShyZXZpc2lvbiAxNzU0NTMpCisrKyBTb3VyY2UvV2ViQ29yZS9jc3Mv Q1NTUHJvcGVydHlOYW1lcy5pbgkod29ya2luZyBjb3B5KQpAQCAtNDg5LDcgKzQ4OSw3IEBAIHRl eHQtZW1waGFzaXMtc3R5bGUgPSAtd2Via2l0LXRleHQtZW1waGEKIC13ZWJraXQtdGV4dC1zdHJv a2UgW0luaGVyaXRlZF0KIC13ZWJraXQtdGV4dC1zdHJva2UtY29sb3IgW0luaGVyaXRlZF0KIC13 ZWJraXQtdGV4dC1zdHJva2Utd2lkdGggW0luaGVyaXRlZF0KLS13ZWJraXQtdHJhbnNmb3JtCist d2Via2l0LXRyYW5zZm9ybSBbTmV3U3R5bGVCdWlsZGVyLCBOYW1lRm9yTWV0aG9kcz1UcmFuc2Zv cm0sIENvbnZlcnRlcj1UcmFuc2Zvcm1dCiAtd2Via2l0LXRyYW5zZm9ybS1vcmlnaW4KIC13ZWJr aXQtdHJhbnNmb3JtLW9yaWdpbi14IFtOZXdTdHlsZUJ1aWxkZXIsIENvbnZlcnRlcj1MZW5ndGhd CiAtd2Via2l0LXRyYW5zZm9ybS1vcmlnaW4teSBbTmV3U3R5bGVCdWlsZGVyLCBDb252ZXJ0ZXI9 TGVuZ3RoXQpJbmRleDogU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlQnVpbGRlckNvbnZlcnRlci5o Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZUJ1aWxkZXJDb252ZXJ0ZXIu aAkocmV2aXNpb24gMTc1NDUzKQorKysgU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlQnVpbGRlckNv bnZlcnRlci5oCSh3b3JraW5nIGNvcHkpCkBAIC0zMiw2ICszMiw3IEBACiAjaW5jbHVkZSAiTGVu Z3RoLmgiCiAjaW5jbHVkZSAiUGFpci5oIgogI2luY2x1ZGUgIlN0eWxlUmVzb2x2ZXIuaCIKKyNp bmNsdWRlICJUcmFuc2Zvcm1GdW5jdGlvbnMuaCIKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCkBA IC01MSw2ICs1Miw3IEBAIHB1YmxpYzoKICAgICB0ZW1wbGF0ZSA8Q1NTUHJvcGVydHlJRCBwcm9w ZXJ0eT4gc3RhdGljIE5pbmVQaWVjZUltYWdlIGNvbnZlcnRCb3JkZXJJbWFnZShTdHlsZVJlc29s dmVyJiwgQ1NTVmFsdWUmKTsKICAgICB0ZW1wbGF0ZSA8Q1NTUHJvcGVydHlJRCBwcm9wZXJ0eT4g c3RhdGljIE5pbmVQaWVjZUltYWdlIGNvbnZlcnRCb3JkZXJNYXNrKFN0eWxlUmVzb2x2ZXImLCBD U1NWYWx1ZSYpOwogICAgIHRlbXBsYXRlIDxDU1NQcm9wZXJ0eUlEIHByb3BlcnR5PiBzdGF0aWMg UGFzc1JlZlB0cjxTdHlsZUltYWdlPiBjb252ZXJ0Qm9yZGVySW1hZ2VTb3VyY2UoU3R5bGVSZXNv bHZlciYsIENTU1ZhbHVlJik7CisgICAgc3RhdGljIFRyYW5zZm9ybU9wZXJhdGlvbnMgY29udmVy dFRyYW5zZm9ybShTdHlsZVJlc29sdmVyJiwgQ1NTVmFsdWUmKTsKIAogcHJpdmF0ZToKICAgICBz dGF0aWMgTGVuZ3RoIGNvbnZlcnRUb1JhZGl1c0xlbmd0aChDU1NUb0xlbmd0aENvbnZlcnNpb25E YXRhJiwgQ1NTUHJpbWl0aXZlVmFsdWUmKTsKQEAgLTI0MCw2ICsyNDIsMTMgQEAgaW5saW5lIFBh c3NSZWZQdHI8U3R5bGVJbWFnZT4gU3R5bGVCdWlsZAogICAgIHJldHVybiBzdHlsZVJlc29sdmVy LnN0eWxlSW1hZ2UocHJvcGVydHksICZ2YWx1ZSk7CiB9CiAKK2lubGluZSBUcmFuc2Zvcm1PcGVy YXRpb25zIFN0eWxlQnVpbGRlckNvbnZlcnRlcjo6Y29udmVydFRyYW5zZm9ybShTdHlsZVJlc29s dmVyJiBzdHlsZVJlc29sdmVyLCBDU1NWYWx1ZSYgdmFsdWUpCit7CisgICAgVHJhbnNmb3JtT3Bl cmF0aW9ucyBvcGVyYXRpb25zOworICAgIHRyYW5zZm9ybXNGb3JWYWx1ZSh2YWx1ZSwgc3R5bGVS ZXNvbHZlci5zdGF0ZSgpLmNzc1RvTGVuZ3RoQ29udmVyc2lvbkRhdGEoKSwgb3BlcmF0aW9ucyk7 CisgICAgcmV0dXJuIG9wZXJhdGlvbnM7Cit9CisKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKIAog I2VuZGlmIC8vIFN0eWxlQnVpbGRlckNvbnZlcnRlcl9oCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9j c3MvU3R5bGVSZXNvbHZlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvY3NzL1N0 eWxlUmVzb2x2ZXIuY3BwCShyZXZpc2lvbiAxNzU0NTMpCisrKyBTb3VyY2UvV2ViQ29yZS9jc3Mv U3R5bGVSZXNvbHZlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI1NTMsMTMgKzI1NTMsNiBAQCB2 b2lkIFN0eWxlUmVzb2x2ZXI6OmFwcGx5UHJvcGVydHkoQ1NTUHJvCiAgICAgICAgIHN0YXRlLnN0 eWxlKCktPnNldFRleHRTdHJva2VXaWR0aCh3aWR0aCk7CiAgICAgICAgIHJldHVybjsKICAgICB9 Ci0gICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdFRyYW5zZm9ybTogewotICAgICAgICBIQU5ETEVf SU5IRVJJVF9BTkRfSU5JVElBTCh0cmFuc2Zvcm0sIFRyYW5zZm9ybSk7Ci0gICAgICAgIFRyYW5z Zm9ybU9wZXJhdGlvbnMgb3BlcmF0aW9uczsKLSAgICAgICAgdHJhbnNmb3Jtc0ZvclZhbHVlKHZh bHVlLCBzdGF0ZS5jc3NUb0xlbmd0aENvbnZlcnNpb25EYXRhKCksIG9wZXJhdGlvbnMpOwotICAg ICAgICBzdGF0ZS5zdHlsZSgpLT5zZXRUcmFuc2Zvcm0ob3BlcmF0aW9ucyk7Ci0gICAgICAgIHJl dHVybjsKLSAgICB9CiAgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdFBlcnNwZWN0aXZlOiB7CiAg ICAgICAgIEhBTkRMRV9JTkhFUklUX0FORF9JTklUSUFMKHBlcnNwZWN0aXZlLCBQZXJzcGVjdGl2 ZSkKIApJbmRleDogU291cmNlL1dlYkNvcmUvY3NzL1RyYW5zZm9ybUZ1bmN0aW9ucy5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvY3NzL1RyYW5zZm9ybUZ1bmN0aW9ucy5jcHAJKHJl dmlzaW9uIDE3NTQ1MykKKysrIFNvdXJjZS9XZWJDb3JlL2Nzcy9UcmFuc2Zvcm1GdW5jdGlvbnMu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC04MSwxNSArODEsMTUgQEAgc3RhdGljIExlbmd0aCBjb252 ZXJ0VG9GbG9hdExlbmd0aChjb25zdAogICAgIHJldHVybiBwcmltaXRpdmVWYWx1ZSA/IHByaW1p dGl2ZVZhbHVlLT5jb252ZXJ0VG9MZW5ndGg8Rml4ZWRGbG9hdENvbnZlcnNpb24gfCBQZXJjZW50 Q29udmVyc2lvbiB8IENhbGN1bGF0ZWRDb252ZXJzaW9uPihjb252ZXJzaW9uRGF0YSkgOiBMZW5n dGgoVW5kZWZpbmVkKTsKIH0KIAotYm9vbCB0cmFuc2Zvcm1zRm9yVmFsdWUoQ1NTVmFsdWUqIHZh bHVlLCBjb25zdCBDU1NUb0xlbmd0aENvbnZlcnNpb25EYXRhJiBjb252ZXJzaW9uRGF0YSwgVHJh bnNmb3JtT3BlcmF0aW9ucyYgb3V0T3BlcmF0aW9ucykKK2Jvb2wgdHJhbnNmb3Jtc0ZvclZhbHVl KENTU1ZhbHVlJiB2YWx1ZSwgY29uc3QgQ1NTVG9MZW5ndGhDb252ZXJzaW9uRGF0YSYgY29udmVy c2lvbkRhdGEsIFRyYW5zZm9ybU9wZXJhdGlvbnMmIG91dE9wZXJhdGlvbnMpCiB7Ci0gICAgaWYg KCF2YWx1ZSB8fCAhdmFsdWUtPmlzVmFsdWVMaXN0KCkpIHsKKyAgICBpZiAoIXZhbHVlLmlzVmFs dWVMaXN0KCkpIHsKICAgICAgICAgb3V0T3BlcmF0aW9ucy5jbGVhcigpOwogICAgICAgICByZXR1 cm4gZmFsc2U7CiAgICAgfQogCiAgICAgVHJhbnNmb3JtT3BlcmF0aW9ucyBvcGVyYXRpb25zOwot ICAgIGZvciAoQ1NTVmFsdWVMaXN0SXRlcmF0b3IgaSA9IHZhbHVlOyBpLmhhc01vcmUoKTsgaS5h ZHZhbmNlKCkpIHsKKyAgICBmb3IgKENTU1ZhbHVlTGlzdEl0ZXJhdG9yIGkgPSAmdmFsdWU7IGku aGFzTW9yZSgpOyBpLmFkdmFuY2UoKSkgewogICAgICAgICBDU1NWYWx1ZSYgY3VyclZhbHVlID0g KmkudmFsdWUoKTsKIAogICAgICAgICBpZiAoIWlzPFdlYktpdENTU1RyYW5zZm9ybVZhbHVlPihj dXJyVmFsdWUpKQpJbmRleDogU291cmNlL1dlYkNvcmUvY3NzL1RyYW5zZm9ybUZ1bmN0aW9ucy5o Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2Nzcy9UcmFuc2Zvcm1GdW5jdGlvbnMuaAko cmV2aXNpb24gMTc1NDUzKQorKysgU291cmNlL1dlYkNvcmUvY3NzL1RyYW5zZm9ybUZ1bmN0aW9u cy5oCSh3b3JraW5nIGNvcHkpCkBAIC0zOSw3ICszOSw3IEBAIGNsYXNzIENTU1ZhbHVlOwogY2xh c3MgUmVuZGVyU3R5bGU7CiBjbGFzcyBXZWJLaXRDU1NUcmFuc2Zvcm1WYWx1ZTsKIAotYm9vbCB0 cmFuc2Zvcm1zRm9yVmFsdWUoQ1NTVmFsdWUqLCBjb25zdCBDU1NUb0xlbmd0aENvbnZlcnNpb25E YXRhJiwgVHJhbnNmb3JtT3BlcmF0aW9ucyYpOworYm9vbCB0cmFuc2Zvcm1zRm9yVmFsdWUoQ1NT VmFsdWUmLCBjb25zdCBDU1NUb0xlbmd0aENvbnZlcnNpb25EYXRhJiwgVHJhbnNmb3JtT3BlcmF0 aW9ucyYpOwogCiB9CiAjZW5kaWYKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2Nzcy9XZWJLaXRDU1NN YXRyaXguY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2Nzcy9XZWJLaXRDU1NNYXRy aXguY3BwCShyZXZpc2lvbiAxNzU0NTMpCisrKyBTb3VyY2UvV2ViQ29yZS9jc3MvV2ViS2l0Q1NT TWF0cml4LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNjcsNyArNjcsNyBAQCB2b2lkIFdlYktpdENT U01hdHJpeDo6c2V0TWF0cml4VmFsdWUoY29uCiAgICAgICAgICAgICByZXR1cm47CiAKICAgICAg ICAgVHJhbnNmb3JtT3BlcmF0aW9ucyBvcGVyYXRpb25zOwotICAgICAgICBpZiAoIXRyYW5zZm9y bXNGb3JWYWx1ZSh2YWx1ZS5nZXQoKSwgQ1NTVG9MZW5ndGhDb252ZXJzaW9uRGF0YSgpLCBvcGVy YXRpb25zKSkgeworICAgICAgICBpZiAoIXRyYW5zZm9ybXNGb3JWYWx1ZSgqdmFsdWUsIENTU1Rv TGVuZ3RoQ29udmVyc2lvbkRhdGEoKSwgb3BlcmF0aW9ucykpIHsKICAgICAgICAgICAgIGVjID0g U1lOVEFYX0VSUjsKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQo=