68734 2011-09-23 14:51:55 -0700 Enable LCD text in Skia on Mac 2011-09-29 15:20:12 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 caryclark caryclark senorblanco webkit.review.bot oldest_to_newest 472522 0 caryclark 2011-09-23 14:51:55 -0700 Enable LCD text in Skia on Mac 472532 1 108544 caryclark 2011-09-23 15:00:21 -0700 Created attachment 108544 Patch 472533 2 108544 jamesr 2011-09-23 15:04:47 -0700 Comment on attachment 108544 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=108544&action=review > Source/WebCore/ChangeLog:11 > + Duplicate the logic in FontMac.mm to pass settings That word makes me sad. Is there any way to share the logic instead of duplicating? > Source/WebCore/platform/graphics/skia/FontSkia.cpp:109 > + case Antialiased: { > + shouldSmoothFonts = false; > + break; > + } { }s in a case statement is very strange - I think this would be easier to read if they were omitted > Source/WebCore/platform/graphics/skia/FontSkia.cpp:123 > + default: > + ASSERT_NOT_REACHED(); just leave out the 'default' case and the compiler will tell us if all cases are listed or not > Source/WebCore/platform/graphics/skia/FontSkia.cpp:126 > + if (!shouldUseSmoothing() || PlatformSupport::layoutTestMode()) do you really need to check layoutTestMode() here? I thought we twiddled the shouldSmoothFonts somewhere 473053 3 108653 caryclark 2011-09-26 05:00:50 -0700 Created attachment 108653 Patch 473056 4 108544 caryclark 2011-09-26 05:04:36 -0700 Comment on attachment 108544 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=108544&action=review >> Source/WebCore/ChangeLog:11 >> + Duplicate the logic in FontMac.mm to pass settings > > That word makes me sad. Is there any way to share the logic instead of duplicating? No. The logic is duplicated, but the code is not. The FontMac.mm code performs additional work that does not make sense to duplicate. Eventually, the Linux and Windows Chromium ports will share this logic -- all Skia ports will use FontSkia for common code. >> Source/WebCore/platform/graphics/skia/FontSkia.cpp:109 >> + } > > { }s in a case statement is very strange - I think this would be easier to read if they were omitted Fixed. >> Source/WebCore/platform/graphics/skia/FontSkia.cpp:123 >> + ASSERT_NOT_REACHED(); > > just leave out the 'default' case and the compiler will tell us if all cases are listed or not Fixed. >> Source/WebCore/platform/graphics/skia/FontSkia.cpp:126 >> + if (!shouldUseSmoothing() || PlatformSupport::layoutTestMode()) > > do you really need to check layoutTestMode() here? I thought we twiddled the shouldSmoothFonts somewhere Yes, it's required. There is an equivalent check in FontCacheChromiumWin.cpp. 473060 5 108654 caryclark 2011-09-26 05:14:57 -0700 Created attachment 108654 Patch 473357 6 jamesr 2011-09-26 13:56:10 -0700 (In reply to comment #4) > >> Source/WebCore/platform/graphics/skia/FontSkia.cpp:126 > >> + if (!shouldUseSmoothing() || PlatformSupport::layoutTestMode()) > > > > do you really need to check layoutTestMode() here? I thought we twiddled the shouldSmoothFonts somewhere > > Yes, it's required. There is an equivalent check in FontCacheChromiumWin.cpp. But there aren't any such checks in the old mac codepath, and it seems to work fine. Why would the skia font code be the only rendering system that needs to check this bit explicitly? 473366 7 caryclark 2011-09-26 14:03:24 -0700 Skia sets the font smoothing policy differently from CoreText. This may explain the difference. I have a separate change in for Skia to address this. In the meantime, would you consider approving this as is? 473369 8 jamesr 2011-09-26 14:06:10 -0700 (In reply to comment #7) > Skia sets the font smoothing policy differently from CoreText. This may explain the difference. I have a separate change in for Skia to address this. In the meantime, would you consider approving this as is? I'm confused about how this addresses my question. Do we actually know where the difference is? 473371 9 caryclark 2011-09-26 14:06:56 -0700 The Skia change is: http://codereview.appspot.com/5131046/ -- but I'd prefer not to make this change dependent on that one. 473633 10 jamesr 2011-09-26 19:11:12 -0700 I can't tell how that skia patch relates to this. At a quick glance I'm not sure how the chromium mac DRT port enables grayscale text and my worry is that if we're missing that configuration path, we might be missing other important text configuration paths that exist. I'd feel a lot more comfortable with this change if I knew how the old path worked. Just saying "it is different" doesn't help me understand how this is the right way to address this. 475516 11 senorblanco 2011-09-29 10:43:44 -0700 (In reply to comment #10) > I can't tell how that skia patch relates to this. At a quick glance I'm not sure how the chromium mac DRT port enables grayscale text and my worry is that if we're missing that configuration path, we might be missing other important text configuration paths that exist. I'd feel a lot more comfortable with this change if I knew how the old path worked. Just saying "it is different" doesn't help me understand how this is the right way to address this. I share James's concern here. There's no call to layoutTestMode() in platform/graphics/mac or /cg, so I'm confused as to where it was being done in the old Chrome/Mac. The Safari layout test results look like they don't have LCD AA (although that could be blamed on presbyopia...). 475518 12 108654 senorblanco 2011-09-29 10:44:23 -0700 Comment on attachment 108654 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=108654&action=review > Source/WebCore/platform/graphics/skia/FontSkia.cpp:116 > + // For the AutoSmooth case, don't do anything! Keep the default settings. Although the comment is the same as FontMac.mm, it looks like the behaviour is slightly different here: it will set antialiasing and smoothFonts to true in the SkPaint, whereas the FontMac code avoids making a font smoothing call at all (via the changeFontSmoothing bool). Are we diverging from the old Chrome-Mac behaviour here? > Source/WebCore/platform/graphics/skia/FontSkia.cpp:121 > + if (!shouldUseSmoothing() || PlatformSupport::layoutTestMode()) > + shouldSmoothFonts = false; It looks like the layoutTestMode() check is already being done on the Windows side in FontCustomPlatformData::fontPlatformData(). Could we now remove it from there, since it's centralized here? Also, how was it that Chrome-Linux was doing non-LCD text for layout tests before? (just want to make sure we're not changing that either) 475572 13 108654 caryclark 2011-09-29 12:00:36 -0700 Comment on attachment 108654 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=108654&action=review >> Source/WebCore/platform/graphics/skia/FontSkia.cpp:116 >> + // For the AutoSmooth case, don't do anything! Keep the default settings. > > Although the comment is the same as FontMac.mm, it looks like the behaviour is slightly different here: it will set antialiasing and smoothFonts to true in the SkPaint, whereas the FontMac code avoids making a font smoothing call at all (via the changeFontSmoothing bool). Are we diverging from the old Chrome-Mac behaviour here? This preserves old Chrome-Mac behavior. CoreGraphics, by default, enables antialiasing, and smoothFonts. Skia, by default, has both disabled in a newly-created SkPaint object. I interpreted 'AutoSmoothing' to mean 'default CoreGraphics behavior' -- I'll replace the comment with this assumption. I've tested this on Apple and non-Apple monitors to make sure we match when smoothing is turned on and when it is not. >> Source/WebCore/platform/graphics/skia/FontSkia.cpp:121 >> + shouldSmoothFonts = false; > > It looks like the layoutTestMode() check is already being done on the Windows side in FontCustomPlatformData::fontPlatformData(). Could we now remove it from there, since it's centralized here? > > Also, how was it that Chrome-Linux was doing non-LCD text for layout tests before? (just want to make sure we're not changing that either) Today, FontSkia is only used by the Mac port. I'll add a FIXME here that notes that this should be shared, and create a bug to track that. I don't know how linux works, but this change doesn't affect it. 475581 14 caryclark 2011-09-29 12:06:24 -0700 (In reply to comment #11) > (In reply to comment #10) > > I can't tell how that skia patch relates to this. At a quick glance I'm not sure how the chromium mac DRT port enables grayscale text and my worry is that if we're missing that configuration path, we might be missing other important text configuration paths that exist. I'd feel a lot more comfortable with this change if I knew how the old path worked. Just saying "it is different" doesn't help me understand how this is the right way to address this. > > I share James's concern here. There's no call to layoutTestMode() in platform/graphics/mac or /cg, so I'm confused as to where it was being done in the old Chrome/Mac. The Safari layout test results look like they don't have LCD AA (although that could be blamed on presbyopia...). CoreGraphics assumes that offscreen drawing cannot know the characteristics of the onscreen device, and always draws with font smoothing disabled. Skia assumes that the code author knows what they are doing, and allows font smoothing to be enabled for all devices, both onscreen and offscreen. To match Apple's behavior, this change disables font smoothing when creating layout tests. I have a separate change to Skia to disable font smoothing when Apple has chosen not to allow it on a class of monitor (typically non-Apple branded ones). 475667 15 108654 senorblanco 2011-09-29 14:01:06 -0700 Comment on attachment 108654 Patch Thanks for the explanations. It's all clear now. :) r=me 475717 16 108654 webkit.review.bot 2011-09-29 15:20:07 -0700 Comment on attachment 108654 Patch Clearing flags on attachment: 108654 Committed r96366: <http://trac.webkit.org/changeset/96366> 475718 17 webkit.review.bot 2011-09-29 15:20:12 -0700 All reviewed patches have been landed. Closing bug. 108544 2011-09-23 15:00:21 -0700 2011-09-26 05:04:36 -0700 Patch bug-68734-20110923180020.patch text/plain 4555 caryclark SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDk1ODYzKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTEtMDktMjMgIENhcnkgQ2xh cmsgIDxjYXJ5Y2xhcmtAZ29vZ2xlLmNvbT4KKworICAgICAgICBFbmFibGUgTENEIHRleHQgaW4g U2tpYSBvbiBNYWMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTY4NzM0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgTm8gbmV3IHRlc3RzLiBFeGlzdGluZyBsYXlvdXQgdGVzdHMgYXJlIGdlbmVyYXRlZAorICAg ICAgICB3aXRoIExDRCB0ZXh0IGRpc2FibGVkIGZvciBwaXhlbCBjb21wYXJpc29ucy4KKworICAg ICAgICBEdXBsaWNhdGUgdGhlIGxvZ2ljIGluIEZvbnRNYWMubW0gdG8gcGFzcyBzZXR0aW5ncwor ICAgICAgICBmb3IgYW50aWFsaWFzaW5nIGFuZCBzbW9vdGhpbmcuIEFsc28gZGlzYWJsZSBzbW9v dGhpbmcKKyAgICAgICAgZm9yIER1bXBSZW5kZXJUcmVlLgorIAorICAgICAgICAqIHBsYXRmb3Jt L2dyYXBoaWNzL3NraWEvRm9udFNraWEuY3BwOgorICAgICAgICAoV2ViQ29yZTo6c2V0dXBQYWlu dCk6CisgICAgICAgIChXZWJDb3JlOjpGb250OjpkcmF3R2x5cGhzKToKKwogMjAxMS0wOS0yMyAg SmFtZXMgUm9iaW5zb24gIDxqYW1lc3JAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIEF2b2lkIHVw ZGF0aW5nIGNvbXBvc2l0aW5nIHN0YXRlIGR1cmluZyBwYWludApJbmRleDogU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9Gb250U2tpYS5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9Gb250U2tpYS5jcHAJKHJldmlzaW9u IDk1ODU2KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9Gb250U2tp YS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM0LDYgKzM0LDcgQEAKICNpbmNsdWRlICJHbHlwaEJ1 ZmZlci5oIgogI2luY2x1ZGUgIkdyYXBoaWNzQ29udGV4dC5oIgogI2luY2x1ZGUgIlBsYXRmb3Jt Q29udGV4dFNraWEuaCIKKyNpbmNsdWRlICJQbGF0Zm9ybVN1cHBvcnQuaCIKICNpbmNsdWRlICJT aW1wbGVGb250RGF0YS5oIgogCiAjaW5jbHVkZSAiU2tDYW52YXMuaCIKQEAgLTczLDEyICs3NCwx MiBAQCBzdGF0aWMgdm9pZCBhZGp1c3RUZXh0UmVuZGVyTW9kZShTa1BhaW50CiAgICAgICAgIHBh aW50LT5zZXRMQ0RSZW5kZXJUZXh0KGZhbHNlKTsKIH0KIAotc3RhdGljIHZvaWQgc2V0dXBQYWlu dChTa1BhaW50KiBwYWludCwgY29uc3QgU2ltcGxlRm9udERhdGEqIGZvbnREYXRhLCBjb25zdCBG b250KiBmb250KQorc3RhdGljIHZvaWQgc2V0dXBQYWludChTa1BhaW50KiBwYWludCwgY29uc3Qg U2ltcGxlRm9udERhdGEqIGZvbnREYXRhLCBjb25zdCBGb250KiBmb250LCBib29sIHNob3VsZEFu dGlhbGlhcywgYm9vbCBzaG91bGRTbW9vdGhGb250cykKIHsKICAgICBjb25zdCBGb250UGxhdGZv cm1EYXRhJiBwbGF0Zm9ybURhdGEgPSBmb250RGF0YS0+cGxhdGZvcm1EYXRhKCk7CiAgICAgY29u c3QgZmxvYXQgdGV4dFNpemUgPSBwbGF0Zm9ybURhdGEubV9zaXplID49IDAgPyBwbGF0Zm9ybURh dGEubV9zaXplIDogMTI7CiAKLSAgICBwYWludC0+c2V0QW50aUFsaWFzKHRydWUpOworICAgIHBh aW50LT5zZXRBbnRpQWxpYXMoc2hvdWxkQW50aWFsaWFzKTsKICAgICBwYWludC0+c2V0RW1iZWRk ZWRCaXRtYXBUZXh0KGZhbHNlKTsKICAgICBwYWludC0+c2V0VGV4dFNpemUoU2tGbG9hdFRvU2Nh bGFyKHRleHRTaXplKSk7CiAgICAgU2tUeXBlZmFjZSogdHlwZWZhY2UgPSBTa0NyZWF0ZVR5cGVm YWNlRnJvbUNURm9udChwbGF0Zm9ybURhdGEuY3RGb250KCkpOwpAQCAtODcsNyArODgsNyBAQCBz dGF0aWMgdm9pZCBzZXR1cFBhaW50KFNrUGFpbnQqIHBhaW50LCBjCiAgICAgcGFpbnQtPnNldEZh a2VCb2xkVGV4dChwbGF0Zm9ybURhdGEubV9zeW50aGV0aWNCb2xkKTsKICAgICBwYWludC0+c2V0 VGV4dFNrZXdYKHBsYXRmb3JtRGF0YS5tX3N5bnRoZXRpY09ibGlxdWUgPyAtU0tfU2NhbGFyMSAv IDQgOiAwKTsKICAgICBwYWludC0+c2V0QXV0b2hpbnRlZChmYWxzZSk7IC8vIGZyZWV0eXBlIHNw ZWNpZmljCi0gICAgcGFpbnQtPnNldExDRFJlbmRlclRleHQoZm9udC0+Zm9udERlc2NyaXB0aW9u KCkuZm9udFNtb290aGluZygpID09IFN1YnBpeGVsQW50aWFsaWFzZWQpOworICAgIHBhaW50LT5z ZXRMQ0RSZW5kZXJUZXh0KHNob3VsZFNtb290aEZvbnRzKTsKIH0KIAogLy8gVE9ETzogVGhpcyBu ZWVkcyB0byBiZSBzcGxpdCBpbnRvIGhlbHBlciBmdW5jdGlvbnMgdG8gYmV0dGVyIHNjb3BlIHRo ZQpAQCAtOTgsNiArOTksMzMgQEAgdm9pZCBGb250OjpkcmF3R2x5cGhzKEdyYXBoaWNzQ29udGV4 dCogZwogICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IEZsb2F0UG9pbnQmIHBvaW50KSBjb25z dCB7CiAgICAgQ09NUElMRV9BU1NFUlQoc2l6ZW9mKEdseXBoQnVmZmVyR2x5cGgpID09IHNpemVv Zih1aW50MTZfdCksIEdseXBoQnVmZmVyR2x5cGhTaXplX2VxdWFsc191aW50MTZfdCk7CiAKKyAg ICBib29sIHNob3VsZFNtb290aEZvbnRzID0gdHJ1ZTsKKyAgICBib29sIHNob3VsZEFudGlhbGlh cyA9IHRydWU7CisgICAgCisgICAgc3dpdGNoIChmb250RGVzY3JpcHRpb24oKS5mb250U21vb3Ro aW5nKCkpIHsKKyAgICBjYXNlIEFudGlhbGlhc2VkOiB7CisgICAgICAgIHNob3VsZFNtb290aEZv bnRzID0gZmFsc2U7CisgICAgICAgIGJyZWFrOworICAgIH0KKyAgICBjYXNlIFN1YnBpeGVsQW50 aWFsaWFzZWQ6IHsKKyAgICAgICAgYnJlYWs7CisgICAgfQorICAgIGNhc2UgTm9TbW9vdGhpbmc6 IHsKKyAgICAgICAgc2hvdWxkQW50aWFsaWFzID0gZmFsc2U7CisgICAgICAgIHNob3VsZFNtb290 aEZvbnRzID0gZmFsc2U7CisgICAgICAgIGJyZWFrOworICAgIH0KKyAgICBjYXNlIEF1dG9TbW9v dGhpbmc6IHsKKyAgICAgICAgLy8gRm9yIHRoZSBBdXRvU21vb3RoIGNhc2UsIGRvbid0IGRvIGFu eXRoaW5nISBLZWVwIHRoZSBkZWZhdWx0IHNldHRpbmdzLgorICAgICAgICBicmVhazsgCisgICAg fQorICAgIGRlZmF1bHQ6IAorICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKyAgICB9Cisg ICAgCisgICAgaWYgKCFzaG91bGRVc2VTbW9vdGhpbmcoKSB8fCBQbGF0Zm9ybVN1cHBvcnQ6Omxh eW91dFRlc3RNb2RlKCkpCisgICAgICAgIHNob3VsZFNtb290aEZvbnRzID0gZmFsc2U7CisKICAg ICBjb25zdCBHbHlwaEJ1ZmZlckdseXBoKiBnbHlwaHMgPSBnbHlwaEJ1ZmZlci5nbHlwaHMoZnJv bSk7CiAgICAgU2tTY2FsYXIgeCA9IFNrRmxvYXRUb1NjYWxhcihwb2ludC54KCkpOwogICAgIFNr U2NhbGFyIHkgPSBTa0Zsb2F0VG9TY2FsYXIocG9pbnQueSgpKTsKQEAgLTEzMyw3ICsxNjEsNyBA QCB2b2lkIEZvbnQ6OmRyYXdHbHlwaHMoR3JhcGhpY3NDb250ZXh0KiBnCiAgICAgaWYgKHRleHRN b2RlICYgVGV4dE1vZGVGaWxsKSB7CiAgICAgICAgIFNrUGFpbnQgcGFpbnQ7CiAgICAgICAgIGdj LT5wbGF0Zm9ybUNvbnRleHQoKS0+c2V0dXBQYWludEZvckZpbGxpbmcoJnBhaW50KTsKLSAgICAg ICAgc2V0dXBQYWludCgmcGFpbnQsIGZvbnQsIHRoaXMpOworICAgICAgICBzZXR1cFBhaW50KCZw YWludCwgZm9udCwgdGhpcywgc2hvdWxkQW50aWFsaWFzLCBzaG91bGRTbW9vdGhGb250cyk7CiAg ICAgICAgIGFkanVzdFRleHRSZW5kZXJNb2RlKCZwYWludCwgZ2MtPnBsYXRmb3JtQ29udGV4dCgp KTsKICAgICAgICAgcGFpbnQuc2V0VGV4dEVuY29kaW5nKFNrUGFpbnQ6OmtHbHlwaElEX1RleHRF bmNvZGluZyk7CiAgICAgICAgIHBhaW50LnNldENvbG9yKGdjLT5maWxsQ29sb3IoKS5yZ2IoKSk7 CkBAIC0xNTYsNyArMTg0LDcgQEAgdm9pZCBGb250OjpkcmF3R2x5cGhzKEdyYXBoaWNzQ29udGV4 dCogZwogCiAgICAgICAgIFNrUGFpbnQgcGFpbnQ7CiAgICAgICAgIGdjLT5wbGF0Zm9ybUNvbnRl eHQoKS0+c2V0dXBQYWludEZvclN0cm9raW5nKCZwYWludCwgMCwgMCk7Ci0gICAgICAgIHNldHVw UGFpbnQoJnBhaW50LCBmb250LCB0aGlzKTsKKyAgICAgICAgc2V0dXBQYWludCgmcGFpbnQsIGZv bnQsIHRoaXMsIHNob3VsZEFudGlhbGlhcywgc2hvdWxkU21vb3RoRm9udHMpOwogICAgICAgICBh ZGp1c3RUZXh0UmVuZGVyTW9kZSgmcGFpbnQsIGdjLT5wbGF0Zm9ybUNvbnRleHQoKSk7CiAgICAg ICAgIHBhaW50LnNldFRleHRFbmNvZGluZyhTa1BhaW50OjprR2x5cGhJRF9UZXh0RW5jb2Rpbmcp OwogICAgICAgICBwYWludC5zZXRDb2xvcihnYy0+c3Ryb2tlQ29sb3IoKS5yZ2IoKSk7Cg== 108653 2011-09-26 05:00:50 -0700 2011-09-26 05:14:52 -0700 Patch bug-68734-20110926080048.patch text/plain 4555 caryclark SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDk1ODYzKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTEtMDktMjMgIENhcnkgQ2xh cmsgIDxjYXJ5Y2xhcmtAZ29vZ2xlLmNvbT4KKworICAgICAgICBFbmFibGUgTENEIHRleHQgaW4g U2tpYSBvbiBNYWMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTY4NzM0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgTm8gbmV3IHRlc3RzLiBFeGlzdGluZyBsYXlvdXQgdGVzdHMgYXJlIGdlbmVyYXRlZAorICAg ICAgICB3aXRoIExDRCB0ZXh0IGRpc2FibGVkIGZvciBwaXhlbCBjb21wYXJpc29ucy4KKworICAg ICAgICBEdXBsaWNhdGUgdGhlIGxvZ2ljIGluIEZvbnRNYWMubW0gdG8gcGFzcyBzZXR0aW5ncwor ICAgICAgICBmb3IgYW50aWFsaWFzaW5nIGFuZCBzbW9vdGhpbmcuIEFsc28gZGlzYWJsZSBzbW9v dGhpbmcKKyAgICAgICAgZm9yIER1bXBSZW5kZXJUcmVlLgorIAorICAgICAgICAqIHBsYXRmb3Jt L2dyYXBoaWNzL3NraWEvRm9udFNraWEuY3BwOgorICAgICAgICAoV2ViQ29yZTo6c2V0dXBQYWlu dCk6CisgICAgICAgIChXZWJDb3JlOjpGb250OjpkcmF3R2x5cGhzKToKKwogMjAxMS0wOS0yMyAg SmFtZXMgUm9iaW5zb24gIDxqYW1lc3JAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIEF2b2lkIHVw ZGF0aW5nIGNvbXBvc2l0aW5nIHN0YXRlIGR1cmluZyBwYWludApJbmRleDogU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9Gb250U2tpYS5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9Gb250U2tpYS5jcHAJKHJldmlzaW9u IDk1ODU2KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9Gb250U2tp YS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM0LDYgKzM0LDcgQEAKICNpbmNsdWRlICJHbHlwaEJ1 ZmZlci5oIgogI2luY2x1ZGUgIkdyYXBoaWNzQ29udGV4dC5oIgogI2luY2x1ZGUgIlBsYXRmb3Jt Q29udGV4dFNraWEuaCIKKyNpbmNsdWRlICJQbGF0Zm9ybVN1cHBvcnQuaCIKICNpbmNsdWRlICJT aW1wbGVGb250RGF0YS5oIgogCiAjaW5jbHVkZSAiU2tDYW52YXMuaCIKQEAgLTczLDEyICs3NCwx MiBAQCBzdGF0aWMgdm9pZCBhZGp1c3RUZXh0UmVuZGVyTW9kZShTa1BhaW50CiAgICAgICAgIHBh aW50LT5zZXRMQ0RSZW5kZXJUZXh0KGZhbHNlKTsKIH0KIAotc3RhdGljIHZvaWQgc2V0dXBQYWlu dChTa1BhaW50KiBwYWludCwgY29uc3QgU2ltcGxlRm9udERhdGEqIGZvbnREYXRhLCBjb25zdCBG b250KiBmb250KQorc3RhdGljIHZvaWQgc2V0dXBQYWludChTa1BhaW50KiBwYWludCwgY29uc3Qg U2ltcGxlRm9udERhdGEqIGZvbnREYXRhLCBjb25zdCBGb250KiBmb250LCBib29sIHNob3VsZEFu dGlhbGlhcywgYm9vbCBzaG91bGRTbW9vdGhGb250cykKIHsKICAgICBjb25zdCBGb250UGxhdGZv cm1EYXRhJiBwbGF0Zm9ybURhdGEgPSBmb250RGF0YS0+cGxhdGZvcm1EYXRhKCk7CiAgICAgY29u c3QgZmxvYXQgdGV4dFNpemUgPSBwbGF0Zm9ybURhdGEubV9zaXplID49IDAgPyBwbGF0Zm9ybURh dGEubV9zaXplIDogMTI7CiAKLSAgICBwYWludC0+c2V0QW50aUFsaWFzKHRydWUpOworICAgIHBh aW50LT5zZXRBbnRpQWxpYXMoc2hvdWxkQW50aWFsaWFzKTsKICAgICBwYWludC0+c2V0RW1iZWRk ZWRCaXRtYXBUZXh0KGZhbHNlKTsKICAgICBwYWludC0+c2V0VGV4dFNpemUoU2tGbG9hdFRvU2Nh bGFyKHRleHRTaXplKSk7CiAgICAgU2tUeXBlZmFjZSogdHlwZWZhY2UgPSBTa0NyZWF0ZVR5cGVm YWNlRnJvbUNURm9udChwbGF0Zm9ybURhdGEuY3RGb250KCkpOwpAQCAtODcsNyArODgsNyBAQCBz dGF0aWMgdm9pZCBzZXR1cFBhaW50KFNrUGFpbnQqIHBhaW50LCBjCiAgICAgcGFpbnQtPnNldEZh a2VCb2xkVGV4dChwbGF0Zm9ybURhdGEubV9zeW50aGV0aWNCb2xkKTsKICAgICBwYWludC0+c2V0 VGV4dFNrZXdYKHBsYXRmb3JtRGF0YS5tX3N5bnRoZXRpY09ibGlxdWUgPyAtU0tfU2NhbGFyMSAv IDQgOiAwKTsKICAgICBwYWludC0+c2V0QXV0b2hpbnRlZChmYWxzZSk7IC8vIGZyZWV0eXBlIHNw ZWNpZmljCi0gICAgcGFpbnQtPnNldExDRFJlbmRlclRleHQoZm9udC0+Zm9udERlc2NyaXB0aW9u KCkuZm9udFNtb290aGluZygpID09IFN1YnBpeGVsQW50aWFsaWFzZWQpOworICAgIHBhaW50LT5z ZXRMQ0RSZW5kZXJUZXh0KHNob3VsZFNtb290aEZvbnRzKTsKIH0KIAogLy8gVE9ETzogVGhpcyBu ZWVkcyB0byBiZSBzcGxpdCBpbnRvIGhlbHBlciBmdW5jdGlvbnMgdG8gYmV0dGVyIHNjb3BlIHRo ZQpAQCAtOTgsNiArOTksMzMgQEAgdm9pZCBGb250OjpkcmF3R2x5cGhzKEdyYXBoaWNzQ29udGV4 dCogZwogICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IEZsb2F0UG9pbnQmIHBvaW50KSBjb25z dCB7CiAgICAgQ09NUElMRV9BU1NFUlQoc2l6ZW9mKEdseXBoQnVmZmVyR2x5cGgpID09IHNpemVv Zih1aW50MTZfdCksIEdseXBoQnVmZmVyR2x5cGhTaXplX2VxdWFsc191aW50MTZfdCk7CiAKKyAg ICBib29sIHNob3VsZFNtb290aEZvbnRzID0gdHJ1ZTsKKyAgICBib29sIHNob3VsZEFudGlhbGlh cyA9IHRydWU7CisgICAgCisgICAgc3dpdGNoIChmb250RGVzY3JpcHRpb24oKS5mb250U21vb3Ro aW5nKCkpIHsKKyAgICBjYXNlIEFudGlhbGlhc2VkOiB7CisgICAgICAgIHNob3VsZFNtb290aEZv bnRzID0gZmFsc2U7CisgICAgICAgIGJyZWFrOworICAgIH0KKyAgICBjYXNlIFN1YnBpeGVsQW50 aWFsaWFzZWQ6IHsKKyAgICAgICAgYnJlYWs7CisgICAgfQorICAgIGNhc2UgTm9TbW9vdGhpbmc6 IHsKKyAgICAgICAgc2hvdWxkQW50aWFsaWFzID0gZmFsc2U7CisgICAgICAgIHNob3VsZFNtb290 aEZvbnRzID0gZmFsc2U7CisgICAgICAgIGJyZWFrOworICAgIH0KKyAgICBjYXNlIEF1dG9TbW9v dGhpbmc6IHsKKyAgICAgICAgLy8gRm9yIHRoZSBBdXRvU21vb3RoIGNhc2UsIGRvbid0IGRvIGFu eXRoaW5nISBLZWVwIHRoZSBkZWZhdWx0IHNldHRpbmdzLgorICAgICAgICBicmVhazsgCisgICAg fQorICAgIGRlZmF1bHQ6IAorICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKyAgICB9Cisg ICAgCisgICAgaWYgKCFzaG91bGRVc2VTbW9vdGhpbmcoKSB8fCBQbGF0Zm9ybVN1cHBvcnQ6Omxh eW91dFRlc3RNb2RlKCkpCisgICAgICAgIHNob3VsZFNtb290aEZvbnRzID0gZmFsc2U7CisKICAg ICBjb25zdCBHbHlwaEJ1ZmZlckdseXBoKiBnbHlwaHMgPSBnbHlwaEJ1ZmZlci5nbHlwaHMoZnJv bSk7CiAgICAgU2tTY2FsYXIgeCA9IFNrRmxvYXRUb1NjYWxhcihwb2ludC54KCkpOwogICAgIFNr U2NhbGFyIHkgPSBTa0Zsb2F0VG9TY2FsYXIocG9pbnQueSgpKTsKQEAgLTEzMyw3ICsxNjEsNyBA QCB2b2lkIEZvbnQ6OmRyYXdHbHlwaHMoR3JhcGhpY3NDb250ZXh0KiBnCiAgICAgaWYgKHRleHRN b2RlICYgVGV4dE1vZGVGaWxsKSB7CiAgICAgICAgIFNrUGFpbnQgcGFpbnQ7CiAgICAgICAgIGdj LT5wbGF0Zm9ybUNvbnRleHQoKS0+c2V0dXBQYWludEZvckZpbGxpbmcoJnBhaW50KTsKLSAgICAg ICAgc2V0dXBQYWludCgmcGFpbnQsIGZvbnQsIHRoaXMpOworICAgICAgICBzZXR1cFBhaW50KCZw YWludCwgZm9udCwgdGhpcywgc2hvdWxkQW50aWFsaWFzLCBzaG91bGRTbW9vdGhGb250cyk7CiAg ICAgICAgIGFkanVzdFRleHRSZW5kZXJNb2RlKCZwYWludCwgZ2MtPnBsYXRmb3JtQ29udGV4dCgp KTsKICAgICAgICAgcGFpbnQuc2V0VGV4dEVuY29kaW5nKFNrUGFpbnQ6OmtHbHlwaElEX1RleHRF bmNvZGluZyk7CiAgICAgICAgIHBhaW50LnNldENvbG9yKGdjLT5maWxsQ29sb3IoKS5yZ2IoKSk7 CkBAIC0xNTYsNyArMTg0LDcgQEAgdm9pZCBGb250OjpkcmF3R2x5cGhzKEdyYXBoaWNzQ29udGV4 dCogZwogCiAgICAgICAgIFNrUGFpbnQgcGFpbnQ7CiAgICAgICAgIGdjLT5wbGF0Zm9ybUNvbnRl eHQoKS0+c2V0dXBQYWludEZvclN0cm9raW5nKCZwYWludCwgMCwgMCk7Ci0gICAgICAgIHNldHVw UGFpbnQoJnBhaW50LCBmb250LCB0aGlzKTsKKyAgICAgICAgc2V0dXBQYWludCgmcGFpbnQsIGZv bnQsIHRoaXMsIHNob3VsZEFudGlhbGlhcywgc2hvdWxkU21vb3RoRm9udHMpOwogICAgICAgICBh ZGp1c3RUZXh0UmVuZGVyTW9kZSgmcGFpbnQsIGdjLT5wbGF0Zm9ybUNvbnRleHQoKSk7CiAgICAg ICAgIHBhaW50LnNldFRleHRFbmNvZGluZyhTa1BhaW50OjprR2x5cGhJRF9UZXh0RW5jb2Rpbmcp OwogICAgICAgICBwYWludC5zZXRDb2xvcihnYy0+c3Ryb2tlQ29sb3IoKS5yZ2IoKSk7Cg== 108654 2011-09-26 05:14:57 -0700 2011-09-29 15:20:07 -0700 Patch bug-68734-20110926081455.patch text/plain 4473 caryclark SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDk1ODYzKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTEtMDktMjMgIENhcnkgQ2xh cmsgIDxjYXJ5Y2xhcmtAZ29vZ2xlLmNvbT4KKworICAgICAgICBFbmFibGUgTENEIHRleHQgaW4g U2tpYSBvbiBNYWMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTY4NzM0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgTm8gbmV3IHRlc3RzLiBFeGlzdGluZyBsYXlvdXQgdGVzdHMgYXJlIGdlbmVyYXRlZAorICAg ICAgICB3aXRoIExDRCB0ZXh0IGRpc2FibGVkIGZvciBwaXhlbCBjb21wYXJpc29ucy4KKworICAg ICAgICBEdXBsaWNhdGUgdGhlIGxvZ2ljIGluIEZvbnRNYWMubW0gdG8gcGFzcyBzZXR0aW5ncwor ICAgICAgICBmb3IgYW50aWFsaWFzaW5nIGFuZCBzbW9vdGhpbmcuIEFsc28gZGlzYWJsZSBzbW9v dGhpbmcKKyAgICAgICAgZm9yIER1bXBSZW5kZXJUcmVlLgorIAorICAgICAgICAqIHBsYXRmb3Jt L2dyYXBoaWNzL3NraWEvRm9udFNraWEuY3BwOgorICAgICAgICAoV2ViQ29yZTo6c2V0dXBQYWlu dCk6CisgICAgICAgIChXZWJDb3JlOjpGb250OjpkcmF3R2x5cGhzKToKKwogMjAxMS0wOS0yMyAg SmFtZXMgUm9iaW5zb24gIDxqYW1lc3JAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIEF2b2lkIHVw ZGF0aW5nIGNvbXBvc2l0aW5nIHN0YXRlIGR1cmluZyBwYWludApJbmRleDogU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9Gb250U2tpYS5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9Gb250U2tpYS5jcHAJKHJldmlzaW9u IDk1ODU2KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9Gb250U2tp YS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM0LDYgKzM0LDcgQEAKICNpbmNsdWRlICJHbHlwaEJ1 ZmZlci5oIgogI2luY2x1ZGUgIkdyYXBoaWNzQ29udGV4dC5oIgogI2luY2x1ZGUgIlBsYXRmb3Jt Q29udGV4dFNraWEuaCIKKyNpbmNsdWRlICJQbGF0Zm9ybVN1cHBvcnQuaCIKICNpbmNsdWRlICJT aW1wbGVGb250RGF0YS5oIgogCiAjaW5jbHVkZSAiU2tDYW52YXMuaCIKQEAgLTczLDEyICs3NCwx MiBAQCBzdGF0aWMgdm9pZCBhZGp1c3RUZXh0UmVuZGVyTW9kZShTa1BhaW50CiAgICAgICAgIHBh aW50LT5zZXRMQ0RSZW5kZXJUZXh0KGZhbHNlKTsKIH0KIAotc3RhdGljIHZvaWQgc2V0dXBQYWlu dChTa1BhaW50KiBwYWludCwgY29uc3QgU2ltcGxlRm9udERhdGEqIGZvbnREYXRhLCBjb25zdCBG b250KiBmb250KQorc3RhdGljIHZvaWQgc2V0dXBQYWludChTa1BhaW50KiBwYWludCwgY29uc3Qg U2ltcGxlRm9udERhdGEqIGZvbnREYXRhLCBjb25zdCBGb250KiBmb250LCBib29sIHNob3VsZEFu dGlhbGlhcywgYm9vbCBzaG91bGRTbW9vdGhGb250cykKIHsKICAgICBjb25zdCBGb250UGxhdGZv cm1EYXRhJiBwbGF0Zm9ybURhdGEgPSBmb250RGF0YS0+cGxhdGZvcm1EYXRhKCk7CiAgICAgY29u c3QgZmxvYXQgdGV4dFNpemUgPSBwbGF0Zm9ybURhdGEubV9zaXplID49IDAgPyBwbGF0Zm9ybURh dGEubV9zaXplIDogMTI7CiAKLSAgICBwYWludC0+c2V0QW50aUFsaWFzKHRydWUpOworICAgIHBh aW50LT5zZXRBbnRpQWxpYXMoc2hvdWxkQW50aWFsaWFzKTsKICAgICBwYWludC0+c2V0RW1iZWRk ZWRCaXRtYXBUZXh0KGZhbHNlKTsKICAgICBwYWludC0+c2V0VGV4dFNpemUoU2tGbG9hdFRvU2Nh bGFyKHRleHRTaXplKSk7CiAgICAgU2tUeXBlZmFjZSogdHlwZWZhY2UgPSBTa0NyZWF0ZVR5cGVm YWNlRnJvbUNURm9udChwbGF0Zm9ybURhdGEuY3RGb250KCkpOwpAQCAtODcsNyArODgsNyBAQCBz dGF0aWMgdm9pZCBzZXR1cFBhaW50KFNrUGFpbnQqIHBhaW50LCBjCiAgICAgcGFpbnQtPnNldEZh a2VCb2xkVGV4dChwbGF0Zm9ybURhdGEubV9zeW50aGV0aWNCb2xkKTsKICAgICBwYWludC0+c2V0 VGV4dFNrZXdYKHBsYXRmb3JtRGF0YS5tX3N5bnRoZXRpY09ibGlxdWUgPyAtU0tfU2NhbGFyMSAv IDQgOiAwKTsKICAgICBwYWludC0+c2V0QXV0b2hpbnRlZChmYWxzZSk7IC8vIGZyZWV0eXBlIHNw ZWNpZmljCi0gICAgcGFpbnQtPnNldExDRFJlbmRlclRleHQoZm9udC0+Zm9udERlc2NyaXB0aW9u KCkuZm9udFNtb290aGluZygpID09IFN1YnBpeGVsQW50aWFsaWFzZWQpOworICAgIHBhaW50LT5z ZXRMQ0RSZW5kZXJUZXh0KHNob3VsZFNtb290aEZvbnRzKTsKIH0KIAogLy8gVE9ETzogVGhpcyBu ZWVkcyB0byBiZSBzcGxpdCBpbnRvIGhlbHBlciBmdW5jdGlvbnMgdG8gYmV0dGVyIHNjb3BlIHRo ZQpAQCAtOTgsNiArOTksMjcgQEAgdm9pZCBGb250OjpkcmF3R2x5cGhzKEdyYXBoaWNzQ29udGV4 dCogZwogICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IEZsb2F0UG9pbnQmIHBvaW50KSBjb25z dCB7CiAgICAgQ09NUElMRV9BU1NFUlQoc2l6ZW9mKEdseXBoQnVmZmVyR2x5cGgpID09IHNpemVv Zih1aW50MTZfdCksIEdseXBoQnVmZmVyR2x5cGhTaXplX2VxdWFsc191aW50MTZfdCk7CiAKKyAg ICBib29sIHNob3VsZFNtb290aEZvbnRzID0gdHJ1ZTsKKyAgICBib29sIHNob3VsZEFudGlhbGlh cyA9IHRydWU7CisgICAgCisgICAgc3dpdGNoIChmb250RGVzY3JpcHRpb24oKS5mb250U21vb3Ro aW5nKCkpIHsKKyAgICBjYXNlIEFudGlhbGlhc2VkOgorICAgICAgICBzaG91bGRTbW9vdGhGb250 cyA9IGZhbHNlOworICAgICAgICBicmVhazsKKyAgICBjYXNlIFN1YnBpeGVsQW50aWFsaWFzZWQ6 CisgICAgICAgIGJyZWFrOworICAgIGNhc2UgTm9TbW9vdGhpbmc6CisgICAgICAgIHNob3VsZEFu dGlhbGlhcyA9IGZhbHNlOworICAgICAgICBzaG91bGRTbW9vdGhGb250cyA9IGZhbHNlOworICAg ICAgICBicmVhazsKKyAgICBjYXNlIEF1dG9TbW9vdGhpbmc6CisgICAgICAgIC8vIEZvciB0aGUg QXV0b1Ntb290aCBjYXNlLCBkb24ndCBkbyBhbnl0aGluZyEgS2VlcCB0aGUgZGVmYXVsdCBzZXR0 aW5ncy4KKyAgICAgICAgYnJlYWs7IAorICAgIH0KKyAgICAKKyAgICBpZiAoIXNob3VsZFVzZVNt b290aGluZygpIHx8IFBsYXRmb3JtU3VwcG9ydDo6bGF5b3V0VGVzdE1vZGUoKSkKKyAgICAgICAg c2hvdWxkU21vb3RoRm9udHMgPSBmYWxzZTsKKwogICAgIGNvbnN0IEdseXBoQnVmZmVyR2x5cGgq IGdseXBocyA9IGdseXBoQnVmZmVyLmdseXBocyhmcm9tKTsKICAgICBTa1NjYWxhciB4ID0gU2tG bG9hdFRvU2NhbGFyKHBvaW50LngoKSk7CiAgICAgU2tTY2FsYXIgeSA9IFNrRmxvYXRUb1NjYWxh cihwb2ludC55KCkpOwpAQCAtMTMzLDcgKzE1NSw3IEBAIHZvaWQgRm9udDo6ZHJhd0dseXBocyhH cmFwaGljc0NvbnRleHQqIGcKICAgICBpZiAodGV4dE1vZGUgJiBUZXh0TW9kZUZpbGwpIHsKICAg ICAgICAgU2tQYWludCBwYWludDsKICAgICAgICAgZ2MtPnBsYXRmb3JtQ29udGV4dCgpLT5zZXR1 cFBhaW50Rm9yRmlsbGluZygmcGFpbnQpOwotICAgICAgICBzZXR1cFBhaW50KCZwYWludCwgZm9u dCwgdGhpcyk7CisgICAgICAgIHNldHVwUGFpbnQoJnBhaW50LCBmb250LCB0aGlzLCBzaG91bGRB bnRpYWxpYXMsIHNob3VsZFNtb290aEZvbnRzKTsKICAgICAgICAgYWRqdXN0VGV4dFJlbmRlck1v ZGUoJnBhaW50LCBnYy0+cGxhdGZvcm1Db250ZXh0KCkpOwogICAgICAgICBwYWludC5zZXRUZXh0 RW5jb2RpbmcoU2tQYWludDo6a0dseXBoSURfVGV4dEVuY29kaW5nKTsKICAgICAgICAgcGFpbnQu c2V0Q29sb3IoZ2MtPmZpbGxDb2xvcigpLnJnYigpKTsKQEAgLTE1Niw3ICsxNzgsNyBAQCB2b2lk IEZvbnQ6OmRyYXdHbHlwaHMoR3JhcGhpY3NDb250ZXh0KiBnCiAKICAgICAgICAgU2tQYWludCBw YWludDsKICAgICAgICAgZ2MtPnBsYXRmb3JtQ29udGV4dCgpLT5zZXR1cFBhaW50Rm9yU3Ryb2tp bmcoJnBhaW50LCAwLCAwKTsKLSAgICAgICAgc2V0dXBQYWludCgmcGFpbnQsIGZvbnQsIHRoaXMp OworICAgICAgICBzZXR1cFBhaW50KCZwYWludCwgZm9udCwgdGhpcywgc2hvdWxkQW50aWFsaWFz LCBzaG91bGRTbW9vdGhGb250cyk7CiAgICAgICAgIGFkanVzdFRleHRSZW5kZXJNb2RlKCZwYWlu dCwgZ2MtPnBsYXRmb3JtQ29udGV4dCgpKTsKICAgICAgICAgcGFpbnQuc2V0VGV4dEVuY29kaW5n KFNrUGFpbnQ6OmtHbHlwaElEX1RleHRFbmNvZGluZyk7CiAgICAgICAgIHBhaW50LnNldENvbG9y KGdjLT5zdHJva2VDb2xvcigpLnJnYigpKTsK