93327 2012-08-06 19:41:58 -0700 style->fontMetrics() should be available when setting line-height 2012-08-28 22:10:47 -0700 1 1 1 Unclassified WebKit Canvas 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 bashi bashi darin jchaffraix webkit.review.bot oldest_to_newest 688705 0 bashi 2012-08-06 19:41:58 -0700 See http://crbug.com/137842 and https://bugs.webkit.org/show_bug.cgi?id=66291. Looks like r96122 wasn't enough. We also need to make sure that fontMetrics are available when setting line-height. 688721 1 156843 bashi 2012-08-06 19:54:19 -0700 Created attachment 156843 Patch 688723 2 bashi 2012-08-06 19:56:21 -0700 Hi Julien, Could you take a look? 689220 3 jchaffraix 2012-08-07 11:27:34 -0700 > Could you take a look? I am not super familiar with the whole logic but can take a look. My main concern is that this is a whack-a-mole game - that I perpetuated - that we are not winning. It should be time to re-think the way we handle fonts and do something saner. 689380 4 156843 darin 2012-08-07 14:24:01 -0700 Comment on attachment 156843 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=156843&action=review > Source/WebCore/ChangeLog:10 > + Setting line-height assumes the fontMetrics are available for the affected font, but > + the fontMetrics won't be available immediately after setting other properties like > + font-size. Call styleResolver->updateFont() before setting line-height to update fontMetrics. What is the performance effect of this second updateFont call? Do we need to make additional changes to keep performance of the canvas text feature acceptable? How do we compare to other browser engines on performance of selecting multiple fonts and drawing them with canvas? > Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp:2019 > // The updateFont() call below updates the fontMetrics and ensures the proper setting of font-size. Please update this sentence too, since the words “call” and “updates” should be changed since there are not multiple updateFont calls. 691018 5 157352 bashi 2012-08-08 17:45:45 -0700 Created attachment 157352 Patch 691021 6 bashi 2012-08-08 17:50:07 -0700 (In reply to comment #3) > > Could you take a look? > > I am not super familiar with the whole logic but can take a look. My main concern is that this is a whack-a-mole game - that I perpetuated - that we are not winning. It should be time to re-think the way we handle fonts and do something saner. I agree, but it will take time and this is a crash bug so I'd like to land the patch at this time. I'm not familiar with CSS implementation so I don't have good idea to handle this problem, but if you (or CSS area reviewers) can give me some advices, I can work on this. 691022 7 bashi 2012-08-08 17:51:48 -0700 Thank you for review, Darin. (In reply to comment #4) > What is the performance effect of this second updateFont call? Do we need to make additional changes to keep performance of the canvas text feature acceptable? How do we compare to other browser engines on performance of selecting multiple fonts and drawing them with canvas? I did quick performance test with the below code: <canvas id="canvas"></canvas> <div id="result"></div> <script> if (window.testRunner) testRunner.dumpAsText(); var ctx = document.getElementById('canvas').getContext('2d'); function test() { var start = Date.now(); for (var i = 0; i < 100000; ++i) ctx.font = "G"; var end = Date.now(); return end - start; } var total = 0; for (var i = 0; i < 10; ++i) total += test(); document.getElementById('result').innerHTML = '' + (total / 10); </script> Here is the results of chromium linux port release build DRT on my machine. Results aren't stable so I checked 10 times. Not applied 398.4 234.4 380.3 243.3 231.2 380.4 377.2 238.1 394.8 351.4 404.7 Applied 408.7 398.5 425.3 380.4 237.1 240.9 240.8 233.7 396.6 241 243.4 I think the performance effect of this patch isn't significant. I also ran the test on Firefox 14 several times. It takes 800+ms every time. > Please update this sentence too, since the words “call” and “updates” should be changed since there are not multiple updateFont calls. Done. 693341 8 bashi 2012-08-12 17:00:51 -0700 Hi Darin and Julien, Could you take another look? 706983 9 bashi 2012-08-28 18:48:56 -0700 (In reply to comment #8) > Hi Darin and Julien, > > Could you take another look? Ping agein. Darin, Julien? 707090 10 157352 webkit.review.bot 2012-08-28 22:10:44 -0700 Comment on attachment 157352 Patch Clearing flags on attachment: 157352 Committed r126959: <http://trac.webkit.org/changeset/126959> 707092 11 webkit.review.bot 2012-08-28 22:10:47 -0700 All reviewed patches have been landed. Closing bug. 156843 2012-08-06 19:54:19 -0700 2012-08-08 17:45:41 -0700 Patch bug-93327-20120807115354.patch text/plain 3960 bashi U3VidmVyc2lvbiBSZXZpc2lvbjogMTI0ODIzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGI5MDRiYjcwZDdlZDVm ODJmYWUxNjE1Y2RjNGFjYTZlMTRhNjhlMC4uNDIyMGI1YjAyMmVmN2UyNDVjZGEyOTE2ZGYzMmY3 NTI0NDNkNzI2ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEyLTA4LTA2ICBLZW5p Y2hpIElzaGliYXNoaSAgPGJhc2hpQGNocm9taXVtLm9yZz4KKworICAgICAgICBzdHlsZS0+Zm9u dE1ldHJpY3MoKSBzaG91bGQgYmUgYXZhaWxhYmxlIHdoZW4gc2V0dGluZyBsaW5lLWhlaWdodAor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTMzMjcKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTZXR0aW5nIGxp bmUtaGVpZ2h0IGFzc3VtZXMgdGhlIGZvbnRNZXRyaWNzIGFyZSBhdmFpbGFibGUgZm9yIHRoZSBh ZmZlY3RlZCBmb250LCBidXQKKyAgICAgICAgdGhlIGZvbnRNZXRyaWNzIHdvbid0IGJlIGF2YWls YWJsZSBpbW1lZGlhdGVseSBhZnRlciBzZXR0aW5nIG90aGVyIHByb3BlcnRpZXMgbGlrZQorICAg ICAgICBmb250LXNpemUuIENhbGwgc3R5bGVSZXNvbHZlci0+dXBkYXRlRm9udCgpIGJlZm9yZSBz ZXR0aW5nIGxpbmUtaGVpZ2h0IHRvIHVwZGF0ZSBmb250TWV0cmljcy4KKworICAgICAgICBBZGRl ZCBhIHRlc3QgY2FzZSB0byBmYXN0L2NhbnZhcy9jcmFzaC1zZXQtZm9udC5odG1sLgorCisgICAg ICAgICogaHRtbC9jYW52YXMvQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJELmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OkNhbnZhc1JlbmRlcmluZ0NvbnRleHQyRDo6c2V0Rm9udCk6CisgICAgICAgIENh bGwgc3R5bGVSZXNvbHZlci0+dXBkYXRlRm9udCgpIGJlZm9yZSBzdHlsZVJlc29sdmVyLT5hcHBs eVByb3BlcnR5VG9DdXJyZW50U3R5bGUoQ1NTUHJvcGVydHlMaW5lSGVpZ2h0LC4uLikKKwogMjAx Mi0wOC0wNiAgTWF4IFZ1am92aWMgIDxtdnVqb3ZpY0BhZG9iZS5jb20+CiAKICAgICAgICAgW0NT UyBTaGFkZXJzXSBQYXJzZSBtaXggZnVuY3Rpb24KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2h0bWwvY2FudmFzL0NhbnZhc1JlbmRlcmluZ0NvbnRleHQyRC5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9odG1sL2NhbnZhcy9DYW52YXNSZW5kZXJpbmdDb250ZXh0MkQuY3BwCmluZGV4IGFjZWQwYmQw YjVmMjgyYjk3NjJlNzgzZjU4MzYwNGJhNWMyOWE4MTEuLjQ4NmIyN2VmNWYyMjVmNzE0NjlmZTU5 OWU4MjExMmFiY2E1YTQ3NWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFz L0NhbnZhc1JlbmRlcmluZ0NvbnRleHQyRC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9j YW52YXMvQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJELmNwcApAQCAtMjAxNCwxMSArMjAxNCwxMiBA QCB2b2lkIENhbnZhc1JlbmRlcmluZ0NvbnRleHQyRDo6c2V0Rm9udChjb25zdCBTdHJpbmcmIG5l d0ZvbnQpCiAgICAgc3R5bGVSZXNvbHZlci0+YXBwbHlQcm9wZXJ0eVRvQ3VycmVudFN0eWxlKENT U1Byb3BlcnR5Rm9udFZhcmlhbnQsIHBhcnNlZFN0eWxlLT5nZXRQcm9wZXJ0eUNTU1ZhbHVlKENT U1Byb3BlcnR5Rm9udFZhcmlhbnQpLmdldCgpKTsKICAgICBzdHlsZVJlc29sdmVyLT5hcHBseVBy b3BlcnR5VG9DdXJyZW50U3R5bGUoQ1NTUHJvcGVydHlGb250V2VpZ2h0LCBwYXJzZWRTdHlsZS0+ Z2V0UHJvcGVydHlDU1NWYWx1ZShDU1NQcm9wZXJ0eUZvbnRXZWlnaHQpLmdldCgpKTsKIAotICAg IC8vIEFzIGRlc2NyaWJlZCBpbiBCVUc2NjI5MSwgc2V0dGluZyBmb250LXNpemUgb24gYSBmb250 IG1heSBlbnRhaWwgYSBDU1NQcmltaXRpdmVWYWx1ZTo6Y29tcHV0ZUxlbmd0aERvdWJsZSBjYWxs LAorICAgIC8vIEFzIGRlc2NyaWJlZCBpbiBCVUc2NjI5MSwgc2V0dGluZyBmb250LXNpemUgYW5k IGxpbmUtaGVpZ2h0IG9uIGEgZm9udCBtYXkgZW50YWlsIGEgQ1NTUHJpbWl0aXZlVmFsdWU6OmNv bXB1dGVMZW5ndGhEb3VibGUgY2FsbCwKICAgICAvLyB3aGljaCBhc3N1bWVzIHRoZSBmb250TWV0 cmljcyBhcmUgYXZhaWxhYmxlIGZvciB0aGUgYWZmZWN0ZWQgZm9udCwgb3RoZXJ3aXNlIGEgY3Jh c2ggb2NjdXJzIChzZWUgaHR0cDovL3RyYWMud2Via2l0Lm9yZy9jaGFuZ2VzZXQvOTYxMjIpLgog ICAgIC8vIFRoZSB1cGRhdGVGb250KCkgY2FsbCBiZWxvdyB1cGRhdGVzIHRoZSBmb250TWV0cmlj cyBhbmQgZW5zdXJlcyB0aGUgcHJvcGVyIHNldHRpbmcgb2YgZm9udC1zaXplLgogICAgIHN0eWxl UmVzb2x2ZXItPnVwZGF0ZUZvbnQoKTsKICAgICBzdHlsZVJlc29sdmVyLT5hcHBseVByb3BlcnR5 VG9DdXJyZW50U3R5bGUoQ1NTUHJvcGVydHlGb250U2l6ZSwgcGFyc2VkU3R5bGUtPmdldFByb3Bl cnR5Q1NTVmFsdWUoQ1NTUHJvcGVydHlGb250U2l6ZSkuZ2V0KCkpOworICAgIHN0eWxlUmVzb2x2 ZXItPnVwZGF0ZUZvbnQoKTsKICAgICBzdHlsZVJlc29sdmVyLT5hcHBseVByb3BlcnR5VG9DdXJy ZW50U3R5bGUoQ1NTUHJvcGVydHlMaW5lSGVpZ2h0LCBwYXJzZWRTdHlsZS0+Z2V0UHJvcGVydHlD U1NWYWx1ZShDU1NQcm9wZXJ0eUxpbmVIZWlnaHQpLmdldCgpKTsKIAogICAgIG1vZGlmaWFibGVT dGF0ZSgpLm1fZm9udCA9IG5ld1N0eWxlLT5mb250KCk7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggNTc3Njg1MDRlYjZlOGJk MThiN2NlMDM4ZTZmM2VkMzkyNGQ4YWI5ZS4uMzQyMmQzOGE3ZmZmYTYzMGUyOWNkNzU2YjQwODBj ODNiYmMxYTcyOSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91 dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEyIEBACisyMDEyLTA4LTA2ICBLZW5pY2hpIElz aGliYXNoaSAgPGJhc2hpQGNocm9taXVtLm9yZz4KKworICAgICAgICBzdHlsZS0+Zm9udE1ldHJp Y3MoKSBzaG91bGQgYmUgYXZhaWxhYmxlIHdoZW4gc2V0dGluZyBsaW5lLWhlaWdodAorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTMzMjcKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGZhc3QvY2FudmFzL2Ny YXNoLXNldC1mb250Lmh0bWw6IEFkZCBhIHRlc3QgY2FzZSB0aGF0IHNldHMgYm90aCBmb250LXNp emUgYW5kIGxpbmUtaGVpZ2h0LgorCiAyMDEyLTA4LTA2ICBNYXggVnVqb3ZpYyAgPG12dWpvdmlj QGFkb2JlLmNvbT4KIAogICAgICAgICBbQ1NTIFNoYWRlcnNdIFBhcnNlIG1peCBmdW5jdGlvbgpk aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9jYW52YXMvY3Jhc2gtc2V0LWZvbnQuaHRtbCBi L0xheW91dFRlc3RzL2Zhc3QvY2FudmFzL2NyYXNoLXNldC1mb250Lmh0bWwKaW5kZXggMjMyZTky NmU2YzRiMmEwODNlZmI4OGQxNTM5ZGMwNGU1YzA0ZmU0OC4uZDFkY2I3NGU5YzU5ZDE3NmNhZDA1 YWY2MmQ5MGZjYTBkYWY1MjFlZSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvZmFzdC9jYW52YXMv Y3Jhc2gtc2V0LWZvbnQuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2NhbnZhcy9jcmFzaC1z ZXQtZm9udC5odG1sCkBAIC05LDYgKzksNyBAQAogICAgICAgICBvQ29udGV4dDJkLmZvbnQgPSAi c21hbGwtY2FwcyAuMGV4IEciOwogICAgICAgICBvQ29udGV4dDJkLmZvbnQgPSAiaXRhbGljIC4w ZXggRyI7CiAgICAgICAgIG9Db250ZXh0MmQuZm9udCA9ICJpdGFsaWMgNDAwIC4wZXggRyI7Cisg ICAgICAgIG9Db250ZXh0MmQuZm9udCA9ICJpdGFsaWMgNDAwIHNtYWxsLy4wZXggRyI7CiAgICAg PC9zY3JpcHQ+CiA8L2hlYWQ+CiA8Ym9keT4K 157352 2012-08-08 17:45:45 -0700 2012-08-28 22:10:44 -0700 Patch bug-93327-20120809094518.patch text/plain 4160 bashi U3VidmVyc2lvbiBSZXZpc2lvbjogMTI1MTAzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGI5OTc3Yzk0NmRhMzY4 M2Y4ZjJmNzMwMTM5OGNkNmY1MzFjN2UxYi4uNDk5ODBiNDQ2MzBhYWEwMzllYzBhYWZiMWU5ODVm NDY3ZTU2MWVmNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEyLTA4LTA4ICBLZW5p Y2hpIElzaGliYXNoaSAgPGJhc2hpQGNocm9taXVtLm9yZz4KKworICAgICAgICBzdHlsZS0+Zm9u dE1ldHJpY3MoKSBzaG91bGQgYmUgYXZhaWxhYmxlIHdoZW4gc2V0dGluZyBsaW5lLWhlaWdodAor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTMzMjcKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTZXR0aW5nIGxp bmUtaGVpZ2h0IGFzc3VtZXMgdGhlIGZvbnRNZXRyaWNzIGFyZSBhdmFpbGFibGUgZm9yIHRoZSBh ZmZlY3RlZCBmb250LCBidXQKKyAgICAgICAgdGhlIGZvbnRNZXRyaWNzIHdvbid0IGJlIGF2YWls YWJsZSBpbW1lZGlhdGVseSBhZnRlciBzZXR0aW5nIG90aGVyIHByb3BlcnRpZXMgbGlrZQorICAg ICAgICBmb250LXNpemUuIENhbGwgc3R5bGVSZXNvbHZlci0+dXBkYXRlRm9udCgpIGJlZm9yZSBz ZXR0aW5nIGxpbmUtaGVpZ2h0IHRvIHVwZGF0ZSBmb250TWV0cmljcy4KKworICAgICAgICBBZGRl ZCBhIHRlc3QgY2FzZSB0byBmYXN0L2NhbnZhcy9jcmFzaC1zZXQtZm9udC5odG1sLgorCisgICAg ICAgICogaHRtbC9jYW52YXMvQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJELmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OkNhbnZhc1JlbmRlcmluZ0NvbnRleHQyRDo6c2V0Rm9udCk6CisgICAgICAgIENh bGwgc3R5bGVSZXNvbHZlci0+dXBkYXRlRm9udCgpIGJlZm9yZSBzdHlsZVJlc29sdmVyLT5hcHBs eVByb3BlcnR5VG9DdXJyZW50U3R5bGUoQ1NTUHJvcGVydHlMaW5lSGVpZ2h0LC4uLikKKwogMjAx Mi0wOC0wOCAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KIAogICAgICAg ICBBdm9pZCBiYWNraW5nIHN0b3JlIG9uIGxheWVycyBjcmVhdGVkIGZvciBDb3JlQW5pbWF0aW9u IHBsdWdpbnMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL0NhbnZhc1Jl bmRlcmluZ0NvbnRleHQyRC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL2NhbnZhcy9DYW52YXNS ZW5kZXJpbmdDb250ZXh0MkQuY3BwCmluZGV4IGFjZWQwYmQwYjVmMjgyYjk3NjJlNzgzZjU4MzYw NGJhNWMyOWE4MTEuLjlmM2ViYmM4YmIyZjExMjYwOGM2MzNmYzE0NTNiZDQyYWQ1YWY5ZTYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL0NhbnZhc1JlbmRlcmluZ0NvbnRl eHQyRC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvQ2FudmFzUmVuZGVyaW5n Q29udGV4dDJELmNwcApAQCAtMjAxNCwxMSArMjAxNCwxMiBAQCB2b2lkIENhbnZhc1JlbmRlcmlu Z0NvbnRleHQyRDo6c2V0Rm9udChjb25zdCBTdHJpbmcmIG5ld0ZvbnQpCiAgICAgc3R5bGVSZXNv bHZlci0+YXBwbHlQcm9wZXJ0eVRvQ3VycmVudFN0eWxlKENTU1Byb3BlcnR5Rm9udFZhcmlhbnQs IHBhcnNlZFN0eWxlLT5nZXRQcm9wZXJ0eUNTU1ZhbHVlKENTU1Byb3BlcnR5Rm9udFZhcmlhbnQp LmdldCgpKTsKICAgICBzdHlsZVJlc29sdmVyLT5hcHBseVByb3BlcnR5VG9DdXJyZW50U3R5bGUo Q1NTUHJvcGVydHlGb250V2VpZ2h0LCBwYXJzZWRTdHlsZS0+Z2V0UHJvcGVydHlDU1NWYWx1ZShD U1NQcm9wZXJ0eUZvbnRXZWlnaHQpLmdldCgpKTsKIAotICAgIC8vIEFzIGRlc2NyaWJlZCBpbiBC VUc2NjI5MSwgc2V0dGluZyBmb250LXNpemUgb24gYSBmb250IG1heSBlbnRhaWwgYSBDU1NQcmlt aXRpdmVWYWx1ZTo6Y29tcHV0ZUxlbmd0aERvdWJsZSBjYWxsLAorICAgIC8vIEFzIGRlc2NyaWJl ZCBpbiBCVUc2NjI5MSwgc2V0dGluZyBmb250LXNpemUgYW5kIGxpbmUtaGVpZ2h0IG9uIGEgZm9u dCBtYXkgZW50YWlsIGEgQ1NTUHJpbWl0aXZlVmFsdWU6OmNvbXB1dGVMZW5ndGhEb3VibGUgY2Fs bCwKICAgICAvLyB3aGljaCBhc3N1bWVzIHRoZSBmb250TWV0cmljcyBhcmUgYXZhaWxhYmxlIGZv ciB0aGUgYWZmZWN0ZWQgZm9udCwgb3RoZXJ3aXNlIGEgY3Jhc2ggb2NjdXJzIChzZWUgaHR0cDov L3RyYWMud2Via2l0Lm9yZy9jaGFuZ2VzZXQvOTYxMjIpLgotICAgIC8vIFRoZSB1cGRhdGVGb250 KCkgY2FsbCBiZWxvdyB1cGRhdGVzIHRoZSBmb250TWV0cmljcyBhbmQgZW5zdXJlcyB0aGUgcHJv cGVyIHNldHRpbmcgb2YgZm9udC1zaXplLgorICAgIC8vIFRoZSB1cGRhdGVGb250KCkgY2FsbHMg YmVsb3cgdXBkYXRlIHRoZSBmb250TWV0cmljcyBhbmQgZW5zdXJlIHRoZSBwcm9wZXIgc2V0dGlu ZyBvZiBmb250LXNpemUgYW5kIGxpbmUtaGVpZ2h0LgogICAgIHN0eWxlUmVzb2x2ZXItPnVwZGF0 ZUZvbnQoKTsKICAgICBzdHlsZVJlc29sdmVyLT5hcHBseVByb3BlcnR5VG9DdXJyZW50U3R5bGUo Q1NTUHJvcGVydHlGb250U2l6ZSwgcGFyc2VkU3R5bGUtPmdldFByb3BlcnR5Q1NTVmFsdWUoQ1NT UHJvcGVydHlGb250U2l6ZSkuZ2V0KCkpOworICAgIHN0eWxlUmVzb2x2ZXItPnVwZGF0ZUZvbnQo KTsKICAgICBzdHlsZVJlc29sdmVyLT5hcHBseVByb3BlcnR5VG9DdXJyZW50U3R5bGUoQ1NTUHJv cGVydHlMaW5lSGVpZ2h0LCBwYXJzZWRTdHlsZS0+Z2V0UHJvcGVydHlDU1NWYWx1ZShDU1NQcm9w ZXJ0eUxpbmVIZWlnaHQpLmdldCgpKTsKIAogICAgIG1vZGlmaWFibGVTdGF0ZSgpLm1fZm9udCA9 IG5ld1N0eWxlLT5mb250KCk7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9M YXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggNTBhZjRiMmY5ODJiZDUwYjQ2ZGU3N2Q2ODhlYmM1 ZTc4MDcwYmViNi4uYTIzMTZiZjhhMGYyYWRiMmUzZjgwNzNiYmFiY2VmZTliOWIxNTNiZCAxMDA2 NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDEyIEBACisyMDEyLTA4LTA4ICBLZW5pY2hpIElzaGliYXNoaSAgPGJhc2hp QGNocm9taXVtLm9yZz4KKworICAgICAgICBzdHlsZS0+Zm9udE1ldHJpY3MoKSBzaG91bGQgYmUg YXZhaWxhYmxlIHdoZW4gc2V0dGluZyBsaW5lLWhlaWdodAorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTMzMjcKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGZhc3QvY2FudmFzL2NyYXNoLXNldC1mb250Lmh0 bWw6IEFkZCBhIHRlc3QgY2FzZSB0aGF0IHNldHMgYm90aCBmb250LXNpemUgYW5kIGxpbmUtaGVp Z2h0LgorCiAyMDEyLTA4LTA4ICBEZWFuIEphY2tzb24gIDxkaW5vQGFwcGxlLmNvbT4KIAogICAg ICAgICBSRUdSRVNTSU9OIChyMTI0NDE2KTogZmFzdC9mb3Jtcy9iYXNpYy1zZWxlY3RzLmh0bWwg ZmFpbGluZyBvbiBMaW9uIERlYnVnIFRlc3RzCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0 L2NhbnZhcy9jcmFzaC1zZXQtZm9udC5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9jYW52YXMvY3Jh c2gtc2V0LWZvbnQuaHRtbAppbmRleCAyMzJlOTI2ZTZjNGIyYTA4M2VmYjg4ZDE1MzlkYzA0ZTVj MDRmZTQ4Li5kMWRjYjc0ZTljNTlkMTc2Y2FkMDVhZjYyZDkwZmNhMGRhZjUyMWVlIDEwMDY0NAot LS0gYS9MYXlvdXRUZXN0cy9mYXN0L2NhbnZhcy9jcmFzaC1zZXQtZm9udC5odG1sCisrKyBiL0xh eW91dFRlc3RzL2Zhc3QvY2FudmFzL2NyYXNoLXNldC1mb250Lmh0bWwKQEAgLTksNiArOSw3IEBA CiAgICAgICAgIG9Db250ZXh0MmQuZm9udCA9ICJzbWFsbC1jYXBzIC4wZXggRyI7CiAgICAgICAg IG9Db250ZXh0MmQuZm9udCA9ICJpdGFsaWMgLjBleCBHIjsKICAgICAgICAgb0NvbnRleHQyZC5m b250ID0gIml0YWxpYyA0MDAgLjBleCBHIjsKKyAgICAgICAgb0NvbnRleHQyZC5mb250ID0gIml0 YWxpYyA0MDAgc21hbGwvLjBleCBHIjsKICAgICA8L3NjcmlwdD4KIDwvaGVhZD4KIDxib2R5Pgo=