28707 2009-08-25 03:41:39 -0700 [Chromium] Complex text doesn't show up with text stroking 2009-09-11 17:28:45 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) PC Windows Vista RESOLVED FIXED P2 Normal --- 0 yusukes webkit-unassigned commit-queue eric hamaji ukai oldest_to_newest 142555 0 yusukes 2009-08-25 03:41:39 -0700 Chromium can't render complex text with -webkit-text-stroke-width style. This causes LayoutTests/fast/text/stroking-decorations.html and LayoutTests/fast/text/stroking.html tests to fail. http://code.google.com/p/chromium/issues/detail?id=20130 142556 1 38539 yusukes 2009-08-25 04:05:09 -0700 Created attachment 38539 complex_text_v1 --- 2 files changed, 13 insertions(+), 1 deletions(-) 142557 2 38540 yusukes 2009-08-25 04:17:55 -0700 Created attachment 38540 complex_text_v2 --- 2 files changed, 13 insertions(+), 1 deletions(-) 142592 3 38540 eric 2009-08-25 09:29:00 -0700 Comment on attachment 38540 complex_text_v2 Clearing flags on attachment: 38540 Committed r47748: <http://trac.webkit.org/changeset/47748> 142593 4 eric 2009-08-25 09:29:03 -0700 All reviewed patches have been landed. Closing bug. 142796 5 38600 yusukes 2009-08-25 23:26:11 -0700 Created attachment 38600 complex_text_second_fix_v1 --- 3 files changed, 26 insertions(+), 7 deletions(-) 142797 6 yusukes 2009-08-25 23:27:41 -0700 Uploaded second patch as per Dirk's suggestion. 142798 7 38600 fishd 2009-08-25 23:40:00 -0700 Comment on attachment 38600 complex_text_second_fix_v1 > +2009-08-25 Yusuke Sato <yusukes@chromium.org> ... > + Added extra NULL checks for HDC. This is the second fix for issue 28707, > + and the fix is similar to http://trac.webkit.org/changeset/45482. nit: please do not include tabs in the ChangeLog. R- for this reason. > +++ b/WebCore/platform/graphics/chromium/UniscribeHelper.cpp > + if (dc) { > + if (firstRun) { > + oldFont = SelectObject(dc, shaping.m_hfont); > + firstRun = false; > + } else > + SelectObject(dc, shaping.m_hfont); > + } This is OK, but maybe it should use the useWindowsDrawing local variable instead just as the code within the for loop does. What do you think? -Darin 142803 8 38601 yusukes 2009-08-26 00:11:03 -0700 Created attachment 38601 complex_text_second_fix_v2 --- 3 files changed, 26 insertions(+), 7 deletions(-) 142804 9 yusukes 2009-08-26 00:12:28 -0700 > nit: please do not include tabs in the ChangeLog. R- for this reason. Fixed, sorry. > This is OK, but maybe it should use the useWindowsDrawing local variable > instead just as the code within the for loop does. What do you think? Agreed. Using useWindowsDrawing seems better than mine. Please take another look. --Yusuke 142818 10 eric 2009-08-26 03:11:37 -0700 bots are red. Once they green up the commit-queue will land this. 143292 11 yusukes 2009-08-27 21:25:49 -0700 Eric, The patch v2 seems not to be landed yet, but the commit queue looks empty. Could you let me know hot to fix this (or could you land the patch)? Thanks, Yusuke 146604 12 eric 2009-09-11 09:29:25 -0700 The bots have been red all night. :) This should be landing in a matter of hours now that folks are back at work. 146694 13 hamaji 2009-09-11 11:57:57 -0700 As it is still not committed, I tried to remove cq+ and give cq+ again. But it seemed not to work. I don't know what we should do... Could someone check this? Thanks! 146718 14 eric 2009-09-11 12:59:27 -0700 Oh. this bug is closed as fixed! Hence it's not appearing in the queue. 146720 15 38601 commit-queue 2009-09-11 13:09:20 -0700 Comment on attachment 38601 complex_text_second_fix_v2 Clearing flags on attachment: 38601 Committed r48313: <http://trac.webkit.org/changeset/48313> 146721 16 commit-queue 2009-09-11 13:09:25 -0700 All reviewed patches have been landed. Closing bug. 146830 17 yusukes 2009-09-11 17:28:45 -0700 > this bug is closed as fixed! Hence it's not appearing in the queue. Ah, I get it now! Eric, Shinichiro, thanks for handling this. 38539 2009-08-25 04:05:09 -0700 2009-08-25 04:17:51 -0700 complex_text_v1 bug-28707-20090825200508.patch text/plain 1265 yusukes ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MGM5OWIxMC4uZTFkODNjMiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAwOS0wOC0yNSAgWXVzdWtlIFNhdG8g IDx5dXN1a2VzQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBbQ2hyb21pdW1dIENvbXBsZXggdGV4dCBkb2Vzbid0IHNob3cgdXAg d2l0aCB0ZXh0IHN0cm9raW5nCisJaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTI4NzA3CisKKwlTa2lwIHRoZSBOVUxMIGNoZWNrIG9mIG1faGRjIGlmIFdpbmRvd3MgR0RJ IGlzIG5vdCBpbiB1c2UuCisJCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0v Rm9udENocm9taXVtV2luLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZvbnQ6OmRyYXdDb21wbGV4 VGV4dCk6CisKIDIwMDktMDgtMjQgIEtlbnQgVGFtdXJhICA8dGtlbnRAY2hyb21pdW0ub3JnPgog CiAgICAgICAgIFJldmlld2VkIGJ5IEVyaWMgU2VpZGVsLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9Gb250Q2hyb21pdW1XaW4uY3BwIGIvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9Gb250Q2hyb21pdW1XaW4uY3BwCmluZGV4IGU1ODQ3 MjQuLjNkNjc5OTIgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21p dW0vRm9udENocm9taXVtV2luLmNwcAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2No cm9taXVtL0ZvbnRDaHJvbWl1bVdpbi5jcHAKQEAgLTQ1OSw3ICs0NTksNyBAQCB2b2lkIEZvbnQ6 OmRyYXdDb21wbGV4VGV4dChHcmFwaGljc0NvbnRleHQqIGdyYXBoaWNzQ29udGV4dCwKICAgICBU cmFuc3BhcmVuY3lBd2FyZVVuaXNjcmliZVBhaW50ZXIgcGFpbnRlcihncmFwaGljc0NvbnRleHQs IHRoaXMsIHJ1biwgZnJvbSwgdG8sIHBvaW50KTsKIAogICAgIEhEQyBoZGMgPSBwYWludGVyLmhk YygpOwotICAgIGlmICh3aW5kb3dzQ2FuSGFuZGxlVGV4dERyYXdpbmcoZ3JhcGhpY3NDb250ZXh0 KSAmJiAhaGRjKQorICAgIGlmICghaGRjKQogICAgICAgICByZXR1cm47CiAKICAgICAvLyBUT0RP KG1hcnVlbCk6IGh0dHA6Ly9iLzcwMDQ2NCBTZXRUZXh0Q29sb3IgZG9lc24ndCBzdXBwb3J0IHRy YW5zcGFyZW5jeS4= 38540 2009-08-25 04:17:55 -0700 2009-08-25 09:29:00 -0700 complex_text_v2 bug-28707-20090825201753.patch text/plain 1278 yusukes ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MGM5OWIxMC4uZTY1ZGRmNCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAwOS0wOC0yNSAgWXVzdWtlIFNhdG8g IDx5dXN1a2VzQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBbQ2hyb21pdW1dIENvbXBsZXggdGV4dCBkb2Vzbid0IHNob3cgdXAg d2l0aCB0ZXh0IHN0cm9raW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0yODcwNworCisgICAgICAgIFNraXAgdGhlIE5VTEwgY2hlY2sgb2YgbV9oZGMg aWYgV2luZG93cyBHREkgaXMgbm90IGluIHVzZS4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBo aWNzL2Nocm9taXVtL0ZvbnRDaHJvbWl1bVdpbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGb250 OjpkcmF3Q29tcGxleFRleHQpOgorCiAyMDA5LTA4LTI0ICBLZW50IFRhbXVyYSAgPHRrZW50QGNo cm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBFcmljIFNlaWRlbC4KZGlmZiAtLWdp dCBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vRm9udENocm9taXVtV2luLmNw cCBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vRm9udENocm9taXVtV2luLmNw cAppbmRleCAzZDY3OTkyLi5lNTg0NzI0IDEwMDY0NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2Nocm9taXVtL0ZvbnRDaHJvbWl1bVdpbi5jcHAKKysrIGIvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9jaHJvbWl1bS9Gb250Q2hyb21pdW1XaW4uY3BwCkBAIC00NTksNyArNDU5LDcg QEAgdm9pZCBGb250OjpkcmF3Q29tcGxleFRleHQoR3JhcGhpY3NDb250ZXh0KiBncmFwaGljc0Nv bnRleHQsCiAgICAgVHJhbnNwYXJlbmN5QXdhcmVVbmlzY3JpYmVQYWludGVyIHBhaW50ZXIoZ3Jh cGhpY3NDb250ZXh0LCB0aGlzLCBydW4sIGZyb20sIHRvLCBwb2ludCk7CiAKICAgICBIREMgaGRj ID0gcGFpbnRlci5oZGMoKTsKLSAgICBpZiAoIWhkYykKKyAgICBpZiAod2luZG93c0NhbkhhbmRs ZVRleHREcmF3aW5nKGdyYXBoaWNzQ29udGV4dCkgJiYgIWhkYykKICAgICAgICAgcmV0dXJuOwog CiAgICAgLy8gVE9ETyhtYXJ1ZWwpOiBodHRwOi8vYi83MDA0NjQgU2V0VGV4dENvbG9yIGRvZXNu J3Qgc3VwcG9ydCB0cmFuc3BhcmVuY3ku 38600 2009-08-25 23:26:11 -0700 2009-08-26 00:11:36 -0700 complex_text_second_fix_v1 bug-28707-20090826152610.patch text/plain 2836 yusukes ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NjYxNmQ3YS4uMjZiODVhZCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAwOS0wOC0yNSAgWXVzdWtlIFNhdG8g IDx5dXN1a2VzQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBbQ2hyb21pdW1dIENvbXBsZXggdGV4dCBkb2Vzbid0IHNob3cgdXAg d2l0aCB0ZXh0IHN0cm9raW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0yODcwNworCisgICAgICAgIEFkZGVkIGV4dHJhIE5VTEwgY2hlY2tzIGZvciBI REMuIFRoaXMgaXMgdGhlIHNlY29uZCBmaXggZm9yIGlzc3VlIDI4NzA3LAorCWFuZCB0aGUgZml4 IGlzIHNpbWlsYXIgdG8gaHR0cDovL3RyYWMud2Via2l0Lm9yZy9jaGFuZ2VzZXQvNDU0ODIuCisK KyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9Gb250Q2hyb21pdW1XaW4uY3Bw OgorICAgICAgICAoV2ViQ29yZTo6Rm9udDo6ZHJhd0NvbXBsZXhUZXh0KToKKyAgICAgICAgKiBw bGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9VbmlzY3JpYmVIZWxwZXIuY3BwOgorICAgICAgICAo V2ViQ29yZTo6VW5pc2NyaWJlSGVscGVyOjpkcmF3KToKKwogMjAwOS0wOC0yNSAgRXJpYyBDYXJs c29uICA8ZXJpYy5jYXJsc29uQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYW4g QmVybnN0ZWluCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVt L0ZvbnRDaHJvbWl1bVdpbi5jcHAgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVt L0ZvbnRDaHJvbWl1bVdpbi5jcHAKaW5kZXggZTU4NDcyNC4uMjI5MTg4ZSAxMDA2NDQKLS0tIGEv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9Gb250Q2hyb21pdW1XaW4uY3BwCisr KyBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vRm9udENocm9taXVtV2luLmNw cApAQCAtNDY1LDggKzQ2NSwxMCBAQCB2b2lkIEZvbnQ6OmRyYXdDb21wbGV4VGV4dChHcmFwaGlj c0NvbnRleHQqIGdyYXBoaWNzQ29udGV4dCwKICAgICAvLyBUT0RPKG1hcnVlbCk6IGh0dHA6Ly9i LzcwMDQ2NCBTZXRUZXh0Q29sb3IgZG9lc24ndCBzdXBwb3J0IHRyYW5zcGFyZW5jeS4KICAgICAv LyBFbmZvcmNlIG5vbi10cmFuc3BhcmVudCBjb2xvci4KICAgICBjb2xvciA9IFNrQ29sb3JTZXRS R0IoU2tDb2xvckdldFIoY29sb3IpLCBTa0NvbG9yR2V0Ryhjb2xvciksIFNrQ29sb3JHZXRCKGNv bG9yKSk7Ci0gICAgU2V0VGV4dENvbG9yKGhkYywgc2tpYTo6U2tDb2xvclRvQ09MT1JSRUYoY29s b3IpKTsKLSAgICBTZXRCa01vZGUoaGRjLCBUUkFOU1BBUkVOVCk7CisgICAgaWYgKGhkYykgewor ICAgICAgICBTZXRUZXh0Q29sb3IoaGRjLCBza2lhOjpTa0NvbG9yVG9DT0xPUlJFRihjb2xvcikp OworICAgICAgICBTZXRCa01vZGUoaGRjLCBUUkFOU1BBUkVOVCk7CisgICAgfQogCiAgICAgLy8g SWYgdGhlcmUgaXMgYSBub24tYmx1ciBzaGFkb3cgYW5kIGJvdGggdGhlIGZpbGwgY29sb3IgYW5k IHNoYWRvdyBjb2xvciAKICAgICAvLyBhcmUgb3BhcXVlLCBoYW5kbGUgd2l0aG91dCBza2lhLiAK ZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vVW5pc2NyaWJl SGVscGVyLmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vVW5pc2NyaWJl SGVscGVyLmNwcAppbmRleCAzOWIwODQ3Li4xN2E4NzVlIDEwMDY0NAotLS0gYS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL1VuaXNjcmliZUhlbHBlci5jcHAKKysrIGIvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9VbmlzY3JpYmVIZWxwZXIuY3BwCkBAIC0zNzUs MTEgKzM3NSwxMyBAQCB2b2lkIFVuaXNjcmliZUhlbHBlcjo6ZHJhdyhHcmFwaGljc0NvbnRleHQq IGdyYXBoaWNzQ29udGV4dCwKICAgICAgICAgICAgIC8vIFBhc3MgMCBpbiB3aGVuIHRoZXJlIGlz IG5vIGp1c3RpZmljYXRpb24uCiAgICAgICAgICAgICBjb25zdCBpbnQqIGp1c3RpZnkgPSBzaGFw aW5nLm1fanVzdGlmeS5zaXplKCkgPT0gMCA/IDAgOiAmc2hhcGluZy5tX2p1c3RpZnlbZnJvbUds eXBoXTsKIAotICAgICAgICAgICAgaWYgKGZpcnN0UnVuKSB7Ci0gICAgICAgICAgICAgICAgb2xk Rm9udCA9IFNlbGVjdE9iamVjdChkYywgc2hhcGluZy5tX2hmb250KTsKLSAgICAgICAgICAgICAg ICBmaXJzdFJ1biA9IGZhbHNlOwotICAgICAgICAgICAgfSBlbHNlCi0gICAgICAgICAgICAgICAg U2VsZWN0T2JqZWN0KGRjLCBzaGFwaW5nLm1faGZvbnQpOworICAgICAgICAgICAgaWYgKGRjKSB7 CisgICAgICAgICAgICAgICAgaWYgKGZpcnN0UnVuKSB7CisgICAgICAgICAgICAgICAgICAgIG9s ZEZvbnQgPSBTZWxlY3RPYmplY3QoZGMsIHNoYXBpbmcubV9oZm9udCk7CisgICAgICAgICAgICAg ICAgICAgIGZpcnN0UnVuID0gZmFsc2U7CisgICAgICAgICAgICAgICAgfSBlbHNlCisgICAgICAg ICAgICAgICAgICAgIFNlbGVjdE9iamVjdChkYywgc2hhcGluZy5tX2hmb250KTsKKyAgICAgICAg ICAgIH0KIAogICAgICAgICAgICAgLy8gRm9udHMgd2l0aCBkaWZmZXJlbnQgYXNjZW50cyBjYW4g YmUgdXNlZCB0byByZW5kZXIgZGlmZmVyZW50CiAgICAgICAgICAgICAvLyBydW5zLiAgJ0Fjcm9z cy1ydW5zJyB5LWNvb3JkaW5hdGUgY29ycmVjdGlvbiBuZWVkcyB0byBiZQ== 38601 2009-08-26 00:11:03 -0700 2009-09-11 13:09:20 -0700 complex_text_second_fix_v2 bug-28707-20090826161101.patch text/plain 2858 yusukes ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NjYxNmQ3YS4uMWIyODFhMSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAwOS0wOC0yNSAgWXVzdWtlIFNhdG8g IDx5dXN1a2VzQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBbQ2hyb21pdW1dIENvbXBsZXggdGV4dCBkb2Vzbid0IHNob3cgdXAg d2l0aCB0ZXh0IHN0cm9raW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0yODcwNworCisgICAgICAgIEFkZGVkIGV4dHJhIE5VTEwgY2hlY2tzIGZvciBI REMuIFRoaXMgaXMgdGhlIHNlY29uZCBmaXggZm9yIGlzc3VlIDI4NzA3LAorICAgICAgICBhbmQg dGhlIGZpeCBpcyBzaW1pbGFyIHRvIGh0dHA6Ly90cmFjLndlYmtpdC5vcmcvY2hhbmdlc2V0LzQ1 NDgyLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vRm9udENocm9taXVt V2luLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZvbnQ6OmRyYXdDb21wbGV4VGV4dCk6CisgICAg ICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vVW5pc2NyaWJlSGVscGVyLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OlVuaXNjcmliZUhlbHBlcjo6ZHJhdyk6CisKIDIwMDktMDgtMjUgIEVy aWMgQ2FybHNvbiAgPGVyaWMuY2FybHNvbkBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQg YnkgRGFuIEJlcm5zdGVpbgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9j aHJvbWl1bS9Gb250Q2hyb21pdW1XaW4uY3BwIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9j aHJvbWl1bS9Gb250Q2hyb21pdW1XaW4uY3BwCmluZGV4IGU1ODQ3MjQuLjIyOTE4OGUgMTAwNjQ0 Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vRm9udENocm9taXVtV2lu LmNwcAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0ZvbnRDaHJvbWl1 bVdpbi5jcHAKQEAgLTQ2NSw4ICs0NjUsMTAgQEAgdm9pZCBGb250OjpkcmF3Q29tcGxleFRleHQo R3JhcGhpY3NDb250ZXh0KiBncmFwaGljc0NvbnRleHQsCiAgICAgLy8gVE9ETyhtYXJ1ZWwpOiBo dHRwOi8vYi83MDA0NjQgU2V0VGV4dENvbG9yIGRvZXNuJ3Qgc3VwcG9ydCB0cmFuc3BhcmVuY3ku CiAgICAgLy8gRW5mb3JjZSBub24tdHJhbnNwYXJlbnQgY29sb3IuCiAgICAgY29sb3IgPSBTa0Nv bG9yU2V0UkdCKFNrQ29sb3JHZXRSKGNvbG9yKSwgU2tDb2xvckdldEcoY29sb3IpLCBTa0NvbG9y R2V0Qihjb2xvcikpOwotICAgIFNldFRleHRDb2xvcihoZGMsIHNraWE6OlNrQ29sb3JUb0NPTE9S UkVGKGNvbG9yKSk7Ci0gICAgU2V0QmtNb2RlKGhkYywgVFJBTlNQQVJFTlQpOworICAgIGlmICho ZGMpIHsKKyAgICAgICAgU2V0VGV4dENvbG9yKGhkYywgc2tpYTo6U2tDb2xvclRvQ09MT1JSRUYo Y29sb3IpKTsKKyAgICAgICAgU2V0QmtNb2RlKGhkYywgVFJBTlNQQVJFTlQpOworICAgIH0KIAog ICAgIC8vIElmIHRoZXJlIGlzIGEgbm9uLWJsdXIgc2hhZG93IGFuZCBib3RoIHRoZSBmaWxsIGNv bG9yIGFuZCBzaGFkb3cgY29sb3IgCiAgICAgLy8gYXJlIG9wYXF1ZSwgaGFuZGxlIHdpdGhvdXQg c2tpYS4gCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL1Vu aXNjcmliZUhlbHBlci5jcHAgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL1Vu aXNjcmliZUhlbHBlci5jcHAKaW5kZXggMzliMDg0Ny4uYmNmNWE3NiAxMDA2NDQKLS0tIGEvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9VbmlzY3JpYmVIZWxwZXIuY3BwCisrKyBi L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vVW5pc2NyaWJlSGVscGVyLmNwcApA QCAtMzc1LDExICszNzUsMTMgQEAgdm9pZCBVbmlzY3JpYmVIZWxwZXI6OmRyYXcoR3JhcGhpY3ND b250ZXh0KiBncmFwaGljc0NvbnRleHQsCiAgICAgICAgICAgICAvLyBQYXNzIDAgaW4gd2hlbiB0 aGVyZSBpcyBubyBqdXN0aWZpY2F0aW9uLgogICAgICAgICAgICAgY29uc3QgaW50KiBqdXN0aWZ5 ID0gc2hhcGluZy5tX2p1c3RpZnkuc2l6ZSgpID09IDAgPyAwIDogJnNoYXBpbmcubV9qdXN0aWZ5 W2Zyb21HbHlwaF07CiAKLSAgICAgICAgICAgIGlmIChmaXJzdFJ1bikgewotICAgICAgICAgICAg ICAgIG9sZEZvbnQgPSBTZWxlY3RPYmplY3QoZGMsIHNoYXBpbmcubV9oZm9udCk7Ci0gICAgICAg ICAgICAgICAgZmlyc3RSdW4gPSBmYWxzZTsKLSAgICAgICAgICAgIH0gZWxzZQotICAgICAgICAg ICAgICAgIFNlbGVjdE9iamVjdChkYywgc2hhcGluZy5tX2hmb250KTsKKyAgICAgICAgICAgIGlm ICh1c2VXaW5kb3dzRHJhd2luZykgeworICAgICAgICAgICAgICAgIGlmIChmaXJzdFJ1bikgewor ICAgICAgICAgICAgICAgICAgICBvbGRGb250ID0gU2VsZWN0T2JqZWN0KGRjLCBzaGFwaW5nLm1f aGZvbnQpOworICAgICAgICAgICAgICAgICAgICBmaXJzdFJ1biA9IGZhbHNlOworICAgICAgICAg ICAgICAgIH0gZWxzZQorICAgICAgICAgICAgICAgICAgICBTZWxlY3RPYmplY3QoZGMsIHNoYXBp bmcubV9oZm9udCk7CisgICAgICAgICAgICB9CiAKICAgICAgICAgICAgIC8vIEZvbnRzIHdpdGgg ZGlmZmVyZW50IGFzY2VudHMgY2FuIGJlIHVzZWQgdG8gcmVuZGVyIGRpZmZlcmVudAogICAgICAg ICAgICAgLy8gcnVucy4gICdBY3Jvc3MtcnVucycgeS1jb29yZGluYXRlIGNvcnJlY3Rpb24gbmVl ZHMgdG8gYmU=