71061 2011-10-27 14:13:33 -0700 [CSS Line Grids] Add support for line-grid property parsing. 2011-10-27 14:21:52 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 hyatt hyatt macpherson webkit.review.bot oldest_to_newest 491938 0 hyatt 2011-10-27 14:13:33 -0700 Add support for line-grid property parsing. 491941 1 112749 hyatt 2011-10-27 14:15:13 -0700 Created attachment 112749 Patch 491944 2 112749 mitz 2011-10-27 14:18:49 -0700 Comment on attachment 112749 Patch I think you also need to update some test result in svg/css 491947 3 hyatt 2011-10-27 14:21:52 -0700 Fixed in r98638. 112749 2011-10-27 14:15:13 -0700 2011-10-27 14:18:49 -0700 Patch patch.txt text/plain 15920 hyatt SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDk4NjM3KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjkgQEAKKzIwMTEtMTAtMjcgIERhdmlkIEh5 YXR0ICA8aHlhdHRAYXBwbGUuY29tPgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD03MTA2MQorICAgICAgICAKKyAgICAgICAgW0NTUyBMaW5lIEdyaWRd IEFkZCBzdXBwb3J0IGZvciBwYXJzaW5nIHRoZSBsaW5lLWdyaWQgcHJvcGVydHkuCisKKyAgICAg ICAgTmV3IHRlc3RzIGluIGZhc3QvbGluZS1ncmlkLgorCisgICAgICAgICogY3NzL0NTU0NvbXB1 dGVkU3R5bGVEZWNsYXJhdGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDU1NDb21wdXRlZFN0 eWxlRGVjbGFyYXRpb246OmdldFByb3BlcnR5Q1NTVmFsdWUpOgorICAgICAgICAqIGNzcy9DU1NQ YXJzZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q1NTUGFyc2VyOjpwYXJzZVZhbHVlKToKKyAg ICAgICAgKiBjc3MvQ1NTUHJvcGVydHkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q1NTUHJvcGVy dHk6OmlzSW5oZXJpdGVkUHJvcGVydHkpOgorICAgICAgICAqIGNzcy9DU1NQcm9wZXJ0eU5hbWVz LmluOgorICAgICAgICAqIGNzcy9DU1NTdHlsZVNlbGVjdG9yLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkNTU1N0eWxlU2VsZWN0b3I6OmFwcGx5UHJvcGVydHkpOgorICAgICAgICAqIHJlbmRlcmlu Zy9zdHlsZS9SZW5kZXJTdHlsZS5oOgorICAgICAgICAoV2ViQ29yZTo6SW5oZXJpdGVkRmxhZ3M6 OmxpbmVHcmlkKToKKyAgICAgICAgKFdlYkNvcmU6OkluaGVyaXRlZEZsYWdzOjpzZXRMaW5lR3Jp ZCk6CisgICAgICAgIChXZWJDb3JlOjpJbmhlcml0ZWRGbGFnczo6aW5pdGlhbExpbmVHcmlkKToK KyAgICAgICAgKiByZW5kZXJpbmcvc3R5bGUvU3R5bGVSYXJlSW5oZXJpdGVkRGF0YS5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpTdHlsZVJhcmVJbmhlcml0ZWREYXRhOjpTdHlsZVJhcmVJbmhlcml0 ZWREYXRhKToKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlUmFyZUluaGVyaXRlZERhdGE6Om9wZXJh dG9yPT0pOgorICAgICAgICAqIHJlbmRlcmluZy9zdHlsZS9TdHlsZVJhcmVJbmhlcml0ZWREYXRh Lmg6CisKIDIwMTEtMTAtMjcgIEZhZHkgU2FtdWVsICA8ZnNhbXVlbEBjaHJvbWl1bS5vcmc+CiAK ICAgICAgICAgaWZyYW1lcyBzZWVtIHRvIG9jY2FzaW9uYWxseSBkb3VibHkgc2NhbGUgb3Igc2Nh bGUgaW5jb3JyZWN0bHkgd2hlbiBwYWdlU2NhbGVGYWN0b3IgIT0gMS4wCkluZGV4OiBTb3VyY2Uv V2ViQ29yZS9jc3MvQ1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uLmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uLmNwcAkocmV2 aXNpb24gOTg2MjgpCisrKyBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTQ29tcHV0ZWRTdHlsZURlY2xh cmF0aW9uLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjI2LDYgKzIyNiw3IEBAIHN0YXRpYyBjb25z dCBpbnQgY29tcHV0ZWRQcm9wZXJ0aWVzW10gPSAKICAgICBDU1NQcm9wZXJ0eVdlYmtpdExpbmVC b3hDb250YWluLAogICAgIENTU1Byb3BlcnR5V2Via2l0TGluZUJyZWFrLAogICAgIENTU1Byb3Bl cnR5V2Via2l0TGluZUNsYW1wLAorICAgIENTU1Byb3BlcnR5V2Via2l0TGluZUdyaWQsCiAgICAg Q1NTUHJvcGVydHlXZWJraXRMb2NhbGUsCiAgICAgQ1NTUHJvcGVydHlXZWJraXRNYXJnaW5CZWZv cmVDb2xsYXBzZSwKICAgICBDU1NQcm9wZXJ0eVdlYmtpdE1hcmdpbkFmdGVyQ29sbGFwc2UsCkBA IC0xOTczLDYgKzE5NzQsMTAgQEAgUGFzc1JlZlB0cjxDU1NWYWx1ZT4gQ1NTQ29tcHV0ZWRTdHls ZURlYwogICAgICAgICAgICAgcmV0dXJuIHByaW1pdGl2ZVZhbHVlQ2FjaGUtPmNyZWF0ZVZhbHVl KHN0eWxlLT5wb2ludGVyRXZlbnRzKCkpOwogICAgICAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0 Q29sb3JDb3JyZWN0aW9uOgogICAgICAgICAgICAgcmV0dXJuIHByaW1pdGl2ZVZhbHVlQ2FjaGUt PmNyZWF0ZVZhbHVlKHN0eWxlLT5jb2xvclNwYWNlKCkpOworICAgICAgICBjYXNlIENTU1Byb3Bl cnR5V2Via2l0TGluZUdyaWQ6CisgICAgICAgICAgICBpZiAoc3R5bGUtPmxpbmVHcmlkKCkuaXNO dWxsKCkpCisgICAgICAgICAgICAgICAgcmV0dXJuIHByaW1pdGl2ZVZhbHVlQ2FjaGUtPmNyZWF0 ZUlkZW50aWZpZXJWYWx1ZShDU1NWYWx1ZU5vbmUpOworICAgICAgICAgICAgcmV0dXJuIHByaW1p dGl2ZVZhbHVlQ2FjaGUtPmNyZWF0ZVZhbHVlKHN0eWxlLT5saW5lR3JpZCgpLCBDU1NQcmltaXRp dmVWYWx1ZTo6Q1NTX1NUUklORyk7CiAgICAgICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRXcml0 aW5nTW9kZToKICAgICAgICAgICAgIHJldHVybiBwcmltaXRpdmVWYWx1ZUNhY2hlLT5jcmVhdGVW YWx1ZShzdHlsZS0+d3JpdGluZ01vZGUoKSk7CiAgICAgICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJr aXRUZXh0Q29tYmluZToKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQYXJzZXIuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQYXJzZXIuY3BwCShyZXZpc2lvbiA5 ODYyOCkKKysrIFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQYXJzZXIuY3BwCSh3b3JraW5nIGNvcHkp CkBAIC0xOTAzLDYgKzE5MDMsMTcgQEAgYm9vbCBDU1NQYXJzZXI6OnBhcnNlVmFsdWUoaW50IHBy b3BJZCwgYgogICAgICAgICAgICAgdmFsaWRQcmltaXRpdmUgPSB0cnVlOwogICAgICAgICBicmVh azsKIAorICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRMaW5lR3JpZDoKKyAgICAgICAgaWYgKGlk ID09IENTU1ZhbHVlTm9uZSkKKyAgICAgICAgICAgIHZhbGlkUHJpbWl0aXZlID0gdHJ1ZTsKKyAg ICAgICAgZWxzZSBpZiAodmFsdWUtPnVuaXQgPT0gQ1NTUHJpbWl0aXZlVmFsdWU6OkNTU19JREVO VCkgeworICAgICAgICAgICAgU3RyaW5nIGlucHV0UHJvcGVydHkgPSBTdHJpbmcodmFsdWUtPnN0 cmluZyk7CisgICAgICAgICAgICBpZiAoIWlucHV0UHJvcGVydHkuaXNFbXB0eSgpKSB7CisgICAg ICAgICAgICAgICAgYWRkUHJvcGVydHkocHJvcElkLCBwcmltaXRpdmVWYWx1ZUNhY2hlKCktPmNy ZWF0ZVZhbHVlKGlucHV0UHJvcGVydHksIENTU1ByaW1pdGl2ZVZhbHVlOjpDU1NfU1RSSU5HKSwg aW1wb3J0YW50KTsKKyAgICAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAgICAgICAgIH0K KyAgICAgICAgfQorICAgICAgICBicmVhazsKICAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0TG9j YWxlOgogICAgICAgICBpZiAoaWQgPT0gQ1NTVmFsdWVBdXRvIHx8IHZhbHVlLT51bml0ID09IENT U1ByaW1pdGl2ZVZhbHVlOjpDU1NfU1RSSU5HKQogICAgICAgICAgICAgdmFsaWRQcmltaXRpdmUg PSB0cnVlOwpJbmRleDogU291cmNlL1dlYkNvcmUvY3NzL0NTU1Byb3BlcnR5LmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUHJvcGVydHkuY3BwCShyZXZpc2lvbiA5ODYy OCkKKysrIFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQcm9wZXJ0eS5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTMzMCw2ICszMzAsNyBAQCBib29sIENTU1Byb3BlcnR5Ojppc0luaGVyaXRlZFByb3BlcnR5 KHVuCiAgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdEh5cGhlbnM6CiAgICAgY2FzZSBDU1NQcm9w ZXJ0eVdlYmtpdExpbmVCb3hDb250YWluOgogICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRMaW5l QnJlYWs6CisgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdExpbmVHcmlkOgogICAgIGNhc2UgQ1NT UHJvcGVydHlXZWJraXROYnNwTW9kZToKICAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0UnRsT3Jk ZXJpbmc6CiAgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdFRleHRDb21iaW5lOgpJbmRleDogU291 cmNlL1dlYkNvcmUvY3NzL0NTU1Byb3BlcnR5TmFtZXMuaW4KPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYkNvcmUvY3NzL0NTU1Byb3BlcnR5TmFtZXMuaW4JKHJldmlzaW9uIDk4NjI4KQorKysgU291 cmNlL1dlYkNvcmUvY3NzL0NTU1Byb3BlcnR5TmFtZXMuaW4JKHdvcmtpbmcgY29weSkKQEAgLTI2 OSw2ICsyNjksNyBAQCB6LWluZGV4CiAtd2Via2l0LWxpbmUtYm94LWNvbnRhaW4KIC13ZWJraXQt bGluZS1icmVhawogLXdlYmtpdC1saW5lLWNsYW1wCistd2Via2l0LWxpbmUtZ3JpZAogLXdlYmtp dC1sb2dpY2FsLXdpZHRoCiAtd2Via2l0LWxvZ2ljYWwtaGVpZ2h0CiAtd2Via2l0LW1hcmdpbi1h ZnRlci1jb2xsYXBzZQpJbmRleDogU291cmNlL1dlYkNvcmUvY3NzL0NTU1N0eWxlU2VsZWN0b3Iu Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NTdHlsZVNlbGVjdG9yLmNw cAkocmV2aXNpb24gOTg2MjgpCisrKyBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVTZWxlY3Rv ci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTMzNzIsNyArMzM3Miw3IEBAIHZvaWQgQ1NTU3R5bGVT ZWxlY3Rvcjo6YXBwbHlQcm9wZXJ0eShpbnQKICAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0Q29s dW1uQnJlYWtJbnNpZGU6CiAgICAgICAgIEhBTkRMRV9JTkhFUklUX0FORF9JTklUSUFMX0FORF9Q UklNSVRJVkVfV0lUSF9WQUxVRShjb2x1bW5CcmVha0luc2lkZSwgQ29sdW1uQnJlYWtJbnNpZGUs IFBhZ2VCcmVhaykKICAgICAgICAgcmV0dXJuOwotICAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0 Q29sdW1uUnVsZToKKyAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0Q29sdW1uUnVsZToKICAgICAg ICAgaWYgKGlzSW5oZXJpdCkgewogICAgICAgICAgICAgbV9zdHlsZS0+c2V0Q29sdW1uUnVsZUNv bG9yKG1fcGFyZW50U3R5bGUtPmNvbHVtblJ1bGVDb2xvcigpLmlzVmFsaWQoKSA/IG1fcGFyZW50 U3R5bGUtPmNvbHVtblJ1bGVDb2xvcigpIDogbV9wYXJlbnRTdHlsZS0+Y29sb3IoKSk7CiAgICAg ICAgICAgICBtX3N0eWxlLT5zZXRDb2x1bW5SdWxlU3R5bGUobV9wYXJlbnRTdHlsZS0+Y29sdW1u UnVsZVN0eWxlKCkpOwpAQCAtMzM4MSw2ICszMzgxLDEzIEBAIHZvaWQgQ1NTU3R5bGVTZWxlY3Rv cjo6YXBwbHlQcm9wZXJ0eShpbnQKICAgICAgICAgZWxzZSBpZiAoaXNJbml0aWFsKQogICAgICAg ICAgICAgbV9zdHlsZS0+cmVzZXRDb2x1bW5SdWxlKCk7CiAgICAgICAgIHJldHVybjsKKyAgICBj YXNlIENTU1Byb3BlcnR5V2Via2l0TGluZUdyaWQ6CisgICAgICAgIEhBTkRMRV9JTkhFUklUX0FO RF9JTklUSUFMKGxpbmVHcmlkLCBMaW5lR3JpZCk7CisgICAgICAgIGlmIChwcmltaXRpdmVWYWx1 ZS0+Z2V0SWRlbnQoKSA9PSBDU1NWYWx1ZU5vbmUpCisgICAgICAgICAgICBtX3N0eWxlLT5zZXRM aW5lR3JpZChudWxsQXRvbSk7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIG1fc3R5bGUtPnNl dExpbmVHcmlkKHByaW1pdGl2ZVZhbHVlLT5nZXRTdHJpbmdWYWx1ZSgpKTsKKyAgICAgICAgcmV0 dXJuOwogICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRSZWdpb25CcmVha0JlZm9yZToKICAgICAg ICAgSEFORExFX0lOSEVSSVRfQU5EX0lOSVRJQUxfQU5EX1BSSU1JVElWRV9XSVRIX1ZBTFVFKHJl Z2lvbkJyZWFrQmVmb3JlLCBSZWdpb25CcmVha0JlZm9yZSwgUGFnZUJyZWFrKQogICAgICAgICBy ZXR1cm47CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUu aAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5 bGUuaAkocmV2aXNpb24gOTg2MjgpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUv UmVuZGVyU3R5bGUuaAkod29ya2luZyBjb3B5KQpAQCAtODEwLDYgKzgxMCw4IEBAIHB1YmxpYzoK ICAgICBjb25zdCBBdG9taWNTdHJpbmcmIHJlZ2lvblRocmVhZCgpIGNvbnN0IHsgcmV0dXJuIHJh cmVOb25Jbmhlcml0ZWREYXRhLT5tX3JlZ2lvblRocmVhZDsgfQogICAgIFJlZ2lvbk92ZXJmbG93 IHJlZ2lvbk92ZXJmbG93KCkgY29uc3QgeyByZXR1cm4gc3RhdGljX2Nhc3Q8UmVnaW9uT3ZlcmZs b3c+KHJhcmVOb25Jbmhlcml0ZWREYXRhLT5tX3JlZ2lvbk92ZXJmbG93KTsgfQogCisgICAgY29u c3QgQXRvbWljU3RyaW5nJiBsaW5lR3JpZCgpIGNvbnN0IHsgcmV0dXJuIHJhcmVJbmhlcml0ZWRE YXRhLT5tX2xpbmVHcmlkOyB9CisgICAgCiAgICAgLy8gQXBwbGUtc3BlY2lmaWMgcHJvcGVydHkg Z2V0dGVyIG1ldGhvZHMKICAgICBFUG9pbnRlckV2ZW50cyBwb2ludGVyRXZlbnRzKCkgY29uc3Qg eyByZXR1cm4gc3RhdGljX2Nhc3Q8RVBvaW50ZXJFdmVudHM+KGluaGVyaXRlZF9mbGFncy5fcG9p bnRlckV2ZW50cyk7IH0KICAgICBjb25zdCBBbmltYXRpb25MaXN0KiBhbmltYXRpb25zKCkgY29u c3QgeyByZXR1cm4gcmFyZU5vbkluaGVyaXRlZERhdGEtPm1fYW5pbWF0aW9ucy5nZXQoKTsgfQpA QCAtMTE4OSw2ICsxMTkxLDggQEAgcHVibGljOgogCiAgICAgLy8gRW5kIENTUzMgU2V0dGVycwog CisgICAgdm9pZCBzZXRMaW5lR3JpZChjb25zdCBBdG9taWNTdHJpbmcmIGxpbmVHcmlkKSB7IFNF VF9WQVIocmFyZUluaGVyaXRlZERhdGEsIG1fbGluZUdyaWQsIGxpbmVHcmlkKTsgfQorCiAgICAg dm9pZCBzZXRGbG93VGhyZWFkKGNvbnN0IEF0b21pY1N0cmluZyYgZmxvd1RocmVhZCkgeyBTRVRf VkFSKHJhcmVOb25Jbmhlcml0ZWREYXRhLCBtX2Zsb3dUaHJlYWQsIGZsb3dUaHJlYWQpOyB9CiAg ICAgdm9pZCBzZXRSZWdpb25UaHJlYWQoY29uc3QgQXRvbWljU3RyaW5nJiByZWdpb25UaHJlYWQp IHsgU0VUX1ZBUihyYXJlTm9uSW5oZXJpdGVkRGF0YSwgbV9yZWdpb25UaHJlYWQsIHJlZ2lvblRo cmVhZCk7IH0KICAgICB2b2lkIHNldFJlZ2lvbk92ZXJmbG93KFJlZ2lvbk92ZXJmbG93IHJlZ2lv bk92ZXJmbG93KSB7IFNFVF9WQVIocmFyZU5vbkluaGVyaXRlZERhdGEsIG1fcmVnaW9uT3ZlcmZs b3csIHJlZ2lvbk92ZXJmbG93KTsgfQpAQCAtMTQ2OSw2ICsxNDczLDggQEAgcHVibGljOgogICAg IHN0YXRpYyBTdHlsZUltYWdlKiBpbml0aWFsQm9yZGVySW1hZ2VTb3VyY2UoKSB7IHJldHVybiAw OyB9CiAgICAgc3RhdGljIFN0eWxlSW1hZ2UqIGluaXRpYWxNYXNrQm94SW1hZ2VTb3VyY2UoKSB7 IHJldHVybiAwOyB9CiAKKyAgICBzdGF0aWMgY29uc3QgQXRvbWljU3RyaW5nJiBpbml0aWFsTGlu ZUdyaWQoKSB7IHJldHVybiBudWxsQXRvbTsgfQorCiAgICAgc3RhdGljIGNvbnN0IEF0b21pY1N0 cmluZyYgaW5pdGlhbEZsb3dUaHJlYWQoKSB7IHJldHVybiBudWxsQXRvbTsgfQogICAgIHN0YXRp YyBjb25zdCBBdG9taWNTdHJpbmcmIGluaXRpYWxSZWdpb25UaHJlYWQoKSB7IHJldHVybiBudWxs QXRvbTsgfQogICAgIHN0YXRpYyBSZWdpb25PdmVyZmxvdyBpbml0aWFsUmVnaW9uT3ZlcmZsb3co KSB7IHJldHVybiBBdXRvUmVnaW9uT3ZlcmZsb3c7IH0KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9zdHlsZS9TdHlsZVJhcmVJbmhlcml0ZWREYXRhLmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvU3R5bGVSYXJlSW5oZXJpdGVkRGF0YS5jcHAJ KHJldmlzaW9uIDk4NjI4KQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1N0eWxl UmFyZUluaGVyaXRlZERhdGEuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01Niw2ICs1Niw3IEBAIFN0 eWxlUmFyZUluaGVyaXRlZERhdGE6OlN0eWxlUmFyZUluaGVyaXQKICAgICAsIGh5cGhlbmF0aW9u TGltaXRCZWZvcmUoLTEpCiAgICAgLCBoeXBoZW5hdGlvbkxpbWl0QWZ0ZXIoLTEpCiAgICAgLCBo eXBoZW5hdGlvbkxpbWl0TGluZXMoLTEpCisgICAgLCBtX2xpbmVHcmlkKFJlbmRlclN0eWxlOjpp bml0aWFsTGluZUdyaWQoKSkKICNpZiBFTkFCTEUoVE9VQ0hfRVZFTlRTKQogICAgICwgdGFwSGln aGxpZ2h0Q29sb3IoUmVuZGVyU3R5bGU6OmluaXRpYWxUYXBIaWdobGlnaHRDb2xvcigpKQogI2Vu ZGlmICAgIApAQCAtMTAxLDYgKzEwMiw3IEBAIFN0eWxlUmFyZUluaGVyaXRlZERhdGE6OlN0eWxl UmFyZUluaGVyaXQKICAgICAsIGh5cGhlbmF0aW9uTGltaXRMaW5lcyhvLmh5cGhlbmF0aW9uTGlt aXRMaW5lcykKICAgICAsIGxvY2FsZShvLmxvY2FsZSkKICAgICAsIHRleHRFbXBoYXNpc0N1c3Rv bU1hcmsoby50ZXh0RW1waGFzaXNDdXN0b21NYXJrKQorICAgICwgbV9saW5lR3JpZChvLm1fbGlu ZUdyaWQpCiAjaWYgRU5BQkxFKFRPVUNIX0VWRU5UUykKICAgICAsIHRhcEhpZ2hsaWdodENvbG9y KG8udGFwSGlnaGxpZ2h0Q29sb3IpCiAjZW5kaWYKQEAgLTE2Miw2ICsxNjQsNyBAQCBib29sIFN0 eWxlUmFyZUluaGVyaXRlZERhdGE6Om9wZXJhdG9yPT0oCiAgICAgICAgICYmIGxvY2FsZSA9PSBv LmxvY2FsZQogICAgICAgICAmJiB0ZXh0RW1waGFzaXNDdXN0b21NYXJrID09IG8udGV4dEVtcGhh c2lzQ3VzdG9tTWFyawogICAgICAgICAmJiBRdW90ZXNEYXRhOjplcXVhbChxdW90ZXMuZ2V0KCks IG8ucXVvdGVzLmdldCgpKQorICAgICAgICAmJiBtX2xpbmVHcmlkID09IG8ubV9saW5lR3JpZAog ICAgICAgICAmJiBtX2ltYWdlUmVuZGVyaW5nID09IG8ubV9pbWFnZVJlbmRlcmluZzsKIH0KIApJ bmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1N0eWxlUmFyZUluaGVyaXRlZERh dGEuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvU3R5bGVS YXJlSW5oZXJpdGVkRGF0YS5oCShyZXZpc2lvbiA5ODYyOCkKKysrIFNvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9zdHlsZS9TdHlsZVJhcmVJbmhlcml0ZWREYXRhLmgJKHdvcmtpbmcgY29weSkKQEAg LTEwMiw2ICsxMDIsOSBAQCBwdWJsaWM6CiAKICAgICBBdG9taWNTdHJpbmcgdGV4dEVtcGhhc2lz Q3VzdG9tTWFyazsKICAgICBSZWZQdHI8UXVvdGVzRGF0YT4gcXVvdGVzOworICAgIAorICAgIEF0 b21pY1N0cmluZyBtX2xpbmVHcmlkOworCiAjaWYgRU5BQkxFKFRPVUNIX0VWRU5UUykKICAgICBD b2xvciB0YXBIaWdobGlnaHRDb2xvcjsKICNlbmRpZgpJbmRleDogTGF5b3V0VGVzdHMvQ2hhbmdl TG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL0NoYW5nZUxvZwkocmV2aXNpb24gOTg2MzYp CisrKyBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxOSBA QAorMjAxMS0xMC0yNyAgRGF2aWQgSHlhdHQgIDxoeWF0dEBhcHBsZS5jb20+CisKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTcxMDYxCisgICAgICAgIAor ICAgICAgICBbQ1NTIExpbmUgR3JpZF0gQWRkIHN1cHBvcnQgZm9yIHBhcnNpbmcgdGhlIGxpbmUt Z3JpZCBwcm9wZXJ0eS4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICAqIGZhc3QvY3NzL2dldENvbXB1dGVkU3R5bGUvY29tcHV0ZWQtc3R5bGUtZXhwZWN0 ZWQudHh0OgorICAgICAgICAqIGZhc3QvY3NzL2dldENvbXB1dGVkU3R5bGUvY29tcHV0ZWQtc3R5 bGUtd2l0aG91dC1yZW5kZXJlci1leHBlY3RlZC50eHQ6CisgICAgICAgICogZmFzdC9saW5lLWdy aWQ6IEFkZGVkLgorICAgICAgICAqIGZhc3QvbGluZS1ncmlkL2xpbmUtZ3JpZC1wYXJzaW5nLWV4 cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogZmFzdC9saW5lLWdyaWQvbGluZS1ncmlkLXBh cnNpbmcuaHRtbDogQWRkZWQuCisgICAgICAgICogZmFzdC9saW5lLWdyaWQvc2NyaXB0LXRlc3Rz OiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L2xpbmUtZ3JpZC9zY3JpcHQtdGVzdHMvbGluZS1ncmlk LXBhcnNpbmcuanM6IEFkZGVkLgorCiAyMDExLTEwLTI3ICBNaWtlIFJlZWQgIDxyZWVkQGdvb2ds ZS5jb20+CiAKICAgICAgICAgdGVzdF9yZWJhc2VsaW5lX2V4cGVjdGF0aW9ucyBmYWlsaW5nCklu ZGV4OiBMYXlvdXRUZXN0cy9mYXN0L2Nzcy9nZXRDb21wdXRlZFN0eWxlL2NvbXB1dGVkLXN0eWxl LWV4cGVjdGVkLnR4dAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9mYXN0L2Nzcy9nZXRDb21w dXRlZFN0eWxlL2NvbXB1dGVkLXN0eWxlLWV4cGVjdGVkLnR4dAkocmV2aXNpb24gOTg2MzUpCisr KyBMYXlvdXRUZXN0cy9mYXN0L2Nzcy9nZXRDb21wdXRlZFN0eWxlL2NvbXB1dGVkLXN0eWxlLWV4 cGVjdGVkLnR4dAkod29ya2luZyBjb3B5KQpAQCAtMTUyLDYgKzE1Miw3IEBAIHpvb206IDE7CiAt d2Via2l0LWxpbmUtYm94LWNvbnRhaW46IGJsb2NrIGlubGluZSByZXBsYWNlZDsKIC13ZWJraXQt bGluZS1icmVhazogbm9ybWFsOwogLXdlYmtpdC1saW5lLWNsYW1wOiBub25lOworLXdlYmtpdC1s aW5lLWdyaWQ6IG5vbmU7CiAtd2Via2l0LWxvY2FsZTogYXV0bzsKIC13ZWJraXQtbWFyZ2luLWJl Zm9yZS1jb2xsYXBzZTogY29sbGFwc2U7CiAtd2Via2l0LW1hcmdpbi1hZnRlci1jb2xsYXBzZTog Y29sbGFwc2U7CkluZGV4OiBMYXlvdXRUZXN0cy9mYXN0L2Nzcy9nZXRDb21wdXRlZFN0eWxlL2Nv bXB1dGVkLXN0eWxlLXdpdGhvdXQtcmVuZGVyZXItZXhwZWN0ZWQudHh0Cj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IExheW91dFRlc3RzL2Zhc3QvY3NzL2dldENvbXB1dGVkU3R5bGUvY29tcHV0ZWQtc3R5bGUtd2l0 aG91dC1yZW5kZXJlci1leHBlY3RlZC50eHQJKHJldmlzaW9uIDk4NjM1KQorKysgTGF5b3V0VGVz dHMvZmFzdC9jc3MvZ2V0Q29tcHV0ZWRTdHlsZS9jb21wdXRlZC1zdHlsZS13aXRob3V0LXJlbmRl cmVyLWV4cGVjdGVkLnR4dAkod29ya2luZyBjb3B5KQpAQCAtMTUxLDYgKzE1MSw3IEBAIENvbXB1 dGVkIHN0eWxlIG9mIGFuIGVsZW1lbnQgd2hvc2UgcGFyZW4KICAgICAtd2Via2l0LWxpbmUtYm94 LWNvbnRhaW46IGJsb2NrIGlubGluZSByZXBsYWNlZAogICAgIC13ZWJraXQtbGluZS1icmVhazog bm9ybWFsCiAgICAgLXdlYmtpdC1saW5lLWNsYW1wOiBub25lCisgICAgLXdlYmtpdC1saW5lLWdy aWQ6IG5vbmUKICAgICAtd2Via2l0LWxvY2FsZTogYXV0bwogICAgIC13ZWJraXQtbWFyZ2luLWJl Zm9yZS1jb2xsYXBzZTogY29sbGFwc2UKICAgICAtd2Via2l0LW1hcmdpbi1hZnRlci1jb2xsYXBz ZTogY29sbGFwc2UKSW5kZXg6IExheW91dFRlc3RzL2Zhc3QvbGluZS1ncmlkL2xpbmUtZ3JpZC1w YXJzaW5nLWV4cGVjdGVkLnR4dAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9mYXN0L2xpbmUt Z3JpZC9saW5lLWdyaWQtcGFyc2luZy1leHBlY3RlZC50eHQJKHJldmlzaW9uIDApCisrKyBMYXlv dXRUZXN0cy9mYXN0L2xpbmUtZ3JpZC9saW5lLWdyaWQtcGFyc2luZy1leHBlY3RlZC50eHQJKHJl dmlzaW9uIDApCkBAIC0wLDAgKzEsMjQgQEAKK1Rlc3QgcGFyc2luZyBvZiB0aGUgQ1NTIGxpbmUt Z3JpZCBwcm9wZXJ0eS4KKworT24gc3VjY2VzcywgeW91IHdpbGwgc2VlIGEgc2VyaWVzIG9mICJQ QVNTIiBtZXNzYWdlcywgZm9sbG93ZWQgYnkgIlRFU1QgQ09NUExFVEUiLgorCisKK1BBU1MgdGVz dCgiLXdlYmtpdC1saW5lLWdyaWQ6IG5vbmUiKSBpcyAibm9uZSIKK1BBU1MgdGVzdCgiLXdlYmtp dC1saW5lLWdyaWQ6IGZpcnN0LWdyaWQiKSBpcyAiZmlyc3QtZ3JpZCIKK1BBU1MgdGVzdCgiLXdl YmtpdC1saW5lLWdyaWQ6ICdmaXJzdCBncmlkJyIpIGlzICIiCitQQVNTIHRlc3QoIi13ZWJraXQt bGluZS1ncmlkOiA7IikgaXMgIiIKK1BBU1MgdGVzdCgiLXdlYmtpdC1saW5lLWdyaWQ6IDEiKSBp cyAiIgorUEFTUyB0ZXN0KCItd2Via2l0LWxpbmUtZ3JpZDogMS4yIikgaXMgIiIKK1BBU1MgdGVz dCgiLXdlYmtpdC1saW5lLWdyaWQ6IC0xIikgaXMgIiIKK1BBU1MgdGVzdCgiLXdlYmtpdC1saW5l LWdyaWQ6IDEycHgiKSBpcyAiIgorUEFTUyB0ZXN0Q29tcHV0ZWRTdHlsZSgibm9uZSIpIGlzICJu b25lIgorUEFTUyB0ZXN0Q29tcHV0ZWRTdHlsZSgiIikgaXMgIm5vbmUiCitQQVNTIHRlc3RDb21w dXRlZFN0eWxlKCInZmlyc3QtZmxvdyciKSBpcyAibm9uZSIKK1BBU1MgdGVzdENvbXB1dGVkU3R5 bGUoImZpcnN0LWdyaWQiKSBpcyAiZmlyc3QtZ3JpZCIKK1BBU1MgdGVzdENvbXB1dGVkU3R5bGUo IjEycHgiKSBpcyAibm9uZSIKK1BBU1MgdGVzdEluaGVyaXRlZCgibm9uZSIpIGlzICJub25lIgor UEFTUyB0ZXN0SW5oZXJpdGVkKCJncmlkIikgaXMgImdyaWQiCitQQVNTIHN1Y2Nlc3NmdWxseVBh cnNlZCBpcyB0cnVlCisKK1RFU1QgQ09NUExFVEUKKwpJbmRleDogTGF5b3V0VGVzdHMvZmFzdC9s aW5lLWdyaWQvbGluZS1ncmlkLXBhcnNpbmcuaHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0 cy9mYXN0L2xpbmUtZ3JpZC9saW5lLWdyaWQtcGFyc2luZy5odG1sCShyZXZpc2lvbiAwKQorKysg TGF5b3V0VGVzdHMvZmFzdC9saW5lLWdyaWQvbGluZS1ncmlkLXBhcnNpbmcuaHRtbAkocmV2aXNp b24gMCkKQEAgLTAsMCArMSwxMCBAQAorPCFET0NUWVBFIEhUTUwgUFVCTElDICItLy9JRVRGLy9E VEQgSFRNTC8vRU4iPgorPGh0bWw+Cis8aGVhZD4KKzxzY3JpcHQgc3JjPSIuLi8uLi9mYXN0L2pz L3Jlc291cmNlcy9qcy10ZXN0LXByZS5qcyI+PC9zY3JpcHQ+Cis8L2hlYWQ+Cis8Ym9keT4KKzxz Y3JpcHQgc3JjPSJzY3JpcHQtdGVzdHMvbGluZS1ncmlkLXBhcnNpbmcuanMiPjwvc2NyaXB0Pgor PHNjcmlwdCBzcmM9Ii4uLy4uL2Zhc3QvanMvcmVzb3VyY2VzL2pzLXRlc3QtcG9zdC5qcyI+PC9z Y3JpcHQ+Cis8L2JvZHk+Cis8L2h0bWw+CkluZGV4OiBMYXlvdXRUZXN0cy9mYXN0L2xpbmUtZ3Jp ZC9zY3JpcHQtdGVzdHMvbGluZS1ncmlkLXBhcnNpbmcuanMKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0 VGVzdHMvZmFzdC9saW5lLWdyaWQvc2NyaXB0LXRlc3RzL2xpbmUtZ3JpZC1wYXJzaW5nLmpzCShy ZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMvZmFzdC9saW5lLWdyaWQvc2NyaXB0LXRlc3RzL2xp bmUtZ3JpZC1wYXJzaW5nLmpzCShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDUwIEBACitkZXNjcmlw dGlvbignVGVzdCBwYXJzaW5nIG9mIHRoZSBDU1MgbGluZS1ncmlkIHByb3BlcnR5LicpOworCitm dW5jdGlvbiB0ZXN0KGRlY2xhcmF0aW9uKSB7CisgICAgdmFyIGRpdiA9IGRvY3VtZW50LmNyZWF0 ZUVsZW1lbnQoImRpdiIpOworICAgIGRpdi5zZXRBdHRyaWJ1dGUoInN0eWxlIiwgZGVjbGFyYXRp b24pOworICAgIHJldHVybiBkaXYuc3R5bGUud2Via2l0TGluZUdyaWQ7Cit9CisKK2Z1bmN0aW9u IHRlc3RDb21wdXRlZFN0eWxlKHZhbHVlKSB7CisgICAgdmFyIGRpdiA9IGRvY3VtZW50LmNyZWF0 ZUVsZW1lbnQoImRpdiIpOworICAgIGRvY3VtZW50LmJvZHkuYXBwZW5kQ2hpbGQoZGl2KTsKKyAg ICBkaXYuc3R5bGUuc2V0UHJvcGVydHkoIi13ZWJraXQtbGluZS1ncmlkIiwgdmFsdWUpOworICAg IHZhciB3ZWJraXRGbG93Q29tcHV0ZWRWYWx1ZSA9IGdldENvbXB1dGVkU3R5bGUoZGl2KS5nZXRQ cm9wZXJ0eVZhbHVlKCItd2Via2l0LWxpbmUtZ3JpZCIpOworICAgIGRvY3VtZW50LmJvZHkucmVt b3ZlQ2hpbGQoZGl2KTsKKyAgICByZXR1cm4gd2Via2l0Rmxvd0NvbXB1dGVkVmFsdWU7Cit9CisK K2Z1bmN0aW9uIHRlc3RJbmhlcml0ZWQocGFyZW50VmFsdWUpIHsKKyAgICB2YXIgcGFyZW50RGl2 ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7CisgICAgZG9jdW1lbnQuYm9keS5hcHBl bmRDaGlsZChwYXJlbnREaXYpOworICAgIHBhcmVudERpdi5zdHlsZS5zZXRQcm9wZXJ0eSgiLXdl YmtpdC1saW5lLWdyaWQiLCBwYXJlbnRWYWx1ZSk7CisKKyAgICB2YXIgY2hpbGREaXYgPSBkb2N1 bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKKyAgICBwYXJlbnREaXYuYXBwZW5kQ2hpbGQoY2hp bGREaXYpOworCisgICAgdmFyIGNoaWxkV2ViS2l0Rmxvd0NvbXB1dGVkVmFsdWUgPSBnZXRDb21w dXRlZFN0eWxlKGNoaWxkRGl2KS5nZXRQcm9wZXJ0eVZhbHVlKCItd2Via2l0LWxpbmUtZ3JpZCIp OworCisgICAgcGFyZW50RGl2LnJlbW92ZUNoaWxkKGNoaWxkRGl2KTsKKyAgICBkb2N1bWVudC5i b2R5LnJlbW92ZUNoaWxkKHBhcmVudERpdik7CisKKyAgICByZXR1cm4gY2hpbGRXZWJLaXRGbG93 Q29tcHV0ZWRWYWx1ZTsKK30KKworc2hvdWxkQmVFcXVhbFRvU3RyaW5nKCd0ZXN0KCItd2Via2l0 LWxpbmUtZ3JpZDogbm9uZSIpJywgIm5vbmUiKTsKK3Nob3VsZEJlRXF1YWxUb1N0cmluZygndGVz dCgiLXdlYmtpdC1saW5lLWdyaWQ6IGZpcnN0LWdyaWQiKScsICJmaXJzdC1ncmlkIik7CitzaG91 bGRCZUVxdWFsVG9TdHJpbmcoJ3Rlc3QoIi13ZWJraXQtbGluZS1ncmlkOiBcJ2ZpcnN0IGdyaWRc JyIpJywgIiIpOworc2hvdWxkQmVFcXVhbFRvU3RyaW5nKCd0ZXN0KCItd2Via2l0LWxpbmUtZ3Jp ZDogOyIpJywgIiIpOworc2hvdWxkQmVFcXVhbFRvU3RyaW5nKCd0ZXN0KCItd2Via2l0LWxpbmUt Z3JpZDogMSIpJywgIiIpOworc2hvdWxkQmVFcXVhbFRvU3RyaW5nKCd0ZXN0KCItd2Via2l0LWxp bmUtZ3JpZDogMS4yIiknLCAiIik7CitzaG91bGRCZUVxdWFsVG9TdHJpbmcoJ3Rlc3QoIi13ZWJr aXQtbGluZS1ncmlkOiAtMSIpJywgIiIpOworc2hvdWxkQmVFcXVhbFRvU3RyaW5nKCd0ZXN0KCIt d2Via2l0LWxpbmUtZ3JpZDogMTJweCIpJywgIiIpOworCitzaG91bGRCZUVxdWFsVG9TdHJpbmco J3Rlc3RDb21wdXRlZFN0eWxlKCJub25lIiknLCAibm9uZSIpOworc2hvdWxkQmVFcXVhbFRvU3Ry aW5nKCd0ZXN0Q29tcHV0ZWRTdHlsZSgiIiknLCAibm9uZSIpOworc2hvdWxkQmVFcXVhbFRvU3Ry aW5nKCd0ZXN0Q29tcHV0ZWRTdHlsZSgiXCdmaXJzdC1mbG93XCciKScsICJub25lIik7CitzaG91 bGRCZUVxdWFsVG9TdHJpbmcoJ3Rlc3RDb21wdXRlZFN0eWxlKCJmaXJzdC1ncmlkIiknLCAiZmly c3QtZ3JpZCIpOworc2hvdWxkQmVFcXVhbFRvU3RyaW5nKCd0ZXN0Q29tcHV0ZWRTdHlsZSgiMTJw eCIpJywgIm5vbmUiKTsKKworc2hvdWxkQmVFcXVhbFRvU3RyaW5nKCd0ZXN0SW5oZXJpdGVkKCJu b25lIiknLCAibm9uZSIpOworc2hvdWxkQmVFcXVhbFRvU3RyaW5nKCd0ZXN0SW5oZXJpdGVkKCJn cmlkIiknLCAiZ3JpZCIpOwo=