55453 2011-03-01 02:57:46 -0800 Pass preferred language information down to font fallback logic 2011-03-07 12:43:56 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 0 kochi webkit-unassigned agl ap commit-queue jshin kochi mitz tony oldest_to_newest 359774 0 kochi 2011-03-01 02:57:46 -0800 For Chromium on Linux, we don't use any locale information for selecting fallback font (no default or CSS-supplied font has glyph for those characters). This often happens especially for CJK pages with font-family being 'Arial' or any other latin-only fonts. Sometimes we see fontconfig pick up undesired font (CJK-unified font, which has wrong glyph for unified character for some language, e.g. 誤's glyphs should be different between C & J) and it ends up in wrong typeface rendered. As Chromium/Linux uses fontconfig for selecting a font from character, fontconfig returns the top result that contains glyph for it, regardless of font-family or language. At least, we have to pass the language, then with some fontconfig configuration tweaks we can pick a more appropriate font. Attaching a patch to implement this, but this requires changes in Chromium code too. See also http://crosbug.com/11699 359775 1 84205 kochi 2011-03-01 03:01:33 -0800 Created attachment 84205 This is a tentative patch trying to implement passing preferred language to font fallback logic. 359965 2 ap 2011-03-01 09:53:40 -0800 (In reply to comment #0) > For Chromium on Linux, we don't use any locale information for selecting fallback font Do other versions of Chromium support that? I thought it was a cross-paltform issue, tracked by bug 10874. The main blocker being that node language is slow to compute. 360000 3 84205 agl 2011-03-01 10:24:04 -0800 Comment on attachment 84205 This is a tentative patch trying to implement passing preferred language to font fallback logic. View in context: https://bugs.webkit.org/attachment.cgi?id=84205&action=review > WebKit/chromium/public/gtk/WebFontInfo.h:48 > + // preferredLanguage: preferred language for the characters The comment should specify the format of the language. There are (at least) two and three letter forms in use. > WebKit/chromium/public/linux/WebSandboxSupport.h:-53 > - virtual WebString getFontFamilyForCharacters(const WebUChar* characters, size_t numCharacters) = 0; the indentation here looks to be wrong. > WebCore/platform/graphics/chromium/FontCacheLinux.cpp:61 > + icu::Locale locale = icu::Locale::getDefault(); If this is for Linux then is the best way to get the locale? In zygote_main_linux.cc we preload the ICU timezone information, but I don't see anything about locale. So, if ICU tries to access the disk for this then it'll fail. 360595 4 kochi 2011-03-01 22:45:57 -0800 (In reply to comment #2) > (In reply to comment #0) > > For Chromium on Linux, we don't use any locale information for selecting fallback font > > Do other versions of Chromium support that? > > I thought it was a cross-paltform issue, tracked by bug 10874. The main blocker being that node language is slow to compute. This change affects only Linux. As FontCache has per-platform implementation and this is Linux-only issue. But yes, more generically I think bug 10874 is the right direction to go. I admit that this is an intermediate solution as it uses UI language, not HTML language. 360613 5 84205 kochi 2011-03-01 23:22:57 -0800 Comment on attachment 84205 This is a tentative patch trying to implement passing preferred language to font fallback logic. View in context: https://bugs.webkit.org/attachment.cgi?id=84205&action=review >> WebKit/chromium/public/gtk/WebFontInfo.h:48 >> + // preferredLanguage: preferred language for the characters > > The comment should specify the format of the language. There are (at least) two and three letter forms in use. Done. >> WebKit/chromium/public/linux/WebSandboxSupport.h:-53 >> - virtual WebString getFontFamilyForCharacters(const WebUChar* characters, size_t numCharacters) = 0; > > the indentation here looks to be wrong. Fixed. >> WebCore/platform/graphics/chromium/FontCacheLinux.cpp:61 >> + icu::Locale locale = icu::Locale::getDefault(); > > If this is for Linux then is the best way to get the locale? In zygote_main_linux.cc we preload the ICU timezone information, but I don't see anything about locale. So, if ICU tries to access the disk for this then it'll fail. This doesn't hit the disk. In the chrome side of the patch, I explicitly set for each renderer the default ICU locale from commandline option passed from browser process (--lang=xx). getDefault() returns the value set then. On Chrome OS, zygote and sandbox helper are spawned off of main browser process in very early stage, where the browser process does not know about UI language at that point. After user logs in, the browser changes its UI language according to the user's pref, and then passes '--lang=' commandline option and this is the only knowledge that renderers know. 360628 6 84376 kochi 2011-03-01 23:47:50 -0800 Created attachment 84376 Reflected comment from agl. 361239 7 84376 jshin 2011-03-02 17:32:24 -0800 Comment on attachment 84376 Reflected comment from agl. View in context: https://bugs.webkit.org/attachment.cgi?id=84376&action=review > WebKit/chromium/public/gtk/WebFontInfo.h:49 > + // or 2-letter with 2-letter region (e.g. "zh-cn") Language codes can be longer than 2-letter (e.g. fil) . The same is true of region code (numeric region code is 3-digit like 419). Also, actually, script code is better for the 2nd part (like zh-Hant vs zh-Hans). Anyway, just say 'locale identifier' (along with a couple of examples like zh-CN, ja) would suffice without going to details for this comment 361243 8 jshin 2011-03-02 17:36:34 -0800 Thank you, Kochi, for the patch. In reply to comment #2 : What this patch does is roughly equivalent to what Chrome Windows does (to deal with CJK glyph preferences). As Kochi wrote, this is a kinda interim solution (that works in most cases but not always) and bug 10874 and related bugs have to be fixed eventually. I earnestly plan to those bugs in March. In case of Chrome Windows, everything happens in the renderer (Webkit), but in case of Chrome Linux, fontconfig call goes out to the browser process. 361244 9 84376 agl 2011-03-02 17:36:45 -0800 Comment on attachment 84376 Reflected comment from agl. LGTM (I am not a WebKit reviewer. I need an r+ from a real reviewer before landing.) 361502 10 84543 kochi 2011-03-03 03:35:09 -0800 Created attachment 84543 Reflected comment from Jungshik. 361504 11 84376 kochi 2011-03-03 03:35:32 -0800 Comment on attachment 84376 Reflected comment from agl. View in context: https://bugs.webkit.org/attachment.cgi?id=84376&action=review >> WebKit/chromium/public/gtk/WebFontInfo.h:49 >> + // or 2-letter with 2-letter region (e.g. "zh-cn") > > Language codes can be longer than 2-letter (e.g. fil) . The same is true of region code (numeric region code is 3-digit like 419). Also, actually, script code is better for the 2nd part (like zh-Hant vs zh-Hans). Anyway, just say 'locale identifier' (along with a couple of examples like zh-CN, ja) would suffice without going to details for this comment Done. 361505 12 kochi 2011-03-03 03:48:45 -0800 Updated the patch for fixes to Jungshik's comment. Also I included a couple of minor changes in WebFontInfo from the previous patch: 1. made preferredLocale optional (= 0 default parameter) 2. NULL check for preferredLocale With 1, we can commit WebKit change side only once. For Chromium, I'll submit http://codereview.chromium.org/6592065/ first then I'll make follow-up changelist to really use this interface. Jungshik, could you take another look? 361719 13 84543 tony 2011-03-03 10:22:02 -0800 Comment on attachment 84543 Reflected comment from Jungshik. View in context: https://bugs.webkit.org/attachment.cgi?id=84543&action=review > WebKit/chromium/src/gtk/WebFontInfo.cpp:69 > + FcLangSet* langset = FcLangSetCreate(); > + FcLangSetAdd(langset, reinterpret_cast<const FcChar8 *>(preferredLocale)); > + FcPatternAddLangSet(pattern, FC_LANG, langset); > + FcLangSetDestroy(langset); WebKit style uses 4 space indents 361731 14 84543 kochi 2011-03-03 10:38:57 -0800 Comment on attachment 84543 Reflected comment from Jungshik. View in context: https://bugs.webkit.org/attachment.cgi?id=84543&action=review >> WebKit/chromium/src/gtk/WebFontInfo.cpp:69 >> + FcLangSetDestroy(langset); > > WebKit style uses 4 space indents Fixed. Thanks for the review! 361733 15 84584 kochi 2011-03-03 10:39:33 -0800 Created attachment 84584 Fix indentation pointed out by Tony. 362099 16 84584 tony 2011-03-03 17:06:33 -0800 Comment on attachment 84584 Fix indentation pointed out by Tony. View in context: https://bugs.webkit.org/attachment.cgi?id=84584&action=review r- because this patch is missing a ChangeLog entry. Also, shouldn't there be a LayoutTest? > WebKit/chromium/public/gtk/WebFontInfo.h:53 > - WEBKIT_API static WebCString familyForChars(const WebUChar* characters, size_t numCharacters); > + WEBKIT_API static WebCString familyForChars(const WebUChar* characters, size_t numCharacters, const char* preferredLocale = 0); Please file a bug about making |preferredLocale| not have a default param after the chromium side is landed and rolled in. 363218 17 84920 kochi 2011-03-06 21:31:03 -0800 Created attachment 84920 Added ChangeLogs. 363219 18 84584 kochi 2011-03-06 21:36:35 -0800 Comment on attachment 84584 Fix indentation pointed out by Tony. View in context: https://bugs.webkit.org/attachment.cgi?id=84584&action=review >> WebKit/chromium/public/gtk/WebFontInfo.h:53 >> + WEBKIT_API static WebCString familyForChars(const WebUChar* characters, size_t numCharacters, const char* preferredLocale = 0); > > Please file a bug about making |preferredLocale| not have a default param after the chromium side is landed and rolled in. Done. https://bugs.webkit.org/show_bug.cgi?id=55752 363234 19 84922 kochi 2011-03-06 22:55:24 -0800 Created attachment 84922 Fixed wrong ChangeLog entries and diff paths (now Source/ prefixed). 363257 20 kochi 2011-03-07 00:57:15 -0800 Tony, could you take another look at this? If this looks good, could you put this into commit queue? Thanks, 363259 21 kochi 2011-03-07 01:06:14 -0800 (In reply to comment #16) > (From update of attachment 84584 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=84584&action=review > > r- because this patch is missing a ChangeLog entry. Also, shouldn't there be a LayoutTest? As I also wrote in one of the ChangeLogs, the code depends on locale setting and cannot be run the test easily in the framework. So test will be added in the Chromium side. 363502 22 84922 commit-queue 2011-03-07 12:43:50 -0800 Comment on attachment 84922 Fixed wrong ChangeLog entries and diff paths (now Source/ prefixed). Clearing flags on attachment: 84922 Committed r80489: <http://trac.webkit.org/changeset/80489> 363503 23 commit-queue 2011-03-07 12:43:56 -0800 All reviewed patches have been landed. Closing bug. 84205 2011-03-01 03:01:33 -0800 2011-03-01 23:47:50 -0800 This is a tentative patch trying to implement passing preferred language to font fallback logic. WebKit-chromium-linux-font-lang.patch text/plain 5582 kochi SW5kZXg6IFdlYktpdC9jaHJvbWl1bS9zcmMvUGxhdGZvcm1CcmlkZ2UuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFdlYktpdC9jaHJvbWl1bS9zcmMvUGxhdGZvcm1CcmlkZ2UuY3BwCShyZXZpc2lvbiA3OTc1 NykKKysrIFdlYktpdC9jaHJvbWl1bS9zcmMvUGxhdGZvcm1CcmlkZ2UuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC00NjMsMTIgKzQ2MywxMiBAQAogI2VuZGlmCiAKICNpZiBPUyhMSU5VWCkgfHwgT1Mo RlJFRUJTRCkKLVN0cmluZyBQbGF0Zm9ybUJyaWRnZTo6Z2V0Rm9udEZhbWlseUZvckNoYXJhY3Rl cnMoY29uc3QgVUNoYXIqIGNoYXJhY3RlcnMsIHNpemVfdCBudW1DaGFyYWN0ZXJzKQorU3RyaW5n IFBsYXRmb3JtQnJpZGdlOjpnZXRGb250RmFtaWx5Rm9yQ2hhcmFjdGVycyhjb25zdCBVQ2hhciog Y2hhcmFjdGVycywgc2l6ZV90IG51bUNoYXJhY3RlcnMsIGNvbnN0IGNoYXIqIHByZWZlcnJlZExh bmd1YWdlKQogewogICAgIGlmICh3ZWJLaXRDbGllbnQoKS0+c2FuZGJveFN1cHBvcnQoKSkKLSAg ICAgICAgcmV0dXJuIHdlYktpdENsaWVudCgpLT5zYW5kYm94U3VwcG9ydCgpLT5nZXRGb250RmFt aWx5Rm9yQ2hhcmFjdGVycyhjaGFyYWN0ZXJzLCBudW1DaGFyYWN0ZXJzKTsKKyAgICAgICAgcmV0 dXJuIHdlYktpdENsaWVudCgpLT5zYW5kYm94U3VwcG9ydCgpLT5nZXRGb250RmFtaWx5Rm9yQ2hh cmFjdGVycyhjaGFyYWN0ZXJzLCBudW1DaGFyYWN0ZXJzLCBwcmVmZXJyZWRMYW5ndWFnZSk7CiAK LSAgICBXZWJDU3RyaW5nIGZhbWlseSA9IFdlYkZvbnRJbmZvOjpmYW1pbHlGb3JDaGFycyhjaGFy YWN0ZXJzLCBudW1DaGFyYWN0ZXJzKTsKKyAgICBXZWJDU3RyaW5nIGZhbWlseSA9IFdlYkZvbnRJ bmZvOjpmYW1pbHlGb3JDaGFycyhjaGFyYWN0ZXJzLCBudW1DaGFyYWN0ZXJzLCBwcmVmZXJyZWRM YW5ndWFnZSk7CiAgICAgaWYgKGZhbWlseS5kYXRhKCkpCiAgICAgICAgIHJldHVybiBXZWJTdHJp bmc6OmZyb21VVEY4KGZhbWlseS5kYXRhKCkpOwogCkluZGV4OiBXZWJLaXQvY2hyb21pdW0vc3Jj L2d0ay9XZWJGb250SW5mby5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2Nocm9taXVtL3NyYy9n dGsvV2ViRm9udEluZm8uY3BwCShyZXZpc2lvbiA3OTc1NykKKysrIFdlYktpdC9jaHJvbWl1bS9z cmMvZ3RrL1dlYkZvbnRJbmZvLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzgsNyArMzgsNyBAQAog CiBuYW1lc3BhY2UgV2ViS2l0IHsKIAotV2ViQ1N0cmluZyBXZWJGb250SW5mbzo6ZmFtaWx5Rm9y Q2hhcnMoY29uc3QgV2ViVUNoYXIqIGNoYXJhY3RlcnMsIHNpemVfdCBudW1DaGFyYWN0ZXJzKQor V2ViQ1N0cmluZyBXZWJGb250SW5mbzo6ZmFtaWx5Rm9yQ2hhcnMoY29uc3QgV2ViVUNoYXIqIGNo YXJhY3RlcnMsIHNpemVfdCBudW1DaGFyYWN0ZXJzLCBjb25zdCBjaGFyKiBwcmVmZXJyZWRMYW5n dWFnZSkKIHsKICAgICBGY0NoYXJTZXQqIGNzZXQgPSBGY0NoYXJTZXRDcmVhdGUoKTsKICAgICBm b3IgKHNpemVfdCBpID0gMDsgaSA8IG51bUNoYXJhY3RlcnM7ICsraSkgewpAQCAtNjIsNiArNjIs MTEgQEAKICAgICBmY3ZhbHVlLnUuYiA9IEZjVHJ1ZTsKICAgICBGY1BhdHRlcm5BZGQocGF0dGVy biwgRkNfU0NBTEFCTEUsIGZjdmFsdWUsIEZjRmFsc2UpOwogCisgICAgRmNMYW5nU2V0KiBsYW5n c2V0ID0gRmNMYW5nU2V0Q3JlYXRlKCk7CisgICAgRmNMYW5nU2V0QWRkKGxhbmdzZXQsIHJlaW50 ZXJwcmV0X2Nhc3Q8Y29uc3QgRmNDaGFyOCAqPihwcmVmZXJyZWRMYW5ndWFnZSkpOworICAgIEZj UGF0dGVybkFkZExhbmdTZXQocGF0dGVybiwgRkNfTEFORywgbGFuZ3NldCk7CisgICAgRmNMYW5n U2V0RGVzdHJveShsYW5nc2V0KTsKKwogICAgIEZjQ29uZmlnU3Vic3RpdHV0ZSgwLCBwYXR0ZXJu LCBGY01hdGNoUGF0dGVybik7CiAgICAgRmNEZWZhdWx0U3Vic3RpdHV0ZShwYXR0ZXJuKTsKIApJ bmRleDogV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9ndGsvV2ViRm9udEluZm8uaAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBXZWJLaXQvY2hyb21pdW0vcHVibGljL2d0ay9XZWJGb250SW5mby5oCShyZXZpc2lvbiA3 OTc1NykKKysrIFdlYktpdC9jaHJvbWl1bS9wdWJsaWMvZ3RrL1dlYkZvbnRJbmZvLmgJKHdvcmtp bmcgY29weSkKQEAgLTQ1LDEwICs0NSwxMSBAQAogICAgIC8vIHNwZWNpZmllZCBieSB8dXRmMTZ8 CiAgICAgLy8gICBjaGFyYWN0ZXJzOiBhIG5hdGl2ZS1lbmRpYW4gVVRGMTYgc3RyaW5nCiAgICAg Ly8gICBudW1DaGFyYWN0ZXJzOiB0aGUgbnVtYmVyIG9mIDE2LWJpdCB3b3JkcyBpbiB8dXRmMTZ8 CisgICAgLy8gICBwcmVmZXJyZWRMYW5ndWFnZTogcHJlZmVycmVkIGxhbmd1YWdlIGZvciB0aGUg Y2hhcmFjdGVycwogICAgIC8vCiAgICAgLy8gUmV0dXJuczogdGhlIGZvbnQgZmFtaWx5IG9yIGFu IGVtcHR5IHN0cmluZyBpZiB0aGUgcmVxdWVzdCBjb3VsZCBub3QgYmUKICAgICAvLyBzYXRpc2Zp ZWQuCi0gICAgV0VCS0lUX0FQSSBzdGF0aWMgV2ViQ1N0cmluZyBmYW1pbHlGb3JDaGFycyhjb25z dCBXZWJVQ2hhciogY2hhcmFjdGVycywgc2l6ZV90IG51bUNoYXJhY3RlcnMpOworICAgIFdFQktJ VF9BUEkgc3RhdGljIFdlYkNTdHJpbmcgZmFtaWx5Rm9yQ2hhcnMoY29uc3QgV2ViVUNoYXIqIGNo YXJhY3RlcnMsIHNpemVfdCBudW1DaGFyYWN0ZXJzLCBjb25zdCBjaGFyKiBwcmVmZXJyZWRMYW5n dWFnZSk7CiAKICAgICAvLyBGaWxsIG91dCB0aGUgZ2l2ZW4gV2ViRm9udFJlbmRlclN0eWxlIHdp dGggdGhlIHVzZXIncyBwcmVmZXJlbmNlcyBmb3IKICAgICAvLyByZW5kZXJpbmcgdGhlIGdpdmVu IGZvbnQgYXQgdGhlIGdpdmVuIHNpemUuCkluZGV4OiBXZWJLaXQvY2hyb21pdW0vcHVibGljL2xp bnV4L1dlYlNhbmRib3hTdXBwb3J0LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2Nocm9taXVtL3B1 YmxpYy9saW51eC9XZWJTYW5kYm94U3VwcG9ydC5oCShyZXZpc2lvbiA3OTc1NykKKysrIFdlYktp dC9jaHJvbWl1bS9wdWJsaWMvbGludXgvV2ViU2FuZGJveFN1cHBvcnQuaAkod29ya2luZyBjb3B5 KQpAQCAtNDcsMTAgKzQ3LDExIEBACiAgICAgLy8gY29kZS1wb2ludHMuCiAgICAgLy8gICBjaGFy YWN0ZXJzOiBhIFVURi0xNiBlbmNvZGVkIHN0cmluZwogICAgIC8vICAgbnVtQ2hhcmFjdGVyczog dGhlIG51bWJlciBvZiAxNi1iaXQgd29yZHMgaW4gfGNoYXJhY3RlcnN8CisgICAgLy8gICBwcmVm ZXJyZWRMYW5ndWFnZTogcHJlZmVycmVkIGxhbmd1YWdlIGZvciB0aGUgY2hhcmFjdGVycwogICAg IC8vCiAgICAgLy8gUmV0dXJucyBhIHN0cmluZyB3aXRoIHRoZSBmb250IGZhbWlseSBvbiBhbiBl bXB0eSBzdHJpbmcgaWYgdGhlCiAgICAgLy8gcmVxdWVzdCBjYW5ub3QgYmUgc2F0aXNmaWVkLgot ICAgIHZpcnR1YWwgV2ViU3RyaW5nIGdldEZvbnRGYW1pbHlGb3JDaGFyYWN0ZXJzKGNvbnN0IFdl YlVDaGFyKiBjaGFyYWN0ZXJzLCBzaXplX3QgbnVtQ2hhcmFjdGVycykgPSAwOworICB2aXJ0dWFs IFdlYlN0cmluZyBnZXRGb250RmFtaWx5Rm9yQ2hhcmFjdGVycyhjb25zdCBXZWJVQ2hhciogY2hh cmFjdGVycywgc2l6ZV90IG51bUNoYXJhY3RlcnMsIGNvbnN0IGNoYXIqIHByZWZlcnJlZExhbmd1 YWdlKSA9IDA7CiAgICAgdmlydHVhbCB2b2lkIGdldFJlbmRlclN0eWxlRm9yU3RyaWtlKGNvbnN0 IGNoYXIqIGZhbWlseSwgaW50IHNpemVBbmRTdHlsZSwgV2ViRm9udFJlbmRlclN0eWxlKiBzdHls ZSkgPSAwOwogfTsKIApJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9G b250Q2FjaGVMaW51eC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9jaHJvbWl1bS9Gb250Q2FjaGVMaW51eC5jcHAJKHJldmlzaW9uIDc5NzU3KQorKysgV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9Gb250Q2FjaGVMaW51eC5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTQzLDYgKzQzLDcgQEAKICNpbmNsdWRlICJTa1R5cGVmYWNlLmgiCiAjaW5jbHVk ZSAiU2tVdGlscy5oIgogCisjaW5jbHVkZSA8dW5pY29kZS9sb2NpZC5oPgogI2luY2x1ZGUgPHd0 Zi9Bc3NlcnRpb25zLmg+CiAjaW5jbHVkZSA8d3RmL3RleHQvQXRvbWljU3RyaW5nLmg+CiAjaW5j bHVkZSA8d3RmL3RleHQvQ1N0cmluZy5oPgpAQCAtNTcsNyArNTgsOCBAQAogICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IFVDaGFy KiBjaGFyYWN0ZXJzLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIGludCBsZW5ndGgpCiB7Ci0gICAgU3RyaW5nIGZhbWlseSA9IFBsYXRm b3JtQnJpZGdlOjpnZXRGb250RmFtaWx5Rm9yQ2hhcmFjdGVycyhjaGFyYWN0ZXJzLCBsZW5ndGgp OworICAgIGljdTo6TG9jYWxlIGxvY2FsZSA9IGljdTo6TG9jYWxlOjpnZXREZWZhdWx0KCk7Cisg ICAgU3RyaW5nIGZhbWlseSA9IFBsYXRmb3JtQnJpZGdlOjpnZXRGb250RmFtaWx5Rm9yQ2hhcmFj dGVycyhjaGFyYWN0ZXJzLCBsZW5ndGgsIGxvY2FsZS5nZXRMYW5ndWFnZSgpKTsKICAgICBpZiAo ZmFtaWx5LmlzRW1wdHkoKSkKICAgICAgICAgcmV0dXJuIDA7CiAKSW5kZXg6IFdlYkNvcmUvcGxh dGZvcm0vY2hyb21pdW0vUGxhdGZvcm1CcmlkZ2UuaAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3Bs YXRmb3JtL2Nocm9taXVtL1BsYXRmb3JtQnJpZGdlLmgJKHJldmlzaW9uIDc5NzU3KQorKysgV2Vi Q29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9QbGF0Zm9ybUJyaWRnZS5oCSh3b3JraW5nIGNvcHkpCkBA IC0xNTAsNyArMTUwLDcgQEAKICNlbmRpZgogI2lmIE9TKExJTlVYKSB8fCBPUyhGUkVFQlNEKQog ICAgIHN0YXRpYyB2b2lkIGdldFJlbmRlclN0eWxlRm9yU3RyaWtlKGNvbnN0IGNoYXIqIGZhbWls eSwgaW50IHNpemVBbmRTdHlsZSwgRm9udFJlbmRlclN0eWxlKiByZXN1bHQpOwotICAgIHN0YXRp YyBTdHJpbmcgZ2V0Rm9udEZhbWlseUZvckNoYXJhY3RlcnMoY29uc3QgVUNoYXIqLCBzaXplX3Qg bnVtQ2hhcmFjdGVycyk7CisgICAgc3RhdGljIFN0cmluZyBnZXRGb250RmFtaWx5Rm9yQ2hhcmFj dGVycyhjb25zdCBVQ2hhciosIHNpemVfdCBudW1DaGFyYWN0ZXJzLCBjb25zdCBjaGFyKiBwcmVm ZXJyZWRMYW5ndWFnZSk7CiAjZW5kaWYKICNpZiBPUyhEQVJXSU4pCiAgICAgc3RhdGljIGJvb2wg bG9hZEZvbnQoTlNGb250KiBzcmNGb250LCBBVFNGb250Q29udGFpbmVyUmVmKiBvdXQpOwo= 84376 2011-03-01 23:47:50 -0800 2011-03-03 03:35:32 -0800 Reflected comment from agl. WebKit-chromium-linux-font-lang2.patch text/plain 5766 kochi SW5kZXg6IFdlYktpdC9jaHJvbWl1bS9zcmMvUGxhdGZvcm1CcmlkZ2UuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFdlYktpdC9jaHJvbWl1bS9zcmMvUGxhdGZvcm1CcmlkZ2UuY3BwCShyZXZpc2lvbiA3OTc1 NykKKysrIFdlYktpdC9jaHJvbWl1bS9zcmMvUGxhdGZvcm1CcmlkZ2UuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC00NjMsMTIgKzQ2MywxMiBAQAogI2VuZGlmCiAKICNpZiBPUyhMSU5VWCkgfHwgT1Mo RlJFRUJTRCkKLVN0cmluZyBQbGF0Zm9ybUJyaWRnZTo6Z2V0Rm9udEZhbWlseUZvckNoYXJhY3Rl cnMoY29uc3QgVUNoYXIqIGNoYXJhY3RlcnMsIHNpemVfdCBudW1DaGFyYWN0ZXJzKQorU3RyaW5n IFBsYXRmb3JtQnJpZGdlOjpnZXRGb250RmFtaWx5Rm9yQ2hhcmFjdGVycyhjb25zdCBVQ2hhciog Y2hhcmFjdGVycywgc2l6ZV90IG51bUNoYXJhY3RlcnMsIGNvbnN0IGNoYXIqIHByZWZlcnJlZExh bmd1YWdlKQogewogICAgIGlmICh3ZWJLaXRDbGllbnQoKS0+c2FuZGJveFN1cHBvcnQoKSkKLSAg ICAgICAgcmV0dXJuIHdlYktpdENsaWVudCgpLT5zYW5kYm94U3VwcG9ydCgpLT5nZXRGb250RmFt aWx5Rm9yQ2hhcmFjdGVycyhjaGFyYWN0ZXJzLCBudW1DaGFyYWN0ZXJzKTsKKyAgICAgICAgcmV0 dXJuIHdlYktpdENsaWVudCgpLT5zYW5kYm94U3VwcG9ydCgpLT5nZXRGb250RmFtaWx5Rm9yQ2hh cmFjdGVycyhjaGFyYWN0ZXJzLCBudW1DaGFyYWN0ZXJzLCBwcmVmZXJyZWRMYW5ndWFnZSk7CiAK LSAgICBXZWJDU3RyaW5nIGZhbWlseSA9IFdlYkZvbnRJbmZvOjpmYW1pbHlGb3JDaGFycyhjaGFy YWN0ZXJzLCBudW1DaGFyYWN0ZXJzKTsKKyAgICBXZWJDU3RyaW5nIGZhbWlseSA9IFdlYkZvbnRJ bmZvOjpmYW1pbHlGb3JDaGFycyhjaGFyYWN0ZXJzLCBudW1DaGFyYWN0ZXJzLCBwcmVmZXJyZWRM YW5ndWFnZSk7CiAgICAgaWYgKGZhbWlseS5kYXRhKCkpCiAgICAgICAgIHJldHVybiBXZWJTdHJp bmc6OmZyb21VVEY4KGZhbWlseS5kYXRhKCkpOwogCkluZGV4OiBXZWJLaXQvY2hyb21pdW0vc3Jj L2d0ay9XZWJGb250SW5mby5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2Nocm9taXVtL3NyYy9n dGsvV2ViRm9udEluZm8uY3BwCShyZXZpc2lvbiA3OTc1NykKKysrIFdlYktpdC9jaHJvbWl1bS9z cmMvZ3RrL1dlYkZvbnRJbmZvLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzgsNyArMzgsNyBAQAog CiBuYW1lc3BhY2UgV2ViS2l0IHsKIAotV2ViQ1N0cmluZyBXZWJGb250SW5mbzo6ZmFtaWx5Rm9y Q2hhcnMoY29uc3QgV2ViVUNoYXIqIGNoYXJhY3RlcnMsIHNpemVfdCBudW1DaGFyYWN0ZXJzKQor V2ViQ1N0cmluZyBXZWJGb250SW5mbzo6ZmFtaWx5Rm9yQ2hhcnMoY29uc3QgV2ViVUNoYXIqIGNo YXJhY3RlcnMsIHNpemVfdCBudW1DaGFyYWN0ZXJzLCBjb25zdCBjaGFyKiBwcmVmZXJyZWRMYW5n dWFnZSkKIHsKICAgICBGY0NoYXJTZXQqIGNzZXQgPSBGY0NoYXJTZXRDcmVhdGUoKTsKICAgICBm b3IgKHNpemVfdCBpID0gMDsgaSA8IG51bUNoYXJhY3RlcnM7ICsraSkgewpAQCAtNjIsNiArNjIs MTEgQEAKICAgICBmY3ZhbHVlLnUuYiA9IEZjVHJ1ZTsKICAgICBGY1BhdHRlcm5BZGQocGF0dGVy biwgRkNfU0NBTEFCTEUsIGZjdmFsdWUsIEZjRmFsc2UpOwogCisgICAgRmNMYW5nU2V0KiBsYW5n c2V0ID0gRmNMYW5nU2V0Q3JlYXRlKCk7CisgICAgRmNMYW5nU2V0QWRkKGxhbmdzZXQsIHJlaW50 ZXJwcmV0X2Nhc3Q8Y29uc3QgRmNDaGFyOCAqPihwcmVmZXJyZWRMYW5ndWFnZSkpOworICAgIEZj UGF0dGVybkFkZExhbmdTZXQocGF0dGVybiwgRkNfTEFORywgbGFuZ3NldCk7CisgICAgRmNMYW5n U2V0RGVzdHJveShsYW5nc2V0KTsKKwogICAgIEZjQ29uZmlnU3Vic3RpdHV0ZSgwLCBwYXR0ZXJu LCBGY01hdGNoUGF0dGVybik7CiAgICAgRmNEZWZhdWx0U3Vic3RpdHV0ZShwYXR0ZXJuKTsKIApJ bmRleDogV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9ndGsvV2ViRm9udEluZm8uaAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBXZWJLaXQvY2hyb21pdW0vcHVibGljL2d0ay9XZWJGb250SW5mby5oCShyZXZpc2lvbiA3 OTc1NykKKysrIFdlYktpdC9jaHJvbWl1bS9wdWJsaWMvZ3RrL1dlYkZvbnRJbmZvLmgJKHdvcmtp bmcgY29weSkKQEAgLTQ1LDEwICs0NSwxMiBAQAogICAgIC8vIHNwZWNpZmllZCBieSB8dXRmMTZ8 CiAgICAgLy8gICBjaGFyYWN0ZXJzOiBhIG5hdGl2ZS1lbmRpYW4gVVRGMTYgc3RyaW5nCiAgICAg Ly8gICBudW1DaGFyYWN0ZXJzOiB0aGUgbnVtYmVyIG9mIDE2LWJpdCB3b3JkcyBpbiB8dXRmMTZ8 CisgICAgLy8gICBwcmVmZXJyZWRMYW5ndWFnZTogcHJlZmVycmVkIGxhbmd1YWdlIGZvciB0aGUg fGNoYXJhY3RlcnN8IGluIDItbGV0dGVyCisgICAgLy8gICAgICAgICAgICAgICAgICAgICAgb3Ig Mi1sZXR0ZXIgd2l0aCAyLWxldHRlciByZWdpb24gKGUuZy4gInpoLWNuIikKICAgICAvLwogICAg IC8vIFJldHVybnM6IHRoZSBmb250IGZhbWlseSBvciBhbiBlbXB0eSBzdHJpbmcgaWYgdGhlIHJl cXVlc3QgY291bGQgbm90IGJlCiAgICAgLy8gc2F0aXNmaWVkLgotICAgIFdFQktJVF9BUEkgc3Rh dGljIFdlYkNTdHJpbmcgZmFtaWx5Rm9yQ2hhcnMoY29uc3QgV2ViVUNoYXIqIGNoYXJhY3RlcnMs IHNpemVfdCBudW1DaGFyYWN0ZXJzKTsKKyAgICBXRUJLSVRfQVBJIHN0YXRpYyBXZWJDU3RyaW5n IGZhbWlseUZvckNoYXJzKGNvbnN0IFdlYlVDaGFyKiBjaGFyYWN0ZXJzLCBzaXplX3QgbnVtQ2hh cmFjdGVycywgY29uc3QgY2hhciogcHJlZmVycmVkTGFuZ3VhZ2UpOwogCiAgICAgLy8gRmlsbCBv dXQgdGhlIGdpdmVuIFdlYkZvbnRSZW5kZXJTdHlsZSB3aXRoIHRoZSB1c2VyJ3MgcHJlZmVyZW5j ZXMgZm9yCiAgICAgLy8gcmVuZGVyaW5nIHRoZSBnaXZlbiBmb250IGF0IHRoZSBnaXZlbiBzaXpl LgpJbmRleDogV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9saW51eC9XZWJTYW5kYm94U3VwcG9ydC5o Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFdlYktpdC9jaHJvbWl1bS9wdWJsaWMvbGludXgvV2ViU2FuZGJveFN1 cHBvcnQuaAkocmV2aXNpb24gNzk3NTcpCisrKyBXZWJLaXQvY2hyb21pdW0vcHVibGljL2xpbnV4 L1dlYlNhbmRib3hTdXBwb3J0LmgJKHdvcmtpbmcgY29weSkKQEAgLTQ3LDEwICs0NywxMiBAQAog ICAgIC8vIGNvZGUtcG9pbnRzLgogICAgIC8vICAgY2hhcmFjdGVyczogYSBVVEYtMTYgZW5jb2Rl ZCBzdHJpbmcKICAgICAvLyAgIG51bUNoYXJhY3RlcnM6IHRoZSBudW1iZXIgb2YgMTYtYml0IHdv cmRzIGluIHxjaGFyYWN0ZXJzfAorICAgIC8vICAgcHJlZmVycmVkTGFuZ3VhZ2U6IHByZWZlcnJl ZCBsYW5ndWFnZSBmb3IgdGhlIHxjaGFyYWN0ZXJzfCBpbiAyLWxldHRlcgorICAgIC8vICAgICAg ICAgICAgICAgICAgICAgIG9yIDItbGV0dGVyIHdpdGggMi1sZXR0ZXIgcmVnaW9uIChlLmcuICJ6 aC1jbiIpCiAgICAgLy8KICAgICAvLyBSZXR1cm5zIGEgc3RyaW5nIHdpdGggdGhlIGZvbnQgZmFt aWx5IG9uIGFuIGVtcHR5IHN0cmluZyBpZiB0aGUKICAgICAvLyByZXF1ZXN0IGNhbm5vdCBiZSBz YXRpc2ZpZWQuCi0gICAgdmlydHVhbCBXZWJTdHJpbmcgZ2V0Rm9udEZhbWlseUZvckNoYXJhY3Rl cnMoY29uc3QgV2ViVUNoYXIqIGNoYXJhY3RlcnMsIHNpemVfdCBudW1DaGFyYWN0ZXJzKSA9IDA7 CisgICAgdmlydHVhbCBXZWJTdHJpbmcgZ2V0Rm9udEZhbWlseUZvckNoYXJhY3RlcnMoY29uc3Qg V2ViVUNoYXIqIGNoYXJhY3RlcnMsIHNpemVfdCBudW1DaGFyYWN0ZXJzLCBjb25zdCBjaGFyKiBw cmVmZXJyZWRMYW5ndWFnZSkgPSAwOwogICAgIHZpcnR1YWwgdm9pZCBnZXRSZW5kZXJTdHlsZUZv clN0cmlrZShjb25zdCBjaGFyKiBmYW1pbHksIGludCBzaXplQW5kU3R5bGUsIFdlYkZvbnRSZW5k ZXJTdHlsZSogc3R5bGUpID0gMDsKIH07CiAKSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvY2hyb21pdW0vRm9udENhY2hlTGludXguY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vRm9udENhY2hlTGludXguY3BwCShyZXZpc2lvbiA3OTc1 NykKKysrIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vRm9udENhY2hlTGludXgu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC00Myw2ICs0Myw3IEBACiAjaW5jbHVkZSAiU2tUeXBlZmFj ZS5oIgogI2luY2x1ZGUgIlNrVXRpbHMuaCIKIAorI2luY2x1ZGUgPHVuaWNvZGUvbG9jaWQuaD4K ICNpbmNsdWRlIDx3dGYvQXNzZXJ0aW9ucy5oPgogI2luY2x1ZGUgPHd0Zi90ZXh0L0F0b21pY1N0 cmluZy5oPgogI2luY2x1ZGUgPHd0Zi90ZXh0L0NTdHJpbmcuaD4KQEAgLTU3LDcgKzU4LDggQEAK ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBjb25zdCBVQ2hhciogY2hhcmFjdGVycywKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpbnQgbGVuZ3RoKQogewotICAgIFN0cmluZyBm YW1pbHkgPSBQbGF0Zm9ybUJyaWRnZTo6Z2V0Rm9udEZhbWlseUZvckNoYXJhY3RlcnMoY2hhcmFj dGVycywgbGVuZ3RoKTsKKyAgICBpY3U6OkxvY2FsZSBsb2NhbGUgPSBpY3U6OkxvY2FsZTo6Z2V0 RGVmYXVsdCgpOworICAgIFN0cmluZyBmYW1pbHkgPSBQbGF0Zm9ybUJyaWRnZTo6Z2V0Rm9udEZh bWlseUZvckNoYXJhY3RlcnMoY2hhcmFjdGVycywgbGVuZ3RoLCBsb2NhbGUuZ2V0TGFuZ3VhZ2Uo KSk7CiAgICAgaWYgKGZhbWlseS5pc0VtcHR5KCkpCiAgICAgICAgIHJldHVybiAwOwogCkluZGV4 OiBXZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL1BsYXRmb3JtQnJpZGdlLmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9QbGF0Zm9ybUJyaWRnZS5oCShyZXZpc2lvbiA3 OTc1NykKKysrIFdlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vUGxhdGZvcm1CcmlkZ2UuaAkod29y a2luZyBjb3B5KQpAQCAtMTUwLDcgKzE1MCw3IEBACiAjZW5kaWYKICNpZiBPUyhMSU5VWCkgfHwg T1MoRlJFRUJTRCkKICAgICBzdGF0aWMgdm9pZCBnZXRSZW5kZXJTdHlsZUZvclN0cmlrZShjb25z dCBjaGFyKiBmYW1pbHksIGludCBzaXplQW5kU3R5bGUsIEZvbnRSZW5kZXJTdHlsZSogcmVzdWx0 KTsKLSAgICBzdGF0aWMgU3RyaW5nIGdldEZvbnRGYW1pbHlGb3JDaGFyYWN0ZXJzKGNvbnN0IFVD aGFyKiwgc2l6ZV90IG51bUNoYXJhY3RlcnMpOworICAgIHN0YXRpYyBTdHJpbmcgZ2V0Rm9udEZh bWlseUZvckNoYXJhY3RlcnMoY29uc3QgVUNoYXIqLCBzaXplX3QgbnVtQ2hhcmFjdGVycywgY29u c3QgY2hhciogcHJlZmVycmVkTGFuZ3VhZ2UpOwogI2VuZGlmCiAjaWYgT1MoREFSV0lOKQogICAg IHN0YXRpYyBib29sIGxvYWRGb250KE5TRm9udCogc3JjRm9udCwgQVRTRm9udENvbnRhaW5lclJl Ziogb3V0KTsK 84543 2011-03-03 03:35:09 -0800 2011-03-03 10:39:33 -0800 Reflected comment from Jungshik. WebKit-chromium-linux-font-lang4.patch text/plain 5742 kochi SW5kZXg6IFdlYktpdC9jaHJvbWl1bS9zcmMvUGxhdGZvcm1CcmlkZ2UuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFdlYktpdC9jaHJvbWl1bS9zcmMvUGxhdGZvcm1CcmlkZ2UuY3BwCShyZXZpc2lvbiA4MDE2 OCkKKysrIFdlYktpdC9jaHJvbWl1bS9zcmMvUGxhdGZvcm1CcmlkZ2UuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC00NjMsMTIgKzQ2MywxMiBAQAogI2VuZGlmCiAKICNpZiBPUyhMSU5VWCkgfHwgT1Mo RlJFRUJTRCkKLVN0cmluZyBQbGF0Zm9ybUJyaWRnZTo6Z2V0Rm9udEZhbWlseUZvckNoYXJhY3Rl cnMoY29uc3QgVUNoYXIqIGNoYXJhY3RlcnMsIHNpemVfdCBudW1DaGFyYWN0ZXJzKQorU3RyaW5n IFBsYXRmb3JtQnJpZGdlOjpnZXRGb250RmFtaWx5Rm9yQ2hhcmFjdGVycyhjb25zdCBVQ2hhciog Y2hhcmFjdGVycywgc2l6ZV90IG51bUNoYXJhY3RlcnMsIGNvbnN0IGNoYXIqIHByZWZlcnJlZExv Y2FsZSkKIHsKICAgICBpZiAod2ViS2l0Q2xpZW50KCktPnNhbmRib3hTdXBwb3J0KCkpCi0gICAg ICAgIHJldHVybiB3ZWJLaXRDbGllbnQoKS0+c2FuZGJveFN1cHBvcnQoKS0+Z2V0Rm9udEZhbWls eUZvckNoYXJhY3RlcnMoY2hhcmFjdGVycywgbnVtQ2hhcmFjdGVycyk7CisgICAgICAgIHJldHVy biB3ZWJLaXRDbGllbnQoKS0+c2FuZGJveFN1cHBvcnQoKS0+Z2V0Rm9udEZhbWlseUZvckNoYXJh Y3RlcnMoY2hhcmFjdGVycywgbnVtQ2hhcmFjdGVycywgcHJlZmVycmVkTG9jYWxlKTsKIAotICAg IFdlYkNTdHJpbmcgZmFtaWx5ID0gV2ViRm9udEluZm86OmZhbWlseUZvckNoYXJzKGNoYXJhY3Rl cnMsIG51bUNoYXJhY3RlcnMpOworICAgIFdlYkNTdHJpbmcgZmFtaWx5ID0gV2ViRm9udEluZm86 OmZhbWlseUZvckNoYXJzKGNoYXJhY3RlcnMsIG51bUNoYXJhY3RlcnMsIHByZWZlcnJlZExvY2Fs ZSk7CiAgICAgaWYgKGZhbWlseS5kYXRhKCkpCiAgICAgICAgIHJldHVybiBXZWJTdHJpbmc6OmZy b21VVEY4KGZhbWlseS5kYXRhKCkpOwogCkluZGV4OiBXZWJLaXQvY2hyb21pdW0vc3JjL2d0ay9X ZWJGb250SW5mby5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2Nocm9taXVtL3NyYy9ndGsvV2Vi Rm9udEluZm8uY3BwCShyZXZpc2lvbiA4MDE2OCkKKysrIFdlYktpdC9jaHJvbWl1bS9zcmMvZ3Rr L1dlYkZvbnRJbmZvLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzgsNyArMzgsNyBAQAogCiBuYW1l c3BhY2UgV2ViS2l0IHsKIAotV2ViQ1N0cmluZyBXZWJGb250SW5mbzo6ZmFtaWx5Rm9yQ2hhcnMo Y29uc3QgV2ViVUNoYXIqIGNoYXJhY3RlcnMsIHNpemVfdCBudW1DaGFyYWN0ZXJzKQorV2ViQ1N0 cmluZyBXZWJGb250SW5mbzo6ZmFtaWx5Rm9yQ2hhcnMoY29uc3QgV2ViVUNoYXIqIGNoYXJhY3Rl cnMsIHNpemVfdCBudW1DaGFyYWN0ZXJzLCBjb25zdCBjaGFyKiBwcmVmZXJyZWRMb2NhbGUpCiB7 CiAgICAgRmNDaGFyU2V0KiBjc2V0ID0gRmNDaGFyU2V0Q3JlYXRlKCk7CiAgICAgZm9yIChzaXpl X3QgaSA9IDA7IGkgPCBudW1DaGFyYWN0ZXJzOyArK2kpIHsKQEAgLTYyLDYgKzYyLDEzIEBACiAg ICAgZmN2YWx1ZS51LmIgPSBGY1RydWU7CiAgICAgRmNQYXR0ZXJuQWRkKHBhdHRlcm4sIEZDX1ND QUxBQkxFLCBmY3ZhbHVlLCBGY0ZhbHNlKTsKIAorICAgIGlmIChwcmVmZXJyZWRMb2NhbGUpIHsK KyAgICAgIEZjTGFuZ1NldCogbGFuZ3NldCA9IEZjTGFuZ1NldENyZWF0ZSgpOworICAgICAgRmNM YW5nU2V0QWRkKGxhbmdzZXQsIHJlaW50ZXJwcmV0X2Nhc3Q8Y29uc3QgRmNDaGFyOCAqPihwcmVm ZXJyZWRMb2NhbGUpKTsKKyAgICAgIEZjUGF0dGVybkFkZExhbmdTZXQocGF0dGVybiwgRkNfTEFO RywgbGFuZ3NldCk7CisgICAgICBGY0xhbmdTZXREZXN0cm95KGxhbmdzZXQpOworICAgIH0KKwog ICAgIEZjQ29uZmlnU3Vic3RpdHV0ZSgwLCBwYXR0ZXJuLCBGY01hdGNoUGF0dGVybik7CiAgICAg RmNEZWZhdWx0U3Vic3RpdHV0ZShwYXR0ZXJuKTsKIApJbmRleDogV2ViS2l0L2Nocm9taXVtL3B1 YmxpYy9ndGsvV2ViRm9udEluZm8uaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvY2hyb21pdW0vcHVi bGljL2d0ay9XZWJGb250SW5mby5oCShyZXZpc2lvbiA4MDE2OCkKKysrIFdlYktpdC9jaHJvbWl1 bS9wdWJsaWMvZ3RrL1dlYkZvbnRJbmZvLmgJKHdvcmtpbmcgY29weSkKQEAgLTQ1LDEwICs0NSwx MiBAQAogICAgIC8vIHNwZWNpZmllZCBieSB8dXRmMTZ8CiAgICAgLy8gICBjaGFyYWN0ZXJzOiBh IG5hdGl2ZS1lbmRpYW4gVVRGMTYgc3RyaW5nCiAgICAgLy8gICBudW1DaGFyYWN0ZXJzOiB0aGUg bnVtYmVyIG9mIDE2LWJpdCB3b3JkcyBpbiB8dXRmMTZ8CisgICAgLy8gICBwcmVmZXJyZWRMb2Nh bGU6IHByZWZlcnJlZCBsb2NhbGUgaWRlbnRpZmllciBmb3IgdGhlIHxjaGFyYWN0ZXJzfAorICAg IC8vICAgICAgICAgICAgICAgICAgICAoZS5nLiAiZW4iLCAiamEiLCAiemgtQ04iKQogICAgIC8v CiAgICAgLy8gUmV0dXJuczogdGhlIGZvbnQgZmFtaWx5IG9yIGFuIGVtcHR5IHN0cmluZyBpZiB0 aGUgcmVxdWVzdCBjb3VsZCBub3QgYmUKICAgICAvLyBzYXRpc2ZpZWQuCi0gICAgV0VCS0lUX0FQ SSBzdGF0aWMgV2ViQ1N0cmluZyBmYW1pbHlGb3JDaGFycyhjb25zdCBXZWJVQ2hhciogY2hhcmFj dGVycywgc2l6ZV90IG51bUNoYXJhY3RlcnMpOworICAgIFdFQktJVF9BUEkgc3RhdGljIFdlYkNT dHJpbmcgZmFtaWx5Rm9yQ2hhcnMoY29uc3QgV2ViVUNoYXIqIGNoYXJhY3RlcnMsIHNpemVfdCBu dW1DaGFyYWN0ZXJzLCBjb25zdCBjaGFyKiBwcmVmZXJyZWRMb2NhbGUgPSAwKTsKIAogICAgIC8v IEZpbGwgb3V0IHRoZSBnaXZlbiBXZWJGb250UmVuZGVyU3R5bGUgd2l0aCB0aGUgdXNlcidzIHBy ZWZlcmVuY2VzIGZvcgogICAgIC8vIHJlbmRlcmluZyB0aGUgZ2l2ZW4gZm9udCBhdCB0aGUgZ2l2 ZW4gc2l6ZS4KSW5kZXg6IFdlYktpdC9jaHJvbWl1bS9wdWJsaWMvbGludXgvV2ViU2FuZGJveFN1 cHBvcnQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvY2hyb21pdW0vcHVibGljL2xpbnV4L1dlYlNh bmRib3hTdXBwb3J0LmgJKHJldmlzaW9uIDgwMTY4KQorKysgV2ViS2l0L2Nocm9taXVtL3B1Ymxp Yy9saW51eC9XZWJTYW5kYm94U3VwcG9ydC5oCSh3b3JraW5nIGNvcHkpCkBAIC00NywxMCArNDcs MTIgQEAKICAgICAvLyBjb2RlLXBvaW50cy4KICAgICAvLyAgIGNoYXJhY3RlcnM6IGEgVVRGLTE2 IGVuY29kZWQgc3RyaW5nCiAgICAgLy8gICBudW1DaGFyYWN0ZXJzOiB0aGUgbnVtYmVyIG9mIDE2 LWJpdCB3b3JkcyBpbiB8Y2hhcmFjdGVyc3wKKyAgICAvLyAgIHByZWZlcnJlZExvY2FsZTogcHJl ZmVycmVkIGxvY2FsZSBpZGVudGlmaWVyIGZvciB0aGUgfGNoYXJhY3RlcnN8CisgICAgLy8gICAg ICAgICAgICAgICAgICAgIChlLmcuICJlbiIsICJqYSIsICJ6aC1DTiIpCiAgICAgLy8KICAgICAv LyBSZXR1cm5zIGEgc3RyaW5nIHdpdGggdGhlIGZvbnQgZmFtaWx5IG9uIGFuIGVtcHR5IHN0cmlu ZyBpZiB0aGUKICAgICAvLyByZXF1ZXN0IGNhbm5vdCBiZSBzYXRpc2ZpZWQuCi0gICAgdmlydHVh bCBXZWJTdHJpbmcgZ2V0Rm9udEZhbWlseUZvckNoYXJhY3RlcnMoY29uc3QgV2ViVUNoYXIqIGNo YXJhY3RlcnMsIHNpemVfdCBudW1DaGFyYWN0ZXJzKSA9IDA7CisgICAgdmlydHVhbCBXZWJTdHJp bmcgZ2V0Rm9udEZhbWlseUZvckNoYXJhY3RlcnMoY29uc3QgV2ViVUNoYXIqIGNoYXJhY3RlcnMs IHNpemVfdCBudW1DaGFyYWN0ZXJzLCBjb25zdCBjaGFyKiBwcmVmZXJyZWRMb2NhbGUpICA9IDA7 CiAgICAgdmlydHVhbCB2b2lkIGdldFJlbmRlclN0eWxlRm9yU3RyaWtlKGNvbnN0IGNoYXIqIGZh bWlseSwgaW50IHNpemVBbmRTdHlsZSwgV2ViRm9udFJlbmRlclN0eWxlKiBzdHlsZSkgPSAwOwog fTsKIApJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9Gb250Q2FjaGVM aW51eC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1 bS9Gb250Q2FjaGVMaW51eC5jcHAJKHJldmlzaW9uIDgwMTY4KQorKysgV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9jaHJvbWl1bS9Gb250Q2FjaGVMaW51eC5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTQzLDYgKzQzLDcgQEAKICNpbmNsdWRlICJTa1R5cGVmYWNlLmgiCiAjaW5jbHVkZSAiU2tVdGls cy5oIgogCisjaW5jbHVkZSA8dW5pY29kZS9sb2NpZC5oPgogI2luY2x1ZGUgPHd0Zi9Bc3NlcnRp b25zLmg+CiAjaW5jbHVkZSA8d3RmL3RleHQvQXRvbWljU3RyaW5nLmg+CiAjaW5jbHVkZSA8d3Rm L3RleHQvQ1N0cmluZy5oPgpAQCAtNTcsNyArNTgsOCBAQAogICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IFVDaGFyKiBjaGFyYWN0 ZXJzLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIGludCBsZW5ndGgpCiB7Ci0gICAgU3RyaW5nIGZhbWlseSA9IFBsYXRmb3JtQnJpZGdl OjpnZXRGb250RmFtaWx5Rm9yQ2hhcmFjdGVycyhjaGFyYWN0ZXJzLCBsZW5ndGgpOworICAgIGlj dTo6TG9jYWxlIGxvY2FsZSA9IGljdTo6TG9jYWxlOjpnZXREZWZhdWx0KCk7CisgICAgU3RyaW5n IGZhbWlseSA9IFBsYXRmb3JtQnJpZGdlOjpnZXRGb250RmFtaWx5Rm9yQ2hhcmFjdGVycyhjaGFy YWN0ZXJzLCBsZW5ndGgsIGxvY2FsZS5nZXRMYW5ndWFnZSgpKTsKICAgICBpZiAoZmFtaWx5Lmlz RW1wdHkoKSkKICAgICAgICAgcmV0dXJuIDA7CiAKSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vY2hy b21pdW0vUGxhdGZvcm1CcmlkZ2UuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL2No cm9taXVtL1BsYXRmb3JtQnJpZGdlLmgJKHJldmlzaW9uIDgwMTY4KQorKysgV2ViQ29yZS9wbGF0 Zm9ybS9jaHJvbWl1bS9QbGF0Zm9ybUJyaWRnZS5oCSh3b3JraW5nIGNvcHkpCkBAIC0xNTAsNyAr MTUwLDcgQEAKICNlbmRpZgogI2lmIE9TKExJTlVYKSB8fCBPUyhGUkVFQlNEKQogICAgIHN0YXRp YyB2b2lkIGdldFJlbmRlclN0eWxlRm9yU3RyaWtlKGNvbnN0IGNoYXIqIGZhbWlseSwgaW50IHNp emVBbmRTdHlsZSwgRm9udFJlbmRlclN0eWxlKiByZXN1bHQpOwotICAgIHN0YXRpYyBTdHJpbmcg Z2V0Rm9udEZhbWlseUZvckNoYXJhY3RlcnMoY29uc3QgVUNoYXIqLCBzaXplX3QgbnVtQ2hhcmFj dGVycyk7CisgICAgc3RhdGljIFN0cmluZyBnZXRGb250RmFtaWx5Rm9yQ2hhcmFjdGVycyhjb25z dCBVQ2hhciosIHNpemVfdCBudW1DaGFyYWN0ZXJzLCBjb25zdCBjaGFyKiBwcmVmZXJyZWRMb2Nh bGUpOwogI2VuZGlmCiAjaWYgT1MoREFSV0lOKQogICAgIHN0YXRpYyBib29sIGxvYWRGb250KE5T Rm9udCogc3JjRm9udCwgQVRTRm9udENvbnRhaW5lclJlZiogb3V0KTsK 84584 2011-03-03 10:39:33 -0800 2011-03-06 21:36:35 -0800 Fix indentation pointed out by Tony. WebKit-chromium-linux-font-lang5.patch text/plain 5750 kochi SW5kZXg6IFdlYktpdC9jaHJvbWl1bS9zcmMvUGxhdGZvcm1CcmlkZ2UuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFdlYktpdC9jaHJvbWl1bS9zcmMvUGxhdGZvcm1CcmlkZ2UuY3BwCShyZXZpc2lvbiA4MDE2 OCkKKysrIFdlYktpdC9jaHJvbWl1bS9zcmMvUGxhdGZvcm1CcmlkZ2UuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC00NjMsMTIgKzQ2MywxMiBAQAogI2VuZGlmCiAKICNpZiBPUyhMSU5VWCkgfHwgT1Mo RlJFRUJTRCkKLVN0cmluZyBQbGF0Zm9ybUJyaWRnZTo6Z2V0Rm9udEZhbWlseUZvckNoYXJhY3Rl cnMoY29uc3QgVUNoYXIqIGNoYXJhY3RlcnMsIHNpemVfdCBudW1DaGFyYWN0ZXJzKQorU3RyaW5n IFBsYXRmb3JtQnJpZGdlOjpnZXRGb250RmFtaWx5Rm9yQ2hhcmFjdGVycyhjb25zdCBVQ2hhciog Y2hhcmFjdGVycywgc2l6ZV90IG51bUNoYXJhY3RlcnMsIGNvbnN0IGNoYXIqIHByZWZlcnJlZExv Y2FsZSkKIHsKICAgICBpZiAod2ViS2l0Q2xpZW50KCktPnNhbmRib3hTdXBwb3J0KCkpCi0gICAg ICAgIHJldHVybiB3ZWJLaXRDbGllbnQoKS0+c2FuZGJveFN1cHBvcnQoKS0+Z2V0Rm9udEZhbWls eUZvckNoYXJhY3RlcnMoY2hhcmFjdGVycywgbnVtQ2hhcmFjdGVycyk7CisgICAgICAgIHJldHVy biB3ZWJLaXRDbGllbnQoKS0+c2FuZGJveFN1cHBvcnQoKS0+Z2V0Rm9udEZhbWlseUZvckNoYXJh Y3RlcnMoY2hhcmFjdGVycywgbnVtQ2hhcmFjdGVycywgcHJlZmVycmVkTG9jYWxlKTsKIAotICAg IFdlYkNTdHJpbmcgZmFtaWx5ID0gV2ViRm9udEluZm86OmZhbWlseUZvckNoYXJzKGNoYXJhY3Rl cnMsIG51bUNoYXJhY3RlcnMpOworICAgIFdlYkNTdHJpbmcgZmFtaWx5ID0gV2ViRm9udEluZm86 OmZhbWlseUZvckNoYXJzKGNoYXJhY3RlcnMsIG51bUNoYXJhY3RlcnMsIHByZWZlcnJlZExvY2Fs ZSk7CiAgICAgaWYgKGZhbWlseS5kYXRhKCkpCiAgICAgICAgIHJldHVybiBXZWJTdHJpbmc6OmZy b21VVEY4KGZhbWlseS5kYXRhKCkpOwogCkluZGV4OiBXZWJLaXQvY2hyb21pdW0vc3JjL2d0ay9X ZWJGb250SW5mby5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2Nocm9taXVtL3NyYy9ndGsvV2Vi Rm9udEluZm8uY3BwCShyZXZpc2lvbiA4MDE2OCkKKysrIFdlYktpdC9jaHJvbWl1bS9zcmMvZ3Rr L1dlYkZvbnRJbmZvLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzgsNyArMzgsNyBAQAogCiBuYW1l c3BhY2UgV2ViS2l0IHsKIAotV2ViQ1N0cmluZyBXZWJGb250SW5mbzo6ZmFtaWx5Rm9yQ2hhcnMo Y29uc3QgV2ViVUNoYXIqIGNoYXJhY3RlcnMsIHNpemVfdCBudW1DaGFyYWN0ZXJzKQorV2ViQ1N0 cmluZyBXZWJGb250SW5mbzo6ZmFtaWx5Rm9yQ2hhcnMoY29uc3QgV2ViVUNoYXIqIGNoYXJhY3Rl cnMsIHNpemVfdCBudW1DaGFyYWN0ZXJzLCBjb25zdCBjaGFyKiBwcmVmZXJyZWRMb2NhbGUpCiB7 CiAgICAgRmNDaGFyU2V0KiBjc2V0ID0gRmNDaGFyU2V0Q3JlYXRlKCk7CiAgICAgZm9yIChzaXpl X3QgaSA9IDA7IGkgPCBudW1DaGFyYWN0ZXJzOyArK2kpIHsKQEAgLTYyLDYgKzYyLDEzIEBACiAg ICAgZmN2YWx1ZS51LmIgPSBGY1RydWU7CiAgICAgRmNQYXR0ZXJuQWRkKHBhdHRlcm4sIEZDX1ND QUxBQkxFLCBmY3ZhbHVlLCBGY0ZhbHNlKTsKIAorICAgIGlmIChwcmVmZXJyZWRMb2NhbGUpIHsK KyAgICAgICAgRmNMYW5nU2V0KiBsYW5nc2V0ID0gRmNMYW5nU2V0Q3JlYXRlKCk7CisgICAgICAg IEZjTGFuZ1NldEFkZChsYW5nc2V0LCByZWludGVycHJldF9jYXN0PGNvbnN0IEZjQ2hhcjggKj4o cHJlZmVycmVkTG9jYWxlKSk7CisgICAgICAgIEZjUGF0dGVybkFkZExhbmdTZXQocGF0dGVybiwg RkNfTEFORywgbGFuZ3NldCk7CisgICAgICAgIEZjTGFuZ1NldERlc3Ryb3kobGFuZ3NldCk7Cisg ICAgfQorCiAgICAgRmNDb25maWdTdWJzdGl0dXRlKDAsIHBhdHRlcm4sIEZjTWF0Y2hQYXR0ZXJu KTsKICAgICBGY0RlZmF1bHRTdWJzdGl0dXRlKHBhdHRlcm4pOwogCkluZGV4OiBXZWJLaXQvY2hy b21pdW0vcHVibGljL2d0ay9XZWJGb250SW5mby5oCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9jaHJv bWl1bS9wdWJsaWMvZ3RrL1dlYkZvbnRJbmZvLmgJKHJldmlzaW9uIDgwMTY4KQorKysgV2ViS2l0 L2Nocm9taXVtL3B1YmxpYy9ndGsvV2ViRm9udEluZm8uaAkod29ya2luZyBjb3B5KQpAQCAtNDUs MTAgKzQ1LDEyIEBACiAgICAgLy8gc3BlY2lmaWVkIGJ5IHx1dGYxNnwKICAgICAvLyAgIGNoYXJh Y3RlcnM6IGEgbmF0aXZlLWVuZGlhbiBVVEYxNiBzdHJpbmcKICAgICAvLyAgIG51bUNoYXJhY3Rl cnM6IHRoZSBudW1iZXIgb2YgMTYtYml0IHdvcmRzIGluIHx1dGYxNnwKKyAgICAvLyAgIHByZWZl cnJlZExvY2FsZTogcHJlZmVycmVkIGxvY2FsZSBpZGVudGlmaWVyIGZvciB0aGUgfGNoYXJhY3Rl cnN8CisgICAgLy8gICAgICAgICAgICAgICAgICAgIChlLmcuICJlbiIsICJqYSIsICJ6aC1DTiIp CiAgICAgLy8KICAgICAvLyBSZXR1cm5zOiB0aGUgZm9udCBmYW1pbHkgb3IgYW4gZW1wdHkgc3Ry aW5nIGlmIHRoZSByZXF1ZXN0IGNvdWxkIG5vdCBiZQogICAgIC8vIHNhdGlzZmllZC4KLSAgICBX RUJLSVRfQVBJIHN0YXRpYyBXZWJDU3RyaW5nIGZhbWlseUZvckNoYXJzKGNvbnN0IFdlYlVDaGFy KiBjaGFyYWN0ZXJzLCBzaXplX3QgbnVtQ2hhcmFjdGVycyk7CisgICAgV0VCS0lUX0FQSSBzdGF0 aWMgV2ViQ1N0cmluZyBmYW1pbHlGb3JDaGFycyhjb25zdCBXZWJVQ2hhciogY2hhcmFjdGVycywg c2l6ZV90IG51bUNoYXJhY3RlcnMsIGNvbnN0IGNoYXIqIHByZWZlcnJlZExvY2FsZSA9IDApOwog CiAgICAgLy8gRmlsbCBvdXQgdGhlIGdpdmVuIFdlYkZvbnRSZW5kZXJTdHlsZSB3aXRoIHRoZSB1 c2VyJ3MgcHJlZmVyZW5jZXMgZm9yCiAgICAgLy8gcmVuZGVyaW5nIHRoZSBnaXZlbiBmb250IGF0 IHRoZSBnaXZlbiBzaXplLgpJbmRleDogV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9saW51eC9XZWJT YW5kYm94U3VwcG9ydC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9jaHJvbWl1bS9wdWJsaWMvbGlu dXgvV2ViU2FuZGJveFN1cHBvcnQuaAkocmV2aXNpb24gODAxNjgpCisrKyBXZWJLaXQvY2hyb21p dW0vcHVibGljL2xpbnV4L1dlYlNhbmRib3hTdXBwb3J0LmgJKHdvcmtpbmcgY29weSkKQEAgLTQ3 LDEwICs0NywxMiBAQAogICAgIC8vIGNvZGUtcG9pbnRzLgogICAgIC8vICAgY2hhcmFjdGVyczog YSBVVEYtMTYgZW5jb2RlZCBzdHJpbmcKICAgICAvLyAgIG51bUNoYXJhY3RlcnM6IHRoZSBudW1i ZXIgb2YgMTYtYml0IHdvcmRzIGluIHxjaGFyYWN0ZXJzfAorICAgIC8vICAgcHJlZmVycmVkTG9j YWxlOiBwcmVmZXJyZWQgbG9jYWxlIGlkZW50aWZpZXIgZm9yIHRoZSB8Y2hhcmFjdGVyc3wKKyAg ICAvLyAgICAgICAgICAgICAgICAgICAgKGUuZy4gImVuIiwgImphIiwgInpoLUNOIikKICAgICAv LwogICAgIC8vIFJldHVybnMgYSBzdHJpbmcgd2l0aCB0aGUgZm9udCBmYW1pbHkgb24gYW4gZW1w dHkgc3RyaW5nIGlmIHRoZQogICAgIC8vIHJlcXVlc3QgY2Fubm90IGJlIHNhdGlzZmllZC4KLSAg ICB2aXJ0dWFsIFdlYlN0cmluZyBnZXRGb250RmFtaWx5Rm9yQ2hhcmFjdGVycyhjb25zdCBXZWJV Q2hhciogY2hhcmFjdGVycywgc2l6ZV90IG51bUNoYXJhY3RlcnMpID0gMDsKKyAgICB2aXJ0dWFs IFdlYlN0cmluZyBnZXRGb250RmFtaWx5Rm9yQ2hhcmFjdGVycyhjb25zdCBXZWJVQ2hhciogY2hh cmFjdGVycywgc2l6ZV90IG51bUNoYXJhY3RlcnMsIGNvbnN0IGNoYXIqIHByZWZlcnJlZExvY2Fs ZSkgID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgZ2V0UmVuZGVyU3R5bGVGb3JTdHJpa2UoY29uc3Qg Y2hhciogZmFtaWx5LCBpbnQgc2l6ZUFuZFN0eWxlLCBXZWJGb250UmVuZGVyU3R5bGUqIHN0eWxl KSA9IDA7CiB9OwogCkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0Zv bnRDYWNoZUxpbnV4LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2Nocm9taXVtL0ZvbnRDYWNoZUxpbnV4LmNwcAkocmV2aXNpb24gODAxNjgpCisrKyBXZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0ZvbnRDYWNoZUxpbnV4LmNwcAkod29ya2luZyBj b3B5KQpAQCAtNDMsNiArNDMsNyBAQAogI2luY2x1ZGUgIlNrVHlwZWZhY2UuaCIKICNpbmNsdWRl ICJTa1V0aWxzLmgiCiAKKyNpbmNsdWRlIDx1bmljb2RlL2xvY2lkLmg+CiAjaW5jbHVkZSA8d3Rm L0Fzc2VydGlvbnMuaD4KICNpbmNsdWRlIDx3dGYvdGV4dC9BdG9taWNTdHJpbmcuaD4KICNpbmNs dWRlIDx3dGYvdGV4dC9DU3RyaW5nLmg+CkBAIC01Nyw3ICs1OCw4IEBACiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgVUNoYXIq IGNoYXJhY3RlcnMsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgaW50IGxlbmd0aCkKIHsKLSAgICBTdHJpbmcgZmFtaWx5ID0gUGxhdGZv cm1CcmlkZ2U6OmdldEZvbnRGYW1pbHlGb3JDaGFyYWN0ZXJzKGNoYXJhY3RlcnMsIGxlbmd0aCk7 CisgICAgaWN1OjpMb2NhbGUgbG9jYWxlID0gaWN1OjpMb2NhbGU6OmdldERlZmF1bHQoKTsKKyAg ICBTdHJpbmcgZmFtaWx5ID0gUGxhdGZvcm1CcmlkZ2U6OmdldEZvbnRGYW1pbHlGb3JDaGFyYWN0 ZXJzKGNoYXJhY3RlcnMsIGxlbmd0aCwgbG9jYWxlLmdldExhbmd1YWdlKCkpOwogICAgIGlmIChm YW1pbHkuaXNFbXB0eSgpKQogICAgICAgICByZXR1cm4gMDsKIApJbmRleDogV2ViQ29yZS9wbGF0 Zm9ybS9jaHJvbWl1bS9QbGF0Zm9ybUJyaWRnZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxh dGZvcm0vY2hyb21pdW0vUGxhdGZvcm1CcmlkZ2UuaAkocmV2aXNpb24gODAxNjgpCisrKyBXZWJD b3JlL3BsYXRmb3JtL2Nocm9taXVtL1BsYXRmb3JtQnJpZGdlLmgJKHdvcmtpbmcgY29weSkKQEAg LTE1MCw3ICsxNTAsNyBAQAogI2VuZGlmCiAjaWYgT1MoTElOVVgpIHx8IE9TKEZSRUVCU0QpCiAg ICAgc3RhdGljIHZvaWQgZ2V0UmVuZGVyU3R5bGVGb3JTdHJpa2UoY29uc3QgY2hhciogZmFtaWx5 LCBpbnQgc2l6ZUFuZFN0eWxlLCBGb250UmVuZGVyU3R5bGUqIHJlc3VsdCk7Ci0gICAgc3RhdGlj IFN0cmluZyBnZXRGb250RmFtaWx5Rm9yQ2hhcmFjdGVycyhjb25zdCBVQ2hhciosIHNpemVfdCBu dW1DaGFyYWN0ZXJzKTsKKyAgICBzdGF0aWMgU3RyaW5nIGdldEZvbnRGYW1pbHlGb3JDaGFyYWN0 ZXJzKGNvbnN0IFVDaGFyKiwgc2l6ZV90IG51bUNoYXJhY3RlcnMsIGNvbnN0IGNoYXIqIHByZWZl cnJlZExvY2FsZSk7CiAjZW5kaWYKICNpZiBPUyhEQVJXSU4pCiAgICAgc3RhdGljIGJvb2wgbG9h ZEZvbnQoTlNGb250KiBzcmNGb250LCBBVFNGb250Q29udGFpbmVyUmVmKiBvdXQpOwo= 84920 2011-03-06 21:31:03 -0800 2011-03-06 22:55:24 -0800 Added ChangeLogs. WebKit-chromium-linux-font-lang6.patch text/plain 7684 kochi SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA4MDQ0OCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTcgQEAKKzIwMTEtMDMtMDYgIFRha2F5b3NoaSBLb2NoaSAgPGtvY2hpQGNocm9t aXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBbY2hyb21pdW1dIFVzZSBwcmVmZXJyZWQgbG9jYWxlIGluZm9ybWF0aW9uIHdoZW4gY2hvb3Np bmcgZmFsbGJhY2sKKyAgICAgICAgZm9udCB1c2luZyBmb250Y29uZmlnIG9uIExpbnV4IHBsYXRm b3JtLgorICAgICAgICBodHRwOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01NTQ1 MworCisgICAgICAgIE5vIG5ldyB0ZXN0cywgYXMgaXQgZGVwZW5kcyBvbiBJQ1UgYW5kIGxvY2Fs ZSBzZXR0aW5nLCBzbyBpdCB3aWxsIGJlCisgICAgICAgIGNvdmVyZWQgYnkgQ2hyb21pdW0gc2lk ZS4KKworICAgICAgICAqIHBsYXRmb3JtL2Nocm9taXVtL1BsYXRmb3JtQnJpZGdlLmg6CisgICAg ICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vRm9udENhY2hlTGludXguY3BwOgorCiAy MDExLTAzLTA2ICBOYW9raSBUYWthbm8gIDx0YWthbm8ubmFva2lAZ21haWwuY29tPgogCiAgICAg ICAgIFJldmlld2VkIGJ5IEtlbnQgVGFtdXJhLgpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9jaHJv bWl1bS9QbGF0Zm9ybUJyaWRnZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vY2hy b21pdW0vUGxhdGZvcm1CcmlkZ2UuaAkocmV2aXNpb24gODAyMTApCisrKyBXZWJDb3JlL3BsYXRm b3JtL2Nocm9taXVtL1BsYXRmb3JtQnJpZGdlLmgJKHdvcmtpbmcgY29weSkKQEAgLTE1MCw3ICsx NTAsNyBAQCBwdWJsaWM6CiAjZW5kaWYKICNpZiBPUyhMSU5VWCkgfHwgT1MoRlJFRUJTRCkKICAg ICBzdGF0aWMgdm9pZCBnZXRSZW5kZXJTdHlsZUZvclN0cmlrZShjb25zdCBjaGFyKiBmYW1pbHks IGludCBzaXplQW5kU3R5bGUsIEZvbnRSZW5kZXJTdHlsZSogcmVzdWx0KTsKLSAgICBzdGF0aWMg U3RyaW5nIGdldEZvbnRGYW1pbHlGb3JDaGFyYWN0ZXJzKGNvbnN0IFVDaGFyKiwgc2l6ZV90IG51 bUNoYXJhY3RlcnMpOworICAgIHN0YXRpYyBTdHJpbmcgZ2V0Rm9udEZhbWlseUZvckNoYXJhY3Rl cnMoY29uc3QgVUNoYXIqLCBzaXplX3QgbnVtQ2hhcmFjdGVycywgY29uc3QgY2hhciogcHJlZmVy cmVkTG9jYWxlKTsKICNlbmRpZgogI2lmIE9TKERBUldJTikKICAgICBzdGF0aWMgYm9vbCBsb2Fk Rm9udChOU0ZvbnQqIHNyY0ZvbnQsIEFUU0ZvbnRDb250YWluZXJSZWYqIG91dCk7CkluZGV4OiBX ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0ZvbnRDYWNoZUxpbnV4LmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0ZvbnRDYWNoZUxp bnV4LmNwcAkocmV2aXNpb24gODAyMTApCisrKyBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2No cm9taXVtL0ZvbnRDYWNoZUxpbnV4LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDMsNiArNDMsNyBA QAogI2luY2x1ZGUgIlNrVHlwZWZhY2UuaCIKICNpbmNsdWRlICJTa1V0aWxzLmgiCiAKKyNpbmNs dWRlIDx1bmljb2RlL2xvY2lkLmg+CiAjaW5jbHVkZSA8d3RmL0Fzc2VydGlvbnMuaD4KICNpbmNs dWRlIDx3dGYvdGV4dC9BdG9taWNTdHJpbmcuaD4KICNpbmNsdWRlIDx3dGYvdGV4dC9DU3RyaW5n Lmg+CkBAIC01Nyw3ICs1OCw4IEBAIGNvbnN0IFNpbXBsZUZvbnREYXRhKiBGb250Q2FjaGU6Omdl dEZvbnQKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBjb25zdCBVQ2hhciogY2hhcmFjdGVycywKICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpbnQgbGVuZ3RoKQogewotICAgIFN0 cmluZyBmYW1pbHkgPSBQbGF0Zm9ybUJyaWRnZTo6Z2V0Rm9udEZhbWlseUZvckNoYXJhY3RlcnMo Y2hhcmFjdGVycywgbGVuZ3RoKTsKKyAgICBpY3U6OkxvY2FsZSBsb2NhbGUgPSBpY3U6OkxvY2Fs ZTo6Z2V0RGVmYXVsdCgpOworICAgIFN0cmluZyBmYW1pbHkgPSBQbGF0Zm9ybUJyaWRnZTo6Z2V0 Rm9udEZhbWlseUZvckNoYXJhY3RlcnMoY2hhcmFjdGVycywgbGVuZ3RoLCBsb2NhbGUuZ2V0TGFu Z3VhZ2UoKSk7CiAgICAgaWYgKGZhbWlseS5pc0VtcHR5KCkpCiAgICAgICAgIHJldHVybiAwOwog CkluZGV4OiBXZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9j aHJvbWl1bS9DaGFuZ2VMb2cJKHJldmlzaW9uIDgwNDQ4KQorKysgV2ViS2l0L2Nocm9taXVtL0No YW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDExLTAzLTA2ICBUYWth eW9zaGkgS29jaGkgIDxrb2NoaUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVXNlIHByZWZlcnJlZCBsb2NhbGUgaW5mb3JtYXRp b24gd2hlbiBjaG9vc2luZyBmYWxsYmFjayBmb250IHVzaW5nCisgICAgICAgIGZvbnRjb25maWcg b24gTGludXggcGxhdGZvcm0uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD01NTQ1MworCisgICAgICAgIFRlc3RzIHdpbGwgYmUgY292ZXJlZCBieSBDaHJv bWl1bSBzaWRlLgorCisgICAgICAgICogLi4vLi4vLi4vLi4vcHVibGljL2d0ay9XZWJGb250SW5m by5oOgorICAgICAgICAoV2ViS2l0OjpXZWJGb250SW5mbzo6ZmFtaWx5Rm9yQ2hhcnMpOiBhZGRl ZCAzcmQgcGFyYW1ldGVyIHxwcmVmZXJyZWRMb2NhbGV8CisgICAgICAgICogLi4vLi4vLi4vLi4v cHVibGljL2xpbnV4L1dlYlNhbmRib3hTdXBwb3J0Lmg6CisgICAgICAgIChXZWJLaXQ6OldlYlNh bmRib3hTdXBwb3J0OjpnZXRGb250RmFtaWx5Rm9yQ2hhcmFjdGVycyk6IGFkZGVkIDNyZCBwYXJh bWV0ZXIgfHByZWZlcnJlZExvY2FsZXwKKyAgICAgICAgKiAuLi8uLi8uLi8uLi9zcmMvUGxhdGZv cm1CcmlkZ2UuY3BwOgorICAgICAgICAqIC4uLy4uLy4uLy4uL3NyYy9ndGsvV2ViRm9udEluZm8u Y3BwOgorCiAyMDExLTAzLTA2ICBTaGVyaWZmIEJvdCAgPHdlYmtpdC5yZXZpZXcuYm90QGdtYWls LmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91dCByODA0MzYuCkluZGV4OiBX ZWJLaXQvY2hyb21pdW0vcHVibGljL2d0ay9XZWJGb250SW5mby5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdl YktpdC9jaHJvbWl1bS9wdWJsaWMvZ3RrL1dlYkZvbnRJbmZvLmgJKHJldmlzaW9uIDgwMjEwKQor KysgV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9ndGsvV2ViRm9udEluZm8uaAkod29ya2luZyBjb3B5 KQpAQCAtNDUsMTAgKzQ1LDEyIEBAIHB1YmxpYzoKICAgICAvLyBzcGVjaWZpZWQgYnkgfHV0ZjE2 fAogICAgIC8vICAgY2hhcmFjdGVyczogYSBuYXRpdmUtZW5kaWFuIFVURjE2IHN0cmluZwogICAg IC8vICAgbnVtQ2hhcmFjdGVyczogdGhlIG51bWJlciBvZiAxNi1iaXQgd29yZHMgaW4gfHV0ZjE2 fAorICAgIC8vICAgcHJlZmVycmVkTG9jYWxlOiBwcmVmZXJyZWQgbG9jYWxlIGlkZW50aWZpZXIg Zm9yIHRoZSB8Y2hhcmFjdGVyc3wKKyAgICAvLyAgICAgICAgICAgICAgICAgICAgKGUuZy4gImVu IiwgImphIiwgInpoLUNOIikKICAgICAvLwogICAgIC8vIFJldHVybnM6IHRoZSBmb250IGZhbWls eSBvciBhbiBlbXB0eSBzdHJpbmcgaWYgdGhlIHJlcXVlc3QgY291bGQgbm90IGJlCiAgICAgLy8g c2F0aXNmaWVkLgotICAgIFdFQktJVF9BUEkgc3RhdGljIFdlYkNTdHJpbmcgZmFtaWx5Rm9yQ2hh cnMoY29uc3QgV2ViVUNoYXIqIGNoYXJhY3RlcnMsIHNpemVfdCBudW1DaGFyYWN0ZXJzKTsKKyAg ICBXRUJLSVRfQVBJIHN0YXRpYyBXZWJDU3RyaW5nIGZhbWlseUZvckNoYXJzKGNvbnN0IFdlYlVD aGFyKiBjaGFyYWN0ZXJzLCBzaXplX3QgbnVtQ2hhcmFjdGVycywgY29uc3QgY2hhciogcHJlZmVy cmVkTG9jYWxlID0gMCk7CiAKICAgICAvLyBGaWxsIG91dCB0aGUgZ2l2ZW4gV2ViRm9udFJlbmRl clN0eWxlIHdpdGggdGhlIHVzZXIncyBwcmVmZXJlbmNlcyBmb3IKICAgICAvLyByZW5kZXJpbmcg dGhlIGdpdmVuIGZvbnQgYXQgdGhlIGdpdmVuIHNpemUuCkluZGV4OiBXZWJLaXQvY2hyb21pdW0v cHVibGljL2xpbnV4L1dlYlNhbmRib3hTdXBwb3J0LmgKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2No cm9taXVtL3B1YmxpYy9saW51eC9XZWJTYW5kYm94U3VwcG9ydC5oCShyZXZpc2lvbiA4MDIxMCkK KysrIFdlYktpdC9jaHJvbWl1bS9wdWJsaWMvbGludXgvV2ViU2FuZGJveFN1cHBvcnQuaAkod29y a2luZyBjb3B5KQpAQCAtNDcsMTAgKzQ3LDEyIEBAIHB1YmxpYzoKICAgICAvLyBjb2RlLXBvaW50 cy4KICAgICAvLyAgIGNoYXJhY3RlcnM6IGEgVVRGLTE2IGVuY29kZWQgc3RyaW5nCiAgICAgLy8g ICBudW1DaGFyYWN0ZXJzOiB0aGUgbnVtYmVyIG9mIDE2LWJpdCB3b3JkcyBpbiB8Y2hhcmFjdGVy c3wKKyAgICAvLyAgIHByZWZlcnJlZExvY2FsZTogcHJlZmVycmVkIGxvY2FsZSBpZGVudGlmaWVy IGZvciB0aGUgfGNoYXJhY3RlcnN8CisgICAgLy8gICAgICAgICAgICAgICAgICAgIChlLmcuICJl biIsICJqYSIsICJ6aC1DTiIpCiAgICAgLy8KICAgICAvLyBSZXR1cm5zIGEgc3RyaW5nIHdpdGgg dGhlIGZvbnQgZmFtaWx5IG9uIGFuIGVtcHR5IHN0cmluZyBpZiB0aGUKICAgICAvLyByZXF1ZXN0 IGNhbm5vdCBiZSBzYXRpc2ZpZWQuCi0gICAgdmlydHVhbCBXZWJTdHJpbmcgZ2V0Rm9udEZhbWls eUZvckNoYXJhY3RlcnMoY29uc3QgV2ViVUNoYXIqIGNoYXJhY3RlcnMsIHNpemVfdCBudW1DaGFy YWN0ZXJzKSA9IDA7CisgICAgdmlydHVhbCBXZWJTdHJpbmcgZ2V0Rm9udEZhbWlseUZvckNoYXJh Y3RlcnMoY29uc3QgV2ViVUNoYXIqIGNoYXJhY3RlcnMsIHNpemVfdCBudW1DaGFyYWN0ZXJzLCBj b25zdCBjaGFyKiBwcmVmZXJyZWRMb2NhbGUpICA9IDA7CiAgICAgdmlydHVhbCB2b2lkIGdldFJl bmRlclN0eWxlRm9yU3RyaWtlKGNvbnN0IGNoYXIqIGZhbWlseSwgaW50IHNpemVBbmRTdHlsZSwg V2ViRm9udFJlbmRlclN0eWxlKiBzdHlsZSkgPSAwOwogfTsKIApJbmRleDogV2ViS2l0L2Nocm9t aXVtL3NyYy9QbGF0Zm9ybUJyaWRnZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2Nocm9taXVt L3NyYy9QbGF0Zm9ybUJyaWRnZS5jcHAJKHJldmlzaW9uIDgwMjEwKQorKysgV2ViS2l0L2Nocm9t aXVtL3NyYy9QbGF0Zm9ybUJyaWRnZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQzNywxMiArNDM3 LDEyIEBAIGJvb2wgUGxhdGZvcm1CcmlkZ2U6OmVuc3VyZUZvbnRMb2FkZWQoSEYKICNlbmRpZgog CiAjaWYgT1MoTElOVVgpIHx8IE9TKEZSRUVCU0QpCi1TdHJpbmcgUGxhdGZvcm1CcmlkZ2U6Omdl dEZvbnRGYW1pbHlGb3JDaGFyYWN0ZXJzKGNvbnN0IFVDaGFyKiBjaGFyYWN0ZXJzLCBzaXplX3Qg bnVtQ2hhcmFjdGVycykKK1N0cmluZyBQbGF0Zm9ybUJyaWRnZTo6Z2V0Rm9udEZhbWlseUZvckNo YXJhY3RlcnMoY29uc3QgVUNoYXIqIGNoYXJhY3RlcnMsIHNpemVfdCBudW1DaGFyYWN0ZXJzLCBj b25zdCBjaGFyKiBwcmVmZXJyZWRMb2NhbGUpCiB7CiAgICAgaWYgKHdlYktpdENsaWVudCgpLT5z YW5kYm94U3VwcG9ydCgpKQotICAgICAgICByZXR1cm4gd2ViS2l0Q2xpZW50KCktPnNhbmRib3hT dXBwb3J0KCktPmdldEZvbnRGYW1pbHlGb3JDaGFyYWN0ZXJzKGNoYXJhY3RlcnMsIG51bUNoYXJh Y3RlcnMpOworICAgICAgICByZXR1cm4gd2ViS2l0Q2xpZW50KCktPnNhbmRib3hTdXBwb3J0KCkt PmdldEZvbnRGYW1pbHlGb3JDaGFyYWN0ZXJzKGNoYXJhY3RlcnMsIG51bUNoYXJhY3RlcnMsIHBy ZWZlcnJlZExvY2FsZSk7CiAKLSAgICBXZWJDU3RyaW5nIGZhbWlseSA9IFdlYkZvbnRJbmZvOjpm YW1pbHlGb3JDaGFycyhjaGFyYWN0ZXJzLCBudW1DaGFyYWN0ZXJzKTsKKyAgICBXZWJDU3RyaW5n IGZhbWlseSA9IFdlYkZvbnRJbmZvOjpmYW1pbHlGb3JDaGFycyhjaGFyYWN0ZXJzLCBudW1DaGFy YWN0ZXJzLCBwcmVmZXJyZWRMb2NhbGUpOwogICAgIGlmIChmYW1pbHkuZGF0YSgpKQogICAgICAg ICByZXR1cm4gV2ViU3RyaW5nOjpmcm9tVVRGOChmYW1pbHkuZGF0YSgpKTsKIApJbmRleDogV2Vi S2l0L2Nocm9taXVtL3NyYy9ndGsvV2ViRm9udEluZm8uY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktp dC9jaHJvbWl1bS9zcmMvZ3RrL1dlYkZvbnRJbmZvLmNwcAkocmV2aXNpb24gODAyMTApCisrKyBX ZWJLaXQvY2hyb21pdW0vc3JjL2d0ay9XZWJGb250SW5mby5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTM4LDcgKzM4LDcgQEAKIAogbmFtZXNwYWNlIFdlYktpdCB7CiAKLVdlYkNTdHJpbmcgV2ViRm9u dEluZm86OmZhbWlseUZvckNoYXJzKGNvbnN0IFdlYlVDaGFyKiBjaGFyYWN0ZXJzLCBzaXplX3Qg bnVtQ2hhcmFjdGVycykKK1dlYkNTdHJpbmcgV2ViRm9udEluZm86OmZhbWlseUZvckNoYXJzKGNv bnN0IFdlYlVDaGFyKiBjaGFyYWN0ZXJzLCBzaXplX3QgbnVtQ2hhcmFjdGVycywgY29uc3QgY2hh ciogcHJlZmVycmVkTG9jYWxlKQogewogICAgIEZjQ2hhclNldCogY3NldCA9IEZjQ2hhclNldENy ZWF0ZSgpOwogICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgbnVtQ2hhcmFjdGVyczsgKytpKSB7 CkBAIC02Miw2ICs2MiwxMyBAQCBXZWJDU3RyaW5nIFdlYkZvbnRJbmZvOjpmYW1pbHlGb3JDaGFy cyhjCiAgICAgZmN2YWx1ZS51LmIgPSBGY1RydWU7CiAgICAgRmNQYXR0ZXJuQWRkKHBhdHRlcm4s IEZDX1NDQUxBQkxFLCBmY3ZhbHVlLCBGY0ZhbHNlKTsKIAorICAgIGlmIChwcmVmZXJyZWRMb2Nh bGUpIHsKKyAgICAgICAgRmNMYW5nU2V0KiBsYW5nc2V0ID0gRmNMYW5nU2V0Q3JlYXRlKCk7Cisg ICAgICAgIEZjTGFuZ1NldEFkZChsYW5nc2V0LCByZWludGVycHJldF9jYXN0PGNvbnN0IEZjQ2hh cjggKj4ocHJlZmVycmVkTG9jYWxlKSk7CisgICAgICAgIEZjUGF0dGVybkFkZExhbmdTZXQocGF0 dGVybiwgRkNfTEFORywgbGFuZ3NldCk7CisgICAgICAgIEZjTGFuZ1NldERlc3Ryb3kobGFuZ3Nl dCk7CisgICAgfQorCiAgICAgRmNDb25maWdTdWJzdGl0dXRlKDAsIHBhdHRlcm4sIEZjTWF0Y2hQ YXR0ZXJuKTsKICAgICBGY0RlZmF1bHRTdWJzdGl0dXRlKHBhdHRlcm4pOwogCg== 84922 2011-03-06 22:55:24 -0800 2011-03-07 12:43:50 -0800 Fixed wrong ChangeLog entries and diff paths (now Source/ prefixed). WebKit-chromium-linux-font-lang7.patch text/plain 7654 kochi SW5kZXg6IFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1BsYXRmb3JtQnJpZGdlLmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9QbGF0Zm9ybUJyaWRnZS5jcHAJ KHJldmlzaW9uIDgwNDQ3KQorKysgU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvUGxhdGZvcm1C cmlkZ2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00MzcsMTIgKzQzNywxMiBAQAogI2VuZGlmCiAK ICNpZiBPUyhMSU5VWCkgfHwgT1MoRlJFRUJTRCkKLVN0cmluZyBQbGF0Zm9ybUJyaWRnZTo6Z2V0 Rm9udEZhbWlseUZvckNoYXJhY3RlcnMoY29uc3QgVUNoYXIqIGNoYXJhY3RlcnMsIHNpemVfdCBu dW1DaGFyYWN0ZXJzKQorU3RyaW5nIFBsYXRmb3JtQnJpZGdlOjpnZXRGb250RmFtaWx5Rm9yQ2hh cmFjdGVycyhjb25zdCBVQ2hhciogY2hhcmFjdGVycywgc2l6ZV90IG51bUNoYXJhY3RlcnMsIGNv bnN0IGNoYXIqIHByZWZlcnJlZExvY2FsZSkKIHsKICAgICBpZiAod2ViS2l0Q2xpZW50KCktPnNh bmRib3hTdXBwb3J0KCkpCi0gICAgICAgIHJldHVybiB3ZWJLaXRDbGllbnQoKS0+c2FuZGJveFN1 cHBvcnQoKS0+Z2V0Rm9udEZhbWlseUZvckNoYXJhY3RlcnMoY2hhcmFjdGVycywgbnVtQ2hhcmFj dGVycyk7CisgICAgICAgIHJldHVybiB3ZWJLaXRDbGllbnQoKS0+c2FuZGJveFN1cHBvcnQoKS0+ Z2V0Rm9udEZhbWlseUZvckNoYXJhY3RlcnMoY2hhcmFjdGVycywgbnVtQ2hhcmFjdGVycywgcHJl ZmVycmVkTG9jYWxlKTsKIAotICAgIFdlYkNTdHJpbmcgZmFtaWx5ID0gV2ViRm9udEluZm86OmZh bWlseUZvckNoYXJzKGNoYXJhY3RlcnMsIG51bUNoYXJhY3RlcnMpOworICAgIFdlYkNTdHJpbmcg ZmFtaWx5ID0gV2ViRm9udEluZm86OmZhbWlseUZvckNoYXJzKGNoYXJhY3RlcnMsIG51bUNoYXJh Y3RlcnMsIHByZWZlcnJlZExvY2FsZSk7CiAgICAgaWYgKGZhbWlseS5kYXRhKCkpCiAgICAgICAg IHJldHVybiBXZWJTdHJpbmc6OmZyb21VVEY4KGZhbWlseS5kYXRhKCkpOwogCkluZGV4OiBTb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL3NyYy9ndGsvV2ViRm9udEluZm8uY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL2d0ay9XZWJGb250SW5mby5jcHAJKHJldmlzaW9u IDgwNDQ3KQorKysgU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvZ3RrL1dlYkZvbnRJbmZvLmNw cAkod29ya2luZyBjb3B5KQpAQCAtMzgsNyArMzgsNyBAQAogCiBuYW1lc3BhY2UgV2ViS2l0IHsK IAotV2ViQ1N0cmluZyBXZWJGb250SW5mbzo6ZmFtaWx5Rm9yQ2hhcnMoY29uc3QgV2ViVUNoYXIq IGNoYXJhY3RlcnMsIHNpemVfdCBudW1DaGFyYWN0ZXJzKQorV2ViQ1N0cmluZyBXZWJGb250SW5m bzo6ZmFtaWx5Rm9yQ2hhcnMoY29uc3QgV2ViVUNoYXIqIGNoYXJhY3RlcnMsIHNpemVfdCBudW1D aGFyYWN0ZXJzLCBjb25zdCBjaGFyKiBwcmVmZXJyZWRMb2NhbGUpCiB7CiAgICAgRmNDaGFyU2V0 KiBjc2V0ID0gRmNDaGFyU2V0Q3JlYXRlKCk7CiAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBu dW1DaGFyYWN0ZXJzOyArK2kpIHsKQEAgLTYyLDYgKzYyLDEzIEBACiAgICAgZmN2YWx1ZS51LmIg PSBGY1RydWU7CiAgICAgRmNQYXR0ZXJuQWRkKHBhdHRlcm4sIEZDX1NDQUxBQkxFLCBmY3ZhbHVl LCBGY0ZhbHNlKTsKIAorICAgIGlmIChwcmVmZXJyZWRMb2NhbGUpIHsKKyAgICAgICAgRmNMYW5n U2V0KiBsYW5nc2V0ID0gRmNMYW5nU2V0Q3JlYXRlKCk7CisgICAgICAgIEZjTGFuZ1NldEFkZChs YW5nc2V0LCByZWludGVycHJldF9jYXN0PGNvbnN0IEZjQ2hhcjggKj4ocHJlZmVycmVkTG9jYWxl KSk7CisgICAgICAgIEZjUGF0dGVybkFkZExhbmdTZXQocGF0dGVybiwgRkNfTEFORywgbGFuZ3Nl dCk7CisgICAgICAgIEZjTGFuZ1NldERlc3Ryb3kobGFuZ3NldCk7CisgICAgfQorCiAgICAgRmND b25maWdTdWJzdGl0dXRlKDAsIHBhdHRlcm4sIEZjTWF0Y2hQYXR0ZXJuKTsKICAgICBGY0RlZmF1 bHRTdWJzdGl0dXRlKHBhdHRlcm4pOwogCkluZGV4OiBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL0No YW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwko cmV2aXNpb24gODA0NDcpCisrKyBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwkod29y a2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDExLTAzLTA2ICBUYWtheW9zaGkgS29jaGkg IDxrb2NoaUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgVXNlIHByZWZlcnJlZCBsb2NhbGUgaW5mb3JtYXRpb24gd2hlbiBjaG9v c2luZyBmYWxsYmFjayBmb250IHVzaW5nCisgICAgICAgIGZvbnRjb25maWcgb24gTGludXggcGxh dGZvcm0uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01 NTQ1MworCisgICAgICAgIFRlc3RzIHdpbGwgYmUgY292ZXJlZCBieSBDaHJvbWl1bSBzaWRlLgor CisgICAgICAgICogcHVibGljL2d0ay9XZWJGb250SW5mby5oOgorICAgICAgICAoV2ViS2l0OjpX ZWJGb250SW5mbzo6ZmFtaWx5Rm9yQ2hhcnMpOiBhZGRlZCAzcmQgcGFyYW1ldGVyIHxwcmVmZXJy ZWRMb2NhbGV8CisgICAgICAgICogcHVibGljL2xpbnV4L1dlYlNhbmRib3hTdXBwb3J0Lmg6Cisg ICAgICAgIChXZWJLaXQ6OldlYlNhbmRib3hTdXBwb3J0OjpnZXRGb250RmFtaWx5Rm9yQ2hhcmFj dGVycyk6IGFkZGVkIDNyZCBwYXJhbWV0ZXIgfHByZWZlcnJlZExvY2FsZXwKKyAgICAgICAgKiBz cmMvUGxhdGZvcm1CcmlkZ2UuY3BwOgorICAgICAgICAqIHNyYy9ndGsvV2ViRm9udEluZm8uY3Bw OgorCiAyMDExLTAzLTA2ICBTaGVyaWZmIEJvdCAgPHdlYmtpdC5yZXZpZXcuYm90QGdtYWlsLmNv bT4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91dCByODA0MzYuCkluZGV4OiBTb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9ndGsvV2ViRm9udEluZm8uaAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9ndGsvV2ViRm9udEluZm8uaAkocmV2aXNp b24gODA0NDcpCisrKyBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9ndGsvV2ViRm9udElu Zm8uaAkod29ya2luZyBjb3B5KQpAQCAtNDUsMTAgKzQ1LDEyIEBACiAgICAgLy8gc3BlY2lmaWVk IGJ5IHx1dGYxNnwKICAgICAvLyAgIGNoYXJhY3RlcnM6IGEgbmF0aXZlLWVuZGlhbiBVVEYxNiBz dHJpbmcKICAgICAvLyAgIG51bUNoYXJhY3RlcnM6IHRoZSBudW1iZXIgb2YgMTYtYml0IHdvcmRz IGluIHx1dGYxNnwKKyAgICAvLyAgIHByZWZlcnJlZExvY2FsZTogcHJlZmVycmVkIGxvY2FsZSBp ZGVudGlmaWVyIGZvciB0aGUgfGNoYXJhY3RlcnN8CisgICAgLy8gICAgICAgICAgICAgICAgICAg IChlLmcuICJlbiIsICJqYSIsICJ6aC1DTiIpCiAgICAgLy8KICAgICAvLyBSZXR1cm5zOiB0aGUg Zm9udCBmYW1pbHkgb3IgYW4gZW1wdHkgc3RyaW5nIGlmIHRoZSByZXF1ZXN0IGNvdWxkIG5vdCBi ZQogICAgIC8vIHNhdGlzZmllZC4KLSAgICBXRUJLSVRfQVBJIHN0YXRpYyBXZWJDU3RyaW5nIGZh bWlseUZvckNoYXJzKGNvbnN0IFdlYlVDaGFyKiBjaGFyYWN0ZXJzLCBzaXplX3QgbnVtQ2hhcmFj dGVycyk7CisgICAgV0VCS0lUX0FQSSBzdGF0aWMgV2ViQ1N0cmluZyBmYW1pbHlGb3JDaGFycyhj b25zdCBXZWJVQ2hhciogY2hhcmFjdGVycywgc2l6ZV90IG51bUNoYXJhY3RlcnMsIGNvbnN0IGNo YXIqIHByZWZlcnJlZExvY2FsZSA9IDApOwogCiAgICAgLy8gRmlsbCBvdXQgdGhlIGdpdmVuIFdl YkZvbnRSZW5kZXJTdHlsZSB3aXRoIHRoZSB1c2VyJ3MgcHJlZmVyZW5jZXMgZm9yCiAgICAgLy8g cmVuZGVyaW5nIHRoZSBnaXZlbiBmb250IGF0IHRoZSBnaXZlbiBzaXplLgpJbmRleDogU291cmNl L1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvbGludXgvV2ViU2FuZGJveFN1cHBvcnQuaAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9saW51eC9XZWJTYW5kYm94U3Vw cG9ydC5oCShyZXZpc2lvbiA4MDQ0NykKKysrIFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGlj L2xpbnV4L1dlYlNhbmRib3hTdXBwb3J0LmgJKHdvcmtpbmcgY29weSkKQEAgLTQ3LDEwICs0Nywx MiBAQAogICAgIC8vIGNvZGUtcG9pbnRzLgogICAgIC8vICAgY2hhcmFjdGVyczogYSBVVEYtMTYg ZW5jb2RlZCBzdHJpbmcKICAgICAvLyAgIG51bUNoYXJhY3RlcnM6IHRoZSBudW1iZXIgb2YgMTYt Yml0IHdvcmRzIGluIHxjaGFyYWN0ZXJzfAorICAgIC8vICAgcHJlZmVycmVkTG9jYWxlOiBwcmVm ZXJyZWQgbG9jYWxlIGlkZW50aWZpZXIgZm9yIHRoZSB8Y2hhcmFjdGVyc3wKKyAgICAvLyAgICAg ICAgICAgICAgICAgICAgKGUuZy4gImVuIiwgImphIiwgInpoLUNOIikKICAgICAvLwogICAgIC8v IFJldHVybnMgYSBzdHJpbmcgd2l0aCB0aGUgZm9udCBmYW1pbHkgb24gYW4gZW1wdHkgc3RyaW5n IGlmIHRoZQogICAgIC8vIHJlcXVlc3QgY2Fubm90IGJlIHNhdGlzZmllZC4KLSAgICB2aXJ0dWFs IFdlYlN0cmluZyBnZXRGb250RmFtaWx5Rm9yQ2hhcmFjdGVycyhjb25zdCBXZWJVQ2hhciogY2hh cmFjdGVycywgc2l6ZV90IG51bUNoYXJhY3RlcnMpID0gMDsKKyAgICB2aXJ0dWFsIFdlYlN0cmlu ZyBnZXRGb250RmFtaWx5Rm9yQ2hhcmFjdGVycyhjb25zdCBXZWJVQ2hhciogY2hhcmFjdGVycywg c2l6ZV90IG51bUNoYXJhY3RlcnMsIGNvbnN0IGNoYXIqIHByZWZlcnJlZExvY2FsZSkgID0gMDsK ICAgICB2aXJ0dWFsIHZvaWQgZ2V0UmVuZGVyU3R5bGVGb3JTdHJpa2UoY29uc3QgY2hhciogZmFt aWx5LCBpbnQgc2l6ZUFuZFN0eWxlLCBXZWJGb250UmVuZGVyU3R5bGUqIHN0eWxlKSA9IDA7CiB9 OwogCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYkNvcmUvQ2hhbmdlTG9nCShyZXZpc2lvbiA4MDQ0NykKKysrIFNvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBACisyMDExLTAzLTA2ICBUYWth eW9zaGkgS29jaGkgIDxrb2NoaUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW2Nocm9taXVtXSBVc2UgcHJlZmVycmVkIGxvY2Fs ZSBpbmZvcm1hdGlvbiB3aGVuIGNob29zaW5nIGZhbGxiYWNrCisgICAgICAgIGZvbnQgdXNpbmcg Zm9udGNvbmZpZyBvbiBMaW51eCBwbGF0Zm9ybS4KKyAgICAgICAgaHR0cDovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTU0NTMKKworICAgICAgICBObyBuZXcgdGVzdHMsIGFzIGl0 IGRlcGVuZHMgb24gSUNVIGFuZCBsb2NhbGUgc2V0dGluZywgc28gaXQgd2lsbCBiZQorICAgICAg ICBjb3ZlcmVkIGJ5IENocm9taXVtIHNpZGUuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9jaHJvbWl1 bS9QbGF0Zm9ybUJyaWRnZS5oOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVt L0ZvbnRDYWNoZUxpbnV4LmNwcDoKKwogMjAxMS0wMy0wNiAgWXV0YSBLaXRhbXVyYSAgPHl1dGFr QGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBLZW50IFRhbXVyYS4KSW5kZXg6 IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0ZvbnRDYWNoZUxpbnV4 LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJv bWl1bS9Gb250Q2FjaGVMaW51eC5jcHAJKHJldmlzaW9uIDgwNDQ3KQorKysgU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vRm9udENhY2hlTGludXguY3BwCSh3b3JraW5n IGNvcHkpCkBAIC00Myw2ICs0Myw3IEBACiAjaW5jbHVkZSAiU2tUeXBlZmFjZS5oIgogI2luY2x1 ZGUgIlNrVXRpbHMuaCIKIAorI2luY2x1ZGUgPHVuaWNvZGUvbG9jaWQuaD4KICNpbmNsdWRlIDx3 dGYvQXNzZXJ0aW9ucy5oPgogI2luY2x1ZGUgPHd0Zi90ZXh0L0F0b21pY1N0cmluZy5oPgogI2lu Y2x1ZGUgPHd0Zi90ZXh0L0NTdHJpbmcuaD4KQEAgLTU3LDcgKzU4LDggQEAKICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBVQ2hh ciogY2hhcmFjdGVycywKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBpbnQgbGVuZ3RoKQogewotICAgIFN0cmluZyBmYW1pbHkgPSBQbGF0 Zm9ybUJyaWRnZTo6Z2V0Rm9udEZhbWlseUZvckNoYXJhY3RlcnMoY2hhcmFjdGVycywgbGVuZ3Ro KTsKKyAgICBpY3U6OkxvY2FsZSBsb2NhbGUgPSBpY3U6OkxvY2FsZTo6Z2V0RGVmYXVsdCgpOwor ICAgIFN0cmluZyBmYW1pbHkgPSBQbGF0Zm9ybUJyaWRnZTo6Z2V0Rm9udEZhbWlseUZvckNoYXJh Y3RlcnMoY2hhcmFjdGVycywgbGVuZ3RoLCBsb2NhbGUuZ2V0TGFuZ3VhZ2UoKSk7CiAgICAgaWYg KGZhbWlseS5pc0VtcHR5KCkpCiAgICAgICAgIHJldHVybiAwOwogCkluZGV4OiBTb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9QbGF0Zm9ybUJyaWRnZS5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL1BsYXRmb3JtQnJpZGdlLmgJKHJldmlzaW9u IDgwNDQ3KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vUGxhdGZvcm1Ccmlk Z2UuaAkod29ya2luZyBjb3B5KQpAQCAtMTUwLDcgKzE1MCw3IEBACiAjZW5kaWYKICNpZiBPUyhM SU5VWCkgfHwgT1MoRlJFRUJTRCkKICAgICBzdGF0aWMgdm9pZCBnZXRSZW5kZXJTdHlsZUZvclN0 cmlrZShjb25zdCBjaGFyKiBmYW1pbHksIGludCBzaXplQW5kU3R5bGUsIEZvbnRSZW5kZXJTdHls ZSogcmVzdWx0KTsKLSAgICBzdGF0aWMgU3RyaW5nIGdldEZvbnRGYW1pbHlGb3JDaGFyYWN0ZXJz KGNvbnN0IFVDaGFyKiwgc2l6ZV90IG51bUNoYXJhY3RlcnMpOworICAgIHN0YXRpYyBTdHJpbmcg Z2V0Rm9udEZhbWlseUZvckNoYXJhY3RlcnMoY29uc3QgVUNoYXIqLCBzaXplX3QgbnVtQ2hhcmFj dGVycywgY29uc3QgY2hhciogcHJlZmVycmVkTG9jYWxlKTsKICNlbmRpZgogI2lmIE9TKERBUldJ TikKICAgICBzdGF0aWMgYm9vbCBsb2FkRm9udChOU0ZvbnQqIHNyY0ZvbnQsIEFUU0ZvbnRDb250 YWluZXJSZWYqIG91dCk7Cg==