152030 2015-12-08 17:31:03 -0800 Remove Mavericks-specific code from FontCacheMac 2015-12-08 19:57:31 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mmaxfield mmaxfield commit-queue oldest_to_newest 1147555 0 mmaxfield 2015-12-08 17:31:03 -0800 Remove Mavericks-specific code from FontCacheMac 1147556 1 266958 mmaxfield 2015-12-08 17:31:38 -0800 Created attachment 266958 Patch 1147574 2 266958 commit-queue 2015-12-08 19:57:29 -0800 Comment on attachment 266958 Patch Clearing flags on attachment: 266958 Committed r193805: <http://trac.webkit.org/changeset/193805> 1147575 3 commit-queue 2015-12-08 19:57:31 -0800 All reviewed patches have been landed. Closing bug. 266958 2015-12-08 17:31:38 -0800 2015-12-08 19:57:29 -0800 Patch bug-152030-20151208173111.patch text/plain 3613 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMTkzNzk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjg3MTY2ZGU2MThlZjIy MjE1YjIzMDMwOGY1NTM2MWEyMmFkOGNiYy4uNWQ0YzYzNWQxODllY2U0MmFiY2QyMjIyYjUxMjIz NDU2ZjMxZTE4NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDE1LTEyLTA4ICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgUmVtb3ZlIE1h dmVyaWNrcy1zcGVjaWZpYyBjb2RlIGZyb20gRm9udENhY2hlTWFjCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTIwMzAKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNYXZlcmlja3MgaXMgbm8gbG9uZ2VyIGEg c3VwcG9ydGVkIHBsYXRmb3JtLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyBiZWNhdXNlIHRoZXJl IGlzIG5vIGJlaGF2aW9yIGNoYW5nZS4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL21h Yy9Gb250Q2FjaGVNYWMubW06CisgICAgICAgIChXZWJDb3JlOjpwbGF0Zm9ybUxvb2t1cEZhbGxi YWNrRm9udCk6CisgICAgICAgIChXZWJDb3JlOjpwbGF0Zm9ybUZvbnRXaXRoRmFtaWx5U3BlY2lh bENhc2UpOiBEZWxldGVkLgorCiAyMDE1LTEyLTA4ICBCcmFkeSBFaWRzb24gIDxiZWlkc29uQGFw cGxlLmNvbT4KIAogICAgICAgICBNb2Rlcm4gSURCOiBGaXJlIGJsb2NrZWQgZXZlbnRzIGZvciBk ZWxldGUgcmVxdWVzdHMgdGhhdCBhcmUgYmxvY2tlZC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL21hYy9Gb250Q2FjaGVNYWMubW0gYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9tYWMvRm9udENhY2hlTWFjLm1tCmluZGV4IDFkOTNhY2I4MDg5 MWQ3ZmZmY2M2MWQ1YjAxYTZkYTk1NDhkMDg2NDcuLmIzM2Y0YTBjZDE5MzBmODRmMjgzOWZiMmFh MTQ2MWQzNmI1NGMzYmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL21hYy9Gb250Q2FjaGVNYWMubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvbWFjL0ZvbnRDYWNoZU1hYy5tbQpAQCAtMTkwLDcgKzE5MCw2IEBAIHN0YXRpYyBOU0Zv bnRUcmFpdE1hc2sgdG9OU0ZvbnRUcmFpdHMoQ1RGb250U3ltYm9saWNUcmFpdHMgdHJhaXRzKQog CiAjZW5kaWYgLy8gUExBVEZPUk1fRk9OVF9MT09LVVAKIAotI2lmIF9fTUFDX09TX1hfVkVSU0lP Tl9NSU5fUkVRVUlSRUQgPj0gMTAxMDAwCiBzdGF0aWMgQ0dGbG9hdCB0b05TRm9udFdlaWdodChG b250V2VpZ2h0IGZvbnRXZWlnaHQpCiB7CiAgICAgc3RhdGljIGNvbnN0IENHRmxvYXQgbnNGb250 V2VpZ2h0c1tdID0gewpAQCAtMjA3LDE4ICsyMDYsMTMgQEAgc3RhdGljIENHRmxvYXQgdG9OU0Zv bnRXZWlnaHQoRm9udFdlaWdodCBmb250V2VpZ2h0KQogICAgIEFTU0VSVChmb250V2VpZ2h0ID49 IDAgJiYgZm9udFdlaWdodCA8PSA4KTsKICAgICByZXR1cm4gbnNGb250V2VpZ2h0c1tmb250V2Vp Z2h0XTsKIH0KLSNlbmRpZgogCiBSZXRhaW5QdHI8Q1RGb250UmVmPiBwbGF0Zm9ybUZvbnRXaXRo RmFtaWx5U3BlY2lhbENhc2UoY29uc3QgQXRvbWljU3RyaW5nJiBmYW1pbHksIEZvbnRXZWlnaHQg d2VpZ2h0LCBDVEZvbnRTeW1ib2xpY1RyYWl0cyBkZXNpcmVkVHJhaXRzLCBmbG9hdCBzaXplKQog ewogICAgIGlmIChlcXVhbElnbm9yaW5nQVNDSUlDYXNlKGZhbWlseSwgIi13ZWJraXQtc3lzdGVt LWZvbnQiKQogICAgICAgICB8fCBlcXVhbElnbm9yaW5nQVNDSUlDYXNlKGZhbWlseSwgIi1hcHBs ZS1zeXN0ZW0iKQogICAgICAgICB8fCBlcXVhbElnbm9yaW5nQVNDSUlDYXNlKGZhbWlseSwgIi1h cHBsZS1zeXN0ZW0tZm9udCIpKSB7Ci0jaWYgX19NQUNfT1NfWF9WRVJTSU9OX01JTl9SRVFVSVJF RCA+PSAxMDEwMDAKICAgICAgICAgUmV0YWluUHRyPENURm9udFJlZj4gcmVzdWx0ID0gdG9DVEZv bnQoW05TRm9udCBzeXN0ZW1Gb250T2ZTaXplOnNpemUgd2VpZ2h0OnRvTlNGb250V2VpZ2h0KHdl aWdodCldKTsKLSNlbHNlCi0gICAgICAgIFJldGFpblB0cjxDVEZvbnRSZWY+IHJlc3VsdCA9IHRv Q1RGb250KCh3ZWlnaHQgPj0gRm9udFdlaWdodDYwMCkgPyBbTlNGb250IGJvbGRTeXN0ZW1Gb250 T2ZTaXplOnNpemVdIDogW05TRm9udCBzeXN0ZW1Gb250T2ZTaXplOnNpemVdKTsKLSNlbmRpZgog ICAgICAgICBpZiAoZGVzaXJlZFRyYWl0cyAmIGtDVEZvbnRJdGFsaWNUcmFpdCkgewogICAgICAg ICAgICAgaWYgKGF1dG8gaXRhbGljaXplZEZvbnQgPSBhZG9wdENGKENURm9udENyZWF0ZUNvcHlX aXRoU3ltYm9saWNUcmFpdHMocmVzdWx0LmdldCgpLCBzaXplLCBudWxscHRyLCBkZXNpcmVkVHJh aXRzLCBkZXNpcmVkVHJhaXRzKSkpCiAgICAgICAgICAgICAgICAgcmVzdWx0ID0gaXRhbGljaXpl ZEZvbnQ7CkBAIC0zODgsMjMgKzM4Miw3IEBAIHZvaWQgcGxhdGZvcm1JbnZhbGlkYXRlRm9udENh Y2hlKCkKIFJldGFpblB0cjxDVEZvbnRSZWY+IHBsYXRmb3JtTG9va3VwRmFsbGJhY2tGb250KENU Rm9udFJlZiBmb250LCBGb250V2VpZ2h0LCBjb25zdCBBdG9taWNTdHJpbmcmIGxvY2FsZSwgY29u c3QgVUNoYXIqIGNoYXJhY3RlcnMsIHVuc2lnbmVkIGxlbmd0aCkKIHsKICAgICBSZXRhaW5QdHI8 Q0ZTdHJpbmdSZWY+IGxvY2FsZVN0cmluZzsKLSNpZiBfX01BQ19PU19YX1ZFUlNJT05fTUlOX1JF UVVJUkVEID09IDEwOTAKLSAgICBVTlVTRURfUEFSQU0obG9jYWxlKTsKLSAgICBpZiAoIWZvbnQp IHsKLSAgICAgICAgZm9udCA9IHRvQ1RGb250KFtOU0ZvbnQgdXNlckZvbnRPZlNpemU6Q1RGb250 R2V0U2l6ZShmb250KV0pOwotICAgICAgICBib29sIGFjY2VwdGFibGUgPSB0cnVlOwotICAgICAg ICAKLSAgICAgICAgUmV0YWluUHRyPENGQ2hhcmFjdGVyU2V0UmVmPiBjaGFyYWN0ZXJTZXQgPSBh ZG9wdENGKENURm9udENvcHlDaGFyYWN0ZXJTZXQoZm9udCkpOwotICAgICAgICBmb3IgKGF1dG8g Y2hhcmFjdGVyIDogU3RyaW5nVmlldyhjaGFyYWN0ZXJzLCBsZW5ndGgpLmNvZGVQb2ludHMoKSkg ewotICAgICAgICAgICAgaWYgKCFDRkNoYXJhY3RlclNldElzTG9uZ0NoYXJhY3Rlck1lbWJlcihj aGFyYWN0ZXJTZXQuZ2V0KCksIGNoYXJhY3RlcikpIHsKLSAgICAgICAgICAgICAgICBhY2NlcHRh YmxlID0gZmFsc2U7Ci0gICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgICB9Ci0gICAg ICAgIH0KLSAgICAgICAgaWYgKGFjY2VwdGFibGUpCi0gICAgICAgICAgICByZXR1cm4gZm9udDsK LSAgICB9Ci0jZWxpZiBfX01BQ19PU19YX1ZFUlNJT05fTUlOX1JFUVVJUkVEID4gMTAxMTAwCisj aWYgX19NQUNfT1NfWF9WRVJTSU9OX01JTl9SRVFVSVJFRCA+IDEwMTEwMAogICAgIGlmICghbG9j YWxlLmlzTnVsbCgpKQogICAgICAgICBsb2NhbGVTdHJpbmcgPSBsb2NhbGUuc3RyaW5nKCkuY3Jl YXRlQ0ZTdHJpbmcoKTsKICNlbHNlCg==