112668 2013-03-19 01:14:00 -0700 [Qt] New fast/text/word-space-with-kerning-3.html fails on Qt. 2013-03-25 02:37:15 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 112795 113179 87008 1 kadam allan.jensen allan.jensen dino enrica jturcotte noam ossy szledan webkit.review.bot zarvai oldest_to_newest 858026 0 kadam 2013-03-19 01:14:00 -0700 The new layout test fast/text/word-space-with-kerning-3.html is failing after http://trac.webkit.org/changeset/146087. diff: http://build.webkit.sed.hu/results/x86-64%20Linux%20Qt%20Release/r146183%20(49292)/fast/text/word-space-with-kerning-3-diffs.html I will skip it. 858083 1 kadam 2013-03-19 02:34:20 -0700 Skipped in: http://trac.webkit.org/changeset/146194/trunk/LayoutTests/platform/qt/TestExpectations 858570 2 dino 2013-03-19 12:01:32 -0700 This seems like an actual bug in the layout system. Is kerning enabled on QT? If so, then there is definitely a bug. The two pieces of content should be identical. If not, then I'm not sure how they could be different :) 859235 3 allan.jensen 2013-03-20 04:15:10 -0700 I think kerning might be always on in the complex font path in Qt. I have a patch to fix that I will see if that fixes it. 859242 4 194018 allan.jensen 2013-03-20 04:27:12 -0700 Created attachment 194018 Patch Make complex font path respect WebCore kerning setting 859272 5 allan.jensen 2013-03-20 04:56:17 -0700 Committed r146331: <http://trac.webkit.org/changeset/146331> 859296 6 webkit.review.bot 2013-03-20 06:03:45 -0700 Re-opened since this is blocked by bug 112795 859306 7 allan.jensen 2013-03-20 06:08:30 -0700 The test-case works with Qt 5.1 because both cases goes through the fast font path. There does however seem to be a problem with word-spacing working differently in fast and complex path. Possibly we need to fix the same bug in the Qt complex path that this test was introduced to test in the fast path. 859372 8 194048 allan.jensen 2013-03-20 07:15:29 -0700 Created attachment 194048 Patch Second try, this time verified it works when the complex font path is used. 859484 9 194076 allan.jensen 2013-03-20 09:22:54 -0700 Created attachment 194076 Patch 859522 10 194076 jturcotte 2013-03-20 10:02:44 -0700 Comment on attachment 194076 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=194076&action=review > Source/WebCore/platform/graphics/qt/FontQt.cpp:238 > - initFormatForTextLayout(&layout); > + initFormatForTextLayout(&layout, run); > QTextLine line = setupLayout(&layout, run); Maybe you can do this in setupLayout instead? You don't seem to be using any Font member for this logic, and initFormatForTextLayout isn't a fitting name anymore with this. > Source/WebCore/platform/graphics/qt/FontQt.cpp:260 > + if (!range.length) > + return; Maybe this is the reason why, but I'm not quite well following that part. 859555 11 194088 allan.jensen 2013-03-20 11:01:53 -0700 Created attachment 194088 Patch Slight clean-up 861558 12 194088 pierre.rossi 2013-03-22 09:26:29 -0700 Comment on attachment 194088 Patch Me gusta ! 861669 13 194088 allan.jensen 2013-03-22 10:53:35 -0700 Comment on attachment 194088 Patch Clearing flags on attachment: 194088 Committed r146630: <http://trac.webkit.org/changeset/146630> 861670 14 allan.jensen 2013-03-22 10:53:40 -0700 All reviewed patches have been landed. Closing bug. 862587 15 zarvai 2013-03-25 02:37:15 -0700 After the patch 8 test started asserting on Qt debug bots. https://bugs.webkit.org/show_bug.cgi?id=113179 194018 2013-03-20 04:27:12 -0700 2013-03-20 07:15:24 -0700 Patch bug-112668-20130320122208.patch text/plain 2975 allan.jensen U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ2MzIxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTA1ZWMzMTg4ZTRhZGIz ZWE0Yzk0MjYxYzdjOGRkODc4NmY2ODBhNC4uZjI2ZjE5MThiNTgwODQ5YzE1Mzc4NGU0ZTYzMTI2 MzRiZTI2MzViNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDEzLTAzLTIwICBBbGxh biBTYW5kZmVsZCBKZW5zZW4gIDxhbGxhbi5qZW5zZW5AZGlnaWEuY29tPgorCisgICAgICAgIFtR dF0gTmV3IGZhc3QvdGV4dC93b3JkLXNwYWNlLXdpdGgta2VybmluZy0zLmh0bWwgZmFpbHMgb24g UXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMjY2 OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEtlcm5p bmcgaXMgb24gYnkgZGVmYXVsdCBpbiBRdC4gVGhpcyBtZWFucyB3ZSBuZWVkIHRvIGRpc2FibGUg aXQKKyAgICAgICAgd2hlbiBXZWJDb3JlIGRvZXMgbm90IHJlcXVlc3QgaXQuCisKKyAgICAgICAg KiBwbGF0Zm9ybS9ncmFwaGljcy9xdC9Gb250UXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Rm9u dDo6aW5pdEZvcm1hdEZvclRleHRMYXlvdXQpOgorCiAyMDEzLTAzLTIwICBBbGV4ZWkgRmlsaXBw b3YgIDxhbHBoQGNocm9taXVtLm9yZz4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBBbGxvdyB0 b29sYmFyIGN1c3RvbWl6YXRpb24KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL3F0L0ZvbnRRdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9xdC9Gb250UXQuY3BwCmluZGV4IGUyY2RlNzY1YjE5ODdkZGEwN2QxYmJjY2QwYWI4NTY1Yzc5 NTRiNDAuLmYxNDdhYmEwMGM4NmY0ZTE2MThkOGQ0ODBhZGNkNTNlOTU0N2NkZmYgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L0ZvbnRRdC5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvRm9udFF0LmNwcApAQCAtMjU3LDEw ICsyNTcsOSBAQCB2b2lkIEZvbnQ6OmluaXRGb3JtYXRGb3JUZXh0TGF5b3V0KFFUZXh0TGF5b3V0 KiBsYXlvdXQpIGNvbnN0CiAgICAgICAgIHJhbmdlLmZvcm1hdC5zZXRGb250V29yZFNwYWNpbmco bV93b3JkU3BhY2luZyk7CiAgICAgaWYgKG1fbGV0dGVyU3BhY2luZykKICAgICAgICAgcmFuZ2Uu Zm9ybWF0LnNldEZvbnRMZXR0ZXJTcGFjaW5nKG1fbGV0dGVyU3BhY2luZyk7Ci0gICAgaWYgKHR5 cGVzZXR0aW5nRmVhdHVyZXMoKSAmIEtlcm5pbmcpCi0gICAgICAgIHJhbmdlLmZvcm1hdC5zZXRG b250S2VybmluZyh0cnVlKTsKICAgICBpZiAoaXNTbWFsbENhcHMoKSkKICAgICAgICAgcmFuZ2Uu Zm9ybWF0LnNldEZvbnRDYXBpdGFsaXphdGlvbihRRm9udDo6U21hbGxDYXBzKTsKKyAgICByYW5n ZS5mb3JtYXQuc2V0Rm9udEtlcm5pbmcodHlwZXNldHRpbmdGZWF0dXJlcygpICYgS2VybmluZyk7 CiAKICAgICBpZiAocmFuZ2UuZm9ybWF0LnByb3BlcnR5Q291bnQoKSkKICAgICAgICAgbGF5b3V0 LT5zZXRBZGRpdGlvbmFsRm9ybWF0cyhRTGlzdDxRVGV4dExheW91dDo6Rm9ybWF0UmFuZ2U+KCkg PDwgcmFuZ2UpOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVz dHMvQ2hhbmdlTG9nCmluZGV4IDlmZTZlMzRmZjU0NDVhMDIxODAyYzdjMzlkMGQwMTNkMDljZmZl MDAuLjJiYWRjOTMyMTFmMGFlZTRkNGVmMjI0YThhZDFhZTg1ZjBhNWZkODYgMTAwNjQ0Ci0tLSBh L0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxMiBAQAorMjAxMy0wMy0yMCAgQWxsYW4gU2FuZGZlbGQgSmVuc2VuICA8YWxsYW4uamVu c2VuQGRpZ2lhLmNvbT4KKworICAgICAgICBbUXRdIE5ldyBmYXN0L3RleHQvd29yZC1zcGFjZS13 aXRoLWtlcm5pbmctMy5odG1sIGZhaWxzIG9uIFF0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTI2NjgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICAqIHBsYXRmb3JtL3F0L1Rlc3RFeHBlY3RhdGlvbnM6CisK IDIwMTMtMDMtMjAgIEtyenlzenRvZiBDemVjaCAgPGsuY3plY2hAc2Ftc3VuZy5jb20+CiAKICAg ICAgICAgW0VGTF0gYWNjZXNzaWJpbGl0eS9hcmlhLXNjcm9sbGJhci1yb2xlLmh0bWwgaXMgZmFp bGluZwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vcXQvVGVzdEV4cGVjdGF0aW9u cyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL3F0L1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXggZjRkN2M2 MmMyYmRiMThhMzQyMzhiOTQyMDU3ZjRkYmIwNzFjZGVmYS4uMzY4YjNjN2ZkMjI3ZWM0OGEwZTdk NTBmZmQ4NjY2NjI3ZDQ0M2E2MiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vcXQv VGVzdEV4cGVjdGF0aW9ucworKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9xdC9UZXN0RXhwZWN0 YXRpb25zCkBAIC0xODIyLDggKzE4MjIsNiBAQCBmYXN0L3RleHQvZW1waGFzaXMtYXZvaWQtcnVi eS5odG1sCiAjIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MDI5Mwog ZmFzdC90ZXh0L2ludGVybmF0aW9uYWwvc3BhY2VzLWNvbWJpbmVkLWluLXZlcnRpY2FsLXRleHQu aHRtbAogCi13ZWJraXQub3JnL2IvMTEyNjY4IGZhc3QvdGV4dC93b3JkLXNwYWNlLXdpdGgta2Vy bmluZy0zLmh0bWwgWyBTa2lwIF0KLQogZmFzdC93cml0aW5nLW1vZGUvYm9yZGVyLXN0eWxlcy12 ZXJ0aWNhbC1sci5odG1sCiBmYXN0L3dyaXRpbmctbW9kZS9ib3JkZXItc3R5bGVzLXZlcnRpY2Fs LXJsLmh0bWwKIAo= 194048 2013-03-20 07:15:29 -0700 2013-03-20 09:22:49 -0700 Patch bug-112668-20130320151025.patch text/plain 3109 allan.jensen U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ2MzM5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmQwMzZiYTgzNzc4YWZl ZTkwNDhkNzcyMWY1MTk5ZDUyZjQ2MmI2Ni4uMWVmZGMyYTM4MTQ5YzYxMmVhM2EyMWM4YzljNzUy MTRlZjM2NDQ5OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDEzLTAzLTIwICBBbGxh biBTYW5kZmVsZCBKZW5zZW4gIDxhbGxhbi5qZW5zZW5AZGlnaWEuY29tPgorCisgICAgICAgIFtR dF0gTmV3IGZhc3QvdGV4dC93b3JkLXNwYWNlLXdpdGgta2VybmluZy0zLmh0bWwgZmFpbHMgb24g UXQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTI2 NjgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBRdCBh ZGRzIHdvcmQtc3BhY2luZyB0byBsZWFkaW5nIHNwYWNlcywgYnV0IFdlYkNvcmUgb25seSBleHBl Y3RzCisgICAgICAgIHVzIHRvIGFkZCBmb3IgdHJhaWxpbmcgc3BhY2VzLiBXZSBhbHJlYWR5IGNv cnJlY3RzIGZvciB0aGlzIGluIHdpZHRoCisgICAgICAgIGNhbGN1bGF0aW9uIGJ1dCBkbyBub3Qg Y29ycmVjdCBmb3IgaXQgd2hlbiBkcmF3aW5nLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhp Y3MvcXQvRm9udFF0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZvbnQ6OmRyYXdDb21wbGV4VGV4 dCk6CisKIDIwMTMtMDMtMjAgIFNoZXJpZmYgQm90ICA8d2Via2l0LnJldmlldy5ib3RAZ21haWwu Y29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHIxNDYzMzEuCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9Gb250UXQuY3BwIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvRm9udFF0LmNwcAppbmRleCBlMmNkZTc2 NWIxOTg3ZGRhMDdkMWJiY2NkMGFiODU2NWM3OTU0YjQwLi4zNTI4ZTU5NDUxYTQwMjBkZTFjYjYz YjZhZjNkNDE0NGJjMzAyMmE1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9xdC9Gb250UXQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL3F0L0ZvbnRRdC5jcHAKQEAgLTE4NCw3ICsxODQsOSBAQCB2b2lkIEZvbnQ6OmRyYXdDb21w bGV4VGV4dChHcmFwaGljc0NvbnRleHQqIGN0eCwgY29uc3QgVGV4dFJ1biYgcnVuLCBjb25zdCBG bG9hdAogICAgIGxheW91dC5zZXRSYXdGb250KHJhd0ZvbnQoKSk7CiAgICAgaW5pdEZvcm1hdEZv clRleHRMYXlvdXQoJmxheW91dCk7CiAgICAgUVRleHRMaW5lIGxpbmUgPSBzZXR1cExheW91dCgm bGF5b3V0LCBydW4pOwotICAgIGNvbnN0IFFQb2ludEYgYWRqdXN0ZWRQb2ludChwb2ludC54KCks IHBvaW50LnkoKSAtIGxpbmUuYXNjZW50KCkpOworICAgIC8vIFJlbmRlckJsb2NrTGluZUxheW91 dCBleHBlY3RzIHVzIHRvIG9ubHkgYWRkIHdvcmQtc3BhY2luZyBmb3IgdHJhaWxpbmcgc3BhY2Vz LCBub3QgZm9yIGxlYWRpbmcgc3BhY2VzLgorICAgIGZsb2F0IG9mZnNldFggPSB0cmVhdEFzU3Bh Y2UocnVuWzBdKSA/IC1tX3dvcmRTcGFjaW5nIDogMDsKKyAgICBjb25zdCBRUG9pbnRGIGFkanVz dGVkUG9pbnQocG9pbnQueCgpICsgb2Zmc2V0WCwgcG9pbnQueSgpIC0gbGluZS5hc2NlbnQoKSk7 CiAKICAgICBRTGlzdDxRR2x5cGhSdW4+IHJ1bnMgPSBsaW5lLmdseXBoUnVucyhmcm9tLCB0byAt IGZyb20pOwogICAgIFFfRk9SRUFDSChRR2x5cGhSdW4gZ2x5cGhSdW4sIHJ1bnMpCmRpZmYgLS1n aXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXgg ZDY0YzY5Mzc5ZGNhZWM4NzQyNjVjODM3ZTk0MzYzM2EzMjM0OTZiZi4uYjY0MGYxNGQwNWQwMmI0 YmJkMDUxOGNkZjYyZGJjNTJkMTQyYmU5NSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdl TG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEyIEBACisyMDEzLTAz LTIwICBBbGxhbiBTYW5kZmVsZCBKZW5zZW4gIDxhbGxhbi5qZW5zZW5AZGlnaWEuY29tPgorCisg ICAgICAgIFtRdF0gTmV3IGZhc3QvdGV4dC93b3JkLXNwYWNlLXdpdGgta2VybmluZy0zLmh0bWwg ZmFpbHMgb24gUXQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xMTI2NjgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIHBsYXRmb3JtL3F0L1Rlc3RFeHBlY3RhdGlvbnM6CisKIDIwMTMtMDMtMjAgIFNoZXJp ZmYgQm90ICA8d2Via2l0LnJldmlldy5ib3RAZ21haWwuY29tPgogCiAgICAgICAgIFVucmV2aWV3 ZWQsIHJvbGxpbmcgb3V0IHIxNDYzMzEuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9y bS9xdC9UZXN0RXhwZWN0YXRpb25zIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vcXQvVGVzdEV4cGVj dGF0aW9ucwppbmRleCBmNGQ3YzYyYzJiZGIxOGEzNDIzOGI5NDIwNTdmNGRiYjA3MWNkZWZhLi4z NjhiM2M3ZmQyMjdlYzQ4YTBlN2Q1MGZmZDg2NjY2MjdkNDQzYTYyIDEwMDY0NAotLS0gYS9MYXlv dXRUZXN0cy9wbGF0Zm9ybS9xdC9UZXN0RXhwZWN0YXRpb25zCisrKyBiL0xheW91dFRlc3RzL3Bs YXRmb3JtL3F0L1Rlc3RFeHBlY3RhdGlvbnMKQEAgLTE4MjIsOCArMTgyMiw2IEBAIGZhc3QvdGV4 dC9lbXBoYXNpcy1hdm9pZC1ydWJ5Lmh0bWwKICMgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTgwMjkzCiBmYXN0L3RleHQvaW50ZXJuYXRpb25hbC9zcGFjZXMtY29tYmlu ZWQtaW4tdmVydGljYWwtdGV4dC5odG1sCiAKLXdlYmtpdC5vcmcvYi8xMTI2NjggZmFzdC90ZXh0 L3dvcmQtc3BhY2Utd2l0aC1rZXJuaW5nLTMuaHRtbCBbIFNraXAgXQotCiBmYXN0L3dyaXRpbmct bW9kZS9ib3JkZXItc3R5bGVzLXZlcnRpY2FsLWxyLmh0bWwKIGZhc3Qvd3JpdGluZy1tb2RlL2Jv cmRlci1zdHlsZXMtdmVydGljYWwtcmwuaHRtbAogCg== 194076 2013-03-20 09:22:54 -0700 2013-03-20 11:01:48 -0700 Patch bug-112668-20130320171750.patch text/plain 6208 allan.jensen U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ2MzQzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWIxYmE5NWM0OTcxOWI0 NjExYmE4ZDk0YmYzMTQ3MmViMTc4NzIzMS4uMGVjMTRmNGNkMzczMWU1NzQ1YmVlYzIzNWNkNzY1 YjE3ZDdiZDQ2NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDEzLTAzLTIwICBBbGxh biBTYW5kZmVsZCBKZW5zZW4gIDxhbGxhbi5qZW5zZW5AZGlnaWEuY29tPgorCisgICAgICAgIFtR dF0gTmV3IGZhc3QvdGV4dC93b3JkLXNwYWNlLXdpdGgta2VybmluZy0zLmh0bWwgZmFpbHMgb24g UXQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTI2 NjgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBRdCBh ZGRzIHdvcmQtc3BhY2luZyB0byBsZWFkaW5nIHNwYWNlcywgYnV0IFdlYkNvcmUgb25seSBleHBl Y3RzCisgICAgICAgIHVzIHRvIGFkZCBmb3IgdHJhaWxpbmcgc3BhY2VzLiBXZSBvbmx5IGNvcnJl Y3RlZCBmb3IgdGhpcyBpbiB3aWR0aAorICAgICAgICBjYWxjdWxhdGlvbiBidXQgZG8gbmVlZCB0 byBhbHNvIGRvIGl0IGZvciBkcmF3aW5nLgorCisgICAgICAgIEluc3RlYWQgb2Ygc3VidHJhY3Rp bmcgdGhlIGV4dHJhIHdvcmQtc3BhY2luZyB3ZSBub3cgY29uZmlndXJlIHRoZQorICAgICAgICBG b3JtYXRSYW5nZSBub3QgdG8gYXBwbHkgdG8gbGVhZGluZyBzcGFjZXMuIFRoaXMgbWVhbnMgdGhp cyBiZWhhdmlvcgorICAgICAgICB3aWxsIGJlIGFwcGxpZWQgZXZlcnl3aGVyZSByZWxpYWJseS4K KworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL0ZvbnQuaDoKKyAgICAgICAgKEZvbnQpOgor ICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3F0L0ZvbnRRdC5jcHA6CisgICAgICAgIChXZWJD b3JlOjpGb250OjpkcmF3Q29tcGxleFRleHQpOgorICAgICAgICAoV2ViQ29yZTo6Rm9udDo6Zmxv YXRXaWR0aEZvckNvbXBsZXhUZXh0KToKKyAgICAgICAgKFdlYkNvcmU6OkZvbnQ6Om9mZnNldEZv clBvc2l0aW9uRm9yQ29tcGxleFRleHQpOgorICAgICAgICAoV2ViQ29yZTo6Rm9udDo6c2VsZWN0 aW9uUmVjdEZvckNvbXBsZXhUZXh0KToKKyAgICAgICAgKFdlYkNvcmU6OkZvbnQ6OmluaXRGb3Jt YXRGb3JUZXh0TGF5b3V0KToKKwogMjAxMy0wMy0yMCAgQXJ2aWQgTmlsc3NvbiAgPGFuaWxzc29u QHJpbS5jb20+CiAKICAgICAgICAgW0JsYWNrQmVycnldIEVuYWJsZSBhcHByb3ByaWF0ZSB2ZXJ0 ZXggYXR0cmlidXRlIGFycmF5cyBpbiBMYXllclJlbmRlcmVyOjp1c2VQcm9ncmFtKCkKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnQuaCBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnQuaAppbmRleCBlMzZmOTk0N2M0M2RjNWY0ZWY0 ODAxN2E3ZGNkMzAwYjI0ZmM5OWM5Li5kNmQzOTNhMTYyNzQ1M2M3ZGRlYTI0MjNhZThhOWZhNGJj NTg0N2ZjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250 LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udC5oCkBAIC0yOTcs NyArMjk3LDcgQEAgcHJpdmF0ZToKICAgICB9CiAKICNpZiBQTEFURk9STShRVCkKLSAgICB2b2lk IGluaXRGb3JtYXRGb3JUZXh0TGF5b3V0KFFUZXh0TGF5b3V0KikgY29uc3Q7CisgICAgdm9pZCBp bml0Rm9ybWF0Rm9yVGV4dExheW91dChRVGV4dExheW91dCosIGNvbnN0IFRleHRSdW4mKSBjb25z dDsKICNlbmRpZgogCiAgICAgc3RhdGljIFR5cGVzZXR0aW5nRmVhdHVyZXMgc19kZWZhdWx0VHlw ZXNldHRpbmdGZWF0dXJlczsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL3F0L0ZvbnRRdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9x dC9Gb250UXQuY3BwCmluZGV4IGUyY2RlNzY1YjE5ODdkZGEwN2QxYmJjY2QwYWI4NTY1Yzc5NTRi NDAuLjY1ODA4YWU2OGMwMzNkNDgzMWNkNDJkNjM1ZTI0ZjgwYTkzOThjY2IgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L0ZvbnRRdC5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvRm9udFF0LmNwcApAQCAtMTgyLDcgKzE4 Miw3IEBAIHZvaWQgRm9udDo6ZHJhd0NvbXBsZXhUZXh0KEdyYXBoaWNzQ29udGV4dCogY3R4LCBj b25zdCBUZXh0UnVuJiBydW4sIGNvbnN0IEZsb2F0CiAgICAgY29uc3QgUVN0cmluZyBzdHJpbmcg PSBmcm9tUmF3RGF0YVdpdGhvdXRSZWYoc2FuaXRpemVkKTsKICAgICBRVGV4dExheW91dCBsYXlv dXQoc3RyaW5nKTsKICAgICBsYXlvdXQuc2V0UmF3Rm9udChyYXdGb250KCkpOwotICAgIGluaXRG b3JtYXRGb3JUZXh0TGF5b3V0KCZsYXlvdXQpOworICAgIGluaXRGb3JtYXRGb3JUZXh0TGF5b3V0 KCZsYXlvdXQsIHJ1bik7CiAgICAgUVRleHRMaW5lIGxpbmUgPSBzZXR1cExheW91dCgmbGF5b3V0 LCBydW4pOwogICAgIGNvbnN0IFFQb2ludEYgYWRqdXN0ZWRQb2ludChwb2ludC54KCksIHBvaW50 LnkoKSAtIGxpbmUuYXNjZW50KCkpOwogCkBAIC0yMDYsMTQgKzIwNiwxMSBAQCBmbG9hdCBGb250 OjpmbG9hdFdpZHRoRm9yQ29tcGxleFRleHQoY29uc3QgVGV4dFJ1biYgcnVuLCBIYXNoU2V0PGNv bnN0IFNpbXBsZUZvbgogCiAgICAgUVRleHRMYXlvdXQgbGF5b3V0KHN0cmluZyk7CiAgICAgbGF5 b3V0LnNldFJhd0ZvbnQocmF3Rm9udCgpKTsKLSAgICBpbml0Rm9ybWF0Rm9yVGV4dExheW91dCgm bGF5b3V0KTsKKyAgICBpbml0Rm9ybWF0Rm9yVGV4dExheW91dCgmbGF5b3V0LCBydW4pOwogICAg IFFUZXh0TGluZSBsaW5lID0gc2V0dXBMYXlvdXQoJmxheW91dCwgcnVuKTsKICAgICBmbG9hdCB4 MSA9IGxpbmUuY3Vyc29yVG9YKDApOwogICAgIGZsb2F0IHgyID0gbGluZS5jdXJzb3JUb1gocnVu Lmxlbmd0aCgpKTsKICAgICBmbG9hdCB3aWR0aCA9IHFBYnMoeDIgLSB4MSk7Ci0gICAgLy8gUmVu ZGVyQmxvY2tMaW5lTGF5b3V0IGV4cGVjdHMgdXMgdG8gb25seSBhZGQgd29yZC1zcGFjaW5nIGZv ciB0cmFpbGluZyBzcGFjZXMsIG5vdCBmb3IgbGVhZGluZyBzcGFjZXMuCi0gICAgaWYgKHRyZWF0 QXNTcGFjZShydW5bMF0pKQotICAgICAgICB3aWR0aCAtPSBtX3dvcmRTcGFjaW5nOwogCiAgICAg cmV0dXJuIHdpZHRoICsgcnVuLmV4cGFuc2lvbigpOwogfQpAQCAtMjI1LDcgKzIyMiw3IEBAIGlu dCBGb250OjpvZmZzZXRGb3JQb3NpdGlvbkZvckNvbXBsZXhUZXh0KGNvbnN0IFRleHRSdW4mIHJ1 biwgZmxvYXQgcG9zaXRpb24sIGJvCiAKICAgICBRVGV4dExheW91dCBsYXlvdXQoc3RyaW5nKTsK ICAgICBsYXlvdXQuc2V0UmF3Rm9udChyYXdGb250KCkpOwotICAgIGluaXRGb3JtYXRGb3JUZXh0 TGF5b3V0KCZsYXlvdXQpOworICAgIGluaXRGb3JtYXRGb3JUZXh0TGF5b3V0KCZsYXlvdXQsIHJ1 bik7CiAgICAgUVRleHRMaW5lIGxpbmUgPSBzZXR1cExheW91dCgmbGF5b3V0LCBydW4pOwogICAg IHJldHVybiBsaW5lLnhUb0N1cnNvcihwb3NpdGlvbik7CiB9CkBAIC0yMzcsNyArMjM0LDcgQEAg RmxvYXRSZWN0IEZvbnQ6OnNlbGVjdGlvblJlY3RGb3JDb21wbGV4VGV4dChjb25zdCBUZXh0UnVu JiBydW4sIGNvbnN0IEZsb2F0UG9pbnQKIAogICAgIFFUZXh0TGF5b3V0IGxheW91dChzdHJpbmcp OwogICAgIGxheW91dC5zZXRSYXdGb250KHJhd0ZvbnQoKSk7Ci0gICAgaW5pdEZvcm1hdEZvclRl eHRMYXlvdXQoJmxheW91dCk7CisgICAgaW5pdEZvcm1hdEZvclRleHRMYXlvdXQoJmxheW91dCwg cnVuKTsKICAgICBRVGV4dExpbmUgbGluZSA9IHNldHVwTGF5b3V0KCZsYXlvdXQsIHJ1bik7CiAK ICAgICBmbG9hdCB4MSA9IGxpbmUuY3Vyc29yVG9YKGZyb20pOwpAQCAtMjQ4LDExICsyNDUsMjAg QEAgRmxvYXRSZWN0IEZvbnQ6OnNlbGVjdGlvblJlY3RGb3JDb21wbGV4VGV4dChjb25zdCBUZXh0 UnVuJiBydW4sIGNvbnN0IEZsb2F0UG9pbnQKICAgICByZXR1cm4gRmxvYXRSZWN0KHB0LngoKSAr IHgxLCBwdC55KCksIHgyIC0geDEsIGgpOwogfQogCi12b2lkIEZvbnQ6OmluaXRGb3JtYXRGb3JU ZXh0TGF5b3V0KFFUZXh0TGF5b3V0KiBsYXlvdXQpIGNvbnN0Cit2b2lkIEZvbnQ6OmluaXRGb3Jt YXRGb3JUZXh0TGF5b3V0KFFUZXh0TGF5b3V0KiBsYXlvdXQsIGNvbnN0IFRleHRSdW4mIHJ1bikg Y29uc3QKIHsKICAgICBRVGV4dExheW91dDo6Rm9ybWF0UmFuZ2UgcmFuZ2U7CisgICAgLy8gV2Vi Q29yZSBleHBlY3RzIHdvcmQtc3BhY2luZyB0byBiZSBpZ25vcmVkIG9uIGxlYWRpbmcgc3BhY2Vz LgorICAgIC8vIFNpbmNlIHRoZSByZXN0IG9mIHRoZSBmb3JtYXRpbmcgb3B0aW9ucyBkb2VzIG5v dCBhZmZlY3Qgc3BhY2VzLAorICAgIC8vIHdlIHNraXAgbGVhZGluZyBzcGFjZXMgZnJvbSB0aGUg Rm9ybWF0UmFuZ2UuCisgICAgdW5zaWduZWQgbGVuZ3RoID0gbGF5b3V0LT50ZXh0KCkubGVuZ3Ro KCk7CiAgICAgcmFuZ2Uuc3RhcnQgPSAwOwotICAgIHJhbmdlLmxlbmd0aCA9IGxheW91dC0+dGV4 dCgpLmxlbmd0aCgpOworICAgIHdoaWxlICh0cmVhdEFzU3BhY2UocnVuW3JhbmdlLnN0YXJ0XSkg JiYgcmFuZ2Uuc3RhcnQgPCBsZW5ndGgpCisgICAgICAgICsrcmFuZ2Uuc3RhcnQ7CisgICAgcmFu Z2UubGVuZ3RoID0gbGVuZ3RoIC0gcmFuZ2Uuc3RhcnQ7CisgICAgaWYgKCFyYW5nZS5sZW5ndGgp CisgICAgICAgIHJldHVybjsKKwogICAgIGlmIChtX3dvcmRTcGFjaW5nKQogICAgICAgICByYW5n ZS5mb3JtYXQuc2V0Rm9udFdvcmRTcGFjaW5nKG1fd29yZFNwYWNpbmcpOwogICAgIGlmIChtX2xl dHRlclNwYWNpbmcpCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRU ZXN0cy9DaGFuZ2VMb2cKaW5kZXggZDY0YzY5Mzc5ZGNhZWM4NzQyNjVjODM3ZTk0MzYzM2EzMjM0 OTZiZi4uYjY0MGYxNGQwNWQwMmI0YmJkMDUxOGNkZjYyZGJjNTJkMTQyYmU5NSAxMDA2NDQKLS0t IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAt MSwzICsxLDEyIEBACisyMDEzLTAzLTIwICBBbGxhbiBTYW5kZmVsZCBKZW5zZW4gIDxhbGxhbi5q ZW5zZW5AZGlnaWEuY29tPgorCisgICAgICAgIFtRdF0gTmV3IGZhc3QvdGV4dC93b3JkLXNwYWNl LXdpdGgta2VybmluZy0zLmh0bWwgZmFpbHMgb24gUXQuCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTI2NjgKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHBsYXRmb3JtL3F0L1Rlc3RFeHBlY3RhdGlvbnM6 CisKIDIwMTMtMDMtMjAgIFNoZXJpZmYgQm90ICA8d2Via2l0LnJldmlldy5ib3RAZ21haWwuY29t PgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHIxNDYzMzEuCmRpZmYgLS1naXQg YS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9xdC9UZXN0RXhwZWN0YXRpb25zIGIvTGF5b3V0VGVzdHMv cGxhdGZvcm0vcXQvVGVzdEV4cGVjdGF0aW9ucwppbmRleCBmNGQ3YzYyYzJiZGIxOGEzNDIzOGI5 NDIwNTdmNGRiYjA3MWNkZWZhLi4zNjhiM2M3ZmQyMjdlYzQ4YTBlN2Q1MGZmZDg2NjY2MjdkNDQz YTYyIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9xdC9UZXN0RXhwZWN0YXRpb25z CisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL3F0L1Rlc3RFeHBlY3RhdGlvbnMKQEAgLTE4MjIs OCArMTgyMiw2IEBAIGZhc3QvdGV4dC9lbXBoYXNpcy1hdm9pZC1ydWJ5Lmh0bWwKICMgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgwMjkzCiBmYXN0L3RleHQvaW50ZXJu YXRpb25hbC9zcGFjZXMtY29tYmluZWQtaW4tdmVydGljYWwtdGV4dC5odG1sCiAKLXdlYmtpdC5v cmcvYi8xMTI2NjggZmFzdC90ZXh0L3dvcmQtc3BhY2Utd2l0aC1rZXJuaW5nLTMuaHRtbCBbIFNr aXAgXQotCiBmYXN0L3dyaXRpbmctbW9kZS9ib3JkZXItc3R5bGVzLXZlcnRpY2FsLWxyLmh0bWwK IGZhc3Qvd3JpdGluZy1tb2RlL2JvcmRlci1zdHlsZXMtdmVydGljYWwtcmwuaHRtbAogCg== 194088 2013-03-20 11:01:53 -0700 2013-03-22 10:53:34 -0700 Patch bug-112668-20130320185649.patch text/plain 6669 allan.jensen U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ2MzQzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWIxYmE5NWM0OTcxOWI0 NjExYmE4ZDk0YmYzMTQ3MmViMTc4NzIzMS4uMGVjMTRmNGNkMzczMWU1NzQ1YmVlYzIzNWNkNzY1 YjE3ZDdiZDQ2NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDEzLTAzLTIwICBBbGxh biBTYW5kZmVsZCBKZW5zZW4gIDxhbGxhbi5qZW5zZW5AZGlnaWEuY29tPgorCisgICAgICAgIFtR dF0gTmV3IGZhc3QvdGV4dC93b3JkLXNwYWNlLXdpdGgta2VybmluZy0zLmh0bWwgZmFpbHMgb24g UXQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTI2 NjgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBRdCBh ZGRzIHdvcmQtc3BhY2luZyB0byBsZWFkaW5nIHNwYWNlcywgYnV0IFdlYkNvcmUgb25seSBleHBl Y3RzCisgICAgICAgIHVzIHRvIGFkZCBmb3IgdHJhaWxpbmcgc3BhY2VzLiBXZSBvbmx5IGNvcnJl Y3RlZCBmb3IgdGhpcyBpbiB3aWR0aAorICAgICAgICBjYWxjdWxhdGlvbiBidXQgZG8gbmVlZCB0 byBhbHNvIGRvIGl0IGZvciBkcmF3aW5nLgorCisgICAgICAgIEluc3RlYWQgb2Ygc3VidHJhY3Rp bmcgdGhlIGV4dHJhIHdvcmQtc3BhY2luZyB3ZSBub3cgY29uZmlndXJlIHRoZQorICAgICAgICBG b3JtYXRSYW5nZSBub3QgdG8gYXBwbHkgdG8gbGVhZGluZyBzcGFjZXMuIFRoaXMgbWVhbnMgdGhp cyBiZWhhdmlvcgorICAgICAgICB3aWxsIGJlIGFwcGxpZWQgZXZlcnl3aGVyZSByZWxpYWJseS4K KworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL0ZvbnQuaDoKKyAgICAgICAgKEZvbnQpOgor ICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3F0L0ZvbnRRdC5jcHA6CisgICAgICAgIChXZWJD b3JlOjpGb250OjpkcmF3Q29tcGxleFRleHQpOgorICAgICAgICAoV2ViQ29yZTo6Rm9udDo6Zmxv YXRXaWR0aEZvckNvbXBsZXhUZXh0KToKKyAgICAgICAgKFdlYkNvcmU6OkZvbnQ6Om9mZnNldEZv clBvc2l0aW9uRm9yQ29tcGxleFRleHQpOgorICAgICAgICAoV2ViQ29yZTo6Rm9udDo6c2VsZWN0 aW9uUmVjdEZvckNvbXBsZXhUZXh0KToKKyAgICAgICAgKFdlYkNvcmU6OkZvbnQ6OmluaXRGb3Jt YXRGb3JUZXh0TGF5b3V0KToKKwogMjAxMy0wMy0yMCAgQXJ2aWQgTmlsc3NvbiAgPGFuaWxzc29u QHJpbS5jb20+CiAKICAgICAgICAgW0JsYWNrQmVycnldIEVuYWJsZSBhcHByb3ByaWF0ZSB2ZXJ0 ZXggYXR0cmlidXRlIGFycmF5cyBpbiBMYXllclJlbmRlcmVyOjp1c2VQcm9ncmFtKCkKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnQuaCBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnQuaAppbmRleCBlMzZmOTk0N2M0M2RjNWY0ZWY0 ODAxN2E3ZGNkMzAwYjI0ZmM5OWM5Li5kNmQzOTNhMTYyNzQ1M2M3ZGRlYTI0MjNhZThhOWZhNGJj NTg0N2ZjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250 LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udC5oCkBAIC0yOTcs NyArMjk3LDcgQEAgcHJpdmF0ZToKICAgICB9CiAKICNpZiBQTEFURk9STShRVCkKLSAgICB2b2lk IGluaXRGb3JtYXRGb3JUZXh0TGF5b3V0KFFUZXh0TGF5b3V0KikgY29uc3Q7CisgICAgdm9pZCBp bml0Rm9ybWF0Rm9yVGV4dExheW91dChRVGV4dExheW91dCosIGNvbnN0IFRleHRSdW4mKSBjb25z dDsKICNlbmRpZgogCiAgICAgc3RhdGljIFR5cGVzZXR0aW5nRmVhdHVyZXMgc19kZWZhdWx0VHlw ZXNldHRpbmdGZWF0dXJlczsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL3F0L0ZvbnRRdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9x dC9Gb250UXQuY3BwCmluZGV4IGUyY2RlNzY1YjE5ODdkZGEwN2QxYmJjY2QwYWI4NTY1Yzc5NTRi NDAuLjk2ZGI1NWM5MmQ4NjM0NTIyNThkNGRkMjU3ZmNkNzA3NzY3ODM1MGQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L0ZvbnRRdC5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvRm9udFF0LmNwcApAQCAtMTgyLDcgKzE4 Miw3IEBAIHZvaWQgRm9udDo6ZHJhd0NvbXBsZXhUZXh0KEdyYXBoaWNzQ29udGV4dCogY3R4LCBj b25zdCBUZXh0UnVuJiBydW4sIGNvbnN0IEZsb2F0CiAgICAgY29uc3QgUVN0cmluZyBzdHJpbmcg PSBmcm9tUmF3RGF0YVdpdGhvdXRSZWYoc2FuaXRpemVkKTsKICAgICBRVGV4dExheW91dCBsYXlv dXQoc3RyaW5nKTsKICAgICBsYXlvdXQuc2V0UmF3Rm9udChyYXdGb250KCkpOwotICAgIGluaXRG b3JtYXRGb3JUZXh0TGF5b3V0KCZsYXlvdXQpOworICAgIGluaXRGb3JtYXRGb3JUZXh0TGF5b3V0 KCZsYXlvdXQsIHJ1bik7CiAgICAgUVRleHRMaW5lIGxpbmUgPSBzZXR1cExheW91dCgmbGF5b3V0 LCBydW4pOwogICAgIGNvbnN0IFFQb2ludEYgYWRqdXN0ZWRQb2ludChwb2ludC54KCksIHBvaW50 LnkoKSAtIGxpbmUuYXNjZW50KCkpOwogCkBAIC0yMDYsMTQgKzIwNiwxMSBAQCBmbG9hdCBGb250 OjpmbG9hdFdpZHRoRm9yQ29tcGxleFRleHQoY29uc3QgVGV4dFJ1biYgcnVuLCBIYXNoU2V0PGNv bnN0IFNpbXBsZUZvbgogCiAgICAgUVRleHRMYXlvdXQgbGF5b3V0KHN0cmluZyk7CiAgICAgbGF5 b3V0LnNldFJhd0ZvbnQocmF3Rm9udCgpKTsKLSAgICBpbml0Rm9ybWF0Rm9yVGV4dExheW91dCgm bGF5b3V0KTsKKyAgICBpbml0Rm9ybWF0Rm9yVGV4dExheW91dCgmbGF5b3V0LCBydW4pOwogICAg IFFUZXh0TGluZSBsaW5lID0gc2V0dXBMYXlvdXQoJmxheW91dCwgcnVuKTsKICAgICBmbG9hdCB4 MSA9IGxpbmUuY3Vyc29yVG9YKDApOwogICAgIGZsb2F0IHgyID0gbGluZS5jdXJzb3JUb1gocnVu Lmxlbmd0aCgpKTsKICAgICBmbG9hdCB3aWR0aCA9IHFBYnMoeDIgLSB4MSk7Ci0gICAgLy8gUmVu ZGVyQmxvY2tMaW5lTGF5b3V0IGV4cGVjdHMgdXMgdG8gb25seSBhZGQgd29yZC1zcGFjaW5nIGZv ciB0cmFpbGluZyBzcGFjZXMsIG5vdCBmb3IgbGVhZGluZyBzcGFjZXMuCi0gICAgaWYgKHRyZWF0 QXNTcGFjZShydW5bMF0pKQotICAgICAgICB3aWR0aCAtPSBtX3dvcmRTcGFjaW5nOwogCiAgICAg cmV0dXJuIHdpZHRoICsgcnVuLmV4cGFuc2lvbigpOwogfQpAQCAtMjI1LDcgKzIyMiw3IEBAIGlu dCBGb250OjpvZmZzZXRGb3JQb3NpdGlvbkZvckNvbXBsZXhUZXh0KGNvbnN0IFRleHRSdW4mIHJ1 biwgZmxvYXQgcG9zaXRpb24sIGJvCiAKICAgICBRVGV4dExheW91dCBsYXlvdXQoc3RyaW5nKTsK ICAgICBsYXlvdXQuc2V0UmF3Rm9udChyYXdGb250KCkpOwotICAgIGluaXRGb3JtYXRGb3JUZXh0 TGF5b3V0KCZsYXlvdXQpOworICAgIGluaXRGb3JtYXRGb3JUZXh0TGF5b3V0KCZsYXlvdXQsIHJ1 bik7CiAgICAgUVRleHRMaW5lIGxpbmUgPSBzZXR1cExheW91dCgmbGF5b3V0LCBydW4pOwogICAg IHJldHVybiBsaW5lLnhUb0N1cnNvcihwb3NpdGlvbik7CiB9CkBAIC0yMzcsNyArMjM0LDcgQEAg RmxvYXRSZWN0IEZvbnQ6OnNlbGVjdGlvblJlY3RGb3JDb21wbGV4VGV4dChjb25zdCBUZXh0UnVu JiBydW4sIGNvbnN0IEZsb2F0UG9pbnQKIAogICAgIFFUZXh0TGF5b3V0IGxheW91dChzdHJpbmcp OwogICAgIGxheW91dC5zZXRSYXdGb250KHJhd0ZvbnQoKSk7Ci0gICAgaW5pdEZvcm1hdEZvclRl eHRMYXlvdXQoJmxheW91dCk7CisgICAgaW5pdEZvcm1hdEZvclRleHRMYXlvdXQoJmxheW91dCwg cnVuKTsKICAgICBRVGV4dExpbmUgbGluZSA9IHNldHVwTGF5b3V0KCZsYXlvdXQsIHJ1bik7CiAK ICAgICBmbG9hdCB4MSA9IGxpbmUuY3Vyc29yVG9YKGZyb20pOwpAQCAtMjQ4LDExICsyNDUsMTcg QEAgRmxvYXRSZWN0IEZvbnQ6OnNlbGVjdGlvblJlY3RGb3JDb21wbGV4VGV4dChjb25zdCBUZXh0 UnVuJiBydW4sIGNvbnN0IEZsb2F0UG9pbnQKICAgICByZXR1cm4gRmxvYXRSZWN0KHB0LngoKSAr IHgxLCBwdC55KCksIHgyIC0geDEsIGgpOwogfQogCi12b2lkIEZvbnQ6OmluaXRGb3JtYXRGb3JU ZXh0TGF5b3V0KFFUZXh0TGF5b3V0KiBsYXlvdXQpIGNvbnN0Cit2b2lkIEZvbnQ6OmluaXRGb3Jt YXRGb3JUZXh0TGF5b3V0KFFUZXh0TGF5b3V0KiBsYXlvdXQsIGNvbnN0IFRleHRSdW4mIHJ1bikg Y29uc3QKIHsKICAgICBRVGV4dExheW91dDo6Rm9ybWF0UmFuZ2UgcmFuZ2U7Ci0gICAgcmFuZ2Uu c3RhcnQgPSAwOwotICAgIHJhbmdlLmxlbmd0aCA9IGxheW91dC0+dGV4dCgpLmxlbmd0aCgpOwor ICAgIC8vIFdlYkNvcmUgZXhwZWN0cyB3b3JkLXNwYWNpbmcgdG8gYmUgaWdub3JlZCBvbiBsZWFk aW5nIHNwYWNlcyBjb250cmFyeSB0byB3aGF0IFF0IGRvZXMuCisgICAgLy8gVG8gYXZvaWQgd29y ZC1zcGFjaW5nIG9uIGFueSBsZWFkaW5nIHNwYWNlcywgd2UgZXhjbHVkZSB0aGVtIGZyb20gRm9y bWF0UmFuZ2Ugd2hpY2gKKyAgICAvLyB3b3JkLXNwYWNpbmcgYWxvbmcgd2l0aCBvdGhlciBvcHRp b25zIHdvdWxkIGJlIGFwcGxpZWQgdG8uIFRoaXMgaXMgc2FmZSBzaW5jZSB0aGUgb3RoZXIKKyAg ICAvLyBmb3JtYXR0aW5nIG9wdGlvbnMgZG9lcyBub3QgYWZmZWN0IHNwYWNlcy4KKyAgICB1bnNp Z25lZCBsZW5ndGggPSBsYXlvdXQtPnRleHQoKS5sZW5ndGgoKTsKKyAgICBmb3IgKHJhbmdlLnN0 YXJ0ID0gMDsgdHJlYXRBc1NwYWNlKHJ1bltyYW5nZS5zdGFydF0pICYmIHJhbmdlLnN0YXJ0IDwg bGVuZ3RoOyArK3JhbmdlLnN0YXJ0KSB7IH0KKyAgICByYW5nZS5sZW5ndGggPSBsZW5ndGggLSBy YW5nZS5zdGFydDsKKwogICAgIGlmIChtX3dvcmRTcGFjaW5nKQogICAgICAgICByYW5nZS5mb3Jt YXQuc2V0Rm9udFdvcmRTcGFjaW5nKG1fd29yZFNwYWNpbmcpOwogICAgIGlmIChtX2xldHRlclNw YWNpbmcpCkBAIC0yNjIsNyArMjY1LDcgQEAgdm9pZCBGb250Ojppbml0Rm9ybWF0Rm9yVGV4dExh eW91dChRVGV4dExheW91dCogbGF5b3V0KSBjb25zdAogICAgIGlmIChpc1NtYWxsQ2FwcygpKQog ICAgICAgICByYW5nZS5mb3JtYXQuc2V0Rm9udENhcGl0YWxpemF0aW9uKFFGb250OjpTbWFsbENh cHMpOwogCi0gICAgaWYgKHJhbmdlLmZvcm1hdC5wcm9wZXJ0eUNvdW50KCkpCisgICAgaWYgKHJh bmdlLmZvcm1hdC5wcm9wZXJ0eUNvdW50KCkgJiYgcmFuZ2UubGVuZ3RoKQogICAgICAgICBsYXlv dXQtPnNldEFkZGl0aW9uYWxGb3JtYXRzKFFMaXN0PFFUZXh0TGF5b3V0OjpGb3JtYXRSYW5nZT4o KSA8PCByYW5nZSk7CiB9CiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xh eW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBkNjRjNjkzNzlkY2FlYzg3NDI2NWM4MzdlOTQzNjMz YTMyMzQ5NmJmLi5iNjQwZjE0ZDA1ZDAyYjRiYmQwNTE4Y2RmNjJkYmM1MmQxNDJiZTk1IDEwMDY0 NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9n CkBAIC0xLDMgKzEsMTIgQEAKKzIwMTMtMDMtMjAgIEFsbGFuIFNhbmRmZWxkIEplbnNlbiAgPGFs bGFuLmplbnNlbkBkaWdpYS5jb20+CisKKyAgICAgICAgW1F0XSBOZXcgZmFzdC90ZXh0L3dvcmQt c3BhY2Utd2l0aC1rZXJuaW5nLTMuaHRtbCBmYWlscyBvbiBRdC4KKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMjY2OAorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogcGxhdGZvcm0vcXQvVGVzdEV4cGVjdGF0 aW9uczoKKwogMjAxMy0wMy0yMCAgU2hlcmlmZiBCb3QgIDx3ZWJraXQucmV2aWV3LmJvdEBnbWFp bC5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjE0NjMzMS4KZGlmZiAt LWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL3F0L1Rlc3RFeHBlY3RhdGlvbnMgYi9MYXlvdXRU ZXN0cy9wbGF0Zm9ybS9xdC9UZXN0RXhwZWN0YXRpb25zCmluZGV4IGY0ZDdjNjJjMmJkYjE4YTM0 MjM4Yjk0MjA1N2Y0ZGJiMDcxY2RlZmEuLjM2OGIzYzdmZDIyN2VjNDhhMGU3ZDUwZmZkODY2NjYy N2Q0NDNhNjIgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3BsYXRmb3JtL3F0L1Rlc3RFeHBlY3Rh dGlvbnMKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vcXQvVGVzdEV4cGVjdGF0aW9ucwpAQCAt MTgyMiw4ICsxODIyLDYgQEAgZmFzdC90ZXh0L2VtcGhhc2lzLWF2b2lkLXJ1YnkuaHRtbAogIyBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODAyOTMKIGZhc3QvdGV4dC9p bnRlcm5hdGlvbmFsL3NwYWNlcy1jb21iaW5lZC1pbi12ZXJ0aWNhbC10ZXh0Lmh0bWwKIAotd2Vi a2l0Lm9yZy9iLzExMjY2OCBmYXN0L3RleHQvd29yZC1zcGFjZS13aXRoLWtlcm5pbmctMy5odG1s IFsgU2tpcCBdCi0KIGZhc3Qvd3JpdGluZy1tb2RlL2JvcmRlci1zdHlsZXMtdmVydGljYWwtbHIu aHRtbAogZmFzdC93cml0aW5nLW1vZGUvYm9yZGVyLXN0eWxlcy12ZXJ0aWNhbC1ybC5odG1sCiAK