145634 2015-06-03 22:57:05 -0700 [Cocoa] Clean up m_font inside FontPlatformData 2015-06-04 09:51:04 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mmaxfield mmaxfield darin oldest_to_newest 1099408 0 mmaxfield 2015-06-03 22:57:05 -0700 [Cocoa] Clean up m_font inside FontPlatformData 1099414 1 254248 mmaxfield 2015-06-03 23:13:39 -0700 Created attachment 254248 Patch 1099417 2 254248 mmaxfield 2015-06-03 23:20:46 -0700 Comment on attachment 254248 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=254248&action=review > Source/WebCore/platform/graphics/FontPlatformData.h:215 > + bool m_isHashTableDeletedValue { false }; If I move this bool down to the rest of them, we get it for free! 1099485 3 254248 kling 2015-06-04 08:51:30 -0700 Comment on attachment 254248 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=254248&action=review Oh wow, this is so much nicer. r=me >> Source/WebCore/platform/graphics/FontPlatformData.h:215 >> + bool m_isHashTableDeletedValue { false }; > > If I move this bool down to the rest of them, we get it for free! So let's do that too :) 1099496 4 mmaxfield 2015-06-04 09:51:04 -0700 Committed r185200: <http://trac.webkit.org/changeset/185200> 254248 2015-06-03 23:13:39 -0700 2015-06-04 08:51:30 -0700 Patch bug-145634-20150603231318.patch text/plain 13970 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMTg1MTkxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGZkNDNlZGU4N2JlMWZj ZjNkYTdjYjY0NzlkZDVmMTMxMmMzZmNlMS4uZDEyZjMwNjdlYzNhMjAwZTc2ZmNlZDNmNTIxNGQx YzI3MmRjZWIyNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDU3IEBACisyMDE1LTA2LTAzICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgW0NvY29hXSBD bGVhbiB1cCBtX2ZvbnQgaW5zaWRlIEZvbnRQbGF0Zm9ybURhdGEKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NTYzNAorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZvbnRQbGF0Zm9ybURhdGFzIGFyZSB1c2Vk IGFzIGtleXMgaW4gYSBIYXNoTWFwLiBUaGlzIG1lYW5zIHRoYXQgdGhleSBuZWVkCisgICAgICAg IHRvIGJlIGFibGUgdG8gcmVwcmVzZW50IGEgImRlbGV0ZWQiIHZhbHVlLiBQcmV2aW91c2x5LCB0 aGlzICJkZWxldGVkIiB2YWx1ZQorICAgICAgICB3YXMgcmVwcmVzZW50ZWQgYXMgc2V0dGluZyB0 aGUgcG9pbnRlciB2YWx1ZSBvZiBtX2ZvbnQgdG8gLTEsIGFuZCBndWFyZGluZworICAgICAgICBh bGwgdXNlcyBvZiBtX2ZvbnQgdG8gbWFrZSBzdXJlIGl0IHdhc24ndCAtMSBiZWZvcmUgZGVyZWZl cmVuY2luZyBpdC4KKworICAgICAgICBUaGlzIHBhdGNoIHNpbXBsaWZpZXMgRm9udFBsYXRmb3Jt RGF0YSB0byByZXByZXNlbnQgYSAiZGVsZXRlZCIgdmFsdWUgdXNpbmcKKyAgICAgICAgYSBzZXBh cmF0ZSBib29sZWFuIG1lbWJlciB2YXJpYWJsZS4gVGhpcyBjbGFzcyBpcyBhbHJlYWR5IGJpZyBl bm91Z2ggdGhhdAorICAgICAgICB0aGUgaW5jcmVhc2VkIHNwYWNlIGlzIG5lZ2xpZ2FibGUgKHRo ZSBjbGFzcyBhbHJlYWR5IGNvbnRhaW5zIHR3byBDb3JlVGV4dAorICAgICAgICBmb250cyBpbiBh ZGRpdGlvbiB0byBhIENvcmVHcmFwaGljcyBmb250KS4gQmVjYXVzZSBvZiB0aGlzIHNpbXBsaWZp Y2F0aW9uLAorICAgICAgICBtX2ZvbnQgY2FuIG5vdyBiZSBhIFJldGFpblB0ciwgaW5zdGVhZCBv ZiBiZWluZyBtYW51YWxseSByZXRhaW5lZCBhbmQKKyAgICAgICAgcmVsZWFzZWQuCisKKyAgICAg ICAgVGhlcmUgaXMgc3RpbGwgYSBsb25nIHdheSB0byBnbyBiZWZvcmUgRm9udFBsYXRmb3JtRGF0 YSBpcyBhY2NlcHRhYmx5CisgICAgICAgIGNsZWFuIGFuZCB1bmRlcnN0YW5kYWJsZS4gVGhpcyBw YXRjaCBpbXByb3ZlcyBvbmUgYXNwZWN0IG9mIGl0LCBhbmQgbW9yZQorICAgICAgICBpbXByb3Zl bWVudHMgd2lsbCBldmVudHVhbGx5IGZvbGxvdy4KKworICAgICAgICBObyBuZXcgdGVzdHMgYmVj YXVzZSB0aGVyZSBpcyBubyBiZWhhdmlvciBjaGFuZ2UuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9n cmFwaGljcy9Gb250Q2FjaGUuY3BwOiBSZW1vdmUgdW51c2VkIHZhcmlhYmxlLgorICAgICAgICAq IHBsYXRmb3JtL2dyYXBoaWNzL0ZvbnRQbGF0Zm9ybURhdGEuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6Rm9udFBsYXRmb3JtRGF0YTo6Rm9udFBsYXRmb3JtRGF0YSk6IENsZWFuIHVwIGFsbCB0aGUg UExBVEZPUk0KKyAgICAgICAgbWFjcm9zIGluIGZhdm9yIG9mIGEgc2luZ2xlIGJvb2wuIEFsc28s IHVwZGF0ZSB0byBpbmNsdWRlIG5ldyBzdGF0ZS4KKyAgICAgICAgKFdlYkNvcmU6OkZvbnRQbGF0 Zm9ybURhdGE6Om9wZXJhdG9yPSk6IFVwZGF0ZSB0byBpbmNsdWRlIG5ldyBzdGF0ZS4KKyAgICAg ICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9Gb250UGxhdGZvcm1EYXRhLmg6CisgICAgICAgIChXZWJD b3JlOjpGb250UGxhdGZvcm1EYXRhOjpmb250KTogVXBkYXRlIHRvIGFjY291bnQgZm9yIFJldGFp blB0ci4KKyAgICAgICAgKFdlYkNvcmU6OkZvbnRQbGF0Zm9ybURhdGE6Om5zRm9udCk6IERpdHRv LgorICAgICAgICAoV2ViQ29yZTo6Rm9udFBsYXRmb3JtRGF0YTo6c2V0TlNGb250KTogRGl0dG8u CisgICAgICAgIChXZWJDb3JlOjpGb250UGxhdGZvcm1EYXRhOjpoYXNoKTogVXBkYXRlIHRvIGlu Y2x1ZGUgbmV3IHN0YXRlLgorICAgICAgICAoV2ViQ29yZTo6Rm9udFBsYXRmb3JtRGF0YTo6b3Bl cmF0b3I9PSk6IERpdHRvLgorICAgICAgICAoV2ViQ29yZTo6Rm9udFBsYXRmb3JtRGF0YTo6aXNI YXNoVGFibGVEZWxldGVkVmFsdWUpOiBVc2UgbmV3IHN0YXRlLgorICAgICAgICAoV2ViQ29yZTo6 Rm9udFBsYXRmb3JtRGF0YTo6aGFzaFRhYmxlRGVsZXRlZEZvbnRWYWx1ZSk6IERlbGV0ZWQuCisg ICAgICAgIChXZWJDb3JlOjpGb250UGxhdGZvcm1EYXRhOjppc1ZhbGlkQ1RGb250UmVmKTogRGVs ZXRlZC4KKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9Gb250UGxhdGZvcm1EYXRh Q29jb2EubW06CisgICAgICAgIChXZWJDb3JlOjpGb250UGxhdGZvcm1EYXRhOjpwbGF0Zm9ybURh dGFJbml0KTogTm8gbmVlZCBmb3IgbWFudWFsIHJldGFpbgorICAgICAgICBhbmQgcmVsZWFzZS4K KyAgICAgICAgKFdlYkNvcmU6OkZvbnRQbGF0Zm9ybURhdGE6OnBsYXRmb3JtRGF0YUFzc2lnbik6 IERpdHRvLgorICAgICAgICAoV2ViQ29yZTo6Rm9udFBsYXRmb3JtRGF0YTo6cGxhdGZvcm1Jc0Vx dWFsKTogVXBkYXRlIHRvIGFjY291bnQgZm9yCisgICAgICAgIFJldGFuUHRyLgorICAgICAgICAo V2ViQ29yZTo6Rm9udFBsYXRmb3JtRGF0YTo6c2V0Rm9udCk6IE5vIG5lZWQgZm9yIG1hbnVhbCBy ZXRhaW4gYW5kCisgICAgICAgIHJlbGVhc2UuCisgICAgICAgIChXZWJDb3JlOjpGb250UGxhdGZv cm1EYXRhOjpGb250UGxhdGZvcm1EYXRhKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkZv bnRQbGF0Zm9ybURhdGE6On5Gb250UGxhdGZvcm1EYXRhKTogRGVsZXRlZC4KKyAgICAgICAgKiBw bGF0Zm9ybS9ncmFwaGljcy93aW4vRm9udFBsYXRmb3JtRGF0YUNhaXJvV2luLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OkZvbnRQbGF0Zm9ybURhdGE6On5Gb250UGxhdGZvcm1EYXRhKTogbV9zY2Fs ZWRGb250IGlzIGFsd2F5cworICAgICAgICB2YWxpZC4KKyAgICAgICAgKFdlYkNvcmU6OkZvbnRQ bGF0Zm9ybURhdGE6OnBsYXRmb3JtRGF0YUFzc2lnbik6IERpdHRvLgorCiAyMDE1LTA2LTAzICBZ b3Vlbm4gRmFibGV0ICA8eW91ZW5uLmZhYmxldEBjcmYuY2Fub24uZnI+CiAKICAgICAgICAgTWVk aWFEZXZpY2VzLmdldFVzZXJNZWRpYSBzaG91bGQgcHV0IHByb21pc2VzIGluIHJlc29sdmUvcmVq ZWN0IHN0YXRlIHN5bmNocm9ub3VzbHkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL0ZvbnRDYWNoZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9Gb250Q2FjaGUuY3BwCmluZGV4IDMxYjljZjYzZTBiNzY1MmU5NTM4MDRkN2QwMzc4ZTNl NWFmODVjMmUuLmE2YzQwNDk5NDhjZjM2MzIxYjczZGQ1MTFiOTE4YTJhOGFhZTA0NWMgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnRDYWNoZS5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udENhY2hlLmNwcApAQCAtMzQy LDcgKzM0Miw2IEBAIHN0cnVjdCBGb250RGF0YUNhY2hlS2V5SGFzaCB7CiAKIHN0cnVjdCBGb250 RGF0YUNhY2hlS2V5VHJhaXRzIDogV1RGOjpHZW5lcmljSGFzaFRyYWl0czxGb250UGxhdGZvcm1E YXRhPiB7CiAgICAgc3RhdGljIGNvbnN0IGJvb2wgZW1wdHlWYWx1ZUlzWmVybyA9IHRydWU7Ci0g ICAgc3RhdGljIGNvbnN0IGJvb2wgbmVlZHNEZXN0cnVjdGlvbiA9IHRydWU7CiAgICAgc3RhdGlj IGNvbnN0IEZvbnRQbGF0Zm9ybURhdGEmIGVtcHR5VmFsdWUoKQogICAgIHsKICAgICAgICAgc3Rh dGljIE5ldmVyRGVzdHJveWVkPEZvbnRQbGF0Zm9ybURhdGE+IGtleSgwLmYsIGZhbHNlLCBmYWxz ZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250UGxh dGZvcm1EYXRhLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnRQbGF0 Zm9ybURhdGEuY3BwCmluZGV4IGY5MGMwMmVmNzBmYzAzY2E5N2IxNjMyZTgwNDhmYWZiNzNjMTlm MGUuLjMxNjY0ZjRmNDM1ZDc1MmE4MTQzNTQwY2I0ZGJhNWFjZTEwMzIzMjggMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnRQbGF0Zm9ybURhdGEuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnRQbGF0Zm9ybURhdGEuY3Bw CkBAIC0zNSwxNSArMzUsOCBAQAogbmFtZXNwYWNlIFdlYkNvcmUgewogCiBGb250UGxhdGZvcm1E YXRhOjpGb250UGxhdGZvcm1EYXRhKFdURjo6SGFzaFRhYmxlRGVsZXRlZFZhbHVlVHlwZSkKLSNp ZiBQTEFURk9STShXSU4pCi0gICAgOiBtX2ZvbnQoV1RGOjpIYXNoVGFibGVEZWxldGVkVmFsdWUp Ci0jZWxpZiBQTEFURk9STShDT0NPQSkKLSAgICA6IG1fZm9udChoYXNoVGFibGVEZWxldGVkRm9u dFZhbHVlKCkpCi0jZW5kaWYKKyAgICA6IG1faXNIYXNoVGFibGVEZWxldGVkVmFsdWUodHJ1ZSkK IHsKLSNpZiBVU0UoQ0FJUk8pCi0gICAgbV9zY2FsZWRGb250ID0gaGFzaFRhYmxlRGVsZXRlZEZv bnRWYWx1ZSgpOwotI2VuZGlmCiB9CiAKIEZvbnRQbGF0Zm9ybURhdGE6OkZvbnRQbGF0Zm9ybURh dGEoKQpAQCAtNzAsNiArNjMsNyBAQCBGb250UGxhdGZvcm1EYXRhOjpGb250UGxhdGZvcm1EYXRh KENHRm9udFJlZiBjZ0ZvbnQsIGZsb2F0IHNpemUsIGJvb2wgc3ludGhldGljQgogRm9udFBsYXRm b3JtRGF0YTo6Rm9udFBsYXRmb3JtRGF0YShjb25zdCBGb250UGxhdGZvcm1EYXRhJiBzb3VyY2Up CiAgICAgOiBGb250UGxhdGZvcm1EYXRhKHNvdXJjZS5tX3NpemUsIHNvdXJjZS5tX3N5bnRoZXRp Y0JvbGQsIHNvdXJjZS5tX3N5bnRoZXRpY09ibGlxdWUsIHNvdXJjZS5tX29yaWVudGF0aW9uLCBz b3VyY2UubV93aWR0aFZhcmlhbnQpCiB7CisgICAgbV9pc0hhc2hUYWJsZURlbGV0ZWRWYWx1ZSA9 IHNvdXJjZS5tX2lzSGFzaFRhYmxlRGVsZXRlZFZhbHVlOwogICAgIG1faXNDb2xvckJpdG1hcEZv bnQgPSBzb3VyY2UubV9pc0NvbG9yQml0bWFwRm9udDsKICAgICBtX2lzQ29tcG9zaXRlRm9udFJl ZmVyZW5jZSA9IHNvdXJjZS5tX2lzQ29tcG9zaXRlRm9udFJlZmVyZW5jZTsKICAgICBwbGF0Zm9y bURhdGFJbml0KHNvdXJjZSk7CkBAIC04MSw2ICs3NSw3IEBAIGNvbnN0IEZvbnRQbGF0Zm9ybURh dGEmIEZvbnRQbGF0Zm9ybURhdGE6Om9wZXJhdG9yPShjb25zdCBGb250UGxhdGZvcm1EYXRhJiBv dGhlCiAgICAgaWYgKHRoaXMgPT0gJm90aGVyKQogICAgICAgICByZXR1cm4gKnRoaXM7CiAKKyAg ICBtX2lzSGFzaFRhYmxlRGVsZXRlZFZhbHVlID0gb3RoZXIubV9pc0hhc2hUYWJsZURlbGV0ZWRW YWx1ZTsKICAgICBtX3N5bnRoZXRpY0JvbGQgPSBvdGhlci5tX3N5bnRoZXRpY0JvbGQ7CiAgICAg bV9zeW50aGV0aWNPYmxpcXVlID0gb3RoZXIubV9zeW50aGV0aWNPYmxpcXVlOwogICAgIG1fb3Jp ZW50YXRpb24gPSBvdGhlci5tX29yaWVudGF0aW9uOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udFBsYXRmb3JtRGF0YS5oIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvRm9udFBsYXRmb3JtRGF0YS5oCmluZGV4IGE3MTQyYzUyYTVlNmEw MGI2MTJkZDk0NWE0MWI4ZmJhYTVkMTcwY2IuLjg3N2I4MzRjOTI2MWJhNTM2ODI1ZGQ4NGYyOWI0 NzZiNDdlZmI4NTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L0ZvbnRQbGF0Zm9ybURhdGEuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9Gb250UGxhdGZvcm1EYXRhLmgKQEAgLTEwNyw3ICsxMDcsNyBAQCBwdWJsaWM6CiAgICAgSEZP TlQgaGZvbnQoKSBjb25zdCB7IHJldHVybiBtX2ZvbnQgPyBtX2ZvbnQtPmdldCgpIDogMDsgfQog ICAgIGJvb2wgdXNlR0RJKCkgY29uc3QgeyByZXR1cm4gbV91c2VHREk7IH0KICNlbGlmIFBMQVRG T1JNKENPQ09BKQotICAgIENURm9udFJlZiBmb250KCkgY29uc3QgeyByZXR1cm4gbV9mb250OyB9 CisgICAgQ1RGb250UmVmIGZvbnQoKSBjb25zdCB7IHJldHVybiBtX2ZvbnQuZ2V0KCk7IH0KICAg ICB2b2lkIHNldEZvbnQoQ1RGb250UmVmKTsKIAogICAgIENURm9udFJlZiBjdEZvbnQoKSBjb25z dDsKQEAgLTExOCw4ICsxMTgsOCBAQCBwdWJsaWM6CiAKICNpZiBVU0UoQVBQS0lUKQogICAgIC8v IEZJWE1FOiBSZW1vdmUgdGhpcyB3aGVuIGFsbCBOU0ZvbnQgdXNhZ2UgaXMgcmVtb3ZlZC4KLSAg ICBOU0ZvbnQgKm5zRm9udCgpIGNvbnN0IHsgcmV0dXJuIChOU0ZvbnQgKiltX2ZvbnQ7IH0KLSAg ICB2b2lkIHNldE5TRm9udChOU0ZvbnQgKmZvbnQpIHsgc2V0Rm9udCgoQ1RGb250UmVmKWZvbnQp OyB9CisgICAgTlNGb250ICpuc0ZvbnQoKSBjb25zdCB7IHJldHVybiByZWludGVycHJldF9jYXN0 PE5TRm9udCAqPihjb25zdF9jYXN0PF9fQ1RGb250Kj4obV9mb250LmdldCgpKSk7IH0KKyAgICB2 b2lkIHNldE5TRm9udChOU0ZvbnQgKmZvbnQpIHsgc2V0Rm9udChyZWludGVycHJldF9jYXN0PENU Rm9udFJlZj4oZm9udCkpOyB9CiAjZW5kaWYKICNlbmRpZgogCkBAIC0xNTEsMTEgKzE1MSwxMSBA QCBwdWJsaWM6CiAjZWxpZiBPUyhEQVJXSU4pCiAjaWYgVVNFKEFQUEtJVCkKICAgICAgICAgQVNT RVJUKG1fZm9udCB8fCAhbV9jZ0ZvbnQpOwotICAgICAgICB1aW50cHRyX3QgaGFzaENvZGVzWzNd ID0geyAodWludHB0cl90KW1fZm9udCwgbV93aWR0aFZhcmlhbnQsIHN0YXRpY19jYXN0PHVpbnRw dHJfdD4obV9vcmllbnRhdGlvbiA8PCAyIHwgbV9zeW50aGV0aWNCb2xkIDw8IDEgfCBtX3N5bnRo ZXRpY09ibGlxdWUpIH07CisgICAgICAgIHVpbnRwdHJfdCBoYXNoQ29kZXNbM10gPSB7IHJlaW50 ZXJwcmV0X2Nhc3Q8dWludHB0cl90Pihjb25zdF9jYXN0PF9fQ1RGb250Kj4obV9mb250LmdldCgp KSksIG1fd2lkdGhWYXJpYW50LCBzdGF0aWNfY2FzdDx1aW50cHRyX3Q+KG1faXNIYXNoVGFibGVE ZWxldGVkVmFsdWUgPDwgMyB8IG1fb3JpZW50YXRpb24gPDwgMiB8IG1fc3ludGhldGljQm9sZCA8 PCAxIHwgbV9zeW50aGV0aWNPYmxpcXVlKSB9OwogI2Vsc2UKICAgICAgICAgQVNTRVJUKG1fZm9u dCB8fCAhbV9jZ0ZvbnQgfHwgbV9pc0Vtb2ppKTsKLSAgICAgICAgdWludHB0cl90IGhhc2hDb2Rl c1szXSA9IHsgc3RhdGljX2Nhc3Q8dWludHB0cl90PihDRkhhc2gobV9mb250KSksIG1fd2lkdGhW YXJpYW50LCBzdGF0aWNfY2FzdDx1aW50cHRyX3Q+KG1faXNFbW9qaSA8PCAzIHwgbV9vcmllbnRh dGlvbiA8PCAyIHwgbV9zeW50aGV0aWNCb2xkIDw8IDEgfCBtX3N5bnRoZXRpY09ibGlxdWUpIH07 Ci0jZW5kaWYgLy8gIVBMQVRGT1JNKElPUykKKyAgICAgICAgdWludHB0cl90IGhhc2hDb2Rlc1sz XSA9IHsgc3RhdGljX2Nhc3Q8dWludHB0cl90PihDRkhhc2gobV9mb250LmdldCgpKSksIG1fd2lk dGhWYXJpYW50LCBzdGF0aWNfY2FzdDx1aW50cHRyX3Q+KG1faXNIYXNoVGFibGVEZWxldGVkVmFs dWUgPDwgNCB8IG1faXNFbW9qaSA8PCAzIHwgbV9vcmllbnRhdGlvbiA8PCAyIHwgbV9zeW50aGV0 aWNCb2xkIDw8IDEgfCBtX3N5bnRoZXRpY09ibGlxdWUpIH07CisjZW5kaWYKICAgICAgICAgcmV0 dXJuIFN0cmluZ0hhc2hlcjo6aGFzaE1lbW9yeTxzaXplb2YoaGFzaENvZGVzKT4oaGFzaENvZGVz KTsKICNlbGlmIFVTRShDQUlSTykKICAgICAgICAgcmV0dXJuIFB0ckhhc2g8Y2Fpcm9fc2NhbGVk X2ZvbnRfdCo+OjpoYXNoKG1fc2NhbGVkRm9udCk7CkBAIC0xNjcsNiArMTY3LDcgQEAgcHVibGlj OgogICAgIGJvb2wgb3BlcmF0b3I9PShjb25zdCBGb250UGxhdGZvcm1EYXRhJiBvdGhlcikgY29u c3QKICAgICB7CiAgICAgICAgIHJldHVybiBwbGF0Zm9ybUlzRXF1YWwob3RoZXIpCisgICAgICAg ICAgICAmJiBtX2lzSGFzaFRhYmxlRGVsZXRlZFZhbHVlID09IG90aGVyLm1faXNIYXNoVGFibGVE ZWxldGVkVmFsdWUKICAgICAgICAgICAgICYmIG1fc2l6ZSA9PSBvdGhlci5tX3NpemUKICAgICAg ICAgICAgICYmIG1fc3ludGhldGljQm9sZCA9PSBvdGhlci5tX3N5bnRoZXRpY0JvbGQKICAgICAg ICAgICAgICYmIG1fc3ludGhldGljT2JsaXF1ZSA9PSBvdGhlci5tX3N5bnRoZXRpY09ibGlxdWUK QEAgLTE3OCwxMyArMTc5LDcgQEAgcHVibGljOgogCiAgICAgYm9vbCBpc0hhc2hUYWJsZURlbGV0 ZWRWYWx1ZSgpIGNvbnN0CiAgICAgewotI2lmIFBMQVRGT1JNKFdJTikgJiYgIVVTRShDQUlSTykK LSAgICAgICAgcmV0dXJuIG1fZm9udC5pc0hhc2hUYWJsZURlbGV0ZWRWYWx1ZSgpOwotI2VsaWYg UExBVEZPUk0oQ09DT0EpCi0gICAgICAgIHJldHVybiBtX2ZvbnQgPT0gaGFzaFRhYmxlRGVsZXRl ZEZvbnRWYWx1ZSgpOwotI2VsaWYgVVNFKENBSVJPKQotICAgICAgICByZXR1cm4gbV9zY2FsZWRG b250ID09IGhhc2hUYWJsZURlbGV0ZWRGb250VmFsdWUoKTsKLSNlbmRpZgorICAgICAgICByZXR1 cm4gbV9pc0hhc2hUYWJsZURlbGV0ZWRWYWx1ZTsKICAgICB9CiAKICNpZiBQTEFURk9STShDT0NP QSkgfHwgUExBVEZPUk0oV0lOKQpAQCAtMjAwLDE2ICsxOTUsMTEgQEAgcHJpdmF0ZToKICAgICB2 b2lkIHBsYXRmb3JtRGF0YUluaXQoY29uc3QgRm9udFBsYXRmb3JtRGF0YSYpOwogICAgIGNvbnN0 IEZvbnRQbGF0Zm9ybURhdGEmIHBsYXRmb3JtRGF0YUFzc2lnbihjb25zdCBGb250UGxhdGZvcm1E YXRhJik7CiAjaWYgUExBVEZPUk0oQ09DT0EpCi0gICAgc3RhdGljIENURm9udFJlZiBoYXNoVGFi bGVEZWxldGVkRm9udFZhbHVlKCkgeyByZXR1cm4gcmVpbnRlcnByZXRfY2FzdDxDVEZvbnRSZWY+ KC0xKTsgfQotICAgIHN0YXRpYyBib29sIGlzVmFsaWRDVEZvbnRSZWYoQ1RGb250UmVmIGZvbnQp IHsgcmV0dXJuIGZvbnQgJiYgZm9udCAhPSBoYXNoVGFibGVEZWxldGVkRm9udFZhbHVlKCk7IH0K ICAgICBDR0Zsb2F0IGN0Rm9udFNpemUoKSBjb25zdDsKICNlbmRpZgogI2lmIFBMQVRGT1JNKFdJ TikKICAgICB2b2lkIHBsYXRmb3JtRGF0YUluaXQoSEZPTlQsIGZsb2F0IHNpemUsIEhEQywgV0NI QVIqIGZhY2VOYW1lKTsKICNlbmRpZgotI2lmIFVTRShDQUlSTykKLSAgICBzdGF0aWMgY2Fpcm9f c2NhbGVkX2ZvbnRfdCogaGFzaFRhYmxlRGVsZXRlZEZvbnRWYWx1ZSgpIHsgcmV0dXJuIHJlaW50 ZXJwcmV0X2Nhc3Q8Y2Fpcm9fc2NhbGVkX2ZvbnRfdCo+KC0xKTsgfQotI2VuZGlmCiAKIHB1Ymxp YzoKICAgICBib29sIG1fc3ludGhldGljQm9sZCB7IGZhbHNlIH07CkBAIC0yMjIsOSArMjEyLDEw IEBAIHB1YmxpYzoKICAgICBGb250V2lkdGhWYXJpYW50IG1fd2lkdGhWYXJpYW50IHsgUmVndWxh cldpZHRoIH07CiAKIHByaXZhdGU6CisgICAgYm9vbCBtX2lzSGFzaFRhYmxlRGVsZXRlZFZhbHVl IHsgZmFsc2UgfTsKICNpZiBQTEFURk9STShDT0NPQSkKICAgICAvLyBGSVhNRTogR2V0IHJpZCBv ZiBvbmUgb2YgdGhlc2UuIFRoZXNlIHR3byBmb250cyBhcmUgc3VidGx5IGRpZmZlcmVudCwgYW5k IGl0IGlzIG5vdCBvYnZpb3VzIHdoaWNoIG9uZSB0byB1c2Ugd2hlcmUuCi0gICAgQ1RGb250UmVm IG1fZm9udCB7IG51bGxwdHIgfTsKKyAgICBSZXRhaW5QdHI8Q1RGb250UmVmPiBtX2ZvbnQ7CiAg ICAgbXV0YWJsZSBSZXRhaW5QdHI8Q1RGb250UmVmPiBtX2N0Rm9udDsKICNlbGlmIFBMQVRGT1JN KFdJTikKICAgICBSZWZQdHI8U2hhcmVkR0RJT2JqZWN0PEhGT05UPj4gbV9mb250OwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvRm9udFBsYXRmb3Jt RGF0YUNvY29hLm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvRm9u dFBsYXRmb3JtRGF0YUNvY29hLm1tCmluZGV4IGMzOTA2M2VhZmE2N2Y3NTQ3NzFhZjg2NDdkZGI5 MzFiNjVhZWNkYWIuLjU2ODJmNDRhODE2MWM1NGFkZWM2N2VjMjhmMDI1MzE2MWE5NTNiNjYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NvY29hL0ZvbnRQbGF0 Zm9ybURhdGFDb2NvYS5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9j b2NvYS9Gb250UGxhdGZvcm1EYXRhQ29jb2EubW0KQEAgLTQ2LDIwICs0NiwxNyBAQCBGb250UGxh dGZvcm1EYXRhOjpGb250UGxhdGZvcm1EYXRhKENURm9udFJlZiBmb250LCBmbG9hdCBzaXplLCBi b29sIHN5bnRoZXRpY0JvbAogewogICAgIEFTU0VSVF9BUkcoZm9udCwgZm9udCk7CiAgICAgbV9m b250ID0gZm9udDsKLSAgICBDRlJldGFpbihtX2ZvbnQpOwogICAgIG1faXNDb2xvckJpdG1hcEZv bnQgPSBDVEZvbnRHZXRTeW1ib2xpY1RyYWl0cyhmb250KSAmIGtDVEZvbnRUcmFpdENvbG9yR2x5 cGhzOwogICAgIG1faXNDb21wb3NpdGVGb250UmVmZXJlbmNlID0gQ1RGb250R2V0U3ltYm9saWNU cmFpdHMoZm9udCkgJiBrQ1RGb250Q29tcG9zaXRlVHJhaXQ7CiB9CiAKIEZvbnRQbGF0Zm9ybURh dGE6On5Gb250UGxhdGZvcm1EYXRhKCkKIHsKLSAgICBpZiAoaXNWYWxpZENURm9udFJlZihtX2Zv bnQpKQotICAgICAgICBDRlJlbGVhc2UobV9mb250KTsKIH0KIAogdm9pZCBGb250UGxhdGZvcm1E YXRhOjpwbGF0Zm9ybURhdGFJbml0KGNvbnN0IEZvbnRQbGF0Zm9ybURhdGEmIGYpCiB7Ci0gICAg bV9mb250ID0gaXNWYWxpZENURm9udFJlZihmLm1fZm9udCkgPyBzdGF0aWNfY2FzdDxDVEZvbnRS ZWY+KGNvbnN0X2Nhc3Q8dm9pZCAqPihDRlJldGFpbihmLm1fZm9udCkpKSA6IGYubV9mb250Owor ICAgIG1fZm9udCA9IGYubV9mb250OwogCiAjaWYgUExBVEZPUk0oSU9TKQogICAgIG1faXNFbW9q aSA9IGYubV9pc0Vtb2ppOwpAQCAtNzQsMTIgKzcxLDggQEAgY29uc3QgRm9udFBsYXRmb3JtRGF0 YSYgRm9udFBsYXRmb3JtRGF0YTo6cGxhdGZvcm1EYXRhQXNzaWduKGNvbnN0IEZvbnRQbGF0Zm9y bUQKICNpZiBQTEFURk9STShJT1MpCiAgICAgbV9pc0Vtb2ppID0gZi5tX2lzRW1vamk7CiAjZW5k aWYKLSAgICBpZiAoaXNWYWxpZENURm9udFJlZihtX2ZvbnQpICYmIGlzVmFsaWRDVEZvbnRSZWYo Zi5tX2ZvbnQpICYmIENGRXF1YWwobV9mb250LCBmLm1fZm9udCkpCisgICAgaWYgKG1fZm9udCAm JiBmLm1fZm9udCAmJiBDRkVxdWFsKG1fZm9udC5nZXQoKSwgZi5tX2ZvbnQuZ2V0KCkpKQogICAg ICAgICByZXR1cm4gKnRoaXM7Ci0gICAgaWYgKGlzVmFsaWRDVEZvbnRSZWYoZi5tX2ZvbnQpKQot ICAgICAgICBDRlJldGFpbihmLm1fZm9udCk7Ci0gICAgaWYgKGlzVmFsaWRDVEZvbnRSZWYobV9m b250KSkKLSAgICAgICAgQ0ZSZWxlYXNlKG1fZm9udCk7CiAgICAgbV9mb250ID0gZi5tX2ZvbnQ7 CiAgICAgbV9jdEZvbnQgPSBmLm1fY3RGb250OwogCkBAIC05MSwxNCArODQsMTQgQEAgYm9vbCBG b250UGxhdGZvcm1EYXRhOjpwbGF0Zm9ybUlzRXF1YWwoY29uc3QgRm9udFBsYXRmb3JtRGF0YSYg b3RoZXIpIGNvbnN0CiAgICAgYm9vbCByZXN1bHQgPSBmYWxzZTsKICAgICBpZiAobV9mb250IHx8 IG90aGVyLm1fZm9udCkgewogI2lmIFBMQVRGT1JNKElPUykKLSAgICAgICAgcmVzdWx0ID0gaXNW YWxpZENURm9udFJlZihtX2ZvbnQpICYmIGlzVmFsaWRDVEZvbnRSZWYob3RoZXIubV9mb250KSAm JiBDRkVxdWFsKG1fZm9udCwgb3RoZXIubV9mb250KTsKKyAgICAgICAgcmVzdWx0ID0gbV9mb250 ICYmIG90aGVyLm1fZm9udCAmJiBDRkVxdWFsKG1fZm9udC5nZXQoKSwgb3RoZXIubV9mb250Lmdl dCgpKTsKICNpZiAhQVNTRVJUX0RJU0FCTEVECiAgICAgICAgIGlmIChyZXN1bHQpCiAgICAgICAg ICAgICBBU1NFUlQobV9pc0Vtb2ppID09IG90aGVyLm1faXNFbW9qaSk7CiAjZW5kaWYKICNlbHNl CiAgICAgICAgIHJlc3VsdCA9IG1fZm9udCA9PSBvdGhlci5tX2ZvbnQ7Ci0jZW5kaWYgLy8gUExB VEZPUk0oSU9TKQorI2VuZGlmCiAgICAgICAgIHJldHVybiByZXN1bHQ7CiAgICAgfQogI2lmIFBM QVRGT1JNKElPUykgJiYgIUFTU0VSVF9ESVNBQkxFRApAQCAtMTExLDE5ICsxMDQsMTUgQEAgYm9v bCBGb250UGxhdGZvcm1EYXRhOjpwbGF0Zm9ybUlzRXF1YWwoY29uc3QgRm9udFBsYXRmb3JtRGF0 YSYgb3RoZXIpIGNvbnN0CiB2b2lkIEZvbnRQbGF0Zm9ybURhdGE6OnNldEZvbnQoQ1RGb250UmVm IGZvbnQpCiB7CiAgICAgQVNTRVJUX0FSRyhmb250LCBmb250KTsKLSAgICBBU1NFUlQobV9mb250 ICE9IHJlaW50ZXJwcmV0X2Nhc3Q8Q1RGb250UmVmPigtMSkpOwogCiAgICAgaWYgKG1fZm9udCA9 PSBmb250KQogICAgICAgICByZXR1cm47CiAKLSAgICBDRlJldGFpbihmb250KTsKLSAgICBpZiAo bV9mb250KQotICAgICAgICBDRlJlbGVhc2UobV9mb250KTsKICAgICBtX2ZvbnQgPSBmb250Owog ICAgIG1fc2l6ZSA9IENURm9udEdldFNpemUoZm9udCk7CiAgICAgbV9jZ0ZvbnQgPSBhZG9wdENG KENURm9udENvcHlHcmFwaGljc0ZvbnQoZm9udCwgbnVsbHB0cikpOwogCi0gICAgQ1RGb250U3lt Ym9saWNUcmFpdHMgdHJhaXRzID0gQ1RGb250R2V0U3ltYm9saWNUcmFpdHMobV9mb250KTsKKyAg ICBDVEZvbnRTeW1ib2xpY1RyYWl0cyB0cmFpdHMgPSBDVEZvbnRHZXRTeW1ib2xpY1RyYWl0cyht X2ZvbnQuZ2V0KCkpOwogICAgIG1faXNDb2xvckJpdG1hcEZvbnQgPSB0cmFpdHMgJiBrQ1RGb250 VHJhaXRDb2xvckdseXBoczsKICAgICBtX2lzQ29tcG9zaXRlRm9udFJlZmVyZW5jZSA9IHRyYWl0 cyAmIGtDVEZvbnRDb21wb3NpdGVUcmFpdDsKICAgICAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9Gb250UGxhdGZvcm1EYXRhQ2Fpcm9XaW4uY3BwIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL0ZvbnRQbGF0Zm9ybURhdGFDYWly b1dpbi5jcHAKaW5kZXggMzM5YzE0ZDk2MTA3MGZjMWUyMjNiMTc3MGQxM2FkZTU0OGRiYTYyNS4u YWFhN2FhNjNiNzRlMjJhMjgwMjY2YWJmY2I3YzU4ZGQ1MDBlNzRjMyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL0ZvbnRQbGF0Zm9ybURhdGFDYWlyb1dp bi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL0ZvbnRQbGF0 Zm9ybURhdGFDYWlyb1dpbi5jcHAKQEAgLTkxLDcgKzkxLDcgQEAgRm9udFBsYXRmb3JtRGF0YTo6 Rm9udFBsYXRmb3JtRGF0YShHRElPYmplY3Q8SEZPTlQ+IGZvbnQsIGNhaXJvX2ZvbnRfZmFjZV90 KiBmb24KIAogRm9udFBsYXRmb3JtRGF0YTo6fkZvbnRQbGF0Zm9ybURhdGEoKQogewotICAgIGlm IChtX3NjYWxlZEZvbnQgJiYgbV9zY2FsZWRGb250ICE9IGhhc2hUYWJsZURlbGV0ZWRGb250VmFs dWUoKSkKKyAgICBpZiAobV9zY2FsZWRGb250KQogICAgICAgICBjYWlyb19zY2FsZWRfZm9udF9k ZXN0cm95KG1fc2NhbGVkRm9udCk7CiB9CiAKQEAgLTExMCw3ICsxMTAsNyBAQCBjb25zdCBGb250 UGxhdGZvcm1EYXRhJiBGb250UGxhdGZvcm1EYXRhOjpwbGF0Zm9ybURhdGFBc3NpZ24oY29uc3Qg Rm9udFBsYXRmb3JtRAogICAgIG1fZm9udCA9IG90aGVyLm1fZm9udDsKICAgICBtX3VzZUdESSA9 IG90aGVyLm1fdXNlR0RJOwogCi0gICAgaWYgKG1fc2NhbGVkRm9udCAmJiBtX3NjYWxlZEZvbnQg IT0gaGFzaFRhYmxlRGVsZXRlZEZvbnRWYWx1ZSgpKQorICAgIGlmIChtX3NjYWxlZEZvbnQpCiAg ICAgICAgIGNhaXJvX3NjYWxlZF9mb250X2Rlc3Ryb3kobV9zY2FsZWRGb250KTsKIAogICAgIG1f c2NhbGVkRm9udCA9IGNhaXJvX3NjYWxlZF9mb250X3JlZmVyZW5jZShvdGhlci5tX3NjYWxlZEZv bnQpOwo=