31597 2009-11-17 14:01:05 -0800 locale for text breakiterator and string search is not set to the UI locale 2010-01-12 16:23:56 -0800 1 1 1 Unclassified WebKit Text 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 jshin jshin ap commit-queue darin dglazkov hbono webkit.review.bot oldest_to_newest 164343 0 43380 jshin 2009-11-17 14:01:05 -0800 Created attachment 43380 patch (only for Chromium) All the implementations of two methods in TextBreakIteratorInternalICU return "" and "en-US", respectively. There are FIXME comments that they should return the OS UI locale. It works as long as the OS UI locale is the same as the UI locale of a browser. In case of Chrome on Windows, the UI locale of Chrome can be different from the OS UI language. That is, English Windows users can run Chrome in Japanese. And, Chrome's browser process already passes along that information to a renderer process, which is in turn available in WebCore::defaultLanguage(). So, at least in Chrome, we can return that in two methods in TextBreakIteratorInternalICU. I'm tempted to remove two methods and just use WebCore::defaultLanguage() in all the call sites on all ports, but I'm not sure of the reasoning behind having them separate. So, I'm just making changes to Chrome's implementation of TextBreakIteratorInternalICU. If we can agree on the above point, I'll extend the patch to include other ports. With this change, for instance, Swedish Find-in-Page behaves as expected when CHrome is run in Swedish. 164448 1 43380 darin 2009-11-17 21:51:17 -0800 Comment on attachment 43380 patch (only for Chromium) > const char* currentSearchLocaleID() > { > - // FIXME: Should use system locale. > - return ""; > + // Chrome's UI language can be different from the OS UI language on Windows. > + // We want to return Chrome's UI language here. > + return defaultLanguage().ascii().data(); > } This will create a local CString, take a pointer to its contents, then destroy the CString and return a pointer to the destroyed memory. So you definitely can't land this as-is. The concept is probably OK for Chromium. For Mac OS X it would not be good to use defaultLanguage() for everything, so it's good that you did not try to change all ports to work this way. Mac OS X has a separate preference for "Order for sorted lists" that should be used for searches but not text breaking. 178723 2 46147 jshin 2010-01-08 11:28:56 -0800 Created attachment 46147 updated patch per darin's comment Darin, Thank you for the clarification about other ports and also catching my stupid mistake. Can you take another look? 178725 3 webkit.review.bot 2010-01-08 11:34:25 -0800 Attachment 46147 did not pass style-queue: Failed to run "WebKitTools/Scripts/check-webkit-style" exit_code: 1 WebCore/platform/text/chromium/TextBreakIteratorInternalICUChromium.cpp:23: Found other header before a header this file implements. Should be: config.h, primary header, blank line, and then alphabetically sorted. [build/include_order] [4] WebCore/platform/text/chromium/TextBreakIteratorInternalICUChromium.cpp:28: Place brace on its own line for function definitions. [whitespace/braces] [4] Total errors found: 2 178763 4 46147 darin 2010-01-08 13:30:09 -0800 Comment on attachment 46147 updated patch per darin's comment > #include "config.h" > +#include "CString.h" > +#include "Language.h" > +#include "PlatformString.h" > #include "TextBreakIteratorInternalICU.h" As the style-bot said, please add the new includes in a new paragraph after a blank line. The file's own header goes first in the same paragraph with config.h. > +static const char* UILanguage() { Brace goes on a separate line. > + // Chrome's UI language can be different from the OS UI language on Windows. > + // We want to return Chrome's UI language here. > + static WebCore::CString locale; > + locale = WebCore::defaultLanguage().latin1(); This isn't quite right. The locale is a global variable, but you're re-initializing it with new data every time through the function. Merging these two lines of code into one will fix that. 179582 5 46314 jshin 2010-01-11 15:45:15 -0800 Created attachment 46314 updated patch Thank you for bearing with me. Here's an updated patch. 179627 6 46314 darin 2010-01-11 17:12:00 -0800 Comment on attachment 46314 updated patch > +static const char* UILanguage() > +{ > + // Chrome's UI language can be different from the OS UI language on Windows. > + // We want to return Chrome's UI language here. > + static WebCore::CString locale = WebCore::defaultLanguage().latin1(); > + return locale.data(); > +} Normally I would put a function like this inside the WebCore namespace rather than outside. Any reason it's outside? You could avoid those two WebCore prefixes that way. Most places in WebCore we try to avoid global destructors that run on process exit. In fact, for code in the Mac OS X version, it's required. The idiom is to use the DEFINE_STATIC_LOCAL macro. 179899 7 46383 jshin 2010-01-12 11:21:39 -0800 Created attachment 46383 update to use the macro for static local variable thanks for the review. I've seen that macro but was mistaken for that to be only used with a literal value. I updated the patch to use the macro for static local (to leak at the end of a process) and pulled in the helper function into WebCore ns. I'm carrying along r+ for the updated patch and will plus commit-queue once chrome-bot comes back green (although I locally built and ran some tests) 179901 8 jshin 2010-01-12 11:23:17 -0800 http://crbug.com/31812 and http://crbug.com/31609 are chromium bugs related to this one. 179902 9 46383 darin 2010-01-12 11:24:26 -0800 Comment on attachment 46383 update to use the macro for static local variable Yes, looks good. 179914 10 46383 jshin 2010-01-12 11:43:16 -0800 Comment on attachment 46383 update to use the macro for static local variable with r+, it looks like bots are not supposed to run. it should be ok, though and I'm going ahead with c-q +. 179957 11 46383 commit-queue 2010-01-12 13:15:38 -0800 Comment on attachment 46383 update to use the macro for static local variable Clearing flags on attachment: 46383 Committed r53159: <http://trac.webkit.org/changeset/53159> 43380 2009-11-17 14:01:05 -0800 2010-01-08 11:28:56 -0800 patch (only for Chromium) search.locale.patch text/plain 1722 jshin SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1MTA4OCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTcgQEAKKzIwMDktMTEtMTcgIEp1bmdzaGlrIFNoaW4gIDxqc2hpbkBjaHJvbWl1 bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg TWFrZSBJQ1UncyB0ZXh0IGJyZWFraXRlcmF0b3IgYW5kIHN0cmluZyBzZWFyY2ggdXNlIENocm9t ZSdzIFVJCisgICAgICAgIExvY2FsZS4KKworICAgICAgICBBcyBsb25nIGFzIHRoZSB3ZWJraXQg bGF5b3V0IHRlc3RzIGFyZSBydW4gaW4gZW4tVVMgbG9jYWxlLCB0aGVyZSdkIGJlCisgICAgICAg IG5vIHZpc2libGUgY2hhbmdlLgorCisgICAgICAgICogcGxhdGZvcm0vdGV4dC9jaHJvbWl1bS9U ZXh0QnJlYWtJdGVyYXRvckludGVybmFsSUNVQ2hyb21pdW0uY3BwOgorICAgICAgICAoV2ViQ29y ZTo6Y3VycmVudFNlYXJjaExvY2FsZUlEKToKKyAgICAgICAgKFdlYkNvcmU6OmN1cnJlbnRUZXh0 QnJlYWtMb2NhbGVJRCk6CisKIDIwMDktMTEtMTcgIFBhdmVsIEZlbGRtYW4gIDxwZmVsZG1hbkBj aHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgVGltb3RoeSBIYXRjaGVyLgpJbmRl eDogV2ViQ29yZS9wbGF0Zm9ybS90ZXh0L2Nocm9taXVtL1RleHRCcmVha0l0ZXJhdG9ySW50ZXJu YWxJQ1VDaHJvbWl1bS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS90ZXh0L2No cm9taXVtL1RleHRCcmVha0l0ZXJhdG9ySW50ZXJuYWxJQ1VDaHJvbWl1bS5jcHAJKHJldmlzaW9u IDUxMDg3KQorKysgV2ViQ29yZS9wbGF0Zm9ybS90ZXh0L2Nocm9taXVtL1RleHRCcmVha0l0ZXJh dG9ySW50ZXJuYWxJQ1VDaHJvbWl1bS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIwLDIwICsyMCwy MyBAQAogICovCiAKICNpbmNsdWRlICJjb25maWcuaCIKKyNpbmNsdWRlICJMYW5ndWFnZS5oIgor I2luY2x1ZGUgIlBsYXRmb3JtU3RyaW5nLmgiCiAjaW5jbHVkZSAiVGV4dEJyZWFrSXRlcmF0b3JJ bnRlcm5hbElDVS5oIgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIGNvbnN0IGNoYXIqIGN1cnJl bnRTZWFyY2hMb2NhbGVJRCgpCiB7Ci0gICAgLy8gRklYTUU6IFNob3VsZCB1c2Ugc3lzdGVtIGxv Y2FsZS4KLSAgICByZXR1cm4gIiI7CisgICAgLy8gQ2hyb21lJ3MgVUkgbGFuZ3VhZ2UgY2FuIGJl IGRpZmZlcmVudCBmcm9tIHRoZSBPUyBVSSBsYW5ndWFnZSBvbiBXaW5kb3dzLgorICAgIC8vIFdl IHdhbnQgdG8gcmV0dXJuIENocm9tZSdzIFVJIGxhbmd1YWdlIGhlcmUuCisgICAgcmV0dXJuIGRl ZmF1bHRMYW5ndWFnZSgpLmFzY2lpKCkuZGF0YSgpOwogfQogCiBjb25zdCBjaGFyKiBjdXJyZW50 VGV4dEJyZWFrTG9jYWxlSUQoKQogewotICAgIC8vIEZJWE1FOiBTaG91bGQgdXNlIHN5c3RlbSBs b2NhbGUuCi0gICAgcmV0dXJuICJlbl91cyI7CisgICAgLy8gU2FtZSBhcyBhYm92ZS4KKyAgICBy ZXR1cm4gZGVmYXVsdExhbmd1YWdlKCkuYXNjaWkoKS5kYXRhKCk7CiB9CiAKIH0gLy8gbmFtZXNw YWNlIFdlYkNvcmUK 46147 2010-01-08 11:28:56 -0800 2010-01-11 15:45:15 -0800 updated patch per darin's comment 31597.patch.2 text/plain 1897 jshin SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1Mjk5NykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTggQEAKKzIwMTAtMDEtMDggIEp1bmdzaGlrIFNoaW4gIDxqc2hpbkBjaHJvbWl1 bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg TWFrZSBJQ1UncyB0ZXh0IGJyZWFraXRlcmF0b3IgYW5kIHN0cmluZyBzZWFyY2ggdXNlIENocm9t ZSdzIFVJCisgICAgICAgIGxhbmd1YWdlIGluc3RlYWQgb2YgJ2VuLVVTJyBvciB0aGUgT1MgVUkg bGFuZ3VhZ2UuCisKKyAgICAgICAgQXMgbG9uZyBhcyB0aGUgd2Via2l0IGxheW91dCB0ZXN0cyBh cmUgcnVuIGluIGVuLVVTIGxvY2FsZSwgdGhlcmUnZCBiZSAKKyAgICAgICAgbm8gdmlzaWJsZSBj aGFuZ2UuCisKKyAgICAgICAgKiBwbGF0Zm9ybS90ZXh0L2Nocm9taXVtL1RleHRCcmVha0l0ZXJh dG9ySW50ZXJuYWxJQ1VDaHJvbWl1bS5jcHA6CisgICAgICAgIChVSUxhbmd1YWdlKToKKyAgICAg ICAgKFdlYkNvcmU6OmN1cnJlbnRTZWFyY2hMb2NhbGVJRCk6CisgICAgICAgIChXZWJDb3JlOjpj dXJyZW50VGV4dEJyZWFrTG9jYWxlSUQpOgorCiAyMDEwLTAxLTA4ICBNYXR0IFBlcnJ5ICA8bXBj b21wbGV0ZUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQWRhbSBCYXJ0aC4K SW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vdGV4dC9jaHJvbWl1bS9UZXh0QnJlYWtJdGVyYXRvcklu dGVybmFsSUNVQ2hyb21pdW0uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vdGV4 dC9jaHJvbWl1bS9UZXh0QnJlYWtJdGVyYXRvckludGVybmFsSUNVQ2hyb21pdW0uY3BwCShyZXZp c2lvbiA1Mjg4MSkKKysrIFdlYkNvcmUvcGxhdGZvcm0vdGV4dC9jaHJvbWl1bS9UZXh0QnJlYWtJ dGVyYXRvckludGVybmFsSUNVQ2hyb21pdW0uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yMCwyMCAr MjAsMjkgQEAKICAqLwogCiAjaW5jbHVkZSAiY29uZmlnLmgiCisjaW5jbHVkZSAiQ1N0cmluZy5o IgorI2luY2x1ZGUgIkxhbmd1YWdlLmgiCisjaW5jbHVkZSAiUGxhdGZvcm1TdHJpbmcuaCIKICNp bmNsdWRlICJUZXh0QnJlYWtJdGVyYXRvckludGVybmFsSUNVLmgiCiAKK3N0YXRpYyBjb25zdCBj aGFyKiBVSUxhbmd1YWdlKCkgeworICAgIC8vIENocm9tZSdzIFVJIGxhbmd1YWdlIGNhbiBiZSBk aWZmZXJlbnQgZnJvbSB0aGUgT1MgVUkgbGFuZ3VhZ2Ugb24gV2luZG93cy4KKyAgICAvLyBXZSB3 YW50IHRvIHJldHVybiBDaHJvbWUncyBVSSBsYW5ndWFnZSBoZXJlLgorICAgIHN0YXRpYyBXZWJD b3JlOjpDU3RyaW5nIGxvY2FsZTsKKyAgICBsb2NhbGUgPSBXZWJDb3JlOjpkZWZhdWx0TGFuZ3Vh Z2UoKS5sYXRpbjEoKTsKKyAgICByZXR1cm4gbG9jYWxlLmRhdGEoKTsKK30KKwogbmFtZXNwYWNl IFdlYkNvcmUgewogCiBjb25zdCBjaGFyKiBjdXJyZW50U2VhcmNoTG9jYWxlSUQoKQogewotICAg IC8vIEZJWE1FOiBTaG91bGQgdXNlIHN5c3RlbSBsb2NhbGUuCi0gICAgcmV0dXJuICIiOworICAg IHJldHVybiBVSUxhbmd1YWdlKCk7CiB9CiAKIGNvbnN0IGNoYXIqIGN1cnJlbnRUZXh0QnJlYWtM b2NhbGVJRCgpCiB7Ci0gICAgLy8gRklYTUU6IFNob3VsZCB1c2Ugc3lzdGVtIGxvY2FsZS4KLSAg ICByZXR1cm4gImVuX3VzIjsKKyAgICByZXR1cm4gVUlMYW5ndWFnZSgpOwogfQogCiB9IC8vIG5h bWVzcGFjZSBXZWJDb3JlCg== 46314 2010-01-11 15:45:15 -0800 2010-01-11 17:12:00 -0800 updated patch 31597.patch.2a text/plain 1879 jshin SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1MzEwNSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTggQEAKKzIwMTAtMDEtMTEgIEp1bmdzaGlrIFNoaW4gIDxqc2hpbkBjaHJvbWl1 bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg TWFrZSBJQ1UncyB0ZXh0IGJyZWFraXRlcmF0b3IgYW5kIHN0cmluZyBzZWFyY2ggdXNlIENocm9t ZSdzIFVJCisgICAgICAgIGxhbmd1YWdlIGluc3RlYWQgb2YgJ2VuLVVTJyBvciB0aGUgT1MgVUkg bGFuZ3VhZ2UuCisKKyAgICAgICAgQXMgbG9uZyBhcyB0aGUgd2Via2l0IGxheW91dCB0ZXN0cyBh cmUgcnVuIGluIGVuLVVTIGxvY2FsZSwgdGhlcmUnZCBiZSAKKyAgICAgICAgbm8gdmlzaWJsZSBj aGFuZ2UuCisKKyAgICAgICAgKiBwbGF0Zm9ybS90ZXh0L2Nocm9taXVtL1RleHRCcmVha0l0ZXJh dG9ySW50ZXJuYWxJQ1VDaHJvbWl1bS5jcHA6CisgICAgICAgIChVSUxhbmd1YWdlKToKKyAgICAg ICAgKFdlYkNvcmU6OmN1cnJlbnRTZWFyY2hMb2NhbGVJRCk6CisgICAgICAgIChXZWJDb3JlOjpj dXJyZW50VGV4dEJyZWFrTG9jYWxlSUQpOgorCiAyMDEwLTAxLTExICBBbGV4ZXkgUHJvc2t1cnlh a292ICA8YXBAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IE9saXZlciBIdW50LgpJ bmRleDogV2ViQ29yZS9wbGF0Zm9ybS90ZXh0L2Nocm9taXVtL1RleHRCcmVha0l0ZXJhdG9ySW50 ZXJuYWxJQ1VDaHJvbWl1bS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS90ZXh0 L2Nocm9taXVtL1RleHRCcmVha0l0ZXJhdG9ySW50ZXJuYWxJQ1VDaHJvbWl1bS5jcHAJKHJldmlz aW9uIDUyODgxKQorKysgV2ViQ29yZS9wbGF0Zm9ybS90ZXh0L2Nocm9taXVtL1RleHRCcmVha0l0 ZXJhdG9ySW50ZXJuYWxJQ1VDaHJvbWl1bS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIyLDE4ICsy MiwyOCBAQAogI2luY2x1ZGUgImNvbmZpZy5oIgogI2luY2x1ZGUgIlRleHRCcmVha0l0ZXJhdG9y SW50ZXJuYWxJQ1UuaCIKIAorI2luY2x1ZGUgIkNTdHJpbmcuaCIKKyNpbmNsdWRlICJMYW5ndWFn ZS5oIgorI2luY2x1ZGUgIlBsYXRmb3JtU3RyaW5nLmgiCisKK3N0YXRpYyBjb25zdCBjaGFyKiBV SUxhbmd1YWdlKCkKK3sKKyAgICAvLyBDaHJvbWUncyBVSSBsYW5ndWFnZSBjYW4gYmUgZGlmZmVy ZW50IGZyb20gdGhlIE9TIFVJIGxhbmd1YWdlIG9uIFdpbmRvd3MuCisgICAgLy8gV2Ugd2FudCB0 byByZXR1cm4gQ2hyb21lJ3MgVUkgbGFuZ3VhZ2UgaGVyZS4KKyAgICBzdGF0aWMgV2ViQ29yZTo6 Q1N0cmluZyBsb2NhbGUgPSBXZWJDb3JlOjpkZWZhdWx0TGFuZ3VhZ2UoKS5sYXRpbjEoKTsKKyAg ICByZXR1cm4gbG9jYWxlLmRhdGEoKTsKK30KKwogbmFtZXNwYWNlIFdlYkNvcmUgewogCiBjb25z dCBjaGFyKiBjdXJyZW50U2VhcmNoTG9jYWxlSUQoKQogewotICAgIC8vIEZJWE1FOiBTaG91bGQg dXNlIHN5c3RlbSBsb2NhbGUuCi0gICAgcmV0dXJuICIiOworICAgIHJldHVybiBVSUxhbmd1YWdl KCk7CiB9CiAKIGNvbnN0IGNoYXIqIGN1cnJlbnRUZXh0QnJlYWtMb2NhbGVJRCgpCiB7Ci0gICAg Ly8gRklYTUU6IFNob3VsZCB1c2Ugc3lzdGVtIGxvY2FsZS4KLSAgICByZXR1cm4gImVuX3VzIjsK KyAgICByZXR1cm4gVUlMYW5ndWFnZSgpOwogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCg== 46383 2010-01-12 11:21:39 -0800 2010-01-12 13:15:38 -0800 update to use the macro for static local variable 31597.patch.2b text/plain 1981 jshin SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1MzE0NikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjAgQEAKKzIwMTAtMDEtMTIgIEp1bmdzaGlrIFNoaW4gIDxqc2hpbkBjaHJvbWl1 bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIKKworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzE1OTcKKworICAgICAgICBNYWtl IElDVSdzIHRleHQgYnJlYWtpdGVyYXRvciBhbmQgc3RyaW5nIHNlYXJjaCB1c2UgQ2hyb21lJ3Mg VUkKKyAgICAgICAgbGFuZ3VhZ2UgaW5zdGVhZCBvZiAnZW4tVVMnIG9yIHRoZSBPUyBVSSBsYW5n dWFnZS4KKworICAgICAgICBBcyBsb25nIGFzIHRoZSB3ZWJraXQgbGF5b3V0IHRlc3RzIGFyZSBy dW4gaW4gZW4tVVMgbG9jYWxlLCB0aGVyZSdkIGJlIAorICAgICAgICBubyB2aXNpYmxlIGNoYW5n ZS4KKworICAgICAgICAqIHBsYXRmb3JtL3RleHQvY2hyb21pdW0vVGV4dEJyZWFrSXRlcmF0b3JJ bnRlcm5hbElDVUNocm9taXVtLmNwcDoKKyAgICAgICAgKFVJTGFuZ3VhZ2UpOgorICAgICAgICAo V2ViQ29yZTo6Y3VycmVudFNlYXJjaExvY2FsZUlEKToKKyAgICAgICAgKFdlYkNvcmU6OmN1cnJl bnRUZXh0QnJlYWtMb2NhbGVJRCk6CisKIDIwMTAtMDEtMTIgIEVyaWMgQ2FybHNvbiAgPGVyaWMu Y2FybHNvbkBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIgYW5k IFNpbW9uIEZyYXNlci4KSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vdGV4dC9jaHJvbWl1bS9UZXh0 QnJlYWtJdGVyYXRvckludGVybmFsSUNVQ2hyb21pdW0uY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNv cmUvcGxhdGZvcm0vdGV4dC9jaHJvbWl1bS9UZXh0QnJlYWtJdGVyYXRvckludGVybmFsSUNVQ2hy b21pdW0uY3BwCShyZXZpc2lvbiA1Mjg4MSkKKysrIFdlYkNvcmUvcGxhdGZvcm0vdGV4dC9jaHJv bWl1bS9UZXh0QnJlYWtJdGVyYXRvckludGVybmFsSUNVQ2hyb21pdW0uY3BwCSh3b3JraW5nIGNv cHkpCkBAIC0yMiwxOCArMjIsMjkgQEAKICNpbmNsdWRlICJjb25maWcuaCIKICNpbmNsdWRlICJU ZXh0QnJlYWtJdGVyYXRvckludGVybmFsSUNVLmgiCiAKKyNpbmNsdWRlICJDU3RyaW5nLmgiCisj aW5jbHVkZSAiTGFuZ3VhZ2UuaCIKKyNpbmNsdWRlICJQbGF0Zm9ybVN0cmluZy5oIgorI2luY2x1 ZGUgPHd0Zi9TdGRMaWJFeHRyYXMuaD4KKwogbmFtZXNwYWNlIFdlYkNvcmUgewogCitzdGF0aWMg Y29uc3QgY2hhciogVUlMYW5ndWFnZSgpCit7CisgICAgLy8gQ2hyb21lJ3MgVUkgbGFuZ3VhZ2Ug Y2FuIGJlIGRpZmZlcmVudCBmcm9tIHRoZSBPUyBVSSBsYW5ndWFnZSBvbiBXaW5kb3dzLgorICAg IC8vIFdlIHdhbnQgdG8gcmV0dXJuIENocm9tZSdzIFVJIGxhbmd1YWdlIGhlcmUuCisgICAgREVG SU5FX1NUQVRJQ19MT0NBTChDU3RyaW5nLCBsb2NhbGUsIChkZWZhdWx0TGFuZ3VhZ2UoKS5sYXRp bjEoKSkpOworICAgIHJldHVybiBsb2NhbGUuZGF0YSgpOworfQorCiBjb25zdCBjaGFyKiBjdXJy ZW50U2VhcmNoTG9jYWxlSUQoKQogewotICAgIC8vIEZJWE1FOiBTaG91bGQgdXNlIHN5c3RlbSBs b2NhbGUuCi0gICAgcmV0dXJuICIiOworICAgIHJldHVybiBVSUxhbmd1YWdlKCk7CiB9CiAKIGNv bnN0IGNoYXIqIGN1cnJlbnRUZXh0QnJlYWtMb2NhbGVJRCgpCiB7Ci0gICAgLy8gRklYTUU6IFNo b3VsZCB1c2Ugc3lzdGVtIGxvY2FsZS4KLSAgICByZXR1cm4gImVuX3VzIjsKKyAgICByZXR1cm4g VUlMYW5ndWFnZSgpOwogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCg==