176351 2017-09-05 00:29:49 -0700 [GTK] Bump freetype version to 2.8.0 2017-09-07 03:43:25 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=102374 Gtk P2 Normal --- 176501 149703 170500 1 cgarcia webkit-unassigned behdad bugs-noreply buildbot clopez fred.wang fujii mcatanzaro mmaxfield mrobinson zan oldest_to_newest 1345362 0 cgarcia 2017-09-05 00:29:49 -0700 Freetype 2.8.0 was released in February and it's the latest stable version. Upgrading freetype usually requires a major rebaseline of the tests, so it's better to upgrade to something newer. 1345529 1 cgarcia 2017-09-05 11:15:35 -0700 I've been working on this and I've realized that after the 2.8 upgrade we have some failures that don't look correct. The problem is not new, though see bug #102374. That bug was closed because a patch was added for freetype 2.4.11, it was a cherry-pick of a freetype commit (http://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=e0469372be3870a5ad60b2c4586e9c281357bd28), but that was reverted in freetype just a few revisions later (http://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=87dc86d68c93c2b5b836501ece57583d1d6d1a2e), so when upgrading to 2.8 I decided not to include the patch. So, with 2.8 now we are getting: ascent: 15.000000, descent: 4.000000, height: 18.000000 while with previous patched version we got: ascent: 14.000000, descent: 3.000000, height: 17.000000 this means that now ascent + descent > height and we are getting a lineGap of -1. I don't want to keep using a patch that has been reverted upstream. This patch is also the reason why we get different results in many layout tests when not using the internal jhbuild. Also, I don't know why, but I tried to backport the patch to 2.8 just to check what happened and I was still getting -1, so that's no longer a solution. I'm not a fonts expert but the problem seems to be the rounding done by cairo when using hint metrics. When not using them what we get is: ascent: 14.257812, descent: 3.460938, height: 18.398438 where ascent + descent <= height and we get a line gap of 0.679688 I think we have several options here: a) Try to clamp the line gap to be 0 when we get a negative value b) Create a temporary cairo font with hint metrics disable only to get the metrics (this is the patch proposed by Dominik in bug #102374). c) Use freetype api directly to get the metrics instead of cairo. I don't know if these are valid solutions or if there's a better one. Thoughts? 1345881 2 320008 cgarcia 2017-09-06 04:39:44 -0700 Created attachment 320008 Patch This patch upgrades to 2.8 and removes the patch we were using. Instead it uses Dominiks's patch (slightly modified just ot use smart pointers and a fe other cosmetic changes). With this I'm getting 5886 failures. The differences are changes in the text height in 1px. I'm preparing the rebaseline in blocks. 1345896 3 cgarcia 2017-09-06 06:02:13 -0700 I have the rebaselines ready in 7 patches: $ ls -lh 000*.patch -rw-r--r-- 1 cgarcia cgarcia 36M sep 6 14:55 0001-rebaseline-1.patch -rw-r--r-- 1 cgarcia cgarcia 20M sep 6 14:55 0002-rebaseline-2.patch -rw-r--r-- 1 cgarcia cgarcia 27M sep 6 14:55 0003-rebaseline-3.patch -rw-r--r-- 1 cgarcia cgarcia 42M sep 6 14:55 0004-rebaseline-4.patch -rw-r--r-- 1 cgarcia cgarcia 32M sep 6 14:55 0005-rebaseline-5.patch -rw-r--r-- 1 cgarcia cgarcia 39M sep 6 14:56 0006-rebaseline-6.patch -rw-r--r-- 1 cgarcia cgarcia 42M sep 6 14:56 0007-rebaseline-7.patch Hopefully future freetype upgrades will not be so painful now that we don't patch it anymore. 1345907 4 320008 clopez 2017-09-06 06:39:22 -0700 Comment on attachment 320008 Patch Thanks! getting rid of patches on our jhbuild is always a good thing. 1345918 5 cgarcia 2017-09-06 08:11:06 -0700 Committed r221670: <http://trac.webkit.org/changeset/221670> 1346191 6 mcatanzaro 2017-09-06 18:28:03 -0700 This killed the WPE bot :( 1346228 7 cgarcia 2017-09-06 22:02:37 -0700 (In reply to Michael Catanzaro from comment #6) > This killed the WPE bot :( hmm, right, they are also using the freetype 2.4.11 patch. As a workaround we could ifdef the code introduced in this patch. Then I suggests someone bumps freetype to 2.8 in wpe as well, removing the patch and ifdefs and then rebaselining. Not fun at all :-( 1346254 8 clopez 2017-09-07 03:42:32 -0700 (In reply to Carlos Garcia Campos from comment #7) > (In reply to Michael Catanzaro from comment #6) > > This killed the WPE bot :( > > hmm, right, they are also using the freetype 2.4.11 patch. As a workaround > we could ifdef the code introduced in this patch. Then I suggests someone > bumps freetype to 2.8 in wpe as well, removing the patch and ifdefs and then > rebaselining. Not fun at all :-( I think we can do this now, not need to ifdef the code. 320008 2017-09-06 04:39:44 -0700 2017-09-06 06:39:22 -0700 Patch wk-freetype.diff text/plain 7519 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA5N2MyOGIwMmUyYy4uNDdkMTM1YjI4MTQgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMSBAQAorMjAxNy0wOS0wNiAgRG9taW5payBSw7Z0dHNjaGVzICA8ZG9taW5pay5yb3R0 c2NoZXNAaW50ZWwuY29tPgorCisgICAgICAgIFtHVEtdIEJ1bXAgZnJlZXR5cGUgdmVyc2lvbiB0 byAyLjguMAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTc2MzUxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg UmV0cmlldmluZyBsaW5lIHNwYWNpbmcgaW5mbyB3aXRob3V0IG1ldHJpY3MgaGludGluZyAtIEZy ZWVUeXBlJ3MgbWV0cmljIGhpbnRpbmcKKyAgICAgICAgdXNlcyByb3VuZGluZyB3aGljaCByZXN1 bHRzIGluIHRoZSBzdW0gb2YgYXNjZW50IGFuZCBkZXNjZW50IGJlaW5nIGxhcmdlcgorICAgICAg ICB0aGFuIHRoZSBsaW5lIGhlaWdodC4gVG8gd29yayBhcm91bmQgdGhpcyB3aXRob3V0IGdsb2Jh bGx5IGRpc2FibGluZyBmb250IG1ldHJpY3MKKyAgICAgICAgaGludGluZywgSSBhbSB0ZW1wb3Jh cmlseSBjcmVhdGluZyBhIG5ldyBjYWlybyBzY2FsZWQgZm9udCB3aXRoIG1ldHJpY3MgaGludGlu ZworICAgICAgICBvZmYgYW5kIHJldHJpZXZpbmcgdGhlIGhlaWdodCB2YWx1ZXMgZnJvbSB0aGlz IG9uZS4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2ZyZWV0eXBlL1NpbXBsZUZvbnRE YXRhRnJlZVR5cGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6c2NhbGVkRm9udFdpdGhvdXRNZXRy aWNzSGludGluZyk6IE5ldyBmdW5jdGlvbiB0byBjbG9uZSB0aGUgZXhpc3RpbmcgZm9udCwgb25s eSB3aXRoIG1ldHJpY3MgaGludGluZworICAgICAgICBkaXNhYmxlZC4KKyAgICAgICAgKFdlYkNv cmU6OkZvbnQ6OnBsYXRmb3JtSW5pdCk6IEdldCBoZWlnaHQgaW5mbyBmcm9tIG5vbi1tZXRyaWNz IGhpbnRlZCBmb250LCBkaXNhYmxlIHJvdW5kaW5nIGZvciBsaW5lc3BhY2luZy4KKwogMjAxNy0w OS0wNCAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAgIFVzZSBTdHJp bmdWaWV3IG1vcmUgaW4gRE9NRmlsZVN5c3RlbSBjb2RlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9mcmVldHlwZS9TaW1wbGVGb250RGF0YUZyZWVUeXBlLmNw cCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2ZyZWV0eXBlL1NpbXBsZUZvbnRE YXRhRnJlZVR5cGUuY3BwCmluZGV4IDY2YjEwZjExNzQ3Li5kNjhhYzE4ZGFkNyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZnJlZXR5cGUvU2ltcGxlRm9udERh dGFGcmVlVHlwZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZnJl ZXR5cGUvU2ltcGxlRm9udERhdGFGcmVlVHlwZS5jcHAKQEAgLTMzLDYgKzMzLDcgQEAKICNpbmNs dWRlICJjb25maWcuaCIKICNpbmNsdWRlICJGb250LmgiCiAKKyNpbmNsdWRlICJDYWlyb1VuaXF1 ZVB0ci5oIgogI2luY2x1ZGUgIkNhaXJvVXRpbGl0aWVzLmgiCiAjaW5jbHVkZSAiRmxvYXRDb252 ZXJzaW9uLmgiCiAjaW5jbHVkZSAiRmxvYXRSZWN0LmgiCkBAIC00MCw2ICs0MSw3IEBACiAjaW5j bHVkZSAiRm9udERlc2NyaXB0aW9uLmgiCiAjaW5jbHVkZSAiR2x5cGhCdWZmZXIuaCIKICNpbmNs dWRlICJPcGVuVHlwZVR5cGVzLmgiCisjaW5jbHVkZSAiUmVmUHRyQ2Fpcm8uaCIKICNpbmNsdWRl ICJVVEYxNlVDaGFyMzJJdGVyYXRvci5oIgogI2luY2x1ZGUgPGNhaXJvLWZ0Lmg+CiAjaW5jbHVk ZSA8Y2Fpcm8uaD4KQEAgLTUyLDE0ICs1NCwzMCBAQAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAK K3N0YXRpYyBSZWZQdHI8Y2Fpcm9fc2NhbGVkX2ZvbnRfdD4gc2NhbGVkRm9udFdpdGhvdXRNZXRy aWNzSGludGluZyhjYWlyb19zY2FsZWRfZm9udF90KiBzY2FsZWRGb250KQoreworICAgIENhaXJv VW5pcXVlUHRyPGNhaXJvX2ZvbnRfb3B0aW9uc190PiBmb250T3B0aW9ucyhjYWlyb19mb250X29w dGlvbnNfY3JlYXRlKCkpOworICAgIGNhaXJvX3NjYWxlZF9mb250X2dldF9mb250X29wdGlvbnMo c2NhbGVkRm9udCwgZm9udE9wdGlvbnMuZ2V0KCkpOworICAgIGNhaXJvX2ZvbnRfb3B0aW9uc19z ZXRfaGludF9tZXRyaWNzKGZvbnRPcHRpb25zLmdldCgpLCBDQUlST19ISU5UX01FVFJJQ1NfT0ZG KTsKKyAgICBjYWlyb19tYXRyaXhfdCBmb250TWF0cml4OworICAgIGNhaXJvX3NjYWxlZF9mb250 X2dldF9mb250X21hdHJpeChzY2FsZWRGb250LCAmZm9udE1hdHJpeCk7CisgICAgY2Fpcm9fbWF0 cml4X3QgZm9udENUTTsKKyAgICBjYWlyb19zY2FsZWRfZm9udF9nZXRfY3RtKHNjYWxlZEZvbnQs ICZmb250Q1RNKTsKKyAgICByZXR1cm4gYWRvcHRSZWYoY2Fpcm9fc2NhbGVkX2ZvbnRfY3JlYXRl KGNhaXJvX3NjYWxlZF9mb250X2dldF9mb250X2ZhY2Uoc2NhbGVkRm9udCksICZmb250TWF0cml4 LCAmZm9udENUTSwgZm9udE9wdGlvbnMuZ2V0KCkpKTsKK30KKwogdm9pZCBGb250OjpwbGF0Zm9y bUluaXQoKQogewogICAgIGlmICghbV9wbGF0Zm9ybURhdGEuc2l6ZSgpKQogICAgICAgICByZXR1 cm47CiAKICAgICBBU1NFUlQobV9wbGF0Zm9ybURhdGEuc2NhbGVkRm9udCgpKTsKKyAgICAvLyBU ZW1wb3JhcmlseSBjcmVhdGUgYSBjbG9uZSB0aGF0IGRvZXNuJ3QgaGF2ZSBtZXRyaWNzIGhpbnRp bmcgaW4gb3JkZXIgdG8gYXZvaWQgaW5jb3JyZWN0CisgICAgLy8gcm91bmRpbmcgcmVzdWx0aW5n IGluIGluY29ycmVjdCBiYXNlbGluZSBwb3NpdGlvbmluZyBzaW5jZSB0aGUgc3VtIG9mIGFzY2Vu dCBhbmQgZGVzY2VudAorICAgIC8vIGJlY29tZXMgbGFyZ2VyIHRoYW4gdGhlIGxpbmUgaGVpZ2h0 LgorICAgIGF1dG8gZm9udFdpdGhvdXRNZXRyaWNzSGludGluZyA9IHNjYWxlZEZvbnRXaXRob3V0 TWV0cmljc0hpbnRpbmcobV9wbGF0Zm9ybURhdGEuc2NhbGVkRm9udCgpKTsKICAgICBjYWlyb19m b250X2V4dGVudHNfdCBmb250RXh0ZW50czsKLSAgICBjYWlyb19zY2FsZWRfZm9udF9leHRlbnRz KG1fcGxhdGZvcm1EYXRhLnNjYWxlZEZvbnQoKSwgJmZvbnRFeHRlbnRzKTsKKyAgICBjYWlyb19z Y2FsZWRfZm9udF9leHRlbnRzKGZvbnRXaXRob3V0TWV0cmljc0hpbnRpbmcuZ2V0KCksICZmb250 RXh0ZW50cyk7CiAKICAgICBmbG9hdCBhc2NlbnQgPSBuYXJyb3dQcmVjaXNpb25Ub0Zsb2F0KGZv bnRFeHRlbnRzLmFzY2VudCk7CiAgICAgZmxvYXQgZGVzY2VudCA9IG5hcnJvd1ByZWNpc2lvblRv RmxvYXQoZm9udEV4dGVudHMuZGVzY2VudCk7CkBAIC04OCw5ICsxMDYsNyBAQCB2b2lkIEZvbnQ6 OnBsYXRmb3JtSW5pdCgpCiAgICAgbV9mb250TWV0cmljcy5zZXRBc2NlbnQoYXNjZW50KTsKICAg ICBtX2ZvbnRNZXRyaWNzLnNldERlc2NlbnQoZGVzY2VudCk7CiAgICAgbV9mb250TWV0cmljcy5z ZXRDYXBIZWlnaHQoY2FwSGVpZ2h0KTsKLQotICAgIC8vIE1hdGNoIENvcmVHcmFwaGljcyBtZXRy aWNzLgotICAgIG1fZm9udE1ldHJpY3Muc2V0TGluZVNwYWNpbmcobHJvdW5kZihhc2NlbnQpICsg bHJvdW5kZihkZXNjZW50KSArIGxyb3VuZGYobGluZUdhcCkpOworICAgIG1fZm9udE1ldHJpY3Mu c2V0TGluZVNwYWNpbmcoYXNjZW50ICsgZGVzY2VudCArIGxpbmVHYXApOwogICAgIG1fZm9udE1l dHJpY3Muc2V0TGluZUdhcChsaW5lR2FwKTsKIAogICAgIGNhaXJvX3RleHRfZXh0ZW50c190IHRl eHRFeHRlbnRzOwpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9n CmluZGV4IGVjNGRmZWU1NDYyLi5mZTRjYzQ0Y2JlNiAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdl TG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDE3LTA5LTA2ICBD YXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1RL XSBCdW1wIGZyZWV0eXBlIHZlcnNpb24gdG8gMi44LjAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3NjM1MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlbW92ZSB0aGUgcGF0Y2ggd2Ugd2VyZSB1c2luZyBz aW5jZSBpdCB3YXMgcmV2ZXJ0ZWQgdXBzdHJlYW0uCisKKyAgICAgICAgKiBndGsvamhidWlsZC5t b2R1bGVzOgorICAgICAgICAqIGd0ay9wYXRjaGVzL2ZyZWV0eXBlNi0yLjQuMTEtdHJ1ZXR5cGUt Zm9udC1oZWlnaHQtZml4LnBhdGNoOiBSZW1vdmVkLgorCiAyMDE3LTA5LTA1ICBDYXJsb3MgR2Fy Y2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1RLXSBXcm9uZyB1 c2Ugb2YgUExVR0lOX0FSQ0hJVEVDVFVSRShYMTEpIGluIHNldmVyYWwgcGxhY2VzCmRpZmYgLS1n aXQgYS9Ub29scy9ndGsvamhidWlsZC5tb2R1bGVzIGIvVG9vbHMvZ3RrL2poYnVpbGQubW9kdWxl cwppbmRleCAxZDQ5OThjNzkwYy4uMmQ2MWQwNGI3Y2QgMTAwNjQ0Ci0tLSBhL1Rvb2xzL2d0ay9q aGJ1aWxkLm1vZHVsZXMKKysrIGIvVG9vbHMvZ3RrL2poYnVpbGQubW9kdWxlcwpAQCAtMTE5LDEy ICsxMTksOSBAQAogICA8L2F1dG90b29scz4KIAogICA8YXV0b3Rvb2xzIGlkPSJmcmVldHlwZTYi IGF1dG9nZW4tc2g9ImNvbmZpZ3VyZSI+Ci0gICAgPGJyYW5jaCBtb2R1bGU9ImZyZWV0eXBlL2Zy ZWV0eXBlLTIuNC4xMS50YXIuYnoyIiB2ZXJzaW9uPSIyLjQuMTEiCisgICAgPGJyYW5jaCBtb2R1 bGU9ImZyZWV0eXBlL2ZyZWV0eXBlLTIuOC50YXIuYnoyIiB2ZXJzaW9uPSIyLjgiCiAgICAgICAg ICAgICByZXBvPSJzYXZhbm5haC5nbnUub3JnIgotICAgICAgICAgICAgaGFzaD0ic2hhMjU2OmVm OWQwYmNiNjQ2NDdkOWU1MTI1ZGM3NTM0ZDdjYTM3MWM5ODMxMGZlYzg3Njc3YzQxMGYzOTdmNzFm ZmJlM2YiCi0gICAgICAgICAgICBtZDVzdW09ImI5MzQzNTQ4ODk0MjQ4NmM4ZDBjYTIyZThmNzY4 MDM0Ij4KLSAgICAgIDxwYXRjaCBmaWxlPSJmcmVldHlwZTYtMi40LjExLXRydWV0eXBlLWZvbnQt aGVpZ2h0LWZpeC5wYXRjaCIgc3RyaXA9IjEiLz4KLSAgICA8L2JyYW5jaD4KKyAgICAgICAgICAg IGhhc2g9InNoYTI1NjphM2M2MDNlZDg0YzNjMjQ5NWY5YzkzMzFmZTZiYmEzYmIwZWU2NWUwNmVj MzMxZTBhMGZiNTIxNTgyOTFiNDBiIi8+CiAgIDwvYXV0b3Rvb2xzPgogCiAgIDxhdXRvdG9vbHMg aWQ9ImhhcmZidXp6IiBhdXRvZ2VuLXNoPSJjb25maWd1cmUiPgpkaWZmIC0tZ2l0IGEvVG9vbHMv Z3RrL3BhdGNoZXMvZnJlZXR5cGU2LTIuNC4xMS10cnVldHlwZS1mb250LWhlaWdodC1maXgucGF0 Y2ggYi9Ub29scy9ndGsvcGF0Y2hlcy9mcmVldHlwZTYtMi40LjExLXRydWV0eXBlLWZvbnQtaGVp Z2h0LWZpeC5wYXRjaApkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMGZmZTc2YjRlZjAu LjAwMDAwMDAwMDAwCi0tLSBhL1Rvb2xzL2d0ay9wYXRjaGVzL2ZyZWV0eXBlNi0yLjQuMTEtdHJ1 ZXR5cGUtZm9udC1oZWlnaHQtZml4LnBhdGNoCisrKyAvZGV2L251bGwKQEAgLTEsMzkgKzAsMCBA QAotRnJvbSBlMDQ2OTM3MmJlMzg3MGE1YWQ2MGIyYzQ1ODZlOWMyODEzNTdiZDI4IE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQotRnJvbTogV2VybmVyIExlbWJlcmcgPHdsQGdudS5vcmc+Ci1EYXRl OiBUdWUsIDIyIEphbiAyMDEzIDEwOjA3OjA3ICswMDAwCi1TdWJqZWN0OiBbdHJ1ZXR5cGVdIEZp eCBmb250IGhlaWdodC4KLQotKiBzcmMvdHJ1ZXR5cGUvdHRvYmpzLmMgKHR0X3NpemVfcmVzZXQp OiBUaGUgV2luZG93cyByZW5kZXJpbmcKLWVuZ2luZSB1c2VzIHJvdW5kZWQgdmFsdWVzIG9mIHRo ZSBhc2NlbmRlciBhbmQgZGVzY2VuZGVyIHRvIGNvbXB1dGUKLXRoZSBUcnVlVHlwZSBmb250IGhl aWdodC4KLS0tLQotZGlmZiAtLWdpdCBhL3NyYy90cnVldHlwZS90dG9ianMuYyBiL3NyYy90cnVl dHlwZS90dG9ianMuYwotaW5kZXggYzYxYjIxOC4uNTkwYjY2YyAxMDA2NDQKLS0tLSBhL3NyYy90 cnVldHlwZS90dG9ianMuYwotKysrIGIvc3JjL3RydWV0eXBlL3R0b2Jqcy5jCi1AQCAtNCw3ICs0 LDcgQEAKLSAvKiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAqLwotIC8qICAgIE9iamVjdHMgbWFuYWdlciAoYm9k eSkuICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICovCi0gLyog ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgKi8KLS0vKiAgQ29weXJpZ2h0IDE5OTYtMjAxMiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAqLwotKy8qICBDb3B5cmlnaHQg MTk5Ni0yMDEzICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICovCi0gLyogIERhdmlkIFR1cm5lciwgUm9iZXJ0IFdpbGhlbG0sIGFuZCBXZXJuZXIgTGVt YmVyZy4gICAgICAgICAgICAgICAgICAgICAgKi8KLSAvKiAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAqLwotIC8q ICBUaGlzIGZpbGUgaXMgcGFydCBvZiB0aGUgRnJlZVR5cGUgcHJvamVjdCwgYW5kIG1heSBvbmx5 IGJlIHVzZWQsICAgICAgICovCi1AQCAtMTE3NywxMSArMTE3NywxMiBAQAotICAgICAgICAgRlRf UElYX1JPVU5EKCBGVF9NdWxGaXgoIGZhY2UtPnJvb3QuYXNjZW5kZXIsIG1ldHJpY3MtPnlfc2Nh bGUgKSApOwotICAgICAgIG1ldHJpY3MtPmRlc2NlbmRlciA9Ci0gICAgICAgICBGVF9QSVhfUk9V TkQoIEZUX011bEZpeCggZmFjZS0+cm9vdC5kZXNjZW5kZXIsIG1ldHJpY3MtPnlfc2NhbGUgKSAp OwotLSAgICAgIG1ldHJpY3MtPmhlaWdodCA9Ci0tICAgICAgICBGVF9QSVhfUk9VTkQoIEZUX011 bEZpeCggZmFjZS0+cm9vdC5oZWlnaHQsIG1ldHJpY3MtPnlfc2NhbGUgKSApOwotICAgICAgIG1l dHJpY3MtPm1heF9hZHZhbmNlID0KLSAgICAgICAgIEZUX1BJWF9ST1VORCggRlRfTXVsRml4KCBm YWNlLT5yb290Lm1heF9hZHZhbmNlX3dpZHRoLAotICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIG1ldHJpY3MtPnhfc2NhbGUgKSApOwotKwotKyAgICAgIC8qIHRoZSBoZWlnaHQgaXMg ZGVyaXZlZCBmcm9tIHJvdW5kZWQgdmFsdWVzICovCi0rICAgICAgbWV0cmljcy0+aGVpZ2h0ID0g bWV0cmljcy0+YXNjZW5kZXIgLSBtZXRyaWNzLT5kZXNjZW5kZXI7Ci0gICAgIH0KLSAKLSAgICAg LyogY29tcHV0ZSBuZXcgdHJhbnNmb3JtYXRpb24gKi8KLS0tCi1jZ2l0IHYwLjkuMC4yCg==