145659 2015-06-04 14:38:14 -0700 [Cocoa] Add ASSERT to FontPlatformData::ctFont() 2015-06-04 15:00:39 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mmaxfield mmaxfield benjamin cmarcelo commit-queue oldest_to_newest 1099621 0 mmaxfield 2015-06-04 14:38:14 -0700 [Cocoa] Add ASSERT to FontPlatformData::ctFont() 1099624 1 254301 mmaxfield 2015-06-04 14:42:10 -0700 Created attachment 254301 Patch 1099626 2 254301 mmaxfield 2015-06-04 14:45:16 -0700 Comment on attachment 254301 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=254301&action=review > Source/WebCore/ChangeLog:10 > + FontCustomPlatformData and FontPlatformData include, this patch moves the definitions of This statement is false. 1099630 3 254303 mmaxfield 2015-06-04 14:51:03 -0700 Created attachment 254303 Patch 1099633 4 254303 dino 2015-06-04 14:54:34 -0700 Comment on attachment 254303 Patch Personally, I think ENABLE() flags should be restricted to features that can be toggled externally at run time. I suggest you stick with a bare name. 1099637 5 mmaxfield 2015-06-04 15:00:39 -0700 Committed r185219: <http://trac.webkit.org/changeset/185219> 254301 2015-06-04 14:42:10 -0700 2015-06-04 14:51:01 -0700 Patch bug-145659-20150604144148.patch text/plain 6693 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMTg1MjE3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IGFlYmFmYzdiZjA5YzE3NThiZGRlNzNk YzRjOWU3YmUyZWNhNzliMjIuLmY2YzY0MTNlNWM4N2Y1ZDBhMTc4MDIyZDM3ZDE0ZjIwNjU2YmEy ZTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMTUtMDYtMDQgIE15bGVzIEMuIE1heGZpZWxkICA8 bW1heGZpZWxkQGFwcGxlLmNvbT4KKworICAgICAgICBbQ29jb2FdIEFkZCBBU1NFUlQgdG8gRm9u dFBsYXRmb3JtRGF0YTo6Y3RGb250KCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE0NTY1OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgICogd3RmL1BsYXRmb3JtLmg6IE1vdmUgQ09SRVRFWFRfV0VCX0ZPTlRT IGRlZmluZXMgZnJvbSBGb250Q3VzdG9tUGxhdGZvcm1EYXRhLmgKKwogMjAxNS0wNi0wMiAgWGFi aWVyIFJvZHJpZ3VleiBDYWx2YXIgIDxjYWx2YXJpc0BpZ2FsaWEuY29tPiBhbmQgWW91ZW5uIEZh YmxldCA8eW91ZW5uLmZhYmxldEBjcmYuY2Fub24uZnI+CiAKICAgICAgICAgW1N0cmVhbXMgQVBJ XSBEZWxlZ2F0ZSBSZWFkYWJsZVN0cmVhbVJlYWRlciByZWZlcmVuY2UgY291bnRpbmcgdG8gUmVh ZGFibGVTdHJlYW0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA4ODcyYjEyMzU1Nzk0OWQ5ZGNmZGYyZWZmZGJkYmYx Yzk3ZmZlZDg5Li42ZTY2ODljYmRkNjg1MDZlMTkwMTVhNzJiOGQyNGIxZTU0N2JhYzk2IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hh bmdlTG9nCkBAIC0xLDUgKzEsMjYgQEAKIDIwMTUtMDYtMDQgIE15bGVzIEMuIE1heGZpZWxkICA8 bW1heGZpZWxkQGFwcGxlLmNvbT4KIAorICAgICAgICBbQ29jb2FdIEFkZCBBU1NFUlQgdG8gRm9u dFBsYXRmb3JtRGF0YTo6Y3RGb250KCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE0NTY1OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFRoZSBuZXcgQVNTRVJUIG5lZWRzIHRvIGJlIGd1YXJkZWQgd2l0aCBD T1JFVEVYVF9XRUJfRk9OVFMsIHdoaWNoIGlzIGRlZmluZWQgaW4gRm9udEN1c3RvbVBsYXRmb3Jt RGF0YS5oLAorICAgICAgICBhbmQgaXMgbm90IGFjY2Vzc2libGUgdG8gRm9udFBsYXRmb3JtRGF0 YS4gQmVjYXVzZSB0aGVyZSBpcyBubyBzaW5nbGUgZmlsZSB3aGljaCBib3RoCisgICAgICAgIEZv bnRDdXN0b21QbGF0Zm9ybURhdGEgYW5kIEZvbnRQbGF0Zm9ybURhdGEgaW5jbHVkZSwgdGhpcyBw YXRjaCBtb3ZlcyB0aGUgZGVmaW5pdGlvbnMgb2YKKyAgICAgICAgQ09SRVRFWFRfV0VCX0ZPTlRT IHRvIHd0Zi9QbGF0Zm9ybS5oLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyBiZWNhdXNlIHRoZXJl IGlzIG5vIGJlaGF2aW9yIGNoYW5nZS4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nv Y29hL0ZvbnRQbGF0Zm9ybURhdGFDb2NvYS5tbToKKyAgICAgICAgKFdlYkNvcmU6OkZvbnRQbGF0 Zm9ybURhdGE6OmN0Rm9udCk6IEFkZCB0aGUgQVNTRVJULgorICAgICAgICAqIHBsYXRmb3JtL2dy YXBoaWNzL21hYy9Gb250Q3VzdG9tUGxhdGZvcm1EYXRhLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkZvbnRDdXN0b21QbGF0Zm9ybURhdGE6OmZvbnRQbGF0Zm9ybURhdGEpOiBVcGRhdGUgdG8gdXNl IEVOQUJMRSgpCisgICAgICAgIChXZWJDb3JlOjpjcmVhdGVGb250Q3VzdG9tUGxhdGZvcm1EYXRh KTogRGl0dG8uCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL0ZvbnRDdXN0b21QbGF0 Zm9ybURhdGEuaDogRGl0dG8uCisKKzIwMTUtMDYtMDQgIE15bGVzIEMuIE1heGZpZWxkICA8bW1h eGZpZWxkQGFwcGxlLmNvbT4KKwogICAgICAgICBbQ29jb2FdIFJlbW92ZSB1bm5lY2Vzc2FyeSBj b2RlIGZyb20gRm9udFBsYXRmb3JtRGF0YTo6Y3RGb250KCkKICAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NTY1MgogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V1RGL3d0Zi9QbGF0Zm9ybS5oIGIvU291cmNlL1dURi93dGYvUGxhdGZvcm0uaAppbmRleCBhNTk4 NDc0YmZhOWU1MGExY2ExZGRlNWZhMmUxOTExNTcwNTcxMjQyLi45NzRlZTBjN2E0YjAwODZkOGNi YWI1YjA2NTIzZjFkYzgwYjA4ZTdhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL3d0Zi9QbGF0Zm9y bS5oCisrKyBiL1NvdXJjZS9XVEYvd3RmL1BsYXRmb3JtLmgKQEAgLTExMDMsNiArMTEwMywxMyBA QAogI2RlZmluZSBFTkFCTEVfUExBVEZPUk1fRk9OVF9MT09LVVAgMQogI2VuZGlmCiAKKy8qIFJh ZGFyIDE2OTgwNzM2OiBXZWIgZm9udHMgY3Jhc2ggb24gY2VydGFpbiBPU2VzIHdoZW4gdXNpbmcg Q1RGb250TWFuYWdlckNyZWF0ZUZvbnREZXNjcmlwdG9yRnJvbURhdGEoKSAqLworI2lmIChQTEFU Rk9STShJT1MpICYmIF9fSVBIT05FX09TX1ZFUlNJT05fTUlOX1JFUVVJUkVEIDwgODAwMDApIHx8 IChQTEFURk9STShNQUMpICYmIF9fTUFDX09TX1hfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPCAxMDEw MDApCisjZGVmaW5lIEVOQUJMRV9DT1JFVEVYVF9XRUJfRk9OVFMgMAorI2Vsc2UKKyNkZWZpbmUg RU5BQkxFX0NPUkVURVhUX1dFQl9GT05UUyAxCisjZW5kaWYKKwogI2lmIENPTVBJTEVSKE1TVkMp CiAjdW5kZWYgX19TVERDX0xJTUlUX01BQ1JPUwogI2RlZmluZSBfX1NURENfTElNSVRfTUFDUk9T CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9Gb250 UGxhdGZvcm1EYXRhQ29jb2EubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9j b2NvYS9Gb250UGxhdGZvcm1EYXRhQ29jb2EubW0KaW5kZXggYzZiNGNlMjdkMDM2MTk3MWMxZWIy NjhkYmQ0NWQ2MDdmMmNmZDg4Ny4uY2QwZjhkYTRmOWQ4NDMwMmVlZTEwNmYyOTgxNTg1M2NhNGY0 ZTIwOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2Ev Rm9udFBsYXRmb3JtRGF0YUNvY29hLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2NvY29hL0ZvbnRQbGF0Zm9ybURhdGFDb2NvYS5tbQpAQCAtMTc2LDggKzE3NiwxMiBA QCBDVEZvbnRSZWYgRm9udFBsYXRmb3JtRGF0YTo6Y3RGb250KCkgY29uc3QKICAgICAgICAgUmV0 YWluUHRyPENGU3RyaW5nUmVmPiBwb3N0U2NyaXB0TmFtZSA9IGFkb3B0Q0YoQ1RGb250Q29weVBv c3RTY3JpcHROYW1lKG1fY3RGb250LmdldCgpKSk7CiAgICAgICAgIGZvbnREZXNjcmlwdG9yID0g Y2FzY2FkZVRvTGFzdFJlc29ydEZvbnREZXNjcmlwdG9yKCk7CiAgICAgICAgIG1fY3RGb250ID0g YWRvcHRDRihDVEZvbnRDcmVhdGVDb3B5V2l0aEF0dHJpYnV0ZXMobV9jdEZvbnQuZ2V0KCksIGN0 Rm9udFNpemUoKSwgMCwgZm9udERlc2NyaXB0b3IpKTsKLSAgICB9IGVsc2UKKyAgICB9IGVsc2Ug eworI2lmIEVOQUJMRShDT1JFVEVYVF9XRUJfRk9OVFMpCisgICAgICAgIEFTU0VSVF9OT1RfUkVB Q0hFRCgpOworI2VuZGlmCiAgICAgICAgIG1fY3RGb250ID0gYWRvcHRDRihDVEZvbnRDcmVhdGVX aXRoR3JhcGhpY3NGb250KG1fY2dGb250LmdldCgpLCBjdEZvbnRTaXplKCksIDAsIGNhc2NhZGVU b0xhc3RSZXNvcnRGb250RGVzY3JpcHRvcigpKSk7CisgICAgfQogCiAgICAgaWYgKG1fd2lkdGhW YXJpYW50ICE9IFJlZ3VsYXJXaWR0aCkgewogICAgICAgICBpbnQgZmVhdHVyZVR5cGVWYWx1ZSA9 IGtUZXh0U3BhY2luZ1R5cGU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9tYWMvRm9udEN1c3RvbVBsYXRmb3JtRGF0YS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9tYWMvRm9udEN1c3RvbVBsYXRmb3JtRGF0YS5jcHAKaW5kZXggNmQy NjA3M2I0MTMyNTBjMTI3NGNjMDIyZWNhMGJkMTM2NTIzNDk4Zi4uYzI5NWY4Zjg3NjUxYzVjZDE3 YTI2ZmFjYmRmZDQyOGMyZGQ1OGExYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvbWFjL0ZvbnRDdXN0b21QbGF0Zm9ybURhdGEuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL21hYy9Gb250Q3VzdG9tUGxhdGZvcm1EYXRhLmNwcApA QCAtMzQsNyArMzQsNyBAQCBGb250Q3VzdG9tUGxhdGZvcm1EYXRhOjp+Rm9udEN1c3RvbVBsYXRm b3JtRGF0YSgpCiAKIEZvbnRQbGF0Zm9ybURhdGEgRm9udEN1c3RvbVBsYXRmb3JtRGF0YTo6Zm9u dFBsYXRmb3JtRGF0YShpbnQgc2l6ZSwgYm9vbCBib2xkLCBib29sIGl0YWxpYywgRm9udE9yaWVu dGF0aW9uIG9yaWVudGF0aW9uLCBGb250V2lkdGhWYXJpYW50IHdpZHRoVmFyaWFudCwgRm9udFJl bmRlcmluZ01vZGUpCiB7Ci0jaWYgQ09SRVRFWFRfV0VCX0ZPTlRTCisjaWYgRU5BQkxFKENPUkVU RVhUX1dFQl9GT05UUykKICAgICByZXR1cm4gRm9udFBsYXRmb3JtRGF0YShhZG9wdENGKENURm9u dENyZWF0ZVdpdGhGb250RGVzY3JpcHRvcihtX2ZvbnREZXNjcmlwdG9yLmdldCgpLCBzaXplLCBu dWxscHRyKSkuZ2V0KCksIHNpemUsIGJvbGQsIGl0YWxpYywgb3JpZW50YXRpb24sIHdpZHRoVmFy aWFudCk7CiAjZWxzZQogICAgIHJldHVybiBGb250UGxhdGZvcm1EYXRhKG1fY2dGb250LmdldCgp LCBzaXplLCBib2xkLCBpdGFsaWMsIG9yaWVudGF0aW9uLCB3aWR0aFZhcmlhbnQpOwpAQCAtNDUs NyArNDUsNyBAQCBzdGQ6OnVuaXF1ZV9wdHI8Rm9udEN1c3RvbVBsYXRmb3JtRGF0YT4gY3JlYXRl Rm9udEN1c3RvbVBsYXRmb3JtRGF0YShTaGFyZWRCdWZmZQogewogICAgIFJldGFpblB0cjxDRkRh dGFSZWY+IGJ1ZmZlckRhdGEgPSBidWZmZXIuY3JlYXRlQ0ZEYXRhKCk7CiAKLSNpZiBDT1JFVEVY VF9XRUJfRk9OVFMKKyNpZiBFTkFCTEUoQ09SRVRFWFRfV0VCX0ZPTlRTKQogICAgIFJldGFpblB0 cjxDVEZvbnREZXNjcmlwdG9yUmVmPiBmb250RGVzY3JpcHRvciA9IGFkb3B0Q0YoQ1RGb250TWFu YWdlckNyZWF0ZUZvbnREZXNjcmlwdG9yRnJvbURhdGEoYnVmZmVyRGF0YS5nZXQoKSkpOwogICAg IGlmICghZm9udERlc2NyaXB0b3IpCiAgICAgICAgIHJldHVybiBudWxscHRyOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL0ZvbnRDdXN0b21QbGF0Zm9y bURhdGEuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL21hYy9Gb250Q3VzdG9t UGxhdGZvcm1EYXRhLmgKaW5kZXggZmVlYzAyNTM5YTVlODNhNjkxMjJhMjg0MGI5NzRlMWE0ZDRh NGNkOS4uMTNmMzJjYzIyZjFhNWUwMThiOTY4Yzc3MDg0OTE3YjNlNThhMWE5YiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL0ZvbnRDdXN0b21QbGF0Zm9y bURhdGEuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9tYWMvRm9udEN1 c3RvbVBsYXRmb3JtRGF0YS5oCkBAIC0zMCwxMyArMzAsNiBAQAogdHlwZWRlZiBzdHJ1Y3QgQ0dG b250KiBDR0ZvbnRSZWY7CiB0eXBlZGVmIGNvbnN0IHN0cnVjdCBfX0NURm9udERlc2NyaXB0b3Iq IENURm9udERlc2NyaXB0b3JSZWY7CiAKLS8vIDxyZGFyOi8vcHJvYmxlbS8xNjk4MDczNj4gV2Vi IGZvbnRzIGNyYXNoIG9uIGNlcnRhaW4gT1NlcyB3aGVuIHVzaW5nIENURm9udE1hbmFnZXJDcmVh dGVGb250RGVzY3JpcHRvckZyb21EYXRhKCkKLSNpZiAoUExBVEZPUk0oSU9TKSAmJiBfX0lQSE9O RV9PU19WRVJTSU9OX01JTl9SRVFVSVJFRCA8IDgwMDAwKSB8fCAoUExBVEZPUk0oTUFDKSAmJiBf X01BQ19PU19YX1ZFUlNJT05fTUlOX1JFUVVJUkVEIDwgMTAxMDAwKQotI2RlZmluZSBDT1JFVEVY VF9XRUJfRk9OVFMgMAotI2Vsc2UKLSNkZWZpbmUgQ09SRVRFWFRfV0VCX0ZPTlRTIDEKLSNlbmRp ZgotCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIGNsYXNzIEZvbnRQbGF0Zm9ybURhdGE7CkBAIC00 NSw3ICszOCw3IEBAIGNsYXNzIFNoYXJlZEJ1ZmZlcjsKIHN0cnVjdCBGb250Q3VzdG9tUGxhdGZv cm1EYXRhIHsKICAgICBXVEZfTUFLRV9OT05DT1BZQUJMRShGb250Q3VzdG9tUGxhdGZvcm1EYXRh KTsKIHB1YmxpYzoKLSNpZiBDT1JFVEVYVF9XRUJfRk9OVFMKKyNpZiBFTkFCTEUoQ09SRVRFWFRf V0VCX0ZPTlRTKQogICAgIGV4cGxpY2l0IEZvbnRDdXN0b21QbGF0Zm9ybURhdGEoQ1RGb250RGVz Y3JpcHRvclJlZiBmb250RGVzY3JpcHRvcikKICAgICAgICAgOiBtX2ZvbnREZXNjcmlwdG9yKGZv bnREZXNjcmlwdG9yKQogI2Vsc2UKQEAgLTYxLDcgKzU0LDcgQEAgcHVibGljOgogCiAgICAgc3Rh dGljIGJvb2wgc3VwcG9ydHNGb3JtYXQoY29uc3QgU3RyaW5nJik7CiAKLSNpZiBDT1JFVEVYVF9X RUJfRk9OVFMKKyNpZiBFTkFCTEUoQ09SRVRFWFRfV0VCX0ZPTlRTKQogICAgIFJldGFpblB0cjxD VEZvbnREZXNjcmlwdG9yUmVmPiBtX2ZvbnREZXNjcmlwdG9yOwogI2Vsc2UKICAgICBSZXRhaW5Q dHI8Q0dGb250UmVmPiBtX2NnRm9udDsK 254303 2015-06-04 14:51:03 -0700 2015-06-04 14:54:34 -0700 Patch bug-145659-20150604145042.patch text/plain 6104 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMTg1MjE3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODg3MmIxMjM1NTc5NDlk OWRjZmRmMmVmZmRiZGJmMWM5N2ZmZWQ4OS4uMDJjZGUwMDVlM2E0NmViZDllZDY4MDdiMmEyMTEz OTNlNmU0YzExMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI3IEBACiAyMDE1LTA2LTA0ICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CiAKKyAgICAgICAgW0NvY29hXSBB ZGQgQVNTRVJUIHRvIEZvbnRQbGF0Zm9ybURhdGE6OmN0Rm9udCgpCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDU2NTkKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgbmV3IEFTU0VSVCBuZWVkcyB0byBi ZSBndWFyZGVkIHdpdGggQ09SRVRFWFRfV0VCX0ZPTlRTLCB3aGljaCBpcyBkZWZpbmVkIGluIEZv bnRDdXN0b21QbGF0Zm9ybURhdGEuaCwKKyAgICAgICAgYW5kIGlzIG5vdCBhY2Nlc3NpYmxlIHRv IEZvbnRQbGF0Zm9ybURhdGEuIFRoZXJlZm9yZSwgSSd2ZSBtb3ZlZCB0aGUgZGVmaW5pdGlvbiBp bnRvIFRleHRGbGFncy5oLCB3aGljaAorICAgICAgICBib3RoIGZpbGVzIGluY2x1ZGUuCisKKyAg ICAgICAgTm8gbmV3IHRlc3RzIGJlY2F1c2UgdGhlcmUgaXMgbm8gYmVoYXZpb3IgY2hhbmdlLgor CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvRm9udFBsYXRmb3JtRGF0YUNvY29h Lm1tOgorICAgICAgICAoV2ViQ29yZTo6Rm9udFBsYXRmb3JtRGF0YTo6Y3RGb250KTogQWRkIHRo ZSBBU1NFUlQuCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL0ZvbnRDdXN0b21QbGF0 Zm9ybURhdGEuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Rm9udEN1c3RvbVBsYXRmb3JtRGF0YTo6 Zm9udFBsYXRmb3JtRGF0YSk6IFVwZGF0ZSB0byB1c2UgRU5BQkxFKCkKKyAgICAgICAgKFdlYkNv cmU6OmNyZWF0ZUZvbnRDdXN0b21QbGF0Zm9ybURhdGEpOiBEaXR0by4KKyAgICAgICAgKiBwbGF0 Zm9ybS9ncmFwaGljcy9tYWMvRm9udEN1c3RvbVBsYXRmb3JtRGF0YS5oOiBEaXR0by4gQWxzbywg bW92ZSB0aGUgQ09SRVRFWFRfV0VCX0ZPTlRTIHByZXByb2Nlc3NvcgorICAgICAgICBtYWNybyBm cm9tIGhlcmUgLi4uCisgICAgICAgICogcGxhdGZvcm0vdGV4dC9UZXh0RmxhZ3MuaDogLi4uIHRv IGhlcmUuCisKKzIwMTUtMDYtMDQgIE15bGVzIEMuIE1heGZpZWxkICA8bW1heGZpZWxkQGFwcGxl LmNvbT4KKwogICAgICAgICBbQ29jb2FdIFJlbW92ZSB1bm5lY2Vzc2FyeSBjb2RlIGZyb20gRm9u dFBsYXRmb3JtRGF0YTo6Y3RGb250KCkKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE0NTY1MgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9jb2NvYS9Gb250UGxhdGZvcm1EYXRhQ29jb2EubW0gYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9Gb250UGxhdGZvcm1EYXRhQ29jb2EubW0KaW5k ZXggYzZiNGNlMjdkMDM2MTk3MWMxZWIyNjhkYmQ0NWQ2MDdmMmNmZDg4Ny4uY2QwZjhkYTRmOWQ4 NDMwMmVlZTEwNmYyOTgxNTg1M2NhNGY0ZTIwOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvRm9udFBsYXRmb3JtRGF0YUNvY29hLm1tCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NvY29hL0ZvbnRQbGF0Zm9ybURhdGFDb2Nv YS5tbQpAQCAtMTc2LDggKzE3NiwxMiBAQCBDVEZvbnRSZWYgRm9udFBsYXRmb3JtRGF0YTo6Y3RG b250KCkgY29uc3QKICAgICAgICAgUmV0YWluUHRyPENGU3RyaW5nUmVmPiBwb3N0U2NyaXB0TmFt ZSA9IGFkb3B0Q0YoQ1RGb250Q29weVBvc3RTY3JpcHROYW1lKG1fY3RGb250LmdldCgpKSk7CiAg ICAgICAgIGZvbnREZXNjcmlwdG9yID0gY2FzY2FkZVRvTGFzdFJlc29ydEZvbnREZXNjcmlwdG9y KCk7CiAgICAgICAgIG1fY3RGb250ID0gYWRvcHRDRihDVEZvbnRDcmVhdGVDb3B5V2l0aEF0dHJp YnV0ZXMobV9jdEZvbnQuZ2V0KCksIGN0Rm9udFNpemUoKSwgMCwgZm9udERlc2NyaXB0b3IpKTsK LSAgICB9IGVsc2UKKyAgICB9IGVsc2UgeworI2lmIEVOQUJMRShDT1JFVEVYVF9XRUJfRk9OVFMp CisgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOworI2VuZGlmCiAgICAgICAgIG1fY3RGb250 ID0gYWRvcHRDRihDVEZvbnRDcmVhdGVXaXRoR3JhcGhpY3NGb250KG1fY2dGb250LmdldCgpLCBj dEZvbnRTaXplKCksIDAsIGNhc2NhZGVUb0xhc3RSZXNvcnRGb250RGVzY3JpcHRvcigpKSk7Cisg ICAgfQogCiAgICAgaWYgKG1fd2lkdGhWYXJpYW50ICE9IFJlZ3VsYXJXaWR0aCkgewogICAgICAg ICBpbnQgZmVhdHVyZVR5cGVWYWx1ZSA9IGtUZXh0U3BhY2luZ1R5cGU7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9tYWMvRm9udEN1c3RvbVBsYXRmb3JtRGF0 YS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9tYWMvRm9udEN1c3RvbVBs YXRmb3JtRGF0YS5jcHAKaW5kZXggNmQyNjA3M2I0MTMyNTBjMTI3NGNjMDIyZWNhMGJkMTM2NTIz NDk4Zi4uYzI5NWY4Zjg3NjUxYzVjZDE3YTI2ZmFjYmRmZDQyOGMyZGQ1OGExYiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL0ZvbnRDdXN0b21QbGF0Zm9y bURhdGEuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL21hYy9Gb250 Q3VzdG9tUGxhdGZvcm1EYXRhLmNwcApAQCAtMzQsNyArMzQsNyBAQCBGb250Q3VzdG9tUGxhdGZv cm1EYXRhOjp+Rm9udEN1c3RvbVBsYXRmb3JtRGF0YSgpCiAKIEZvbnRQbGF0Zm9ybURhdGEgRm9u dEN1c3RvbVBsYXRmb3JtRGF0YTo6Zm9udFBsYXRmb3JtRGF0YShpbnQgc2l6ZSwgYm9vbCBib2xk LCBib29sIGl0YWxpYywgRm9udE9yaWVudGF0aW9uIG9yaWVudGF0aW9uLCBGb250V2lkdGhWYXJp YW50IHdpZHRoVmFyaWFudCwgRm9udFJlbmRlcmluZ01vZGUpCiB7Ci0jaWYgQ09SRVRFWFRfV0VC X0ZPTlRTCisjaWYgRU5BQkxFKENPUkVURVhUX1dFQl9GT05UUykKICAgICByZXR1cm4gRm9udFBs YXRmb3JtRGF0YShhZG9wdENGKENURm9udENyZWF0ZVdpdGhGb250RGVzY3JpcHRvcihtX2ZvbnRE ZXNjcmlwdG9yLmdldCgpLCBzaXplLCBudWxscHRyKSkuZ2V0KCksIHNpemUsIGJvbGQsIGl0YWxp Yywgb3JpZW50YXRpb24sIHdpZHRoVmFyaWFudCk7CiAjZWxzZQogICAgIHJldHVybiBGb250UGxh dGZvcm1EYXRhKG1fY2dGb250LmdldCgpLCBzaXplLCBib2xkLCBpdGFsaWMsIG9yaWVudGF0aW9u LCB3aWR0aFZhcmlhbnQpOwpAQCAtNDUsNyArNDUsNyBAQCBzdGQ6OnVuaXF1ZV9wdHI8Rm9udEN1 c3RvbVBsYXRmb3JtRGF0YT4gY3JlYXRlRm9udEN1c3RvbVBsYXRmb3JtRGF0YShTaGFyZWRCdWZm ZQogewogICAgIFJldGFpblB0cjxDRkRhdGFSZWY+IGJ1ZmZlckRhdGEgPSBidWZmZXIuY3JlYXRl Q0ZEYXRhKCk7CiAKLSNpZiBDT1JFVEVYVF9XRUJfRk9OVFMKKyNpZiBFTkFCTEUoQ09SRVRFWFRf V0VCX0ZPTlRTKQogICAgIFJldGFpblB0cjxDVEZvbnREZXNjcmlwdG9yUmVmPiBmb250RGVzY3Jp cHRvciA9IGFkb3B0Q0YoQ1RGb250TWFuYWdlckNyZWF0ZUZvbnREZXNjcmlwdG9yRnJvbURhdGEo YnVmZmVyRGF0YS5nZXQoKSkpOwogICAgIGlmICghZm9udERlc2NyaXB0b3IpCiAgICAgICAgIHJl dHVybiBudWxscHRyOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvbWFjL0ZvbnRDdXN0b21QbGF0Zm9ybURhdGEuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL21hYy9Gb250Q3VzdG9tUGxhdGZvcm1EYXRhLmgKaW5kZXggZmVlYzAyNTM5YTVl ODNhNjkxMjJhMjg0MGI5NzRlMWE0ZDRhNGNkOS4uMTNmMzJjYzIyZjFhNWUwMThiOTY4Yzc3MDg0 OTE3YjNlNThhMWE5YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvbWFjL0ZvbnRDdXN0b21QbGF0Zm9ybURhdGEuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9tYWMvRm9udEN1c3RvbVBsYXRmb3JtRGF0YS5oCkBAIC0zMCwxMyArMzAs NiBAQAogdHlwZWRlZiBzdHJ1Y3QgQ0dGb250KiBDR0ZvbnRSZWY7CiB0eXBlZGVmIGNvbnN0IHN0 cnVjdCBfX0NURm9udERlc2NyaXB0b3IqIENURm9udERlc2NyaXB0b3JSZWY7CiAKLS8vIDxyZGFy Oi8vcHJvYmxlbS8xNjk4MDczNj4gV2ViIGZvbnRzIGNyYXNoIG9uIGNlcnRhaW4gT1NlcyB3aGVu IHVzaW5nIENURm9udE1hbmFnZXJDcmVhdGVGb250RGVzY3JpcHRvckZyb21EYXRhKCkKLSNpZiAo UExBVEZPUk0oSU9TKSAmJiBfX0lQSE9ORV9PU19WRVJTSU9OX01JTl9SRVFVSVJFRCA8IDgwMDAw KSB8fCAoUExBVEZPUk0oTUFDKSAmJiBfX01BQ19PU19YX1ZFUlNJT05fTUlOX1JFUVVJUkVEIDwg MTAxMDAwKQotI2RlZmluZSBDT1JFVEVYVF9XRUJfRk9OVFMgMAotI2Vsc2UKLSNkZWZpbmUgQ09S RVRFWFRfV0VCX0ZPTlRTIDEKLSNlbmRpZgotCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIGNsYXNz IEZvbnRQbGF0Zm9ybURhdGE7CkBAIC00NSw3ICszOCw3IEBAIGNsYXNzIFNoYXJlZEJ1ZmZlcjsK IHN0cnVjdCBGb250Q3VzdG9tUGxhdGZvcm1EYXRhIHsKICAgICBXVEZfTUFLRV9OT05DT1BZQUJM RShGb250Q3VzdG9tUGxhdGZvcm1EYXRhKTsKIHB1YmxpYzoKLSNpZiBDT1JFVEVYVF9XRUJfRk9O VFMKKyNpZiBFTkFCTEUoQ09SRVRFWFRfV0VCX0ZPTlRTKQogICAgIGV4cGxpY2l0IEZvbnRDdXN0 b21QbGF0Zm9ybURhdGEoQ1RGb250RGVzY3JpcHRvclJlZiBmb250RGVzY3JpcHRvcikKICAgICAg ICAgOiBtX2ZvbnREZXNjcmlwdG9yKGZvbnREZXNjcmlwdG9yKQogI2Vsc2UKQEAgLTYxLDcgKzU0 LDcgQEAgcHVibGljOgogCiAgICAgc3RhdGljIGJvb2wgc3VwcG9ydHNGb3JtYXQoY29uc3QgU3Ry aW5nJik7CiAKLSNpZiBDT1JFVEVYVF9XRUJfRk9OVFMKKyNpZiBFTkFCTEUoQ09SRVRFWFRfV0VC X0ZPTlRTKQogICAgIFJldGFpblB0cjxDVEZvbnREZXNjcmlwdG9yUmVmPiBtX2ZvbnREZXNjcmlw dG9yOwogI2Vsc2UKICAgICBSZXRhaW5QdHI8Q0dGb250UmVmPiBtX2NnRm9udDsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3RleHQvVGV4dEZsYWdzLmggYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS90ZXh0L1RleHRGbGFncy5oCmluZGV4IGYxYjFmMjYwMmFlMGNlMjhiZmJh YzI4ZjVjMDFlZmNlNDJmZjQ3Y2MuLjNmMTYyNzIzYTcyZDQ4NzIxODMyZjU4YjZmOTU1YzBmNjA0 ZjZlOTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3RleHQvVGV4dEZsYWdz LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vdGV4dC9UZXh0RmxhZ3MuaApAQCAtMjYs NiArMjYsMTMgQEAKICNpZm5kZWYgVGV4dEZsYWdzX2gKICNkZWZpbmUgVGV4dEZsYWdzX2gKIAor Ly8gPHJkYXI6Ly9wcm9ibGVtLzE2OTgwNzM2PjogV2ViIGZvbnRzIGNyYXNoIG9uIGNlcnRhaW4g T1NlcyB3aGVuIHVzaW5nIENURm9udE1hbmFnZXJDcmVhdGVGb250RGVzY3JpcHRvckZyb21EYXRh KCkKKyNpZiAoUExBVEZPUk0oSU9TKSAmJiBfX0lQSE9ORV9PU19WRVJTSU9OX01JTl9SRVFVSVJF RCA8IDgwMDAwKSB8fCAoUExBVEZPUk0oTUFDKSAmJiBfX01BQ19PU19YX1ZFUlNJT05fTUlOX1JF UVVJUkVEIDwgMTAxMDAwKQorI2RlZmluZSBFTkFCTEVfQ09SRVRFWFRfV0VCX0ZPTlRTIDAKKyNl bHNlCisjZGVmaW5lIEVOQUJMRV9DT1JFVEVYVF9XRUJfRk9OVFMgMQorI2VuZGlmCisKIG5hbWVz cGFjZSBXZWJDb3JlIHsKIAogZW51bSBUZXh0UmVuZGVyaW5nTW9kZSB7IEF1dG9UZXh0UmVuZGVy aW5nLCBPcHRpbWl6ZVNwZWVkLCBPcHRpbWl6ZUxlZ2liaWxpdHksIEdlb21ldHJpY1ByZWNpc2lv biB9Owo=