32072 2009-12-02 09:40:34 -0800 Clean up invalid @-rule error handling in CSS 2009-12-15 00:11:28 -0800 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 hyatt hyatt hamaji webkit.review.bot oldest_to_newest 168026 0 hyatt 2009-12-02 09:40:34 -0800 Lots of mistakes, mostly because of the grammar trying to enforce the ordering of namespace vs. import vs. normal rules. 168031 1 44158 hyatt 2009-12-02 09:42:46 -0800 Created attachment 44158 Patch 168032 2 webkit.review.bot 2009-12-02 09:43:26 -0800 style-queue ran check-webkit-style on attachment 44158 without any errors. 168035 3 44158 darin 2009-12-02 09:47:30 -0800 Comment on attachment 44158 Patch > + , m_allowImportRules(true) > + , m_allowVariablesRules(true) > + , m_allowNamespaceDeclarations(true) Normally I'd prefer not to name data members with verb phrases. That's why we end up with names like "shouldAllow". Not sure I have better suggestions here, though. > + m_allowImportRules = m_allowNamespaceDeclarations = m_allowVariablesRules = false; I'd prefer to see three conventional assignment statements instead of this one-liner. I'm not sure all the new error conditions are being logged for the inspector's benefit. The test case doesn't seem to cover everything you changed. Despite the minor concerns above, r=me 168095 4 hyatt 2009-12-02 11:27:47 -0800 Landed in r51608. 171741 5 hamaji 2009-12-15 00:11:28 -0800 It seems the background color of fast/css/variables/misplaced-import-test becomes red by this patch. Was this intentional? If so, we may need to fix the test. http://trac.webkit.org/changeset/51608#file6 44158 2009-12-02 09:42:46 -0800 2009-12-02 09:47:30 -0800 Patch patch.txt text/plain 11608 hyatt SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1MTYwMCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjggQEAKKzIwMDktMTItMDIgIERhdmUgSHlhdHQgIDxoeWF0dEBhcHBsZS5jb20+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMyMDcyLCBjbGVhbiB1cCBpbnZhbGlk IEAtcnVsZSBlcnJvciBoYW5kbGluZyBzbyB0aGF0IHdlCisgICAgICAgIHBhc3MgbW9yZSBDU1Mg dGVzdCBzdWl0ZSBzdHVmZi4gIE1ha2UgdGhlIGdyYW1tYXIgc3RvcCBlbmZvcmNpbmcgdGhlIG9y ZGVyaW5nIG9mIEBuYW1lc3BhY2UgdnMuCisgICAgICAgIEB2YXJpYWJsZXMgdnMuIEBpbXBvcnQu ICBKdXN0IGxldCB0aGUgcGFyc2VyIGhhbmRsZSB0aGF0IGluc3RlYWQuICBUaGlzIHNpbXBsaWZp ZXMgdGhlIGdyYW1tYXIgYW5kCisgICAgICAgIG1ha2VzIGVycm9yIGhhbmRsaW5nIGRlYWwgd2l0 aCBtb3JlIGNhc2VzIGNvcnJlY3RseS4KKworICAgICAgICBBZGRlZCBmYXN0L2Nzcy9uYW1lc3Bh Y2VzL25hbWVzcGFjZXMtaW52YWxpZC1hdC1ydWxlcy54bWwKKworICAgICAgICAqIGNzcy9DU1NH cmFtbWFyLnk6CisgICAgICAgICogY3NzL0NTU1BhcnNlci5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpDU1NQYXJzZXI6OkNTU1BhcnNlcik6CisgICAgICAgIChXZWJDb3JlOjpDU1NQYXJzZXI6OnBh cnNlUnVsZSk6CisgICAgICAgIChXZWJDb3JlOjpDU1NQYXJzZXI6OmNyZWF0ZUNoYXJzZXRSdWxl KToKKyAgICAgICAgKFdlYkNvcmU6OkNTU1BhcnNlcjo6Y3JlYXRlSW1wb3J0UnVsZSk6CisgICAg ICAgIChXZWJDb3JlOjpDU1NQYXJzZXI6OmNyZWF0ZU1lZGlhUnVsZSk6CisgICAgICAgIChXZWJD b3JlOjpDU1NQYXJzZXI6OmNyZWF0ZUtleWZyYW1lc1J1bGUpOgorICAgICAgICAoV2ViQ29yZTo6 Q1NTUGFyc2VyOjpjcmVhdGVTdHlsZVJ1bGUpOgorICAgICAgICAoV2ViQ29yZTo6Q1NTUGFyc2Vy OjpjcmVhdGVGb250RmFjZVJ1bGUpOgorICAgICAgICAoV2ViQ29yZTo6Q1NTUGFyc2VyOjphZGRO YW1lc3BhY2UpOgorICAgICAgICAoV2ViQ29yZTo6Q1NTUGFyc2VyOjpjcmVhdGVWYXJpYWJsZXNS dWxlKToKKyAgICAgICAgKiBjc3MvQ1NTUGFyc2VyLmg6CisKIDIwMDktMTItMDEgIERhdmUgSHlh dHQgIDxoeWF0dEBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFuIEJlcm5zdGVp bi4KSW5kZXg6IFdlYkNvcmUvY3NzL0NTU0dyYW1tYXIueQo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3Jl L2Nzcy9DU1NHcmFtbWFyLnkJKHJldmlzaW9uIDUxNTY2KQorKysgV2ViQ29yZS9jc3MvQ1NTR3Jh bW1hci55CSh3b3JraW5nIGNvcHkpCkBAIC05Nyw3ICs5Nyw3IEBAIHN0YXRpYyBpbnQgY3NzeXls ZXgoWVlTVFlQRSogeXlsdmFsLCB2b2kKIAogJX0KIAotJWV4cGVjdCA1MQorJWV4cGVjdCA0OAog CiAlbm9uYXNzb2MgTE9XRVNUX1BSRUMKIApAQCAtMTg0LDE4ICsxODQsMTUgQEAgc3RhdGljIGlu dCBjc3N5eWxleChZWVNUWVBFKiB5eWx2YWwsIHZvaQogCiAldHlwZSA8cnVsZT4gY2hhcnNldAog JXR5cGUgPHJ1bGU+IHJ1bGVzZXQKLSV0eXBlIDxydWxlPiB2YWxpZF9ydWxlX29yX2ltcG9ydAog JXR5cGUgPHJ1bGU+IG1lZGlhCiAldHlwZSA8cnVsZT4gaW1wb3J0CisldHlwZSA8cnVsZT4gbmFt ZXNwYWNlCiAldHlwZSA8cnVsZT4gcGFnZQogJXR5cGUgPHJ1bGU+IGZvbnRfZmFjZQogJXR5cGUg PHJ1bGU+IGtleWZyYW1lcwogJXR5cGUgPHJ1bGU+IGludmFsaWRfcnVsZQogJXR5cGUgPHJ1bGU+ IHNhdmVfYmxvY2sKICV0eXBlIDxydWxlPiBpbnZhbGlkX2F0Ci0ldHlwZSA8cnVsZT4gaW52YWxp ZF9hdF9saXN0Ci0ldHlwZSA8cnVsZT4gaW52YWxpZF9pbXBvcnQKLSV0eXBlIDxydWxlPiBpbnZh bGlkX21lZGlhCiAldHlwZSA8cnVsZT4gcnVsZQogJXR5cGUgPHJ1bGU+IHZhbGlkX3J1bGUKICV0 eXBlIDxydWxlTGlzdD4gYmxvY2tfcnVsZV9saXN0IApAQCAtMjY4LDcgKzI2NSw3IEBAIHN0YXRp YyBpbnQgY3NzeXlsZXgoWVlTVFlQRSogeXlsdmFsLCB2b2kKICUlCiAKIHN0eWxlc2hlZXQ6Ci0g ICAgbWF5YmVfc3BhY2UgbWF5YmVfY2hhcnNldCBtYXliZV9zZ21sIGltcG9ydF9saXN0IHZhcmlh Ymxlc19saXN0IG5hbWVzcGFjZV9saXN0IHJ1bGVfbGlzdAorICAgIG1heWJlX3NwYWNlIG1heWJl X2NoYXJzZXQgbWF5YmVfc2dtbCBydWxlX2xpc3QKICAgfCB3ZWJraXRfcnVsZSBtYXliZV9zcGFj ZQogICB8IHdlYmtpdF9kZWNscyBtYXliZV9zcGFjZQogICB8IHdlYmtpdF92YWx1ZSBtYXliZV9z cGFjZQpAQCAtMjc4LDEzICsyNzUsOCBAQCBzdHlsZXNoZWV0OgogICB8IHdlYmtpdF9rZXlmcmFt ZV9ydWxlIG1heWJlX3NwYWNlCiAgIDsKIAotdmFsaWRfcnVsZV9vcl9pbXBvcnQ6Ci0gICAgdmFs aWRfcnVsZQotICB8IGltcG9ydAotICA7Ci0KIHdlYmtpdF9ydWxlOgotICAgIFdFQktJVF9SVUxF X1NZTSAneycgbWF5YmVfc3BhY2UgdmFsaWRfcnVsZV9vcl9pbXBvcnQgbWF5YmVfc3BhY2UgJ30n IHsKKyAgICBXRUJLSVRfUlVMRV9TWU0gJ3snIG1heWJlX3NwYWNlIHZhbGlkX3J1bGUgbWF5YmVf c3BhY2UgJ30nIHsKICAgICAgICAgc3RhdGljX2Nhc3Q8Q1NTUGFyc2VyKj4ocGFyc2VyKS0+bV9y dWxlID0gJDQ7CiAgICAgfQogOwpAQCAtMzczLDMxICszNjUsNiBAQCBjaGFyc2V0OgogICB9CiA7 CiAKLWltcG9ydF9saXN0OgotIC8qIGVtcHR5ICovCi0gfCBpbXBvcnRfbGlzdCBpbXBvcnQgbWF5 YmVfc2dtbCB7Ci0gICAgIENTU1BhcnNlciogcCA9IHN0YXRpY19jYXN0PENTU1BhcnNlcio+KHBh cnNlcik7Ci0gICAgIGlmICgkMiAmJiBwLT5tX3N0eWxlU2hlZXQpCi0gICAgICAgICBwLT5tX3N0 eWxlU2hlZXQtPmFwcGVuZCgkMik7Ci0gfQotIHwgaW52YWxpZF9hdF9saXN0IHsKLSB9Ci0gOwot Ci12YXJpYWJsZXNfbGlzdDoKLS8qIGVtcHR5ICovCi18IHZhcmlhYmxlc19saXN0IHZhcmlhYmxl c19ydWxlIG1heWJlX3NnbWwgewotICAgIENTU1BhcnNlciogcCA9IHN0YXRpY19jYXN0PENTU1Bh cnNlcio+KHBhcnNlcik7Ci0gICAgIGlmICgkMiAmJiBwLT5tX3N0eWxlU2hlZXQpCi0gICAgICAg ICBwLT5tX3N0eWxlU2hlZXQtPmFwcGVuZCgkMik7Ci19Ci07Ci0KLW5hbWVzcGFjZV9saXN0Ogot LyogZW1wdHkgKi8KLXwgbmFtZXNwYWNlX2xpc3QgbmFtZXNwYWNlIG1heWJlX3NnbWwKLTsKLQog cnVsZV9saXN0OgogICAgLyogZW1wdHkgKi8KICB8IHJ1bGVfbGlzdCBydWxlIG1heWJlX3NnbWwg ewpAQCAtNDEzLDEzICszODAsMTUgQEAgdmFsaWRfcnVsZToKICAgfCBwYWdlCiAgIHwgZm9udF9m YWNlCiAgIHwga2V5ZnJhbWVzCisgIHwgbmFtZXNwYWNlCisgIHwgaW1wb3J0CisgIHwgdmFyaWFi bGVzX3J1bGUKICAgOwogCiBydWxlOgogICAgIHZhbGlkX3J1bGUKICAgfCBpbnZhbGlkX3J1bGUK ICAgfCBpbnZhbGlkX2F0Ci0gIHwgaW52YWxpZF9pbXBvcnQKICAgOwogCiBibG9ja19ydWxlX2xp c3Q6IApAQCAtNDQ1LDggKzQxNCwxMCBAQCBibG9ja19ydWxlOgogICAgIGJsb2NrX3ZhbGlkX3J1 bGUKICAgfCBpbnZhbGlkX3J1bGUKICAgfCBpbnZhbGlkX2F0Ci0gIHwgaW52YWxpZF9pbXBvcnQK LSAgfCBpbnZhbGlkX21lZGlhCisgIHwgbmFtZXNwYWNlCisgIHwgaW1wb3J0CisgIHwgdmFyaWFi bGVzX3J1bGUKKyAgfCBtZWRpYQogICA7CiAKIApAQCAtNTcwLDEyICs1NDEsMTggQEAgdmFyaWFi bGVfbmFtZToKIAogbmFtZXNwYWNlOgogTkFNRVNQQUNFX1NZTSBtYXliZV9zcGFjZSBtYXliZV9u c19wcmVmaXggc3RyaW5nX29yX3VyaSBtYXliZV9zcGFjZSAnOycgewotICAgIENTU1BhcnNlciog cCA9IHN0YXRpY19jYXN0PENTU1BhcnNlcio+KHBhcnNlcik7Ci0gICAgaWYgKHAtPm1fc3R5bGVT aGVldCkKLSAgICAgICAgcC0+bV9zdHlsZVNoZWV0LT5hZGROYW1lc3BhY2UocCwgJDMsICQ0KTsK KyAgICBzdGF0aWNfY2FzdDxDU1NQYXJzZXIqPihwYXJzZXIpLT5hZGROYW1lc3BhY2UoJDMsICQ0 KTsKKyAgICAkJCA9IDA7Cit9Cit8IE5BTUVTUEFDRV9TWU0gbWF5YmVfc3BhY2UgbWF5YmVfbnNf cHJlZml4IHN0cmluZ19vcl91cmkgbWF5YmVfc3BhY2UgaW52YWxpZF9ibG9jayB7CisgICAgJCQg PSAwOworfQorfCBOQU1FU1BBQ0VfU1lNIGVycm9yIGludmFsaWRfYmxvY2sgeworICAgICQkID0g MDsKK30KK3wgTkFNRVNQQUNFX1NZTSBlcnJvciAnOycgeworICAgICQkID0gMDsKIH0KLXwgTkFN RVNQQUNFX1NZTSBlcnJvciBpbnZhbGlkX2Jsb2NrCi18IE5BTUVTUEFDRV9TWU0gZXJyb3IgJzsn CiA7CiAKIG1heWJlX25zX3ByZWZpeDoKQEAgLTE0ODEsMjMgKzE0NTgsNiBAQCBpbnZhbGlkX2F0 OgogICAgIH0KICAgICA7CiAKLWludmFsaWRfYXRfbGlzdDoKLSAgICBpbnZhbGlkX2F0IG1heWJl X3NnbWwKLSAgfCBpbnZhbGlkX2F0X2xpc3QgaW52YWxpZF9hdCBtYXliZV9zZ21sCi0gIDsKLQot aW52YWxpZF9pbXBvcnQ6Ci0gICAgaW1wb3J0IHsKLSAgICAgICAgJCQgPSAwOwotICAgIH0KLSAg ICA7Ci0KLWludmFsaWRfbWVkaWE6Ci0gICAgbWVkaWEgewotICAgICAgICAkJCA9IDA7Ci0gICAg fQotICAgIDsKLQogaW52YWxpZF9ydWxlOgogICAgIGVycm9yIGludmFsaWRfYmxvY2sgewogICAg ICAgICAkJCA9IDA7CkluZGV4OiBXZWJDb3JlL2Nzcy9DU1NQYXJzZXIuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFdlYkNvcmUvY3NzL0NTU1BhcnNlci5jcHAJKHJldmlzaW9uIDUxNjAwKQorKysgV2ViQ29y ZS9jc3MvQ1NTUGFyc2VyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTQyLDYgKzE0Miw5IEBAIENT U1BhcnNlcjo6Q1NTUGFyc2VyKGJvb2wgc3RyaWN0UGFyc2luZykKICAgICAsIG1fZGVmYXVsdE5h bWVzcGFjZShzdGFyQXRvbSkKICAgICAsIG1fZGF0YSgwKQogICAgICwgeXlfc3RhcnQoMSkKKyAg ICAsIG1fYWxsb3dJbXBvcnRSdWxlcyh0cnVlKQorICAgICwgbV9hbGxvd1ZhcmlhYmxlc1J1bGVz KHRydWUpCisgICAgLCBtX2FsbG93TmFtZXNwYWNlRGVjbGFyYXRpb25zKHRydWUpCiAgICAgLCBt X2Zsb2F0aW5nTWVkaWFRdWVyeSgwKQogICAgICwgbV9mbG9hdGluZ01lZGlhUXVlcnlFeHAoMCkK ICAgICAsIG1fZmxvYXRpbmdNZWRpYVF1ZXJ5RXhwTGlzdCgwKQpAQCAtMjI5LDYgKzIzMiw3IEBA IHZvaWQgQ1NTUGFyc2VyOjpwYXJzZVNoZWV0KENTU1N0eWxlU2hlZXQKIFBhc3NSZWZQdHI8Q1NT UnVsZT4gQ1NTUGFyc2VyOjpwYXJzZVJ1bGUoQ1NTU3R5bGVTaGVldCogc2hlZXQsIGNvbnN0IFN0 cmluZyYgc3RyaW5nKQogewogICAgIG1fc3R5bGVTaGVldCA9IHNoZWV0OworICAgIG1fYWxsb3dO YW1lc3BhY2VEZWNsYXJhdGlvbnMgPSBmYWxzZTsKICAgICBzZXR1cFBhcnNlcigiQC13ZWJraXQt cnVsZXsiLCBzdHJpbmcsICJ9ICIpOwogICAgIGNzc3l5cGFyc2UodGhpcyk7CiAgICAgcmV0dXJu IG1fcnVsZS5yZWxlYXNlKCk7CkBAIC00OTY4LDYgKzQ5NzIsNyBAQCBDU1NSdWxlKiBDU1NQYXJz ZXI6OmNyZWF0ZUNoYXJzZXRSdWxlKGNvCiB7CiAgICAgaWYgKCFtX3N0eWxlU2hlZXQpCiAgICAg ICAgIHJldHVybiAwOworICAgIG1fYWxsb3dJbXBvcnRSdWxlcyA9IG1fYWxsb3dOYW1lc3BhY2VE ZWNsYXJhdGlvbnMgPSBtX2FsbG93VmFyaWFibGVzUnVsZXMgPSBmYWxzZTsKICAgICBSZWZQdHI8 Q1NTQ2hhcnNldFJ1bGU+IHJ1bGUgPSBDU1NDaGFyc2V0UnVsZTo6Y3JlYXRlKG1fc3R5bGVTaGVl dCwgY2hhcnNldCk7CiAgICAgQ1NTQ2hhcnNldFJ1bGUqIHJlc3VsdCA9IHJ1bGUuZ2V0KCk7CiAg ICAgbV9wYXJzZWRTdHlsZU9iamVjdHMuYXBwZW5kKHJ1bGUucmVsZWFzZSgpKTsKQEAgLTQ5NzYs NyArNDk4MSw3IEBAIENTU1J1bGUqIENTU1BhcnNlcjo6Y3JlYXRlQ2hhcnNldFJ1bGUoY28KIAog Q1NTUnVsZSogQ1NTUGFyc2VyOjpjcmVhdGVJbXBvcnRSdWxlKGNvbnN0IENTU1BhcnNlclN0cmlu ZyYgdXJsLCBNZWRpYUxpc3QqIG1lZGlhKQogewotICAgIGlmICghbWVkaWEgfHwgIW1fc3R5bGVT aGVldCkKKyAgICBpZiAoIW1lZGlhIHx8ICFtX3N0eWxlU2hlZXQgfHwgIW1fYWxsb3dJbXBvcnRS dWxlcykKICAgICAgICAgcmV0dXJuIDA7CiAgICAgUmVmUHRyPENTU0ltcG9ydFJ1bGU+IHJ1bGUg PSBDU1NJbXBvcnRSdWxlOjpjcmVhdGUobV9zdHlsZVNoZWV0LCB1cmwsIG1lZGlhKTsKICAgICBD U1NJbXBvcnRSdWxlKiByZXN1bHQgPSBydWxlLmdldCgpOwpAQCAtNDk4OCw2ICs0OTkzLDcgQEAg Q1NTUnVsZSogQ1NTUGFyc2VyOjpjcmVhdGVNZWRpYVJ1bGUoTWVkaQogewogICAgIGlmICghbWVk aWEgfHwgIXJ1bGVzIHx8ICFtX3N0eWxlU2hlZXQpCiAgICAgICAgIHJldHVybiAwOworICAgIG1f YWxsb3dJbXBvcnRSdWxlcyA9IG1fYWxsb3dOYW1lc3BhY2VEZWNsYXJhdGlvbnMgPSBtX2FsbG93 VmFyaWFibGVzUnVsZXMgPSBmYWxzZTsKICAgICBSZWZQdHI8Q1NTTWVkaWFSdWxlPiBydWxlID0g Q1NTTWVkaWFSdWxlOjpjcmVhdGUobV9zdHlsZVNoZWV0LCBtZWRpYSwgcnVsZXMpOwogICAgIENT U01lZGlhUnVsZSogcmVzdWx0ID0gcnVsZS5nZXQoKTsKICAgICBtX3BhcnNlZFN0eWxlT2JqZWN0 cy5hcHBlbmQocnVsZS5yZWxlYXNlKCkpOwpAQCAtNTAwNSw2ICs1MDExLDcgQEAgQ1NTUnVsZUxp c3QqIENTU1BhcnNlcjo6Y3JlYXRlUnVsZUxpc3QoKQogCiBXZWJLaXRDU1NLZXlmcmFtZXNSdWxl KiBDU1NQYXJzZXI6OmNyZWF0ZUtleWZyYW1lc1J1bGUoKQogeworICAgIG1fYWxsb3dJbXBvcnRS dWxlcyA9IG1fYWxsb3dOYW1lc3BhY2VEZWNsYXJhdGlvbnMgPSBtX2FsbG93VmFyaWFibGVzUnVs ZXMgPSBmYWxzZTsKICAgICBSZWZQdHI8V2ViS2l0Q1NTS2V5ZnJhbWVzUnVsZT4gcnVsZSA9IFdl YktpdENTU0tleWZyYW1lc1J1bGU6OmNyZWF0ZShtX3N0eWxlU2hlZXQpOwogICAgIFdlYktpdENT U0tleWZyYW1lc1J1bGUqIHJ1bGVQdHIgPSBydWxlLmdldCgpOwogICAgIG1fcGFyc2VkU3R5bGVP YmplY3RzLmFwcGVuZChydWxlLnJlbGVhc2UoKSk7CkBAIC01MDEzLDYgKzUwMjAsNyBAQCBXZWJL aXRDU1NLZXlmcmFtZXNSdWxlKiBDU1NQYXJzZXI6OmNyZWF0CiAKIENTU1J1bGUqIENTU1BhcnNl cjo6Y3JlYXRlU3R5bGVSdWxlKFZlY3RvcjxDU1NTZWxlY3Rvcio+KiBzZWxlY3RvcnMpCiB7Cisg ICAgbV9hbGxvd0ltcG9ydFJ1bGVzID0gbV9hbGxvd05hbWVzcGFjZURlY2xhcmF0aW9ucyA9IG1f YWxsb3dWYXJpYWJsZXNSdWxlcyA9IGZhbHNlOwogICAgIENTU1N0eWxlUnVsZSogcmVzdWx0ID0g MDsKICAgICBpZiAoc2VsZWN0b3JzKSB7CiAgICAgICAgIFJlZlB0cjxDU1NTdHlsZVJ1bGU+IHJ1 bGUgPSBDU1NTdHlsZVJ1bGU6OmNyZWF0ZShtX3N0eWxlU2hlZXQpOwpAQCAtNTAyOSw2ICs1MDM3 LDcgQEAgQ1NTUnVsZSogQ1NTUGFyc2VyOjpjcmVhdGVTdHlsZVJ1bGUoVmVjdAogCiBDU1NSdWxl KiBDU1NQYXJzZXI6OmNyZWF0ZUZvbnRGYWNlUnVsZSgpCiB7CisgICAgbV9hbGxvd0ltcG9ydFJ1 bGVzID0gbV9hbGxvd05hbWVzcGFjZURlY2xhcmF0aW9ucyA9IG1fYWxsb3dWYXJpYWJsZXNSdWxl cyA9IGZhbHNlOwogICAgIFJlZlB0cjxDU1NGb250RmFjZVJ1bGU+IHJ1bGUgPSBDU1NGb250RmFj ZVJ1bGU6OmNyZWF0ZShtX3N0eWxlU2hlZXQpOwogICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkg PCBtX251bVBhcnNlZFByb3BlcnRpZXM7ICsraSkgewogICAgICAgICBDU1NQcm9wZXJ0eSogcHJv cGVydHkgPSBtX3BhcnNlZFByb3BlcnRpZXNbaV07CkBAIC01MDQ2LDYgKzUwNTUsMTUgQEAgQ1NT UnVsZSogQ1NTUGFyc2VyOjpjcmVhdGVGb250RmFjZVJ1bGUoKQogICAgIHJldHVybiByZXN1bHQ7 CiB9CiAKK3ZvaWQgQ1NTUGFyc2VyOjphZGROYW1lc3BhY2UoY29uc3QgQXRvbWljU3RyaW5nJiBw cmVmaXgsIGNvbnN0IEF0b21pY1N0cmluZyYgdXJpKQoreworICAgIGlmICghbV9zdHlsZVNoZWV0 IHx8ICFtX2FsbG93TmFtZXNwYWNlRGVjbGFyYXRpb25zKQorICAgICAgICByZXR1cm47CisgICAg bV9hbGxvd0ltcG9ydFJ1bGVzID0gZmFsc2U7CisgICAgbV9hbGxvd1ZhcmlhYmxlc1J1bGVzID0g ZmFsc2U7CisgICAgbV9zdHlsZVNoZWV0LT5hZGROYW1lc3BhY2UodGhpcywgcHJlZml4LCB1cmkp OworfQorCiAjaWYgIUVOQUJMRShDU1NfVkFSSUFCTEVTKQogCiBDU1NSdWxlKiBDU1NQYXJzZXI6 OmNyZWF0ZVZhcmlhYmxlc1J1bGUoTWVkaWFMaXN0KiwgYm9vbCkKQEAgLTUwNjcsNiArNTA4NSw5 IEBAIGJvb2wgQ1NTUGFyc2VyOjphZGRWYXJpYWJsZURlY2xhcmF0aW9uQmwKIAogQ1NTUnVsZSog Q1NTUGFyc2VyOjpjcmVhdGVWYXJpYWJsZXNSdWxlKE1lZGlhTGlzdCogbWVkaWFMaXN0LCBib29s IHZhcmlhYmxlc0tleXdvcmQpCiB7CisgICAgaWYgKCFtX2FsbG93VmFyaWFibGVzUnVsZXMpCisg ICAgICAgIHJldHVybiAwOworICAgIG1fYWxsb3dJbXBvcnRSdWxlcyA9IGZhbHNlOwogICAgIFJl ZlB0cjxDU1NWYXJpYWJsZXNSdWxlPiBydWxlID0gQ1NTVmFyaWFibGVzUnVsZTo6Y3JlYXRlKG1f c3R5bGVTaGVldCwgbWVkaWFMaXN0LCB2YXJpYWJsZXNLZXl3b3JkKTsKICAgICBydWxlLT5zZXRE ZWNsYXJhdGlvbihDU1NWYXJpYWJsZXNEZWNsYXJhdGlvbjo6Y3JlYXRlKHJ1bGUuZ2V0KCksIG1f dmFyaWFibGVOYW1lcywgbV92YXJpYWJsZVZhbHVlcykpOwogICAgIGNsZWFyVmFyaWFibGVzKCk7 ICAgIApJbmRleDogV2ViQ29yZS9jc3MvQ1NTUGFyc2VyLmgKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29y ZS9jc3MvQ1NTUGFyc2VyLmgJKHJldmlzaW9uIDUxNjAwKQorKysgV2ViQ29yZS9jc3MvQ1NTUGFy c2VyLmgJKHdvcmtpbmcgY29weSkKQEAgLTE4NywxMyArMTg3LDE1IEBAIG5hbWVzcGFjZSBXZWJD b3JlIHsKICAgICAgICAgTWVkaWFRdWVyeSogY3JlYXRlRmxvYXRpbmdNZWRpYVF1ZXJ5KFZlY3Rv cjxNZWRpYVF1ZXJ5RXhwKj4qKTsKICAgICAgICAgTWVkaWFRdWVyeSogc2lua0Zsb2F0aW5nTWVk aWFRdWVyeShNZWRpYVF1ZXJ5Kik7CiAKKyAgICAgICAgdm9pZCBhZGROYW1lc3BhY2UoY29uc3Qg QXRvbWljU3RyaW5nJiBwcmVmaXgsIGNvbnN0IEF0b21pY1N0cmluZyYgdXJpKTsKKwogICAgICAg ICBib29sIGFkZFZhcmlhYmxlKGNvbnN0IENTU1BhcnNlclN0cmluZyYsIENTU1BhcnNlclZhbHVl TGlzdCopOwogICAgICAgICBib29sIGFkZFZhcmlhYmxlRGVjbGFyYXRpb25CbG9jayhjb25zdCBD U1NQYXJzZXJTdHJpbmcmKTsKICAgICAgICAgYm9vbCBjaGVja0ZvclZhcmlhYmxlcyhDU1NQYXJz ZXJWYWx1ZUxpc3QqKTsKICAgICAgICAgdm9pZCBhZGRVbnJlc29sdmVkUHJvcGVydHkoaW50IHBy b3BJZCwgYm9vbCBpbXBvcnRhbnQpOwogICAgICAgICAKICAgICAgICAgVmVjdG9yPENTU1NlbGVj dG9yKj4qIHJldXNhYmxlU2VsZWN0b3JWZWN0b3IoKSB7IHJldHVybiAmbV9yZXVzYWJsZVNlbGVj dG9yVmVjdG9yOyB9Ci0gICAgICAgIAorCiAgICAgICAgIGJvb2wgbV9zdHJpY3Q7CiAgICAgICAg IGJvb2wgbV9pbXBvcnRhbnQ7CiAgICAgICAgIGludCBtX2lkOwpAQCAtMjQ5LDYgKzI1MSwxMCBA QCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIGludCB5eVRvazsKICAgICAgICAgaW50IHl5 X3N0YXJ0OwogCisgICAgICAgIGJvb2wgbV9hbGxvd0ltcG9ydFJ1bGVzOworICAgICAgICBib29s IG1fYWxsb3dWYXJpYWJsZXNSdWxlczsKKyAgICAgICAgYm9vbCBtX2FsbG93TmFtZXNwYWNlRGVj bGFyYXRpb25zOworCiAgICAgICAgIFZlY3RvcjxSZWZQdHI8U3R5bGVCYXNlPiA+IG1fcGFyc2Vk U3R5bGVPYmplY3RzOwogICAgICAgICBWZWN0b3I8UmVmUHRyPENTU1J1bGVMaXN0PiA+IG1fcGFy c2VkUnVsZUxpc3RzOwogICAgICAgICBIYXNoU2V0PENTU1NlbGVjdG9yKj4gbV9mbG9hdGluZ1Nl bGVjdG9yczsKSW5kZXg6IExheW91dFRlc3RzL2Zhc3QvY3NzL25hbWVzcGFjZXMvbmFtZXNwYWNl cy1pbnZhbGlkLWF0LnhtbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9mYXN0L2Nzcy9uYW1l c3BhY2VzL25hbWVzcGFjZXMtaW52YWxpZC1hdC54bWwJKHJldmlzaW9uIDApCisrKyBMYXlvdXRU ZXN0cy9mYXN0L2Nzcy9uYW1lc3BhY2VzL25hbWVzcGFjZXMtaW52YWxpZC1hdC54bWwJKHJldmlz aW9uIDApCkBAIC0wLDAgKzEsMzMgQEAKKzxodG1sIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8x OTk5L3hodG1sIj4KKyA8aGVhZD4KKyAgPGxpbmsgcmVsPSJhdXRob3IiIHRpdGxlPSJBbm5lIHZh biBLZXN0ZXJlbiIgaHJlZj0iaHR0cDovL2FubmV2YW5rZXN0ZXJlbi5ubC8iLz4KKyAgPGxpbmsg cmVsPSJhdXRob3IiIHRpdGxlPSJPcGVyYSBTb2Z0d2FyZSBBU0EiIGhyZWY9Imh0dHA6Ly9vcGVy YS5jb20vIi8+CisgIDxsaW5rIHJlbD0iaGVscCIgaHJlZj0iaHR0cDovL3d3dy53My5vcmcvVFIv Y3NzMy1uYW1lc3BhY2UvI3N5bnRheCIvPgorICA8bWV0YSBuYW1lPSJmbGFncyIgY29udGVudD0i aW52YWxpZCIvPgorICA8dGl0bGU+Q1NTIE5hbWVzcGFjZXMgVGVzdCBTdWl0ZTogQG5hbWVzcGFj ZSBhbmQgaW52YWxpZCBhdC1ydWxlczwvdGl0bGU+CisgIDxzdHlsZT4KKyAgIHQsIHQyLCB0MyB7 IGJhY2tncm91bmQ6cmVkIH0KKyAgPC9zdHlsZT4KKyAgPHN0eWxlPgorICAgQGltcG9ydCB4IHt9 CisgICBAbmFtZXNwYWNlIHggInRlc3QiOworICAgeHx0IHsgYmFja2dyb3VuZDpsaW1lIH0KKyAg PC9zdHlsZT4KKyAgPHN0eWxlPgorICAgQG5hbWVzcGFjZSB4ICJ0ZXN0LXRvcCI7CisgICBmb29i YXIgdGhpcyBpcyBmdW5ueSB7IG5vdDpzdXJlIH0KKyAgIEBuYW1lc3BhY2UgZm9vIHt9CisgICBA bmFtZXNwYWNlIGZvbyBiYXIgYmF6OworICAgQG5hbWVzcGFjZSB7fQorICAgQG5hbWVzcGFjZSAi dGVzdCI7CisgICBAZm9vYmFyIHRoaXMgaXMgZnVubmllcjsKKyAgIHQyIHsgYmFja2dyb3VuZDps aW1lIH0KKyAgIHh8dDMgeyBiYWNrZ3JvdW5kOmxpbWUgfQorICAgPC9zdHlsZT4KKyA8L2hlYWQ+ CisgPGJvZHk+CisgIDxwPjx0IHhtbG5zPSJ0ZXN0Ij5UaGlzIHNlbnRlbmNlIHNob3VsZCBoYXZl IGEgZ3JlZW4gYmFja2dyb3VuZC48L3Q+PC9wPgorICA8cD48dDIgeG1sbnM9InRlc3QiPlRoaXMg c2VudGVuY2Ugc2hvdWxkIGhhdmUgYSBncmVlbiBiYWNrZ3JvdW5kLjwvdDI+PC9wPgorICA8cD48 dDMgeG1sbnM9InRlc3QtdG9wIj5UaGlzIHNlbnRlbmNlIHNob3VsZCBoYXZlIGEgZ3JlZW4gYmFj a2dyb3VuZC48L3QzPjwvcD4KKyA8L2JvZHk+Cis8L2h0bWw+Cg==