56026 2011-03-09 10:30:54 -0800 Make sure orientation is included in all places in FontPlatformDataLinux 2011-03-09 11:24:00 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 hyatt hyatt webkit.review.bot oldest_to_newest 364579 0 hyatt 2011-03-09 10:30:54 -0800 Make sure orientation is included in all places in FontPlatformDataLinux 364581 1 85191 hyatt 2011-03-09 10:31:16 -0800 Created attachment 85191 Patch 364583 2 85191 dglazkov 2011-03-09 10:32:25 -0800 Comment on attachment 85191 Patch activate Varon-T disruptors! 364599 3 85194 hyatt 2011-03-09 10:42:36 -0800 Created attachment 85194 Patch 364601 4 webkit.review.bot 2011-03-09 10:43:41 -0800 Attachment 85194 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCor..." exit_code: 1 Source/WebCore/platform/graphics/chromium/FontPlatformDataLinux.h:95: The parameter name "orientation" adds no information, so it should be removed. [readability/parameter_name] [5] Source/WebCore/platform/graphics/chromium/FontPlatformDataLinux.h:95: The parameter name "textOrientation" adds no information, so it should be removed. [readability/parameter_name] [5] Total errors found: 2 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 364609 5 85194 darin 2011-03-09 10:52:34 -0800 Comment on attachment 85194 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=85194&action=review >>> Source/WebCore/platform/graphics/chromium/FontPlatformDataLinux.h:95 >>> + FontPlatformData(SkTypeface*, const char* name, float textSize, bool fakeBold, bool fakeItalic, FontOrientation orientation = Horizontal, TextOrientation textOrientation = TextOrientationVerticalRight); >> >> The parameter name "orientation" adds no information, so it should be removed. [readability/parameter_name] [5] > > The parameter name "textOrientation" adds no information, so it should be removed. [readability/parameter_name] [5] I agree with the style bot! 364610 6 85196 hyatt 2011-03-09 10:54:56 -0800 Created attachment 85196 Sorry one more. Just completing it. 364613 7 85196 dglazkov 2011-03-09 10:56:35 -0800 Comment on attachment 85196 Sorry one more. Just completing it. rs=me. 364620 8 85198 hyatt 2011-03-09 11:06:59 -0800 Created attachment 85198 No really. This time I *really* mean it. 364645 9 hyatt 2011-03-09 11:24:00 -0800 Fixed. 85191 2011-03-09 10:31:16 -0800 2011-03-09 10:42:36 -0800 Patch patch.txt text/plain 1845 hyatt SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDgwNjUwKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTEtMDMtMDkgIERhdmlkIEh5 YXR0ICA8aHlhdHRAYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFBhdGNoIEZvbnRQbGF0Zm9ybURhdGFMaW51eCB0byBwcm9wZXJseSBp bml0aWFsaXplIGFuZCBjb3B5IG9yaWVudGF0aW9uIGluIGFsbCBwbGFjZXMuCisKKyAgICAgICAg KiBwbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9Gb250UGxhdGZvcm1EYXRhTGludXguY3BwOgor ICAgICAgICAoV2ViQ29yZTo6Rm9udFBsYXRmb3JtRGF0YTo6Rm9udFBsYXRmb3JtRGF0YSk6Cisg ICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vRm9udFBsYXRmb3JtRGF0YUxpbnV4 Lmg6CisgICAgICAgIChXZWJDb3JlOjpGb250UGxhdGZvcm1EYXRhOjpGb250UGxhdGZvcm1EYXRh KToKKwogMjAxMS0wMy0wOSAgU3RldmUgQmxvY2sgIDxzdGV2ZWJsb2NrQGdvb2dsZS5jb20+CiAK ICAgICAgICAgUmV2aWV3ZWQgYnkgSmVyZW15IE9ybG93LgpJbmRleDogU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vRm9udFBsYXRmb3JtRGF0YUxpbnV4LmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9Gb250 UGxhdGZvcm1EYXRhTGludXguY3BwCShyZXZpc2lvbiA4MDY0NikKKysrIFNvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0ZvbnRQbGF0Zm9ybURhdGFMaW51eC5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTEwMiw2ICsxMDIsNyBAQCBGb250UGxhdGZvcm1EYXRhOjpGb250UGxh dGZvcm1EYXRhKGNvbnN0CiAgICAgLCBtX2VtU2l6ZUluRm9udFVuaXRzKHNyYy5tX2VtU2l6ZUlu Rm9udFVuaXRzKQogICAgICwgbV9mYWtlQm9sZChzcmMubV9mYWtlQm9sZCkKICAgICAsIG1fZmFr ZUl0YWxpYyhzcmMubV9mYWtlSXRhbGljKQorICAgICwgbV9vcmllbnRhdGlvbihzcmMubV9vcmll bnRhdGlvbikKICAgICAsIG1faGFyZmJ1enpGYWNlKHNyYy5tX2hhcmZidXp6RmFjZSkKIHsKICAg ICBTa1NhZmVSZWYobV90eXBlZmFjZSk7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9jaHJvbWl1bS9Gb250UGxhdGZvcm1EYXRhTGludXguaAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9Gb250UGxhdGZvcm1EYXRh TGludXguaAkocmV2aXNpb24gODA2NDYpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9jaHJvbWl1bS9Gb250UGxhdGZvcm1EYXRhTGludXguaAkod29ya2luZyBjb3B5KQpAQCAt NjYsNiArNjYsNyBAQCBwdWJsaWM6CiAgICAgICAgICwgbV9lbVNpemVJbkZvbnRVbml0cygwKQog ICAgICAgICAsIG1fZmFrZUJvbGQoZmFsc2UpCiAgICAgICAgICwgbV9mYWtlSXRhbGljKGZhbHNl KQorICAgICAgICAsIG1fb3JpZW50YXRpb24oSG9yaXpvbnRhbCkKICAgICAgICAgeyB9CiAKICAg ICBGb250UGxhdGZvcm1EYXRhKCkK 85194 2011-03-09 10:42:36 -0800 2011-03-09 10:54:56 -0800 Patch patch.txt text/plain 5273 hyatt SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDgwNjUwKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTEtMDMtMDkgIERhdmlkIEh5 YXR0ICA8aHlhdHRAYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFBhdGNoIEZvbnRQbGF0Zm9ybURhdGFMaW51eCB0byBwcm9wZXJseSBp bml0aWFsaXplIGFuZCBjb3B5IG9yaWVudGF0aW9uIGluIGFsbCBwbGFjZXMuCisKKyAgICAgICAg KiBwbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9Gb250UGxhdGZvcm1EYXRhTGludXguY3BwOgor ICAgICAgICAoV2ViQ29yZTo6Rm9udFBsYXRmb3JtRGF0YTo6Rm9udFBsYXRmb3JtRGF0YSk6Cisg ICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vRm9udFBsYXRmb3JtRGF0YUxpbnV4 Lmg6CisgICAgICAgIChXZWJDb3JlOjpGb250UGxhdGZvcm1EYXRhOjpGb250UGxhdGZvcm1EYXRh KToKKwogMjAxMS0wMy0wOSAgU3RldmUgQmxvY2sgIDxzdGV2ZWJsb2NrQGdvb2dsZS5jb20+CiAK ICAgICAgICAgUmV2aWV3ZWQgYnkgSmVyZW15IE9ybG93LgpJbmRleDogU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vRm9udFBsYXRmb3JtRGF0YUxpbnV4LmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9Gb250 UGxhdGZvcm1EYXRhTGludXguY3BwCShyZXZpc2lvbiA4MDY0NikKKysrIFNvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0ZvbnRQbGF0Zm9ybURhdGFMaW51eC5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTc2LDEzICs3NiwxNCBAQCBGb250UGxhdGZvcm1EYXRhOjpGb250UGxh dGZvcm1EYXRhKGNvbnN0CiAgICAgLCBtX2Zha2VCb2xkKHNyYy5tX2Zha2VCb2xkKQogICAgICwg bV9mYWtlSXRhbGljKHNyYy5tX2Zha2VJdGFsaWMpCiAgICAgLCBtX29yaWVudGF0aW9uKHNyYy5t X29yaWVudGF0aW9uKQorICAgICwgbV90ZXh0T3JpZW50YXRpb24oc3JjLm1fdGV4dE9yaWVudGF0 aW9uKQogICAgICwgbV9zdHlsZShzcmMubV9zdHlsZSkKICAgICAsIG1faGFyZmJ1enpGYWNlKHNy Yy5tX2hhcmZidXp6RmFjZSkKIHsKICAgICBTa1NhZmVSZWYobV90eXBlZmFjZSk7CiB9CiAKLUZv bnRQbGF0Zm9ybURhdGE6OkZvbnRQbGF0Zm9ybURhdGEoU2tUeXBlZmFjZSogdGYsIGNvbnN0IGNo YXIqIGZhbWlseSwgZmxvYXQgdGV4dFNpemUsIGJvb2wgZmFrZUJvbGQsIGJvb2wgZmFrZUl0YWxp YywgRm9udE9yaWVudGF0aW9uIG9yaWVudGF0aW9uKQorRm9udFBsYXRmb3JtRGF0YTo6Rm9udFBs YXRmb3JtRGF0YShTa1R5cGVmYWNlKiB0ZiwgY29uc3QgY2hhciogZmFtaWx5LCBmbG9hdCB0ZXh0 U2l6ZSwgYm9vbCBmYWtlQm9sZCwgYm9vbCBmYWtlSXRhbGljLCBGb250T3JpZW50YXRpb24gb3Jp ZW50YXRpb24sIFRleHRPcmllbnRhdGlvbiB0ZXh0T3JpZW50YXRpb24pCiAgICAgOiBtX3R5cGVm YWNlKHRmKQogICAgICwgbV9mYW1pbHkoZmFtaWx5KQogICAgICwgbV90ZXh0U2l6ZSh0ZXh0U2l6 ZSkKQEAgLTkwLDYgKzkxLDcgQEAgRm9udFBsYXRmb3JtRGF0YTo6Rm9udFBsYXRmb3JtRGF0YShT a1R5cAogICAgICwgbV9mYWtlQm9sZChmYWtlQm9sZCkKICAgICAsIG1fZmFrZUl0YWxpYyhmYWtl SXRhbGljKQogICAgICwgbV9vcmllbnRhdGlvbihvcmllbnRhdGlvbikKKyAgICAsIG1fdGV4dE9y aWVudGF0aW9uKHRleHRPcmllbnRhdGlvbikKIHsKICAgICBTa1NhZmVSZWYobV90eXBlZmFjZSk7 CiAgICAgcXVlcnlTeXN0ZW1Gb3JSZW5kZXJTdHlsZSgpOwpAQCAtMTAyLDYgKzEwNCw4IEBAIEZv bnRQbGF0Zm9ybURhdGE6OkZvbnRQbGF0Zm9ybURhdGEoY29uc3QKICAgICAsIG1fZW1TaXplSW5G b250VW5pdHMoc3JjLm1fZW1TaXplSW5Gb250VW5pdHMpCiAgICAgLCBtX2Zha2VCb2xkKHNyYy5t X2Zha2VCb2xkKQogICAgICwgbV9mYWtlSXRhbGljKHNyYy5tX2Zha2VJdGFsaWMpCisgICAgLCBt X29yaWVudGF0aW9uKHNyYy5tX29yaWVudGF0aW9uKQorICAgICwgbV90ZXh0T3JpZW50YXRpb24o c3JjLm1fdGV4dE9yaWVudGF0aW9uKQogICAgICwgbV9oYXJmYnV6ekZhY2Uoc3JjLm1faGFyZmJ1 enpGYWNlKQogewogICAgIFNrU2FmZVJlZihtX3R5cGVmYWNlKTsKQEAgLTEzNCw2ICsxMzgsNyBA QCBGb250UGxhdGZvcm1EYXRhJiBGb250UGxhdGZvcm1EYXRhOjpvcGVyCiAgICAgbV9mYWtlSXRh bGljID0gc3JjLm1fZmFrZUl0YWxpYzsKICAgICBtX2hhcmZidXp6RmFjZSA9IHNyYy5tX2hhcmZi dXp6RmFjZTsKICAgICBtX29yaWVudGF0aW9uID0gc3JjLm1fb3JpZW50YXRpb247CisgICAgbV90 ZXh0T3JpZW50YXRpb24gPSBzcmMubV90ZXh0T3JpZW50YXRpb247CiAgICAgbV9zdHlsZSA9IHNy Yy5tX3N0eWxlOwogICAgIG1fZW1TaXplSW5Gb250VW5pdHMgPSBzcmMubV9lbVNpemVJbkZvbnRV bml0czsKIApAQCAtMTk5LDEzICsyMDQsMTQgQEAgYm9vbCBGb250UGxhdGZvcm1EYXRhOjpvcGVy YXRvcj09KGNvbnN0IAogICAgICAgICAmJiBtX2Zha2VCb2xkID09IGEubV9mYWtlQm9sZAogICAg ICAgICAmJiBtX2Zha2VJdGFsaWMgPT0gYS5tX2Zha2VJdGFsaWMKICAgICAgICAgJiYgbV9vcmll bnRhdGlvbiA9PSBhLm1fb3JpZW50YXRpb24KKyAgICAgICAgJiYgbV90ZXh0T3JpZW50YXRpb24g PT0gYS5tX3RleHRPcmllbnRhdGlvbgogICAgICAgICAmJiBtX3N0eWxlID09IGEubV9zdHlsZTsK IH0KIAogdW5zaWduZWQgRm9udFBsYXRmb3JtRGF0YTo6aGFzaCgpIGNvbnN0CiB7CiAgICAgdW5z aWduZWQgaCA9IFNrVHlwZWZhY2U6OlVuaXF1ZUlEKG1fdHlwZWZhY2UpOwotICAgIGggXj0gMHgw MTAxMDEwMSAqICgoc3RhdGljX2Nhc3Q8aW50PihtX29yaWVudGF0aW9uKSA8PCAyKSB8IChzdGF0 aWNfY2FzdDxpbnQ+KG1fZmFrZUJvbGQpIDw8IDEpIHwgc3RhdGljX2Nhc3Q8aW50PihtX2Zha2VJ dGFsaWMpKTsKKyAgICBoIF49IDB4MDEwMTAxMDEgKiAoKHN0YXRpY19jYXN0PGludD4obV90ZXh0 T3JpZW50YXRpb24pIDw8IDMpIHwgKHN0YXRpY19jYXN0PGludD4obV9vcmllbnRhdGlvbikgPDwg MikgfCAoc3RhdGljX2Nhc3Q8aW50PihtX2Zha2VCb2xkKSA8PCAxKSB8IHN0YXRpY19jYXN0PGlu dD4obV9mYWtlSXRhbGljKSk7CiAKICAgICAvLyBUaGlzIG1lbWNweSBpcyB0byBhdm9pZCBhIHJl aW50ZXJwcmV0X2Nhc3QgdGhhdCBicmVha3Mgc3RyaWN0LWFsaWFzaW5nCiAgICAgLy8gcnVsZXMu IE1lbWNweSBpcyBnZW5lcmFsbHkgb3B0aW1pemVkIGVub3VnaCBzbyB0aGF0IHBlcmZvcm1hbmNl IGRvZXNuJ3QKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVt L0ZvbnRQbGF0Zm9ybURhdGFMaW51eC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0ZvbnRQbGF0Zm9ybURhdGFMaW51eC5oCShyZXZpc2lv biA4MDY0NikKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0Zv bnRQbGF0Zm9ybURhdGFMaW51eC5oCSh3b3JraW5nIGNvcHkpCkBAIC0zMyw2ICszMyw3IEBACiAK ICNpbmNsdWRlICJGb250T3JpZW50YXRpb24uaCIKICNpbmNsdWRlICJGb250UmVuZGVyU3R5bGUu aCIKKyNpbmNsdWRlICJUZXh0T3JpZW50YXRpb24uaCIKICNpbmNsdWRlIDx3dGYvRm9yd2FyZC5o PgogI2luY2x1ZGUgPHd0Zi9SZWZQdHIuaD4KICNpbmNsdWRlIDx3dGYvdGV4dC9DU3RyaW5nLmg+ CkBAIC02Niw2ICs2Nyw4IEBAIHB1YmxpYzoKICAgICAgICAgLCBtX2VtU2l6ZUluRm9udFVuaXRz KDApCiAgICAgICAgICwgbV9mYWtlQm9sZChmYWxzZSkKICAgICAgICAgLCBtX2Zha2VJdGFsaWMo ZmFsc2UpCisgICAgICAgICwgbV9vcmllbnRhdGlvbihIb3Jpem9udGFsKQorICAgICAgICAsIG1f dGV4dE9yaWVudGF0aW9uKFRleHRPcmllbnRhdGlvblZlcnRpY2FsUmlnaHQpCiAgICAgICAgIHsg fQogCiAgICAgRm9udFBsYXRmb3JtRGF0YSgpCkBAIC03NSw2ICs3OCw3IEBAIHB1YmxpYzoKICAg ICAgICAgLCBtX2Zha2VCb2xkKGZhbHNlKQogICAgICAgICAsIG1fZmFrZUl0YWxpYyhmYWxzZSkK ICAgICAgICAgLCBtX29yaWVudGF0aW9uKEhvcml6b250YWwpCisgICAgICAgICwgbV90ZXh0T3Jp ZW50YXRpb24oVGV4dE9yaWVudGF0aW9uVmVydGljYWxSaWdodCkKICAgICAgICAgeyB9CiAKICAg ICBGb250UGxhdGZvcm1EYXRhKGZsb2F0IHRleHRTaXplLCBib29sIGZha2VCb2xkLCBib29sIGZh a2VJdGFsaWMpCkBAIC04NCwxMCArODgsMTEgQEAgcHVibGljOgogICAgICAgICAsIG1fZmFrZUJv bGQoZmFrZUJvbGQpCiAgICAgICAgICwgbV9mYWtlSXRhbGljKGZha2VJdGFsaWMpCiAgICAgICAg ICwgbV9vcmllbnRhdGlvbihIb3Jpem9udGFsKQorICAgICAgICAsIG1fdGV4dE9yaWVudGF0aW9u KFRleHRPcmllbnRhdGlvblZlcnRpY2FsUmlnaHQpCiAgICAgICAgIHsgfQogCiAgICAgRm9udFBs YXRmb3JtRGF0YShjb25zdCBGb250UGxhdGZvcm1EYXRhJik7Ci0gICAgRm9udFBsYXRmb3JtRGF0 YShTa1R5cGVmYWNlKiwgY29uc3QgY2hhciogbmFtZSwgZmxvYXQgdGV4dFNpemUsIGJvb2wgZmFr ZUJvbGQsIGJvb2wgZmFrZUl0YWxpYywgRm9udE9yaWVudGF0aW9uIG9yaWVudGF0aW9uID0gSG9y aXpvbnRhbCk7CisgICAgRm9udFBsYXRmb3JtRGF0YShTa1R5cGVmYWNlKiwgY29uc3QgY2hhciog bmFtZSwgZmxvYXQgdGV4dFNpemUsIGJvb2wgZmFrZUJvbGQsIGJvb2wgZmFrZUl0YWxpYywgRm9u dE9yaWVudGF0aW9uIG9yaWVudGF0aW9uID0gSG9yaXpvbnRhbCwgVGV4dE9yaWVudGF0aW9uIHRl eHRPcmllbnRhdGlvbiA9IFRleHRPcmllbnRhdGlvblZlcnRpY2FsUmlnaHQpOwogICAgIEZvbnRQ bGF0Zm9ybURhdGEoY29uc3QgRm9udFBsYXRmb3JtRGF0YSYgc3JjLCBmbG9hdCB0ZXh0U2l6ZSk7 CiAgICAgfkZvbnRQbGF0Zm9ybURhdGEoKTsKIAo= 85196 2011-03-09 10:54:56 -0800 2011-03-09 11:06:59 -0800 Sorry one more. Just completing it. patch.txt text/plain 6843 hyatt SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDgwNjUwKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTEtMDMtMDkgIERhdmlkIEh5 YXR0ICA8aHlhdHRAYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFBhdGNoIEZvbnRQbGF0Zm9ybURhdGFMaW51eCB0byBwcm9wZXJseSBp bml0aWFsaXplIGFuZCBjb3B5IG9yaWVudGF0aW9uIGluIGFsbCBwbGFjZXMuCisKKyAgICAgICAg KiBwbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9Gb250UGxhdGZvcm1EYXRhTGludXguY3BwOgor ICAgICAgICAoV2ViQ29yZTo6Rm9udFBsYXRmb3JtRGF0YTo6Rm9udFBsYXRmb3JtRGF0YSk6Cisg ICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vRm9udFBsYXRmb3JtRGF0YUxpbnV4 Lmg6CisgICAgICAgIChXZWJDb3JlOjpGb250UGxhdGZvcm1EYXRhOjpGb250UGxhdGZvcm1EYXRh KToKKwogMjAxMS0wMy0wOSAgU3RldmUgQmxvY2sgIDxzdGV2ZWJsb2NrQGdvb2dsZS5jb20+CiAK ICAgICAgICAgUmV2aWV3ZWQgYnkgSmVyZW15IE9ybG93LgpJbmRleDogU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vRm9udFBsYXRmb3JtRGF0YUxpbnV4LmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9Gb250 UGxhdGZvcm1EYXRhTGludXguY3BwCShyZXZpc2lvbiA4MDY0NikKKysrIFNvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0ZvbnRQbGF0Zm9ybURhdGFMaW51eC5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTc2LDEzICs3NiwxNCBAQCBGb250UGxhdGZvcm1EYXRhOjpGb250UGxh dGZvcm1EYXRhKGNvbnN0CiAgICAgLCBtX2Zha2VCb2xkKHNyYy5tX2Zha2VCb2xkKQogICAgICwg bV9mYWtlSXRhbGljKHNyYy5tX2Zha2VJdGFsaWMpCiAgICAgLCBtX29yaWVudGF0aW9uKHNyYy5t X29yaWVudGF0aW9uKQorICAgICwgbV90ZXh0T3JpZW50YXRpb24oc3JjLm1fdGV4dE9yaWVudGF0 aW9uKQogICAgICwgbV9zdHlsZShzcmMubV9zdHlsZSkKICAgICAsIG1faGFyZmJ1enpGYWNlKHNy Yy5tX2hhcmZidXp6RmFjZSkKIHsKICAgICBTa1NhZmVSZWYobV90eXBlZmFjZSk7CiB9CiAKLUZv bnRQbGF0Zm9ybURhdGE6OkZvbnRQbGF0Zm9ybURhdGEoU2tUeXBlZmFjZSogdGYsIGNvbnN0IGNo YXIqIGZhbWlseSwgZmxvYXQgdGV4dFNpemUsIGJvb2wgZmFrZUJvbGQsIGJvb2wgZmFrZUl0YWxp YywgRm9udE9yaWVudGF0aW9uIG9yaWVudGF0aW9uKQorRm9udFBsYXRmb3JtRGF0YTo6Rm9udFBs YXRmb3JtRGF0YShTa1R5cGVmYWNlKiB0ZiwgY29uc3QgY2hhciogZmFtaWx5LCBmbG9hdCB0ZXh0 U2l6ZSwgYm9vbCBmYWtlQm9sZCwgYm9vbCBmYWtlSXRhbGljLCBGb250T3JpZW50YXRpb24gb3Jp ZW50YXRpb24sIFRleHRPcmllbnRhdGlvbiB0ZXh0T3JpZW50YXRpb24pCiAgICAgOiBtX3R5cGVm YWNlKHRmKQogICAgICwgbV9mYW1pbHkoZmFtaWx5KQogICAgICwgbV90ZXh0U2l6ZSh0ZXh0U2l6 ZSkKQEAgLTkwLDYgKzkxLDcgQEAgRm9udFBsYXRmb3JtRGF0YTo6Rm9udFBsYXRmb3JtRGF0YShT a1R5cAogICAgICwgbV9mYWtlQm9sZChmYWtlQm9sZCkKICAgICAsIG1fZmFrZUl0YWxpYyhmYWtl SXRhbGljKQogICAgICwgbV9vcmllbnRhdGlvbihvcmllbnRhdGlvbikKKyAgICAsIG1fdGV4dE9y aWVudGF0aW9uKHRleHRPcmllbnRhdGlvbikKIHsKICAgICBTa1NhZmVSZWYobV90eXBlZmFjZSk7 CiAgICAgcXVlcnlTeXN0ZW1Gb3JSZW5kZXJTdHlsZSgpOwpAQCAtMTAyLDYgKzEwNCw4IEBAIEZv bnRQbGF0Zm9ybURhdGE6OkZvbnRQbGF0Zm9ybURhdGEoY29uc3QKICAgICAsIG1fZW1TaXplSW5G b250VW5pdHMoc3JjLm1fZW1TaXplSW5Gb250VW5pdHMpCiAgICAgLCBtX2Zha2VCb2xkKHNyYy5t X2Zha2VCb2xkKQogICAgICwgbV9mYWtlSXRhbGljKHNyYy5tX2Zha2VJdGFsaWMpCisgICAgLCBt X29yaWVudGF0aW9uKHNyYy5tX29yaWVudGF0aW9uKQorICAgICwgbV90ZXh0T3JpZW50YXRpb24o c3JjLm1fdGV4dE9yaWVudGF0aW9uKQogICAgICwgbV9oYXJmYnV6ekZhY2Uoc3JjLm1faGFyZmJ1 enpGYWNlKQogewogICAgIFNrU2FmZVJlZihtX3R5cGVmYWNlKTsKQEAgLTEzNCw2ICsxMzgsNyBA QCBGb250UGxhdGZvcm1EYXRhJiBGb250UGxhdGZvcm1EYXRhOjpvcGVyCiAgICAgbV9mYWtlSXRh bGljID0gc3JjLm1fZmFrZUl0YWxpYzsKICAgICBtX2hhcmZidXp6RmFjZSA9IHNyYy5tX2hhcmZi dXp6RmFjZTsKICAgICBtX29yaWVudGF0aW9uID0gc3JjLm1fb3JpZW50YXRpb247CisgICAgbV90 ZXh0T3JpZW50YXRpb24gPSBzcmMubV90ZXh0T3JpZW50YXRpb247CiAgICAgbV9zdHlsZSA9IHNy Yy5tX3N0eWxlOwogICAgIG1fZW1TaXplSW5Gb250VW5pdHMgPSBzcmMubV9lbVNpemVJbkZvbnRV bml0czsKIApAQCAtMTk5LDEzICsyMDQsMTQgQEAgYm9vbCBGb250UGxhdGZvcm1EYXRhOjpvcGVy YXRvcj09KGNvbnN0IAogICAgICAgICAmJiBtX2Zha2VCb2xkID09IGEubV9mYWtlQm9sZAogICAg ICAgICAmJiBtX2Zha2VJdGFsaWMgPT0gYS5tX2Zha2VJdGFsaWMKICAgICAgICAgJiYgbV9vcmll bnRhdGlvbiA9PSBhLm1fb3JpZW50YXRpb24KKyAgICAgICAgJiYgbV90ZXh0T3JpZW50YXRpb24g PT0gYS5tX3RleHRPcmllbnRhdGlvbgogICAgICAgICAmJiBtX3N0eWxlID09IGEubV9zdHlsZTsK IH0KIAogdW5zaWduZWQgRm9udFBsYXRmb3JtRGF0YTo6aGFzaCgpIGNvbnN0CiB7CiAgICAgdW5z aWduZWQgaCA9IFNrVHlwZWZhY2U6OlVuaXF1ZUlEKG1fdHlwZWZhY2UpOwotICAgIGggXj0gMHgw MTAxMDEwMSAqICgoc3RhdGljX2Nhc3Q8aW50PihtX29yaWVudGF0aW9uKSA8PCAyKSB8IChzdGF0 aWNfY2FzdDxpbnQ+KG1fZmFrZUJvbGQpIDw8IDEpIHwgc3RhdGljX2Nhc3Q8aW50PihtX2Zha2VJ dGFsaWMpKTsKKyAgICBoIF49IDB4MDEwMTAxMDEgKiAoKHN0YXRpY19jYXN0PGludD4obV90ZXh0 T3JpZW50YXRpb24pIDw8IDMpIHwgKHN0YXRpY19jYXN0PGludD4obV9vcmllbnRhdGlvbikgPDwg MikgfCAoc3RhdGljX2Nhc3Q8aW50PihtX2Zha2VCb2xkKSA8PCAxKSB8IHN0YXRpY19jYXN0PGlu dD4obV9mYWtlSXRhbGljKSk7CiAKICAgICAvLyBUaGlzIG1lbWNweSBpcyB0byBhdm9pZCBhIHJl aW50ZXJwcmV0X2Nhc3QgdGhhdCBicmVha3Mgc3RyaWN0LWFsaWFzaW5nCiAgICAgLy8gcnVsZXMu IE1lbWNweSBpcyBnZW5lcmFsbHkgb3B0aW1pemVkIGVub3VnaCBzbyB0aGF0IHBlcmZvcm1hbmNl IGRvZXNuJ3QKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVt L0ZvbnRQbGF0Zm9ybURhdGFMaW51eC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0ZvbnRQbGF0Zm9ybURhdGFMaW51eC5oCShyZXZpc2lv biA4MDY0NikKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0Zv bnRQbGF0Zm9ybURhdGFMaW51eC5oCSh3b3JraW5nIGNvcHkpCkBAIC0zMyw2ICszMyw3IEBACiAK ICNpbmNsdWRlICJGb250T3JpZW50YXRpb24uaCIKICNpbmNsdWRlICJGb250UmVuZGVyU3R5bGUu aCIKKyNpbmNsdWRlICJUZXh0T3JpZW50YXRpb24uaCIKICNpbmNsdWRlIDx3dGYvRm9yd2FyZC5o PgogI2luY2x1ZGUgPHd0Zi9SZWZQdHIuaD4KICNpbmNsdWRlIDx3dGYvdGV4dC9DU3RyaW5nLmg+ CkBAIC02Niw2ICs2Nyw4IEBAIHB1YmxpYzoKICAgICAgICAgLCBtX2VtU2l6ZUluRm9udFVuaXRz KDApCiAgICAgICAgICwgbV9mYWtlQm9sZChmYWxzZSkKICAgICAgICAgLCBtX2Zha2VJdGFsaWMo ZmFsc2UpCisgICAgICAgICwgbV9vcmllbnRhdGlvbihIb3Jpem9udGFsKQorICAgICAgICAsIG1f dGV4dE9yaWVudGF0aW9uKFRleHRPcmllbnRhdGlvblZlcnRpY2FsUmlnaHQpCiAgICAgICAgIHsg fQogCiAgICAgRm9udFBsYXRmb3JtRGF0YSgpCkBAIC03NSw2ICs3OCw3IEBAIHB1YmxpYzoKICAg ICAgICAgLCBtX2Zha2VCb2xkKGZhbHNlKQogICAgICAgICAsIG1fZmFrZUl0YWxpYyhmYWxzZSkK ICAgICAgICAgLCBtX29yaWVudGF0aW9uKEhvcml6b250YWwpCisgICAgICAgICwgbV90ZXh0T3Jp ZW50YXRpb24oVGV4dE9yaWVudGF0aW9uVmVydGljYWxSaWdodCkKICAgICAgICAgeyB9CiAKICAg ICBGb250UGxhdGZvcm1EYXRhKGZsb2F0IHRleHRTaXplLCBib29sIGZha2VCb2xkLCBib29sIGZh a2VJdGFsaWMpCkBAIC04NCwxMCArODgsMTEgQEAgcHVibGljOgogICAgICAgICAsIG1fZmFrZUJv bGQoZmFrZUJvbGQpCiAgICAgICAgICwgbV9mYWtlSXRhbGljKGZha2VJdGFsaWMpCiAgICAgICAg ICwgbV9vcmllbnRhdGlvbihIb3Jpem9udGFsKQorICAgICAgICAsIG1fdGV4dE9yaWVudGF0aW9u KFRleHRPcmllbnRhdGlvblZlcnRpY2FsUmlnaHQpCiAgICAgICAgIHsgfQogCiAgICAgRm9udFBs YXRmb3JtRGF0YShjb25zdCBGb250UGxhdGZvcm1EYXRhJik7Ci0gICAgRm9udFBsYXRmb3JtRGF0 YShTa1R5cGVmYWNlKiwgY29uc3QgY2hhciogbmFtZSwgZmxvYXQgdGV4dFNpemUsIGJvb2wgZmFr ZUJvbGQsIGJvb2wgZmFrZUl0YWxpYywgRm9udE9yaWVudGF0aW9uIG9yaWVudGF0aW9uID0gSG9y aXpvbnRhbCk7CisgICAgRm9udFBsYXRmb3JtRGF0YShTa1R5cGVmYWNlKiwgY29uc3QgY2hhciog bmFtZSwgZmxvYXQgdGV4dFNpemUsIGJvb2wgZmFrZUJvbGQsIGJvb2wgZmFrZUl0YWxpYywgRm9u dE9yaWVudGF0aW9uID0gSG9yaXpvbnRhbCwgVGV4dE9yaWVudGF0aW9uID0gVGV4dE9yaWVudGF0 aW9uVmVydGljYWxSaWdodCk7CiAgICAgRm9udFBsYXRmb3JtRGF0YShjb25zdCBGb250UGxhdGZv cm1EYXRhJiBzcmMsIGZsb2F0IHRleHRTaXplKTsKICAgICB+Rm9udFBsYXRmb3JtRGF0YSgpOwog CkBAIC0xNjIsNiArMTY3LDcgQEAgcHJpdmF0ZToKICAgICBib29sIG1fZmFrZUJvbGQ7CiAgICAg Ym9vbCBtX2Zha2VJdGFsaWM7CiAgICAgRm9udE9yaWVudGF0aW9uIG1fb3JpZW50YXRpb247Cisg ICAgVGV4dE9yaWVudGF0aW9uIG1fdGV4dE9yaWVudGF0aW9uOwogICAgIEZvbnRSZW5kZXJTdHls ZSBtX3N0eWxlOwogICAgIG11dGFibGUgUmVmUHRyPFJlZkNvdW50ZWRIYXJmYnV6ekZhY2U+IG1f aGFyZmJ1enpGYWNlOwogCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9z a2lhL0ZvbnRDdXN0b21QbGF0Zm9ybURhdGEuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL3NraWEvRm9udEN1c3RvbVBsYXRmb3JtRGF0YS5jcHAJKHJl dmlzaW9uIDgwNjQ2KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9G b250Q3VzdG9tUGxhdGZvcm1EYXRhLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNjYsNyArNjYsNyBA QCBGb250Q3VzdG9tUGxhdGZvcm1EYXRhOjp+Rm9udEN1c3RvbVBsYXRmCiB9CiAKIEZvbnRQbGF0 Zm9ybURhdGEgRm9udEN1c3RvbVBsYXRmb3JtRGF0YTo6Zm9udFBsYXRmb3JtRGF0YShpbnQgc2l6 ZSwgYm9vbCBib2xkLCBib29sIGl0YWxpYywgRm9udE9yaWVudGF0aW9uIG9yaWVudGF0aW9uLAot ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IFRleHRPcmllbnRhdGlvbiwgRm9udFdpZHRoVmFyaWFudCwgRm9udFJlbmRlcmluZ01vZGUgbW9k ZSkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBUZXh0T3JpZW50YXRpb24gdGV4dE9yaWVudGF0aW9uLCBGb250V2lkdGhWYXJpYW50LCBG b250UmVuZGVyaW5nTW9kZSBtb2RlKQogewogI2lmIE9TKFdJTkRPV1MpCiAgICAgQVNTRVJUKG1f Zm9udFJlZmVyZW5jZSk7CkBAIC0xMDMsNyArMTAzLDcgQEAgRm9udFBsYXRmb3JtRGF0YSBGb250 Q3VzdG9tUGxhdGZvcm1EYXRhOgogICAgIHJldHVybiBGb250UGxhdGZvcm1EYXRhKGhmb250LCBz aXplKTsKICNlbGlmIE9TKExJTlVYKSB8fCBPUyhGUkVFQlNEKSB8fCBQTEFURk9STShCUkVXTVAp CiAgICAgQVNTRVJUKG1fZm9udFJlZmVyZW5jZSk7Ci0gICAgcmV0dXJuIEZvbnRQbGF0Zm9ybURh dGEobV9mb250UmVmZXJlbmNlLCAiIiwgc2l6ZSwgYm9sZCAmJiAhbV9mb250UmVmZXJlbmNlLT5p c0JvbGQoKSwgaXRhbGljICYmICFtX2ZvbnRSZWZlcmVuY2UtPmlzSXRhbGljKCksIG9yaWVudGF0 aW9uKTsKKyAgICByZXR1cm4gRm9udFBsYXRmb3JtRGF0YShtX2ZvbnRSZWZlcmVuY2UsICIiLCBz aXplLCBib2xkICYmICFtX2ZvbnRSZWZlcmVuY2UtPmlzQm9sZCgpLCBpdGFsaWMgJiYgIW1fZm9u dFJlZmVyZW5jZS0+aXNJdGFsaWMoKSwgb3JpZW50YXRpb24sIHRleHRPcmllbnRhdGlvbik7CiAj ZWxzZQogICAgIG5vdEltcGxlbWVudGVkKCk7CiAgICAgcmV0dXJuIEZvbnRQbGF0Zm9ybURhdGEo KTsK 85198 2011-03-09 11:06:59 -0800 2011-03-09 11:08:33 -0800 No really. This time I *really* mean it. patch.txt text/plain 7650 hyatt SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDgwNjUwKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTEtMDMtMDkgIERhdmlkIEh5 YXR0ICA8aHlhdHRAYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFBhdGNoIEZvbnRQbGF0Zm9ybURhdGFMaW51eCB0byBwcm9wZXJseSBp bml0aWFsaXplIGFuZCBjb3B5IG9yaWVudGF0aW9uIGluIGFsbCBwbGFjZXMuCisKKyAgICAgICAg KiBwbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9Gb250UGxhdGZvcm1EYXRhTGludXguY3BwOgor ICAgICAgICAoV2ViQ29yZTo6Rm9udFBsYXRmb3JtRGF0YTo6Rm9udFBsYXRmb3JtRGF0YSk6Cisg ICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vRm9udFBsYXRmb3JtRGF0YUxpbnV4 Lmg6CisgICAgICAgIChXZWJDb3JlOjpGb250UGxhdGZvcm1EYXRhOjpGb250UGxhdGZvcm1EYXRh KToKKwogMjAxMS0wMy0wOSAgU3RldmUgQmxvY2sgIDxzdGV2ZWJsb2NrQGdvb2dsZS5jb20+CiAK ICAgICAgICAgUmV2aWV3ZWQgYnkgSmVyZW15IE9ybG93LgpJbmRleDogU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vRm9udENhY2hlTGludXguY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0ZvbnRDYWNoZUxp bnV4LmNwcAkocmV2aXNpb24gODA2NDYpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9jaHJvbWl1bS9Gb250Q2FjaGVMaW51eC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE1Myw3 ICsxNTMsOCBAQCBGb250UGxhdGZvcm1EYXRhKiBGb250Q2FjaGU6OmNyZWF0ZUZvbnRQCiAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIGZvbnREZXNjcmlwdGlvbi5jb21wdXRlZFNpemUoKSwK ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKHN0eWxlICYgU2tUeXBlZmFjZTo6a0JvbGQp ICYmICF0Zi0+aXNCb2xkKCksCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChzdHlsZSAm IFNrVHlwZWZhY2U6OmtJdGFsaWMpICYmICF0Zi0+aXNJdGFsaWMoKSwKLSAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgZm9udERlc2NyaXB0aW9uLm9yaWVudGF0aW9uKCkpOworICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBmb250RGVzY3JpcHRpb24ub3JpZW50YXRpb24oKSwKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgZm9udERlc2NyaXB0aW9uLnRleHRPcmllbnRhdGlvbigp KTsKICAgICB0Zi0+dW5yZWYoKTsKICAgICByZXR1cm4gcmVzdWx0OwogfQpJbmRleDogU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vRm9udFBsYXRmb3JtRGF0YUxpbnV4 LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJv bWl1bS9Gb250UGxhdGZvcm1EYXRhTGludXguY3BwCShyZXZpc2lvbiA4MDY0NikKKysrIFNvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0ZvbnRQbGF0Zm9ybURhdGFMaW51 eC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTc2LDEzICs3NiwxNCBAQCBGb250UGxhdGZvcm1EYXRh OjpGb250UGxhdGZvcm1EYXRhKGNvbnN0CiAgICAgLCBtX2Zha2VCb2xkKHNyYy5tX2Zha2VCb2xk KQogICAgICwgbV9mYWtlSXRhbGljKHNyYy5tX2Zha2VJdGFsaWMpCiAgICAgLCBtX29yaWVudGF0 aW9uKHNyYy5tX29yaWVudGF0aW9uKQorICAgICwgbV90ZXh0T3JpZW50YXRpb24oc3JjLm1fdGV4 dE9yaWVudGF0aW9uKQogICAgICwgbV9zdHlsZShzcmMubV9zdHlsZSkKICAgICAsIG1faGFyZmJ1 enpGYWNlKHNyYy5tX2hhcmZidXp6RmFjZSkKIHsKICAgICBTa1NhZmVSZWYobV90eXBlZmFjZSk7 CiB9CiAKLUZvbnRQbGF0Zm9ybURhdGE6OkZvbnRQbGF0Zm9ybURhdGEoU2tUeXBlZmFjZSogdGYs IGNvbnN0IGNoYXIqIGZhbWlseSwgZmxvYXQgdGV4dFNpemUsIGJvb2wgZmFrZUJvbGQsIGJvb2wg ZmFrZUl0YWxpYywgRm9udE9yaWVudGF0aW9uIG9yaWVudGF0aW9uKQorRm9udFBsYXRmb3JtRGF0 YTo6Rm9udFBsYXRmb3JtRGF0YShTa1R5cGVmYWNlKiB0ZiwgY29uc3QgY2hhciogZmFtaWx5LCBm bG9hdCB0ZXh0U2l6ZSwgYm9vbCBmYWtlQm9sZCwgYm9vbCBmYWtlSXRhbGljLCBGb250T3JpZW50 YXRpb24gb3JpZW50YXRpb24sIFRleHRPcmllbnRhdGlvbiB0ZXh0T3JpZW50YXRpb24pCiAgICAg OiBtX3R5cGVmYWNlKHRmKQogICAgICwgbV9mYW1pbHkoZmFtaWx5KQogICAgICwgbV90ZXh0U2l6 ZSh0ZXh0U2l6ZSkKQEAgLTkwLDYgKzkxLDcgQEAgRm9udFBsYXRmb3JtRGF0YTo6Rm9udFBsYXRm b3JtRGF0YShTa1R5cAogICAgICwgbV9mYWtlQm9sZChmYWtlQm9sZCkKICAgICAsIG1fZmFrZUl0 YWxpYyhmYWtlSXRhbGljKQogICAgICwgbV9vcmllbnRhdGlvbihvcmllbnRhdGlvbikKKyAgICAs IG1fdGV4dE9yaWVudGF0aW9uKHRleHRPcmllbnRhdGlvbikKIHsKICAgICBTa1NhZmVSZWYobV90 eXBlZmFjZSk7CiAgICAgcXVlcnlTeXN0ZW1Gb3JSZW5kZXJTdHlsZSgpOwpAQCAtMTAyLDYgKzEw NCw4IEBAIEZvbnRQbGF0Zm9ybURhdGE6OkZvbnRQbGF0Zm9ybURhdGEoY29uc3QKICAgICAsIG1f ZW1TaXplSW5Gb250VW5pdHMoc3JjLm1fZW1TaXplSW5Gb250VW5pdHMpCiAgICAgLCBtX2Zha2VC b2xkKHNyYy5tX2Zha2VCb2xkKQogICAgICwgbV9mYWtlSXRhbGljKHNyYy5tX2Zha2VJdGFsaWMp CisgICAgLCBtX29yaWVudGF0aW9uKHNyYy5tX29yaWVudGF0aW9uKQorICAgICwgbV90ZXh0T3Jp ZW50YXRpb24oc3JjLm1fdGV4dE9yaWVudGF0aW9uKQogICAgICwgbV9oYXJmYnV6ekZhY2Uoc3Jj Lm1faGFyZmJ1enpGYWNlKQogewogICAgIFNrU2FmZVJlZihtX3R5cGVmYWNlKTsKQEAgLTEzNCw2 ICsxMzgsNyBAQCBGb250UGxhdGZvcm1EYXRhJiBGb250UGxhdGZvcm1EYXRhOjpvcGVyCiAgICAg bV9mYWtlSXRhbGljID0gc3JjLm1fZmFrZUl0YWxpYzsKICAgICBtX2hhcmZidXp6RmFjZSA9IHNy Yy5tX2hhcmZidXp6RmFjZTsKICAgICBtX29yaWVudGF0aW9uID0gc3JjLm1fb3JpZW50YXRpb247 CisgICAgbV90ZXh0T3JpZW50YXRpb24gPSBzcmMubV90ZXh0T3JpZW50YXRpb247CiAgICAgbV9z dHlsZSA9IHNyYy5tX3N0eWxlOwogICAgIG1fZW1TaXplSW5Gb250VW5pdHMgPSBzcmMubV9lbVNp emVJbkZvbnRVbml0czsKIApAQCAtMTk5LDEzICsyMDQsMTQgQEAgYm9vbCBGb250UGxhdGZvcm1E YXRhOjpvcGVyYXRvcj09KGNvbnN0IAogICAgICAgICAmJiBtX2Zha2VCb2xkID09IGEubV9mYWtl Qm9sZAogICAgICAgICAmJiBtX2Zha2VJdGFsaWMgPT0gYS5tX2Zha2VJdGFsaWMKICAgICAgICAg JiYgbV9vcmllbnRhdGlvbiA9PSBhLm1fb3JpZW50YXRpb24KKyAgICAgICAgJiYgbV90ZXh0T3Jp ZW50YXRpb24gPT0gYS5tX3RleHRPcmllbnRhdGlvbgogICAgICAgICAmJiBtX3N0eWxlID09IGEu bV9zdHlsZTsKIH0KIAogdW5zaWduZWQgRm9udFBsYXRmb3JtRGF0YTo6aGFzaCgpIGNvbnN0CiB7 CiAgICAgdW5zaWduZWQgaCA9IFNrVHlwZWZhY2U6OlVuaXF1ZUlEKG1fdHlwZWZhY2UpOwotICAg IGggXj0gMHgwMTAxMDEwMSAqICgoc3RhdGljX2Nhc3Q8aW50PihtX29yaWVudGF0aW9uKSA8PCAy KSB8IChzdGF0aWNfY2FzdDxpbnQ+KG1fZmFrZUJvbGQpIDw8IDEpIHwgc3RhdGljX2Nhc3Q8aW50 PihtX2Zha2VJdGFsaWMpKTsKKyAgICBoIF49IDB4MDEwMTAxMDEgKiAoKHN0YXRpY19jYXN0PGlu dD4obV90ZXh0T3JpZW50YXRpb24pIDw8IDMpIHwgKHN0YXRpY19jYXN0PGludD4obV9vcmllbnRh dGlvbikgPDwgMikgfCAoc3RhdGljX2Nhc3Q8aW50PihtX2Zha2VCb2xkKSA8PCAxKSB8IHN0YXRp Y19jYXN0PGludD4obV9mYWtlSXRhbGljKSk7CiAKICAgICAvLyBUaGlzIG1lbWNweSBpcyB0byBh dm9pZCBhIHJlaW50ZXJwcmV0X2Nhc3QgdGhhdCBicmVha3Mgc3RyaWN0LWFsaWFzaW5nCiAgICAg Ly8gcnVsZXMuIE1lbWNweSBpcyBnZW5lcmFsbHkgb3B0aW1pemVkIGVub3VnaCBzbyB0aGF0IHBl cmZvcm1hbmNlIGRvZXNuJ3QKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2Nocm9taXVtL0ZvbnRQbGF0Zm9ybURhdGFMaW51eC5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0ZvbnRQbGF0Zm9ybURhdGFMaW51eC5o CShyZXZpc2lvbiA4MDY0NikKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2No cm9taXVtL0ZvbnRQbGF0Zm9ybURhdGFMaW51eC5oCSh3b3JraW5nIGNvcHkpCkBAIC0zMyw2ICsz Myw3IEBACiAKICNpbmNsdWRlICJGb250T3JpZW50YXRpb24uaCIKICNpbmNsdWRlICJGb250UmVu ZGVyU3R5bGUuaCIKKyNpbmNsdWRlICJUZXh0T3JpZW50YXRpb24uaCIKICNpbmNsdWRlIDx3dGYv Rm9yd2FyZC5oPgogI2luY2x1ZGUgPHd0Zi9SZWZQdHIuaD4KICNpbmNsdWRlIDx3dGYvdGV4dC9D U3RyaW5nLmg+CkBAIC02Niw2ICs2Nyw4IEBAIHB1YmxpYzoKICAgICAgICAgLCBtX2VtU2l6ZUlu Rm9udFVuaXRzKDApCiAgICAgICAgICwgbV9mYWtlQm9sZChmYWxzZSkKICAgICAgICAgLCBtX2Zh a2VJdGFsaWMoZmFsc2UpCisgICAgICAgICwgbV9vcmllbnRhdGlvbihIb3Jpem9udGFsKQorICAg ICAgICAsIG1fdGV4dE9yaWVudGF0aW9uKFRleHRPcmllbnRhdGlvblZlcnRpY2FsUmlnaHQpCiAg ICAgICAgIHsgfQogCiAgICAgRm9udFBsYXRmb3JtRGF0YSgpCkBAIC03NSw2ICs3OCw3IEBAIHB1 YmxpYzoKICAgICAgICAgLCBtX2Zha2VCb2xkKGZhbHNlKQogICAgICAgICAsIG1fZmFrZUl0YWxp YyhmYWxzZSkKICAgICAgICAgLCBtX29yaWVudGF0aW9uKEhvcml6b250YWwpCisgICAgICAgICwg bV90ZXh0T3JpZW50YXRpb24oVGV4dE9yaWVudGF0aW9uVmVydGljYWxSaWdodCkKICAgICAgICAg eyB9CiAKICAgICBGb250UGxhdGZvcm1EYXRhKGZsb2F0IHRleHRTaXplLCBib29sIGZha2VCb2xk LCBib29sIGZha2VJdGFsaWMpCkBAIC04NCwxMCArODgsMTEgQEAgcHVibGljOgogICAgICAgICAs IG1fZmFrZUJvbGQoZmFrZUJvbGQpCiAgICAgICAgICwgbV9mYWtlSXRhbGljKGZha2VJdGFsaWMp CiAgICAgICAgICwgbV9vcmllbnRhdGlvbihIb3Jpem9udGFsKQorICAgICAgICAsIG1fdGV4dE9y aWVudGF0aW9uKFRleHRPcmllbnRhdGlvblZlcnRpY2FsUmlnaHQpCiAgICAgICAgIHsgfQogCiAg ICAgRm9udFBsYXRmb3JtRGF0YShjb25zdCBGb250UGxhdGZvcm1EYXRhJik7Ci0gICAgRm9udFBs YXRmb3JtRGF0YShTa1R5cGVmYWNlKiwgY29uc3QgY2hhciogbmFtZSwgZmxvYXQgdGV4dFNpemUs IGJvb2wgZmFrZUJvbGQsIGJvb2wgZmFrZUl0YWxpYywgRm9udE9yaWVudGF0aW9uIG9yaWVudGF0 aW9uID0gSG9yaXpvbnRhbCk7CisgICAgRm9udFBsYXRmb3JtRGF0YShTa1R5cGVmYWNlKiwgY29u c3QgY2hhciogbmFtZSwgZmxvYXQgdGV4dFNpemUsIGJvb2wgZmFrZUJvbGQsIGJvb2wgZmFrZUl0 YWxpYywgRm9udE9yaWVudGF0aW9uID0gSG9yaXpvbnRhbCwgVGV4dE9yaWVudGF0aW9uID0gVGV4 dE9yaWVudGF0aW9uVmVydGljYWxSaWdodCk7CiAgICAgRm9udFBsYXRmb3JtRGF0YShjb25zdCBG b250UGxhdGZvcm1EYXRhJiBzcmMsIGZsb2F0IHRleHRTaXplKTsKICAgICB+Rm9udFBsYXRmb3Jt RGF0YSgpOwogCkBAIC0xNjIsNiArMTY3LDcgQEAgcHJpdmF0ZToKICAgICBib29sIG1fZmFrZUJv bGQ7CiAgICAgYm9vbCBtX2Zha2VJdGFsaWM7CiAgICAgRm9udE9yaWVudGF0aW9uIG1fb3JpZW50 YXRpb247CisgICAgVGV4dE9yaWVudGF0aW9uIG1fdGV4dE9yaWVudGF0aW9uOwogICAgIEZvbnRS ZW5kZXJTdHlsZSBtX3N0eWxlOwogICAgIG11dGFibGUgUmVmUHRyPFJlZkNvdW50ZWRIYXJmYnV6 ekZhY2U+IG1faGFyZmJ1enpGYWNlOwogCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9za2lhL0ZvbnRDdXN0b21QbGF0Zm9ybURhdGEuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3NraWEvRm9udEN1c3RvbVBsYXRmb3JtRGF0 YS5jcHAJKHJldmlzaW9uIDgwNjQ2KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3Mvc2tpYS9Gb250Q3VzdG9tUGxhdGZvcm1EYXRhLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNjYs NyArNjYsNyBAQCBGb250Q3VzdG9tUGxhdGZvcm1EYXRhOjp+Rm9udEN1c3RvbVBsYXRmCiB9CiAK IEZvbnRQbGF0Zm9ybURhdGEgRm9udEN1c3RvbVBsYXRmb3JtRGF0YTo6Zm9udFBsYXRmb3JtRGF0 YShpbnQgc2l6ZSwgYm9vbCBib2xkLCBib29sIGl0YWxpYywgRm9udE9yaWVudGF0aW9uIG9yaWVu dGF0aW9uLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIFRleHRPcmllbnRhdGlvbiwgRm9udFdpZHRoVmFyaWFudCwgRm9udFJlbmRlcmlu Z01vZGUgbW9kZSkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBUZXh0T3JpZW50YXRpb24gdGV4dE9yaWVudGF0aW9uLCBGb250V2lkdGhW YXJpYW50LCBGb250UmVuZGVyaW5nTW9kZSBtb2RlKQogewogI2lmIE9TKFdJTkRPV1MpCiAgICAg QVNTRVJUKG1fZm9udFJlZmVyZW5jZSk7CkBAIC0xMDMsNyArMTAzLDcgQEAgRm9udFBsYXRmb3Jt RGF0YSBGb250Q3VzdG9tUGxhdGZvcm1EYXRhOgogICAgIHJldHVybiBGb250UGxhdGZvcm1EYXRh KGhmb250LCBzaXplKTsKICNlbGlmIE9TKExJTlVYKSB8fCBPUyhGUkVFQlNEKSB8fCBQTEFURk9S TShCUkVXTVApCiAgICAgQVNTRVJUKG1fZm9udFJlZmVyZW5jZSk7Ci0gICAgcmV0dXJuIEZvbnRQ bGF0Zm9ybURhdGEobV9mb250UmVmZXJlbmNlLCAiIiwgc2l6ZSwgYm9sZCAmJiAhbV9mb250UmVm ZXJlbmNlLT5pc0JvbGQoKSwgaXRhbGljICYmICFtX2ZvbnRSZWZlcmVuY2UtPmlzSXRhbGljKCks IG9yaWVudGF0aW9uKTsKKyAgICByZXR1cm4gRm9udFBsYXRmb3JtRGF0YShtX2ZvbnRSZWZlcmVu Y2UsICIiLCBzaXplLCBib2xkICYmICFtX2ZvbnRSZWZlcmVuY2UtPmlzQm9sZCgpLCBpdGFsaWMg JiYgIW1fZm9udFJlZmVyZW5jZS0+aXNJdGFsaWMoKSwgb3JpZW50YXRpb24sIHRleHRPcmllbnRh dGlvbik7CiAjZWxzZQogICAgIG5vdEltcGxlbWVudGVkKCk7CiAgICAgcmV0dXJuIEZvbnRQbGF0 Zm9ybURhdGEoKTsK