38530 2010-05-04 10:43:40 -0700 SVG fonts trigger GlyphPage::fill with null font 2010-05-24 11:42:36 -0700 1 1 1 Unclassified WebKit Text 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED InRadar P2 Normal --- 1 joepeck webkit-unassigned joepeck mitz webkit.review.bot oldest_to_newest 220656 0 joepeck 2010-05-04 10:43:40 -0700 If the primary font is non-SVG, but there is an SVG segment, than when initializing GlyphPages a page may attempt to be filled with an SVG font. This results in a null font being used in GlyphPage::fill() which does not crash but instead fills the page buffer with 0s. This point can be reached if the SVG font is loading while layout occurs. 220675 1 55029 joepeck 2010-05-04 11:13:37 -0700 Created attachment 55029 [PATCH] Proposed Fix - Test for SVG Fonts in initializePage This attempts to quickly handle an SVG font in GlyphPageTreeNode::initializePage. This prevents sending a null font, so it should be saving some memory. I can't think of a way to test this. It may just be a memory improvement. Any thoughts from font/text experts? 220679 2 55029 mitz 2010-05-04 11:25:37 -0700 Comment on attachment 55029 [PATCH] Proposed Fix - Test for SVG Fonts in initializePage I don’t think this is the best fix. SegmentedFontData::isSVGFont()—and by extension FontData::isSVGFont()— doesn’t make sense. Even though currently SVG segments aren’t handled correctly due to bug 32227, introducing this concept is a step in the wrong direction. Instead, GlyphPageTreeNode::initializePage() should examine individual SimpleFontData for SVG-ness, and in the SVG case, instead of calling fill() it should zero-fill and behave as if fill() returned false. Since fill() has two call sites in initializePage(), you can add a small static helper method that does this. 220790 3 joepeck 2010-05-04 14:27:59 -0700 While writing a new patch, which shouldn't have changed anything, I was seeing a few changes to this pixel test. This looks stale to me, since Safari 4.0.5 doesn't look like that for me: http://trac.webkit.org/browser/trunk/LayoutTests/platform/mac/svg/text/text-fonts-01-t-expected.png 220798 4 joepeck 2010-05-04 14:42:49 -0700 Both of these are now failing for me after I backed my patch out. Work for me on another machine. svg/W3C-SVG-1.1/text-fonts-01-t.svg svg/text/text-fonts-01-t.svg 220811 5 joepeck 2010-05-04 15:16:54 -0700 After a reboot, and updating to ToT without my patch these are still failing 100% for me but not on the bots. So I'm going to reapply my patch and suggest it without changes to these tests. 220815 6 55052 joepeck 2010-05-04 15:27:22 -0700 Created attachment 55052 [PATCH] Suggested Fix Based on Comments After putting in my own expected results for before this change, this change did not affect the results. 220817 7 webkit.review.bot 2010-05-04 15:28:52 -0700 Attachment 55052 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style', '--no-squash']" exit_code: 1 WebCore/platform/graphics/GlyphPageTreeNode.cpp:129: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] WebCore/platform/graphics/GlyphPageTreeNode.cpp:134: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] WebCore/platform/graphics/GlyphPageTreeNode.cpp:136: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Total errors found: 3 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 220826 8 55059 joepeck 2010-05-04 15:35:31 -0700 Created attachment 55059 [PATCH] Suggested Fix Based on Comments + Style Fix Style fixes. 220857 9 joepeck 2010-05-04 16:18:36 -0700 Committed r58786 M WebCore/ChangeLog M WebCore/platform/graphics/GlyphPageTreeNode.cpp r58786 = 3aefd0619567aa7a18a92b20d442d1274a40e72f (refs/remotes/trunk) http://trac.webkit.org/changeset/58786 I'll be watching the bots to see if the tests change, but I don't expect them to. 229832 10 mitz 2010-05-24 11:42:36 -0700 <rdar://problem/7828848> 55029 2010-05-04 11:13:37 -0700 2010-05-04 15:27:22 -0700 [PATCH] Proposed Fix - Test for SVG Fonts in initializePage svg-fix-1.patch text/plain 5353 joepeck ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NjMyZWZlMy4uN2FjNjM2ZCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNSBAQAorMjAxMC0wNS0wNCAgSm9zZXBoIFBlY29y YXJvICA8am9lcGVja0B3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFNWRyBmb250cyBtYXkgY3JlYXRlIGJsYW5rIEdseXBoIENhY2hl IFBhZ2VzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0z ODUzMAorCisgICAgICAgIFRoaXMgYnJlYWtzIGVhcmx5IHdoZW4gaW5pdGlhbGl6aW5nIGdseXBo IHBhZ2VzIGlmIHRoZXJlIGlzIGFuIFNWRyBGb250CisgICAgICAgIGJlY2F1c2UgU1ZHIGZvbnRz IGRvIG5vdCB1c2UgdGhlIGdseXBoIHBhZ2UgY2FjaGUuIFRoaXMgcHJldmVudHMgYSBudWxsCisg ICAgICAgIGZvbnQgZnJvbSBiZWluZyB1c2VkIGluIEdseXBoUGFnZTo6ZmlsbCgpIHdoaWNoIHdv dWxkIGNyZWF0ZSBhIGJsYW5rCisgICAgICAgIGdseXBoIHBhZ2UgZmlsbGVkIHdpdGggMHMuCisK KyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9Gb250RGF0YS5oOiBtb3ZlIGlzU1ZHRm9udCB1 cCB0byB0aGUgRm9udERhdGEgbGV2ZWwKKyAgICAgICAgKFdlYkNvcmU6OkZvbnREYXRhOjppc1NW R0ZvbnQpOiBkZWZhdWx0IGltcGxlbWVudGF0aW9uIGZvciBub24tRU5BQkxFX1NWR19GT05UCisg ICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvR2x5cGhQYWdlVHJlZU5vZGUuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6R2x5cGhQYWdlVHJlZU5vZGU6OmluaXRpYWxpemVQYWdlKTogZGV0ZWN0IGFu IFNWRyBGb250IGFuZCBicmVhayBlYXJseQorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL1Nl Z21lbnRlZEZvbnREYXRhLmNwcDogCisgICAgICAgIChXZWJDb3JlOjpTZWdtZW50ZWRGb250RGF0 YTo6aXNTVkdGb250KTogY2hlY2sgaWYgYW55IHNlZ21lbnQgaXMgYW4gU1ZHIEZvbnQKKyAgICAg ICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9TZWdtZW50ZWRGb250RGF0YS5oOiBub3cgaW1wbGVtZW50 cyBpc1NWR0ZvbnQKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9TaW1wbGVGb250RGF0YS5o OgorICAgICAgICAoV2ViQ29yZTo6U2ltcGxlRm9udERhdGE6OmlzU1ZHRm9udCk6IGlzU1ZHRm9u dCBtb3ZlZCB1cCBhIGxldmVsLCBzbyBtYWtlIHRoaXMgdmlydHVhbCBub3cKKwogMjAxMC0wNS0w MyAgSm9zZXBoIFBlY29yYXJvICA8am9lcGVja0B3ZWJraXQub3JnPgogCiAgICAgICAgIFJldmll d2VkIGJ5IERhbiBCZXJuc3RlaW4uCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL0ZvbnREYXRhLmggYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnREYXRhLmgKaW5k ZXggNzY5MjdmNS4uYTUyZjQxOCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9Gb250RGF0YS5oCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udERhdGEuaApA QCAtNDksNiArNDksMTIgQEAgcHVibGljOgogICAgIHZpcnR1YWwgYm9vbCBpc0xvYWRpbmcoKSBj b25zdCA9IDA7CiAgICAgdmlydHVhbCBib29sIGlzU2VnbWVudGVkKCkgY29uc3QgPSAwOwogCisj aWYgRU5BQkxFKFNWR19GT05UUykKKyAgICB2aXJ0dWFsIGJvb2wgaXNTVkdGb250KCkgY29uc3Qg PSAwOworI2Vsc2UKKyAgICBib29sIGlzU1ZHRm9udCgpIGNvbnN0IHsgcmV0dXJuIGZhbHNlOyB9 CisjZW5kaWYKKwogICAgIHZvaWQgc2V0TWF4R2x5cGhQYWdlVHJlZUxldmVsKHVuc2lnbmVkIGxl dmVsKSBjb25zdCB7IG1fbWF4R2x5cGhQYWdlVHJlZUxldmVsID0gbGV2ZWw7IH0KICAgICB1bnNp Z25lZCBtYXhHbHlwaFBhZ2VUcmVlTGV2ZWwoKSBjb25zdCB7IHJldHVybiBtX21heEdseXBoUGFn ZVRyZWVMZXZlbDsgfQogCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ds eXBoUGFnZVRyZWVOb2RlLmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR2x5cGhQYWdl VHJlZU5vZGUuY3BwCmluZGV4IDllODQ2ZWMuLmNmM2JiNDcgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvR2x5cGhQYWdlVHJlZU5vZGUuY3BwCisrKyBiL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvR2x5cGhQYWdlVHJlZU5vZGUuY3BwCkBAIC0xMzYsOCArMTM2LDE2IEBA IHZvaWQgR2x5cGhQYWdlVHJlZU5vZGU6OmluaXRpYWxpemVQYWdlKGNvbnN0IEZvbnREYXRhKiBm b250RGF0YSwgdW5zaWduZWQgcGFnZU51CiAgICAgLy8gZGlkIG5vdCBjb250YWluIGFueSBnbHlw aHMgZm9yIHRoYXQgcGFnZS4KICAgICBHbHlwaFBhZ2UqIHBhcmVudFBhZ2UgPSBtX3BhcmVudC0+ cGFnZSgpOwogCisgICAgLy8gU1ZHIEZvbnRzIGRvIG5vdCB1c2UgdGhlIGdseXBoIHBhZ2UgY2Fj aGUsIHNvIHVzZSB0aGUgcGFyZW50J3MgcGFnZSBpZgorICAgIC8vIHRoZXJlIGlzIGEgcGFyZW50 IHBhZ2UuCisgICAgaWYgKHBhcmVudFBhZ2UgJiYgZm9udERhdGEtPmlzU1ZHRm9udCgpKSB7Cisg ICAgICAgIG1fcGFnZSA9IHBhcmVudFBhZ2U7CisgICAgICAgIHJldHVybjsKKyAgICB9CisgICAg CiAgICAgLy8gTlVMTCBGb250RGF0YSBtZWFucyB3ZSdyZSBiZWluZyBhc2tlZCBmb3IgdGhlIHN5 c3RlbSBmYWxsYmFjayBmb250LgotICAgIGlmIChmb250RGF0YSkgeworICAgIC8vIFNWRyBGb250 cyBkbyBub3QgdXNlIHRoZSBnbHlwaCBwYWdlIGNhY2hlIHNvIHJlc29ydCB0byBmYWxsYmFjayBi ZWhhdmlvci4KKyAgICBpZiAoZm9udERhdGEgJiYgIWZvbnREYXRhLT5pc1NWR0ZvbnQoKSkgewog ICAgICAgICBpZiAobV9sZXZlbCA9PSAxKSB7CiAgICAgICAgICAgICAvLyBDaGlsZHJlbiBvZiB0 aGUgcm9vdCBob2xkIHB1cmUgcGFnZXMuIFRoZXNlIHdpbGwgY292ZXIgb25seSBvbmUKICAgICAg ICAgICAgIC8vIGZvbnQgZGF0YSdzIGdseXBocywgYW5kIHdpbGwgaGF2ZSBnbHlwaCBpbmRleCAw IGlmIHRoZSBmb250IGRhdGEgZG9lcyBub3QKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvU2VnbWVudGVkRm9udERhdGEuY3BwIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9TZWdtZW50ZWRGb250RGF0YS5jcHAKaW5kZXggN2UxMDA0MC4uOTQ0ODI1OSAxMDA2NDQKLS0t IGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9TZWdtZW50ZWRGb250RGF0YS5jcHAKKysrIGIv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9TZWdtZW50ZWRGb250RGF0YS5jcHAKQEAgLTg4LDYg Kzg4LDE4IEBAIGJvb2wgU2VnbWVudGVkRm9udERhdGE6OmlzU2VnbWVudGVkKCkgY29uc3QKICAg ICByZXR1cm4gdHJ1ZTsKIH0KIAorI2lmIEVOQUJMRShTVkdfRk9OVFMpCitib29sIFNlZ21lbnRl ZEZvbnREYXRhOjppc1NWR0ZvbnQoKSBjb25zdAoreworICAgIFZlY3RvcjxGb250RGF0YVJhbmdl Pjo6Y29uc3RfaXRlcmF0b3IgZW5kID0gbV9yYW5nZXMuZW5kKCk7CisgICAgZm9yIChWZWN0b3I8 Rm9udERhdGFSYW5nZT46OmNvbnN0X2l0ZXJhdG9yIGl0ID0gbV9yYW5nZXMuYmVnaW4oKTsgaXQg IT0gZW5kOyArK2l0KSB7CisgICAgICAgIGlmIChpdC0+Zm9udERhdGEoKS0+aXNTVkdGb250KCkp CisgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICB9CisgICAgcmV0dXJuIGZhbHNlOworfQor I2VuZGlmCisKICNpZm5kZWYgTkRFQlVHCiBTdHJpbmcgU2VnbWVudGVkRm9udERhdGE6OmRlc2Ny aXB0aW9uKCkgY29uc3QKIHsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv U2VnbWVudGVkRm9udERhdGEuaCBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvU2VnbWVudGVk Rm9udERhdGEuaAppbmRleCA2NDVkYzBkLi41ZWE2YjFjIDEwMDY0NAotLS0gYS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL1NlZ21lbnRlZEZvbnREYXRhLmgKKysrIGIvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9TZWdtZW50ZWRGb250RGF0YS5oCkBAIC03MSw2ICs3MSwxMCBAQCBwcml2YXRl OgogICAgIHZpcnR1YWwgYm9vbCBpc0xvYWRpbmcoKSBjb25zdDsKICAgICB2aXJ0dWFsIGJvb2wg aXNTZWdtZW50ZWQoKSBjb25zdDsKIAorI2lmIEVOQUJMRShTVkdfRk9OVFMpCisgICAgdmlydHVh bCBib29sIGlzU1ZHRm9udCgpIGNvbnN0OworI2VuZGlmCisKICAgICBib29sIGNvbnRhaW5zQ2hh cmFjdGVyKFVDaGFyMzIpIGNvbnN0OwogCiAgICAgVmVjdG9yPEZvbnREYXRhUmFuZ2UsIDE+IG1f cmFuZ2VzOwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9TaW1wbGVGb250 RGF0YS5oIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9TaW1wbGVGb250RGF0YS5oCmluZGV4 IDRjMzRmMmIuLmU4Y2JiNzYgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv U2ltcGxlRm9udERhdGEuaAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL1NpbXBsZUZv bnREYXRhLmgKQEAgLTEwNiwxNyArMTA2LDE1IEBAIHB1YmxpYzoKICAgICB2b2lkIGRldGVybWlu ZVBpdGNoKCk7CiAgICAgUGl0Y2ggcGl0Y2goKSBjb25zdCB7IHJldHVybiBtX3RyZWF0QXNGaXhl ZFBpdGNoID8gRml4ZWRQaXRjaCA6IFZhcmlhYmxlUGl0Y2g7IH0KIAotI2lmIEVOQUJMRShTVkdf Rk9OVFMpCi0gICAgU1ZHRm9udERhdGEqIHN2Z0ZvbnREYXRhKCkgY29uc3QgeyByZXR1cm4gbV9z dmdGb250RGF0YS5nZXQoKTsgfQotICAgIGJvb2wgaXNTVkdGb250KCkgY29uc3QgeyByZXR1cm4g bV9zdmdGb250RGF0YTsgfQotI2Vsc2UKLSAgICBib29sIGlzU1ZHRm9udCgpIGNvbnN0IHsgcmV0 dXJuIGZhbHNlOyB9Ci0jZW5kaWYKLQogICAgIHZpcnR1YWwgYm9vbCBpc0N1c3RvbUZvbnQoKSBj b25zdCB7IHJldHVybiBtX2lzQ3VzdG9tRm9udDsgfQogICAgIHZpcnR1YWwgYm9vbCBpc0xvYWRp bmcoKSBjb25zdCB7IHJldHVybiBtX2lzTG9hZGluZzsgfQogICAgIHZpcnR1YWwgYm9vbCBpc1Nl Z21lbnRlZCgpIGNvbnN0OwogCisjaWYgRU5BQkxFKFNWR19GT05UUykKKyAgICBTVkdGb250RGF0 YSogc3ZnRm9udERhdGEoKSBjb25zdCB7IHJldHVybiBtX3N2Z0ZvbnREYXRhLmdldCgpOyB9Cisg ICAgdmlydHVhbCBib29sIGlzU1ZHRm9udCgpIGNvbnN0IHsgcmV0dXJuIG1fc3ZnRm9udERhdGE7 IH0KKyNlbmRpZgorCiAgICAgY29uc3QgR2x5cGhEYXRhJiBtaXNzaW5nR2x5cGhEYXRhKCkgY29u c3QgeyByZXR1cm4gbV9taXNzaW5nR2x5cGhEYXRhOyB9CiAKICNpZm5kZWYgTkRFQlVHCg== 55052 2010-05-04 15:27:22 -0700 2010-05-04 15:35:31 -0700 [PATCH] Suggested Fix Based on Comments svg-fonts-2.patch text/plain 3120 joepeck ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NDllMDQzYS4uM2JjZTdkZSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAxMC0wNS0wNCAgSm9zZXBoIFBlY29y YXJvICA8am9lcGVja0B3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFNWRyBmb250cyB0cmlnZ2VyIEdseXBoUGFnZTo6ZmlsbCB3aXRo IG51bGwgZm9udAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9Mzg1MzAKKworICAgICAgICBTVkcgZm9udHMgZG8gbm90IHVzZSB0aGUgZ2x5cGggcGFnZSBj YWNoZS4gVGhpcyBjaGFuZ2UgZGV0ZWN0cyB3aGVuCisgICAgICAgIGF0dGVtcHRpbmcgdG8gZmls bCBhIEdseXBoUGFnZSB3aXRoIGFuIFNWRyBmb250IGFuZCBpbmRpY2F0ZXMgdGhhdAorICAgICAg ICB0aGUgZ2x5cGhzIHdlcmUgbm90IGF2YWlsYWJsZS4KKworICAgICAgICAqIHBsYXRmb3JtL2dy YXBoaWNzL0dseXBoUGFnZVRyZWVOb2RlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmZpbGwpOiBo ZWxwZXIgbWV0aG9kIHdoaWNoIGhhbmRsZXMgYXR0ZW1wdHMgdG8gZmlsbCBhIEdseXBoUGFnZSB3 aXRoIFNWRyBvciBub24tU1ZHIGZvbnRzCisgICAgICAgIChXZWJDb3JlOjpHbHlwaFBhZ2VUcmVl Tm9kZTo6aW5pdGlhbGl6ZVBhZ2UpOiB1c2UgdGhlIGhlbHBlciB3aGVyZSBhcHByb3ByaWF0ZQor CiAyMDEwLTA1LTA0ICBTdGV2ZSBCbG9jayAgPHN0ZXZlYmxvY2tAZ29vZ2xlLmNvbT4KIAogICAg ICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvR2x5cGhQYWdlVHJlZU5vZGUuY3BwIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9HbHlwaFBhZ2VUcmVlTm9kZS5jcHAKaW5kZXggOWU4NDZlYy4uOGNiNjUwNyAxMDA2NDQK LS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HbHlwaFBhZ2VUcmVlTm9kZS5jcHAKKysr IGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HbHlwaFBhZ2VUcmVlTm9kZS5jcHAKQEAgLTEy NCw2ICsxMjQsMTggQEAgR2x5cGhQYWdlVHJlZU5vZGU6On5HbHlwaFBhZ2VUcmVlTm9kZSgpCiAg ICAgZGVsZXRlIG1fc3lzdGVtRmFsbGJhY2tDaGlsZDsKIH0KIAorc3RhdGljIGJvb2wgZmlsbChH bHlwaFBhZ2UqIHBhZ2VUb0ZpbGwsIHVuc2lnbmVkIG9mZnNldCwgdW5zaWduZWQgbGVuZ3RoLCBV Q2hhciogYnVmZmVyLCB1bnNpZ25lZCBidWZmZXJMZW5ndGgsIGNvbnN0IFNpbXBsZUZvbnREYXRh KiBmb250RGF0YSkKK3sKKyAgIGlmICghZm9udERhdGEtPmlzU1ZHRm9udCgpKQorICAgICAgICBy ZXR1cm4gcGFnZVRvRmlsbC0+ZmlsbChvZmZzZXQsIGxlbmd0aCwgYnVmZmVyLCBidWZmZXJMZW5n dGgsIGZvbnREYXRhKTsKKworICAgIC8vIFNWRyBGb250cyBkbyBub3QgdXNlIHRoZSBnbHlwaCBw YWdlIGNhY2hlLiBaZXJvIGZpbGwgdGhlIGdseXBoCisgICAgLy8gcG9zaXRpb25zIGFuZCByZXR1 cm4gZmFsc2UgdG8gaW5kaWNhdGUgdGhlIGdseXBocyB3ZXJlIG5vdCBmb3VuZC4KKyAgIGZvciAo dW5zaWduZWQgaSA9IDA7IGkgPCBsZW5ndGg7ICsraSkKKyAgICAgICBwYWdlVG9GaWxsLT5zZXRH bHlwaERhdGFGb3JJbmRleChvZmZzZXQgKyBpLCAwLCAwKTsKKyAgIHJldHVybiBmYWxzZTsKK30K Kwogdm9pZCBHbHlwaFBhZ2VUcmVlTm9kZTo6aW5pdGlhbGl6ZVBhZ2UoY29uc3QgRm9udERhdGEq IGZvbnREYXRhLCB1bnNpZ25lZCBwYWdlTnVtYmVyKQogewogICAgIEFTU0VSVCghbV9wYWdlKTsK QEAgLTIyMyw3ICsyMzUsNyBAQCB2b2lkIEdseXBoUGFnZVRyZWVOb2RlOjppbml0aWFsaXplUGFn ZShjb25zdCBGb250RGF0YSogZm9udERhdGEsIHVuc2lnbmVkIHBhZ2VOdQogICAgICAgICAgICAg ICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgICAgICAgICAgICAgICB6ZXJvRmlsbGVk ID0gdHJ1ZTsKICAgICAgICAgICAgICAgICAgICAgICAgIH0KLSAgICAgICAgICAgICAgICAgICAg ICAgIGhhdmVHbHlwaHMgfD0gcGFnZVRvRmlsbC0+ZmlsbChmcm9tLCB0byAtIGZyb20sIGJ1ZmZl ciArIGZyb20gKiAoc3RhcnQgPCAweDEwMDAwID8gMSA6IDIpLCAodG8gLSBmcm9tKSAqIChzdGFy dCA8IDB4MTAwMDAgPyAxIDogMiksIHJhbmdlLmZvbnREYXRhKCkpOworICAgICAgICAgICAgICAg ICAgICAgICAgaGF2ZUdseXBocyB8PSBmaWxsKHBhZ2VUb0ZpbGwsIGZyb20sIHRvIC0gZnJvbSwg YnVmZmVyICsgZnJvbSAqIChzdGFydCA8IDB4MTAwMDAgPyAxIDogMiksICh0byAtIGZyb20pICog KHN0YXJ0IDwgMHgxMDAwMCA/IDEgOiAyKSwgcmFuZ2UuZm9udERhdGEoKSk7CiAgICAgICAgICAg ICAgICAgICAgICAgICBpZiAoc2NyYXRjaFBhZ2UpIHsKICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBBU1NFUlQodG8gPD0gIHN0YXRpY19jYXN0PGludD4oR2x5cGhQYWdlOjpzaXplKSk7CiAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgZm9yIChpbnQgaiA9IGZyb207IGogPCB0bzsgaisr KSB7CkBAIC0yMzQsNyArMjQ2LDcgQEAgdm9pZCBHbHlwaFBhZ2VUcmVlTm9kZTo6aW5pdGlhbGl6 ZVBhZ2UoY29uc3QgRm9udERhdGEqIGZvbnREYXRhLCB1bnNpZ25lZCBwYWdlTnUKICAgICAgICAg ICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgIH0gZWxzZQotICAg ICAgICAgICAgICAgIGhhdmVHbHlwaHMgPSBtX3BhZ2UtPmZpbGwoMCwgR2x5cGhQYWdlOjpzaXpl LCBidWZmZXIsIGJ1ZmZlckxlbmd0aCwgc3RhdGljX2Nhc3Q8Y29uc3QgU2ltcGxlRm9udERhdGEq Pihmb250RGF0YSkpOworICAgICAgICAgICAgICAgIGhhdmVHbHlwaHMgPSBmaWxsKG1fcGFnZS5n ZXQoKSwgMCwgR2x5cGhQYWdlOjpzaXplLCBidWZmZXIsIGJ1ZmZlckxlbmd0aCwgc3RhdGljX2Nh c3Q8Y29uc3QgU2ltcGxlRm9udERhdGEqPihmb250RGF0YSkpOwogCiAgICAgICAgICAgICBpZiAo IWhhdmVHbHlwaHMpCiAgICAgICAgICAgICAgICAgbV9wYWdlID0gMDsK 55059 2010-05-04 15:35:31 -0700 2010-05-04 15:59:20 -0700 [PATCH] Suggested Fix Based on Comments + Style Fix style-fix.patch text/plain 3124 joepeck ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NDllMDQzYS4uM2JjZTdkZSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAxMC0wNS0wNCAgSm9zZXBoIFBlY29y YXJvICA8am9lcGVja0B3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFNWRyBmb250cyB0cmlnZ2VyIEdseXBoUGFnZTo6ZmlsbCB3aXRo IG51bGwgZm9udAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9Mzg1MzAKKworICAgICAgICBTVkcgZm9udHMgZG8gbm90IHVzZSB0aGUgZ2x5cGggcGFnZSBj YWNoZS4gVGhpcyBjaGFuZ2UgZGV0ZWN0cyB3aGVuCisgICAgICAgIGF0dGVtcHRpbmcgdG8gZmls bCBhIEdseXBoUGFnZSB3aXRoIGFuIFNWRyBmb250IGFuZCBpbmRpY2F0ZXMgdGhhdAorICAgICAg ICB0aGUgZ2x5cGhzIHdlcmUgbm90IGF2YWlsYWJsZS4KKworICAgICAgICAqIHBsYXRmb3JtL2dy YXBoaWNzL0dseXBoUGFnZVRyZWVOb2RlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmZpbGwpOiBo ZWxwZXIgbWV0aG9kIHdoaWNoIGhhbmRsZXMgYXR0ZW1wdHMgdG8gZmlsbCBhIEdseXBoUGFnZSB3 aXRoIFNWRyBvciBub24tU1ZHIGZvbnRzCisgICAgICAgIChXZWJDb3JlOjpHbHlwaFBhZ2VUcmVl Tm9kZTo6aW5pdGlhbGl6ZVBhZ2UpOiB1c2UgdGhlIGhlbHBlciB3aGVyZSBhcHByb3ByaWF0ZQor CiAyMDEwLTA1LTA0ICBTdGV2ZSBCbG9jayAgPHN0ZXZlYmxvY2tAZ29vZ2xlLmNvbT4KIAogICAg ICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvR2x5cGhQYWdlVHJlZU5vZGUuY3BwIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9HbHlwaFBhZ2VUcmVlTm9kZS5jcHAKaW5kZXggOWU4NDZlYy4uZGFjMjZiMyAxMDA2NDQK LS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HbHlwaFBhZ2VUcmVlTm9kZS5jcHAKKysr IGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HbHlwaFBhZ2VUcmVlTm9kZS5jcHAKQEAgLTEy NCw2ICsxMjQsMTggQEAgR2x5cGhQYWdlVHJlZU5vZGU6On5HbHlwaFBhZ2VUcmVlTm9kZSgpCiAg ICAgZGVsZXRlIG1fc3lzdGVtRmFsbGJhY2tDaGlsZDsKIH0KIAorc3RhdGljIGJvb2wgZmlsbChH bHlwaFBhZ2UqIHBhZ2VUb0ZpbGwsIHVuc2lnbmVkIG9mZnNldCwgdW5zaWduZWQgbGVuZ3RoLCBV Q2hhciogYnVmZmVyLCB1bnNpZ25lZCBidWZmZXJMZW5ndGgsIGNvbnN0IFNpbXBsZUZvbnREYXRh KiBmb250RGF0YSkKK3sKKyAgICBpZiAoIWZvbnREYXRhLT5pc1NWR0ZvbnQoKSkKKyAgICAgICAg cmV0dXJuIHBhZ2VUb0ZpbGwtPmZpbGwob2Zmc2V0LCBsZW5ndGgsIGJ1ZmZlciwgYnVmZmVyTGVu Z3RoLCBmb250RGF0YSk7CisKKyAgICAvLyBTVkcgRm9udHMgZG8gbm90IHVzZSB0aGUgZ2x5cGgg cGFnZSBjYWNoZS4gWmVybyBmaWxsIHRoZSBnbHlwaAorICAgIC8vIHBvc2l0aW9ucyBhbmQgcmV0 dXJuIGZhbHNlIHRvIGluZGljYXRlIHRoZSBnbHlwaHMgd2VyZSBub3QgZm91bmQuCisgICAgZm9y ICh1bnNpZ25lZCBpID0gMDsgaSA8IGxlbmd0aDsgKytpKQorICAgICAgICBwYWdlVG9GaWxsLT5z ZXRHbHlwaERhdGFGb3JJbmRleChvZmZzZXQgKyBpLCAwLCAwKTsKKyAgICByZXR1cm4gZmFsc2U7 Cit9CisKIHZvaWQgR2x5cGhQYWdlVHJlZU5vZGU6OmluaXRpYWxpemVQYWdlKGNvbnN0IEZvbnRE YXRhKiBmb250RGF0YSwgdW5zaWduZWQgcGFnZU51bWJlcikKIHsKICAgICBBU1NFUlQoIW1fcGFn ZSk7CkBAIC0yMjMsNyArMjM1LDcgQEAgdm9pZCBHbHlwaFBhZ2VUcmVlTm9kZTo6aW5pdGlhbGl6 ZVBhZ2UoY29uc3QgRm9udERhdGEqIGZvbnREYXRhLCB1bnNpZ25lZCBwYWdlTnUKICAgICAgICAg ICAgICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgemVyb0Zp bGxlZCA9IHRydWU7CiAgICAgICAgICAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICAgICAg ICAgICAgICBoYXZlR2x5cGhzIHw9IHBhZ2VUb0ZpbGwtPmZpbGwoZnJvbSwgdG8gLSBmcm9tLCBi dWZmZXIgKyBmcm9tICogKHN0YXJ0IDwgMHgxMDAwMCA/IDEgOiAyKSwgKHRvIC0gZnJvbSkgKiAo c3RhcnQgPCAweDEwMDAwID8gMSA6IDIpLCByYW5nZS5mb250RGF0YSgpKTsKKyAgICAgICAgICAg ICAgICAgICAgICAgIGhhdmVHbHlwaHMgfD0gZmlsbChwYWdlVG9GaWxsLCBmcm9tLCB0byAtIGZy b20sIGJ1ZmZlciArIGZyb20gKiAoc3RhcnQgPCAweDEwMDAwID8gMSA6IDIpLCAodG8gLSBmcm9t KSAqIChzdGFydCA8IDB4MTAwMDAgPyAxIDogMiksIHJhbmdlLmZvbnREYXRhKCkpOwogICAgICAg ICAgICAgICAgICAgICAgICAgaWYgKHNjcmF0Y2hQYWdlKSB7CiAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgQVNTRVJUKHRvIDw9ICBzdGF0aWNfY2FzdDxpbnQ+KEdseXBoUGFnZTo6c2l6ZSkp OwogICAgICAgICAgICAgICAgICAgICAgICAgICAgIGZvciAoaW50IGogPSBmcm9tOyBqIDwgdG87 IGorKykgewpAQCAtMjM0LDcgKzI0Niw3IEBAIHZvaWQgR2x5cGhQYWdlVHJlZU5vZGU6OmluaXRp YWxpemVQYWdlKGNvbnN0IEZvbnREYXRhKiBmb250RGF0YSwgdW5zaWduZWQgcGFnZU51CiAgICAg ICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICB9IGVsc2UK LSAgICAgICAgICAgICAgICBoYXZlR2x5cGhzID0gbV9wYWdlLT5maWxsKDAsIEdseXBoUGFnZTo6 c2l6ZSwgYnVmZmVyLCBidWZmZXJMZW5ndGgsIHN0YXRpY19jYXN0PGNvbnN0IFNpbXBsZUZvbnRE YXRhKj4oZm9udERhdGEpKTsKKyAgICAgICAgICAgICAgICBoYXZlR2x5cGhzID0gZmlsbChtX3Bh Z2UuZ2V0KCksIDAsIEdseXBoUGFnZTo6c2l6ZSwgYnVmZmVyLCBidWZmZXJMZW5ndGgsIHN0YXRp Y19jYXN0PGNvbnN0IFNpbXBsZUZvbnREYXRhKj4oZm9udERhdGEpKTsKIAogICAgICAgICAgICAg aWYgKCFoYXZlR2x5cGhzKQogICAgICAgICAgICAgICAgIG1fcGFnZSA9IDA7Cg==