40602 2010-06-14 18:14:36 -0700 Use an array for extensions in MimeClassInfo 2010-06-14 18:43:45 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 andersca andersca abarth eric webkit.review.bot oldest_to_newest 238176 0 andersca 2010-06-14 18:14:36 -0700 Use an array for extensions in MimeClassInfo 238180 1 58737 andersca 2010-06-14 18:16:47 -0700 Created attachment 58737 Patch 238181 2 andersca 2010-06-14 18:17:11 -0700 Please don't review this yet, I'd like to run it through the EWS bots. 238184 3 58737 darin 2010-06-14 18:20:39 -0700 Comment on attachment 58737 Patch > + const Vector<String> &extensions = mimeClassInfo().extensions; The "&" here is in the wrong place. > + StringBuilder builder; > + for (size_t i = 0; i < extensions.size(); ++i) { > + if (i) > + builder.append(','); > + builder.append(extensions[i]); > + } > + return builder.toString(); Would Vector<UChar> do a better job? I never know which to use. > + NSArray *extensions = [plugin extensionsForMIMEType:MIME]; > + NSUInteger count = [extensions count]; > + for (NSUInteger i = 0; i < count; ++i) { > + NSString *extension = [extensions objectAtIndex:i]; > + mime.extensions.append(extension); > + } This is a lot like toStringVector in WebView.mm and WebEditorClient::getGuessesForWord in WebEditorClient.mm. I wish we had shared code to make NSArray of NSString into Vector<String> and vice versa. r=me 238187 4 andersca 2010-06-14 18:27:06 -0700 (In reply to comment #3) > (From update of attachment 58737 [details]) > > + const Vector<String> &extensions = mimeClassInfo().extensions; > > The "&" here is in the wrong place. > Fixed. > > Would Vector<UChar> do a better job? I never know which to use. I don't think it matters; this code is not performance sensitive. > This is a lot like toStringVector in WebView.mm and WebEditorClient::getGuessesForWord in WebEditorClient.mm. I wish we had shared code to make NSArray of NSString into Vector<String> and vice versa. I agree. However, in this case I think that it would be better to convert WebKit over to using WebCore types for its plug-in database. > > r=me Thanks! 238188 5 andersca 2010-06-14 18:30:40 -0700 Committed r61168: <http://trac.webkit.org/changeset/61168> 238191 6 webkit.review.bot 2010-06-14 18:43:45 -0700 http://trac.webkit.org/changeset/61168 might have broken Chromium Linux Release 58737 2010-06-14 18:16:47 -0700 2010-06-14 18:20:38 -0700 Patch bug-40602-20100614181646.patch text/plain 8577 andersca SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2MTE2NykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMzIgQEAKKzIwMTAtMDYtMTQgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFw cGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBVc2UgYW4gYXJyYXkgZm9yIGV4dGVuc2lvbnMgaW4gTWltZUNsYXNzSW5mbworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDA2MDIKKworICAgICAgICBH ZXQgcmlkIG9mIE1pbWVDbGFzc0luZm86OnN1ZmZpeGVzIGFuZCByZXBsYWNlIGl0IHdpdGggYW4g YXJyYXkgb2YgZXh0ZW5zaW9ucy4KKworICAgICAgICAqIHBsdWdpbnMvTWltZVR5cGUuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6TWltZVR5cGU6OnN1ZmZpeGVzKToKKyAgICAgICAgQ3JlYXRlIGEg c3RyaW5nIG9mIGpvaW5lZCBleHRlbnNpb25zLgorCisgICAgICAgICogcGx1Z2lucy9NaW1lVHlw ZS5oOgorICAgICAgICAqIHBsdWdpbnMvUGx1Z2luRGF0YS5oOgorICAgICAgICAoV2ViQ29yZTo6 b3BlcmF0b3I9PSk6CisgICAgICAgICogcGx1Z2lucy9jaHJvbWl1bS9QbHVnaW5EYXRhQ2hyb21p dW0uY3BwOgorICAgICAgICAoV2ViQ29yZTo6Z2V0UGx1Z2luTWltZVR5cGVGcm9tRXh0ZW5zaW9u KToKKyAgICAgICAgKiBwbHVnaW5zL2d0ay9QbHVnaW5EYXRhR3RrLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlBsdWdpbkRhdGE6OmluaXRQbHVnaW5zKToKKyAgICAgICAgKiBwbHVnaW5zL21hYy9Q bHVnaW5EYXRhTWFjLm1tOgorICAgICAgICAoV2ViQ29yZTo6UGx1Z2luRGF0YTo6aW5pdFBsdWdp bnMpOgorICAgICAgICAqIHBsdWdpbnMvcXQvUGx1Z2luRGF0YVF0LmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlBsdWdpbkRhdGE6OmluaXRQbHVnaW5zKToKKyAgICAgICAgKiBwbHVnaW5zL3dpbi9Q bHVnaW5EYXRhV2luLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlBsdWdpbkRhdGE6OmluaXRQbHVn aW5zKToKKyAgICAgICAgKiBwbHVnaW5zL3d4L1BsdWdpbkRhdGFXeC5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpQbHVnaW5EYXRhOjppbml0UGx1Z2lucyk6CisKIDIwMTAtMDYtMTQgIEFkYW0gQmFy dGggIDxhYmFydGhAd2Via2l0Lm9yZz4KIAogICAgICAgICBVbnJldmlld2VkLgpJbmRleDogV2Vi Q29yZS9wbHVnaW5zL01pbWVUeXBlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsdWdpbnMv TWltZVR5cGUuY3BwCShyZXZpc2lvbiA2MTE0OSkKKysrIFdlYkNvcmUvcGx1Z2lucy9NaW1lVHlw ZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI1LDYgKzI1LDcgQEAKICNpbmNsdWRlICJQbHVnaW4u aCIKICNpbmNsdWRlICJQbHVnaW5EYXRhLmgiCiAjaW5jbHVkZSAiU2V0dGluZ3MuaCIKKyNpbmNs dWRlICJTdHJpbmdCdWlsZGVyLmgiCiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIApAQCAtNDMsOSAr NDQsMTcgQEAgY29uc3QgU3RyaW5nICZNaW1lVHlwZTo6dHlwZSgpIGNvbnN0CiAgICAgcmV0dXJu IG1pbWVDbGFzc0luZm8oKS50eXBlOwogfQogCi1jb25zdCBTdHJpbmcgJk1pbWVUeXBlOjpzdWZm aXhlcygpIGNvbnN0CitTdHJpbmcgTWltZVR5cGU6OnN1ZmZpeGVzKCkgY29uc3QKIHsKLSAgICBy ZXR1cm4gbWltZUNsYXNzSW5mbygpLnN1ZmZpeGVzOworICAgIGNvbnN0IFZlY3RvcjxTdHJpbmc+ ICZleHRlbnNpb25zID0gbWltZUNsYXNzSW5mbygpLmV4dGVuc2lvbnM7CisKKyAgICBTdHJpbmdC dWlsZGVyIGJ1aWxkZXI7CisgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBleHRlbnNpb25zLnNp emUoKTsgKytpKSB7CisgICAgICAgIGlmIChpKQorICAgICAgICAgICAgYnVpbGRlci5hcHBlbmQo JywnKTsKKyAgICAgICAgYnVpbGRlci5hcHBlbmQoZXh0ZW5zaW9uc1tpXSk7CisgICAgfQorICAg IHJldHVybiBidWlsZGVyLnRvU3RyaW5nKCk7CiB9CiAKIGNvbnN0IFN0cmluZyAmTWltZVR5cGU6 OmRlc2NyaXB0aW9uKCkgY29uc3QKSW5kZXg6IFdlYkNvcmUvcGx1Z2lucy9NaW1lVHlwZS5oCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFdlYkNvcmUvcGx1Z2lucy9NaW1lVHlwZS5oCShyZXZpc2lvbiA2MTE0OSkK KysrIFdlYkNvcmUvcGx1Z2lucy9NaW1lVHlwZS5oCSh3b3JraW5nIGNvcHkpCkBAIC0zNyw3ICsz Nyw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgfk1pbWVUeXBlKCk7CiAKICAgICAg ICAgY29uc3QgU3RyaW5nICZ0eXBlKCkgY29uc3Q7Ci0gICAgICAgIGNvbnN0IFN0cmluZyAmc3Vm Zml4ZXMoKSBjb25zdDsKKyAgICAgICAgU3RyaW5nIHN1ZmZpeGVzKCkgY29uc3Q7CiAgICAgICAg IGNvbnN0IFN0cmluZyAmZGVzY3JpcHRpb24oKSBjb25zdDsKICAgICAgICAgUGFzc1JlZlB0cjxQ bHVnaW4+IGVuYWJsZWRQbHVnaW4oKSBjb25zdDsKIApJbmRleDogV2ViQ29yZS9wbHVnaW5zL1Bs dWdpbkRhdGEuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsdWdpbnMvUGx1Z2luRGF0YS5oCShy ZXZpc2lvbiA2MTE1MCkKKysrIFdlYkNvcmUvcGx1Z2lucy9QbHVnaW5EYXRhLmgJKHdvcmtpbmcg Y29weSkKQEAgLTMyLDEyICszMiwxMiBAQCBzdHJ1Y3QgUGx1Z2luSW5mbzsKIHN0cnVjdCBNaW1l Q2xhc3NJbmZvIHsKICAgICBTdHJpbmcgdHlwZTsKICAgICBTdHJpbmcgZGVzYzsKLSAgICBTdHJp bmcgc3VmZml4ZXM7CisgICAgVmVjdG9yPFN0cmluZz4gZXh0ZW5zaW9uczsKIH07CiAKIGlubGlu ZSBib29sIG9wZXJhdG9yPT0oY29uc3QgTWltZUNsYXNzSW5mbyYgYSwgY29uc3QgTWltZUNsYXNz SW5mbyYgYikKIHsKLSAgICByZXR1cm4gYS50eXBlID09IGIudHlwZSAmJiBhLmRlc2MgPT0gYi5k ZXNjICYmIGEuc3VmZml4ZXMgPT0gYi5zdWZmaXhlczsKKyAgICByZXR1cm4gYS50eXBlID09IGIu dHlwZSAmJiBhLmRlc2MgPT0gYi5kZXNjICYmIGEuZXh0ZW5zaW9ucyA9PSBiLmV4dGVuc2lvbnM7 CiB9CiAKIHN0cnVjdCBQbHVnaW5JbmZvIHsKSW5kZXg6IFdlYkNvcmUvcGx1Z2lucy9jaHJvbWl1 bS9QbHVnaW5EYXRhQ2hyb21pdW0uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGx1Z2lucy9j aHJvbWl1bS9QbHVnaW5EYXRhQ2hyb21pdW0uY3BwCShyZXZpc2lvbiA2MTE0OSkKKysrIFdlYkNv cmUvcGx1Z2lucy9jaHJvbWl1bS9QbHVnaW5EYXRhQ2hyb21pdW0uY3BwCSh3b3JraW5nIGNvcHkp CkBAIC04NCw4ICs4NCw3IEBAIFN0cmluZyBnZXRQbHVnaW5NaW1lVHlwZUZyb21FeHRlbnNpb24o Y28KICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IHBsdWdpbnMuc2l6ZSgpOyArK2kpIHsKICAg ICAgICAgZm9yIChzaXplX3QgaiA9IDA7IGogPCBwbHVnaW5zW2ldLm1pbWVzLnNpemUoKTsgKytq KSB7CiAgICAgICAgICAgICBjb25zdCBNaW1lQ2xhc3NJbmZvJiBtaW1lID0gcGx1Z2luc1tpXS5t aW1lc1tqXTsKLSAgICAgICAgICAgIFZlY3RvcjxTdHJpbmc+IGV4dGVuc2lvbnM7Ci0gICAgICAg ICAgICBtaW1lLnN1ZmZpeGVzLnNwbGl0KCIsIiwgZXh0ZW5zaW9ucyk7CisgICAgICAgICAgICBj b25zdCBWZWN0b3I8U3RyaW5nPiYgZXh0ZW5zaW9ucyA9IG1pbWUuZXh0ZW5zaW9uczsKICAgICAg ICAgICAgIGZvciAoc2l6ZV90IGsgPSAwOyBrIDwgZXh0ZW5zaW9ucy5zaXplKCk7ICsraykgewog ICAgICAgICAgICAgICAgIGlmIChleHRlbnNpb24gPT0gZXh0ZW5zaW9uc1trXSkKICAgICAgICAg ICAgICAgICAgICAgcmV0dXJuIG1pbWUudHlwZTsKSW5kZXg6IFdlYkNvcmUvcGx1Z2lucy9ndGsv UGx1Z2luRGF0YUd0ay5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbHVnaW5zL2d0ay9QbHVn aW5EYXRhR3RrLmNwcAkocmV2aXNpb24gNjExNTApCisrKyBXZWJDb3JlL3BsdWdpbnMvZ3RrL1Bs dWdpbkRhdGFHdGsuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00NywxNiArNDcsOCBAQCB2b2lkIFBs dWdpbkRhdGE6OmluaXRQbHVnaW5zKCkKIAogICAgICAgICAgICAgbWltZS50eXBlID0gaXQtPmZp cnN0OwogICAgICAgICAgICAgbWltZS5kZXNjID0gaXQtPnNlY29uZDsKKyAgICAgICAgICAgIG1p bWUuZXh0ZW5zaW9ucyA9IHBhY2thZ2UtPm1pbWVUb0V4dGVuc2lvbnMoKS5nZXQobWltZS50eXBl KTsKIAotICAgICAgICAgICAgVmVjdG9yPFN0cmluZz4gZXh0ZW5zaW9ucyA9IHBhY2thZ2UtPm1p bWVUb0V4dGVuc2lvbnMoKS5nZXQobWltZS50eXBlKTsKLQotICAgICAgICAgICAgZm9yICh1bnNp Z25lZCBpID0gMDsgaSA8IGV4dGVuc2lvbnMuc2l6ZSgpOyBpKyspIHsKLSAgICAgICAgICAgICAg ICBpZiAoaSA+IDApCi0gICAgICAgICAgICAgICAgICAgIG1pbWUuc3VmZml4ZXMgKz0gIiwiOwot Ci0gICAgICAgICAgICAgICAgbWltZS5zdWZmaXhlcyArPSBleHRlbnNpb25zW2ldOwotICAgICAg ICAgICAgfQotICAgICAgICAgICAgCiAgICAgICAgICAgICBpbmZvLm1pbWVzLmFwcGVuZChtaW1l KTsKICAgICAgICAgfQogCkluZGV4OiBXZWJDb3JlL3BsdWdpbnMvbWFjL1BsdWdpbkRhdGFNYWMu bW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbHVnaW5zL21hYy9QbHVnaW5EYXRhTWFjLm1tCShy ZXZpc2lvbiA2MTE1MCkKKysrIFdlYkNvcmUvcGx1Z2lucy9tYWMvUGx1Z2luRGF0YU1hYy5tbQko d29ya2luZyBjb3B5KQpAQCAtNTIsNyArNTIsMTQgQEAgdm9pZCBQbHVnaW5EYXRhOjppbml0UGx1 Z2lucygpCiAgICAgICAgICAgICBNaW1lQ2xhc3NJbmZvIG1pbWU7CiAKICAgICAgICAgICAgIG1p bWUudHlwZSA9IFN0cmluZyhNSU1FKS5sb3dlcigpOwotICAgICAgICAgICAgbWltZS5zdWZmaXhl cyA9IFtbcGx1Z2luIGV4dGVuc2lvbnNGb3JNSU1FVHlwZTpNSU1FXSBjb21wb25lbnRzSm9pbmVk QnlTdHJpbmc6QCIsIl07CisgICAgICAgICAgICAKKyAgICAgICAgICAgIE5TQXJyYXkgKmV4dGVu c2lvbnMgPSBbcGx1Z2luIGV4dGVuc2lvbnNGb3JNSU1FVHlwZTpNSU1FXTsKKyAgICAgICAgICAg IE5TVUludGVnZXIgY291bnQgPSBbZXh0ZW5zaW9ucyBjb3VudF07CisgICAgICAgICAgICBmb3Ig KE5TVUludGVnZXIgaSA9IDA7IGkgPCBjb3VudDsgKytpKSB7CisgICAgICAgICAgICAgICAgTlNT dHJpbmcgKmV4dGVuc2lvbiA9IFtleHRlbnNpb25zIG9iamVjdEF0SW5kZXg6aV07CisgICAgICAg ICAgICAgICAgbWltZS5leHRlbnNpb25zLmFwcGVuZChleHRlbnNpb24pOworICAgICAgICAgICAg fQorCiAgICAgICAgICAgICBtaW1lLmRlc2MgPSBbcGx1Z2luIGRlc2NyaXB0aW9uRm9yTUlNRVR5 cGU6TUlNRV07CiAgICAgICAgICAgICAKICAgICAgICAgICAgIHBsdWdpbkluZm8ubWltZXMuYXBw ZW5kKG1pbWUpOwpJbmRleDogV2ViQ29yZS9wbHVnaW5zL3F0L1BsdWdpbkRhdGFRdC5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gV2ViQ29yZS9wbHVnaW5zL3F0L1BsdWdpbkRhdGFRdC5jcHAJKHJldmlzaW9u IDYxMTUwKQorKysgV2ViQ29yZS9wbHVnaW5zL3F0L1BsdWdpbkRhdGFRdC5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTUyLDcgKzUyLDggQEAgdm9pZCBQbHVnaW5EYXRhOjppbml0UGx1Z2lucygpCiAg ICAgICAgICAgICAgICAgTWltZUNsYXNzSW5mbyBtaW1lSW5mbzsKICAgICAgICAgICAgICAgICBt aW1lSW5mby50eXBlID0gbWltZVR5cGUubmFtZTsKICAgICAgICAgICAgICAgICBtaW1lSW5mby5k ZXNjID0gbWltZVR5cGUuZGVzY3JpcHRpb247Ci0gICAgICAgICAgICAgICAgbWltZUluZm8uc3Vm Zml4ZXMgPSBtaW1lVHlwZS5maWxlRXh0ZW5zaW9ucy5qb2luKFFMYXRpbjFTdHJpbmcoIjsgIikp OworICAgICAgICAgICAgICAgIGZvciAoaW50IGsgPSAwOyBrIDwgbWltZVR5cGUuZmlsZUV4dGVu c2lvbnMuY291bnQoKTsgKytrKQorICAgICAgICAgICAgICAgICAgbWltZUluZm8uZXh0ZW5zaW9u cy5hcHBlbmQobWltZVR5cGUuZmlsZUV4dGVuc2lvbnMuYXQoaykpOwogCiAgICAgICAgICAgICAg ICAgaW5mby5taW1lcy5hcHBlbmQobWltZUluZm8pOwogICAgICAgICAgICAgfQpAQCAtNzksMTUg KzgwLDcgQEAgdm9pZCBQbHVnaW5EYXRhOjppbml0UGx1Z2lucygpCiAKICAgICAgICAgICAgIG1p bWUudHlwZSA9IGl0LT5maXJzdDsKICAgICAgICAgICAgIG1pbWUuZGVzYyA9IGl0LT5zZWNvbmQ7 Ci0KLSAgICAgICAgICAgIFZlY3RvcjxTdHJpbmc+IGV4dGVuc2lvbnMgPSBwYWNrYWdlLT5taW1l VG9FeHRlbnNpb25zKCkuZ2V0KG1pbWUudHlwZSk7Ci0KLSAgICAgICAgICAgIGZvciAodW5zaWdu ZWQgaSA9IDA7IGkgPCBleHRlbnNpb25zLnNpemUoKTsgaSsrKSB7Ci0gICAgICAgICAgICAgICAg aWYgKGkgPiAwKQotICAgICAgICAgICAgICAgICAgICBtaW1lLnN1ZmZpeGVzICs9ICIsIjsKLQot ICAgICAgICAgICAgICAgIG1pbWUuc3VmZml4ZXMgKz0gZXh0ZW5zaW9uc1tpXTsKLSAgICAgICAg ICAgIH0KKyAgICAgICAgICAgIG1pbWUuZXh0ZW5zaW9ucyA9IHBhY2thZ2UtPm1pbWVUb0V4dGVu c2lvbnMoKS5nZXQobWltZS50eXBlKTsKIAogICAgICAgICAgICAgaW5mby5taW1lcy5hcHBlbmQo bWltZSk7CiAgICAgICAgIH0KSW5kZXg6IFdlYkNvcmUvcGx1Z2lucy93aW4vUGx1Z2luRGF0YVdp bi5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbHVnaW5zL3dpbi9QbHVnaW5EYXRhV2luLmNw cAkocmV2aXNpb24gNjExNTApCisrKyBXZWJDb3JlL3BsdWdpbnMvd2luL1BsdWdpbkRhdGFXaW4u Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC00NiwxNSArNDYsNyBAQCB2b2lkIFBsdWdpbkRhdGE6Omlu aXRQbHVnaW5zKCkKIAogICAgICAgICAgICAgbWltZS50eXBlID0gaXQtPmZpcnN0OwogICAgICAg ICAgICAgbWltZS5kZXNjID0gaXQtPnNlY29uZDsKLQotICAgICAgICAgICAgVmVjdG9yPFN0cmlu Zz4gZXh0ZW5zaW9ucyA9IHBhY2thZ2UtPm1pbWVUb0V4dGVuc2lvbnMoKS5nZXQobWltZS50eXBl KTsKLQotICAgICAgICAgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IGV4dGVuc2lvbnMuc2l6 ZSgpOyBpKyspIHsKLSAgICAgICAgICAgICAgICBpZiAoaSA+IDApCi0gICAgICAgICAgICAgICAg ICAgIG1pbWUuc3VmZml4ZXMgKz0gIiwiOwotCi0gICAgICAgICAgICAgICAgbWltZS5zdWZmaXhl cyArPSBleHRlbnNpb25zW2ldOwotICAgICAgICAgICAgfQorICAgICAgICAgICAgbWltZS5leHRl bnNpb25zID0gcGFja2FnZS0+bWltZVRvRXh0ZW5zaW9ucygpLmdldChtaW1lLnR5cGUpOwogCiAg ICAgICAgICAgICBpbmZvLm1pbWVzLmFwcGVuZChtaW1lKTsKICAgICAgICAgfQpJbmRleDogV2Vi Q29yZS9wbHVnaW5zL3d4L1BsdWdpbkRhdGFXeC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9w bHVnaW5zL3d4L1BsdWdpbkRhdGFXeC5jcHAJKHJldmlzaW9uIDYxMTUwKQorKysgV2ViQ29yZS9w bHVnaW5zL3d4L1BsdWdpbkRhdGFXeC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTUzLDE2ICs1Myw4 IEBAIHZvaWQgUGx1Z2luRGF0YTo6aW5pdFBsdWdpbnMoKQogCiAgICAgICAgICAgICBtaW1lLnR5 cGUgPSBpdC0+Zmlyc3Q7CiAgICAgICAgICAgICBtaW1lLmRlc2MgPSBpdC0+c2Vjb25kOworICAg ICAgICAgICAgbWltZS5leHRlbnNpb25zID0gcGFja2FnZS0+bWltZVRvRXh0ZW5zaW9ucygpLmdl dChtaW1lLnR5cGUpOwogCi0gICAgICAgICAgICBWZWN0b3I8U3RyaW5nPiBleHRlbnNpb25zID0g cGFja2FnZS0+bWltZVRvRXh0ZW5zaW9ucygpLmdldChtaW1lLnR5cGUpOwotCi0gICAgICAgICAg ICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgZXh0ZW5zaW9ucy5zaXplKCk7IGkrKykgewotICAg ICAgICAgICAgICAgIGlmIChpID4gMCkKLSAgICAgICAgICAgICAgICAgICAgbWltZS5zdWZmaXhl cyArPSAiLCI7Ci0KLSAgICAgICAgICAgICAgICBtaW1lLnN1ZmZpeGVzICs9IGV4dGVuc2lvbnNb aV07Ci0gICAgICAgICAgICB9Ci0gICAgICAgICAgICAKICAgICAgICAgICAgIGluZm8ubWltZXMu YXBwZW5kKG1pbWUpOwogICAgICAgICB9CiAK