72137 2011-11-11 09:00:41 -0800 [chromium-mac] Enable vertical text using Skia 2011-11-15 08:17:48 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 caryclark caryclark reed senorblanco webkit.review.bot oldest_to_newest 500822 0 caryclark 2011-11-11 09:00:41 -0800 [chromium-mac] Enable vertical text using Skia 500829 1 114712 caryclark 2011-11-11 09:08:46 -0800 Created attachment 114712 Patch 500838 2 114712 senorblanco 2011-11-11 09:20:12 -0800 Comment on attachment 114712 Patch Code looks good. Will this require any image rebaselines? 502103 3 114989 caryclark 2011-11-14 11:07:48 -0800 Created attachment 114989 Patch 502104 4 caryclark 2011-11-14 11:09:50 -0800 Added exceptions to test_expectations 502107 5 webkit.review.bot 2011-11-14 11:10:07 -0800 Attachment 114989 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'LayoutTests/ChangeLog', u'LayoutTests/plat..." exit_code: 1 Last 3072 characters of output: /test_expectations.txt:3891: Path does not exist. fast/text/international/vertical-text-glyph-test.html [test/expectations] [2] LayoutTests/platform/chromium/test_expectations.txt:3892: Path does not exist. fast/text/justify-ideograph-vertical.html [test/expectations] [2] LayoutTests/platform/chromium/test_expectations.txt:3893: Path does not exist. fast/writing-mode/Kusa-Makura-background-canvas.html [test/expectations] [2] LayoutTests/platform/chromium/test_expectations.txt:3894: Path does not exist. fast/writing-mode/border-vertical-lr.html [test/expectations] [2] LayoutTests/platform/chromium/test_expectations.txt:3895: Path does not exist. fast/writing-mode/broken-ideographic-font.html [test/expectations] [2] LayoutTests/platform/chromium/test_expectations.txt:3896: Path does not exist. fast/writing-mode/fallback-orientation.html [test/expectations] [2] LayoutTests/platform/chromium/test_expectations.txt:3897: Path does not exist. fast/writing-mode/japanese-lr-text.html [test/expectations] [2] LayoutTests/platform/chromium/test_expectations.txt:3898: Path does not exist. fast/writing-mode/japanese-rl-text-with-broken-font.html [test/expectations] [2] LayoutTests/platform/chromium/test_expectations.txt:3899: Path does not exist. fast/writing-mode/japanese-rl-text-with-broken-font.html [test/expectations] [2] LayoutTests/platform/chromium/test_expectations.txt:3900: Path does not exist. fast/writing-mode/japanese-rl-text.html [test/expectations] [2] LayoutTests/platform/chromium/test_expectations.txt:3901: Path does not exist. fast/writing-mode/japanese-ruby-vertical-lr.html [test/expectations] [2] LayoutTests/platform/chromium/test_expectations.txt:3902: Path does not exist. fast/writing-mode/japanese-ruby-vertical-rl.html [test/expectations] [2] LayoutTests/platform/chromium/test_expectations.txt:3903: Path does not exist. fast/writing-mode/text-orientation-basic.html [test/expectations] [2] LayoutTests/platform/chromium/test_expectations.txt:3904: Path does not exist. fast/writing-mode/vertical-align-table-baseline.html [test/expectations] [2] LayoutTests/platform/chromium/test_expectations.txt:3905: Path does not exist. fast/writing-mode/vertical-baseline-alignment.html [test/expectations] [2] LayoutTests/platform/chromium/test_expectations.txt:3906: Path does not exist. fast/writing-mode/vertical-font-fallback.html [test/expectations] [2] LayoutTests/platform/chromium/test_expectations.txt:3908: Path does not exist. fast/loader/javascript-url-in-embed.html [test/expectations] [2] LayoutTests/platform/chromium/test_expectations.txt:3910: Path does not exist. security/crypto-random-values-types.html [test/expectations] [2] LayoutTests/platform/chromium/test_expectations.txt:3912: Path does not exist. media/track/track-webvtt-tc004-magic-header.html [test/expectations] [2] LayoutTests/platform/chromium/test_expectations.txt:3914: Path does not exist. http/tests/inspector/resource-tree/resource-tree-frame-add.html [test/expectations] [2] Total errors found: 2158 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 502117 6 reed 2011-11-14 11:15:38 -0800 *all* style checks are busted for now, so it has to be ignored. 502149 7 114989 senorblanco 2011-11-14 11:53:07 -0800 Comment on attachment 114989 Patch Looks good. r=me; leaving cq off until the EWS bots have chewed on it a bit. 502919 8 114989 webkit.review.bot 2011-11-15 08:17:43 -0800 Comment on attachment 114989 Patch Clearing flags on attachment: 114989 Committed r100283: <http://trac.webkit.org/changeset/100283> 502920 9 webkit.review.bot 2011-11-15 08:17:48 -0800 All reviewed patches have been landed. Closing bug. 114712 2011-11-11 09:08:46 -0800 2011-11-14 11:07:42 -0800 Patch bug-72137-20111111120844.patch text/plain 5301 caryclark SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDk5OTgyKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjkgQEAKKzIwMTEtMTEtMTEgIENhcnkgQ2xh cmsgIDxjYXJ5Y2xhcmtAZ29vZ2xlLmNvbT4KKworICAgICAgICBbY2hyb21pdW0tbWFjXSBFbmFi bGUgdmVydGljYWwgdGV4dCB1c2luZyBTa2lhCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD03MjEzNworCisgICAgICAgIFVzZSBTa2lhIHRvIGRyYXcgdmVy dGljYWwgdGV4dC4gVGhpcyBpcyBtdWNoCisgICAgICAgIGZhc3RlciBhbmQgaGFzIGhpZ2hlciBm aWRlbGl0eSB0aGFuIHRoZSBvbGQgbWV0aG9kCisgICAgICAgIG9mIGRyYXdpbmcgdGV4dCBvbiBh IHBhdGguCisKKyAgICAgICAgVGhlIGdyYXBoaWNzIGNvbnRleHQgcGFzc2VkIHRvIFNraWEgaGFz IGJlZW4KKyAgICAgICAgcm90YXRlZCA5MCBkZWdyZWVzIGJ1dCB0aGUgY2hhcmFjdGVyIGFkdmFu Y2VzCisgICAgICAgIGhhdmUgbm90LCBzbyBpdCBpcyBuZWNlc3NhcnkgdG8gdW5yb3RhdGUgdGhl IGNhbnZhcywKKyAgICAgICAgYW5kIHJlLXJvdGF0ZSB0aGUgcG9zaXRpb25zLgorCisgICAgICAg IFRoaXMgZ2VuZXJhdGVzIGNvcnJlY3Qgb3V0cHV0IChvciwgYXQgbGVhc3QsCisgICAgICAgIGNv bnNpc3RlbnQgd2l0aCBDaHJvbWl1bSBDRyBvbiBNYWMpIGZvciBhbGwgdmVydGljYWwKKyAgICAg ICAgdGV4dCB0ZXN0cywgb25lIG9mIHdoaWNoIGlzIG1lbnRpb25lZCBiZWxvdy4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUZXN0OiBmYXN0L3dyaXRp bmctbW9kZS90ZXh0LW9yaWVudGF0aW9uLWJhc2ljLmh0bWwKKworICAgICAgICAqIHBsYXRmb3Jt L2dyYXBoaWNzL3NraWEvRm9udFNraWEuY3BwOgorICAgICAgICAoV2ViQ29yZTo6c2V0dXBQYWlu dCk6CisgICAgICAgIChXZWJDb3JlOjpGb250OjpkcmF3R2x5cGhzKToKKwogMjAxMS0xMS0xMSAg R2F2aW4gUGV0ZXJzICA8Z2F2aW5wQGNocm9taXVtLm9yZz4KIAogICAgICAgICBQcm90ZWN0IERv Y3VtZW50IGR1cmluZyBlcnJvciByZXNwb25zZXMKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL3NraWEvRm9udFNraWEuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL3NraWEvRm9udFNraWEuY3BwCShyZXZpc2lvbiA5OTg5MikK KysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3NraWEvRm9udFNraWEuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC03OSw2ICs3OSw3IEBAIHN0YXRpYyB2b2lkIHNldHVwUGFpbnQoU2tQ YWludCogcGFpbnQsIGMKICAgICBwYWludC0+c2V0QW50aUFsaWFzKHNob3VsZEFudGlhbGlhcyk7 CiAgICAgcGFpbnQtPnNldEVtYmVkZGVkQml0bWFwVGV4dChmYWxzZSk7CiAgICAgcGFpbnQtPnNl dFRleHRTaXplKFNrRmxvYXRUb1NjYWxhcih0ZXh0U2l6ZSkpOworICAgIHBhaW50LT5zZXRWZXJ0 aWNhbFRleHQocGxhdGZvcm1EYXRhLm9yaWVudGF0aW9uKCkgPT0gVmVydGljYWwpOwogICAgIFNr VHlwZWZhY2UqIHR5cGVmYWNlID0gU2tDcmVhdGVUeXBlZmFjZUZyb21DVEZvbnQocGxhdGZvcm1E YXRhLmN0Rm9udCgpKTsKICAgICBTa0F1dG9VbnJlZiBhdXRvVW5yZWYodHlwZWZhY2UpOwogICAg IHBhaW50LT5zZXRUeXBlZmFjZSh0eXBlZmFjZSk7CkBAIC0xMjIsNiArMTIzLDggQEAgdm9pZCBG b250OjpkcmF3R2x5cGhzKEdyYXBoaWNzQ29udGV4dCogZwogICAgIFNrU2NhbGFyIHggPSBTa0Zs b2F0VG9TY2FsYXIocG9pbnQueCgpKTsKICAgICBTa1NjYWxhciB5ID0gU2tGbG9hdFRvU2NhbGFy KHBvaW50LnkoKSk7CiAKKyAgICBpZiAoZm9udC0+cGxhdGZvcm1EYXRhKCkub3JpZW50YXRpb24o KSA9PSBWZXJ0aWNhbCkKKyAgICAgICAgeSArPSBTa0Zsb2F0VG9TY2FsYXIoZm9udC0+Zm9udE1l dHJpY3MoKS5mbG9hdEFzY2VudChJZGVvZ3JhcGhpY0Jhc2VsaW5lKSAtIGZvbnQtPmZvbnRNZXRy aWNzKCkuZmxvYXRBc2NlbnQoKSk7CiAgICAgLy8gRklYTUU6IHRleHQgcmVuZGVyaW5nIHNwZWVk OgogICAgIC8vIEFuZHJvaWQgaGFzIGNvZGUgaW4gdGhlaXIgV2ViQ29yZSBmb3JrIHRvIHNwZWNp YWwgY2FzZSB3aGVuIHRoZQogICAgIC8vIEdseXBoQnVmZmVyIGhhcyBubyBhZHZhbmNlcyBvdGhl ciB0aGFuIHRoZSBkZWZhdWx0cy4gSW4gdGhhdCBjYXNlIHRoZQpAQCAtMTI5LDI0ICsxMzIsMjQg QEAgdm9pZCBGb250OjpkcmF3R2x5cGhzKEdyYXBoaWNzQ29udGV4dCogZwogICAgIC8vIHBhdGNo ZXMgbWF5IGJlIHVwc3RyZWFtZWQgdG8gV2ViS2l0IHNvIHdlIGFsd2F5cyB1c2UgdGhlIHNsb3dl ciBwYXRoCiAgICAgLy8gaGVyZS4KICAgICBjb25zdCBHbHlwaEJ1ZmZlckFkdmFuY2UqIGFkdiA9 IGdseXBoQnVmZmVyLmFkdmFuY2VzKGZyb20pOwotICAgIFNrQXV0b1NUTWFsbG9jPDMyLCBTa1Bv aW50PiBzdG9yYWdlKG51bUdseXBocyksIHN0b3JhZ2UyKG51bUdseXBocyksIHN0b3JhZ2UzKG51 bUdseXBocyk7CisgICAgU2tBdXRvU1RNYWxsb2M8MzIsIFNrUG9pbnQ+IHN0b3JhZ2UobnVtR2x5 cGhzKTsKICAgICBTa1BvaW50KiBwb3MgPSBzdG9yYWdlLmdldCgpOwotICAgIFNrUG9pbnQqIHZQ b3NCZWdpbiA9IHN0b3JhZ2UyLmdldCgpOwotICAgIFNrUG9pbnQqIHZQb3NFbmQgPSBzdG9yYWdl My5nZXQoKTsKIAotICAgIGJvb2wgaXNWZXJ0aWNhbCA9IGZvbnQtPnBsYXRmb3JtRGF0YSgpLm9y aWVudGF0aW9uKCkgPT0gVmVydGljYWw7CiAgICAgZm9yIChpbnQgaSA9IDA7IGkgPCBudW1HbHlw aHM7IGkrKykgewotICAgICAgICBTa1NjYWxhciBteVdpZHRoID0gU2tGbG9hdFRvU2NhbGFyKGFk dltpXS53aWR0aCk7CiAgICAgICAgIHBvc1tpXS5zZXQoeCwgeSk7Ci0gICAgICAgIGlmIChpc1Zl cnRpY2FsKSB7Ci0gICAgICAgICAgICB2UG9zQmVnaW5baV0uc2V0KHggKyBteVdpZHRoLCB5KTsK LSAgICAgICAgICAgIHZQb3NFbmRbaV0uc2V0KHggKyBteVdpZHRoLCB5IC0gbXlXaWR0aCk7Ci0g ICAgICAgIH0KLSAgICAgICAgeCArPSBteVdpZHRoOworICAgICAgICB4ICs9IFNrRmxvYXRUb1Nj YWxhcihhZHZbaV0ud2lkdGgpOwogICAgICAgICB5ICs9IFNrRmxvYXRUb1NjYWxhcihhZHZbaV0u aGVpZ2h0KTsKICAgICB9CiAKICAgICBTa0NhbnZhcyogY2FudmFzID0gZ2MtPnBsYXRmb3JtQ29u dGV4dCgpLT5jYW52YXMoKTsKKyAgICBpZiAoZm9udC0+cGxhdGZvcm1EYXRhKCkub3JpZW50YXRp b24oKSA9PSBWZXJ0aWNhbCkgeworICAgICAgICBjYW52YXMtPnNhdmUoKTsKKyAgICAgICAgY2Fu dmFzLT5yb3RhdGUoLTkwKTsKKyAgICAgICAgU2tNYXRyaXggcm90YXRvcjsKKyAgICAgICAgcm90 YXRvci5yZXNldCgpOworICAgICAgICByb3RhdG9yLnNldFJvdGF0ZSg5MCk7CisgICAgICAgIHJv dGF0b3IubWFwUG9pbnRzKHBvcywgbnVtR2x5cGhzKTsKKyAgICB9CiAgICAgVGV4dERyYXdpbmdN b2RlRmxhZ3MgdGV4dE1vZGUgPSBnYy0+cGxhdGZvcm1Db250ZXh0KCktPmdldFRleHREcmF3aW5n TW9kZSgpOwogCiAgICAgLy8gV2UgZHJhdyB0ZXh0IHVwIHRvIHR3byB0aW1lcyAob25jZSBmb3Ig ZmlsbCwgb25jZSBmb3Igc3Ryb2tlKS4KQEAgLTE1OCwxNiArMTYxLDcgQEAgdm9pZCBGb250Ojpk cmF3R2x5cGhzKEdyYXBoaWNzQ29udGV4dCogZwogICAgICAgICBwYWludC5zZXRUZXh0RW5jb2Rp bmcoU2tQYWludDo6a0dseXBoSURfVGV4dEVuY29kaW5nKTsKICAgICAgICAgcGFpbnQuc2V0Q29s b3IoZ2MtPmZpbGxDb2xvcigpLnJnYigpKTsKIAotICAgICAgICBpZiAoaXNWZXJ0aWNhbCkgewot ICAgICAgICAgICAgU2tQYXRoIHBhdGg7Ci0gICAgICAgICAgICBmb3IgKGludCBpID0gMDsgaSA8 IG51bUdseXBoczsgKytpKSB7Ci0gICAgICAgICAgICAgICAgcGF0aC5yZXNldCgpOwotICAgICAg ICAgICAgICAgIHBhdGgubW92ZVRvKHZQb3NCZWdpbltpXSk7Ci0gICAgICAgICAgICAgICAgcGF0 aC5saW5lVG8odlBvc0VuZFtpXSk7Ci0gICAgICAgICAgICAgICAgY2FudmFzLT5kcmF3VGV4dE9u UGF0aChnbHlwaHMgKyBpLCBzaXplb2YodWludDE2X3QpLCBwYXRoLCAwLCBwYWludCk7Ci0gICAg ICAgICAgICB9Ci0gICAgICAgIH0gZWxzZQotICAgICAgICAgICAgY2FudmFzLT5kcmF3UG9zVGV4 dChnbHlwaHMsIG51bUdseXBocyAqIHNpemVvZih1aW50MTZfdCksIHBvcywgcGFpbnQpOworICAg ICAgICBjYW52YXMtPmRyYXdQb3NUZXh0KGdseXBocywgbnVtR2x5cGhzICogc2l6ZW9mKHVpbnQx Nl90KSwgcG9zLCBwYWludCk7CiAgICAgfQogCiAgICAgaWYgKCh0ZXh0TW9kZSAmIFRleHRNb2Rl U3Ryb2tlKQpAQCAtMTg3LDE3ICsxODEsMTAgQEAgdm9pZCBGb250OjpkcmF3R2x5cGhzKEdyYXBo aWNzQ29udGV4dCogZwogICAgICAgICAgICAgcGFpbnQuc2V0TG9vcGVyKDApOwogICAgICAgICB9 CiAKLSAgICAgICAgaWYgKGlzVmVydGljYWwpIHsKLSAgICAgICAgICAgIFNrUGF0aCBwYXRoOwot ICAgICAgICAgICAgZm9yIChpbnQgaSA9IDA7IGkgPCBudW1HbHlwaHM7ICsraSkgewotICAgICAg ICAgICAgICAgIHBhdGgucmVzZXQoKTsKLSAgICAgICAgICAgICAgICBwYXRoLm1vdmVUbyh2UG9z QmVnaW5baV0pOwotICAgICAgICAgICAgICAgIHBhdGgubGluZVRvKHZQb3NFbmRbaV0pOwotICAg ICAgICAgICAgICAgIGNhbnZhcy0+ZHJhd1RleHRPblBhdGgoZ2x5cGhzICsgaSwgc2l6ZW9mKHVp bnQxNl90KSwgcGF0aCwgMCwgcGFpbnQpOwotICAgICAgICAgICAgfQotICAgICAgICB9IGVsc2UK LSAgICAgICAgICAgIGNhbnZhcy0+ZHJhd1Bvc1RleHQoZ2x5cGhzLCBudW1HbHlwaHMgKiBzaXpl b2YodWludDE2X3QpLCBwb3MsIHBhaW50KTsKKyAgICAgICAgY2FudmFzLT5kcmF3UG9zVGV4dChn bHlwaHMsIG51bUdseXBocyAqIHNpemVvZih1aW50MTZfdCksIHBvcywgcGFpbnQpOwogICAgIH0K KyAgICBpZiAoZm9udC0+cGxhdGZvcm1EYXRhKCkub3JpZW50YXRpb24oKSA9PSBWZXJ0aWNhbCkK KyAgICAgICAgY2FudmFzLT5yZXN0b3JlKCk7CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUK 114989 2011-11-14 11:07:48 -0800 2011-11-15 08:17:43 -0800 Patch bug-72137-20111114140746.patch text/plain 9069 caryclark SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEwMDE2MikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI5IEBACisyMDExLTExLTExICBDYXJ5IENs YXJrICA8Y2FyeWNsYXJrQGdvb2dsZS5jb20+CisKKyAgICAgICAgW2Nocm9taXVtLW1hY10gRW5h YmxlIHZlcnRpY2FsIHRleHQgdXNpbmcgU2tpYQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzIxMzcKKworICAgICAgICBVc2UgU2tpYSB0byBkcmF3IHZl cnRpY2FsIHRleHQuIFRoaXMgaXMgbXVjaAorICAgICAgICBmYXN0ZXIgYW5kIGhhcyBoaWdoZXIg ZmlkZWxpdHkgdGhhbiB0aGUgb2xkIG1ldGhvZAorICAgICAgICBvZiBkcmF3aW5nIHRleHQgb24g YSBwYXRoLgorCisgICAgICAgIFRoZSBncmFwaGljcyBjb250ZXh0IHBhc3NlZCB0byBTa2lhIGhh cyBiZWVuCisgICAgICAgIHJvdGF0ZWQgOTAgZGVncmVlcyBidXQgdGhlIGNoYXJhY3RlciBhZHZh bmNlcworICAgICAgICBoYXZlIG5vdCwgc28gaXQgaXMgbmVjZXNzYXJ5IHRvIHVucm90YXRlIHRo ZSBjYW52YXMsCisgICAgICAgIGFuZCByZS1yb3RhdGUgdGhlIHBvc2l0aW9ucy4KKworICAgICAg ICBUaGlzIGdlbmVyYXRlcyBjb3JyZWN0IG91dHB1dCAob3IsIGF0IGxlYXN0LAorICAgICAgICBj b25zaXN0ZW50IHdpdGggQ2hyb21pdW0gQ0cgb24gTWFjKSBmb3IgYWxsIHZlcnRpY2FsCisgICAg ICAgIHRleHQgdGVzdHMsIG9uZSBvZiB3aGljaCBpcyBtZW50aW9uZWQgYmVsb3cuCisgICAgICAg IAorICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUZXN0OiBm YXN0L3dyaXRpbmctbW9kZS90ZXh0LW9yaWVudGF0aW9uLWJhc2ljLmh0bWwKKworICAgICAgICAq IHBsYXRmb3JtL2dyYXBoaWNzL3NraWEvRm9udFNraWEuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 c2V0dXBQYWludCk6CisgICAgICAgIChXZWJDb3JlOjpGb250OjpkcmF3R2x5cGhzKToKKwogMjAx MS0xMS0wOCAgSmVyIE5vYmxlICA8amVyLm5vYmxlQGFwcGxlLmNvbT4KIAogICAgICAgICBJbXBs ZW1lbnQgTWVkaWFDb250cm9sbGVyLgpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3Mvc2tpYS9Gb250U2tpYS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3Mvc2tpYS9Gb250U2tpYS5jcHAJKHJldmlzaW9uIDEwMDE2MikKKysrIFNv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3NraWEvRm9udFNraWEuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC03OSw2ICs3OSw3IEBAIHN0YXRpYyB2b2lkIHNldHVwUGFpbnQoU2tQYWludCog cGFpbnQsIGMKICAgICBwYWludC0+c2V0QW50aUFsaWFzKHNob3VsZEFudGlhbGlhcyk7CiAgICAg cGFpbnQtPnNldEVtYmVkZGVkQml0bWFwVGV4dChmYWxzZSk7CiAgICAgcGFpbnQtPnNldFRleHRT aXplKFNrRmxvYXRUb1NjYWxhcih0ZXh0U2l6ZSkpOworICAgIHBhaW50LT5zZXRWZXJ0aWNhbFRl eHQocGxhdGZvcm1EYXRhLm9yaWVudGF0aW9uKCkgPT0gVmVydGljYWwpOwogICAgIFNrVHlwZWZh Y2UqIHR5cGVmYWNlID0gU2tDcmVhdGVUeXBlZmFjZUZyb21DVEZvbnQocGxhdGZvcm1EYXRhLmN0 Rm9udCgpKTsKICAgICBTa0F1dG9VbnJlZiBhdXRvVW5yZWYodHlwZWZhY2UpOwogICAgIHBhaW50 LT5zZXRUeXBlZmFjZSh0eXBlZmFjZSk7CkBAIC0xMjIsNiArMTIzLDggQEAgdm9pZCBGb250Ojpk cmF3R2x5cGhzKEdyYXBoaWNzQ29udGV4dCogZwogICAgIFNrU2NhbGFyIHggPSBTa0Zsb2F0VG9T Y2FsYXIocG9pbnQueCgpKTsKICAgICBTa1NjYWxhciB5ID0gU2tGbG9hdFRvU2NhbGFyKHBvaW50 LnkoKSk7CiAKKyAgICBpZiAoZm9udC0+cGxhdGZvcm1EYXRhKCkub3JpZW50YXRpb24oKSA9PSBW ZXJ0aWNhbCkKKyAgICAgICAgeSArPSBTa0Zsb2F0VG9TY2FsYXIoZm9udC0+Zm9udE1ldHJpY3Mo KS5mbG9hdEFzY2VudChJZGVvZ3JhcGhpY0Jhc2VsaW5lKSAtIGZvbnQtPmZvbnRNZXRyaWNzKCku ZmxvYXRBc2NlbnQoKSk7CiAgICAgLy8gRklYTUU6IHRleHQgcmVuZGVyaW5nIHNwZWVkOgogICAg IC8vIEFuZHJvaWQgaGFzIGNvZGUgaW4gdGhlaXIgV2ViQ29yZSBmb3JrIHRvIHNwZWNpYWwgY2Fz ZSB3aGVuIHRoZQogICAgIC8vIEdseXBoQnVmZmVyIGhhcyBubyBhZHZhbmNlcyBvdGhlciB0aGFu IHRoZSBkZWZhdWx0cy4gSW4gdGhhdCBjYXNlIHRoZQpAQCAtMTI5LDI0ICsxMzIsMjQgQEAgdm9p ZCBGb250OjpkcmF3R2x5cGhzKEdyYXBoaWNzQ29udGV4dCogZwogICAgIC8vIHBhdGNoZXMgbWF5 IGJlIHVwc3RyZWFtZWQgdG8gV2ViS2l0IHNvIHdlIGFsd2F5cyB1c2UgdGhlIHNsb3dlciBwYXRo CiAgICAgLy8gaGVyZS4KICAgICBjb25zdCBHbHlwaEJ1ZmZlckFkdmFuY2UqIGFkdiA9IGdseXBo QnVmZmVyLmFkdmFuY2VzKGZyb20pOwotICAgIFNrQXV0b1NUTWFsbG9jPDMyLCBTa1BvaW50PiBz dG9yYWdlKG51bUdseXBocyksIHN0b3JhZ2UyKG51bUdseXBocyksIHN0b3JhZ2UzKG51bUdseXBo cyk7CisgICAgU2tBdXRvU1RNYWxsb2M8MzIsIFNrUG9pbnQ+IHN0b3JhZ2UobnVtR2x5cGhzKTsK ICAgICBTa1BvaW50KiBwb3MgPSBzdG9yYWdlLmdldCgpOwotICAgIFNrUG9pbnQqIHZQb3NCZWdp biA9IHN0b3JhZ2UyLmdldCgpOwotICAgIFNrUG9pbnQqIHZQb3NFbmQgPSBzdG9yYWdlMy5nZXQo KTsKIAotICAgIGJvb2wgaXNWZXJ0aWNhbCA9IGZvbnQtPnBsYXRmb3JtRGF0YSgpLm9yaWVudGF0 aW9uKCkgPT0gVmVydGljYWw7CiAgICAgZm9yIChpbnQgaSA9IDA7IGkgPCBudW1HbHlwaHM7IGkr KykgewotICAgICAgICBTa1NjYWxhciBteVdpZHRoID0gU2tGbG9hdFRvU2NhbGFyKGFkdltpXS53 aWR0aCk7CiAgICAgICAgIHBvc1tpXS5zZXQoeCwgeSk7Ci0gICAgICAgIGlmIChpc1ZlcnRpY2Fs KSB7Ci0gICAgICAgICAgICB2UG9zQmVnaW5baV0uc2V0KHggKyBteVdpZHRoLCB5KTsKLSAgICAg ICAgICAgIHZQb3NFbmRbaV0uc2V0KHggKyBteVdpZHRoLCB5IC0gbXlXaWR0aCk7Ci0gICAgICAg IH0KLSAgICAgICAgeCArPSBteVdpZHRoOworICAgICAgICB4ICs9IFNrRmxvYXRUb1NjYWxhcihh ZHZbaV0ud2lkdGgpOwogICAgICAgICB5ICs9IFNrRmxvYXRUb1NjYWxhcihhZHZbaV0uaGVpZ2h0 KTsKICAgICB9CiAKICAgICBTa0NhbnZhcyogY2FudmFzID0gZ2MtPnBsYXRmb3JtQ29udGV4dCgp LT5jYW52YXMoKTsKKyAgICBpZiAoZm9udC0+cGxhdGZvcm1EYXRhKCkub3JpZW50YXRpb24oKSA9 PSBWZXJ0aWNhbCkgeworICAgICAgICBjYW52YXMtPnNhdmUoKTsKKyAgICAgICAgY2FudmFzLT5y b3RhdGUoLTkwKTsKKyAgICAgICAgU2tNYXRyaXggcm90YXRvcjsKKyAgICAgICAgcm90YXRvci5y ZXNldCgpOworICAgICAgICByb3RhdG9yLnNldFJvdGF0ZSg5MCk7CisgICAgICAgIHJvdGF0b3Iu bWFwUG9pbnRzKHBvcywgbnVtR2x5cGhzKTsKKyAgICB9CiAgICAgVGV4dERyYXdpbmdNb2RlRmxh Z3MgdGV4dE1vZGUgPSBnYy0+cGxhdGZvcm1Db250ZXh0KCktPmdldFRleHREcmF3aW5nTW9kZSgp OwogCiAgICAgLy8gV2UgZHJhdyB0ZXh0IHVwIHRvIHR3byB0aW1lcyAob25jZSBmb3IgZmlsbCwg b25jZSBmb3Igc3Ryb2tlKS4KQEAgLTE1OCwxNiArMTYxLDcgQEAgdm9pZCBGb250OjpkcmF3R2x5 cGhzKEdyYXBoaWNzQ29udGV4dCogZwogICAgICAgICBwYWludC5zZXRUZXh0RW5jb2RpbmcoU2tQ YWludDo6a0dseXBoSURfVGV4dEVuY29kaW5nKTsKICAgICAgICAgcGFpbnQuc2V0Q29sb3IoZ2Mt PmZpbGxDb2xvcigpLnJnYigpKTsKIAotICAgICAgICBpZiAoaXNWZXJ0aWNhbCkgewotICAgICAg ICAgICAgU2tQYXRoIHBhdGg7Ci0gICAgICAgICAgICBmb3IgKGludCBpID0gMDsgaSA8IG51bUds eXBoczsgKytpKSB7Ci0gICAgICAgICAgICAgICAgcGF0aC5yZXNldCgpOwotICAgICAgICAgICAg ICAgIHBhdGgubW92ZVRvKHZQb3NCZWdpbltpXSk7Ci0gICAgICAgICAgICAgICAgcGF0aC5saW5l VG8odlBvc0VuZFtpXSk7Ci0gICAgICAgICAgICAgICAgY2FudmFzLT5kcmF3VGV4dE9uUGF0aChn bHlwaHMgKyBpLCBzaXplb2YodWludDE2X3QpLCBwYXRoLCAwLCBwYWludCk7Ci0gICAgICAgICAg ICB9Ci0gICAgICAgIH0gZWxzZQotICAgICAgICAgICAgY2FudmFzLT5kcmF3UG9zVGV4dChnbHlw aHMsIG51bUdseXBocyAqIHNpemVvZih1aW50MTZfdCksIHBvcywgcGFpbnQpOworICAgICAgICBj YW52YXMtPmRyYXdQb3NUZXh0KGdseXBocywgbnVtR2x5cGhzICogc2l6ZW9mKHVpbnQxNl90KSwg cG9zLCBwYWludCk7CiAgICAgfQogCiAgICAgaWYgKCh0ZXh0TW9kZSAmIFRleHRNb2RlU3Ryb2tl KQpAQCAtMTg3LDE3ICsxODEsMTAgQEAgdm9pZCBGb250OjpkcmF3R2x5cGhzKEdyYXBoaWNzQ29u dGV4dCogZwogICAgICAgICAgICAgcGFpbnQuc2V0TG9vcGVyKDApOwogICAgICAgICB9CiAKLSAg ICAgICAgaWYgKGlzVmVydGljYWwpIHsKLSAgICAgICAgICAgIFNrUGF0aCBwYXRoOwotICAgICAg ICAgICAgZm9yIChpbnQgaSA9IDA7IGkgPCBudW1HbHlwaHM7ICsraSkgewotICAgICAgICAgICAg ICAgIHBhdGgucmVzZXQoKTsKLSAgICAgICAgICAgICAgICBwYXRoLm1vdmVUbyh2UG9zQmVnaW5b aV0pOwotICAgICAgICAgICAgICAgIHBhdGgubGluZVRvKHZQb3NFbmRbaV0pOwotICAgICAgICAg ICAgICAgIGNhbnZhcy0+ZHJhd1RleHRPblBhdGgoZ2x5cGhzICsgaSwgc2l6ZW9mKHVpbnQxNl90 KSwgcGF0aCwgMCwgcGFpbnQpOwotICAgICAgICAgICAgfQotICAgICAgICB9IGVsc2UKLSAgICAg ICAgICAgIGNhbnZhcy0+ZHJhd1Bvc1RleHQoZ2x5cGhzLCBudW1HbHlwaHMgKiBzaXplb2YodWlu dDE2X3QpLCBwb3MsIHBhaW50KTsKKyAgICAgICAgY2FudmFzLT5kcmF3UG9zVGV4dChnbHlwaHMs IG51bUdseXBocyAqIHNpemVvZih1aW50MTZfdCksIHBvcywgcGFpbnQpOwogICAgIH0KKyAgICBp ZiAoZm9udC0+cGxhdGZvcm1EYXRhKCkub3JpZW50YXRpb24oKSA9PSBWZXJ0aWNhbCkKKyAgICAg ICAgY2FudmFzLT5yZXN0b3JlKCk7CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKSW5kZXg6 IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9DaGFuZ2VM b2cJKHJldmlzaW9uIDEwMDE2MikKKysrIExheW91dFRlc3RzL0NoYW5nZUxvZwkod29ya2luZyBj b3B5KQpAQCAtMSwzICsxLDE0IEBACisyMDExLTExLTExICBDYXJ5IENsYXJrICA8Y2FyeWNsYXJr QGdvb2dsZS5jb20+CisKKyAgICAgICAgW2Nocm9taXVtLW1hY10gRW5hYmxlIHZlcnRpY2FsIHRl eHQgdXNpbmcgU2tpYQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9NzIxMzcKKworICAgICAgICBJZ25vcmUgdmVydGljYWwgdGV4dCB0ZXN0cyBvbiBTa2lh IG9uIE1hYyBmb3Igbm93LgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgICogcGxhdGZvcm0vY2hyb21pdW0vdGVzdF9leHBlY3RhdGlvbnMudHh0OgorCiAy MDExLTExLTExICBKZXIgTm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgogCiAgICAgICAgIElt cGxlbWVudCBNZWRpYUNvbnRyb2xsZXIuCkluZGV4OiBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9jaHJv bWl1bS90ZXN0X2V4cGVjdGF0aW9ucy50eHQKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvcGxh dGZvcm0vY2hyb21pdW0vdGVzdF9leHBlY3RhdGlvbnMudHh0CShyZXZpc2lvbiAxMDAxNjIpCisr KyBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9jaHJvbWl1bS90ZXN0X2V4cGVjdGF0aW9ucy50eHQJKHdv cmtpbmcgY29weSkKQEAgLTM4NzQsNiArMzg3NCwzNyBAQCBCVUdXSzcyMTMzIFNLSVAgTUFDIDog aHR0cC90ZXN0cy9pbnNwZWN0CiAKIEJVR1dLNTk1NTIgTUFDIERFQlVHIDogaHR0cC90ZXN0cy9z ZWN1cml0eS9jcm9zcy1mcmFtZS1hY2Nlc3MtY3VzdG9tLmh0bWwgPSBQQVNTIENSQVNICiAKKy8v IHVzZSBTa2lhIHRvIGRyYXcgdmVydGljYWwgdGV4dCBkaXJlY3RseSBpbnN0ZWFkIG9mIHRleHQt b24tcGF0aAorQlVHX0NBUllDTEFSSyBNQUMgQ1BVIDogZWRpdGluZy9zZWxlY3Rpb24vdmVydGlj YWwtbHItbHRyLWV4dGVuZC1saW5lLWJhY2t3YXJkLWJyLmh0bWwgPSBJTUFHRQorQlVHX0NBUllD TEFSSyBNQUMgQ1BVIDogZWRpdGluZy9zZWxlY3Rpb24vdmVydGljYWwtbHItbHRyLWV4dGVuZC1s aW5lLWZvcndhcmQtYnIuaHRtbCA9IElNQUdFCitCVUdfQ0FSWUNMQVJLIE1BQyBDUFUgOiBlZGl0 aW5nL3NlbGVjdGlvbi92ZXJ0aWNhbC1ybC1sdHItZXh0ZW5kLWxpbmUtYmFja3dhcmQtYnIuaHRt bCA9IElNQUdFCitCVUdfQ0FSWUNMQVJLIE1BQyBDUFUgOiBlZGl0aW5nL3NlbGVjdGlvbi92ZXJ0 aWNhbC1ybC1sdHItZXh0ZW5kLWxpbmUtYmFja3dhcmQtcC5odG1sID0gSU1BR0UKK0JVR19DQVJZ Q0xBUksgTUFDIENQVSA6IGVkaXRpbmcvc2VsZWN0aW9uL3ZlcnRpY2FsLXJsLWx0ci1leHRlbmQt bGluZS1iYWNrd2FyZC13cmFwLmh0bWwgPSBJTUFHRQorQlVHX0NBUllDTEFSSyBNQUMgQ1BVIDog ZWRpdGluZy9zZWxlY3Rpb24vdmVydGljYWwtcmwtbHRyLWV4dGVuZC1saW5lLWZvcndhcmQtYnIu aHRtbCA9IElNQUdFCitCVUdfQ0FSWUNMQVJLIE1BQyBDUFUgOiBlZGl0aW5nL3NlbGVjdGlvbi92 ZXJ0aWNhbC1ybC1sdHItZXh0ZW5kLWxpbmUtZm9yd2FyZC1wLmh0bWwgPSBJTUFHRQorQlVHX0NB UllDTEFSSyBNQUMgQ1BVIDogZWRpdGluZy9zZWxlY3Rpb24vdmVydGljYWwtcmwtbHRyLWV4dGVu ZC1saW5lLWZvcndhcmQtd3JhcC5odG1sID0gSU1BR0UKK0JVR19DQVJZQ0xBUksgTUFDIENQVSA6 IGZhc3QvZHluYW1pYy90ZXh0LWNvbWJpbmUuaHRtbCA9IElNQUdFCitCVUdfQ0FSWUNMQVJLIE1B QyBDUFUgOiBmYXN0L3JlcGFpbnQvamFwYW5lc2Utcmwtc2VsZWN0aW9uLWNsZWFyLmh0bWwgPSBJ TUFHRQorQlVHX0NBUllDTEFSSyBNQUMgQ1BVIDogZmFzdC9yZXBhaW50L2phcGFuZXNlLXJsLXNl bGVjdGlvbi1yZXBhaW50LWluLXJlZ2lvbnMuaHRtbCA9IElNQUdFCitCVUdfQ0FSWUNMQVJLIE1B QyBDUFUgOiBmYXN0L3JlcGFpbnQvamFwYW5lc2Utcmwtc2VsZWN0aW9uLXJlcGFpbnQuaHRtbCA9 IElNQUdFCitCVUdfQ0FSWUNMQVJLIE1BQyBDUFUgOiBmYXN0L3JlcGFpbnQvcmVwYWludC1hY3Jv c3Mtd3JpdGluZy1tb2RlLWJvdW5kYXJ5Lmh0bWwgPSBJTUFHRQorQlVHX0NBUllDTEFSSyBTTk9X TEVPUEFSRCBMSU9OIENQVSA6IGZhc3QvdGV4dC9pbnRlcm5hdGlvbmFsL3ZlcnRpY2FsLXRleHQt Z2x5cGgtdGVzdC5odG1sID0gSU1BR0UKK0JVR19DQVJZQ0xBUksgU05PV0xFT1BBUkQgTElPTiBD UFUgOiBmYXN0L3RleHQvanVzdGlmeS1pZGVvZ3JhcGgtdmVydGljYWwuaHRtbCA9IElNQUdFCitC VUdfQ0FSWUNMQVJLIE1BQyBDUFUgOiBmYXN0L3dyaXRpbmctbW9kZS9LdXNhLU1ha3VyYS1iYWNr Z3JvdW5kLWNhbnZhcy5odG1sID0gSU1BR0UKK0JVR19DQVJZQ0xBUksgTUFDIENQVSA6IGZhc3Qv d3JpdGluZy1tb2RlL2JvcmRlci12ZXJ0aWNhbC1sci5odG1sID0gSU1BR0UKK0JVR19DQVJZQ0xB UksgTUFDIENQVSA6IGZhc3Qvd3JpdGluZy1tb2RlL2Jyb2tlbi1pZGVvZ3JhcGhpYy1mb250Lmh0 bWwgPSBJTUFHRQorQlVHX0NBUllDTEFSSyBNQUMgQ1BVIDogZmFzdC93cml0aW5nLW1vZGUvZmFs bGJhY2stb3JpZW50YXRpb24uaHRtbCA9IElNQUdFCitCVUdfQ0FSWUNMQVJLIE1BQyBDUFUgOiBm YXN0L3dyaXRpbmctbW9kZS9qYXBhbmVzZS1sci10ZXh0Lmh0bWwgPSBJTUFHRQorQlVHX0NBUllD TEFSSyBMSU9OIENQVSA6IGZhc3Qvd3JpdGluZy1tb2RlL2phcGFuZXNlLXJsLXRleHQtd2l0aC1i cm9rZW4tZm9udC5odG1sID0gSU1BR0UKK0JVR19DQVJZQ0xBUksgU05PV0xFT1BBUkQgQ1BVIFJF TEVBU0UgOiBmYXN0L3dyaXRpbmctbW9kZS9qYXBhbmVzZS1ybC10ZXh0LXdpdGgtYnJva2VuLWZv bnQuaHRtbCA9IElNQUdFCitCVUdfQ0FSWUNMQVJLIE1BQyBDUFUgOiBmYXN0L3dyaXRpbmctbW9k ZS9qYXBhbmVzZS1ybC10ZXh0Lmh0bWwgPSBJTUFHRQorQlVHX0NBUllDTEFSSyBNQUMgQ1BVIDog ZmFzdC93cml0aW5nLW1vZGUvamFwYW5lc2UtcnVieS12ZXJ0aWNhbC1sci5odG1sID0gSU1BR0UK K0JVR19DQVJZQ0xBUksgTUFDIENQVSA6IGZhc3Qvd3JpdGluZy1tb2RlL2phcGFuZXNlLXJ1Ynkt dmVydGljYWwtcmwuaHRtbCA9IElNQUdFCitCVUdfQ0FSWUNMQVJLIFNOT1dMRU9QQVJEIExJT04g Q1BVIDogZmFzdC93cml0aW5nLW1vZGUvdGV4dC1vcmllbnRhdGlvbi1iYXNpYy5odG1sID0gSU1B R0UKK0JVR19DQVJZQ0xBUksgTUFDIENQVSA6IGZhc3Qvd3JpdGluZy1tb2RlL3ZlcnRpY2FsLWFs aWduLXRhYmxlLWJhc2VsaW5lLmh0bWwgPSBJTUFHRQorQlVHX0NBUllDTEFSSyBNQUMgQ1BVIDog ZmFzdC93cml0aW5nLW1vZGUvdmVydGljYWwtYmFzZWxpbmUtYWxpZ25tZW50Lmh0bWwgPSBJTUFH RQorQlVHX0NBUllDTEFSSyBNQUMgQ1BVIDogZmFzdC93cml0aW5nLW1vZGUvdmVydGljYWwtZm9u dC1mYWxsYmFjay5odG1sID0gSU1BR0UKKwogQlVHV0s3MjI3MSBNQUMgREVCVUcgOiBmYXN0L2xv YWRlci9qYXZhc2NyaXB0LXVybC1pbi1lbWJlZC5odG1sID0gUEFTUyBDUkFTSAogCiBCVUdXSzcy MjcyIFdJTiA6IHNlY3VyaXR5L2NyeXB0by1yYW5kb20tdmFsdWVzLXR5cGVzLmh0bWwgPSBURVhU IFBBU1MK