163741 2016-10-20 10:13:18 -0700 [CSS Parser] Fix font family parsing and add CSS region property parsing 2016-10-20 10:27:54 -0700 1 1 1 Unclassified WebKit CSS WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 hyatt hyatt commit-queue oldest_to_newest 1242466 0 hyatt 2016-10-20 10:13:18 -0700 Fix font family parsing and add CSS region property parsing. 1242469 1 292220 hyatt 2016-10-20 10:17:11 -0700 Created attachment 292220 Patch 1242470 2 commit-queue 2016-10-20 10:19:33 -0700 Attachment 292220 did not pass style-queue: ERROR: Source/WebCore/css/parser/CSSPropertyParser.cpp:4086: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] ERROR: Source/WebCore/css/parser/CSSParser.cpp:1155: A case label should not be indented, but line up with its switch statement. [whitespace/indent] [4] Total errors found: 2 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 1242478 3 hyatt 2016-10-20 10:27:54 -0700 Landed in r207622. 292220 2016-10-20 10:17:11 -0700 2016-10-20 10:18:45 -0700 Patch patch.txt text/plain 10099 hyatt SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIwNzYyMSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQ1IEBACisyMDE2LTEwLTIwICBEYXZlIEh5 YXR0ICA8aHlhdHRAYXBwbGUuY29tPgorCisgICAgICAgIFtDU1MgUGFyc2VyXSBGaXggZm9udCBm YW1pbHkgcGFyc2luZyBhbmQgYWRkIENTUyByZWdpb24gcHJvcGVydHkgcGFyc2luZworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTYzNzQxCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBjc3MvcGFyc2VyL0NT U1BhcnNlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjppc0tleXdvcmRQcm9wZXJ0eUlEKToKKyAg ICAgICAgKFdlYkNvcmU6OnBhcnNlS2V5d29yZFZhbHVlKToKKyAgICAgICAgKFdlYkNvcmU6OkNT U1BhcnNlcjo6cGFyc2VWYWx1ZSk6CisgICAgICAgIE1vZGlmeSB0aGUgb2xkIENTU1BhcnNlciB0 byBoYXZlIGl0cyBvd24ga2V5d29yZCBjaGVjaywgc2luY2Uga2V5d29yZHMgd2VyZQorICAgICAg ICBpbmNvcnJlY3RseSBhZGRlZCB0byB0aGUgbmV3IHBhcnNlciB3aGVuIHRoaXMgY2hlY2sgd2Fz IGNvbnNvbGlkYXRlZC4gQ29sdW1uCisgICAgICAgIGFuZCByZWdpb24gYnJlYWtzIGFyZSBjb25z aWRlcmVkIGtleXdvcmQgcHJvcGVydGllcyBieSB0aGUgb2xkIHBhcnNlciwgYnV0CisgICAgICAg IG5vdCBieSB0aGUgbmV3IHBhcnNlciwgc2luY2UgdGhlIG5ldyBwYXJzZXIgc3BlY2lhbCBjYXNl cyB0aGVtIGFuZCBtYXBzIHRoZW0KKyAgICAgICAgaW50byB0aGUgZ2VuZXJpYyBicmVhayBwcm9w ZXJ0eS4KKworICAgICAgICAqIGNzcy9wYXJzZXIvQ1NTUGFyc2VyRmFzdFBhdGhzLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkNTU1BhcnNlckZhc3RQYXRoczo6aXNWYWxpZEtleXdvcmRQcm9wZXJ0 eUFuZFZhbHVlKToKKyAgICAgICAgKFdlYkNvcmU6OkNTU1BhcnNlckZhc3RQYXRoczo6aXNLZXl3 b3JkUHJvcGVydHlJRCk6CisgICAgICAgIFVwZGF0ZSBmb3IgcmVnaW9ucyB0byBtYWtlIHN1cmUg YWxsIHRoZSByZWdpb24gcHJvcGVydGllcyBhcmUgdGhlcmUuIFJlbW92ZSB0aGUKKyAgICAgICAg Y29sdW1uIGFuZCByZWdpb24gYnJlYWsgcHJvcGVydGllcywgc2luY2UgdGhleSdyZSBub3Qgc3Vw cG9zZWQgdG8gYmUgaGVyZSBpbiB0aGUKKyAgICAgICAgbmV3IHBhcnNlci4KKworICAgICAgICAq IGNzcy9wYXJzZXIvQ1NTUHJvcGVydHlQYXJzZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Y29u c3VtZUZhbWlseU5hbWUpOgorICAgICAgICBGaXggZm9udCBwYXJzaW5nIHRvIG1ha2UgZm9udCBm YW1pbHkgdmFsdWVzIHNvIHRoYXQgZm9udHMgd29yay4KKworICAgICAgICAoV2ViQ29yZTo6Y29u c3VtZUZsb3dQcm9wZXJ0eSk6CisgICAgICAgIEFkZCBhIGZ1bmN0aW9uIGZvciBoYW5kbGluZyAt d2Via2l0LWZsb3ctZnJvbSBhbmQgLXdlYmtpdC1mbG93LWludG8uCisKKyAgICAgICAgKFdlYkNv cmU6OkNTU1Byb3BlcnR5UGFyc2VyOjpwYXJzZVNpbmdsZVZhbHVlKToKKyAgICAgICAgQWRkIHN1 cHBvcnQgZm9yIHRoZSByZWdpb24gcHJvcGVydGllcy4KKworICAgICAgICAoV2ViQ29yZTo6bWFw RnJvbVJlZ2lvbkJyZWFrQmV0d2Vlbik6CisgICAgICAgIChXZWJDb3JlOjptYXBGcm9tQ29sdW1u UmVnaW9uT3JQYWdlQnJlYWtJbnNpZGUpOgorICAgICAgICAoV2ViQ29yZTo6bWFwRnJvbUxlZ2Fj eUJyZWFrUHJvcGVydHkpOgorICAgICAgICAoV2ViQ29yZTo6Q1NTUHJvcGVydHlQYXJzZXI6OmNv bnN1bWVMZWdhY3lCcmVha1Byb3BlcnR5KToKKyAgICAgICAgKFdlYkNvcmU6Om1hcEZyb21Db2x1 bW5PclBhZ2VCcmVha0luc2lkZSk6IERlbGV0ZWQuCisgICAgICAgIFVwZGF0ZSB0byBoYW5kbGUg dGhlIHJlZ2lvbiBicmVhayBwcm9wZXJ0aWVzIGluIHRoZSBzYW1lIHdheSB0aGF0IGNvbHVtbiBi cmVhaworICAgICAgICBwcm9wZXJ0aWVzIGFyZSBoYW5kbGVkLgorCiAyMDE2LTEwLTIwICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgogCiAgICAgICAgIENSQVNIIGluIFdlYkNvcmU6 Ok1lZGlhU291cmNlOjpzZWVrVG9UaW1lICsgMTg1CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9jc3Mv cGFyc2VyL0NTU1BhcnNlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvY3NzL3Bh cnNlci9DU1NQYXJzZXIuY3BwCShyZXZpc2lvbiAyMDc1NDgpCisrKyBTb3VyY2UvV2ViQ29yZS9j c3MvcGFyc2VyL0NTU1BhcnNlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTExNDksMTEgKzExNDks MzAgQEAgc3RhdGljIGJvb2wgaXNVbml2ZXJzYWxLZXl3b3JkKGNvbnN0IFN0cgogICAgICAgICB8 fCBlcXVhbExldHRlcnNJZ25vcmluZ0FTQ0lJQ2FzZShzdHJpbmcsICJyZXZlcnQiKTsKIH0KIAor c3RhdGljIGJvb2wgaXNLZXl3b3JkUHJvcGVydHlJRChDU1NQcm9wZXJ0eUlEIHByb3BlcnR5SUQp Cit7CisgICAgc3dpdGNoIChwcm9wZXJ0eUlEKSB7CisgICAgICAgIGNhc2UgQ1NTUHJvcGVydHlX ZWJraXRDb2x1bW5CcmVha0FmdGVyOgorICAgICAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0Q29s dW1uQnJlYWtCZWZvcmU6CisgICAgICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRDb2x1bW5CcmVh a0luc2lkZToKKyNpZiBFTkFCTEUoQ1NTX1JFR0lPTlMpCisgICAgICAgIGNhc2UgQ1NTUHJvcGVy dHlXZWJraXRSZWdpb25CcmVha0FmdGVyOgorICAgICAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0 UmVnaW9uQnJlYWtCZWZvcmU6CisgICAgICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRSZWdpb25C cmVha0luc2lkZToKKyNlbmRpZgorICAgICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgICAgIGRl ZmF1bHQ6CisgICAgICAgICAgICBicmVhazsKKyAgICB9CisgICAgCisgICAgcmV0dXJuIENTU1Bh cnNlckZhc3RQYXRoczo6aXNLZXl3b3JkUHJvcGVydHlJRChwcm9wZXJ0eUlEKTsKK30KKwogc3Rh dGljIENTU1BhcnNlcjo6UGFyc2VSZXN1bHQgcGFyc2VLZXl3b3JkVmFsdWUoTXV0YWJsZVN0eWxl UHJvcGVydGllcyYgZGVjbGFyYXRpb24sIENTU1Byb3BlcnR5SUQgcHJvcGVydHlJZCwgY29uc3Qg U3RyaW5nJiBzdHJpbmcsIGJvb2wgaW1wb3J0YW50LCBjb25zdCBDU1NQYXJzZXJDb250ZXh0JiBw YXJzZXJDb250ZXh0LCBTdHlsZVNoZWV0Q29udGVudHMqIHN0eWxlU2hlZXRDb250ZW50cykKIHsK ICAgICBBU1NFUlQoIXN0cmluZy5pc0VtcHR5KCkpOwogCi0gICAgaWYgKCFDU1NQYXJzZXJGYXN0 UGF0aHM6OmlzS2V5d29yZFByb3BlcnR5SUQocHJvcGVydHlJZCkpIHsKKyAgICBpZiAoIWlzS2V5 d29yZFByb3BlcnR5SUQocHJvcGVydHlJZCkpIHsKICAgICAgICAgaWYgKCFpc1VuaXZlcnNhbEtl eXdvcmQoc3RyaW5nKSkKICAgICAgICAgICAgIHJldHVybiBDU1NQYXJzZXI6OlBhcnNlUmVzdWx0 OjpFcnJvcjsKIApAQCAtMTg0Miw3ICsxODYxLDcgQEAgYm9vbCBDU1NQYXJzZXI6OnBhcnNlVmFs dWUoQ1NTUHJvcGVydHlJRAogICAgIGlmIChwcm9wSWQgPT0gQ1NTUHJvcGVydHlBbGwpCiAgICAg ICAgIHJldHVybiBmYWxzZTsgLy8gImFsbCIgZG9lc24ndCBhbGxvdyB5b3UgdG8gc3BlY2lmeSBh bnl0aGluZyBvdGhlciB0aGFuIGluaGVyaXQvaW5pdGlhbC91bnNldC4KIAotICAgIGlmIChDU1NQ YXJzZXJGYXN0UGF0aHM6OmlzS2V5d29yZFByb3BlcnR5SUQocHJvcElkKSkgeworICAgIGlmIChp c0tleXdvcmRQcm9wZXJ0eUlEKHByb3BJZCkpIHsKICAgICAgICAgaWYgKCFpc1ZhbGlkS2V5d29y ZFByb3BlcnR5QW5kVmFsdWUocHJvcElkLCBpZCwgbV9jb250ZXh0LCBtX3N0eWxlU2hlZXQpKQog ICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAgICBpZiAobV92YWx1ZUxpc3QtPm5leHQo KSAmJiAhaW5TaG9ydGhhbmQoKSkKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2Nzcy9wYXJzZXIvQ1NT UGFyc2VyRmFzdFBhdGhzLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9jc3MvcGFy c2VyL0NTU1BhcnNlckZhc3RQYXRocy5jcHAJKHJldmlzaW9uIDIwNzU2NykKKysrIFNvdXJjZS9X ZWJDb3JlL2Nzcy9wYXJzZXIvQ1NTUGFyc2VyRmFzdFBhdGhzLmNwcAkod29ya2luZyBjb3B5KQpA QCAtNzQ1LDYgKzc0NSwxMCBAQCBib29sIENTU1BhcnNlckZhc3RQYXRoczo6aXNWYWxpZEtleXdv cmRQCiAgICAgICAgIHJldHVybiB2YWx1ZUlEID09IENTU1ZhbHVlTm9ybWFsIHx8IHZhbHVlSUQg PT0gQ1NTVmFsdWVCcmVha0FsbCB8fCB2YWx1ZUlEID09IENTU1ZhbHVlS2VlcEFsbCB8fCB2YWx1 ZUlEID09IENTU1ZhbHVlQnJlYWtXb3JkOwogICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRCb3Jk ZXJGaXQ6CiAgICAgICAgIHJldHVybiB2YWx1ZUlEID09IENTU1ZhbHVlQm9yZGVyIHx8IHZhbHVl SUQgPT0gQ1NTVmFsdWVMaW5lczsKKyNpZiBFTkFCTEUoQ1NTX1JFR0lPTlMpCisgICAgY2FzZSBD U1NQcm9wZXJ0eVdlYmtpdFJlZ2lvbkZyYWdtZW50OgorICAgICAgICByZXR1cm4gdmFsdWVJRCA9 PSBDU1NWYWx1ZUF1dG8gfHwgdmFsdWVJRCA9PSBDU1NWYWx1ZUJyZWFrOworI2VuZGlmCiAjaWYg RU5BQkxFKENTU19TQ1JPTExfU05BUCkKICAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0U2Nyb2xs U25hcFR5cGU6IC8vIG5vbmUgfCBtYW5kYXRvcnkgfCBwcm94aW1pdHkKICAgICAgICAgcmV0dXJu IHZhbHVlSUQgPT0gQ1NTVmFsdWVOb25lIHx8IHZhbHVlSUQgPT0gQ1NTVmFsdWVNYW5kYXRvcnkg fHwgdmFsdWVJRCA9PSBDU1NWYWx1ZVByb3hpbWl0eTsKQEAgLTgzOSw5ICs4NDMsNiBAQCBib29s IENTU1BhcnNlckZhc3RQYXRoczo6aXNLZXl3b3JkUHJvcGVyCiAgICAgY2FzZSBDU1NQcm9wZXJ0 eVdlYmtpdEJveE9yaWVudDoKICAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0Qm94UGFjazoKICAg ICBjYXNlIENTU1Byb3BlcnR5V2Via2l0Q29sdW1uQXhpczoKLSAgICBjYXNlIENTU1Byb3BlcnR5 V2Via2l0Q29sdW1uQnJlYWtBZnRlcjoKLSAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0Q29sdW1u QnJlYWtCZWZvcmU6Ci0gICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdENvbHVtbkJyZWFrSW5zaWRl OgogICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRGb250S2VybmluZzoKICAgICBjYXNlIENTU1By b3BlcnR5V2Via2l0Rm9udFNtb290aGluZzoKICAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0SHlw aGVuczoKQEAgLTkzMCw5ICs5MzEsNiBAQCBib29sIENTU1BhcnNlckZhc3RQYXRoczo6aXNLZXl3 b3JkUHJvcGVyCiAgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdE92ZXJmbG93U2Nyb2xsaW5nOgog I2VuZGlmCiAjaWYgRU5BQkxFKENTU19SRUdJT05TKQotICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJr aXRSZWdpb25CcmVha0FmdGVyOgotICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRSZWdpb25CcmVh a0JlZm9yZToKLSAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0UmVnaW9uQnJlYWtJbnNpZGU6CiAg ICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdFJlZ2lvbkZyYWdtZW50OgogI2VuZGlmCiAjaWYgRU5B QkxFKENTUzNfVEVYVCkKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2Nzcy9wYXJzZXIvQ1NTUHJvcGVy dHlQYXJzZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2Nzcy9wYXJzZXIvQ1NT UHJvcGVydHlQYXJzZXIuY3BwCShyZXZpc2lvbiAyMDc1NDkpCisrKyBTb3VyY2UvV2ViQ29yZS9j c3MvcGFyc2VyL0NTU1Byb3BlcnR5UGFyc2VyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNzA2LDEz ICs3MDYsMTMgQEAgc3RhdGljIFN0cmluZyBjb25jYXRlbmF0ZUZhbWlseU5hbWUoQ1NTUAogc3Rh dGljIFJlZlB0cjxDU1NWYWx1ZT4gY29uc3VtZUZhbWlseU5hbWUoQ1NTUGFyc2VyVG9rZW5SYW5n ZSYgcmFuZ2UpCiB7CiAgICAgaWYgKHJhbmdlLnBlZWsoKS50eXBlKCkgPT0gU3RyaW5nVG9rZW4p Ci0gICAgICAgIHJldHVybiBDU1NQcmltaXRpdmVWYWx1ZTo6Y3JlYXRlKHJhbmdlLmNvbnN1bWVJ bmNsdWRpbmdXaGl0ZXNwYWNlKCkudmFsdWUoKS50b1N0cmluZygpLCBDU1NQcmltaXRpdmVWYWx1 ZTo6VW5pdFR5cGVzOjpDU1NfU1RSSU5HKTsKKyAgICAgICAgcmV0dXJuIENTU1ZhbHVlUG9vbDo6 c2luZ2xldG9uKCkuY3JlYXRlRm9udEZhbWlseVZhbHVlKHJhbmdlLmNvbnN1bWVJbmNsdWRpbmdX aGl0ZXNwYWNlKCkudmFsdWUoKS50b1N0cmluZygpKTsKICAgICBpZiAocmFuZ2UucGVlaygpLnR5 cGUoKSAhPSBJZGVudFRva2VuKQogICAgICAgICByZXR1cm4gbnVsbHB0cjsKICAgICBTdHJpbmcg ZmFtaWx5TmFtZSA9IGNvbmNhdGVuYXRlRmFtaWx5TmFtZShyYW5nZSk7CiAgICAgaWYgKGZhbWls eU5hbWUuaXNOdWxsKCkpCiAgICAgICAgIHJldHVybiBudWxscHRyOwotICAgIHJldHVybiBDU1NQ cmltaXRpdmVWYWx1ZTo6Y3JlYXRlKGZhbWlseU5hbWUsIENTU1ByaW1pdGl2ZVZhbHVlOjpVbml0 VHlwZXM6OkNTU19TVFJJTkcpOworICAgIHJldHVybiBDU1NWYWx1ZVBvb2w6OnNpbmdsZXRvbigp LmNyZWF0ZUZvbnRGYW1pbHlWYWx1ZShmYW1pbHlOYW1lKTsKIH0KIAogc3RhdGljIFJlZlB0cjxD U1NWYWx1ZT4gY29uc3VtZUdlbmVyaWNGYW1pbHkoQ1NTUGFyc2VyVG9rZW5SYW5nZSYgcmFuZ2Up CkBAIC0zMDA3LDYgKzMwMDcsMTggQEAgc3RhdGljIFJlZlB0cjxDU1NWYWx1ZT4gY29uc3VtZUdy aWRUZW1wbAogICAgIHJldHVybiBDU1NHcmlkVGVtcGxhdGVBcmVhc1ZhbHVlOjpjcmVhdGUoZ3Jp ZEFyZWFNYXAsIHJvd0NvdW50LCBjb2x1bW5Db3VudCk7CiB9CiAKKyNpZiBFTkFCTEUoQ1NTX1JF R0lPTlMpCitzdGF0aWMgUmVmUHRyPENTU1ZhbHVlPiBjb25zdW1lRmxvd1Byb3BlcnR5KENTU1Bh cnNlclRva2VuUmFuZ2UmIHJhbmdlKQoreworICAgIFJlZlB0cjxDU1NWYWx1ZT4gcmVzdWx0Owor ICAgIGlmIChyYW5nZS5wZWVrKCkuaWQoKSA9PSBDU1NWYWx1ZU5vbmUpCisgICAgICAgIHJlc3Vs dCA9IGNvbnN1bWVJZGVudChyYW5nZSk7CisgICAgZWxzZQorICAgICAgICByZXN1bHQgPSBjb25z dW1lQ3VzdG9tSWRlbnQocmFuZ2UpOworICAgIHJldHVybiByZXN1bHQ7Cit9CisjZW5kaWYKKwog UmVmUHRyPENTU1ZhbHVlPiBDU1NQcm9wZXJ0eVBhcnNlcjo6cGFyc2VTaW5nbGVWYWx1ZShDU1NQ cm9wZXJ0eUlEIHByb3BlcnR5LCBDU1NQcm9wZXJ0eUlEIGN1cnJlbnRTaG9ydGhhbmQpCiB7CiAg ICAgaWYgKENTU1BhcnNlckZhc3RQYXRoczo6aXNLZXl3b3JkUHJvcGVydHlJRChwcm9wZXJ0eSkp IHsKQEAgLTMzNjgsNiArMzM4MCwxMiBAQCBSZWZQdHI8Q1NTVmFsdWU+IENTU1Byb3BlcnR5UGFy c2VyOjpwYXJzCiAgICAgICAgIHJldHVybiBjb25zdW1lR3JpZFRlbXBsYXRlQXJlYXMobV9yYW5n ZSk7CiAgICAgY2FzZSBDU1NQcm9wZXJ0eUdyaWRBdXRvRmxvdzoKICAgICAgICAgcmV0dXJuIGNv bnN1bWVHcmlkQXV0b0Zsb3cobV9yYW5nZSk7CisjaWYgRU5BQkxFKENTU19SRUdJT05TKQorICAg IGNhc2UgQ1NTUHJvcGVydHlXZWJraXRGbG93SW50bzoKKyAgICAgICAgcmV0dXJuIGNvbnN1bWVG bG93UHJvcGVydHkobV9yYW5nZSk7CisgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdEZsb3dGcm9t OgorICAgICAgICByZXR1cm4gY29uc3VtZUZsb3dQcm9wZXJ0eShtX3JhbmdlKTsKKyNlbmRpZgog ICAgIGRlZmF1bHQ6CiAgICAgICAgIHJldHVybiBudWxscHRyOwogICAgIH0KQEAgLTQwMDAsNyAr NDAxOCwxOCBAQCBzdGF0aWMgaW5saW5lIENTU1ZhbHVlSUQgbWFwRnJvbUNvbHVtbkJyCiAgICAg cmV0dXJuIENTU1ZhbHVlSW52YWxpZDsKIH0KIAotc3RhdGljIGlubGluZSBDU1NWYWx1ZUlEIG1h cEZyb21Db2x1bW5PclBhZ2VCcmVha0luc2lkZShDU1NWYWx1ZUlEIHZhbHVlKQorI2lmIEVOQUJM RShDU1NfUkVHSU9OUykKK3N0YXRpYyBpbmxpbmUgQ1NTVmFsdWVJRCBtYXBGcm9tUmVnaW9uQnJl YWtCZXR3ZWVuKENTU1ZhbHVlSUQgdmFsdWUpCit7CisgICAgaWYgKHZhbHVlID09IENTU1ZhbHVl QWx3YXlzKQorICAgICAgICByZXR1cm4gQ1NTVmFsdWVSZWdpb247CisgICAgaWYgKHZhbHVlID09 IENTU1ZhbHVlQXV0byB8fCB2YWx1ZSA9PSBDU1NWYWx1ZUF2b2lkKQorICAgICAgICByZXR1cm4g dmFsdWU7CisgICAgcmV0dXJuIENTU1ZhbHVlSW52YWxpZDsKK30KKyNlbmRpZgorCitzdGF0aWMg aW5saW5lIENTU1ZhbHVlSUQgbWFwRnJvbUNvbHVtblJlZ2lvbk9yUGFnZUJyZWFrSW5zaWRlKENT U1ZhbHVlSUQgdmFsdWUpCiB7CiAgICAgaWYgKHZhbHVlID09IENTU1ZhbHVlQXV0byB8fCB2YWx1 ZSA9PSBDU1NWYWx1ZUF2b2lkKQogICAgICAgICByZXR1cm4gdmFsdWU7CkBAIC00MDEzLDcgKzQw NDIsMTUgQEAgc3RhdGljIGlubGluZSBDU1NQcm9wZXJ0eUlEIG1hcEZyb21MZWdhYwogICAgICAg ICByZXR1cm4gQ1NTUHJvcGVydHlCcmVha0FmdGVyOwogICAgIGlmIChwcm9wZXJ0eSA9PSBDU1NQ cm9wZXJ0eVBhZ2VCcmVha0JlZm9yZSB8fCBwcm9wZXJ0eSA9PSBDU1NQcm9wZXJ0eVdlYmtpdENv bHVtbkJyZWFrQmVmb3JlKQogICAgICAgICByZXR1cm4gQ1NTUHJvcGVydHlCcmVha0JlZm9yZTsK KyNpZiBFTkFCTEUoQ1NTX1JFR0lPTlMpCisgICAgaWYgKHByb3BlcnR5ID09IENTU1Byb3BlcnR5 V2Via2l0UmVnaW9uQnJlYWtBZnRlcikKKyAgICAgICAgcmV0dXJuIENTU1Byb3BlcnR5QnJlYWtB ZnRlcjsKKyAgICBpZiAocHJvcGVydHkgPT0gQ1NTUHJvcGVydHlXZWJraXRSZWdpb25CcmVha0Jl Zm9yZSkKKyAgICAgICAgcmV0dXJuIENTU1Byb3BlcnR5QnJlYWtCZWZvcmU7CisgICAgQVNTRVJU KHByb3BlcnR5ID09IENTU1Byb3BlcnR5UGFnZUJyZWFrSW5zaWRlIHx8IHByb3BlcnR5ID09IENT U1Byb3BlcnR5V2Via2l0Q29sdW1uQnJlYWtJbnNpZGUgfHwgcHJvcGVydHkgPT0gQ1NTUHJvcGVy dHlXZWJraXRSZWdpb25CcmVha0luc2lkZSk7CisjZWxzZQogICAgIEFTU0VSVChwcm9wZXJ0eSA9 PSBDU1NQcm9wZXJ0eVBhZ2VCcmVha0luc2lkZSB8fCBwcm9wZXJ0eSA9PSBDU1NQcm9wZXJ0eVdl YmtpdENvbHVtbkJyZWFrSW5zaWRlKTsKKyNlbmRpZgogICAgIHJldHVybiBDU1NQcm9wZXJ0eUJy ZWFrSW5zaWRlOwogfQogCkBAIC00MDM3LDkgKzQwNzQsMTYgQEAgYm9vbCBDU1NQcm9wZXJ0eVBh cnNlcjo6Y29uc3VtZUxlZ2FjeUJyZQogICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRDb2x1bW5C cmVha0JlZm9yZToKICAgICAgICAgdmFsdWUgPSBtYXBGcm9tQ29sdW1uQnJlYWtCZXR3ZWVuKHZh bHVlKTsKICAgICAgICAgYnJlYWs7CisjaWYgRU5BQkxFKENTU19SRUdJT05TKQorICAgIGNhc2Ug Q1NTUHJvcGVydHlXZWJraXRSZWdpb25CcmVha0FmdGVyOgorICAgIGNhc2UgQ1NTUHJvcGVydHlX ZWJraXRSZWdpb25CcmVha0JlZm9yZToKKyAgICAgICAgdmFsdWUgPSBtYXBGcm9tUmVnaW9uQnJl YWtCZXR3ZWVuKHZhbHVlKTsKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBDU1NQcm9wZXJ0eVdl YmtpdFJlZ2lvbkJyZWFrSW5zaWRlOgorI2VuZGlmCiAgICAgY2FzZSBDU1NQcm9wZXJ0eVBhZ2VC cmVha0luc2lkZToKICAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0Q29sdW1uQnJlYWtJbnNpZGU6 Ci0gICAgICAgIHZhbHVlID0gbWFwRnJvbUNvbHVtbk9yUGFnZUJyZWFrSW5zaWRlKHZhbHVlKTsK KyAgICAgICAgIHZhbHVlID0gbWFwRnJvbUNvbHVtblJlZ2lvbk9yUGFnZUJyZWFrSW5zaWRlKHZh bHVlKTsKICAgICAgICAgYnJlYWs7CiAgICAgZGVmYXVsdDoKICAgICAgICAgQVNTRVJUX05PVF9S RUFDSEVEKCk7Cg==