64767 2011-07-18 16:52:07 -0700 REGRESSION(91209?): fast/css/custom-font-xheight.html is failing on Leopard 2011-07-18 21:14:49 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 rniwa rniwa jamesr mitz sam oldest_to_newest 438829 0 rniwa 2011-07-18 16:52:07 -0700 The following tests are failing on Chromium Leopard bots: fast/blockflow/broken-ideograph-small-caps.html = IMAGE+TEXT fast/blockflow/broken-ideographic-font.html = IMAGE fast/css/custom-font-xheight.html = TEXT In addition, fast/css/custom-font-xheight.html is failing on Apple's mac port (Leopard). I suspect this is a regression due to http://trac.webkit.org/changeset/91209. 438856 1 mitz 2011-07-18 17:29:16 -0700 I will build on Leopard and see if I can reproduce any of the failures. 438869 2 mitz 2011-07-18 17:52:39 -0700 Working on a fix. 438874 3 rniwa 2011-07-18 17:58:28 -0700 (In reply to comment #2) > Working on a fix. Thanks! 438890 4 mitz 2011-07-18 18:21:28 -0700 Committed r91229. 438894 5 jamesr 2011-07-18 18:24:58 -0700 In chromium we never set BUILDING_ON_LEOPARD, since we build the same binary for leopard and snow leopard, and rely on runtime checks. Do we need this code change for chromium-on-leopard as well? If so we'll have to convert this check to a runtime check, at least for chromium. 438900 6 mitz 2011-07-18 18:27:47 -0700 Then you will probably need a runtime check. 438907 7 rniwa 2011-07-18 18:34:24 -0700 It seems like the patch broke Leopard build. /Volumes/Big/WebKit-BuildSlave/leopard-intel-debug/build/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm: In member function 'const __CTFont* WebCore::FontPlatformData::ctFont() const': /Volumes/Big/WebKit-BuildSlave/leopard-intel-debug/build/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm:207: error: expected `)' before ';' token 438910 8 rniwa 2011-07-18 18:43:05 -0700 Build fix landed in http://trac.webkit.org/changeset/91231. 438920 9 mitz 2011-07-18 19:21:00 -0700 (In reply to comment #8) > Build fix landed in http://trac.webkit.org/changeset/91231. Sorry about that! I built and tested my fix on Leopard, but then retyped it on another machine in an attempt to expedite things :( Thank you for cleaning up after me! 438928 10 101259 rniwa 2011-07-18 19:31:46 -0700 Created attachment 101259 fixes the bug for Chromium and all 438929 11 rniwa 2011-07-18 19:34:08 -0700 I feel bad to duplicate code but I couldn't figure out a way to share code with hasBrokenCTFontGetVerticalTranslationsForGlyphs or OutOfProcessFontLoadingEnabled. We should figure out a way to share code between all these functions eventually. 438930 12 rniwa 2011-07-18 19:38:14 -0700 I verified that this patch builds on Chromium Mac and Mac (both 10.6). 438941 13 101259 mitz 2011-07-18 20:13:23 -0700 Comment on attachment 101259 fixes the bug for Chromium and all View in context: https://bugs.webkit.org/attachment.cgi?id=101259&action=review I have a few comments but this is OK as-is. > Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm:195 > +static bool enableFontCascadeOptimization() The name is a little misleading, because this only controls the optimization for web fonts (the m_font == 0 case). > Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm:198 > + static SInt32 systemVersion = 0; No need to initialize a static to 0. > Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm:209 > +#elif defined(BUILDING_ON_SNOW_LEOPARD) > + return true; > +#else > + return false; > +#endif We usually try to order things such that the present and future codepath comes before the legacy codepath (as was in my change below). > Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm:223 > + else if (enableFontCascadeOptimization()) > m_CTFont.adoptCF(CTFontCreateWithGraphicsFont(m_cgFont.get(), m_size, 0, 0)); > -#endif > - } > + else > + m_CTFont.adoptCF(CTFontCreateWithGraphicsFont(m_cgFont.get(), m_size, 0, cascadeToLastResortFontDescriptor())); I think you can now just do something like m_CTFont.adoptCF(CTFontCreateWithGraphicsFont(m_cgFont.get(), m_size, 0, enableFontCascadeOptimization() ? cascadeToLastResortFontDescriptor() : 0)); 438945 14 101259 rniwa 2011-07-18 20:21:25 -0700 Comment on attachment 101259 fixes the bug for Chromium and all View in context: https://bugs.webkit.org/attachment.cgi?id=101259&action=review >> Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm:195 >> +static bool enableFontCascadeOptimization() > > The name is a little misleading, because this only controls the optimization for web fonts (the m_font == 0 case). Any suggestion? >> Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm:198 >> + static SInt32 systemVersion = 0; > > No need to initialize a static to 0. I copied this code from OutOfProcessFontLoadingEnabled so I'd rather keep = 0. It could be that there was some gcc bug that doesn't initialize this properly. >> Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm:209 >> +#endif > > We usually try to order things such that the present and future codepath comes before the legacy codepath (as was in my change below). I'm confused. We do return true first here for Snow Leopard, right? Or are you saying that we should put Chromium case after Mac port case? Mn... I've started to think that I should replace defined(BUILDING_ON_SNOW_LEOPARD) by !defined(BUILDING_ON_LEOPARD) >> Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm:223 >> + m_CTFont.adoptCF(CTFontCreateWithGraphicsFont(m_cgFont.get(), m_size, 0, cascadeToLastResortFontDescriptor())); > > I think you can now just do something like > m_CTFont.adoptCF(CTFontCreateWithGraphicsFont(m_cgFont.get(), m_size, 0, enableFontCascadeOptimization() ? cascadeToLastResortFontDescriptor() : 0)); Sure, that looks cleaner. 438949 15 mitz 2011-07-18 20:29:43 -0700 (In reply to comment #14) > (From update of attachment 101259 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=101259&action=review > > >> Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm:195 > >> +static bool enableFontCascadeOptimization() > > > > The name is a little misleading, because this only controls the optimization for web fonts (the m_font == 0 case). > > Any suggestion? canSetCascadeListForCustomFont() > > >> Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm:198 > >> + static SInt32 systemVersion = 0; > > > > No need to initialize a static to 0. > > I copied this code from OutOfProcessFontLoadingEnabled so I'd rather keep = 0. It could be that there was some gcc bug that doesn't initialize this properly. I very much doubt it, for two reasons: (1) there are many places in WebKit that rely on initialization of statics to 0 (or false) and this was never an issue; (2) Apple has never shipped a version of gcc with such a bug. > > >> Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm:209 > >> +#endif > > > > We usually try to order things such that the present and future codepath comes before the legacy codepath (as was in my change below). > > I'm confused. We do return true first here for Snow Leopard, right? Or are you saying that we should put Chromium case after Mac port case? Mn... I've started to think that I should replace defined(BUILDING_ON_SNOW_LEOPARD) by !defined(BUILDING_ON_LEOPARD) You’re right (and I missed the fact that the check was for Snow Leopard. That is the wrong thing to special-case, of course). > > >> Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm:223 > >> + m_CTFont.adoptCF(CTFontCreateWithGraphicsFont(m_cgFont.get(), m_size, 0, cascadeToLastResortFontDescriptor())); > > > > I think you can now just do something like > > m_CTFont.adoptCF(CTFontCreateWithGraphicsFont(m_cgFont.get(), m_size, 0, enableFontCascadeOptimization() ? cascadeToLastResortFontDescriptor() : 0)); > > Sure, that looks cleaner. 438950 16 101259 mitz 2011-07-18 20:30:12 -0700 Comment on attachment 101259 fixes the bug for Chromium and all r- because it’s wrong to special-case Snow Leopard here. 438952 17 101265 rniwa 2011-07-18 20:40:09 -0700 Created attachment 101265 Fixed per comments 438953 18 101266 rniwa 2011-07-18 20:46:51 -0700 Created attachment 101266 Fixed per comments 438954 19 101266 rniwa 2011-07-18 20:47:29 -0700 Comment on attachment 101266 Fixed per comments Ugh... another mistake :( 438956 20 101267 rniwa 2011-07-18 20:56:01 -0700 Created attachment 101267 More fixes 438957 21 101267 rniwa 2011-07-18 21:14:44 -0700 Comment on attachment 101267 More fixes Clearing flags on attachment: 101267 Committed r91237: <http://trac.webkit.org/changeset/91237> 438958 22 rniwa 2011-07-18 21:14:49 -0700 All reviewed patches have been landed. Closing bug. 101259 2011-07-18 19:31:46 -0700 2011-07-18 20:40:06 -0700 fixes the bug for Chromium and all bug-64767-20110718193145.patch text/plain 2506 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDkxMjMzKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTEtMDctMTggIFJ5b3N1a2Ug Tml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUkVHUkVTU0lPTig5MTIwOT8pOiBm YXN0L2Nzcy9jdXN0b20tZm9udC14aGVpZ2h0Lmh0bWwgaXMgZmFpbGluZyBvbiBMZW9wYXJkCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02NDc2NworCisg ICAgICAgIEFkZCBhIHJ1bnRpbWUgY2hlY2sgZm9yIGZvbnQgY2FzY2FkaW5nIG9wdGltaXphdGlv bi4KKworICAgICAgICBJdCdzIGEgY29uc3RhbnQgdmFsdWUgaW4gTWFjIHBvcnQgc28gaG9wZWZ1 bGx5IGdjYyB3aWxsIGNvbnN0YW50LXByb3BhZ2F0ZSB0aGUgdmFsdWUKKyAgICAgICAgYW5kIGVs aW1pbmF0ZSB0aGUgZnVuY3Rpb24gYWx0b2dldGhlci4KKworICAgICAgICAqIHBsYXRmb3JtL2dy YXBoaWNzL2NvY29hL0ZvbnRQbGF0Zm9ybURhdGFDb2NvYS5tbToKKyAgICAgICAgKFdlYkNvcmU6 OmVuYWJsZUZvbnRDYXNjYWRlT3B0aW1pemF0aW9uKTogQWRkZWQuCisgICAgICAgIChXZWJDb3Jl OjpGb250UGxhdGZvcm1EYXRhOjpjdEZvbnQpOgorCiAyMDExLTA3LTE4ICBEZWFuIEphY2tzb24g IDxkaW5vQGFwcGxlLmNvbT4KIAogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9NjQ3NDIKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2NvY29hL0ZvbnRQbGF0Zm9ybURhdGFDb2NvYS5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9Gb250UGxhdGZvcm1EYXRhQ29jb2EubW0JKHJl dmlzaW9uIDkxMjMxKQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2Ev Rm9udFBsYXRmb3JtRGF0YUNvY29hLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0xOTIsNiArMTkyLDIz IEBAIHN0YXRpYyBDVEZvbnREZXNjcmlwdG9yUmVmIGNhc2NhZGVUb0xhc3QKICAgICByZXR1cm4g ZGVzY3JpcHRvcjsKIH0KIAorc3RhdGljIGJvb2wgZW5hYmxlRm9udENhc2NhZGVPcHRpbWl6YXRp b24oKQoreworI2lmIFBMQVRGT1JNKENIUk9NSVVNKQorICAgIHN0YXRpYyBTSW50MzIgc3lzdGVt VmVyc2lvbiA9IDA7CisgICAgaWYgKCFzeXN0ZW1WZXJzaW9uKSB7CisgICAgICAgIGlmIChHZXN0 YWx0KGdlc3RhbHRTeXN0ZW1WZXJzaW9uLCAmc3lzdGVtVmVyc2lvbikgIT0gbm9FcnIpCisgICAg ICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgfQorCisgICAgcmV0dXJuIHN5c3RlbVZlcnNpb24g Pj0gMHgxMDYwOworI2VsaWYgZGVmaW5lZChCVUlMRElOR19PTl9TTk9XX0xFT1BBUkQpCisgICAg cmV0dXJuIHRydWU7CisjZWxzZQorICAgIHJldHVybiBmYWxzZTsKKyNlbmRpZgorfQorCiBDVEZv bnRSZWYgRm9udFBsYXRmb3JtRGF0YTo6Y3RGb250KCkgY29uc3QKIHsKICAgICBpZiAobV9DVEZv bnQpCkBAIC0yMDAsMTMgKzIxNywxMCBAQCBDVEZvbnRSZWYgRm9udFBsYXRmb3JtRGF0YTo6Y3RG b250KCkgY29uCiAgICAgbV9DVEZvbnQgPSB0b0NURm9udFJlZihtX2ZvbnQpOwogICAgIGlmICht X0NURm9udCkKICAgICAgICAgbV9DVEZvbnQuYWRvcHRDRihDVEZvbnRDcmVhdGVDb3B5V2l0aEF0 dHJpYnV0ZXMobV9DVEZvbnQuZ2V0KCksIG1fc2l6ZSwgMCwgY2FzY2FkZVRvTGFzdFJlc29ydEZv bnREZXNjcmlwdG9yKCkpKTsKLSAgICBlbHNlIHsKLSNpZiAhZGVmaW5lZChCVUlMRElOR19PTl9M RU9QQVJEKQotICAgICAgICBtX0NURm9udC5hZG9wdENGKENURm9udENyZWF0ZVdpdGhHcmFwaGlj c0ZvbnQobV9jZ0ZvbnQuZ2V0KCksIG1fc2l6ZSwgMCwgY2FzY2FkZVRvTGFzdFJlc29ydEZvbnRE ZXNjcmlwdG9yKCkpKTsKLSNlbHNlCisgICAgZWxzZSBpZiAoZW5hYmxlRm9udENhc2NhZGVPcHRp bWl6YXRpb24oKSkKICAgICAgICAgbV9DVEZvbnQuYWRvcHRDRihDVEZvbnRDcmVhdGVXaXRoR3Jh cGhpY3NGb250KG1fY2dGb250LmdldCgpLCBtX3NpemUsIDAsIDApKTsKLSNlbmRpZgotICAgIH0K KyAgICBlbHNlCisgICAgICAgIG1fQ1RGb250LmFkb3B0Q0YoQ1RGb250Q3JlYXRlV2l0aEdyYXBo aWNzRm9udChtX2NnRm9udC5nZXQoKSwgbV9zaXplLCAwLCBjYXNjYWRlVG9MYXN0UmVzb3J0Rm9u dERlc2NyaXB0b3IoKSkpOwogCiAgICAgaWYgKG1fd2lkdGhWYXJpYW50ICE9IFJlZ3VsYXJXaWR0 aCkgewogICAgICAgICBpbnQgZmVhdHVyZVR5cGVWYWx1ZSA9IGtUZXh0U3BhY2luZ1R5cGU7Cg== 101265 2011-07-18 20:40:09 -0700 2011-07-18 20:44:46 -0700 Fixed per comments bug-64767-20110718204008.patch text/plain 2581 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDkxMjMzKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTEtMDctMTggIFJ5b3N1a2Ug Tml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUkVHUkVTU0lPTig5MTIwOT8pOiBm YXN0L2Nzcy9jdXN0b20tZm9udC14aGVpZ2h0Lmh0bWwgaXMgZmFpbGluZyBvbiBMZW9wYXJkCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02NDc2NworCisg ICAgICAgIEFkZCBhIHJ1bnRpbWUgY2hlY2sgZm9yIGZvbnQgY2FzY2FkaW5nIG9wdGltaXphdGlv bi4KKworICAgICAgICBJdCdzIGEgY29uc3RhbnQgdmFsdWUgaW4gTWFjIHBvcnQgc28gaG9wZWZ1 bGx5IGdjYyB3aWxsIGNvbnN0YW50LXByb3BhZ2F0ZSB0aGUgdmFsdWUKKyAgICAgICAgYW5kIGVs aW1pbmF0ZSB0aGUgZnVuY3Rpb24gYWx0b2dldGhlci4KKworICAgICAgICAqIHBsYXRmb3JtL2dy YXBoaWNzL2NvY29hL0ZvbnRQbGF0Zm9ybURhdGFDb2NvYS5tbToKKyAgICAgICAgKFdlYkNvcmU6 OmNhblNldENhc2NhZGVMaXN0Rm9yQ3VzdG9tRm9udCk6IEFkZGVkLgorICAgICAgICAoV2ViQ29y ZTo6Rm9udFBsYXRmb3JtRGF0YTo6Y3RGb250KToKKwogMjAxMS0wNy0xOCAgRGVhbiBKYWNrc29u ICA8ZGlub0BhcHBsZS5jb20+CiAKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTY0NzQyCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9jb2NvYS9Gb250UGxhdGZvcm1EYXRhQ29jb2EubW0KPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvRm9udFBsYXRmb3JtRGF0YUNvY29hLm1tCShy ZXZpc2lvbiA5MTIzMSkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NvY29h L0ZvbnRQbGF0Zm9ybURhdGFDb2NvYS5tbQkod29ya2luZyBjb3B5KQpAQCAtMTkyLDYgKzE5Miwy NCBAQCBzdGF0aWMgQ1RGb250RGVzY3JpcHRvclJlZiBjYXNjYWRlVG9MYXN0CiAgICAgcmV0dXJu IGRlc2NyaXB0b3I7CiB9CiAKKy8vIEFkZGluZyBhIGNhc2NhZGUgbGlzdCBicmVha3MgdGhlIGZv bnQgb24gTGVvcGFyZAorc3RhdGljIGJvb2wgY2FuU2V0Q2FzY2FkZUxpc3RGb3JDdXN0b21Gb250 KCkKK3sKKyNpZiBQTEFURk9STShDSFJPTUlVTSkKKyAgICBzdGF0aWMgU0ludDMyIHN5c3RlbVZl cnNpb247CisgICAgaWYgKCFzeXN0ZW1WZXJzaW9uKSB7CisgICAgICAgIGlmIChHZXN0YWx0KGdl c3RhbHRTeXN0ZW1WZXJzaW9uLCAmc3lzdGVtVmVyc2lvbikgIT0gbm9FcnIpCisgICAgICAgICAg ICByZXR1cm4gZmFsc2U7CisgICAgfQorCisgICAgcmV0dXJuIHN5c3RlbVZlcnNpb24gPj0gMHgx MDYwOworI2VsaWYgIWRlZmluZWQoQlVJTERJTkdfT05fTEVPUEFSRCkKKyAgICByZXR1cm4gdHJ1 ZTsKKyNlbHNlCisgICAgcmV0dXJuIGZhbHNlOworI2VuZGlmCit9CisKIENURm9udFJlZiBGb250 UGxhdGZvcm1EYXRhOjpjdEZvbnQoKSBjb25zdAogewogICAgIGlmIChtX0NURm9udCkKQEAgLTIw MCwxMyArMjE4LDggQEAgQ1RGb250UmVmIEZvbnRQbGF0Zm9ybURhdGE6OmN0Rm9udCgpIGNvbgog ICAgIG1fQ1RGb250ID0gdG9DVEZvbnRSZWYobV9mb250KTsKICAgICBpZiAobV9DVEZvbnQpCiAg ICAgICAgIG1fQ1RGb250LmFkb3B0Q0YoQ1RGb250Q3JlYXRlQ29weVdpdGhBdHRyaWJ1dGVzKG1f Q1RGb250LmdldCgpLCBtX3NpemUsIDAsIGNhc2NhZGVUb0xhc3RSZXNvcnRGb250RGVzY3JpcHRv cigpKSk7Ci0gICAgZWxzZSB7Ci0jaWYgIWRlZmluZWQoQlVJTERJTkdfT05fTEVPUEFSRCkKLSAg ICAgICAgbV9DVEZvbnQuYWRvcHRDRihDVEZvbnRDcmVhdGVXaXRoR3JhcGhpY3NGb250KG1fY2dG b250LmdldCgpLCBtX3NpemUsIDAsIGNhc2NhZGVUb0xhc3RSZXNvcnRGb250RGVzY3JpcHRvcigp KSk7Ci0jZWxzZQotICAgICAgICBtX0NURm9udC5hZG9wdENGKENURm9udENyZWF0ZVdpdGhHcmFw aGljc0ZvbnQobV9jZ0ZvbnQuZ2V0KCksIG1fc2l6ZSwgMCwgMCkpOwotI2VuZGlmCi0gICAgfQor ICAgIGVsc2UgaWYgKGVuYWJsZUZvbnRDYXNjYWRlT3B0aW1pemF0aW9uKCkpCisgICAgICAgIG1f Q1RGb250LmFkb3B0Q0YoQ1RGb250Q3JlYXRlV2l0aEdyYXBoaWNzRm9udChtX2NnRm9udC5nZXQo KSwgbV9zaXplLCAwLCBjYW5TZXRDYXNjYWRlTGlzdEZvckN1c3RvbUZvbnQoKSA/IGNhc2NhZGVU b0xhc3RSZXNvcnRGb250RGVzY3JpcHRvcigpIDogMCkpOwogCiAgICAgaWYgKG1fd2lkdGhWYXJp YW50ICE9IFJlZ3VsYXJXaWR0aCkgewogICAgICAgICBpbnQgZmVhdHVyZVR5cGVWYWx1ZSA9IGtU ZXh0U3BhY2luZ1R5cGU7Cg== 101266 2011-07-18 20:46:51 -0700 2011-07-18 20:47:29 -0700 Fixed per comments bug-64767-20110718204650.patch text/plain 2582 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDkxMjMzKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTEtMDctMTggIFJ5b3N1a2Ug Tml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUkVHUkVTU0lPTig5MTIwOT8pOiBm YXN0L2Nzcy9jdXN0b20tZm9udC14aGVpZ2h0Lmh0bWwgaXMgZmFpbGluZyBvbiBMZW9wYXJkCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02NDc2NworCisg ICAgICAgIEFkZCBhIHJ1bnRpbWUgY2hlY2sgZm9yIGZvbnQgY2FzY2FkaW5nIG9wdGltaXphdGlv bi4KKworICAgICAgICBJdCdzIGEgY29uc3RhbnQgdmFsdWUgaW4gTWFjIHBvcnQgc28gaG9wZWZ1 bGx5IGdjYyB3aWxsIGNvbnN0YW50LXByb3BhZ2F0ZSB0aGUgdmFsdWUKKyAgICAgICAgYW5kIGVs aW1pbmF0ZSB0aGUgZnVuY3Rpb24gYWx0b2dldGhlci4KKworICAgICAgICAqIHBsYXRmb3JtL2dy YXBoaWNzL2NvY29hL0ZvbnRQbGF0Zm9ybURhdGFDb2NvYS5tbToKKyAgICAgICAgKFdlYkNvcmU6 OmNhblNldENhc2NhZGVMaXN0Rm9yQ3VzdG9tRm9udCk6IEFkZGVkLgorICAgICAgICAoV2ViQ29y ZTo6Rm9udFBsYXRmb3JtRGF0YTo6Y3RGb250KToKKwogMjAxMS0wNy0xOCAgRGVhbiBKYWNrc29u ICA8ZGlub0BhcHBsZS5jb20+CiAKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTY0NzQyCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9jb2NvYS9Gb250UGxhdGZvcm1EYXRhQ29jb2EubW0KPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvRm9udFBsYXRmb3JtRGF0YUNvY29hLm1tCShy ZXZpc2lvbiA5MTIzMSkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NvY29h L0ZvbnRQbGF0Zm9ybURhdGFDb2NvYS5tbQkod29ya2luZyBjb3B5KQpAQCAtMTkyLDYgKzE5Miwy NCBAQCBzdGF0aWMgQ1RGb250RGVzY3JpcHRvclJlZiBjYXNjYWRlVG9MYXN0CiAgICAgcmV0dXJu IGRlc2NyaXB0b3I7CiB9CiAKKy8vIEFkZGluZyBhIGNhc2NhZGUgbGlzdCBicmVha3MgdGhlIGZv bnQgb24gTGVvcGFyZAorc3RhdGljIGJvb2wgY2FuU2V0Q2FzY2FkZUxpc3RGb3JDdXN0b21Gb250 KCkKK3sKKyNpZiBQTEFURk9STShDSFJPTUlVTSkKKyAgICBzdGF0aWMgU0ludDMyIHN5c3RlbVZl cnNpb247CisgICAgaWYgKCFzeXN0ZW1WZXJzaW9uKSB7CisgICAgICAgIGlmIChHZXN0YWx0KGdl c3RhbHRTeXN0ZW1WZXJzaW9uLCAmc3lzdGVtVmVyc2lvbikgIT0gbm9FcnIpCisgICAgICAgICAg ICByZXR1cm4gZmFsc2U7CisgICAgfQorCisgICAgcmV0dXJuIHN5c3RlbVZlcnNpb24gPj0gMHgx MDYwOworI2VsaWYgIWRlZmluZWQoQlVJTERJTkdfT05fTEVPUEFSRCkKKyAgICByZXR1cm4gdHJ1 ZTsKKyNlbHNlCisgICAgcmV0dXJuIGZhbHNlOworI2VuZGlmCit9CisKIENURm9udFJlZiBGb250 UGxhdGZvcm1EYXRhOjpjdEZvbnQoKSBjb25zdAogewogICAgIGlmIChtX0NURm9udCkKQEAgLTIw MCwxMyArMjE4LDggQEAgQ1RGb250UmVmIEZvbnRQbGF0Zm9ybURhdGE6OmN0Rm9udCgpIGNvbgog ICAgIG1fQ1RGb250ID0gdG9DVEZvbnRSZWYobV9mb250KTsKICAgICBpZiAobV9DVEZvbnQpCiAg ICAgICAgIG1fQ1RGb250LmFkb3B0Q0YoQ1RGb250Q3JlYXRlQ29weVdpdGhBdHRyaWJ1dGVzKG1f Q1RGb250LmdldCgpLCBtX3NpemUsIDAsIGNhc2NhZGVUb0xhc3RSZXNvcnRGb250RGVzY3JpcHRv cigpKSk7Ci0gICAgZWxzZSB7Ci0jaWYgIWRlZmluZWQoQlVJTERJTkdfT05fTEVPUEFSRCkKLSAg ICAgICAgbV9DVEZvbnQuYWRvcHRDRihDVEZvbnRDcmVhdGVXaXRoR3JhcGhpY3NGb250KG1fY2dG b250LmdldCgpLCBtX3NpemUsIDAsIGNhc2NhZGVUb0xhc3RSZXNvcnRGb250RGVzY3JpcHRvcigp KSk7Ci0jZWxzZQotICAgICAgICBtX0NURm9udC5hZG9wdENGKENURm9udENyZWF0ZVdpdGhHcmFw aGljc0ZvbnQobV9jZ0ZvbnQuZ2V0KCksIG1fc2l6ZSwgMCwgMCkpOwotI2VuZGlmCi0gICAgfQor ICAgIGVsc2UgaWYgKGNhblNldENhc2NhZGVMaXN0Rm9yQ3VzdG9tRm9udCgpKQorICAgICAgICBt X0NURm9udC5hZG9wdENGKENURm9udENyZWF0ZVdpdGhHcmFwaGljc0ZvbnQobV9jZ0ZvbnQuZ2V0 KCksIG1fc2l6ZSwgMCwgY2FuU2V0Q2FzY2FkZUxpc3RGb3JDdXN0b21Gb250KCkgPyBjYXNjYWRl VG9MYXN0UmVzb3J0Rm9udERlc2NyaXB0b3IoKSA6IDApKTsKIAogICAgIGlmIChtX3dpZHRoVmFy aWFudCAhPSBSZWd1bGFyV2lkdGgpIHsKICAgICAgICAgaW50IGZlYXR1cmVUeXBlVmFsdWUgPSBr VGV4dFNwYWNpbmdUeXBlOwo= 101267 2011-07-18 20:56:01 -0700 2011-07-18 21:14:44 -0700 More fixes bug-64767-20110718205600.patch text/plain 2544 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDkxMjMzKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTEtMDctMTggIFJ5b3N1a2Ug Tml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUkVHUkVTU0lPTig5MTIwOT8pOiBm YXN0L2Nzcy9jdXN0b20tZm9udC14aGVpZ2h0Lmh0bWwgaXMgZmFpbGluZyBvbiBMZW9wYXJkCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02NDc2NworCisg ICAgICAgIEFkZCBhIHJ1bnRpbWUgY2hlY2sgZm9yIGZvbnQgY2FzY2FkaW5nIG9wdGltaXphdGlv bi4KKworICAgICAgICBJdCdzIGEgY29uc3RhbnQgdmFsdWUgaW4gTWFjIHBvcnQgc28gaG9wZWZ1 bGx5IGdjYyB3aWxsIGNvbnN0YW50LXByb3BhZ2F0ZSB0aGUgdmFsdWUKKyAgICAgICAgYW5kIGVs aW1pbmF0ZSB0aGUgZnVuY3Rpb24gYWx0b2dldGhlci4KKworICAgICAgICAqIHBsYXRmb3JtL2dy YXBoaWNzL2NvY29hL0ZvbnRQbGF0Zm9ybURhdGFDb2NvYS5tbToKKyAgICAgICAgKFdlYkNvcmU6 OmNhblNldENhc2NhZGVMaXN0Rm9yQ3VzdG9tRm9udCk6IEFkZGVkLgorICAgICAgICAoV2ViQ29y ZTo6Rm9udFBsYXRmb3JtRGF0YTo6Y3RGb250KToKKwogMjAxMS0wNy0xOCAgRGVhbiBKYWNrc29u ICA8ZGlub0BhcHBsZS5jb20+CiAKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTY0NzQyCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9jb2NvYS9Gb250UGxhdGZvcm1EYXRhQ29jb2EubW0KPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvRm9udFBsYXRmb3JtRGF0YUNvY29hLm1tCShy ZXZpc2lvbiA5MTIzMSkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NvY29h L0ZvbnRQbGF0Zm9ybURhdGFDb2NvYS5tbQkod29ya2luZyBjb3B5KQpAQCAtMTkyLDYgKzE5Miwy NCBAQCBzdGF0aWMgQ1RGb250RGVzY3JpcHRvclJlZiBjYXNjYWRlVG9MYXN0CiAgICAgcmV0dXJu IGRlc2NyaXB0b3I7CiB9CiAKKy8vIEFkZGluZyBhIGNhc2NhZGUgbGlzdCBicmVha3MgdGhlIGZv bnQgb24gTGVvcGFyZAorc3RhdGljIGJvb2wgY2FuU2V0Q2FzY2FkZUxpc3RGb3JDdXN0b21Gb250 KCkKK3sKKyNpZiBQTEFURk9STShDSFJPTUlVTSkKKyAgICBzdGF0aWMgU0ludDMyIHN5c3RlbVZl cnNpb247CisgICAgaWYgKCFzeXN0ZW1WZXJzaW9uKSB7CisgICAgICAgIGlmIChHZXN0YWx0KGdl c3RhbHRTeXN0ZW1WZXJzaW9uLCAmc3lzdGVtVmVyc2lvbikgIT0gbm9FcnIpCisgICAgICAgICAg ICByZXR1cm4gZmFsc2U7CisgICAgfQorCisgICAgcmV0dXJuIHN5c3RlbVZlcnNpb24gPj0gMHgx MDYwOworI2VsaWYgIWRlZmluZWQoQlVJTERJTkdfT05fTEVPUEFSRCkKKyAgICByZXR1cm4gdHJ1 ZTsKKyNlbHNlCisgICAgcmV0dXJuIGZhbHNlOworI2VuZGlmCit9CisKIENURm9udFJlZiBGb250 UGxhdGZvcm1EYXRhOjpjdEZvbnQoKSBjb25zdAogewogICAgIGlmIChtX0NURm9udCkKQEAgLTIw MCwxMyArMjE4LDggQEAgQ1RGb250UmVmIEZvbnRQbGF0Zm9ybURhdGE6OmN0Rm9udCgpIGNvbgog ICAgIG1fQ1RGb250ID0gdG9DVEZvbnRSZWYobV9mb250KTsKICAgICBpZiAobV9DVEZvbnQpCiAg ICAgICAgIG1fQ1RGb250LmFkb3B0Q0YoQ1RGb250Q3JlYXRlQ29weVdpdGhBdHRyaWJ1dGVzKG1f Q1RGb250LmdldCgpLCBtX3NpemUsIDAsIGNhc2NhZGVUb0xhc3RSZXNvcnRGb250RGVzY3JpcHRv cigpKSk7Ci0gICAgZWxzZSB7Ci0jaWYgIWRlZmluZWQoQlVJTERJTkdfT05fTEVPUEFSRCkKLSAg ICAgICAgbV9DVEZvbnQuYWRvcHRDRihDVEZvbnRDcmVhdGVXaXRoR3JhcGhpY3NGb250KG1fY2dG b250LmdldCgpLCBtX3NpemUsIDAsIGNhc2NhZGVUb0xhc3RSZXNvcnRGb250RGVzY3JpcHRvcigp KSk7Ci0jZWxzZQotICAgICAgICBtX0NURm9udC5hZG9wdENGKENURm9udENyZWF0ZVdpdGhHcmFw aGljc0ZvbnQobV9jZ0ZvbnQuZ2V0KCksIG1fc2l6ZSwgMCwgMCkpOwotI2VuZGlmCi0gICAgfQor ICAgIGVsc2UKKyAgICAgICAgbV9DVEZvbnQuYWRvcHRDRihDVEZvbnRDcmVhdGVXaXRoR3JhcGhp Y3NGb250KG1fY2dGb250LmdldCgpLCBtX3NpemUsIDAsIGNhblNldENhc2NhZGVMaXN0Rm9yQ3Vz dG9tRm9udCgpID8gY2FzY2FkZVRvTGFzdFJlc29ydEZvbnREZXNjcmlwdG9yKCkgOiAwKSk7CiAK ICAgICBpZiAobV93aWR0aFZhcmlhbnQgIT0gUmVndWxhcldpZHRoKSB7CiAgICAgICAgIGludCBm ZWF0dXJlVHlwZVZhbHVlID0ga1RleHRTcGFjaW5nVHlwZTsK