30441 2009-10-16 09:22:14 -0700 MimeTypeRegistryChromium is mis-casen 2009-10-16 10:47:22 -0700 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) Other All RESOLVED FIXED P2 Normal --- 1 abarth webkit-unassigned mrowe oldest_to_newest 155104 0 abarth 2009-10-16 09:22:14 -0700 Comment #3 From Mark Rowe (bdash) 2009-10-16 03:15:20 PDT (-) [reply] (From update of attachment 41276 [details]) > Index: WebCore/platform/chromium/MimeTypeRegistryChromium.cpp It’s sad that this file doesn’t match the case used in the name of the class and in the equivalent files used by other platforms. 155105 1 41289 abarth 2009-10-16 09:26:46 -0700 Created attachment 41289 Patch v1 155109 2 abarth 2009-10-16 09:41:57 -0700 Committed r49683: <http://trac.webkit.org/changeset/49683> 155126 3 abarth 2009-10-16 10:35:49 -0700 I botched the landing. 155130 4 41289 abarth 2009-10-16 10:41:31 -0700 Comment on attachment 41289 Patch v1 Clearing flags on attachment: 41289 Committed r49686: <http://trac.webkit.org/changeset/49686> 155131 5 abarth 2009-10-16 10:41:36 -0700 All reviewed patches have been landed. Closing bug. 155134 6 abarth 2009-10-16 10:47:22 -0700 Final (?) attempt here: http://trac.webkit.org/changeset/49687 41289 2009-10-16 09:26:46 -0700 2009-10-16 10:41:31 -0700 Patch v1 bug-30441-20091016092645.patch text/plain 14318 abarth PyAgICAgICBodWJidWIucGF0Y2gKPyAgICAgICB0dHQKPyAgICAgICBXZWJLaXQvd2luL1dlYlZp ZXcuY3BwLm9yaWcKPyAgICAgICBXZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlldy5tbS5vcmlnCj8g ICAgICAgV2ViQ29yZS9XZWJDb3JlLmd5cGkub3JpZwo/ICAgICAgIFdlYkNvcmUvR05VbWFrZWZp bGUuYW0ub3JpZwo/ICAgICAgIFdlYkNvcmUvcGFnZS9QYWdlLmNwcC5vcmlnCj8gICAgICAgV2Vi Q29yZS9XZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oub3JpZwpJbmRleDogV2ViQ29y ZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDQ5 NjgyKQorKysgV2ViQ29yZS9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxNiBA QAorMjAwOS0xMC0xNiAgQWRhbSBCYXJ0aCAgPGFiYXJ0aEB3ZWJraXQub3JnPgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1pbWVUeXBlUmVnaXN0cnlD aHJvbWl1bSBpcyBtaXMtY2FzZW4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTMwNDQxCisKKyAgICAgICAgQ2hhbmdlIHRoZSBjYXNlIG9mIE1pbWVUeXBl UmVnaXN0cnlDaHJvbWl1bSB0byBtYXRjaCBvdGhlciBwbGF0Zm9ybXMuCisKKyAgICAgICAgKiBX ZWJDb3JlLmd5cGk6CisgICAgICAgICogcGxhdGZvcm0vY2hyb21pdW0vTUlNRVR5cGVSZWdpc3Ry eUNocm9taXVtLmNwcDogQ29waWVkIGZyb20gV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9NaW1l VHlwZVJlZ2lzdHJ5Q2hyb21pdW0uY3BwLgorICAgICAgICAqIHBsYXRmb3JtL2Nocm9taXVtL01p bWVUeXBlUmVnaXN0cnlDaHJvbWl1bS5jcHA6IFJlbW92ZWQuCisKIDIwMDktMTAtMTYgIEFkYW0g QmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBNYXJrIFJv d2UuCkluZGV4OiBXZWJDb3JlL1dlYkNvcmUuZ3lwaQo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL1dl YkNvcmUuZ3lwaQkocmV2aXNpb24gNDk2ODIpCisrKyBXZWJDb3JlL1dlYkNvcmUuZ3lwaQkod29y a2luZyBjb3B5KQpAQCAtMTgzOSw3ICsxODM5LDcgQEAKICAgICAgICAgICAgICdwbGF0Zm9ybS9j aHJvbWl1bS9LZXlib2FyZENvZGVzV2luLmgnLAogICAgICAgICAgICAgJ3BsYXRmb3JtL2Nocm9t aXVtL0xhbmd1YWdlLmNwcCcsCiAgICAgICAgICAgICAncGxhdGZvcm0vY2hyb21pdW0vTGlua0hh c2hDaHJvbWl1bS5jcHAnLAotICAgICAgICAgICAgJ3BsYXRmb3JtL2Nocm9taXVtL01pbWVUeXBl UmVnaXN0cnlDaHJvbWl1bS5jcHAnLAorICAgICAgICAgICAgJ3BsYXRmb3JtL2Nocm9taXVtL01J TUVUeXBlUmVnaXN0cnlDaHJvbWl1bS5jcHAnLAogICAgICAgICAgICAgJ3BsYXRmb3JtL2Nocm9t aXVtL1Bhc3RlYm9hcmRDaHJvbWl1bS5jcHAnLAogICAgICAgICAgICAgJ3BsYXRmb3JtL2Nocm9t aXVtL1Bhc3RlYm9hcmRQcml2YXRlLmgnLAogICAgICAgICAgICAgJ3BsYXRmb3JtL2Nocm9taXVt L1BsYXRmb3JtQ3Vyc29yLmgnLApJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9NSU1F VHlwZVJlZ2lzdHJ5Q2hyb21pdW0uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0v Y2hyb21pdW0vTUlNRVR5cGVSZWdpc3RyeUNocm9taXVtLmNwcAkocmV2aXNpb24gNDk2ODIpCShm cm9tIFdlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vTWltZVR5cGVSZWdpc3RyeUNocm9taXVtLmNw cDo0OTY4MikKKysrIFdlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vTUlNRVR5cGVSZWdpc3RyeUNo cm9taXVtLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMCwwICsxLDE1MSBAQAorLyoKKyAqIENvcHly aWdodCAoYykgMjAwOCwgMjAwOSwgR29vZ2xlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAq IAorICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywg d2l0aCBvciB3aXRob3V0CisgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQg dGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMgYXJlCisgKiBtZXQ6CisgKiAKKyAqICAgICAq IFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29w eXJpZ2h0CisgKiBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93 aW5nIGRpc2NsYWltZXIuCisgKiAgICAgKiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0g bXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlCisgKiBjb3B5cmlnaHQgbm90aWNlLCB0aGlzIGxpc3Qg b2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyCisgKiBpbiB0aGUgZG9j dW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlCisgKiBk aXN0cmlidXRpb24uCisgKiAgICAgKiBOZWl0aGVyIHRoZSBuYW1lIG9mIEdvb2dsZSBJbmMuIG5v ciB0aGUgbmFtZXMgb2YgaXRzCisgKiBjb250cmlidXRvcnMgbWF5IGJlIHVzZWQgdG8gZW5kb3Jz ZSBvciBwcm9tb3RlIHByb2R1Y3RzIGRlcml2ZWQgZnJvbQorICogdGhpcyBzb2Z0d2FyZSB3aXRo b3V0IHNwZWNpZmljIHByaW9yIHdyaXR0ZW4gcGVybWlzc2lvbi4KKyAqIAorICogVEhJUyBTT0ZU V0FSRSBJUyBQUk9WSURFRCBCWSBUSEUgQ09QWVJJR0hUIEhPTERFUlMgQU5EIENPTlRSSUJVVE9S UworICogIkFTIElTIiBBTkQgQU5ZIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNM VURJTkcsIEJVVCBOT1QKKyAqIExJTUlURUQgVE8sIFRIRSBJTVBMSUVEIFdBUlJBTlRJRVMgT0Yg TUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZPUgorICogQSBQQVJUSUNVTEFSIFBVUlBPU0Ug QVJFIERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIFRIRSBDT1BZUklHSFQKKyAqIE9XTkVS IE9SIENPTlRSSUJVVE9SUyBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJ REVOVEFMLAorICogU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUiBDT05TRVFVRU5USUFMIERBTUFHRVMg KElOQ0xVRElORywgQlVUIE5PVAorICogTElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YgU1VCU1RJ VFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsCisgKiBEQVRBLCBPUiBQUk9GSVRT OyBPUiBCVVNJTkVTUyBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkKKyAq IFRIRU9SWSBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4gQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJ VFksIE9SIFRPUlQKKyAqIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJ TkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRQorICogT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJ RiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KKyAqLworCisjaW5j bHVkZSAiY29uZmlnLmgiCisjaW5jbHVkZSAiTUlNRVR5cGVSZWdpc3RyeS5oIgorCisjaW5jbHVk ZSAiQ2hyb21pdW1CcmlkZ2UuaCIKKyNpbmNsdWRlICJDU3RyaW5nLmgiCisjaW5jbHVkZSAiTWVk aWFQbGF5ZXIuaCIKKworLy8gTk9URTogVW5saWtlIG90aGVyIHBvcnRzLCB3ZSBkb24ndCB1c2Ug dGhlIHNoYXJlZCBpbXBsZW1lbnRhdGlvbiBiaXRzIGluCisvLyBNSU1FVHlwZVJlZ2lzdHJ5LmNw cC4gIEluc3RlYWQsIHdlIG5lZWQgdG8gcm91dGUgbW9zdCBmdW5jdGlvbnMgdmlhIHRoZQorLy8g Q2hyb21pdW1CcmlkZ2UgdG8gdGhlIGVtYmVkZGVyLgorCituYW1lc3BhY2UgV2ViQ29yZSB7CisK Ky8vIENoZWNrcyBpZiBhbnkgb2YgdGhlIHBsdWdpbnMgaGFuZGxlIHRoaXMgZXh0ZW5zaW9uLCBh bmQgaWYgc28gcmV0dXJucyB0aGUKKy8vIHBsdWdpbidzIG1pbWUgdHlwZSBmb3IgdGhpcyBleHRl bnNpb24uICBPdGhlcndpc2UgcmV0dXJucyBhbiBlbXB0eSBzdHJpbmcuCisvLyBTZWUgUGx1Z2lu c0Nocm9taXVtLmNwcCBmb3IgdGhlIGltcGxlbWVudGF0aW9uIG9mIHRoaXMgZnVuY3Rpb24uCitT dHJpbmcgZ2V0UGx1Z2luTWltZVR5cGVGcm9tRXh0ZW5zaW9uKGNvbnN0IFN0cmluZyYgZXh0ZW5z aW9uKTsKKworU3RyaW5nIE1JTUVUeXBlUmVnaXN0cnk6OmdldE1JTUVUeXBlRm9yRXh0ZW5zaW9u KGNvbnN0IFN0cmluZyAmZXh0KQoreworICAgIHJldHVybiBDaHJvbWl1bUJyaWRnZTo6bWltZVR5 cGVGb3JFeHRlbnNpb24oZXh0KTsKK30KKworLy8gUmV0dXJucyB0aGUgZmlsZSBleHRlbnNpb24g aWYgb25lIGlzIGZvdW5kLiAgRG9lcyBub3QgaW5jbHVkZSB0aGUgZG90IGluIHRoZQorLy8gZmls ZW5hbWUuICBFLmcuLCAnaHRtbCcuCitTdHJpbmcgTUlNRVR5cGVSZWdpc3RyeTo6Z2V0UHJlZmVy cmVkRXh0ZW5zaW9uRm9yTUlNRVR5cGUoY29uc3QgU3RyaW5nJiB0eXBlKQoreworICAgIC8vIFBy dW5lIG91dCBhbnkgcGFyYW1ldGVycyBpbiBjYXNlIHRoZXkgaGFwcGVuIHRvIGhhdmUgc251Y2sg aW4gdGhlcmUuLi4KKyAgICAvLyBGSVhNRTogSXMgdGhpcyByZWFsbHkgbmVjZXNzYXJ5Pz8KKyAg ICBTdHJpbmcgbWltZVR5cGUgPSB0eXBlLnN1YnN0cmluZygwLCBzdGF0aWNfY2FzdDx1bnNpZ25l ZD4odHlwZS5maW5kKCc7JykpKTsKKworICAgIFN0cmluZyBleHQgPSBDaHJvbWl1bUJyaWRnZTo6 cHJlZmVycmVkRXh0ZW5zaW9uRm9yTUlNRVR5cGUodHlwZSk7CisgICAgaWYgKCFleHQuaXNFbXB0 eSgpICYmIGV4dFswXSA9PSAnLicpCisgICAgICAgIGV4dCA9IGV4dC5zdWJzdHJpbmcoMSk7CisK KyAgICByZXR1cm4gZXh0OworfQorCitTdHJpbmcgTUlNRVR5cGVSZWdpc3RyeTo6Z2V0TUlNRVR5 cGVGb3JQYXRoKGNvbnN0IFN0cmluZyYgcGF0aCkKK3sKKyAgICBpbnQgcG9zID0gcGF0aC5yZXZl cnNlRmluZCgnLicpOworICAgIGlmIChwb3MgPCAwKQorICAgICAgICByZXR1cm4gImFwcGxpY2F0 aW9uL29jdGV0LXN0cmVhbSI7CisgICAgU3RyaW5nIGV4dGVuc2lvbiA9IHBhdGguc3Vic3RyaW5n KHBvcyArIDEpOworICAgIFN0cmluZyBtaW1lVHlwZSA9IGdldE1JTUVUeXBlRm9yRXh0ZW5zaW9u KGV4dGVuc2lvbik7CisgICAgaWYgKG1pbWVUeXBlLmlzRW1wdHkoKSkgeworICAgICAgICAvLyBJ ZiB0aGVyZSdzIG5vIG1pbWV0eXBlIHJlZ2lzdGVyZWQgZm9yIHRoZSBleHRlbnNpb24sIGNoZWNr IHRvIHNlZQorICAgICAgICAvLyBpZiBhIHBsdWdpbiBjYW4gaGFuZGxlIHRoZSBleHRlbnNpb24u CisgICAgICAgIG1pbWVUeXBlID0gZ2V0UGx1Z2luTWltZVR5cGVGcm9tRXh0ZW5zaW9uKGV4dGVu c2lvbik7CisgICAgfQorICAgIGlmIChtaW1lVHlwZS5pc0VtcHR5KCkpCisgICAgICAgIHJldHVy biAiYXBwbGljYXRpb24vb2N0ZXQtc3RyZWFtIjsKKyAgICByZXR1cm4gbWltZVR5cGU7Cit9CisK K2Jvb2wgTUlNRVR5cGVSZWdpc3RyeTo6aXNTdXBwb3J0ZWRJbWFnZU1JTUVUeXBlKGNvbnN0IFN0 cmluZyYgbWltZVR5cGUpCit7IAorICAgIHJldHVybiBDaHJvbWl1bUJyaWRnZTo6aXNTdXBwb3J0 ZWRJbWFnZU1JTUVUeXBlKG1pbWVUeXBlKTsKK30KKworYm9vbCBNSU1FVHlwZVJlZ2lzdHJ5Ojpp c1N1cHBvcnRlZEltYWdlUmVzb3VyY2VNSU1FVHlwZShjb25zdCBTdHJpbmcmIG1pbWVUeXBlKQor eyAKKyAgICByZXR1cm4gaXNTdXBwb3J0ZWRJbWFnZU1JTUVUeXBlKG1pbWVUeXBlKTsgCit9CisK K2Jvb2wgTUlNRVR5cGVSZWdpc3RyeTo6aXNTdXBwb3J0ZWRJbWFnZU1JTUVUeXBlRm9yRW5jb2Rp bmcoY29uc3QgU3RyaW5nJiBtaW1lVHlwZSkKK3sKKyAgICAvLyBGSVhNRTogRmlsbCB0aGlzIG91 dC4gU2VlOiBodHRwOi8vdHJhYy53ZWJraXQub3JnL2NoYW5nZXNldC8zMDg4OAorICAgIHJldHVy biBpc1N1cHBvcnRlZEltYWdlTUlNRVR5cGUobWltZVR5cGUpOworfQorCitib29sIE1JTUVUeXBl UmVnaXN0cnk6OmlzU3VwcG9ydGVkSmF2YVNjcmlwdE1JTUVUeXBlKGNvbnN0IFN0cmluZyYgbWlt ZVR5cGUpCit7CisgICAgcmV0dXJuIENocm9taXVtQnJpZGdlOjppc1N1cHBvcnRlZEphdmFTY3Jp cHRNSU1FVHlwZShtaW1lVHlwZSk7Cit9CisgICAgCitib29sIE1JTUVUeXBlUmVnaXN0cnk6Omlz U3VwcG9ydGVkTm9uSW1hZ2VNSU1FVHlwZShjb25zdCBTdHJpbmcmIG1pbWVUeXBlKQoreworICAg IHJldHVybiBDaHJvbWl1bUJyaWRnZTo6aXNTdXBwb3J0ZWROb25JbWFnZU1JTUVUeXBlKG1pbWVU eXBlKTsKK30KKworYm9vbCBNSU1FVHlwZVJlZ2lzdHJ5Ojppc1N1cHBvcnRlZE1lZGlhTUlNRVR5 cGUoY29uc3QgU3RyaW5nJiBtaW1lVHlwZSkKK3sKKyAgICBIYXNoU2V0PFN0cmluZz4gc3VwcG9y dGVkTWVkaWFNSU1FVHlwZXM7CisjaWYgRU5BQkxFKFZJREVPKQorICAgIE1lZGlhUGxheWVyOjpn ZXRTdXBwb3J0ZWRUeXBlcyhzdXBwb3J0ZWRNZWRpYU1JTUVUeXBlcyk7CisjZW5kaWYKKyAgICBy ZXR1cm4gIW1pbWVUeXBlLmlzRW1wdHkoKSAmJiBzdXBwb3J0ZWRNZWRpYU1JTUVUeXBlcy5jb250 YWlucyhtaW1lVHlwZSk7Cit9CisKK2Jvb2wgTUlNRVR5cGVSZWdpc3RyeTo6aXNKYXZhQXBwbGV0 TUlNRVR5cGUoY29uc3QgU3RyaW5nJiBtaW1lVHlwZSkKK3sKKyAgICAvLyBTaW5jZSB0aGlzIHNl dCBpcyB2ZXJ5IGxpbWl0ZWQgYW5kIGlzIGxpa2VseSB0byByZW1haW4gc28gd2Ugd29uJ3QgYm90 aGVyIHdpdGggdGhlIG92ZXJoZWFkCisgICAgLy8gb2YgdXNpbmcgYSBoYXNoIHNldC4KKyAgICAv LyBBbnkgb2YgdGhlIE1JTUUgdHlwZXMgYmVsb3cgbWF5IGJlIGZvbGxvd2VkIGJ5IGFueSBudW1i ZXIgb2Ygc3BlY2lmaWMgdmVyc2lvbnMgb2YgdGhlIEpWTSwKKyAgICAvLyB3aGljaCBpcyB3aHkg d2UgdXNlIHN0YXJ0c1dpdGgoKQorICAgIHJldHVybiBtaW1lVHlwZS5zdGFydHNXaXRoKCJhcHBs aWNhdGlvbi94LWphdmEtYXBwbGV0IiwgZmFsc2UpIAorICAgICAgICB8fCBtaW1lVHlwZS5zdGFy dHNXaXRoKCJhcHBsaWNhdGlvbi94LWphdmEtYmVhbiIsIGZhbHNlKSAKKyAgICAgICAgfHwgbWlt ZVR5cGUuc3RhcnRzV2l0aCgiYXBwbGljYXRpb24veC1qYXZhLXZtIiwgZmFsc2UpOworfQorCitT dHJpbmcgTUlNRVR5cGVSZWdpc3RyeTo6Z2V0TWVkaWFNSU1FVHlwZUZvckV4dGVuc2lvbihjb25z dCBTdHJpbmcmKQoreworICAgIHJldHVybiBTdHJpbmcoKTsKK30KKworc3RhdGljIEhhc2hTZXQ8 U3RyaW5nPiYgZHVtbXlIYXNoU2V0KCkKK3sKKyAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKyAg ICBzdGF0aWMgSGFzaFNldDxTdHJpbmc+IGR1bW15OworICAgIHJldHVybiBkdW1teTsKK30KKwor Ly8gTk9URTogdGhlIGZvbGxvd2luZyBtZXRob2RzIHNob3VsZCBuZXZlciBiZSByZWFjaGVkCitI YXNoU2V0PFN0cmluZz4mIE1JTUVUeXBlUmVnaXN0cnk6OmdldFN1cHBvcnRlZEltYWdlTUlNRVR5 cGVzKCkgeyByZXR1cm4gZHVtbXlIYXNoU2V0KCk7IH0KK0hhc2hTZXQ8U3RyaW5nPiYgTUlNRVR5 cGVSZWdpc3RyeTo6Z2V0U3VwcG9ydGVkSW1hZ2VSZXNvdXJjZU1JTUVUeXBlcygpIHsgcmV0dXJu IGR1bW15SGFzaFNldCgpOyB9CitIYXNoU2V0PFN0cmluZz4mIE1JTUVUeXBlUmVnaXN0cnk6Omdl dFN1cHBvcnRlZEltYWdlTUlNRVR5cGVzRm9yRW5jb2RpbmcoKSB7IHJldHVybiBkdW1teUhhc2hT ZXQoKTsgfQorSGFzaFNldDxTdHJpbmc+JiBNSU1FVHlwZVJlZ2lzdHJ5OjpnZXRTdXBwb3J0ZWRO b25JbWFnZU1JTUVUeXBlcygpIHsgcmV0dXJuIGR1bW15SGFzaFNldCgpOyB9CitIYXNoU2V0PFN0 cmluZz4mIE1JTUVUeXBlUmVnaXN0cnk6OmdldFN1cHBvcnRlZE1lZGlhTUlNRVR5cGVzKCkgeyBy ZXR1cm4gZHVtbXlIYXNoU2V0KCk7IH0KKworfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpJbmRleDog V2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9NaW1lVHlwZVJlZ2lzdHJ5Q2hyb21pdW0uY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vTWltZVR5cGVSZWdpc3RyeUNo cm9taXVtLmNwcAkocmV2aXNpb24gNDk2ODIpCisrKyBXZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVt L01pbWVUeXBlUmVnaXN0cnlDaHJvbWl1bS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEsMTUxICsw LDAgQEAKLS8qCi0gKiBDb3B5cmlnaHQgKGMpIDIwMDgsIDIwMDksIEdvb2dsZSBJbmMuIEFsbCBy aWdodHMgcmVzZXJ2ZWQuCi0gKiAKLSAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNl IGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAotICogbW9kaWZpY2F0aW9uLCBhcmUg cGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zIGFyZQotICog bWV0OgotICogCi0gKiAgICAgKiBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCBy ZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAotICogbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0 aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgotICogICAgICogUmVkaXN0cmlidXRp b25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZQotICogY29weXJpZ2h0 IG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xh aW1lcgotICogaW4gdGhlIGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92 aWRlZCB3aXRoIHRoZQotICogZGlzdHJpYnV0aW9uLgotICogICAgICogTmVpdGhlciB0aGUgbmFt ZSBvZiBHb29nbGUgSW5jLiBub3IgdGhlIG5hbWVzIG9mIGl0cwotICogY29udHJpYnV0b3JzIG1h eSBiZSB1c2VkIHRvIGVuZG9yc2Ugb3IgcHJvbW90ZSBwcm9kdWN0cyBkZXJpdmVkIGZyb20KLSAq IHRoaXMgc29mdHdhcmUgd2l0aG91dCBzcGVjaWZpYyBwcmlvciB3cml0dGVuIHBlcm1pc3Npb24u Ci0gKiAKLSAqIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgVEhFIENPUFlSSUdIVCBIT0xE RVJTIEFORCBDT05UUklCVVRPUlMKLSAqICJBUyBJUyIgQU5EIEFOWSBFWFBSRVNTIE9SIElNUExJ RUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9UCi0gKiBMSU1JVEVEIFRPLCBUSEUgSU1Q TElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1IKLSAqIEEg UEFSVElDVUxBUiBQVVJQT1NFIEFSRSBESVNDTEFJTUVELiBJTiBOTyBFVkVOVCBTSEFMTCBUSEUg Q09QWVJJR0hUCi0gKiBPV05FUiBPUiBDT05UUklCVVRPUlMgQkUgTElBQkxFIEZPUiBBTlkgRElS RUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwKLSAqIFNQRUNJQUwsIEVYRU1QTEFSWSwgT1IgQ09O U0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1QKLSAqIExJTUlURUQgVE8sIFBS T0NVUkVNRU5UIE9GIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7IExPU1MgT0YgVVNFLAot ICogREFUQSwgT1IgUFJPRklUUzsgT1IgQlVTSU5FU1MgSU5URVJSVVBUSU9OKSBIT1dFVkVSIENB VVNFRCBBTkQgT04gQU5ZCi0gKiBUSEVPUlkgT0YgTElBQklMSVRZLCBXSEVUSEVSIElOIENPTlRS QUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUCi0gKiAoSU5DTFVESU5HIE5FR0xJR0VOQ0Ug T1IgT1RIRVJXSVNFKSBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UKLSAqIE9GIFRI SVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBE QU1BR0UuCi0gKi8KLQotI2luY2x1ZGUgImNvbmZpZy5oIgotI2luY2x1ZGUgIk1JTUVUeXBlUmVn aXN0cnkuaCIKLQotI2luY2x1ZGUgIkNocm9taXVtQnJpZGdlLmgiCi0jaW5jbHVkZSAiQ1N0cmlu Zy5oIgotI2luY2x1ZGUgIk1lZGlhUGxheWVyLmgiCi0KLS8vIE5PVEU6IFVubGlrZSBvdGhlciBw b3J0cywgd2UgZG9uJ3QgdXNlIHRoZSBzaGFyZWQgaW1wbGVtZW50YXRpb24gYml0cyBpbgotLy8g TUlNRVR5cGVSZWdpc3RyeS5jcHAuICBJbnN0ZWFkLCB3ZSBuZWVkIHRvIHJvdXRlIG1vc3QgZnVu Y3Rpb25zIHZpYSB0aGUKLS8vIENocm9taXVtQnJpZGdlIHRvIHRoZSBlbWJlZGRlci4KLQotbmFt ZXNwYWNlIFdlYkNvcmUgewotCi0vLyBDaGVja3MgaWYgYW55IG9mIHRoZSBwbHVnaW5zIGhhbmRs ZSB0aGlzIGV4dGVuc2lvbiwgYW5kIGlmIHNvIHJldHVybnMgdGhlCi0vLyBwbHVnaW4ncyBtaW1l IHR5cGUgZm9yIHRoaXMgZXh0ZW5zaW9uLiAgT3RoZXJ3aXNlIHJldHVybnMgYW4gZW1wdHkgc3Ry aW5nLgotLy8gU2VlIFBsdWdpbnNDaHJvbWl1bS5jcHAgZm9yIHRoZSBpbXBsZW1lbnRhdGlvbiBv ZiB0aGlzIGZ1bmN0aW9uLgotU3RyaW5nIGdldFBsdWdpbk1pbWVUeXBlRnJvbUV4dGVuc2lvbihj b25zdCBTdHJpbmcmIGV4dGVuc2lvbik7Ci0KLVN0cmluZyBNSU1FVHlwZVJlZ2lzdHJ5OjpnZXRN SU1FVHlwZUZvckV4dGVuc2lvbihjb25zdCBTdHJpbmcgJmV4dCkKLXsKLSAgICByZXR1cm4gQ2hy b21pdW1CcmlkZ2U6Om1pbWVUeXBlRm9yRXh0ZW5zaW9uKGV4dCk7Ci19Ci0KLS8vIFJldHVybnMg dGhlIGZpbGUgZXh0ZW5zaW9uIGlmIG9uZSBpcyBmb3VuZC4gIERvZXMgbm90IGluY2x1ZGUgdGhl IGRvdCBpbiB0aGUKLS8vIGZpbGVuYW1lLiAgRS5nLiwgJ2h0bWwnLgotU3RyaW5nIE1JTUVUeXBl UmVnaXN0cnk6OmdldFByZWZlcnJlZEV4dGVuc2lvbkZvck1JTUVUeXBlKGNvbnN0IFN0cmluZyYg dHlwZSkKLXsKLSAgICAvLyBQcnVuZSBvdXQgYW55IHBhcmFtZXRlcnMgaW4gY2FzZSB0aGV5IGhh cHBlbiB0byBoYXZlIHNudWNrIGluIHRoZXJlLi4uCi0gICAgLy8gRklYTUU6IElzIHRoaXMgcmVh bGx5IG5lY2Vzc2FyeT8/Ci0gICAgU3RyaW5nIG1pbWVUeXBlID0gdHlwZS5zdWJzdHJpbmcoMCwg c3RhdGljX2Nhc3Q8dW5zaWduZWQ+KHR5cGUuZmluZCgnOycpKSk7Ci0KLSAgICBTdHJpbmcgZXh0 ID0gQ2hyb21pdW1CcmlkZ2U6OnByZWZlcnJlZEV4dGVuc2lvbkZvck1JTUVUeXBlKHR5cGUpOwot ICAgIGlmICghZXh0LmlzRW1wdHkoKSAmJiBleHRbMF0gPT0gJy4nKQotICAgICAgICBleHQgPSBl eHQuc3Vic3RyaW5nKDEpOwotCi0gICAgcmV0dXJuIGV4dDsKLX0KLQotU3RyaW5nIE1JTUVUeXBl UmVnaXN0cnk6OmdldE1JTUVUeXBlRm9yUGF0aChjb25zdCBTdHJpbmcmIHBhdGgpCi17Ci0gICAg aW50IHBvcyA9IHBhdGgucmV2ZXJzZUZpbmQoJy4nKTsKLSAgICBpZiAocG9zIDwgMCkKLSAgICAg ICAgcmV0dXJuICJhcHBsaWNhdGlvbi9vY3RldC1zdHJlYW0iOwotICAgIFN0cmluZyBleHRlbnNp b24gPSBwYXRoLnN1YnN0cmluZyhwb3MgKyAxKTsKLSAgICBTdHJpbmcgbWltZVR5cGUgPSBnZXRN SU1FVHlwZUZvckV4dGVuc2lvbihleHRlbnNpb24pOwotICAgIGlmIChtaW1lVHlwZS5pc0VtcHR5 KCkpIHsKLSAgICAgICAgLy8gSWYgdGhlcmUncyBubyBtaW1ldHlwZSByZWdpc3RlcmVkIGZvciB0 aGUgZXh0ZW5zaW9uLCBjaGVjayB0byBzZWUKLSAgICAgICAgLy8gaWYgYSBwbHVnaW4gY2FuIGhh bmRsZSB0aGUgZXh0ZW5zaW9uLgotICAgICAgICBtaW1lVHlwZSA9IGdldFBsdWdpbk1pbWVUeXBl RnJvbUV4dGVuc2lvbihleHRlbnNpb24pOwotICAgIH0KLSAgICBpZiAobWltZVR5cGUuaXNFbXB0 eSgpKQotICAgICAgICByZXR1cm4gImFwcGxpY2F0aW9uL29jdGV0LXN0cmVhbSI7Ci0gICAgcmV0 dXJuIG1pbWVUeXBlOwotfQotCi1ib29sIE1JTUVUeXBlUmVnaXN0cnk6OmlzU3VwcG9ydGVkSW1h Z2VNSU1FVHlwZShjb25zdCBTdHJpbmcmIG1pbWVUeXBlKQoteyAKLSAgICByZXR1cm4gQ2hyb21p dW1CcmlkZ2U6OmlzU3VwcG9ydGVkSW1hZ2VNSU1FVHlwZShtaW1lVHlwZSk7Ci19Ci0KLWJvb2wg TUlNRVR5cGVSZWdpc3RyeTo6aXNTdXBwb3J0ZWRJbWFnZVJlc291cmNlTUlNRVR5cGUoY29uc3Qg U3RyaW5nJiBtaW1lVHlwZSkKLXsgCi0gICAgcmV0dXJuIGlzU3VwcG9ydGVkSW1hZ2VNSU1FVHlw ZShtaW1lVHlwZSk7IAotfQotCi1ib29sIE1JTUVUeXBlUmVnaXN0cnk6OmlzU3VwcG9ydGVkSW1h Z2VNSU1FVHlwZUZvckVuY29kaW5nKGNvbnN0IFN0cmluZyYgbWltZVR5cGUpCi17Ci0gICAgLy8g RklYTUU6IEZpbGwgdGhpcyBvdXQuIFNlZTogaHR0cDovL3RyYWMud2Via2l0Lm9yZy9jaGFuZ2Vz ZXQvMzA4ODgKLSAgICByZXR1cm4gaXNTdXBwb3J0ZWRJbWFnZU1JTUVUeXBlKG1pbWVUeXBlKTsK LX0KLQotYm9vbCBNSU1FVHlwZVJlZ2lzdHJ5Ojppc1N1cHBvcnRlZEphdmFTY3JpcHRNSU1FVHlw ZShjb25zdCBTdHJpbmcmIG1pbWVUeXBlKQotewotICAgIHJldHVybiBDaHJvbWl1bUJyaWRnZTo6 aXNTdXBwb3J0ZWRKYXZhU2NyaXB0TUlNRVR5cGUobWltZVR5cGUpOwotfQotICAgIAotYm9vbCBN SU1FVHlwZVJlZ2lzdHJ5Ojppc1N1cHBvcnRlZE5vbkltYWdlTUlNRVR5cGUoY29uc3QgU3RyaW5n JiBtaW1lVHlwZSkKLXsKLSAgICByZXR1cm4gQ2hyb21pdW1CcmlkZ2U6OmlzU3VwcG9ydGVkTm9u SW1hZ2VNSU1FVHlwZShtaW1lVHlwZSk7Ci19Ci0KLWJvb2wgTUlNRVR5cGVSZWdpc3RyeTo6aXNT dXBwb3J0ZWRNZWRpYU1JTUVUeXBlKGNvbnN0IFN0cmluZyYgbWltZVR5cGUpCi17Ci0gICAgSGFz aFNldDxTdHJpbmc+IHN1cHBvcnRlZE1lZGlhTUlNRVR5cGVzOwotI2lmIEVOQUJMRShWSURFTykK LSAgICBNZWRpYVBsYXllcjo6Z2V0U3VwcG9ydGVkVHlwZXMoc3VwcG9ydGVkTWVkaWFNSU1FVHlw ZXMpOwotI2VuZGlmCi0gICAgcmV0dXJuICFtaW1lVHlwZS5pc0VtcHR5KCkgJiYgc3VwcG9ydGVk TWVkaWFNSU1FVHlwZXMuY29udGFpbnMobWltZVR5cGUpOwotfQotCi1ib29sIE1JTUVUeXBlUmVn aXN0cnk6OmlzSmF2YUFwcGxldE1JTUVUeXBlKGNvbnN0IFN0cmluZyYgbWltZVR5cGUpCi17Ci0g ICAgLy8gU2luY2UgdGhpcyBzZXQgaXMgdmVyeSBsaW1pdGVkIGFuZCBpcyBsaWtlbHkgdG8gcmVt YWluIHNvIHdlIHdvbid0IGJvdGhlciB3aXRoIHRoZSBvdmVyaGVhZAotICAgIC8vIG9mIHVzaW5n IGEgaGFzaCBzZXQuCi0gICAgLy8gQW55IG9mIHRoZSBNSU1FIHR5cGVzIGJlbG93IG1heSBiZSBm b2xsb3dlZCBieSBhbnkgbnVtYmVyIG9mIHNwZWNpZmljIHZlcnNpb25zIG9mIHRoZSBKVk0sCi0g ICAgLy8gd2hpY2ggaXMgd2h5IHdlIHVzZSBzdGFydHNXaXRoKCkKLSAgICByZXR1cm4gbWltZVR5 cGUuc3RhcnRzV2l0aCgiYXBwbGljYXRpb24veC1qYXZhLWFwcGxldCIsIGZhbHNlKSAKLSAgICAg ICAgfHwgbWltZVR5cGUuc3RhcnRzV2l0aCgiYXBwbGljYXRpb24veC1qYXZhLWJlYW4iLCBmYWxz ZSkgCi0gICAgICAgIHx8IG1pbWVUeXBlLnN0YXJ0c1dpdGgoImFwcGxpY2F0aW9uL3gtamF2YS12 bSIsIGZhbHNlKTsKLX0KLQotU3RyaW5nIE1JTUVUeXBlUmVnaXN0cnk6OmdldE1lZGlhTUlNRVR5 cGVGb3JFeHRlbnNpb24oY29uc3QgU3RyaW5nJikKLXsKLSAgICByZXR1cm4gU3RyaW5nKCk7Ci19 Ci0KLXN0YXRpYyBIYXNoU2V0PFN0cmluZz4mIGR1bW15SGFzaFNldCgpCi17Ci0gICAgQVNTRVJU X05PVF9SRUFDSEVEKCk7Ci0gICAgc3RhdGljIEhhc2hTZXQ8U3RyaW5nPiBkdW1teTsKLSAgICBy ZXR1cm4gZHVtbXk7Ci19Ci0KLS8vIE5PVEU6IHRoZSBmb2xsb3dpbmcgbWV0aG9kcyBzaG91bGQg bmV2ZXIgYmUgcmVhY2hlZAotSGFzaFNldDxTdHJpbmc+JiBNSU1FVHlwZVJlZ2lzdHJ5OjpnZXRT dXBwb3J0ZWRJbWFnZU1JTUVUeXBlcygpIHsgcmV0dXJuIGR1bW15SGFzaFNldCgpOyB9Ci1IYXNo U2V0PFN0cmluZz4mIE1JTUVUeXBlUmVnaXN0cnk6OmdldFN1cHBvcnRlZEltYWdlUmVzb3VyY2VN SU1FVHlwZXMoKSB7IHJldHVybiBkdW1teUhhc2hTZXQoKTsgfQotSGFzaFNldDxTdHJpbmc+JiBN SU1FVHlwZVJlZ2lzdHJ5OjpnZXRTdXBwb3J0ZWRJbWFnZU1JTUVUeXBlc0ZvckVuY29kaW5nKCkg eyByZXR1cm4gZHVtbXlIYXNoU2V0KCk7IH0KLUhhc2hTZXQ8U3RyaW5nPiYgTUlNRVR5cGVSZWdp c3RyeTo6Z2V0U3VwcG9ydGVkTm9uSW1hZ2VNSU1FVHlwZXMoKSB7IHJldHVybiBkdW1teUhhc2hT ZXQoKTsgfQotSGFzaFNldDxTdHJpbmc+JiBNSU1FVHlwZVJlZ2lzdHJ5OjpnZXRTdXBwb3J0ZWRN ZWRpYU1JTUVUeXBlcygpIHsgcmV0dXJuIGR1bW15SGFzaFNldCgpOyB9Ci0KLX0gLy8gbmFtZXNw YWNlIFdlYkNvcmU=