169214 2017-03-06 13:28:59 -0800 Refactor ContentExtensionParser 2017-03-06 14:57:03 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 achristensen achristensen oldest_to_newest 1283911 0 achristensen 2017-03-06 13:28:59 -0800 Refactor ContentExtensionParser 1283913 1 303548 achristensen 2017-03-06 13:29:54 -0800 Created attachment 303548 Patch 1283985 2 achristensen 2017-03-06 14:57:03 -0800 http://trac.webkit.org/r213470 303548 2017-03-06 13:29:54 -0800 2017-03-06 13:30:50 -0800 Patch bug-169214-20170306132958.patch text/plain 3387 achristensen SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIxMzQ2MykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBACisyMDE3LTAzLTA2ICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmVmYWN0b3Ig Q29udGVudEV4dGVuc2lvblBhcnNlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTY5MjE0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgTm8gY2hhbmdlIGluIGJlaGF2aW9yLCBhcyB2ZXJpZmllZCBieSBleGlz dGluZyBBUEkgdGVzdHMuCisgICAgICAgIFRoaXMgd2lsbCBtYWtlIGl0IGVhc2llciB0byB1c2Ug Z2V0U3RyaW5nTGlzdCBmb3Igb3RoZXIgdGhpbmdzIGluIGNvbWluZyBwYXRjaGVzLgorCisgICAg ICAgICogY29udGVudGV4dGVuc2lvbnMvQ29udGVudEV4dGVuc2lvblBhcnNlci5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpDb250ZW50RXh0ZW5zaW9uczo6Z2V0U3RyaW5nTGlzdCk6CisgICAgICAg IChXZWJDb3JlOjpDb250ZW50RXh0ZW5zaW9uczo6Z2V0RG9tYWluTGlzdCk6CisKIDIwMTctMDMt MDYgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBbaU9TXSBEaXNh YmxlIGF1dG9wbGF5IG9mIHNpbGVudCB2aWRlb3MgaW4gbG93IHBvd2VyIG1vZGUKSW5kZXg6IFNv dXJjZS9XZWJDb3JlL2NvbnRlbnRleHRlbnNpb25zL0NvbnRlbnRFeHRlbnNpb25QYXJzZXIuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2NvbnRlbnRleHRlbnNpb25zL0NvbnRlbnRF eHRlbnNpb25QYXJzZXIuY3BwCShyZXZpc2lvbiAyMTMzNzcpCisrKyBTb3VyY2UvV2ViQ29yZS9j b250ZW50ZXh0ZW5zaW9ucy9Db250ZW50RXh0ZW5zaW9uUGFyc2VyLmNwcAkod29ya2luZyBjb3B5 KQpAQCAtNTksMTMgKzU5LDEzIEBAIHN0YXRpYyBib29sIGNvbnRhaW5zT25seUFTQ0lJV2l0aE5v VXBwZXIKICAgICByZXR1cm4gdHJ1ZTsKIH0KICAgICAKLXN0YXRpYyBFeHBlY3RlZDxWZWN0b3I8 U3RyaW5nPiwgc3RkOjplcnJvcl9jb2RlPiBnZXREb21haW5MaXN0KEV4ZWNTdGF0ZSYgZXhlYywg Y29uc3QgSlNPYmplY3QqIGFycmF5T2JqZWN0KQorc3RhdGljIEV4cGVjdGVkPFZlY3RvcjxTdHJp bmc+LCBzdGQ6OmVycm9yX2NvZGU+IGdldFN0cmluZ0xpc3QoRXhlY1N0YXRlJiBleGVjLCBjb25z dCBKU09iamVjdCogYXJyYXlPYmplY3QsIENvbnRlbnRFeHRlbnNpb25FcnJvciBlcnJvcikKIHsK ICAgICBWTSYgdm0gPSBleGVjLnZtKCk7CiAgICAgYXV0byBzY29wZSA9IERFQ0xBUkVfVEhST1df U0NPUEUodm0pOwogCiAgICAgaWYgKCFhcnJheU9iamVjdCB8fCAhaXNKU0FycmF5KGFycmF5T2Jq ZWN0KSkKLSAgICAgICAgcmV0dXJuIG1ha2VVbmV4cGVjdGVkKENvbnRlbnRFeHRlbnNpb25FcnJv cjo6SlNPTkludmFsaWREb21haW5MaXN0KTsKKyAgICAgICAgcmV0dXJuIG1ha2VVbmV4cGVjdGVk KGVycm9yKTsKICAgICBjb25zdCBKU0FycmF5KiBhcnJheSA9IGpzQ2FzdDxjb25zdCBKU0FycmF5 Kj4oYXJyYXlPYmplY3QpOwogICAgIAogICAgIFZlY3RvcjxTdHJpbmc+IGRvbWFpbnM7CkBAIC03 MywxOSArNzMsMjkgQEAgc3RhdGljIEV4cGVjdGVkPFZlY3RvcjxTdHJpbmc+LCBzdGQ6OmVycgog ICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBsZW5ndGg7ICsraSkgewogICAgICAgICBjb25z dCBKU1ZhbHVlIHZhbHVlID0gYXJyYXktPmdldEluZGV4KCZleGVjLCBpKTsKICAgICAgICAgaWYg KHNjb3BlLmV4Y2VwdGlvbigpIHx8ICF2YWx1ZS5pc1N0cmluZygpKQotICAgICAgICAgICAgcmV0 dXJuIG1ha2VVbmV4cGVjdGVkKENvbnRlbnRFeHRlbnNpb25FcnJvcjo6SlNPTkludmFsaWREb21h aW5MaXN0KTsKKyAgICAgICAgICAgIHJldHVybiBtYWtlVW5leHBlY3RlZChlcnJvcik7CiAgICAg ICAgIAotICAgICAgICAvLyBEb21haW5zIHNob3VsZCBiZSBwdW55Y29kZSBlbmNvZGVkIGxvd2Vy IGNhc2UuCiAgICAgICAgIGNvbnN0IFN0cmluZyYgZG9tYWluID0gYXNTdHJpbmcodmFsdWUpLT52 YWx1ZSgmZXhlYyk7CiAgICAgICAgIGlmIChkb21haW4uaXNFbXB0eSgpKQotICAgICAgICAgICAg cmV0dXJuIG1ha2VVbmV4cGVjdGVkKENvbnRlbnRFeHRlbnNpb25FcnJvcjo6SlNPTkludmFsaWRE b21haW5MaXN0KTsKLSAgICAgICAgaWYgKCFjb250YWluc09ubHlBU0NJSVdpdGhOb1VwcGVyY2Fz ZShkb21haW4pKQotICAgICAgICAgICAgcmV0dXJuIG1ha2VVbmV4cGVjdGVkKENvbnRlbnRFeHRl bnNpb25FcnJvcjo6SlNPTkRvbWFpbk5vdExvd2VyQ2FzZUFTQ0lJKTsKKyAgICAgICAgICAgIHJl dHVybiBtYWtlVW5leHBlY3RlZChlcnJvcik7CiAgICAgICAgIGRvbWFpbnMuYXBwZW5kKGRvbWFp bik7CiAgICAgfQogICAgIHJldHVybiBXVEZNb3ZlKGRvbWFpbnMpOwogfQogCitzdGF0aWMgRXhw ZWN0ZWQ8VmVjdG9yPFN0cmluZz4sIHN0ZDo6ZXJyb3JfY29kZT4gZ2V0RG9tYWluTGlzdChFeGVj U3RhdGUmIGV4ZWMsIGNvbnN0IEpTT2JqZWN0KiBhcnJheU9iamVjdCkKK3sKKyAgICBhdXRvIHN0 cmluZ3MgPSBnZXRTdHJpbmdMaXN0KGV4ZWMsIGFycmF5T2JqZWN0LCBDb250ZW50RXh0ZW5zaW9u RXJyb3I6OkpTT05JbnZhbGlkRG9tYWluTGlzdCk7CisgICAgaWYgKCFzdHJpbmdzLmhhc1ZhbHVl KCkpCisgICAgICAgIHJldHVybiBzdHJpbmdzOworICAgIGZvciAoYXV0byYgZG9tYWluIDogc3Ry aW5ncy52YWx1ZSgpKSB7CisgICAgICAgIC8vIERvbWFpbnMgc2hvdWxkIGJlIHB1bnljb2RlIGVu Y29kZWQgbG93ZXIgY2FzZS4KKyAgICAgICAgaWYgKCFjb250YWluc09ubHlBU0NJSVdpdGhOb1Vw cGVyY2FzZShkb21haW4pKQorICAgICAgICAgICAgcmV0dXJuIG1ha2VVbmV4cGVjdGVkKENvbnRl bnRFeHRlbnNpb25FcnJvcjo6SlNPTkRvbWFpbk5vdExvd2VyQ2FzZUFTQ0lJKTsKKyAgICB9Cisg ICAgcmV0dXJuIHN0cmluZ3M7Cit9CisKIHN0YXRpYyBzdGQ6OmVycm9yX2NvZGUgZ2V0VHlwZUZs YWdzKEV4ZWNTdGF0ZSYgZXhlYywgY29uc3QgSlNWYWx1ZSYgdHlwZVZhbHVlLCBSZXNvdXJjZUZs YWdzJiBmbGFncywgdWludDE2X3QgKCpzdHJpbmdUb1R5cGUpKGNvbnN0IFN0cmluZyYpKQogewog ICAgIFZNJiB2bSA9IGV4ZWMudm0oKTsK