60603 2011-05-10 20:08:09 -0700 Implement various CSS font properties in CSSStyleApplyProperty. 2011-05-25 23:46:38 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 macpherson webkit-unassigned commit-queue dglazkov eric macpherson oldest_to_newest 401729 0 macpherson 2011-05-10 20:08:09 -0700 Implement various CSS font properties in CSSStyleApplyProperty. 401732 1 93067 macpherson 2011-05-10 20:19:45 -0700 Created attachment 93067 Patch 401759 2 93067 eric 2011-05-10 22:13:40 -0700 Comment on attachment 93067 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=93067&action=review > Source/WebCore/css/CSSStyleApplyProperty.cpp:412 > + (fontDescription.*m_setter)(*primitiveValue); FontDescription has an m_setter? 402415 3 93067 macpherson 2011-05-11 16:41:52 -0700 Comment on attachment 93067 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=93067&action=review >> Source/WebCore/css/CSSStyleApplyProperty.cpp:412 >> + (fontDescription.*m_setter)(*primitiveValue); > > FontDescription has an m_setter? m_setter is the function pointer defined on line 417 of this patch. 409337 4 macpherson 2011-05-24 17:39:48 -0700 Patch still applies cleanly, builds, passes tests. ;) 410233 5 93067 commit-queue 2011-05-25 23:46:32 -0700 Comment on attachment 93067 Patch Clearing flags on attachment: 93067 Committed r87362: <http://trac.webkit.org/changeset/87362> 410234 6 commit-queue 2011-05-25 23:46:38 -0700 All reviewed patches have been landed. Closing bug. 93067 2011-05-10 20:19:45 -0700 2011-05-25 23:46:32 -0700 Patch bug-60603-20110511131942.patch text/plain 13419 macpherson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg2MjA5KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzAgQEAKKzIwMTEtMDUtMTAgIEx1a2UgTWFj cGhlcnNvbiAgIDxtYWNwaGVyc29uQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbXBsZW1lbnQgdmFyaW91cyBDU1MgZm9udCBw cm9wZXJ0aWVzIGluIENTU1N0eWxlQXBwbHlQcm9wZXJ0eS4KKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTYwNjAzCisKKyAgICAgICAgTm8gbmV3IHRlc3Rz IC0gcmVmYWN0b3Jpbmcgb25seS4KKworICAgICAgICAqIGNzcy9DU1NTdHlsZUFwcGx5UHJvcGVy dHkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QXBwbHlQcm9wZXJ0eUZvbnQpOgorICAgICAgICBB ZGRlZCB0ZW1wbGF0ZWQgY2xhc3MgdG8gaGFuZGxlIGZvbnQgcHJvcGVydGllcworICAgICAgICAo V2ViQ29yZTo6QXBwbHlQcm9wZXJ0eUZvbnRXZWlnaHQpOgorICAgICAgICBBZGRlZCBjbGFzcyB0 byBoYW5kbGUgZm9udCB3ZWlnaHQgY2FsY3VsYXRpb24KKyAgICAgICAgKFdlYkNvcmU6OkNTU1N0 eWxlQXBwbHlQcm9wZXJ0eTo6Q1NTU3R5bGVBcHBseVByb3BlcnR5KToKKyAgICAgICAgSW5zdGFu dGlhdGUgQXBwbHlQcm9wZXJ0eUZvbnQvQXBwbHlQcm9wZXJ0eUZvbnRXZWlnaHQgZm9yIGFwcHJv cHJpYXRlIHByb3BlcnRpZXMuCisgICAgICAgICogY3NzL0NTU1N0eWxlU2VsZWN0b3IuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6Q1NTU3R5bGVTZWxlY3Rvcjo6YXBwbHlQcm9wZXJ0eSk6CisgICAg ICAgIFJlbW92ZSBwcm9wZXJ0aWVzIHRoYXQgYXJlIG5vdyBpbXBsZW1lbnRlZCBpbiBDU1NTdHls ZUFwcGx5UHJvcGVydHkKKyAgICAgICAgKiBjc3MvQ1NTU3R5bGVTZWxlY3Rvci5oOgorICAgICAg ICAoV2ViQ29yZTo6Q1NTU3R5bGVTZWxlY3Rvcjo6Zm9udERlc2NyaXB0aW9uKToKKyAgICAgICAg QWRkZWQgZ2V0dGVyIGZvciBtX3N0eWxlLT5mb250RGVzY3JpcHRpb24oKQorICAgICAgICAoV2Vi Q29yZTo6Q1NTU3R5bGVTZWxlY3Rvcjo6cGFyZW50Rm9udERlc2NyaXB0aW9uKToKKyAgICAgICAg QWRkZWQgZ2V0dGVyIGZvciBtX3BhcmVudFN0eWxlLT5mb250RGVzY3JpcHRpb24oKQorICAgICAg ICAoV2ViQ29yZTo6Q1NTU3R5bGVTZWxlY3Rvcjo6c2V0Rm9udERlc2NyaXB0aW9uKToKKyAgICAg ICAgQWRkZWQgc2V0dGVyIGZvciBtX3N0eWxlLT5zZXRGb250RGVzY3JpcHRpb24oKSB0aGF0IGF1 dG9tYXRpY2FsbHkgc2V0cyBtX2ZvbnREaXJ0eQorCiAyMDExLTA1LTEwICBKYW1lcyBSb2JpbnNv biAgPGphbWVzckBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgS2VubmV0aCBS dXNzZWxsLgpJbmRleDogU291cmNlL1dlYkNvcmUvY3NzL0NTU1N0eWxlQXBwbHlQcm9wZXJ0eS5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvY3NzL0NTU1N0eWxlQXBwbHlQcm9wZXJ0 eS5jcHAJKHJldmlzaW9uIDg2MTk5KQorKysgU291cmNlL1dlYkNvcmUvY3NzL0NTU1N0eWxlQXBw bHlQcm9wZXJ0eS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM3NSw2ICszNzUsNzkgQEAgcHJpdmF0 ZToKICAgICB9CiB9OwogCit0ZW1wbGF0ZSA8dHlwZW5hbWUgVD4KK2NsYXNzIEFwcGx5UHJvcGVy dHlGb250IDogcHVibGljIEFwcGx5UHJvcGVydHlCYXNlIHsKK3B1YmxpYzoKKyAgICB0eXBlZGVm IFQgKEZvbnREZXNjcmlwdGlvbjo6KkdldHRlckZ1bmN0aW9uKSgpIGNvbnN0OworICAgIHR5cGVk ZWYgdm9pZCAoRm9udERlc2NyaXB0aW9uOjoqU2V0dGVyRnVuY3Rpb24pKFQpOworCisgICAgQXBw bHlQcm9wZXJ0eUZvbnQoR2V0dGVyRnVuY3Rpb24gZ2V0dGVyLCBTZXR0ZXJGdW5jdGlvbiBzZXR0 ZXIsIFQgaW5pdGlhbCkKKyAgICAgICAgOiBtX2dldHRlcihnZXR0ZXIpCisgICAgICAgICwgbV9z ZXR0ZXIoc2V0dGVyKQorICAgICAgICAsIG1faW5pdGlhbChpbml0aWFsKQorICAgIHsKKyAgICB9 CisKK3ByaXZhdGU6CisgICAgdmlydHVhbCB2b2lkIGFwcGx5SW5oZXJpdFZhbHVlKENTU1N0eWxl U2VsZWN0b3IqIHNlbGVjdG9yKSBjb25zdAorICAgIHsKKyAgICAgICAgRm9udERlc2NyaXB0aW9u IGZvbnREZXNjcmlwdGlvbiA9IHNlbGVjdG9yLT5mb250RGVzY3JpcHRpb24oKTsKKyAgICAgICAg KGZvbnREZXNjcmlwdGlvbi4qbV9zZXR0ZXIpKChzZWxlY3Rvci0+cGFyZW50Rm9udERlc2NyaXB0 aW9uKCkuKm1fZ2V0dGVyKSgpKTsKKyAgICAgICAgc2VsZWN0b3ItPnNldEZvbnREZXNjcmlwdGlv bihmb250RGVzY3JpcHRpb24pOworICAgIH0KKworICAgIHZpcnR1YWwgdm9pZCBhcHBseUluaXRp YWxWYWx1ZShDU1NTdHlsZVNlbGVjdG9yKiBzZWxlY3RvcikgY29uc3QKKyAgICB7CisgICAgICAg IEZvbnREZXNjcmlwdGlvbiBmb250RGVzY3JpcHRpb24gPSBzZWxlY3Rvci0+Zm9udERlc2NyaXB0 aW9uKCk7CisgICAgICAgIChmb250RGVzY3JpcHRpb24uKm1fc2V0dGVyKShtX2luaXRpYWwpOwor ICAgICAgICBzZWxlY3Rvci0+c2V0Rm9udERlc2NyaXB0aW9uKGZvbnREZXNjcmlwdGlvbik7Cisg ICAgfQorCisgICAgdmlydHVhbCB2b2lkIGFwcGx5VmFsdWUoQ1NTU3R5bGVTZWxlY3Rvciogc2Vs ZWN0b3IsIENTU1ZhbHVlKiB2YWx1ZSkgY29uc3QKKyAgICB7CisgICAgICAgIGlmICghdmFsdWUt PmlzUHJpbWl0aXZlVmFsdWUoKSkKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgQ1NTUHJp bWl0aXZlVmFsdWUqIHByaW1pdGl2ZVZhbHVlID0gc3RhdGljX2Nhc3Q8Q1NTUHJpbWl0aXZlVmFs dWUqPih2YWx1ZSk7CisgICAgICAgIEZvbnREZXNjcmlwdGlvbiBmb250RGVzY3JpcHRpb24gPSBz ZWxlY3Rvci0+Zm9udERlc2NyaXB0aW9uKCk7CisgICAgICAgIChmb250RGVzY3JpcHRpb24uKm1f c2V0dGVyKSgqcHJpbWl0aXZlVmFsdWUpOworICAgICAgICBzZWxlY3Rvci0+c2V0Rm9udERlc2Ny aXB0aW9uKGZvbnREZXNjcmlwdGlvbik7CisgICAgfQorCisgICAgR2V0dGVyRnVuY3Rpb24gbV9n ZXR0ZXI7CisgICAgU2V0dGVyRnVuY3Rpb24gbV9zZXR0ZXI7CisgICAgVCBtX2luaXRpYWw7Cit9 OworCitjbGFzcyBBcHBseVByb3BlcnR5Rm9udFdlaWdodCA6IHB1YmxpYyBBcHBseVByb3BlcnR5 Rm9udDxGb250V2VpZ2h0PiB7CitwdWJsaWM6CisgICAgQXBwbHlQcm9wZXJ0eUZvbnRXZWlnaHQo KQorICAgICAgICA6IEFwcGx5UHJvcGVydHlGb250PEZvbnRXZWlnaHQ+KCZGb250RGVzY3JpcHRp b246OndlaWdodCwgJkZvbnREZXNjcmlwdGlvbjo6c2V0V2VpZ2h0LCBGb250V2VpZ2h0Tm9ybWFs KQorICAgIHsKKyAgICB9CisKKyAgICB2aXJ0dWFsIHZvaWQgYXBwbHlWYWx1ZShDU1NTdHlsZVNl bGVjdG9yKiBzZWxlY3RvciwgQ1NTVmFsdWUqIHZhbHVlKSBjb25zdAorICAgIHsKKyAgICAgICAg aWYgKCF2YWx1ZS0+aXNQcmltaXRpdmVWYWx1ZSgpKQorICAgICAgICAgICAgcmV0dXJuOworICAg ICAgICBDU1NQcmltaXRpdmVWYWx1ZSogcHJpbWl0aXZlVmFsdWUgPSBzdGF0aWNfY2FzdDxDU1NQ cmltaXRpdmVWYWx1ZSo+KHZhbHVlKTsKKyAgICAgICAgRm9udERlc2NyaXB0aW9uIGZvbnREZXNj cmlwdGlvbiA9IHNlbGVjdG9yLT5mb250RGVzY3JpcHRpb24oKTsKKyAgICAgICAgc3dpdGNoIChw cmltaXRpdmVWYWx1ZS0+Z2V0SWRlbnQoKSkgeworICAgICAgICBjYXNlIENTU1ZhbHVlSW52YWxp ZDoKKyAgICAgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOworICAgICAgICAgICAgYnJlYWs7 CisgICAgICAgIGNhc2UgQ1NTVmFsdWVCb2xkZXI6CisgICAgICAgICAgICBmb250RGVzY3JpcHRp b24uc2V0V2VpZ2h0KGZvbnREZXNjcmlwdGlvbi5ib2xkZXJXZWlnaHQoKSk7CisgICAgICAgICAg ICBicmVhazsKKyAgICAgICAgY2FzZSBDU1NWYWx1ZUxpZ2h0ZXI6CisgICAgICAgICAgICBmb250 RGVzY3JpcHRpb24uc2V0V2VpZ2h0KGZvbnREZXNjcmlwdGlvbi5saWdodGVyV2VpZ2h0KCkpOwor ICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIGRlZmF1bHQ6CisgICAgICAgICAgICBmb250RGVz Y3JpcHRpb24uc2V0V2VpZ2h0KCpwcmltaXRpdmVWYWx1ZSk7CisgICAgICAgIH0KKyAgICAgICAg c2VsZWN0b3ItPnNldEZvbnREZXNjcmlwdGlvbihmb250RGVzY3JpcHRpb24pOworICAgIH0KK307 CisKIGNvbnN0IENTU1N0eWxlQXBwbHlQcm9wZXJ0eSYgQ1NTU3R5bGVBcHBseVByb3BlcnR5Ojpz aGFyZWRDU1NTdHlsZUFwcGx5UHJvcGVydHkoKQogewogICAgIERFRklORV9TVEFUSUNfTE9DQUwo Q1NTU3R5bGVBcHBseVByb3BlcnR5LCBjc3NTdHlsZUFwcGx5UHJvcGVydHlJbnN0YW5jZSwgKCkp OwpAQCAtNDc1LDYgKzU0OCwxMyBAQCBDU1NTdHlsZUFwcGx5UHJvcGVydHk6OkNTU1N0eWxlQXBw bHlQcm9wCiAgICAgc2V0UHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5Qm9yZGVyQ29sb3IsIG5l dyBBcHBseVByb3BlcnR5RXhwYW5kaW5nU3VwcHJlc3NWYWx1ZShwcm9wZXJ0eUhhbmRsZXIoQ1NT UHJvcGVydHlCb3JkZXJUb3BDb2xvciksIHByb3BlcnR5SGFuZGxlcihDU1NQcm9wZXJ0eUJvcmRl clJpZ2h0Q29sb3IpLCBwcm9wZXJ0eUhhbmRsZXIoQ1NTUHJvcGVydHlCb3JkZXJCb3R0b21Db2xv ciksIHByb3BlcnR5SGFuZGxlcihDU1NQcm9wZXJ0eUJvcmRlckxlZnRDb2xvcikpKTsKICAgICBz ZXRQcm9wZXJ0eUhhbmRsZXIoQ1NTUHJvcGVydHlCb3JkZXIsIG5ldyBBcHBseVByb3BlcnR5RXhw YW5kaW5nU3VwcHJlc3NWYWx1ZShwcm9wZXJ0eUhhbmRsZXIoQ1NTUHJvcGVydHlCb3JkZXJTdHls ZSksIHByb3BlcnR5SGFuZGxlcihDU1NQcm9wZXJ0eUJvcmRlcldpZHRoKSwgcHJvcGVydHlIYW5k bGVyKENTU1Byb3BlcnR5Qm9yZGVyQ29sb3IpKSk7CiAKKyAgICBzZXRQcm9wZXJ0eUhhbmRsZXIo Q1NTUHJvcGVydHlGb250U3R5bGUsIG5ldyBBcHBseVByb3BlcnR5Rm9udDxGb250SXRhbGljPigm Rm9udERlc2NyaXB0aW9uOjppdGFsaWMsICZGb250RGVzY3JpcHRpb246OnNldEl0YWxpYywgRm9u dEl0YWxpY09mZikpOworICAgIHNldFByb3BlcnR5SGFuZGxlcihDU1NQcm9wZXJ0eUZvbnRWYXJp YW50LCBuZXcgQXBwbHlQcm9wZXJ0eUZvbnQ8Rm9udFNtYWxsQ2Fwcz4oJkZvbnREZXNjcmlwdGlv bjo6c21hbGxDYXBzLCAmRm9udERlc2NyaXB0aW9uOjpzZXRTbWFsbENhcHMsIEZvbnRTbWFsbENh cHNPZmYpKTsKKyAgICBzZXRQcm9wZXJ0eUhhbmRsZXIoQ1NTUHJvcGVydHlUZXh0UmVuZGVyaW5n LCBuZXcgQXBwbHlQcm9wZXJ0eUZvbnQ8VGV4dFJlbmRlcmluZ01vZGU+KCZGb250RGVzY3JpcHRp b246OnRleHRSZW5kZXJpbmdNb2RlLCAmRm9udERlc2NyaXB0aW9uOjpzZXRUZXh0UmVuZGVyaW5n TW9kZSwgQXV0b1RleHRSZW5kZXJpbmcpKTsKKyAgICBzZXRQcm9wZXJ0eUhhbmRsZXIoQ1NTUHJv cGVydHlXZWJraXRGb250U21vb3RoaW5nLCBuZXcgQXBwbHlQcm9wZXJ0eUZvbnQ8Rm9udFNtb290 aGluZ01vZGU+KCZGb250RGVzY3JpcHRpb246OmZvbnRTbW9vdGhpbmcsICZGb250RGVzY3JpcHRp b246OnNldEZvbnRTbW9vdGhpbmcsIEF1dG9TbW9vdGhpbmcpKTsKKyAgICBzZXRQcm9wZXJ0eUhh bmRsZXIoQ1NTUHJvcGVydHlXZWJraXRUZXh0T3JpZW50YXRpb24sIG5ldyBBcHBseVByb3BlcnR5 Rm9udDxUZXh0T3JpZW50YXRpb24+KCZGb250RGVzY3JpcHRpb246OnRleHRPcmllbnRhdGlvbiwg JkZvbnREZXNjcmlwdGlvbjo6c2V0VGV4dE9yaWVudGF0aW9uLCBSZW5kZXJTdHlsZTo6aW5pdGlh bFRleHRPcmllbnRhdGlvbigpKSk7CisgICAgc2V0UHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5 Rm9udFdlaWdodCwgbmV3IEFwcGx5UHJvcGVydHlGb250V2VpZ2h0KCkpOworCiAgICAgc2V0UHJv cGVydHlIYW5kbGVyKENTU1Byb3BlcnR5T3V0bGluZUNvbG9yLCBuZXcgQXBwbHlQcm9wZXJ0eUNv bG9yPEluaGVyaXRGcm9tUGFyZW50PigmUmVuZGVyU3R5bGU6Om91dGxpbmVDb2xvciwgJlJlbmRl clN0eWxlOjpzZXRPdXRsaW5lQ29sb3IsICZSZW5kZXJTdHlsZTo6Y29sb3IpKTsKIAogICAgIHNl dFByb3BlcnR5SGFuZGxlcihDU1NQcm9wZXJ0eU92ZXJmbG93WCwgbmV3IEFwcGx5UHJvcGVydHlE ZWZhdWx0PEVPdmVyZmxvdz4oJlJlbmRlclN0eWxlOjpvdmVyZmxvd1gsICZSZW5kZXJTdHlsZTo6 c2V0T3ZlcmZsb3dYLCAmUmVuZGVyU3R5bGU6OmluaXRpYWxPdmVyZmxvd1gpKTsKSW5kZXg6IFNv dXJjZS9XZWJDb3JlL2Nzcy9DU1NTdHlsZVNlbGVjdG9yLmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVTZWxlY3Rvci5jcHAJKHJldmlzaW9uIDg2MTk5KQorKysg U291cmNlL1dlYkNvcmUvY3NzL0NTU1N0eWxlU2VsZWN0b3IuY3BwCSh3b3JraW5nIGNvcHkpCkBA IC0zNjMzLDY5ICszNjMzLDYgQEAgdm9pZCBDU1NTdHlsZVNlbGVjdG9yOjphcHBseVByb3BlcnR5 KGludAogICAgIGNhc2UgQ1NTUHJvcGVydHlGbG9hdDoKICAgICAgICAgSEFORExFX0lOSEVSSVRf QU5EX0lOSVRJQUxfQU5EX1BSSU1JVElWRShmbG9hdGluZywgRmxvYXRpbmcpCiAgICAgICAgIHJl dHVybjsKLSAgICBjYXNlIENTU1Byb3BlcnR5Rm9udFN0eWxlOgotICAgIHsKLSAgICAgICAgRm9u dERlc2NyaXB0aW9uIGZvbnREZXNjcmlwdGlvbiA9IG1fc3R5bGUtPmZvbnREZXNjcmlwdGlvbigp OwotICAgICAgICBpZiAoaXNJbmhlcml0KQotICAgICAgICAgICAgZm9udERlc2NyaXB0aW9uLnNl dEl0YWxpYyhtX3BhcmVudFN0eWxlLT5mb250RGVzY3JpcHRpb24oKS5pdGFsaWMoKSk7Ci0gICAg ICAgIGVsc2UgaWYgKGlzSW5pdGlhbCkKLSAgICAgICAgICAgIGZvbnREZXNjcmlwdGlvbi5zZXRJ dGFsaWMoRm9udEl0YWxpY09mZik7Ci0gICAgICAgIGVsc2UgewotICAgICAgICAgICAgaWYgKCFw cmltaXRpdmVWYWx1ZSkKLSAgICAgICAgICAgICAgICByZXR1cm47Ci0gICAgICAgICAgICBmb250 RGVzY3JpcHRpb24uc2V0SXRhbGljKChGb250SXRhbGljKSpwcmltaXRpdmVWYWx1ZSk7Ci0gICAg ICAgIH0KLSAgICAgICAgaWYgKG1fc3R5bGUtPnNldEZvbnREZXNjcmlwdGlvbihmb250RGVzY3Jp cHRpb24pKQotICAgICAgICAgICAgbV9mb250RGlydHkgPSB0cnVlOwotICAgICAgICByZXR1cm47 Ci0gICAgfQotCi0gICAgY2FzZSBDU1NQcm9wZXJ0eUZvbnRWYXJpYW50OgotICAgIHsKLSAgICAg ICAgRm9udERlc2NyaXB0aW9uIGZvbnREZXNjcmlwdGlvbiA9IG1fc3R5bGUtPmZvbnREZXNjcmlw dGlvbigpOwotICAgICAgICBpZiAoaXNJbmhlcml0KSAKLSAgICAgICAgICAgIGZvbnREZXNjcmlw dGlvbi5zZXRTbWFsbENhcHMobV9wYXJlbnRTdHlsZS0+Zm9udERlc2NyaXB0aW9uKCkuc21hbGxD YXBzKCkpOwotICAgICAgICBlbHNlIGlmIChpc0luaXRpYWwpCi0gICAgICAgICAgICBmb250RGVz Y3JpcHRpb24uc2V0U21hbGxDYXBzKEZvbnRTbWFsbENhcHNPZmYpOwotICAgICAgICBlbHNlIHsK LSAgICAgICAgICAgIGlmICghcHJpbWl0aXZlVmFsdWUpCi0gICAgICAgICAgICAgICAgcmV0dXJu OwotICAgICAgICAgICAgZm9udERlc2NyaXB0aW9uLnNldFNtYWxsQ2FwcygoRm9udFNtYWxsQ2Fw cykqcHJpbWl0aXZlVmFsdWUpOwotICAgICAgICB9Ci0gICAgICAgIGlmIChtX3N0eWxlLT5zZXRG b250RGVzY3JpcHRpb24oZm9udERlc2NyaXB0aW9uKSkKLSAgICAgICAgICAgIG1fZm9udERpcnR5 ID0gdHJ1ZTsKLSAgICAgICAgcmV0dXJuOwotICAgIH0KLQotICAgIGNhc2UgQ1NTUHJvcGVydHlG b250V2VpZ2h0OgotICAgIHsKLSAgICAgICAgRm9udERlc2NyaXB0aW9uIGZvbnREZXNjcmlwdGlv biA9IG1fc3R5bGUtPmZvbnREZXNjcmlwdGlvbigpOwotICAgICAgICBpZiAoaXNJbmhlcml0KQot ICAgICAgICAgICAgZm9udERlc2NyaXB0aW9uLnNldFdlaWdodChtX3BhcmVudFN0eWxlLT5mb250 RGVzY3JpcHRpb24oKS53ZWlnaHQoKSk7Ci0gICAgICAgIGVsc2UgaWYgKGlzSW5pdGlhbCkKLSAg ICAgICAgICAgIGZvbnREZXNjcmlwdGlvbi5zZXRXZWlnaHQoRm9udFdlaWdodE5vcm1hbCk7Ci0g ICAgICAgIGVsc2UgewotICAgICAgICAgICAgaWYgKCFwcmltaXRpdmVWYWx1ZSkKLSAgICAgICAg ICAgICAgICByZXR1cm47Ci0gICAgICAgICAgICBzd2l0Y2ggKHByaW1pdGl2ZVZhbHVlLT5nZXRJ ZGVudCgpKSB7Ci0gICAgICAgICAgICBjYXNlIENTU1ZhbHVlSW52YWxpZDoKLSAgICAgICAgICAg ICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKLSAgICAgICAgICAgICAgICBicmVhazsKLSAgICAg ICAgICAgIGNhc2UgQ1NTVmFsdWVCb2xkZXI6Ci0gICAgICAgICAgICAgICAgZm9udERlc2NyaXB0 aW9uLnNldFdlaWdodChmb250RGVzY3JpcHRpb24uYm9sZGVyV2VpZ2h0KCkpOwotICAgICAgICAg ICAgICAgIGJyZWFrOwotICAgICAgICAgICAgY2FzZSBDU1NWYWx1ZUxpZ2h0ZXI6Ci0gICAgICAg ICAgICAgICAgZm9udERlc2NyaXB0aW9uLnNldFdlaWdodChmb250RGVzY3JpcHRpb24ubGlnaHRl cldlaWdodCgpKTsKLSAgICAgICAgICAgICAgICBicmVhazsKLSAgICAgICAgICAgIGRlZmF1bHQ6 Ci0gICAgICAgICAgICAgICAgZm9udERlc2NyaXB0aW9uLnNldFdlaWdodCgqcHJpbWl0aXZlVmFs dWUpOwotICAgICAgICAgICAgfQotICAgICAgICB9Ci0gICAgICAgIGlmIChtX3N0eWxlLT5zZXRG b250RGVzY3JpcHRpb24oZm9udERlc2NyaXB0aW9uKSkKLSAgICAgICAgICAgIG1fZm9udERpcnR5 ID0gdHJ1ZTsKLSAgICAgICAgcmV0dXJuOwotICAgIH0KLSAgICAgICAgCiAgICAgY2FzZSBDU1NQ cm9wZXJ0eUxpc3RTdHlsZVBvc2l0aW9uOgogICAgICAgICBIQU5ETEVfSU5IRVJJVF9BTkRfSU5J VElBTF9BTkRfUFJJTUlUSVZFKGxpc3RTdHlsZVBvc2l0aW9uLCBMaXN0U3R5bGVQb3NpdGlvbikK ICAgICAgICAgcmV0dXJuOwpAQCAtMzgwMSwyMyArMzczOCw2IEBAIHZvaWQgQ1NTU3R5bGVTZWxl Y3Rvcjo6YXBwbHlQcm9wZXJ0eShpbnQKICAgICAgICAgbV9zdHlsZS0+c2V0TGlzdFN0eWxlSW1h Z2Uoc3R5bGVJbWFnZShDU1NQcm9wZXJ0eUxpc3RTdHlsZUltYWdlLCB2YWx1ZSkpOwogICAgICAg ICByZXR1cm47CiAgICAgfQotCi0gICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdEZvbnRTbW9vdGhp bmc6IHsKLSAgICAgICAgRm9udERlc2NyaXB0aW9uIGZvbnREZXNjcmlwdGlvbiA9IG1fc3R5bGUt PmZvbnREZXNjcmlwdGlvbigpOwotICAgICAgICBpZiAoaXNJbmhlcml0KSAKLSAgICAgICAgICAg IGZvbnREZXNjcmlwdGlvbi5zZXRGb250U21vb3RoaW5nKG1fcGFyZW50U3R5bGUtPmZvbnREZXNj cmlwdGlvbigpLmZvbnRTbW9vdGhpbmcoKSk7Ci0gICAgICAgIGVsc2UgaWYgKGlzSW5pdGlhbCkK LSAgICAgICAgICAgIGZvbnREZXNjcmlwdGlvbi5zZXRGb250U21vb3RoaW5nKEF1dG9TbW9vdGhp bmcpOwotICAgICAgICBlbHNlIHsKLSAgICAgICAgICAgIGlmICghcHJpbWl0aXZlVmFsdWUpCi0g ICAgICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICAgICAgZm9udERlc2NyaXB0aW9uLnNldEZv bnRTbW9vdGhpbmcoKnByaW1pdGl2ZVZhbHVlKTsKLSAgICAgICAgfQotICAgICAgICBpZiAobV9z dHlsZS0+c2V0Rm9udERlc2NyaXB0aW9uKGZvbnREZXNjcmlwdGlvbikpCi0gICAgICAgICAgICBt X2ZvbnREaXJ0eSA9IHRydWU7Ci0gICAgICAgIHJldHVybjsKLSAgICB9Ci0KICAgICBjYXNlIENT U1Byb3BlcnR5TGV0dGVyU3BhY2luZzoKICAgICBjYXNlIENTU1Byb3BlcnR5V29yZFNwYWNpbmc6 CiAgICAgewpAQCAtNDY2NCwyMSArNDU4NCw2IEBAIHZvaWQgQ1NTU3R5bGVTZWxlY3Rvcjo6YXBw bHlQcm9wZXJ0eShpbnQKICAgICAgICAgSEFORExFX0lOSEVSSVRfQU5EX0lOSVRJQUwob3V0bGlu ZU9mZnNldCwgT3V0bGluZU9mZnNldCkKICAgICAgICAgbV9zdHlsZS0+c2V0T3V0bGluZU9mZnNl dChwcmltaXRpdmVWYWx1ZS0+Y29tcHV0ZUxlbmd0aEludChzdHlsZSgpLCBtX3Jvb3RFbGVtZW50 U3R5bGUsIHpvb21GYWN0b3IpKTsKICAgICAgICAgcmV0dXJuOwotICAgIGNhc2UgQ1NTUHJvcGVy dHlUZXh0UmVuZGVyaW5nOiB7Ci0gICAgICAgIEZvbnREZXNjcmlwdGlvbiBmb250RGVzY3JpcHRp b24gPSBtX3N0eWxlLT5mb250RGVzY3JpcHRpb24oKTsKLSAgICAgICAgaWYgKGlzSW5oZXJpdCkg Ci0gICAgICAgICAgICBmb250RGVzY3JpcHRpb24uc2V0VGV4dFJlbmRlcmluZ01vZGUobV9wYXJl bnRTdHlsZS0+Zm9udERlc2NyaXB0aW9uKCkudGV4dFJlbmRlcmluZ01vZGUoKSk7Ci0gICAgICAg IGVsc2UgaWYgKGlzSW5pdGlhbCkKLSAgICAgICAgICAgIGZvbnREZXNjcmlwdGlvbi5zZXRUZXh0 UmVuZGVyaW5nTW9kZShBdXRvVGV4dFJlbmRlcmluZyk7Ci0gICAgICAgIGVsc2UgewotICAgICAg ICAgICAgaWYgKCFwcmltaXRpdmVWYWx1ZSkKLSAgICAgICAgICAgICAgICByZXR1cm47Ci0gICAg ICAgICAgICBmb250RGVzY3JpcHRpb24uc2V0VGV4dFJlbmRlcmluZ01vZGUoKnByaW1pdGl2ZVZh bHVlKTsKLSAgICAgICAgfQotICAgICAgICBpZiAobV9zdHlsZS0+c2V0Rm9udERlc2NyaXB0aW9u KGZvbnREZXNjcmlwdGlvbikpCi0gICAgICAgICAgICBtX2ZvbnREaXJ0eSA9IHRydWU7Ci0gICAg ICAgIHJldHVybjsKLSAgICB9CiAgICAgY2FzZSBDU1NQcm9wZXJ0eVRleHRTaGFkb3c6CiAgICAg Y2FzZSBDU1NQcm9wZXJ0eUJveFNoYWRvdzoKICAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0Qm94 U2hhZG93OiB7CkBAIC01NDI5LDI4ICs1MzM0LDYgQEAgdm9pZCBDU1NTdHlsZVNlbGVjdG9yOjph cHBseVByb3BlcnR5KGludAogICAgICAgICB9CiAKICAgICAgICAgcmV0dXJuOwotCi0gICAgY2Fz ZSBDU1NQcm9wZXJ0eVdlYmtpdFRleHRPcmllbnRhdGlvbjogewotICAgICAgICBpZiAoIWlzSW5o ZXJpdCAmJiAhaXNJbml0aWFsICYmICFwcmltaXRpdmVWYWx1ZSkKLSAgICAgICAgICAgIHJldHVy bjsKLSAgICAgICAgCi0gICAgICAgIFRleHRPcmllbnRhdGlvbiByZXN1bHQ7Ci0gICAgICAgIGlm IChpc0luaGVyaXQpCi0gICAgICAgICAgICByZXN1bHQgPSBtX3BhcmVudFN0eWxlLT5mb250RGVz Y3JpcHRpb24oKS50ZXh0T3JpZW50YXRpb24oKTsKLSAgICAgICAgZWxzZSBpZiAoaXNJbml0aWFs KQotICAgICAgICAgICAgcmVzdWx0ID0gUmVuZGVyU3R5bGU6OmluaXRpYWxUZXh0T3JpZW50YXRp b24oKTsKLSAgICAgICAgZWxzZQotICAgICAgICAgICAgcmVzdWx0ID0gKnByaW1pdGl2ZVZhbHVl OwotICAgICAgICAKLSAgICAgICAgRm9udERlc2NyaXB0aW9uIGZvbnREZXNjcmlwdGlvbiA9IG1f c3R5bGUtPmZvbnREZXNjcmlwdGlvbigpOwotICAgICAgICBpZiAoZm9udERlc2NyaXB0aW9uLnRl eHRPcmllbnRhdGlvbigpICE9IHJlc3VsdCkgewotICAgICAgICAgICAgZm9udERlc2NyaXB0aW9u LnNldFRleHRPcmllbnRhdGlvbihyZXN1bHQpOwotICAgICAgICAgICAgaWYgKG1fc3R5bGUtPnNl dEZvbnREZXNjcmlwdGlvbihmb250RGVzY3JpcHRpb24pKQotICAgICAgICAgICAgICAgIG1fZm9u dERpcnR5ID0gdHJ1ZTsKLSAgICAgICAgfQotICAgICAgICByZXR1cm47Ci0gICAgfQotCiAgICAg Y2FzZSBDU1NQcm9wZXJ0eVdlYmtpdExpbmVCb3hDb250YWluOiB7CiAgICAgICAgIEhBTkRMRV9J TkhFUklUX0FORF9JTklUSUFMKGxpbmVCb3hDb250YWluLCBMaW5lQm94Q29udGFpbikKICAgICAg ICAgaWYgKHByaW1pdGl2ZVZhbHVlICYmIHByaW1pdGl2ZVZhbHVlLT5nZXRJZGVudCgpID09IENT U1ZhbHVlTm9uZSkgewpAQCAtNTUwNSw2ICs1Mzg4LDEyIEBAIHZvaWQgQ1NTU3R5bGVTZWxlY3Rv cjo6YXBwbHlQcm9wZXJ0eShpbnQKICAgICBjYXNlIENTU1Byb3BlcnR5Qm9yZGVyUmlnaHQ6CiAg ICAgY2FzZSBDU1NQcm9wZXJ0eUJvcmRlckJvdHRvbToKICAgICBjYXNlIENTU1Byb3BlcnR5Qm9y ZGVyTGVmdDoKKyAgICBjYXNlIENTU1Byb3BlcnR5Rm9udFN0eWxlOgorICAgIGNhc2UgQ1NTUHJv cGVydHlGb250VmFyaWFudDoKKyAgICBjYXNlIENTU1Byb3BlcnR5VGV4dFJlbmRlcmluZzoKKyAg ICBjYXNlIENTU1Byb3BlcnR5V2Via2l0VGV4dE9yaWVudGF0aW9uOgorICAgIGNhc2UgQ1NTUHJv cGVydHlXZWJraXRGb250U21vb3RoaW5nOgorICAgIGNhc2UgQ1NTUHJvcGVydHlGb250V2VpZ2h0 OgogICAgIGNhc2UgQ1NTUHJvcGVydHlPdXRsaW5lV2lkdGg6CiAgICAgY2FzZSBDU1NQcm9wZXJ0 eVdlYmtpdENvbHVtblJ1bGVXaWR0aDoKICAgICBjYXNlIENTU1Byb3BlcnR5T3V0bGluZUNvbG9y OgpJbmRleDogU291cmNlL1dlYkNvcmUvY3NzL0NTU1N0eWxlU2VsZWN0b3IuaAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVTZWxlY3Rvci5oCShyZXZpc2lvbiA4NjE5 OSkKKysrIFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NTdHlsZVNlbGVjdG9yLmgJKHdvcmtpbmcgY29w eSkKQEAgLTExMSw2ICsxMTEsOSBAQCBwdWJsaWM6CiAgICAgICAgIFJlbmRlclN0eWxlKiBwYXJl bnRTdHlsZSgpIGNvbnN0IHsgcmV0dXJuIG1fcGFyZW50U3R5bGU7IH0KICAgICAgICAgUmVuZGVy U3R5bGUqIHJvb3RFbGVtZW50U3R5bGUoKSBjb25zdCB7IHJldHVybiBtX3Jvb3RFbGVtZW50U3R5 bGU7IH0KICAgICAgICAgRWxlbWVudCogZWxlbWVudCgpIGNvbnN0IHsgcmV0dXJuIG1fZWxlbWVu dDsgfQorICAgICAgICBGb250RGVzY3JpcHRpb24gZm9udERlc2NyaXB0aW9uKCkgeyByZXR1cm4g c3R5bGUoKS0+Zm9udERlc2NyaXB0aW9uKCk7IH0KKyAgICAgICAgRm9udERlc2NyaXB0aW9uIHBh cmVudEZvbnREZXNjcmlwdGlvbigpIHtyZXR1cm4gcGFyZW50U3R5bGUoKS0+Zm9udERlc2NyaXB0 aW9uKCk7IH0KKyAgICAgICAgdm9pZCBzZXRGb250RGVzY3JpcHRpb24oRm9udERlc2NyaXB0aW9u IGZvbnREZXNjcmlwdGlvbikgeyBtX2ZvbnREaXJ0eSB8PSBzdHlsZSgpLT5zZXRGb250RGVzY3Jp cHRpb24oZm9udERlc2NyaXB0aW9uKTsgfQogCiAgICAgcHJpdmF0ZToKICAgICAgICAgdm9pZCBp bml0Rm9yU3R5bGVSZXNvbHZlKEVsZW1lbnQqLCBSZW5kZXJTdHlsZSogcGFyZW50U3R5bGUgPSAw LCBQc2V1ZG9JZCA9IE5PUFNFVURPKTsK