59080 2011-04-21 00:25:31 -0700 Add FontItalics and FontSmallCaps enums to be used instead of boolean values. 2011-04-22 01:45:54 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 0 macpherson webkit-unassigned abarth commit-queue dglazkov eric macpherson simon.fraser webkit.review.bot oldest_to_newest 389884 0 macpherson 2011-04-21 00:25:31 -0700 Add FontItalics and FontSmallCaps enums to be used instead of boolean values. 389885 1 90501 macpherson 2011-04-21 00:28:49 -0700 Created attachment 90501 Patch 389899 2 webkit.review.bot 2011-04-21 00:53:42 -0700 Attachment 90501 did not build on chromium: Build output: http://queues.webkit.org/results/8494028 389904 3 90501 eric 2011-04-21 01:59:54 -0700 Comment on attachment 90501 Patch I'm surprised there are no callers of italic() or smallCaps()? 390457 4 macpherson 2011-04-21 16:48:13 -0700 (In reply to comment #3) > (From update of attachment 90501 [details]) > I'm surprised there are no callers of italic() or smallCaps()? There are two cases: 1) the form if(x->italic()), which has the same behavior since the *Off enum values are defined to be zero. 2) the form x->setItalic(y->italic), which is also covered by this CL. 390495 5 90642 macpherson 2011-04-21 17:39:47 -0700 Created attachment 90642 Patch 390658 6 90642 commit-queue 2011-04-22 00:40:48 -0700 Comment on attachment 90642 Patch Clearing flags on attachment: 90642 Committed r84609: <http://trac.webkit.org/changeset/84609> 390659 7 commit-queue 2011-04-22 00:40:53 -0700 All reviewed patches have been landed. Closing bug. 390675 8 webkit.review.bot 2011-04-22 01:45:54 -0700 http://trac.webkit.org/changeset/84609 might have broken WinCairo Debug (Build) 90501 2011-04-21 00:28:49 -0700 2011-04-21 17:39:40 -0700 Patch bug-59080-20110421172846.patch text/plain 8842 macpherson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg0NDc0KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTEtMDQtMjEgIEx1a2UgTWFj cGhlcnNvbiAgIDxtYWNwaGVyc29uQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgRm9udEl0YWxpY3MgYW5kIEZvbnRTbWFs bENhcHMgZW51bXMgdG8gYmUgdXNlZCBpbnN0ZWFkIG9mIGJvb2xlYW4gdmFsdWVzLgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTkwODAKKworICAgICAg ICBObyBuZXcgdGVzdHMgYXMgbm8gbmV3IGZ1bmN0aW9uYWxpdHkgYWRkZWQuCisKKyAgICAgICAg KiBjc3MvQ1NTUHJpbWl0aXZlVmFsdWVNYXBwaW5ncy5oOgorICAgICAgICBBZGQgY2FzdHMgdG8v ZnJvbSBGb250SXRhbGljcyBhbmQgRm9udFNtYWxsQ2FwcworICAgICAgICAqIGNzcy9DU1NTdHls ZVNlbGVjdG9yLmNwcDoKKyAgICAgICAgVXNlIG5ldyBjYXN0cyBkZWZpbmVkIGluIFByaW1pdGl2 ZVZhbHVlTWFwcGluZ3MuaAorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL0ZvbnQuaDoKKyAg ICAgICAgVXNlIEZvbnRJdGFsaWNzIGVudW0uCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mv Rm9udERlc2NyaXB0aW9uLmg6CisgICAgICAgIERlZmluZSBhbmQgdXNlIEZvbnRJdGFsaWNzIGFu ZCBGb250U21hbGxDYXBzIGVudW1zLgorCiAyMDExLTA0LTIxICBKb24gTGVlICA8am9ubGVlQGFw cGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBNYWNpZWogU3RhY2hvd2lhay4KSW5kZXg6 IFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQcmltaXRpdmVWYWx1ZU1hcHBpbmdzLmgKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYkNvcmUvY3NzL0NTU1ByaW1pdGl2ZVZhbHVlTWFwcGluZ3MuaAkocmV2 aXNpb24gODQ0NjEpCisrKyBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUHJpbWl0aXZlVmFsdWVNYXBw aW5ncy5oCSh3b3JraW5nIGNvcHkpCkBAIC0zMyw2ICszMyw3IEBACiAjaW5jbHVkZSAiQ29sb3JT cGFjZS5oIgogI2luY2x1ZGUgIkNTU1ByaW1pdGl2ZVZhbHVlLmgiCiAjaW5jbHVkZSAiQ1NTVmFs dWVLZXl3b3Jkcy5oIgorI2luY2x1ZGUgIkZvbnREZXNjcmlwdGlvbi5oIgogI2luY2x1ZGUgIkZv bnRTbW9vdGhpbmdNb2RlLmgiCiAjaW5jbHVkZSAiR3JhcGhpY3NUeXBlcy5oIgogI2luY2x1ZGUg IlBhdGguaCIKQEAgLTIzMjMsNiArMjMyNCw2NiBAQCB0ZW1wbGF0ZTw+IGlubGluZSBDU1NQcmlt aXRpdmVWYWx1ZTo6b3BlCiAgICAgcmV0dXJuIEF1dG9TbW9vdGhpbmc7CiB9CiAKK3RlbXBsYXRl PD4gaW5saW5lIENTU1ByaW1pdGl2ZVZhbHVlOjpDU1NQcmltaXRpdmVWYWx1ZShGb250SXRhbGlj IGl0YWxpYykKKyAgICA6IG1fdHlwZShDU1NfSURFTlQpCisgICAgLCBtX2hhc0NhY2hlZENTU1Rl eHQoZmFsc2UpCit7CisgICAgc3dpdGNoIChpdGFsaWMpIHsKKyAgICBjYXNlIEZvbnRJdGFsaWNP ZmY6CisgICAgICAgIG1fdmFsdWUuaWRlbnQgPSBDU1NWYWx1ZU5vcm1hbDsKKyAgICAgICAgcmV0 dXJuOworICAgIGNhc2UgRm9udEl0YWxpY09uOgorICAgICAgICBtX3ZhbHVlLmlkZW50ID0gQ1NT VmFsdWVJdGFsaWM7CisgICAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICBBU1NFUlRfTk9UX1JF QUNIRUQoKTsKKyAgICBtX3ZhbHVlLmlkZW50ID0gQ1NTVmFsdWVOb3JtYWw7Cit9CisKK3RlbXBs YXRlPD4gaW5saW5lIENTU1ByaW1pdGl2ZVZhbHVlOjpvcGVyYXRvciBGb250SXRhbGljKCkgY29u c3QKK3sKKyAgICBzd2l0Y2ggKG1fdmFsdWUuaWRlbnQpIHsKKyAgICBjYXNlIENTU1ZhbHVlT2Js aXF1ZToKKyAgICAvLyBGSVhNRTogb2JsaXF1ZSBpcyB0aGUgc2FtZSBhcyBpdGFsaWMgZm9yIHRo ZSBtb21lbnQuLi4KKyAgICBjYXNlIENTU1ZhbHVlSXRhbGljOgorICAgICAgICByZXR1cm4gRm9u dEl0YWxpY09uOworICAgIGNhc2UgQ1NTVmFsdWVOb3JtYWw6CisgICAgICAgIHJldHVybiBGb250 SXRhbGljT2ZmOworICAgIH0KKyAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKyAgICByZXR1cm4g Rm9udEl0YWxpY09mZjsKK30KKwordGVtcGxhdGU8PiBpbmxpbmUgQ1NTUHJpbWl0aXZlVmFsdWU6 OkNTU1ByaW1pdGl2ZVZhbHVlKEZvbnRTbWFsbENhcHMgc21hbGxDYXBzKQorICAgIDogbV90eXBl KENTU19JREVOVCkKKyAgICAsIG1faGFzQ2FjaGVkQ1NTVGV4dChmYWxzZSkKK3sKKyAgICBzd2l0 Y2ggKHNtYWxsQ2FwcykgeworICAgIGNhc2UgRm9udFNtYWxsQ2Fwc09mZjoKKyAgICAgICAgbV92 YWx1ZS5pZGVudCA9IENTU1ZhbHVlTm9ybWFsOworICAgICAgICByZXR1cm47CisgICAgY2FzZSBG b250U21hbGxDYXBzT246CisgICAgICAgIG1fdmFsdWUuaWRlbnQgPSBDU1NWYWx1ZVNtYWxsQ2Fw czsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKworICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwor ICAgIG1fdmFsdWUuaWRlbnQgPSBDU1NWYWx1ZU5vcm1hbDsKK30KKwordGVtcGxhdGU8PiBpbmxp bmUgQ1NTUHJpbWl0aXZlVmFsdWU6Om9wZXJhdG9yIEZvbnRTbWFsbENhcHMoKSBjb25zdAorewor ICAgIHN3aXRjaCAobV92YWx1ZS5pZGVudCkgeworICAgIGNhc2UgQ1NTVmFsdWVTbWFsbENhcHM6 CisgICAgICAgIHJldHVybiBGb250U21hbGxDYXBzT247CisgICAgY2FzZSBDU1NWYWx1ZU5vcm1h bDoKKyAgICAgICAgcmV0dXJuIEZvbnRTbWFsbENhcHNPZmY7CisgICAgfQorICAgIEFTU0VSVF9O T1RfUkVBQ0hFRCgpOworICAgIHJldHVybiBGb250U21hbGxDYXBzT2ZmOworfQorCiB0ZW1wbGF0 ZTw+IGlubGluZSBDU1NQcmltaXRpdmVWYWx1ZTo6Q1NTUHJpbWl0aXZlVmFsdWUoVGV4dFJlbmRl cmluZ01vZGUgZSkKICAgICA6IG1fdHlwZShDU1NfSURFTlQpCiAgICAgLCBtX2hhc0NhY2hlZENT U1RleHQoZmFsc2UpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVTZWxlY3Rvci5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvY3NzL0NTU1N0eWxlU2VsZWN0b3IuY3Bw CShyZXZpc2lvbiA4NDQ2MSkKKysrIFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NTdHlsZVNlbGVjdG9y LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzYzOCwyMiArMzYzOCwxMSBAQCB2b2lkIENTU1N0eWxl U2VsZWN0b3I6OmFwcGx5UHJvcGVydHkoaW50CiAgICAgICAgIGlmIChpc0luaGVyaXQpCiAgICAg ICAgICAgICBmb250RGVzY3JpcHRpb24uc2V0SXRhbGljKG1fcGFyZW50U3R5bGUtPmZvbnREZXNj cmlwdGlvbigpLml0YWxpYygpKTsKICAgICAgICAgZWxzZSBpZiAoaXNJbml0aWFsKQotICAgICAg ICAgICAgZm9udERlc2NyaXB0aW9uLnNldEl0YWxpYyhmYWxzZSk7CisgICAgICAgICAgICBmb250 RGVzY3JpcHRpb24uc2V0SXRhbGljKEZvbnRJdGFsaWNPZmYpOwogICAgICAgICBlbHNlIHsKICAg ICAgICAgICAgIGlmICghcHJpbWl0aXZlVmFsdWUpCiAgICAgICAgICAgICAgICAgcmV0dXJuOwot ICAgICAgICAgICAgc3dpdGNoIChwcmltaXRpdmVWYWx1ZS0+Z2V0SWRlbnQoKSkgewotICAgICAg ICAgICAgICAgIGNhc2UgQ1NTVmFsdWVPYmxpcXVlOgotICAgICAgICAgICAgICAgIC8vIEZJWE1F OiBvYmxpcXVlIGlzIHRoZSBzYW1lIGFzIGl0YWxpYyBmb3IgdGhlIG1vbWVudC4uLgotICAgICAg ICAgICAgICAgIGNhc2UgQ1NTVmFsdWVJdGFsaWM6Ci0gICAgICAgICAgICAgICAgICAgIGZvbnRE ZXNjcmlwdGlvbi5zZXRJdGFsaWModHJ1ZSk7Ci0gICAgICAgICAgICAgICAgICAgIGJyZWFrOwot ICAgICAgICAgICAgICAgIGNhc2UgQ1NTVmFsdWVOb3JtYWw6Ci0gICAgICAgICAgICAgICAgICAg IGZvbnREZXNjcmlwdGlvbi5zZXRJdGFsaWMoZmFsc2UpOwotICAgICAgICAgICAgICAgICAgICBi cmVhazsKLSAgICAgICAgICAgICAgICBkZWZhdWx0OgotICAgICAgICAgICAgICAgICAgICByZXR1 cm47Ci0gICAgICAgICAgICB9CisgICAgICAgICAgICBmb250RGVzY3JpcHRpb24uc2V0SXRhbGlj KChGb250SXRhbGljKSpwcmltaXRpdmVWYWx1ZSk7CiAgICAgICAgIH0KICAgICAgICAgaWYgKG1f c3R5bGUtPnNldEZvbnREZXNjcmlwdGlvbihmb250RGVzY3JpcHRpb24pKQogICAgICAgICAgICAg bV9mb250RGlydHkgPSB0cnVlOwpAQCAtMzY2NiwxNyArMzY1NSwxMSBAQCB2b2lkIENTU1N0eWxl U2VsZWN0b3I6OmFwcGx5UHJvcGVydHkoaW50CiAgICAgICAgIGlmIChpc0luaGVyaXQpIAogICAg ICAgICAgICAgZm9udERlc2NyaXB0aW9uLnNldFNtYWxsQ2FwcyhtX3BhcmVudFN0eWxlLT5mb250 RGVzY3JpcHRpb24oKS5zbWFsbENhcHMoKSk7CiAgICAgICAgIGVsc2UgaWYgKGlzSW5pdGlhbCkK LSAgICAgICAgICAgIGZvbnREZXNjcmlwdGlvbi5zZXRTbWFsbENhcHMoZmFsc2UpOworICAgICAg ICAgICAgZm9udERlc2NyaXB0aW9uLnNldFNtYWxsQ2FwcyhGb250U21hbGxDYXBzT2ZmKTsKICAg ICAgICAgZWxzZSB7CiAgICAgICAgICAgICBpZiAoIXByaW1pdGl2ZVZhbHVlKQogICAgICAgICAg ICAgICAgIHJldHVybjsKLSAgICAgICAgICAgIGludCBpZCA9IHByaW1pdGl2ZVZhbHVlLT5nZXRJ ZGVudCgpOwotICAgICAgICAgICAgaWYgKGlkID09IENTU1ZhbHVlTm9ybWFsKQotICAgICAgICAg ICAgICAgIGZvbnREZXNjcmlwdGlvbi5zZXRTbWFsbENhcHMoZmFsc2UpOwotICAgICAgICAgICAg ZWxzZSBpZiAoaWQgPT0gQ1NTVmFsdWVTbWFsbENhcHMpCi0gICAgICAgICAgICAgICAgZm9udERl c2NyaXB0aW9uLnNldFNtYWxsQ2Fwcyh0cnVlKTsKLSAgICAgICAgICAgIGVsc2UKLSAgICAgICAg ICAgICAgICByZXR1cm47CisgICAgICAgICAgICBmb250RGVzY3JpcHRpb24uc2V0U21hbGxDYXBz KCpwcmltaXRpdmVWYWx1ZSk7CiAgICAgICAgIH0KICAgICAgICAgaWYgKG1fc3R5bGUtPnNldEZv bnREZXNjcmlwdGlvbihmb250RGVzY3JpcHRpb24pKQogICAgICAgICAgICAgbV9mb250RGlydHkg PSB0cnVlOwpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udC5oCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnQuaAkocmV2 aXNpb24gODQ0NjEpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250LmgJ KHdvcmtpbmcgY29weSkKQEAgLTEyMyw3ICsxMjMsNyBAQCBwdWJsaWM6CiAgICAgRm9udEZhbWls eSYgZmlyc3RGYW1pbHkoKSB7IHJldHVybiBtX2ZvbnREZXNjcmlwdGlvbi5maXJzdEZhbWlseSgp OyB9CiAgICAgY29uc3QgRm9udEZhbWlseSYgZmFtaWx5KCkgY29uc3QgeyByZXR1cm4gbV9mb250 RGVzY3JpcHRpb24uZmFtaWx5KCk7IH0KIAotICAgIGJvb2wgaXRhbGljKCkgY29uc3QgeyByZXR1 cm4gbV9mb250RGVzY3JpcHRpb24uaXRhbGljKCk7IH0KKyAgICBGb250SXRhbGljIGl0YWxpYygp IGNvbnN0IHsgcmV0dXJuIG1fZm9udERlc2NyaXB0aW9uLml0YWxpYygpOyB9CiAgICAgRm9udFdl aWdodCB3ZWlnaHQoKSBjb25zdCB7IHJldHVybiBtX2ZvbnREZXNjcmlwdGlvbi53ZWlnaHQoKTsg fQogICAgIEZvbnRXaWR0aFZhcmlhbnQgd2lkdGhWYXJpYW50KCkgY29uc3QgeyByZXR1cm4gbV9m b250RGVzY3JpcHRpb24ud2lkdGhWYXJpYW50KCk7IH0KIApJbmRleDogU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvRm9udERlc2NyaXB0aW9uLmgKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udERlc2NyaXB0aW9uLmgJKHJldmlzaW9uIDg0 NDYxKQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udERlc2NyaXB0aW9u LmgJKHdvcmtpbmcgY29weSkKQEAgLTUwLDYgKzUwLDE2IEBAIGVudW0gRm9udFdlaWdodCB7CiAg ICAgRm9udFdlaWdodEJvbGQgPSBGb250V2VpZ2h0NzAwCiB9OwogCitlbnVtIEZvbnRJdGFsaWMg eworICAgIEZvbnRJdGFsaWNPZmYgPSAwLAorICAgIEZvbnRJdGFsaWNPbiA9IDEKK307CisKK2Vu dW0gRm9udFNtYWxsQ2FwcyB7CisgICAgRm9udFNtYWxsQ2Fwc09mZiA9IDAsCisgICAgRm9udFNt YWxsQ2Fwc09uID0gMQorfTsKKwogY2xhc3MgRm9udERlc2NyaXB0aW9uIHsKIHB1YmxpYzoKICAg ICBlbnVtIEdlbmVyaWNGYW1pbHlUeXBlIHsgTm9GYW1pbHksIFN0YW5kYXJkRmFtaWx5LCBTZXJp ZkZhbWlseSwgU2Fuc1NlcmlmRmFtaWx5LCAKQEAgLTYxLDggKzcxLDggQEAgcHVibGljOgogICAg ICAgICAsIG1fb3JpZW50YXRpb24oSG9yaXpvbnRhbCkKICAgICAgICAgLCBtX3RleHRPcmllbnRh dGlvbihUZXh0T3JpZW50YXRpb25WZXJ0aWNhbFJpZ2h0KQogICAgICAgICAsIG1fd2lkdGhWYXJp YW50KFJlZ3VsYXJXaWR0aCkKLSAgICAgICAgLCBtX2l0YWxpYyhmYWxzZSkKLSAgICAgICAgLCBt X3NtYWxsQ2FwcyhmYWxzZSkKKyAgICAgICAgLCBtX2l0YWxpYyhGb250SXRhbGljT2ZmKQorICAg ICAgICAsIG1fc21hbGxDYXBzKEZvbnRTbWFsbENhcHNPZmYpCiAgICAgICAgICwgbV9pc0Fic29s dXRlU2l6ZShmYWxzZSkKICAgICAgICAgLCBtX3dlaWdodChGb250V2VpZ2h0Tm9ybWFsKQogICAg ICAgICAsIG1fZ2VuZXJpY0ZhbWlseShOb0ZhbWlseSkKQEAgLTgyLDkgKzkyLDkgQEAgcHVibGlj OgogICAgIEZvbnRGYW1pbHkmIGZpcnN0RmFtaWx5KCkgeyByZXR1cm4gbV9mYW1pbHlMaXN0OyB9 CiAgICAgZmxvYXQgc3BlY2lmaWVkU2l6ZSgpIGNvbnN0IHsgcmV0dXJuIG1fc3BlY2lmaWVkU2l6 ZTsgfQogICAgIGZsb2F0IGNvbXB1dGVkU2l6ZSgpIGNvbnN0IHsgcmV0dXJuIG1fY29tcHV0ZWRT aXplOyB9Ci0gICAgYm9vbCBpdGFsaWMoKSBjb25zdCB7IHJldHVybiBtX2l0YWxpYzsgfQorICAg IEZvbnRJdGFsaWMgaXRhbGljKCkgY29uc3QgeyByZXR1cm4gc3RhdGljX2Nhc3Q8Rm9udEl0YWxp Yz4obV9pdGFsaWMpOyB9CiAgICAgaW50IGNvbXB1dGVkUGl4ZWxTaXplKCkgY29uc3QgeyByZXR1 cm4gaW50KG1fY29tcHV0ZWRTaXplICsgMC41Zik7IH0KLSAgICBib29sIHNtYWxsQ2FwcygpIGNv bnN0IHsgcmV0dXJuIG1fc21hbGxDYXBzOyB9CisgICAgRm9udFNtYWxsQ2FwcyBzbWFsbENhcHMo KSBjb25zdCB7IHJldHVybiBzdGF0aWNfY2FzdDxGb250U21hbGxDYXBzPihtX3NtYWxsQ2Fwcyk7 IH0KICAgICBib29sIGlzQWJzb2x1dGVTaXplKCkgY29uc3QgeyByZXR1cm4gbV9pc0Fic29sdXRl U2l6ZTsgfQogICAgIEZvbnRXZWlnaHQgd2VpZ2h0KCkgY29uc3QgeyByZXR1cm4gc3RhdGljX2Nh c3Q8Rm9udFdlaWdodD4obV93ZWlnaHQpOyB9CiAgICAgRm9udFdlaWdodCBsaWdodGVyV2VpZ2h0 KCkgY29uc3Q7CkBAIC0xMDcsOCArMTE3LDkgQEAgcHVibGljOgogICAgIHZvaWQgc2V0RmFtaWx5 KGNvbnN0IEZvbnRGYW1pbHkmIGZhbWlseSkgeyBtX2ZhbWlseUxpc3QgPSBmYW1pbHk7IH0KICAg ICB2b2lkIHNldENvbXB1dGVkU2l6ZShmbG9hdCBzKSB7IG1fY29tcHV0ZWRTaXplID0gczsgfQog ICAgIHZvaWQgc2V0U3BlY2lmaWVkU2l6ZShmbG9hdCBzKSB7IG1fc3BlY2lmaWVkU2l6ZSA9IHM7 IH0KLSAgICB2b2lkIHNldEl0YWxpYyhib29sIGkpIHsgbV9pdGFsaWMgPSBpOyB9Ci0gICAgdm9p ZCBzZXRTbWFsbENhcHMoYm9vbCBjKSB7IG1fc21hbGxDYXBzID0gYzsgfQorICAgIHZvaWQgc2V0 SXRhbGljKEZvbnRJdGFsaWMgaSkgeyBtX2l0YWxpYyA9IGk7IH0KKyAgICB2b2lkIHNldEl0YWxp Yyhib29sIGkpIHsgc2V0SXRhbGljKGkgPyBGb250SXRhbGljT24gOiBGb250SXRhbGljT2ZmKTsg fQorICAgIHZvaWQgc2V0U21hbGxDYXBzKEZvbnRTbWFsbENhcHMgYykgeyBtX3NtYWxsQ2FwcyA9 IGM7IH0KICAgICB2b2lkIHNldElzQWJzb2x1dGVTaXplKGJvb2wgcykgeyBtX2lzQWJzb2x1dGVT aXplID0gczsgfQogICAgIHZvaWQgc2V0V2VpZ2h0KEZvbnRXZWlnaHQgdykgeyBtX3dlaWdodCA9 IHc7IH0KICAgICB2b2lkIHNldEdlbmVyaWNGYW1pbHkoR2VuZXJpY0ZhbWlseVR5cGUgZ2VuZXJp Y0ZhbWlseSkgeyBtX2dlbmVyaWNGYW1pbHkgPSBnZW5lcmljRmFtaWx5OyB9CkBAIC0xMzgsOCAr MTQ5LDggQEAgcHJpdmF0ZToKIAogICAgIEZvbnRXaWR0aFZhcmlhbnQgbV93aWR0aFZhcmlhbnQ7 CiAKLSAgICBib29sIG1faXRhbGljIDogMTsKLSAgICBib29sIG1fc21hbGxDYXBzIDogMTsKKyAg ICB1bnNpZ25lZCBtX2l0YWxpYyA6IDE7IC8vIEZvbnRJdGFsaWMKKyAgICB1bnNpZ25lZCBtX3Nt YWxsQ2FwcyA6IDE7IC8vIEZvbnRTbWFsbENhcHMKICAgICBib29sIG1faXNBYnNvbHV0ZVNpemUg OiAxOyAgIC8vIFdoZXRoZXIgb3Igbm90IENTUyBzcGVjaWZpZWQgYW4gZXhwbGljaXQgc2l6ZQog ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgLy8gKGxvZ2ljYWwgc2l6ZXMgbGlrZSAi bWVkaXVtIiBkb24ndCBjb3VudCkuCiAgICAgdW5zaWduZWQgbV93ZWlnaHQgOiA4OyAvLyBGb250 V2VpZ2h0Cg== 90642 2011-04-21 17:39:47 -0700 2011-04-22 00:40:48 -0700 Patch bug-59080-20110422103944.patch text/plain 8953 macpherson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg0NTcwKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTEtMDQtMjEgIEx1a2UgTWFj cGhlcnNvbiAgIDxtYWNwaGVyc29uQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgRm9udEl0YWxpY3MgYW5kIEZvbnRTbWFs bENhcHMgZW51bXMgdG8gYmUgdXNlZCBpbnN0ZWFkIG9mIGJvb2xlYW4gdmFsdWVzLgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTkwODAKKworICAgICAg ICBObyBuZXcgdGVzdHMgYXMgbm8gbmV3IGZ1bmN0aW9uYWxpdHkgYWRkZWQuCisKKyAgICAgICAg KiBjc3MvQ1NTUHJpbWl0aXZlVmFsdWVNYXBwaW5ncy5oOgorICAgICAgICBBZGQgY2FzdHMgdG8v ZnJvbSBGb250SXRhbGljcyBhbmQgRm9udFNtYWxsQ2FwcworICAgICAgICAqIGNzcy9DU1NTdHls ZVNlbGVjdG9yLmNwcDoKKyAgICAgICAgVXNlIG5ldyBjYXN0cyBkZWZpbmVkIGluIFByaW1pdGl2 ZVZhbHVlTWFwcGluZ3MuaAorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL0ZvbnQuaDoKKyAg ICAgICAgVXNlIEZvbnRJdGFsaWNzIGVudW0uCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mv Rm9udERlc2NyaXB0aW9uLmg6CisgICAgICAgIERlZmluZSBhbmQgdXNlIEZvbnRJdGFsaWNzIGFu ZCBGb250U21hbGxDYXBzIGVudW1zLgorCiAyMDExLTA0LTIxICBPbGl2ZXIgSHVudCAgPG9saXZl ckBhcHBsZS5jb20+CiAKICAgICAgICAgV2hvb3BzLCBjaGFuZ2UgbG9zdCBkdXJpbmcgbWVyZ2UK SW5kZXg6IFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQcmltaXRpdmVWYWx1ZU1hcHBpbmdzLmgKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvY3NzL0NTU1ByaW1pdGl2ZVZhbHVlTWFwcGluZ3Mu aAkocmV2aXNpb24gODQ1NzApCisrKyBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUHJpbWl0aXZlVmFs dWVNYXBwaW5ncy5oCSh3b3JraW5nIGNvcHkpCkBAIC0zMyw2ICszMyw3IEBACiAjaW5jbHVkZSAi Q29sb3JTcGFjZS5oIgogI2luY2x1ZGUgIkNTU1ByaW1pdGl2ZVZhbHVlLmgiCiAjaW5jbHVkZSAi Q1NTVmFsdWVLZXl3b3Jkcy5oIgorI2luY2x1ZGUgIkZvbnREZXNjcmlwdGlvbi5oIgogI2luY2x1 ZGUgIkZvbnRTbW9vdGhpbmdNb2RlLmgiCiAjaW5jbHVkZSAiR3JhcGhpY3NUeXBlcy5oIgogI2lu Y2x1ZGUgIlBhdGguaCIKQEAgLTIzMjMsNiArMjMyNCw2NiBAQCB0ZW1wbGF0ZTw+IGlubGluZSBD U1NQcmltaXRpdmVWYWx1ZTo6b3BlCiAgICAgcmV0dXJuIEF1dG9TbW9vdGhpbmc7CiB9CiAKK3Rl bXBsYXRlPD4gaW5saW5lIENTU1ByaW1pdGl2ZVZhbHVlOjpDU1NQcmltaXRpdmVWYWx1ZShGb250 SXRhbGljIGl0YWxpYykKKyAgICA6IG1fdHlwZShDU1NfSURFTlQpCisgICAgLCBtX2hhc0NhY2hl ZENTU1RleHQoZmFsc2UpCit7CisgICAgc3dpdGNoIChpdGFsaWMpIHsKKyAgICBjYXNlIEZvbnRJ dGFsaWNPZmY6CisgICAgICAgIG1fdmFsdWUuaWRlbnQgPSBDU1NWYWx1ZU5vcm1hbDsKKyAgICAg ICAgcmV0dXJuOworICAgIGNhc2UgRm9udEl0YWxpY09uOgorICAgICAgICBtX3ZhbHVlLmlkZW50 ID0gQ1NTVmFsdWVJdGFsaWM7CisgICAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICBBU1NFUlRf Tk9UX1JFQUNIRUQoKTsKKyAgICBtX3ZhbHVlLmlkZW50ID0gQ1NTVmFsdWVOb3JtYWw7Cit9CisK K3RlbXBsYXRlPD4gaW5saW5lIENTU1ByaW1pdGl2ZVZhbHVlOjpvcGVyYXRvciBGb250SXRhbGlj KCkgY29uc3QKK3sKKyAgICBzd2l0Y2ggKG1fdmFsdWUuaWRlbnQpIHsKKyAgICBjYXNlIENTU1Zh bHVlT2JsaXF1ZToKKyAgICAvLyBGSVhNRTogb2JsaXF1ZSBpcyB0aGUgc2FtZSBhcyBpdGFsaWMg Zm9yIHRoZSBtb21lbnQuLi4KKyAgICBjYXNlIENTU1ZhbHVlSXRhbGljOgorICAgICAgICByZXR1 cm4gRm9udEl0YWxpY09uOworICAgIGNhc2UgQ1NTVmFsdWVOb3JtYWw6CisgICAgICAgIHJldHVy biBGb250SXRhbGljT2ZmOworICAgIH0KKyAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKyAgICBy ZXR1cm4gRm9udEl0YWxpY09mZjsKK30KKwordGVtcGxhdGU8PiBpbmxpbmUgQ1NTUHJpbWl0aXZl VmFsdWU6OkNTU1ByaW1pdGl2ZVZhbHVlKEZvbnRTbWFsbENhcHMgc21hbGxDYXBzKQorICAgIDog bV90eXBlKENTU19JREVOVCkKKyAgICAsIG1faGFzQ2FjaGVkQ1NTVGV4dChmYWxzZSkKK3sKKyAg ICBzd2l0Y2ggKHNtYWxsQ2FwcykgeworICAgIGNhc2UgRm9udFNtYWxsQ2Fwc09mZjoKKyAgICAg ICAgbV92YWx1ZS5pZGVudCA9IENTU1ZhbHVlTm9ybWFsOworICAgICAgICByZXR1cm47CisgICAg Y2FzZSBGb250U21hbGxDYXBzT246CisgICAgICAgIG1fdmFsdWUuaWRlbnQgPSBDU1NWYWx1ZVNt YWxsQ2FwczsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKworICAgIEFTU0VSVF9OT1RfUkVBQ0hF RCgpOworICAgIG1fdmFsdWUuaWRlbnQgPSBDU1NWYWx1ZU5vcm1hbDsKK30KKwordGVtcGxhdGU8 PiBpbmxpbmUgQ1NTUHJpbWl0aXZlVmFsdWU6Om9wZXJhdG9yIEZvbnRTbWFsbENhcHMoKSBjb25z dAoreworICAgIHN3aXRjaCAobV92YWx1ZS5pZGVudCkgeworICAgIGNhc2UgQ1NTVmFsdWVTbWFs bENhcHM6CisgICAgICAgIHJldHVybiBGb250U21hbGxDYXBzT247CisgICAgY2FzZSBDU1NWYWx1 ZU5vcm1hbDoKKyAgICAgICAgcmV0dXJuIEZvbnRTbWFsbENhcHNPZmY7CisgICAgfQorICAgIEFT U0VSVF9OT1RfUkVBQ0hFRCgpOworICAgIHJldHVybiBGb250U21hbGxDYXBzT2ZmOworfQorCiB0 ZW1wbGF0ZTw+IGlubGluZSBDU1NQcmltaXRpdmVWYWx1ZTo6Q1NTUHJpbWl0aXZlVmFsdWUoVGV4 dFJlbmRlcmluZ01vZGUgZSkKICAgICA6IG1fdHlwZShDU1NfSURFTlQpCiAgICAgLCBtX2hhc0Nh Y2hlZENTU1RleHQoZmFsc2UpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVTZWxl Y3Rvci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvY3NzL0NTU1N0eWxlU2VsZWN0 b3IuY3BwCShyZXZpc2lvbiA4NDU3MCkKKysrIFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NTdHlsZVNl bGVjdG9yLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzY4MSwyMiArMzY4MSwxMSBAQCB2b2lkIENT U1N0eWxlU2VsZWN0b3I6OmFwcGx5UHJvcGVydHkoaW50CiAgICAgICAgIGlmIChpc0luaGVyaXQp CiAgICAgICAgICAgICBmb250RGVzY3JpcHRpb24uc2V0SXRhbGljKG1fcGFyZW50U3R5bGUtPmZv bnREZXNjcmlwdGlvbigpLml0YWxpYygpKTsKICAgICAgICAgZWxzZSBpZiAoaXNJbml0aWFsKQot ICAgICAgICAgICAgZm9udERlc2NyaXB0aW9uLnNldEl0YWxpYyhmYWxzZSk7CisgICAgICAgICAg ICBmb250RGVzY3JpcHRpb24uc2V0SXRhbGljKEZvbnRJdGFsaWNPZmYpOwogICAgICAgICBlbHNl IHsKICAgICAgICAgICAgIGlmICghcHJpbWl0aXZlVmFsdWUpCiAgICAgICAgICAgICAgICAgcmV0 dXJuOwotICAgICAgICAgICAgc3dpdGNoIChwcmltaXRpdmVWYWx1ZS0+Z2V0SWRlbnQoKSkgewot ICAgICAgICAgICAgICAgIGNhc2UgQ1NTVmFsdWVPYmxpcXVlOgotICAgICAgICAgICAgICAgIC8v IEZJWE1FOiBvYmxpcXVlIGlzIHRoZSBzYW1lIGFzIGl0YWxpYyBmb3IgdGhlIG1vbWVudC4uLgot ICAgICAgICAgICAgICAgIGNhc2UgQ1NTVmFsdWVJdGFsaWM6Ci0gICAgICAgICAgICAgICAgICAg IGZvbnREZXNjcmlwdGlvbi5zZXRJdGFsaWModHJ1ZSk7Ci0gICAgICAgICAgICAgICAgICAgIGJy ZWFrOwotICAgICAgICAgICAgICAgIGNhc2UgQ1NTVmFsdWVOb3JtYWw6Ci0gICAgICAgICAgICAg ICAgICAgIGZvbnREZXNjcmlwdGlvbi5zZXRJdGFsaWMoZmFsc2UpOwotICAgICAgICAgICAgICAg ICAgICBicmVhazsKLSAgICAgICAgICAgICAgICBkZWZhdWx0OgotICAgICAgICAgICAgICAgICAg ICByZXR1cm47Ci0gICAgICAgICAgICB9CisgICAgICAgICAgICBmb250RGVzY3JpcHRpb24uc2V0 SXRhbGljKChGb250SXRhbGljKSpwcmltaXRpdmVWYWx1ZSk7CiAgICAgICAgIH0KICAgICAgICAg aWYgKG1fc3R5bGUtPnNldEZvbnREZXNjcmlwdGlvbihmb250RGVzY3JpcHRpb24pKQogICAgICAg ICAgICAgbV9mb250RGlydHkgPSB0cnVlOwpAQCAtMzcwOSwxNyArMzY5OCwxMSBAQCB2b2lkIENT U1N0eWxlU2VsZWN0b3I6OmFwcGx5UHJvcGVydHkoaW50CiAgICAgICAgIGlmIChpc0luaGVyaXQp IAogICAgICAgICAgICAgZm9udERlc2NyaXB0aW9uLnNldFNtYWxsQ2FwcyhtX3BhcmVudFN0eWxl LT5mb250RGVzY3JpcHRpb24oKS5zbWFsbENhcHMoKSk7CiAgICAgICAgIGVsc2UgaWYgKGlzSW5p dGlhbCkKLSAgICAgICAgICAgIGZvbnREZXNjcmlwdGlvbi5zZXRTbWFsbENhcHMoZmFsc2UpOwor ICAgICAgICAgICAgZm9udERlc2NyaXB0aW9uLnNldFNtYWxsQ2FwcyhGb250U21hbGxDYXBzT2Zm KTsKICAgICAgICAgZWxzZSB7CiAgICAgICAgICAgICBpZiAoIXByaW1pdGl2ZVZhbHVlKQogICAg ICAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgICAgIGludCBpZCA9IHByaW1pdGl2ZVZhbHVl LT5nZXRJZGVudCgpOwotICAgICAgICAgICAgaWYgKGlkID09IENTU1ZhbHVlTm9ybWFsKQotICAg ICAgICAgICAgICAgIGZvbnREZXNjcmlwdGlvbi5zZXRTbWFsbENhcHMoZmFsc2UpOwotICAgICAg ICAgICAgZWxzZSBpZiAoaWQgPT0gQ1NTVmFsdWVTbWFsbENhcHMpCi0gICAgICAgICAgICAgICAg Zm9udERlc2NyaXB0aW9uLnNldFNtYWxsQ2Fwcyh0cnVlKTsKLSAgICAgICAgICAgIGVsc2UKLSAg ICAgICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICBmb250RGVzY3JpcHRpb24uc2V0U21h bGxDYXBzKChGb250U21hbGxDYXBzKSpwcmltaXRpdmVWYWx1ZSk7CiAgICAgICAgIH0KICAgICAg ICAgaWYgKG1fc3R5bGUtPnNldEZvbnREZXNjcmlwdGlvbihmb250RGVzY3JpcHRpb24pKQogICAg ICAgICAgICAgbV9mb250RGlydHkgPSB0cnVlOwpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvRm9udC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL0ZvbnQuaAkocmV2aXNpb24gODQ1NzApCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9Gb250LmgJKHdvcmtpbmcgY29weSkKQEAgLTEyMyw3ICsxMjMsNyBAQCBw dWJsaWM6CiAgICAgRm9udEZhbWlseSYgZmlyc3RGYW1pbHkoKSB7IHJldHVybiBtX2ZvbnREZXNj cmlwdGlvbi5maXJzdEZhbWlseSgpOyB9CiAgICAgY29uc3QgRm9udEZhbWlseSYgZmFtaWx5KCkg Y29uc3QgeyByZXR1cm4gbV9mb250RGVzY3JpcHRpb24uZmFtaWx5KCk7IH0KIAotICAgIGJvb2wg aXRhbGljKCkgY29uc3QgeyByZXR1cm4gbV9mb250RGVzY3JpcHRpb24uaXRhbGljKCk7IH0KKyAg ICBGb250SXRhbGljIGl0YWxpYygpIGNvbnN0IHsgcmV0dXJuIG1fZm9udERlc2NyaXB0aW9uLml0 YWxpYygpOyB9CiAgICAgRm9udFdlaWdodCB3ZWlnaHQoKSBjb25zdCB7IHJldHVybiBtX2ZvbnRE ZXNjcmlwdGlvbi53ZWlnaHQoKTsgfQogICAgIEZvbnRXaWR0aFZhcmlhbnQgd2lkdGhWYXJpYW50 KCkgY29uc3QgeyByZXR1cm4gbV9mb250RGVzY3JpcHRpb24ud2lkdGhWYXJpYW50KCk7IH0KIApJ bmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udERlc2NyaXB0aW9uLmgK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udERlc2Ny aXB0aW9uLmgJKHJldmlzaW9uIDg0NTcwKQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvRm9udERlc2NyaXB0aW9uLmgJKHdvcmtpbmcgY29weSkKQEAgLTUwLDYgKzUwLDE2IEBA IGVudW0gRm9udFdlaWdodCB7CiAgICAgRm9udFdlaWdodEJvbGQgPSBGb250V2VpZ2h0NzAwCiB9 OwogCitlbnVtIEZvbnRJdGFsaWMgeworICAgIEZvbnRJdGFsaWNPZmYgPSAwLAorICAgIEZvbnRJ dGFsaWNPbiA9IDEKK307CisKK2VudW0gRm9udFNtYWxsQ2FwcyB7CisgICAgRm9udFNtYWxsQ2Fw c09mZiA9IDAsCisgICAgRm9udFNtYWxsQ2Fwc09uID0gMQorfTsKKwogY2xhc3MgRm9udERlc2Ny aXB0aW9uIHsKIHB1YmxpYzoKICAgICBlbnVtIEdlbmVyaWNGYW1pbHlUeXBlIHsgTm9GYW1pbHks IFN0YW5kYXJkRmFtaWx5LCBTZXJpZkZhbWlseSwgU2Fuc1NlcmlmRmFtaWx5LCAKQEAgLTYxLDgg KzcxLDggQEAgcHVibGljOgogICAgICAgICAsIG1fb3JpZW50YXRpb24oSG9yaXpvbnRhbCkKICAg ICAgICAgLCBtX3RleHRPcmllbnRhdGlvbihUZXh0T3JpZW50YXRpb25WZXJ0aWNhbFJpZ2h0KQog ICAgICAgICAsIG1fd2lkdGhWYXJpYW50KFJlZ3VsYXJXaWR0aCkKLSAgICAgICAgLCBtX2l0YWxp YyhmYWxzZSkKLSAgICAgICAgLCBtX3NtYWxsQ2FwcyhmYWxzZSkKKyAgICAgICAgLCBtX2l0YWxp YyhGb250SXRhbGljT2ZmKQorICAgICAgICAsIG1fc21hbGxDYXBzKEZvbnRTbWFsbENhcHNPZmYp CiAgICAgICAgICwgbV9pc0Fic29sdXRlU2l6ZShmYWxzZSkKICAgICAgICAgLCBtX3dlaWdodChG b250V2VpZ2h0Tm9ybWFsKQogICAgICAgICAsIG1fZ2VuZXJpY0ZhbWlseShOb0ZhbWlseSkKQEAg LTgyLDkgKzkyLDkgQEAgcHVibGljOgogICAgIEZvbnRGYW1pbHkmIGZpcnN0RmFtaWx5KCkgeyBy ZXR1cm4gbV9mYW1pbHlMaXN0OyB9CiAgICAgZmxvYXQgc3BlY2lmaWVkU2l6ZSgpIGNvbnN0IHsg cmV0dXJuIG1fc3BlY2lmaWVkU2l6ZTsgfQogICAgIGZsb2F0IGNvbXB1dGVkU2l6ZSgpIGNvbnN0 IHsgcmV0dXJuIG1fY29tcHV0ZWRTaXplOyB9Ci0gICAgYm9vbCBpdGFsaWMoKSBjb25zdCB7IHJl dHVybiBtX2l0YWxpYzsgfQorICAgIEZvbnRJdGFsaWMgaXRhbGljKCkgY29uc3QgeyByZXR1cm4g c3RhdGljX2Nhc3Q8Rm9udEl0YWxpYz4obV9pdGFsaWMpOyB9CiAgICAgaW50IGNvbXB1dGVkUGl4 ZWxTaXplKCkgY29uc3QgeyByZXR1cm4gaW50KG1fY29tcHV0ZWRTaXplICsgMC41Zik7IH0KLSAg ICBib29sIHNtYWxsQ2FwcygpIGNvbnN0IHsgcmV0dXJuIG1fc21hbGxDYXBzOyB9CisgICAgRm9u dFNtYWxsQ2FwcyBzbWFsbENhcHMoKSBjb25zdCB7IHJldHVybiBzdGF0aWNfY2FzdDxGb250U21h bGxDYXBzPihtX3NtYWxsQ2Fwcyk7IH0KICAgICBib29sIGlzQWJzb2x1dGVTaXplKCkgY29uc3Qg eyByZXR1cm4gbV9pc0Fic29sdXRlU2l6ZTsgfQogICAgIEZvbnRXZWlnaHQgd2VpZ2h0KCkgY29u c3QgeyByZXR1cm4gc3RhdGljX2Nhc3Q8Rm9udFdlaWdodD4obV93ZWlnaHQpOyB9CiAgICAgRm9u dFdlaWdodCBsaWdodGVyV2VpZ2h0KCkgY29uc3Q7CkBAIC0xMDcsOCArMTE3LDEwIEBAIHB1Ymxp YzoKICAgICB2b2lkIHNldEZhbWlseShjb25zdCBGb250RmFtaWx5JiBmYW1pbHkpIHsgbV9mYW1p bHlMaXN0ID0gZmFtaWx5OyB9CiAgICAgdm9pZCBzZXRDb21wdXRlZFNpemUoZmxvYXQgcykgeyBt X2NvbXB1dGVkU2l6ZSA9IHM7IH0KICAgICB2b2lkIHNldFNwZWNpZmllZFNpemUoZmxvYXQgcykg eyBtX3NwZWNpZmllZFNpemUgPSBzOyB9Ci0gICAgdm9pZCBzZXRJdGFsaWMoYm9vbCBpKSB7IG1f aXRhbGljID0gaTsgfQotICAgIHZvaWQgc2V0U21hbGxDYXBzKGJvb2wgYykgeyBtX3NtYWxsQ2Fw cyA9IGM7IH0KKyAgICB2b2lkIHNldEl0YWxpYyhGb250SXRhbGljIGkpIHsgbV9pdGFsaWMgPSBp OyB9CisgICAgdm9pZCBzZXRJdGFsaWMoYm9vbCBpKSB7IHNldEl0YWxpYyhpID8gRm9udEl0YWxp Y09uIDogRm9udEl0YWxpY09mZik7IH0KKyAgICB2b2lkIHNldFNtYWxsQ2FwcyhGb250U21hbGxD YXBzIGMpIHsgbV9zbWFsbENhcHMgPSBjOyB9CisgICAgdm9pZCBzZXRTbWFsbENhcHMoYm9vbCBj KSB7IHNldFNtYWxsQ2FwcyhjID8gRm9udFNtYWxsQ2Fwc09uIDogRm9udFNtYWxsQ2Fwc09mZik7 IH0KICAgICB2b2lkIHNldElzQWJzb2x1dGVTaXplKGJvb2wgcykgeyBtX2lzQWJzb2x1dGVTaXpl ID0gczsgfQogICAgIHZvaWQgc2V0V2VpZ2h0KEZvbnRXZWlnaHQgdykgeyBtX3dlaWdodCA9IHc7 IH0KICAgICB2b2lkIHNldEdlbmVyaWNGYW1pbHkoR2VuZXJpY0ZhbWlseVR5cGUgZ2VuZXJpY0Zh bWlseSkgeyBtX2dlbmVyaWNGYW1pbHkgPSBnZW5lcmljRmFtaWx5OyB9CkBAIC0xMzgsOCArMTUw LDggQEAgcHJpdmF0ZToKIAogICAgIEZvbnRXaWR0aFZhcmlhbnQgbV93aWR0aFZhcmlhbnQ7CiAK LSAgICBib29sIG1faXRhbGljIDogMTsKLSAgICBib29sIG1fc21hbGxDYXBzIDogMTsKKyAgICB1 bnNpZ25lZCBtX2l0YWxpYyA6IDE7IC8vIEZvbnRJdGFsaWMKKyAgICB1bnNpZ25lZCBtX3NtYWxs Q2FwcyA6IDE7IC8vIEZvbnRTbWFsbENhcHMKICAgICBib29sIG1faXNBYnNvbHV0ZVNpemUgOiAx OyAgIC8vIFdoZXRoZXIgb3Igbm90IENTUyBzcGVjaWZpZWQgYW4gZXhwbGljaXQgc2l6ZQogICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgLy8gKGxvZ2ljYWwgc2l6ZXMgbGlrZSAibWVk aXVtIiBkb24ndCBjb3VudCkuCiAgICAgdW5zaWduZWQgbV93ZWlnaHQgOiA4OyAvLyBGb250V2Vp Z2h0Cg==