49759 2010-11-18 13:40:24 -0800 [Qt] Zero-sized font does not yet work 2010-12-06 10:37:02 -0800 1 1 1 Unclassified WebKit Text 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 49879 1 darin webkit-unassigned alex benjamin commit-queue darin hausmann hyatt jamesr kling ossy robert oldest_to_newest 311083 0 darin 2010-11-18 13:40:24 -0800 Zero-sized fonts need to render as nothing and take no space. Hyatt got this working on other platforms but it seems that it is not yet working for Qt given that bot failures show fast/text/font-size-zero.html failing. 311135 1 jamesr 2010-11-18 15:43:26 -0800 A consequence of this is that Qt almost certainly fails acid3 currently. 311360 2 alex 2010-11-19 04:46:17 -0800 It also fails in GTK, skipping the test to check the issue. 311928 3 robert 2010-11-20 08:25:10 -0800 void QFont::setPixelSize(int pixelSize) { if (pixelSize <= 0) { qWarning("QFont::setPixelSize: Pixel size <= 0 (%d)", pixelSize); return; } 311930 4 kling 2010-11-20 08:30:28 -0800 *** Bug 49851 has been marked as a duplicate of this bug. *** 312101 5 robert 2010-11-21 07:23:09 -0800 In addition to a Qt API change permitting zero pixel-size fonts we need to fix 49879 to allow this to pass. 312139 6 robert 2010-11-21 10:25:47 -0800 See http://bugreports.qt.nokia.com/browse/QTBUG-15485 312141 7 robert 2010-11-21 10:33:50 -0800 Note we also need to do this in DRT: globalSettings->setFontSize(QWebSettings::MinimumFontSize, 0); globalSettings->setFontSize(QWebSettings::MinimumLogicalFontSize, 0); 312507 8 74595 robert 2010-11-22 14:07:45 -0800 Created attachment 74595 Patch 312510 9 robert 2010-11-22 14:09:32 -0800 (In reply to comment #8) > Created an attachment (id=74595) [details] > Patch A Qt API change is undesirable according to the Qt Jira and gitorious comments and this can be fixed in QtWebKit anyway. 313184 10 robert 2010-11-24 02:18:56 -0800 I asked Jiang about this and he said: "I'm afraid there is no reliable way in Qt now to verify if a font family exists. Can you please create a bug report in http://bugreports.qt.nokia.com/ ? The workaround has to be platform specific." See http://bugreports.qt.nokia.com/browse/QTBUG-15575 Should we fix it for now in QtWebKit using the attached patch? 313185 11 robert 2010-11-24 02:21:42 -0800 (In reply to comment #10) > I asked Jiang about this and he said: > > "I'm afraid there is no reliable way in Qt now to verify if a font family exists. Can you please create a bug report in http://bugreports.qt.nokia.com/ ? The workaround has to be platform specific." > > See http://bugreports.qt.nokia.com/browse/QTBUG-15575 > > Should we fix it for now in QtWebKit using the attached patch? Whoops, wrong font bug! 314613 12 robert 2010-11-29 13:46:36 -0800 Andreas, can you have a look at this? 314929 13 74595 kling 2010-11-30 03:08:19 -0800 Comment on attachment 74595 Patch LGTM, thanks for fixing this Robert! 317369 14 74595 commit-queue 2010-12-05 07:10:36 -0800 Comment on attachment 74595 Patch Clearing flags on attachment: 74595 Committed r73341: <http://trac.webkit.org/changeset/73341> 317370 15 commit-queue 2010-12-05 07:10:43 -0800 All reviewed patches have been landed. Closing bug. 317390 16 robert 2010-12-05 09:46:47 -0800 Test has since been updated to test for font width so it still fails in qt. Patch to fix the failure at https://bugs.webkit.org/show_bug.cgi?id=50539 317502 17 ossy 2010-12-06 02:28:23 -0800 (In reply to comment #16) > Test has since been updated to test for font width so it still fails in qt. > > Patch to fix the failure at https://bugs.webkit.org/show_bug.cgi?id=50539 Next time please don't leave the bot red for a day. :S 317707 18 robert 2010-12-06 10:32:25 -0800 (In reply to comment #17) > (In reply to comment #16) > > Test has since been updated to test for font width so it still fails in qt. > > > > Patch to fix the failure at https://bugs.webkit.org/show_bug.cgi?id=50539 > > Next time please don't leave the bot red for a day. :S Yeah sorry, should I have just re-skipped the test while waiting for the follow-up review? I figured the shortest route to fixing was just to correct the issue with a follow-up patch. 317709 19 ossy 2010-12-06 10:37:02 -0800 (In reply to comment #18) > Yeah sorry, should I have just re-skipped the test while waiting for the follow-up review? I figured the shortest route to fixing was just to correct the issue with a follow-up patch. Not a big problem. But we like always green bots, because you can notice sooner a green vs. red change than a 1 vs. 2 failing tests change. 74595 2010-11-22 14:07:45 -0800 2010-12-05 07:10:36 -0800 Patch bug-49759-20101122220741.patch text/plain 8483 robert ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBiMDhkZDBmZTQ1NDZmNjdiMDdmNDk5ZTVlYWNjMjZjZTAwM2U0Mjg2Li44NGZjNDAy NzZjZjY3ODI4MWMwMTI5ODkyYzcwN2I5NGNlNDZkN2M2IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAK KzIwMTAtMTEtMjIgIFJvYmVydCBIb2dhbiAgPHJvYmVydEB3ZWJraXQub3JnPgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtRdF0gWmVyby1zaXplZCBm b250IGRvZXMgbm90IHlldCB3b3JrCisKKyAgICAgICAgRml4IGZhc3QvdGV4dC9mb250LXNpemUt emVyby5odG1sCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTQ5NzU5CisKKyAgICAgICAgKiBwbGF0Zm9ybS9xdC9Ta2lwcGVkOgorCiAyMDEwLTExLTIy ICBBZGFtIFJvYmVuICA8YXJvYmVuQGFwcGxlLmNvbT4KIAogICAgICAgICBSZW1vdmUgb2Jzb2xl dGUgV2luZG93cy1zcGVjaWZpYyByZXN1bHRzIGZvciBzdmcvZG9tL3BhdGgtcGFyc2VyLmh0bWwK ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL3F0L1NraXBwZWQgYi9MYXlvdXRUZXN0 cy9wbGF0Zm9ybS9xdC9Ta2lwcGVkCmluZGV4IDMxZDA1NzdjOWI3ODYyNWVhN2E3YzViNWU2ZDU2 YzBkOTg2ZDUzOWMuLjM0ZjEzYjhjYzEyYWU2NmI5NGFjNTcwM2Y0MmZkN2YxYzAxYzgxNzMgMTAw NjQ0Ci0tLSBhL0xheW91dFRlc3RzL3BsYXRmb3JtL3F0L1NraXBwZWQKKysrIGIvTGF5b3V0VGVz dHMvcGxhdGZvcm0vcXQvU2tpcHBlZApAQCAtNTMzNCwxMCArNTMzNCw2IEBAIGVkaXRpbmcvcGFz dGVib2FyZC9wYXN0ZS00MDM5Nzc3LWZpeC5odG1sCiAjIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD00OTc0OQogcGx1Z2lucy9yZWZjb3VudC1sZWFrcy5odG1sCiAKLSMg W1F0XSBaZXJvLXNpemVkIGZvbnQgZG9lcyBub3QgeWV0IHdvcmsKLSMgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ5NzU5Ci1mYXN0L3RleHQvZm9udC1zaXplLXplcm8u aHRtbAotCiAjIFtRdF0gUkVHUkVTU0lPTiAocjcyMzUxKTogZmFzdC9wcm9maWxlci90aHJvdy1l eGNlcHRpb24tZnJvbS1ldmFsLmh0bWwgZmFpbHMKICMgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTQ5ODAxCiBmYXN0L3Byb2ZpbGVyL3Rocm93LWV4Y2VwdGlvbi1mcm9t LWV2YWwuaHRtbApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9DaGFuZ2VMb2cgYi9XZWJDb3JlL0NoYW5n ZUxvZwppbmRleCBkYmRiMWI3NzM0YjBiZjYwMTg2ZTg3YTkxYzE1ODMyMjRiMGZmYjViLi5lN2U3 N2RkMGJlNjQzZTQwOWE0MmRkOWZiMDYwMTYyZWJlZGQ4ZDQyIDEwMDY0NAotLS0gYS9XZWJDb3Jl L0NoYW5nZUxvZworKysgYi9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2IEBACisyMDEw LTExLTIyICBSb2JlcnQgSG9nYW4gIDxyb2JlcnRAd2Via2l0Lm9yZz4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbUXRdIFplcm8tc2l6ZWQgZm9udCBk b2VzIG5vdCB5ZXQgd29yaworCisgICAgICAgIEZpeCBmYXN0L3RleHQvZm9udC1zaXplLXplcm8u aHRtbAorCisgICAgICAgIENvcHkgb3RoZXIgcG9ydHMgYnkgc2V0dGluZyBtaW5pbXVtRm9udFNp emUgdG8gMCBmb3IgRFJUIHJ1bnMsCisgICAgICAgIGNvcHkgYSBmaXggdG8gU2ltcGxlRm9udERh dGEgZnJvbSBjaHJvbWl1bS9zYWZhcmksIGFuZCBzZXQgZm9udAorICAgICAgICBzaXplIGluIEZv bnRQbGF0Zm9ybURhdGEgdG8gemVybyBpZiBzaXplIHplcm8gaXMgcmVxdWVzdGVkCisgICAgICAg IGFuZCBRRm9udDo6cGl4ZWxTaXplIG90aGVyd2lzZS4gKE5vdGUgdGhhdCBRRm9udCBkb2Vzbid0 IGFjY2VwdAorICAgICAgICBhIHBpeGVsIHNpemUgb2YgemVybykuCisKKyAgICAgICAgQWxzbyBm aXggUUZvbnQ6OnNldFBpeGVsU2l6ZSBpbiBGb250UGxhdGZvcm1EYXRhIHRvIHVzZQorICAgICAg ICBkZXNjcmlwdGlvbi5jb21wdXRlZFBpeGVsU2l6ZSByYXRoZXIgdGhhbiBjb21wdXRlZFNpemUg YW5kCisgICAgICAgIHBpeGVsU2l6ZSgpIHJhdGhlciB0aGFuIHBvaW50U2l6ZUYgLSBzaW5jZSB0 aGUgbGF0dGVyIGdldHMKKyAgICAgICAgc2V0IHRvIC0xIGlmIHBpeGVsU2l6ZSBpcyBzZXQgYXQg YWxsLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00 OTc1OQorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvcXQvRm9udFBsYXRmb3JtRGF0YS5o OgorICAgICAgICAoV2ViQ29yZTo6Rm9udFBsYXRmb3JtRGF0YVByaXZhdGU6OkZvbnRQbGF0Zm9y bURhdGFQcml2YXRlKToKKyAgICAgICAgKFdlYkNvcmU6OkZvbnRQbGF0Zm9ybURhdGE6OnBpeGVs U2l6ZSk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvcXQvRm9udFBsYXRmb3JtRGF0YVF0 LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZvbnRQbGF0Zm9ybURhdGE6OkZvbnRQbGF0Zm9ybURh dGEpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3F0L0ZvbnRRdC5jcHA6CisgICAgICAg IChXZWJDb3JlOjpkcmF3VGV4dENvbW1vbik6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mv cXQvU2ltcGxlRm9udERhdGFRdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTaW1wbGVGb250RGF0 YTo6cGxhdGZvcm1Jbml0KToKKyAgICAgICAgKFdlYkNvcmU6OlNpbXBsZUZvbnREYXRhOjpwbGF0 Zm9ybUdseXBoSW5pdCk6CisgICAgICAgIChXZWJDb3JlOjpTaW1wbGVGb250RGF0YTo6cGxhdGZv cm1DaGFyV2lkdGhJbml0KToKKwogMjAxMC0xMS0yMiAgQWxleGFuZGVyIFBhdmxvdiAgPGFwYXZs b3ZAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFBhdmVsIEZlbGRtYW4uCmRp ZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L0ZvbnRQbGF0Zm9ybURhdGEu aCBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvRm9udFBsYXRmb3JtRGF0YS5oCmluZGV4 IDIyMDFmMTg1ZDgxNTk1MTkyMjZlMjA0MWEwOTQxZmEwZWFmZDRhNmEuLjFjNTdlMjlmNTg1ZmI1 M2M3NjhiYWM4ZTQwN2E1NjQ2YzZjZjk5Y2MgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvcXQvRm9udFBsYXRmb3JtRGF0YS5oCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvcXQvRm9udFBsYXRmb3JtRGF0YS5oCkBAIC0zNiw3ICszNiw3IEBAIGNsYXNzIEZvbnRQ bGF0Zm9ybURhdGFQcml2YXRlIDogcHVibGljIE5vbmNvcHlhYmxlIHsKIHB1YmxpYzoKICAgICBG b250UGxhdGZvcm1EYXRhUHJpdmF0ZSgpCiAgICAgICAgIDogcmVmQ291bnQoMSkKLSAgICAgICAg LCBzaXplKGZvbnQucG9pbnRTaXplRigpKQorICAgICAgICAsIHNpemUoZm9udC5waXhlbFNpemUo KSkKICAgICAgICAgLCBib2xkKGZvbnQuYm9sZCgpKQogICAgICAgICAsIG9ibGlxdWUoZmFsc2Up CiAgICAge30KQEAgLTQ5LDcgKzQ5LDcgQEAgcHVibGljOgogICAgIEZvbnRQbGF0Zm9ybURhdGFQ cml2YXRlKGNvbnN0IFFGb250JiBmb250KQogICAgICAgICA6IHJlZkNvdW50KDEpCiAgICAgICAg ICwgZm9udChmb250KQotICAgICAgICAsIHNpemUoZm9udC5wb2ludFNpemVGKCkpCisgICAgICAg ICwgc2l6ZShmb250LnBpeGVsU2l6ZSgpKQogICAgICAgICAsIGJvbGQoZm9udC5ib2xkKCkpCiAg ICAgICAgICwgb2JsaXF1ZShmYWxzZSkKICAgICB7fQpAQCAtMTUwLDggKzE1MCwxMiBAQCBwdWJs aWM6CiAgICAgaW50IHBpeGVsU2l6ZSgpIGNvbnN0CiAgICAgewogICAgICAgICBRX0FTU0VSVCht X2RhdGEgIT0gcmVpbnRlcnByZXRfY2FzdDxGb250UGxhdGZvcm1EYXRhUHJpdmF0ZSo+KC0xKSk7 Ci0gICAgICAgIGlmIChtX2RhdGEpCisgICAgICAgIGlmIChtX2RhdGEpIHsKKyAgICAgICAgICAg IC8vIFdlYktpdCBhbGxvd3MgZm9udCBzaXplIHplcm8gYnV0IFFGb250IGRvZXMgbm90LgorICAg ICAgICAgICAgaWYgKCFtX2RhdGEtPnNpemUpCisgICAgICAgICAgICAgICAgcmV0dXJuIG1fZGF0 YS0+c2l6ZTsKICAgICAgICAgICAgIHJldHVybiBtX2RhdGEtPmZvbnQucGl4ZWxTaXplKCk7Cisg ICAgICAgIH0KICAgICAgICAgcmV0dXJuIDA7CiAgICAgfQogICAgIApkaWZmIC0tZ2l0IGEvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9Gb250UGxhdGZvcm1EYXRhUXQuY3BwIGIvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9Gb250UGxhdGZvcm1EYXRhUXQuY3BwCmluZGV4IDM1ZTll MGNmY2JiOTljYTJkMmYxN2E3YTRjZTdkZmQ3NDdmNGI2MzYuLjRjOWViMzIwOGFkNzU0NGU3MTE5 MGQ1ZDMwOTdkMjZhMzQ5N2MwZTEgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvcXQvRm9udFBsYXRmb3JtRGF0YVF0LmNwcAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL3F0L0ZvbnRQbGF0Zm9ybURhdGFRdC5jcHAKQEAgLTUwLDggKzUwLDkgQEAgRm9udFBsYXRm b3JtRGF0YTo6Rm9udFBsYXRmb3JtRGF0YShjb25zdCBGb250RGVzY3JpcHRpb24mIGRlc2NyaXB0 aW9uLCBjb25zdCBBdG8KICAgICA6IG1fZGF0YShuZXcgRm9udFBsYXRmb3JtRGF0YVByaXZhdGUo KSkKIHsKICAgICBRRm9udCYgZm9udCA9IG1fZGF0YS0+Zm9udDsKKyAgICBpbnQgcmVxdWVzdGVk U2l6ZSA9IHFSb3VuZChkZXNjcmlwdGlvbi5jb21wdXRlZFBpeGVsU2l6ZSgpKTsKICAgICBmb250 LnNldEZhbWlseShmYW1pbHlOYW1lKTsKLSAgICBmb250LnNldFBpeGVsU2l6ZShxUm91bmQoZGVz Y3JpcHRpb24uY29tcHV0ZWRTaXplKCkpKTsKKyAgICBmb250LnNldFBpeGVsU2l6ZShxUm91bmQo cmVxdWVzdGVkU2l6ZSkpOwogICAgIGZvbnQuc2V0SXRhbGljKGRlc2NyaXB0aW9uLml0YWxpYygp KTsKICAgICBmb250LnNldFdlaWdodCh0b1FGb250V2VpZ2h0KGRlc2NyaXB0aW9uLndlaWdodCgp KSk7CiAgICAgZm9udC5zZXRXb3JkU3BhY2luZyh3b3JkU3BhY2luZyk7CkBAIC02Myw3ICs2NCwx MCBAQCBGb250UGxhdGZvcm1EYXRhOjpGb250UGxhdGZvcm1EYXRhKGNvbnN0IEZvbnREZXNjcmlw dGlvbiYgZGVzY3JpcHRpb24sIGNvbnN0IEF0bwogI2VuZGlmCiAKICAgICBtX2RhdGEtPmJvbGQg PSBmb250LmJvbGQoKTsKLSAgICBtX2RhdGEtPnNpemUgPSBmb250LnBvaW50U2l6ZUYoKTsKKyAg ICAvLyBXZWJLaXQgYWxsb3dzIGZvbnQgc2l6ZSB6ZXJvIGJ1dCBRRm9udCBkb2VzIG5vdC4gV2Ug d2lsbCByZXR1cm4KKyAgICAvLyBtX2RhdGEtPnNpemUgaWYgYSBmb250IHNpemUgb2YgemVybyBp cyByZXF1ZXN0ZWQgYW5kIHBpeGVsU2l6ZSgpCisgICAgLy8gb3RoZXJ3aXNlLgorICAgIG1fZGF0 YS0+c2l6ZSA9ICghcmVxdWVzdGVkU2l6ZSkgPyByZXF1ZXN0ZWRTaXplIDogZm9udC5waXhlbFNp emUoKTsKIH0KIAogRm9udFBsYXRmb3JtRGF0YTo6fkZvbnRQbGF0Zm9ybURhdGEoKQpkaWZmIC0t Z2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9TaW1wbGVGb250RGF0YVF0LmNwcCBi L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvU2ltcGxlRm9udERhdGFRdC5jcHAKaW5kZXgg ZjA5M2Q3ZGI4MjU1ZTc2ZTk5MTY4MWRiMDRjMmJmN2JlMjFmM2IyOS4uNDdkZGYwMmZjOTFiYWRm NTlkOTU2Y2E1MGY2ZmI3YzhlOGJmMGZmNCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9xdC9TaW1wbGVGb250RGF0YVF0LmNwcAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL3F0L1NpbXBsZUZvbnREYXRhUXQuY3BwCkBAIC00MCw2ICs0MCwxOCBAQCBib29sIFNp bXBsZUZvbnREYXRhOjpjb250YWluc0NoYXJhY3RlcnMoY29uc3QgVUNoYXIqLCBpbnQpIGNvbnN0 CiAKIHZvaWQgU2ltcGxlRm9udERhdGE6OnBsYXRmb3JtSW5pdCgpCiB7CisgICAgaWYgKCFtX3Bs YXRmb3JtRGF0YS5zaXplKCkpIHsKKyAgICAgICAgIG1fYXNjZW50ID0gMDsKKyAgICAgICAgIG1f ZGVzY2VudCA9IDA7CisgICAgICAgICBtX2xpbmVHYXAgPSAwOworICAgICAgICAgbV9saW5lU3Bh Y2luZyA9IDA7CisgICAgICAgICBtX2F2Z0NoYXJXaWR0aCA9IDA7CisgICAgICAgICBtX21heENo YXJXaWR0aCA9IDA7CisgICAgICAgICBtX3hIZWlnaHQgPSAwOworICAgICAgICAgbV91bml0c1Bl ckVtID0gMDsKKyAgICAgICAgIHJldHVybjsKKyAgICB9CisKICAgICBRRm9udE1ldHJpY3MgZm0o bV9wbGF0Zm9ybURhdGEuZm9udCgpKTsKIAogICAgIG1fYXNjZW50ID0gZm0uYXNjZW50KCk7CkBA IC01Miw2ICs2NCw4IEBAIHZvaWQgU2ltcGxlRm9udERhdGE6OnBsYXRmb3JtSW5pdCgpCiAKIHZv aWQgU2ltcGxlRm9udERhdGE6OnBsYXRmb3JtR2x5cGhJbml0KCkKIHsKKyAgICBpZiAoIW1fcGxh dGZvcm1EYXRhLnNpemUoKSkKKyAgICAgICAgcmV0dXJuOwogICAgIG1fc3BhY2VHbHlwaCA9IDA7 CiAgICAgbV9hZGp1c3RlZFNwYWNlV2lkdGggPSBtX3NwYWNlV2lkdGg7CiAgICAgZGV0ZXJtaW5l UGl0Y2goKTsKQEAgLTYxLDYgKzc1LDggQEAgdm9pZCBTaW1wbGVGb250RGF0YTo6cGxhdGZvcm1H bHlwaEluaXQoKQogCiB2b2lkIFNpbXBsZUZvbnREYXRhOjpwbGF0Zm9ybUNoYXJXaWR0aEluaXQo KQogeworICAgIGlmICghbV9wbGF0Zm9ybURhdGEuc2l6ZSgpKQorICAgICAgICByZXR1cm47CiAg ICAgUUZvbnRNZXRyaWNzIGZtKG1fcGxhdGZvcm1EYXRhLmZvbnQoKSk7CiAgICAgbV9hdmdDaGFy V2lkdGggPSBmbS5hdmVyYWdlQ2hhcldpZHRoKCk7CiAgICAgbV9tYXhDaGFyV2lkdGggPSBmbS5t YXhXaWR0aCgpOwpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nIGIvV2ViS2l0VG9v bHMvQ2hhbmdlTG9nCmluZGV4IDRhMDE2YzFmMTgxNDU3MTVlOWEwMWEzZDJlZjZjMDUxMzZkYWFi MGYuLjI1Y2EyZmQ2OTIzZTZmNjc1MDVhMjA1ZjIzYzc2ZGRlZGQ5NTRiYzYgMTAwNjQ0Ci0tLSBh L1dlYktpdFRvb2xzL0NoYW5nZUxvZworKysgYi9XZWJLaXRUb29scy9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxOCBAQAorMjAxMC0xMS0yMiAgUm9iZXJ0IEhvZ2FuICA8cm9iZXJ0QHdlYmtpdC5vcmc+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW1F0XSBa ZXJvLXNpemVkIGZvbnQgZG9lcyBub3QgeWV0IHdvcmsKKworICAgICAgICBGaXggZmFzdC90ZXh0 L2ZvbnQtc2l6ZS16ZXJvLmh0bWwKKworICAgICAgICBDb3B5IG90aGVyIHBvcnRzIGJ5IHNldHRp bmcgbWluaW11bUZvbnRTaXplIHRvIDAgZm9yIERSVCBydW5zLgorCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00OTc1OQorCisgICAgICAgICogRHVtcFJl bmRlclRyZWUvcXQvRHVtcFJlbmRlclRyZWVRdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpXZWJQ YWdlOjpXZWJQYWdlKToKKwogMjAxMC0xMS0yMiAgSm/Do28gUGF1bG8gUmVjaGkgVml0YSAgPGpw cnZpdGFAcHJvZnVzaW9uLm1vYmk+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgS2VubmV0aCBSb2hk ZSBDaHJpc3RpYW5zZW4uCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9x dC9EdW1wUmVuZGVyVHJlZVF0LmNwcCBiL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL3F0L0R1 bXBSZW5kZXJUcmVlUXQuY3BwCmluZGV4IDA5ODJhNmZmYWViMmFjNTc0NDI3ZGU3YjM0NTg5M2Qw ZGRkYTg2N2YuLjkzOWE5ZDBmNjE0ZTczZmE2YTA2ODcwOWI2NmYwYWU3MzFiOWJmYjMgMTAwNjQ0 Ci0tLSBhL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL3F0L0R1bXBSZW5kZXJUcmVlUXQuY3Bw CisrKyBiL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL3F0L0R1bXBSZW5kZXJUcmVlUXQuY3Bw CkBAIC0xMzgsNyArMTM4LDcgQEAgV2ViUGFnZTo6V2ViUGFnZShRT2JqZWN0KiBwYXJlbnQsIER1 bXBSZW5kZXJUcmVlKiBkcnQpCiB7CiAgICAgUVdlYlNldHRpbmdzKiBnbG9iYWxTZXR0aW5ncyA9 IFFXZWJTZXR0aW5nczo6Z2xvYmFsU2V0dGluZ3MoKTsKIAotICAgIGdsb2JhbFNldHRpbmdzLT5z ZXRGb250U2l6ZShRV2ViU2V0dGluZ3M6Ok1pbmltdW1Gb250U2l6ZSwgNSk7CisgICAgZ2xvYmFs U2V0dGluZ3MtPnNldEZvbnRTaXplKFFXZWJTZXR0aW5nczo6TWluaW11bUZvbnRTaXplLCAwKTsK ICAgICBnbG9iYWxTZXR0aW5ncy0+c2V0Rm9udFNpemUoUVdlYlNldHRpbmdzOjpNaW5pbXVtTG9n aWNhbEZvbnRTaXplLCA1KTsKICAgICBnbG9iYWxTZXR0aW5ncy0+c2V0Rm9udFNpemUoUVdlYlNl dHRpbmdzOjpEZWZhdWx0Rm9udFNpemUsIDE2KTsKICAgICBnbG9iYWxTZXR0aW5ncy0+c2V0Rm9u dFNpemUoUVdlYlNldHRpbmdzOjpEZWZhdWx0Rml4ZWRGb250U2l6ZSwgMTMpOwo=