28975 2009-09-04 09:50:43 -0700 [ChromiumMac] Can't upload images to imgur.com when "Hide Extension" set 2009-09-05 02:13:42 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED P2 Normal --- 1 thakis webkit-unassigned eric levin viettrungluu oldest_to_newest 144839 0 thakis 2009-09-04 09:50:43 -0700 Can't upload images with "Hide Extension" set to imgur.com on chromium/mac 144842 1 39072 thakis 2009-09-04 09:57:06 -0700 Created attachment 39072 Patch. 144843 2 thakis 2009-09-04 09:57:36 -0700 Slightly more detailed bug report at http://crbug.com/20857 . 144945 3 39072 levin 2009-09-04 15:57:24 -0700 Comment on attachment 39072 Patch. Just some minor nits... Please fix and then I can go through this one more time. > Index: WebCore/platform/chromium/FileChooserChromium.cpp > =================================================================== > +#if PLATFORM(DARWIN) > + // See crbug.com/20857. > + string = pathGetPresentationalName(m_filenames[0]); > +#else > string = pathGetFileName(m_filenames[0]); > +#endif Add braces around this since there is more than one physical line here. > Index: WebCore/platform/chromium/FileSystemChromiumMac.mm > =================================================================== > + // This has to return a real, existing filename with extension, see > + // crbug.com/20857. > + return [path lastPathComponent]; Use a 4 space indent throughout. > +String pathGetPresentationalName(const String& path) > +{ > + return [[NSFileManager defaultManager] displayNameAtPath:path]; Use a 4 space indent throughout. 144947 4 viettrungluu 2009-09-04 16:01:50 -0700 IANAWKR, but some comments anyway: > Index: WebCore/platform/chromium/FileChooserChromium.cpp > +#if PLATFORM(DARWIN) > +String pathGetPresentationalName(const String& path); > +#endif I don't think having an explicit prototype to something in another file is a good idea; if it's that specific to this file, maybe the entire function belongs in this file? However, see also my comments below. Nit: I would prefer |pathGetDisplayFileName()|. (Why? I want the "File" in there to indicate that it's just a display form of the file name, not the entire path; "Display" is shorter and maybe also more standard than "Presentational".) > +#if PLATFORM(DARWIN) > + // See crbug.com/20857. > + string = pathGetPresentationalName(m_filenames[0]); > +#else > string = pathGetFileName(m_filenames[0]); > +#endif I don't like this #ifdef; I'd rather see |pathGetPresentationalName()| just do the same thing as |pathGetFileName()| on other platforms (again, see below). > Index: WebCore/platform/chromium/FileSystemChromiumMac.mm > String pathGetFileName(const String& path) [...] > +String pathGetPresentationalName(const String& path) [...] This is fine in itself, but |pathGetFileName| has prototype in WebCore/platform/FileSystem.h, so |pathGetPresentationalName()| (or whatever it ends up being called) should logically be there too. I wouldn't be opposed to that, even with an |#if (PLATFORM(CHROMIUM) && PLATFORM(DARWIN) [prototype ...] #else [inline definition which makes pathGetPresentationName() equivalent to pathGetFileName ...] #endif|. I can see that others may be opposed to this, though. Just my opinion -- as I said, IANAWKR. 144949 5 39096 thakis 2009-09-04 16:23:48 -0700 Created attachment 39096 Address review comments. 144950 6 39097 thakis 2009-09-04 16:35:43 -0700 Created attachment 39097 Adress trungl's comments as well. This addresses trungl's comments as well. I think his remarks make sense, but if you like the previous version better, feel free to go with that. 144976 7 39097 levin 2009-09-04 18:38:50 -0700 Comment on attachment 39097 Adress trungl's comments as well. A few last minor things.... if you find someone to fix this up and commit great. (I may even do so later, but you could also submit a new patch with it fixed and then I should r+ and cq+ that.) > Index: WebCore/platform/FileSystem.h > =================================================================== > +#if PLATFORM(CHROMIUM) > +String pathGetDisplayFileName(const String& path); > +#endif Please put this with all of the other if PLATFORM api's at the bottom of the header. > Index: WebCore/platform/chromium/FileChooserChromium.cpp > + else if (m_filenames.size() == 1) { > + // See crbug.com/20857. Let's omit this comment (and then the braces). (It is pretty atypical for WebKit.) Anyone who wants to know why this line looks this way can look in revision history and see your change log and the associated bug. > Index: WebCore/platform/chromium/FileSystemChromiumMac.mm > @@ -38,6 +38,13 @@ namespace WebCore { > > String pathGetFileName(const String& path) > { > + // This has to return a real, existing filename with extension, see > + // crbug.com/20857. This doesn't need the bug reference as it can be found from the revision history. > + return [path lastPathComponent]; > +} 144983 8 39109 thakis 2009-09-04 21:44:42 -0700 Created attachment 39109 Address more review comments. 144997 9 39109 eric 2009-09-05 02:13:38 -0700 Comment on attachment 39109 Address more review comments. Clearing flags on attachment: 39109 Committed r48095: <http://trac.webkit.org/changeset/48095> 144998 10 eric 2009-09-05 02:13:42 -0700 All reviewed patches have been landed. Closing bug. 39072 2009-09-04 09:57:06 -0700 2009-09-04 16:23:48 -0700 Patch. webkit_fileext.patch text/plain 2778 thakis SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0ODA1NikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjIgQEAKKzIwMDktMDktMDQgIE5pY29sYXMgV2ViZXIgIDx0aGFraXNAY2hyb21p dW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yODk3NQorICAgICAgICBG aXggZmlsZSB1cGxvYWQgb24gY2hyb21lL21hYy4gSW1hZ2VzIHRoYXQgaGF2ZSAiSGlkZSBFeHRl bnNpb24iIHNldCwKKyAgICAgICAgc3VjaCBhcyBzY3JlZW5zaG90cyBieSBkZWZhdWx0LCBjYW4g bm93IGJlIHVwbG9hZGVkIHRvIHNpdGVzIHN1Y2ggYXMKKyAgICAgICAgaW1ndXIuY29tLgorCisg ICAgICAgICogcGxhdGZvcm0vY2hyb21pdW0vRmlsZUNob29zZXJDaHJvbWl1bS5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpGaWxlQ2hvb3Nlcjo6YmFzZW5hbWVGb3JXaWR0aCk6CisgICAgICAgIENh bGwgcGF0aEdldFByZXNlbnRhdGlvbmFsTmFtZSgpIG9uIE9TIFguCisgICAgICAgICogcGxhdGZv cm0vY2hyb21pdW0vRmlsZVN5c3RlbUNocm9taXVtTWFjLm1tOgorICAgICAgICAoV2ViQ29yZTo6 cGF0aEdldEZpbGVOYW1lKToKKyAgICAgICAgTm93IHJldHVybnMgYSByZWFsIGZpbGVuYW1lIGlu c3RlYWQgb2YgYSBwcmVzZW50YXRpb25hbCBvbmUsIHdoaWNoCisgICAgICAgIGZpeGVzIHRoZSBw cm9ibGVtIGFkZHJlc3NlZCBieSB0aGlzIGNoYW5nZS4KKyAgICAgICAgKFdlYkNvcmU6OnBhdGhH ZXRQcmVzZW50YXRpb25hbE5hbWUpOgorICAgICAgICBOZXcgZnVuY3Rpb24gdGhhdCByZXR1cm5z IGEgcHJlc2VudGF0aW9uYWwgZmlsZW5hbWUuCisKIDIwMDktMDktMDQgIEFsZXhleSBQcm9za3Vy eWFrb3YgIDxhcEBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRXJpYyBTZWlkZWwu CkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL0ZpbGVDaG9vc2VyQ2hyb21pdW0uY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vRmlsZUNob29zZXJDaHJv bWl1bS5jcHAJKHJldmlzaW9uIDQ2ODgwKQorKysgV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9G aWxlQ2hvb3NlckNocm9taXVtLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzMsNiArMzMsMTAgQEAK IAogbmFtZXNwYWNlIFdlYkNvcmUgewogCisjaWYgUExBVEZPUk0oREFSV0lOKQorU3RyaW5nIHBh dGhHZXRQcmVzZW50YXRpb25hbE5hbWUoY29uc3QgU3RyaW5nJiBwYXRoKTsKKyNlbmRpZgorCiBT dHJpbmcgRmlsZUNob29zZXI6OmJhc2VuYW1lRm9yV2lkdGgoY29uc3QgRm9udCYgZm9udCwgaW50 IHdpZHRoKSBjb25zdAogewogICAgIGlmICh3aWR0aCA8PSAwKQpAQCAtNDIsNyArNDYsMTIgQEAg U3RyaW5nIEZpbGVDaG9vc2VyOjpiYXNlbmFtZUZvcldpZHRoKGNvbgogICAgIGlmIChtX2ZpbGVu YW1lcy5pc0VtcHR5KCkpCiAgICAgICAgIHN0cmluZyA9IGZpbGVCdXR0b25Ob0ZpbGVTZWxlY3Rl ZExhYmVsKCk7CiAgICAgZWxzZSBpZiAobV9maWxlbmFtZXMuc2l6ZSgpID09IDEpCisjaWYgUExB VEZPUk0oREFSV0lOKQorICAgICAgICAvLyBTZWUgY3JidWcuY29tLzIwODU3LgorICAgICAgICBz dHJpbmcgPSBwYXRoR2V0UHJlc2VudGF0aW9uYWxOYW1lKG1fZmlsZW5hbWVzWzBdKTsKKyNlbHNl CiAgICAgICAgIHN0cmluZyA9IHBhdGhHZXRGaWxlTmFtZShtX2ZpbGVuYW1lc1swXSk7CisjZW5k aWYKICAgICBlbHNlCiAgICAgICAgIHJldHVybiBTdHJpbmdUcnVuY2F0b3I6OnJpZ2h0VHJ1bmNh dGUobXVsdGlwbGVGaWxlVXBsb2FkVGV4dChtX2ZpbGVuYW1lcy5zaXplKCkpLCB3aWR0aCwgZm9u dCwgZmFsc2UpOwogCkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL0ZpbGVTeXN0ZW1D aHJvbWl1bU1hYy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL0Zp bGVTeXN0ZW1DaHJvbWl1bU1hYy5tbQkocmV2aXNpb24gNDY4ODApCisrKyBXZWJDb3JlL3BsYXRm b3JtL2Nocm9taXVtL0ZpbGVTeXN0ZW1DaHJvbWl1bU1hYy5tbQkod29ya2luZyBjb3B5KQpAQCAt MzgsNyArMzgsMTQgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiBTdHJpbmcgcGF0aEdldEZpbGVO YW1lKGNvbnN0IFN0cmluZyYgcGF0aCkKIHsKLSAgICByZXR1cm4gW1tOU0ZpbGVNYW5hZ2VyIGRl ZmF1bHRNYW5hZ2VyXSBkaXNwbGF5TmFtZUF0UGF0aDpwYXRoXTsKKyAgLy8gVGhpcyBoYXMgdG8g cmV0dXJuIGEgcmVhbCwgZXhpc3RpbmcgZmlsZW5hbWUgd2l0aCBleHRlbnNpb24sIHNlZQorICAv LyBjcmJ1Zy5jb20vMjA4NTcuCisgIHJldHVybiBbcGF0aCBsYXN0UGF0aENvbXBvbmVudF07Cit9 CisKK1N0cmluZyBwYXRoR2V0UHJlc2VudGF0aW9uYWxOYW1lKGNvbnN0IFN0cmluZyYgcGF0aCkK K3sKKyAgcmV0dXJuIFtbTlNGaWxlTWFuYWdlciBkZWZhdWx0TWFuYWdlcl0gZGlzcGxheU5hbWVB dFBhdGg6cGF0aF07CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUK 39096 2009-09-04 16:23:48 -0700 2009-09-04 18:20:58 -0700 Address review comments. webkit_fileext.patch text/plain 2859 thakis SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0ODA1NikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjIgQEAKKzIwMDktMDktMDQgIE5pY29sYXMgV2ViZXIgIDx0aGFraXNAY2hyb21p dW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yODk3NQorICAgICAgICBG aXggZmlsZSB1cGxvYWQgb24gY2hyb21lL21hYy4gSW1hZ2VzIHRoYXQgaGF2ZSAiSGlkZSBFeHRl bnNpb24iIHNldCwKKyAgICAgICAgc3VjaCBhcyBzY3JlZW5zaG90cyBieSBkZWZhdWx0LCBjYW4g bm93IGJlIHVwbG9hZGVkIHRvIHNpdGVzIHN1Y2ggYXMKKyAgICAgICAgaW1ndXIuY29tLgorCisg ICAgICAgICogcGxhdGZvcm0vY2hyb21pdW0vRmlsZUNob29zZXJDaHJvbWl1bS5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpGaWxlQ2hvb3Nlcjo6YmFzZW5hbWVGb3JXaWR0aCk6CisgICAgICAgIENh bGwgcGF0aEdldFByZXNlbnRhdGlvbmFsTmFtZSgpIG9uIE9TIFguCisgICAgICAgICogcGxhdGZv cm0vY2hyb21pdW0vRmlsZVN5c3RlbUNocm9taXVtTWFjLm1tOgorICAgICAgICAoV2ViQ29yZTo6 cGF0aEdldEZpbGVOYW1lKToKKyAgICAgICAgTm93IHJldHVybnMgYSByZWFsIGZpbGVuYW1lIGlu c3RlYWQgb2YgYSBwcmVzZW50YXRpb25hbCBvbmUsIHdoaWNoCisgICAgICAgIGZpeGVzIHRoZSBw cm9ibGVtIGFkZHJlc3NlZCBieSB0aGlzIGNoYW5nZS4KKyAgICAgICAgKFdlYkNvcmU6OnBhdGhH ZXRQcmVzZW50YXRpb25hbE5hbWUpOgorICAgICAgICBOZXcgZnVuY3Rpb24gdGhhdCByZXR1cm5z IGEgcHJlc2VudGF0aW9uYWwgZmlsZW5hbWUuCisKIDIwMDktMDktMDQgIEFsZXhleSBQcm9za3Vy eWFrb3YgIDxhcEBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRXJpYyBTZWlkZWwu CkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL0ZpbGVDaG9vc2VyQ2hyb21pdW0uY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vRmlsZUNob29zZXJDaHJv bWl1bS5jcHAJKHJldmlzaW9uIDQ2ODgwKQorKysgV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9G aWxlQ2hvb3NlckNocm9taXVtLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzMsNiArMzMsMTAgQEAK IAogbmFtZXNwYWNlIFdlYkNvcmUgewogCisjaWYgUExBVEZPUk0oREFSV0lOKQorU3RyaW5nIHBh dGhHZXRQcmVzZW50YXRpb25hbE5hbWUoY29uc3QgU3RyaW5nJiBwYXRoKTsKKyNlbmRpZgorCiBT dHJpbmcgRmlsZUNob29zZXI6OmJhc2VuYW1lRm9yV2lkdGgoY29uc3QgRm9udCYgZm9udCwgaW50 IHdpZHRoKSBjb25zdAogewogICAgIGlmICh3aWR0aCA8PSAwKQpAQCAtNDEsOSArNDUsMTQgQEAg U3RyaW5nIEZpbGVDaG9vc2VyOjpiYXNlbmFtZUZvcldpZHRoKGNvbgogICAgIFN0cmluZyBzdHJp bmc7CiAgICAgaWYgKG1fZmlsZW5hbWVzLmlzRW1wdHkoKSkKICAgICAgICAgc3RyaW5nID0gZmls ZUJ1dHRvbk5vRmlsZVNlbGVjdGVkTGFiZWwoKTsKLSAgICBlbHNlIGlmIChtX2ZpbGVuYW1lcy5z aXplKCkgPT0gMSkKKyAgICBlbHNlIGlmIChtX2ZpbGVuYW1lcy5zaXplKCkgPT0gMSkgeworI2lm IFBMQVRGT1JNKERBUldJTikKKyAgICAgICAgLy8gU2VlIGNyYnVnLmNvbS8yMDg1Ny4KKyAgICAg ICAgc3RyaW5nID0gcGF0aEdldFByZXNlbnRhdGlvbmFsTmFtZShtX2ZpbGVuYW1lc1swXSk7Cisj ZWxzZQogICAgICAgICBzdHJpbmcgPSBwYXRoR2V0RmlsZU5hbWUobV9maWxlbmFtZXNbMF0pOwot ICAgIGVsc2UKKyNlbmRpZgorICAgIH0gZWxzZQogICAgICAgICByZXR1cm4gU3RyaW5nVHJ1bmNh dG9yOjpyaWdodFRydW5jYXRlKG11bHRpcGxlRmlsZVVwbG9hZFRleHQobV9maWxlbmFtZXMuc2l6 ZSgpKSwgd2lkdGgsIGZvbnQsIGZhbHNlKTsKIAogICAgIHJldHVybiBTdHJpbmdUcnVuY2F0b3I6 OmNlbnRlclRydW5jYXRlKHN0cmluZywgc3RhdGljX2Nhc3Q8ZmxvYXQ+KHdpZHRoKSwgZm9udCwg ZmFsc2UpOwpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9GaWxlU3lzdGVtQ2hyb21p dW1NYWMubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9GaWxlU3lz dGVtQ2hyb21pdW1NYWMubW0JKHJldmlzaW9uIDQ2ODgwKQorKysgV2ViQ29yZS9wbGF0Zm9ybS9j aHJvbWl1bS9GaWxlU3lzdGVtQ2hyb21pdW1NYWMubW0JKHdvcmtpbmcgY29weSkKQEAgLTM4LDYg KzM4LDEzIEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogU3RyaW5nIHBhdGhHZXRGaWxlTmFtZShj b25zdCBTdHJpbmcmIHBhdGgpCiB7CisgICAgLy8gVGhpcyBoYXMgdG8gcmV0dXJuIGEgcmVhbCwg ZXhpc3RpbmcgZmlsZW5hbWUgd2l0aCBleHRlbnNpb24sIHNlZQorICAgIC8vIGNyYnVnLmNvbS8y MDg1Ny4KKyAgICByZXR1cm4gW3BhdGggbGFzdFBhdGhDb21wb25lbnRdOworfQorCitTdHJpbmcg cGF0aEdldFByZXNlbnRhdGlvbmFsTmFtZShjb25zdCBTdHJpbmcmIHBhdGgpCit7CiAgICAgcmV0 dXJuIFtbTlNGaWxlTWFuYWdlciBkZWZhdWx0TWFuYWdlcl0gZGlzcGxheU5hbWVBdFBhdGg6cGF0 aF07CiB9CiAK 39097 2009-09-04 16:35:43 -0700 2009-09-04 21:44:42 -0700 Adress trungl's comments as well. webkit_fileext.patch text/plain 4707 thakis SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0ODA3OCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMzEgQEAKKzIwMDktMDktMDQgIE5pY29sYXMgV2ViZXIgIDx0aGFraXNAY2hyb21p dW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yODk3NQorICAgICAgICBG aXggZmlsZSB1cGxvYWQgb24gY2hyb21lL21hYy4gSW1hZ2VzIHRoYXQgaGF2ZSAiSGlkZSBFeHRl bnNpb24iIHNldCwKKyAgICAgICAgc3VjaCBhcyBzY3JlZW5zaG90cyBieSBkZWZhdWx0LCBjYW4g bm93IGJlIHVwbG9hZGVkIHRvIHNpdGVzIHN1Y2ggYXMKKyAgICAgICAgaW1ndXIuY29tLgorCisg ICAgICAgICogcGxhdGZvcm0vRmlsZVN5c3RlbS5oOgorICAgICAgICBBZGQgcGF0aEdldERpc3Bs YXlGaWxlTmFtZSgpLgorICAgICAgICAqIHBsYXRmb3JtL2Nocm9taXVtL0ZpbGVDaG9vc2VyQ2hy b21pdW0uY3BwOgorICAgICAgICAoV2ViQ29yZTo6RmlsZUNob29zZXI6OmJhc2VuYW1lRm9yV2lk dGgpOgorICAgICAgICBDYWxsIHBhdGhHZXREaXNwbGF5RmlsZU5hbWUoKSBpbnN0ZWFkIG9mIHBh dGhHZXRGaWxlTmFtZSgpLgorICAgICAgICAqIHBsYXRmb3JtL2Nocm9taXVtL0ZpbGVTeXN0ZW1D aHJvbWl1bUxpbnV4LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnBhdGhHZXREaXNwbGF5RmlsZU5h bWUpOgorICAgICAgICBJbXBsZW1lbnQgcGF0aEdldERpc3BsYXlGaWxlTmFtZSgpIGJ5IGRlbGVn YXRpbmcgdG8gcGF0aEdldEZpbGVOYW1lKCkuCisgICAgICAgICogcGxhdGZvcm0vY2hyb21pdW0v RmlsZVN5c3RlbUNocm9taXVtTWFjLm1tOgorICAgICAgICAoV2ViQ29yZTo6cGF0aEdldEZpbGVO YW1lKToKKyAgICAgICAgTm93IHJldHVybnMgYSByZWFsIGZpbGVuYW1lIGluc3RlYWQgb2YgYSBw cmVzZW50YXRpb25hbCBvbmUsIHdoaWNoCisgICAgICAgIGZpeGVzIHRoZSBwcm9ibGVtIGFkZHJl c3NlZCBieSB0aGlzIGNoYW5nZS4KKyAgICAgICAgKFdlYkNvcmU6OnBhdGhHZXREaXNwbGF5Rmls ZU5hbWUpOgorICAgICAgICBOZXcgZnVuY3Rpb24gdGhhdCByZXR1cm5zIGEgcHJlc2VudGF0aW9u YWwgZmlsZW5hbWU7IGRvZXMgd2hhdAorICAgICAgICBwYXRoR2V0RGlzcGxheUZpbGVOYW1lKCkg ZGlkIHByaW9yIHRvIHRoaXMgcGF0Y2guCisgICAgICAgICogcGxhdGZvcm0vY2hyb21pdW0vRmls ZVN5c3RlbUNocm9taXVtV2luLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnBhdGhHZXREaXNwbGF5 RmlsZU5hbWUpOgorICAgICAgICBJbXBsZW1lbnQgcGF0aEdldERpc3BsYXlGaWxlTmFtZSgpIGJ5 IGRlbGVnYXRpbmcgdG8gcGF0aEdldEZpbGVOYW1lKCkuCisKIDIwMDktMDktMDQgIERhdmUgSHlh dHQgIDxoeWF0dEBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQWRhbSBSb2Jlbi4K SW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vRmlsZVN5c3RlbS5oCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNv cmUvcGxhdGZvcm0vRmlsZVN5c3RlbS5oCShyZXZpc2lvbiA0Njg4MCkKKysrIFdlYkNvcmUvcGxh dGZvcm0vRmlsZVN5c3RlbS5oCSh3b3JraW5nIGNvcHkpCkBAIC0xNDMsNiArMTQzLDEwIEBAIFN0 cmluZyBob21lRGlyZWN0b3J5UGF0aCgpOwogU3RyaW5nIHBhdGhHZXRGaWxlTmFtZShjb25zdCBT dHJpbmcmKTsKIFN0cmluZyBkaXJlY3RvcnlOYW1lKGNvbnN0IFN0cmluZyYpOwogCisjaWYgUExB VEZPUk0oQ0hST01JVU0pCitTdHJpbmcgcGF0aEdldERpc3BsYXlGaWxlTmFtZShjb25zdCBTdHJp bmcmIHBhdGgpOworI2VuZGlmCisKIFZlY3RvcjxTdHJpbmc+IGxpc3REaXJlY3RvcnkoY29uc3Qg U3RyaW5nJiBwYXRoLCBjb25zdCBTdHJpbmcmIGZpbHRlciA9IFN0cmluZygpKTsKIAogQ1N0cmlu ZyBmaWxlU3lzdGVtUmVwcmVzZW50YXRpb24oY29uc3QgU3RyaW5nJik7CkluZGV4OiBXZWJDb3Jl L3BsYXRmb3JtL2Nocm9taXVtL0ZpbGVDaG9vc2VyQ2hyb21pdW0uY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFdlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vRmlsZUNob29zZXJDaHJvbWl1bS5jcHAJKHJldmlz aW9uIDQ2ODgwKQorKysgV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9GaWxlQ2hvb3NlckNocm9t aXVtLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDEsOSArNDEsMTAgQEAgU3RyaW5nIEZpbGVDaG9v c2VyOjpiYXNlbmFtZUZvcldpZHRoKGNvbgogICAgIFN0cmluZyBzdHJpbmc7CiAgICAgaWYgKG1f ZmlsZW5hbWVzLmlzRW1wdHkoKSkKICAgICAgICAgc3RyaW5nID0gZmlsZUJ1dHRvbk5vRmlsZVNl bGVjdGVkTGFiZWwoKTsKLSAgICBlbHNlIGlmIChtX2ZpbGVuYW1lcy5zaXplKCkgPT0gMSkKLSAg ICAgICAgc3RyaW5nID0gcGF0aEdldEZpbGVOYW1lKG1fZmlsZW5hbWVzWzBdKTsKLSAgICBlbHNl CisgICAgZWxzZSBpZiAobV9maWxlbmFtZXMuc2l6ZSgpID09IDEpIHsKKyAgICAgICAgLy8gU2Vl IGNyYnVnLmNvbS8yMDg1Ny4KKyAgICAgICAgc3RyaW5nID0gcGF0aEdldERpc3BsYXlGaWxlTmFt ZShtX2ZpbGVuYW1lc1swXSk7CisgICAgfSBlbHNlCiAgICAgICAgIHJldHVybiBTdHJpbmdUcnVu Y2F0b3I6OnJpZ2h0VHJ1bmNhdGUobXVsdGlwbGVGaWxlVXBsb2FkVGV4dChtX2ZpbGVuYW1lcy5z aXplKCkpLCB3aWR0aCwgZm9udCwgZmFsc2UpOwogCiAgICAgcmV0dXJuIFN0cmluZ1RydW5jYXRv cjo6Y2VudGVyVHJ1bmNhdGUoc3RyaW5nLCBzdGF0aWNfY2FzdDxmbG9hdD4od2lkdGgpLCBmb250 LCBmYWxzZSk7CkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL0ZpbGVTeXN0ZW1DaHJv bWl1bUxpbnV4LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL0Zp bGVTeXN0ZW1DaHJvbWl1bUxpbnV4LmNwcAkocmV2aXNpb24gNDY4ODApCisrKyBXZWJDb3JlL3Bs YXRmb3JtL2Nocm9taXVtL0ZpbGVTeXN0ZW1DaHJvbWl1bUxpbnV4LmNwcAkod29ya2luZyBjb3B5 KQpAQCAtMzgsNCArMzgsOSBAQCBTdHJpbmcgcGF0aEdldEZpbGVOYW1lKGNvbnN0IFN0cmluZyYg cGF0CiAgICAgcmV0dXJuIHBhdGguc3Vic3RyaW5nKHBhdGgucmV2ZXJzZUZpbmQoJy8nKSArIDEp OwogfQogCitTdHJpbmcgcGF0aEdldERpc3BsYXlGaWxlTmFtZShjb25zdCBTdHJpbmcmIHBhdGgp Cit7CisgICAgcmV0dXJuIHBhdGhHZXRGaWxlTmFtZShwYXRoKTsKK30KKwogfSAvLyBuYW1lc3Bh Y2UgV2ViQ29yZQpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9GaWxlU3lzdGVtQ2hy b21pdW1NYWMubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9GaWxl U3lzdGVtQ2hyb21pdW1NYWMubW0JKHJldmlzaW9uIDQ2ODgwKQorKysgV2ViQ29yZS9wbGF0Zm9y bS9jaHJvbWl1bS9GaWxlU3lzdGVtQ2hyb21pdW1NYWMubW0JKHdvcmtpbmcgY29weSkKQEAgLTM4 LDYgKzM4LDEzIEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogU3RyaW5nIHBhdGhHZXRGaWxlTmFt ZShjb25zdCBTdHJpbmcmIHBhdGgpCiB7CisgICAgLy8gVGhpcyBoYXMgdG8gcmV0dXJuIGEgcmVh bCwgZXhpc3RpbmcgZmlsZW5hbWUgd2l0aCBleHRlbnNpb24sIHNlZQorICAgIC8vIGNyYnVnLmNv bS8yMDg1Ny4KKyAgICByZXR1cm4gW3BhdGggbGFzdFBhdGhDb21wb25lbnRdOworfQorCitTdHJp bmcgcGF0aEdldERpc3BsYXlGaWxlTmFtZShjb25zdCBTdHJpbmcmIHBhdGgpCit7CiAgICAgcmV0 dXJuIFtbTlNGaWxlTWFuYWdlciBkZWZhdWx0TWFuYWdlcl0gZGlzcGxheU5hbWVBdFBhdGg6cGF0 aF07CiB9CiAKSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vRmlsZVN5c3RlbUNocm9t aXVtV2luLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL0ZpbGVT eXN0ZW1DaHJvbWl1bVdpbi5jcHAJKHJldmlzaW9uIDQ2ODgwKQorKysgV2ViQ29yZS9wbGF0Zm9y bS9jaHJvbWl1bS9GaWxlU3lzdGVtQ2hyb21pdW1XaW4uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00 MSw0ICs0MSw5IEBAIFN0cmluZyBwYXRoR2V0RmlsZU5hbWUoY29uc3QgU3RyaW5nJiBwYXQKICAg ICByZXR1cm4gU3RyaW5nKFBhdGhGaW5kRmlsZU5hbWUoU3RyaW5nKHBhdGgpLmNoYXJhY3RlcnNX aXRoTnVsbFRlcm1pbmF0aW9uKCkpKTsKIH0KIAorU3RyaW5nIHBhdGhHZXREaXNwbGF5RmlsZU5h bWUoY29uc3QgU3RyaW5nJiBwYXRoKQoreworICAgIHJldHVybiBwYXRoR2V0RmlsZU5hbWUocGF0 aCk7Cit9CisKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUK 39109 2009-09-04 21:44:42 -0700 2009-09-05 02:13:38 -0700 Address more review comments. webkit_fileext.patch text/plain 4304 thakis SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0ODA3OCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMzEgQEAKKzIwMDktMDktMDQgIE5pY29sYXMgV2ViZXIgIDx0aGFraXNAY2hyb21p dW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yODk3NQorICAgICAgICBG aXggZmlsZSB1cGxvYWQgb24gY2hyb21lL21hYy4gSW1hZ2VzIHRoYXQgaGF2ZSAiSGlkZSBFeHRl bnNpb24iIHNldCwKKyAgICAgICAgc3VjaCBhcyBzY3JlZW5zaG90cyBieSBkZWZhdWx0LCBjYW4g bm93IGJlIHVwbG9hZGVkIHRvIHNpdGVzIHN1Y2ggYXMKKyAgICAgICAgaW1ndXIuY29tLgorCisg ICAgICAgICogcGxhdGZvcm0vRmlsZVN5c3RlbS5oOgorICAgICAgICBBZGQgcGF0aEdldERpc3Bs YXlGaWxlTmFtZSgpLgorICAgICAgICAqIHBsYXRmb3JtL2Nocm9taXVtL0ZpbGVDaG9vc2VyQ2hy b21pdW0uY3BwOgorICAgICAgICAoV2ViQ29yZTo6RmlsZUNob29zZXI6OmJhc2VuYW1lRm9yV2lk dGgpOgorICAgICAgICBDYWxsIHBhdGhHZXREaXNwbGF5RmlsZU5hbWUoKSBpbnN0ZWFkIG9mIHBh dGhHZXRGaWxlTmFtZSgpLgorICAgICAgICAqIHBsYXRmb3JtL2Nocm9taXVtL0ZpbGVTeXN0ZW1D aHJvbWl1bUxpbnV4LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnBhdGhHZXREaXNwbGF5RmlsZU5h bWUpOgorICAgICAgICBJbXBsZW1lbnQgcGF0aEdldERpc3BsYXlGaWxlTmFtZSgpIGJ5IGRlbGVn YXRpbmcgdG8gcGF0aEdldEZpbGVOYW1lKCkuCisgICAgICAgICogcGxhdGZvcm0vY2hyb21pdW0v RmlsZVN5c3RlbUNocm9taXVtTWFjLm1tOgorICAgICAgICAoV2ViQ29yZTo6cGF0aEdldEZpbGVO YW1lKToKKyAgICAgICAgTm93IHJldHVybnMgYSByZWFsIGZpbGVuYW1lIGluc3RlYWQgb2YgYSBw cmVzZW50YXRpb25hbCBvbmUsIHdoaWNoCisgICAgICAgIGZpeGVzIHRoZSBwcm9ibGVtIGFkZHJl c3NlZCBieSB0aGlzIGNoYW5nZS4KKyAgICAgICAgKFdlYkNvcmU6OnBhdGhHZXREaXNwbGF5Rmls ZU5hbWUpOgorICAgICAgICBOZXcgZnVuY3Rpb24gdGhhdCByZXR1cm5zIGEgcHJlc2VudGF0aW9u YWwgZmlsZW5hbWU7IGRvZXMgd2hhdAorICAgICAgICBwYXRoR2V0RGlzcGxheUZpbGVOYW1lKCkg ZGlkIHByaW9yIHRvIHRoaXMgcGF0Y2guCisgICAgICAgICogcGxhdGZvcm0vY2hyb21pdW0vRmls ZVN5c3RlbUNocm9taXVtV2luLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnBhdGhHZXREaXNwbGF5 RmlsZU5hbWUpOgorICAgICAgICBJbXBsZW1lbnQgcGF0aEdldERpc3BsYXlGaWxlTmFtZSgpIGJ5 IGRlbGVnYXRpbmcgdG8gcGF0aEdldEZpbGVOYW1lKCkuCisKIDIwMDktMDktMDQgIERhdmUgSHlh dHQgIDxoeWF0dEBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQWRhbSBSb2Jlbi4K SW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vRmlsZVN5c3RlbS5oCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNv cmUvcGxhdGZvcm0vRmlsZVN5c3RlbS5oCShyZXZpc2lvbiA0Njg4MCkKKysrIFdlYkNvcmUvcGxh dGZvcm0vRmlsZVN5c3RlbS5oCSh3b3JraW5nIGNvcHkpCkBAIC0xNzAsNiArMTcwLDEwIEBAIGNo YXIqIGZpbGVuYW1lRnJvbVN0cmluZyhjb25zdCBTdHJpbmcmKTsKIFN0cmluZyBmaWxlbmFtZUZv ckRpc3BsYXkoY29uc3QgU3RyaW5nJik7CiAjZW5kaWYKIAorI2lmIFBMQVRGT1JNKENIUk9NSVVN KQorU3RyaW5nIHBhdGhHZXREaXNwbGF5RmlsZU5hbWUoY29uc3QgU3RyaW5nJik7CisjZW5kaWYK KwogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQogCiAjZW5kaWYgLy8gRmlsZVN5c3RlbV9oCkluZGV4 OiBXZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL0ZpbGVDaG9vc2VyQ2hyb21pdW0uY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vRmlsZUNob29zZXJDaHJvbWl1bS5j cHAJKHJldmlzaW9uIDQ2ODgwKQorKysgV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9GaWxlQ2hv b3NlckNocm9taXVtLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDIsNyArNDIsNyBAQCBTdHJpbmcg RmlsZUNob29zZXI6OmJhc2VuYW1lRm9yV2lkdGgoY29uCiAgICAgaWYgKG1fZmlsZW5hbWVzLmlz RW1wdHkoKSkKICAgICAgICAgc3RyaW5nID0gZmlsZUJ1dHRvbk5vRmlsZVNlbGVjdGVkTGFiZWwo KTsKICAgICBlbHNlIGlmIChtX2ZpbGVuYW1lcy5zaXplKCkgPT0gMSkKLSAgICAgICAgc3RyaW5n ID0gcGF0aEdldEZpbGVOYW1lKG1fZmlsZW5hbWVzWzBdKTsKKyAgICAgICAgc3RyaW5nID0gcGF0 aEdldERpc3BsYXlGaWxlTmFtZShtX2ZpbGVuYW1lc1swXSk7CiAgICAgZWxzZQogICAgICAgICBy ZXR1cm4gU3RyaW5nVHJ1bmNhdG9yOjpyaWdodFRydW5jYXRlKG11bHRpcGxlRmlsZVVwbG9hZFRl eHQobV9maWxlbmFtZXMuc2l6ZSgpKSwgd2lkdGgsIGZvbnQsIGZhbHNlKTsKIApJbmRleDogV2Vi Q29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9GaWxlU3lzdGVtQ2hyb21pdW1MaW51eC5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9GaWxlU3lzdGVtQ2hyb21pdW1MaW51 eC5jcHAJKHJldmlzaW9uIDQ2ODgwKQorKysgV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9GaWxl U3lzdGVtQ2hyb21pdW1MaW51eC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM4LDQgKzM4LDkgQEAg U3RyaW5nIHBhdGhHZXRGaWxlTmFtZShjb25zdCBTdHJpbmcmIHBhdAogICAgIHJldHVybiBwYXRo LnN1YnN0cmluZyhwYXRoLnJldmVyc2VGaW5kKCcvJykgKyAxKTsKIH0KIAorU3RyaW5nIHBhdGhH ZXREaXNwbGF5RmlsZU5hbWUoY29uc3QgU3RyaW5nJiBwYXRoKQoreworICAgIHJldHVybiBwYXRo R2V0RmlsZU5hbWUocGF0aCk7Cit9CisKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKSW5kZXg6IFdl YkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vRmlsZVN5c3RlbUNocm9taXVtTWFjLm1tCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vRmlsZVN5c3RlbUNocm9taXVtTWFjLm1t CShyZXZpc2lvbiA0Njg4MCkKKysrIFdlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vRmlsZVN5c3Rl bUNocm9taXVtTWFjLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0zOCw2ICszOCwxMSBAQCBuYW1lc3Bh Y2UgV2ViQ29yZSB7CiAKIFN0cmluZyBwYXRoR2V0RmlsZU5hbWUoY29uc3QgU3RyaW5nJiBwYXRo KQogeworICAgIHJldHVybiBbcGF0aCBsYXN0UGF0aENvbXBvbmVudF07Cit9CisKK1N0cmluZyBw YXRoR2V0RGlzcGxheUZpbGVOYW1lKGNvbnN0IFN0cmluZyYgcGF0aCkKK3sKICAgICByZXR1cm4g W1tOU0ZpbGVNYW5hZ2VyIGRlZmF1bHRNYW5hZ2VyXSBkaXNwbGF5TmFtZUF0UGF0aDpwYXRoXTsK IH0KIApJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9GaWxlU3lzdGVtQ2hyb21pdW1X aW4uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vRmlsZVN5c3Rl bUNocm9taXVtV2luLmNwcAkocmV2aXNpb24gNDY4ODApCisrKyBXZWJDb3JlL3BsYXRmb3JtL2No cm9taXVtL0ZpbGVTeXN0ZW1DaHJvbWl1bVdpbi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQxLDQg KzQxLDkgQEAgU3RyaW5nIHBhdGhHZXRGaWxlTmFtZShjb25zdCBTdHJpbmcmIHBhdAogICAgIHJl dHVybiBTdHJpbmcoUGF0aEZpbmRGaWxlTmFtZShTdHJpbmcocGF0aCkuY2hhcmFjdGVyc1dpdGhO dWxsVGVybWluYXRpb24oKSkpOwogfQogCitTdHJpbmcgcGF0aEdldERpc3BsYXlGaWxlTmFtZShj b25zdCBTdHJpbmcmIHBhdGgpCit7CisgICAgcmV0dXJuIHBhdGhHZXRGaWxlTmFtZShwYXRoKTsK K30KKwogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQo=