114103 2013-04-06 15:55:24 -0700 Remove the Chromium code from Mac's FontPlatformData 2013-04-06 16:17:30 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 benjamin benjamin oldest_to_newest 870365 0 benjamin 2013-04-06 15:55:24 -0700 Remove the Chromium code from Mac's FontPlatformData 870366 1 196756 benjamin 2013-04-06 15:56:18 -0700 Created attachment 196756 Patch 870370 2 196756 benjamin 2013-04-06 16:17:28 -0700 Comment on attachment 196756 Patch Clearing flags on attachment: 196756 Committed r147859: <http://trac.webkit.org/changeset/147859> 870371 3 benjamin 2013-04-06 16:17:30 -0700 All reviewed patches have been landed. Closing bug. 196756 2013-04-06 15:56:18 -0700 2013-04-06 16:17:28 -0700 Patch bug-114103-20130406155603.patch text/plain 7393 benjamin U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ3ODU2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjliZWZmYmNmMDUyNTdm MTY3ZjMxMGQ1Y2NjZWJiMWUzOGMwNjZiOS4uMjVhZGY0NDAyZjdlYmVmYjdhN2RhYTUyMzgzZmM4 YTJiNDhkNWRhOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIyIEBACiAyMDEzLTA0LTA2ICBCZW5q YW1pbiBQb3VsYWluICA8YmVuamFtaW5Ad2Via2l0Lm9yZz4KIAorICAgICAgICBSZW1vdmUgdGhl IENocm9taXVtIGNvZGUgZnJvbSBNYWMncyBGb250UGxhdGZvcm1EYXRhCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTQxMDMKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL0Zv bnRQbGF0Zm9ybURhdGEuaDoKKyAgICAgICAgKFdlYkNvcmUpOgorICAgICAgICAoRm9udFBsYXRm b3JtRGF0YSk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvRm9udFBsYXRmb3Jt RGF0YUNvY29hLm1tOgorICAgICAgICAoV2ViQ29yZTo6Rm9udFBsYXRmb3JtRGF0YTo6Rm9udFBs YXRmb3JtRGF0YSk6CisgICAgICAgIChXZWJDb3JlOjpGb250UGxhdGZvcm1EYXRhOjpwbGF0Zm9y bURhdGFJbml0KToKKyAgICAgICAgKFdlYkNvcmU6OkZvbnRQbGF0Zm9ybURhdGE6OnBsYXRmb3Jt RGF0YUFzc2lnbik6CisgICAgICAgIChXZWJDb3JlOjpGb250UGxhdGZvcm1EYXRhOjpzZXRGb250 KToKKyAgICAgICAgKFdlYkNvcmU6OkZvbnRQbGF0Zm9ybURhdGE6OmN0Rm9udCk6CisKKzIwMTMt MDQtMDYgIEJlbmphbWluIFBvdWxhaW4gIDxiZW5qYW1pbkB3ZWJraXQub3JnPgorCiAgICAgICAg IENsZWFuIERPTVdpbmRvdy5pZGwgZnJvbSB0aGUgVjggbm9uc2Vuc2UKICAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExNDEwMgogCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250UGxhdGZvcm1EYXRhLmggYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250UGxhdGZvcm1EYXRhLmgKaW5kZXggODM4 N2Q0YzE5ZDVhNWUxMzcxNzFmYmE2MjJlMWFjNmNhMDg5NDA3YS4uYmE5NDY2NDg5NjUxZTBlYTU2 OTc4YWUzMGE4NGE4MmUyNzkwM2VhNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvRm9udFBsYXRmb3JtRGF0YS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL0ZvbnRQbGF0Zm9ybURhdGEuaApAQCAtNjMsMTAgKzYzLDYgQEAgdHlwZWRl ZiBjb25zdCBzdHJ1Y3QgX19DVEZvbnQqIENURm9udFJlZjsKICNpbmNsdWRlIDx3dGYvUmV0YWlu UHRyLmg+CiAjaW5jbHVkZSA8d3RmL3RleHQvU3RyaW5nSW1wbC5oPgogCi0jaWYgUExBVEZPUk0o Q0hST01JVU0pICYmIE9TKERBUldJTikKLSNpbmNsdWRlICJDcm9zc1Byb2Nlc3NGb250TG9hZGlu Zy5oIiAgCi0jZW5kaWYKLQogI2lmIFBMQVRGT1JNKFdJTikKIHR5cGVkZWYgc3RydWN0IEhGT05U X18qIEhGT05UOwogI2VuZGlmCkBAIC04NiwxMCArODIsNiBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7 CiBjbGFzcyBGb250RGVzY3JpcHRpb247CiBjbGFzcyBTaGFyZWRCdWZmZXI7CiAKLSNpZiBQTEFU Rk9STShDSFJPTUlVTSkgJiYgT1MoREFSV0lOKQotY2xhc3MgSGFyZkJ1enpGYWNlOwotI2VuZGlm Ci0KICNpZiBPUyhEQVJXSU4pCiBpbmxpbmUgQ1RGb250UmVmIHRvQ1RGb250UmVmKE5TRm9udCAq bnNGb250KSB7IHJldHVybiByZWludGVycHJldF9jYXN0PENURm9udFJlZj4obnNGb250KTsgfQog I2VuZGlmCkBAIC0xNjAsMTAgKzE1Miw2IEBAIHB1YmxpYzoKICAgICBjYWlyb19zY2FsZWRfZm9u dF90KiBzY2FsZWRGb250KCkgY29uc3QgeyByZXR1cm4gbV9zY2FsZWRGb250OyB9CiAjZW5kaWYK IAotI2lmIFBMQVRGT1JNKENIUk9NSVVNKSAmJiBPUyhEQVJXSU4pCi0gICAgSGFyZkJ1enpGYWNl KiBoYXJmQnV6ekZhY2UoKTsKLSNlbmRpZgotCiAgICAgdW5zaWduZWQgaGFzaCgpIGNvbnN0CiAg ICAgewogI2lmIFBMQVRGT1JNKFdJTikgJiYgIVVTRShDQUlSTykKQEAgLTIyMSwxMSArMjA5LDYg QEAgcHJpdmF0ZToKICAgICBjb25zdCBGb250UGxhdGZvcm1EYXRhJiBwbGF0Zm9ybURhdGFBc3Np Z24oY29uc3QgRm9udFBsYXRmb3JtRGF0YSYpOwogI2lmIE9TKERBUldJTikKICAgICAvLyBMb2Fk IHZhcmlvdXMgZGF0YSBhYm91dCB0aGUgZm9udCBzcGVjaWZpZWQgYnkgfG5zRm9udHwgd2l0aCB0 aGUgc2l6ZSBmb250U2l6ZSBpbnRvIHRoZSBmb2xsb3dpbmcgb3V0cHV0IHBhcmFtdGVyczoKLSAg ICAvLyBOb3RlOiBDYWxsZXJzIHNob3VsZCBhbHdheXMgdGFrZSBpbnRvIGFjY291bnQgdGhhdCBm b3IgdGhlIENocm9taXVtIHBvcnQsIHxvdXROU0ZvbnR8IGlzbid0IG5lY2Vzc2FyaWx5IHRoZSBz YW1lCi0gICAgLy8gZm9udCBhcyB8bnNGb250fC4gVGhpcyBiZWNhdXNlIHRoZSBzYW5kYm94IG1h eSBibG9jayBsb2FkaW5nIG9mIHRoZSBvcmlnaW5hbCBmb250LgotICAgIC8vICogb3V0TlNGb250 IC0gVGhlIGZvbnQgdGhhdCB3YXMgYWN0dWFsbHkgbG9hZGVkLCBmb3IgdGhlIENocm9taXVtIHBv cnQgdGhpcyBtYXkgYmUgZGlmZmVyZW50IHRoYW4gbnNGb250LgotICAgIC8vIFRoZSBjYWxsZXIg aXMgcmVzcG9uc2libGUgZm9yIGNhbGxpbmcgQ0ZSZWxlYXNlKCkgb24gdGhpcyBwYXJhbWV0ZXIg d2hlbiBkb25lIHdpdGggaXQuCi0gICAgLy8gKiBjZ0ZvbnQgLSBDR0ZvbnRSZWYgcmVwcmVzZW50 aW5nIHRoZSBpbnB1dCBmb250IGF0IHRoZSBzcGVjaWZpZWQgcG9pbnQgc2l6ZS4KICAgICB2b2lk IGxvYWRGb250KE5TRm9udCosIGZsb2F0IGZvbnRTaXplLCBOU0ZvbnQqJiBvdXROU0ZvbnQsIENH Rm9udFJlZiYpOwogICAgIHN0YXRpYyBOU0ZvbnQqIGhhc2hUYWJsZURlbGV0ZWRGb250VmFsdWUo KSB7IHJldHVybiByZWludGVycHJldF9jYXN0PE5TRm9udCAqPigtMSk7IH0KICNlbGlmIFBMQVRG T1JNKFdJTikKQEAgLTI2MywxMSArMjQ2LDYgQEAgcHJpdmF0ZToKICAgICBjYWlyb19zY2FsZWRf Zm9udF90KiBtX3NjYWxlZEZvbnQ7CiAjZW5kaWYKIAotI2lmIFBMQVRGT1JNKENIUk9NSVVNKSAm JiBPUyhEQVJXSU4pCi0gICAgUmVmUHRyPE1lbW9yeUFjdGl2YXRlZEZvbnQ+IG1faW5NZW1vcnlG b250OwotICAgIFJlZlB0cjxIYXJmQnV6ekZhY2U+IG1faGFyZkJ1enpGYWNlOwotI2VuZGlmCi0K ICAgICBib29sIG1faXNDb2xvckJpdG1hcEZvbnQ7CiAgICAgYm9vbCBtX2lzQ29tcG9zaXRlRm9u dFJlZmVyZW5jZTsKICNpZiBPUyhEQVJXSU4pCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9Gb250UGxhdGZvcm1EYXRhQ29jb2EubW0gYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9Gb250UGxhdGZvcm1EYXRhQ29jb2EubW0K aW5kZXggY2RiYzZkZGVmNWQ4MTJlY2VkODFkNGFjMzM0NjcwMmZhOTU3ZGI2OS4uZjhkODJkMmMz MzVmNDdmY2QyMTkzYzRlZjIwZTgwM2Q0OGFjMzFhZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvRm9udFBsYXRmb3JtRGF0YUNvY29hLm1tCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NvY29hL0ZvbnRQbGF0Zm9ybURhdGFD b2NvYS5tbQpAQCAtMjgsMTAgKzI4LDYgQEAKICNpbXBvcnQgPEFwcEtpdC9OU0ZvbnQuaD4KICNp bXBvcnQgPHd0Zi90ZXh0L1dURlN0cmluZy5oPgogCi0jaWYgUExBVEZPUk0oQ0hST01JVU0pICYm IE9TKERBUldJTikKLSNpbXBvcnQgIkhhcmZCdXp6RmFjZS5oIgotI2VuZGlmCi0KIG5hbWVzcGFj ZSBXZWJDb3JlIHsKIAogLy8gVGhlc2UgQ29yZVRleHQgVGV4dCBTcGFjaW5nIGZlYXR1cmUgc2Vs ZWN0b3JzIGFyZSBub3QgZGVmaW5lZCBpbiBDb3JlVGV4dC4KQEAgLTYyLDggKzU4LDYgQEAgRm9u dFBsYXRmb3JtRGF0YTo6Rm9udFBsYXRmb3JtRGF0YShOU0ZvbnQgKm5zRm9udCwgZmxvYXQgc2l6 ZSwgYm9vbCBpc1ByaW50ZXJGb24KICAgICBsb2FkRm9udChuc0ZvbnQsIHNpemUsIG1fZm9udCwg Y2dGb250KTsKICAgICAKICNpZiBQTEFURk9STShJT1MpIHx8IF9fTUFDX09TX1hfVkVSU0lPTl9N SU5fUkVRVUlSRUQgPj0gMTA3MAotICAgIC8vIEZJWE1FOiBDaHJvbWl1bTogVGhlIGZvbGxvd2lu ZyBjb2RlIGlzbid0IGNvcnJlY3QgZm9yIHRoZSBDaHJvbWl1bSBwb3J0IHNpbmNlIHRoZSBzYW5k Ym94IG1pZ2h0Ci0gICAgLy8gaGF2ZSBibG9ja2VkIGZvbnQgbG9hZGluZywgaW4gd2hpY2ggY2Fz ZSB3ZSdsbCBvbmx5IGhhdmUgdGhlIHJlYWwgbG9hZGVkIGZvbnQgZmlsZSBhZnRlciB0aGUgY2Fs bCB0byBsb2FkRm9udCgpLgogICAgIHsKICAgICAgICAgQ1RGb250U3ltYm9saWNUcmFpdHMgdHJh aXRzID0gQ1RGb250R2V0U3ltYm9saWNUcmFpdHModG9DVEZvbnRSZWYobV9mb250KSk7CiAgICAg ICAgIG1faXNDb2xvckJpdG1hcEZvbnQgPSB0cmFpdHMgJiBrQ1RGb250Q29sb3JHbHlwaHNUcmFp dDsKQEAgLTkxLDExICs4NSw2IEBAIHZvaWQgRm9udFBsYXRmb3JtRGF0YTo6cGxhdGZvcm1EYXRh SW5pdChjb25zdCBGb250UGxhdGZvcm1EYXRhJiBmKQogCiAgICAgbV9jZ0ZvbnQgPSBmLm1fY2dG b250OwogICAgIG1fQ1RGb250ID0gZi5tX0NURm9udDsKLQotI2lmIFBMQVRGT1JNKENIUk9NSVVN KSAmJiBPUyhEQVJXSU4pCi0gICAgbV9pbk1lbW9yeUZvbnQgPSBmLm1faW5NZW1vcnlGb250Owot ICAgIG1faGFyZkJ1enpGYWNlID0gZi5tX2hhcmZCdXp6RmFjZTsKLSNlbmRpZgogfQogCiBjb25z dCBGb250UGxhdGZvcm1EYXRhJiBGb250UGxhdGZvcm1EYXRhOjpwbGF0Zm9ybURhdGFBc3NpZ24o Y29uc3QgRm9udFBsYXRmb3JtRGF0YSYgZikKQEAgLTEwOSwxMCArOTgsNiBAQCBjb25zdCBGb250 UGxhdGZvcm1EYXRhJiBGb250UGxhdGZvcm1EYXRhOjpwbGF0Zm9ybURhdGFBc3NpZ24oY29uc3Qg Rm9udFBsYXRmb3JtRAogICAgICAgICBDRlJlbGVhc2UobV9mb250KTsKICAgICBtX2ZvbnQgPSBm Lm1fZm9udDsKICAgICBtX0NURm9udCA9IGYubV9DVEZvbnQ7Ci0jaWYgUExBVEZPUk0oQ0hST01J VU0pICYmIE9TKERBUldJTikKLSAgICBtX2luTWVtb3J5Rm9udCA9IGYubV9pbk1lbW9yeUZvbnQ7 Ci0gICAgbV9oYXJmQnV6ekZhY2UgPSBmLm1faGFyZkJ1enpGYWNlOwotI2VuZGlmCiAgICAgcmV0 dXJuICp0aGlzOwogfQogCkBAIC0xNDAsMTcgKzEyNSw3IEBAIHZvaWQgRm9udFBsYXRmb3JtRGF0 YTo6c2V0Rm9udChOU0ZvbnQgKmZvbnQpCiAgICAgQ0dGb250UmVmIGNnRm9udCA9IDA7CiAgICAg TlNGb250KiBsb2FkZWRGb250ID0gMDsKICAgICBsb2FkRm9udChtX2ZvbnQsIG1fc2l6ZSwgbG9h ZGVkRm9udCwgY2dGb250KTsKLSAgICAKLSNpZiBQTEFURk9STShDSFJPTUlVTSkgJiYgT1MoREFS V0lOKQotICAgIC8vIElmIGxvYWRGb250IHJlcGxhY2VkIG1fZm9udCB3aXRoIGEgZmFsbGJhY2sg Zm9udCwgdGhlbiByZWxlYXNlIHRoZQotICAgIC8vIHByZXZpb3VzIGZvbnQgdG8gY291bnRlciB0 aGUgcmV0YWluIGFib3ZlLiBUaGVuIHJldGFpbiB0aGUgbmV3IGZvbnQuCi0gICAgaWYgKGxvYWRl ZEZvbnQgIT0gbV9mb250KSB7Ci0gICAgICAgIENGUmVsZWFzZShtX2ZvbnQpOwotICAgICAgICBD RlJldGFpbihsb2FkZWRGb250KTsKLSAgICAgICAgbV9mb250ID0gbG9hZGVkRm9udDsKLSAgICB9 Ci0jZW5kaWYKLSAgICAKKwogICAgIG1fY2dGb250LmFkb3B0Q0YoY2dGb250KTsKICNpZiBQTEFU Rk9STShJT1MpIHx8IF9fTUFDX09TX1hfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPj0gMTA3MAogICAg IHsKQEAgLTI0NywxMyArMjIyLDYgQEAgQ1RGb250UmVmIEZvbnRQbGF0Zm9ybURhdGE6OmN0Rm9u dCgpIGNvbnN0CiAgICAgaWYgKG1fQ1RGb250KQogICAgICAgICByZXR1cm4gbV9DVEZvbnQuZ2V0 KCk7CiAKLSNpZiBQTEFURk9STShDSFJPTUlVTSkKLSAgICBpZiAobV9pbk1lbW9yeUZvbnQpIHsK LSAgICAgICAgbV9DVEZvbnQuYWRvcHRDRihDVEZvbnRDcmVhdGVXaXRoR3JhcGhpY3NGb250KG1f aW5NZW1vcnlGb250LT5jZ0ZvbnQoKSwgbV9zaXplLCAwLCBjYXNjYWRlVG9MYXN0UmVzb3J0Rm9u dERlc2NyaXB0b3IoKSkpOwotICAgICAgICByZXR1cm4gbV9DVEZvbnQuZ2V0KCk7Ci0gICAgfQot I2VuZGlmCi0KICAgICBtX0NURm9udCA9IHRvQ1RGb250UmVmKG1fZm9udCk7CiAgICAgaWYgKG1f Q1RGb250KSB7CiAgICAgICAgIENURm9udERlc2NyaXB0b3JSZWYgZm9udERlc2NyaXB0b3I7CkBA IC0yODMsMzcgKzI1MSw2IEBAIENURm9udFJlZiBGb250UGxhdGZvcm1EYXRhOjpjdEZvbnQoKSBj b25zdAogICAgIHJldHVybiBtX0NURm9udC5nZXQoKTsKIH0KIAotI2lmIFBMQVRGT1JNKENIUk9N SVVNKSAmJiBPUyhEQVJXSU4pCi1zdGF0aWMgYm9vbCBpc0FBVEZvbnQoQ1RGb250UmVmIGN0Rm9u dCkKLXsKLSAgICBDRkRhdGFSZWYgdGFibGUgPSBDVEZvbnRDb3B5VGFibGUoY3RGb250LCBrQ1RG b250VGFibGVNb3J0LCAwKTsKLSAgICBpZiAodGFibGUpIHsKLSAgICAgICAgQ0ZSZWxlYXNlKHRh YmxlKTsKLSAgICAgICAgcmV0dXJuIHRydWU7Ci0gICAgfQotICAgIHRhYmxlID0gQ1RGb250Q29w eVRhYmxlKGN0Rm9udCwga0NURm9udFRhYmxlTW9yeCwgMCk7Ci0gICAgaWYgKHRhYmxlKSB7Ci0g ICAgICAgIENGUmVsZWFzZSh0YWJsZSk7Ci0gICAgICAgIHJldHVybiB0cnVlOwotICAgIH0KLSAg ICByZXR1cm4gZmFsc2U7Ci19Ci0KLUhhcmZCdXp6RmFjZSogRm9udFBsYXRmb3JtRGF0YTo6aGFy ZkJ1enpGYWNlKCkKLXsKLSAgICBDVEZvbnRSZWYgZm9udCA9IGN0Rm9udCgpOwotICAgIC8vIEhh cmZCdXp6IGNhbid0IGhhbmRsZSBBQVQgZm9udAotICAgIGlmIChpc0FBVEZvbnQoZm9udCkpCi0g ICAgICAgIHJldHVybiAwOwotCi0gICAgaWYgKCFtX2hhcmZCdXp6RmFjZSkgewotICAgICAgICB1 aW50NjRfdCB1bmlxdWVJRCA9IHJlaW50ZXJwcmV0X2Nhc3Q8dWludHB0cl90Pihmb250KTsKLSAg ICAgICAgbV9oYXJmQnV6ekZhY2UgPSBIYXJmQnV6ekZhY2U6OmNyZWF0ZShjb25zdF9jYXN0PEZv bnRQbGF0Zm9ybURhdGEqPih0aGlzKSwgdW5pcXVlSUQpOwotICAgIH0KLSAgICByZXR1cm4gbV9o YXJmQnV6ekZhY2UuZ2V0KCk7Ci19Ci0jZW5kaWYKLQogI2lmbmRlZiBOREVCVUcKIFN0cmluZyBG b250UGxhdGZvcm1EYXRhOjpkZXNjcmlwdGlvbigpIGNvbnN0CiB7Cg==