159788 2016-07-14 14:59:27 -0700 Modernize GlyphMetricsMap 2016-07-14 19:08:39 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 cdumez cdumez achristensen commit-queue darin kling koivisto rniwa oldest_to_newest 1211165 0 cdumez 2016-07-14 14:59:27 -0700 Modernize GlyphMetricsMap a bit. 1211166 1 283689 cdumez 2016-07-14 15:03:58 -0700 Created attachment 283689 Patch 1211302 2 283689 darin 2016-07-14 18:47:29 -0700 Comment on attachment 283689 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=283689&action=review > Source/WebCore/platform/graphics/GlyphMetricsMap.h:126 > + > + auto& page = m_pages->ensure(pageNumber, [] { > + return std::make_unique<GlyphMetricsPage>(unknownMetrics()); > + }).iterator->value; > + return *page; No need for the local variable: return *m_pages->ensure(pageNumber, [] { return std::make_unique<GlyphMetricsPage>(unknownMetrics()); }).iterator->value; 1211309 3 283689 commit-queue 2016-07-14 19:08:34 -0700 Comment on attachment 283689 Patch Clearing flags on attachment: 283689 Committed r203262: <http://trac.webkit.org/changeset/203262> 1211310 4 commit-queue 2016-07-14 19:08:39 -0700 All reviewed patches have been landed. Closing bug. 283689 2016-07-14 15:03:58 -0700 2016-07-14 19:08:34 -0700 Patch bug-159788-20160714150311.patch text/plain 3944 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjAzMjQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjc1ZGVlOTlhNGFjNTNk NDc1MGQ5MGQ2MzQ5Y2I2Mzg3NTFhOWVlNC4uNGRhNjUzN2MwM2U0NTdmMjU1MTAwNzk4MjQyYjcz M2YwNDczOThiZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDE2LTA3LTE0ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgTW9kZXJuaXplIEdseXBoTWV0 cmljc01hcAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTU5Nzg4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg TW9kZXJuaXplIEdseXBoTWV0cmljc01hcCBhIGJpdC4KKworICAgICAgICAqIHBsYXRmb3JtL2dy YXBoaWNzL0dseXBoTWV0cmljc01hcC5oOgorICAgICAgICAtIERyb3AgV1RGX01BS0VfTk9OQ09Q WUFCTEUgYXMgdGhlIGNsYXNzIGlzIGFscmVhZHkgbm9uLWNvcHlhYmxlIGR1ZSB0byBoYXZpbmcK KyAgICAgICAgICB0byBoYXZpbmcgYSBzdGQ6OnVuaXF1ZV9wdHIgZGF0YSBtZW1iZXIuCisgICAg ICAgIC0gRHJvcCBHbHlwaE1ldHJpY3NNYXAgZGVmYXVsdCBjb25zdHJ1Y3RvciBhbmQgbGV0IHRo ZSBjb21waWxlciBnZW5lcmF0ZSBpdAorICAgICAgICAgIGluc3RlYWQuIFRoaXMgcmVxdWlyZWQg dXNpbmcgaW5saW5lIGluaXRpYWxpemF0aW9uIGZvciBtX2ZpbGxlZFByaW1hcnlQYWdlLgorCisg ICAgICAgIChXZWJDb3JlOjpHbHlwaE1ldHJpY3NNYXA6OkdseXBoTWV0cmljc1BhZ2U6OkdseXBo TWV0cmljc1BhZ2UpOgorICAgICAgICAtIE1ha2UgbV9tZXRyaWNzIGRhdGEgbWVtYmVyIHByaXZh dGUgYXMgaXQgZG9lcyBub3QgbmVlZCB0byBiZSBwdWJsaWMuCisgICAgICAgIC0gTWFrZSBzZXRN ZXRyaWNzRm9ySW5kZXgodW5zaWduZWQgaW5kZXgsIGNvbnN0IFQmIG1ldHJpY3MpIHNldHRlciBw cml2YXRlCisgICAgICAgICAgYXMgaXQgZG9lcyBub3QgbmVlZCB0byBiZSBwdWJsaWMuCisgICAg ICAgIC0gTWFrZSBHbHlwaE1ldHJpY3NQYWdlKGNvbnN0IFQmIGluaXRpYWxWYWx1ZSkgY29uc3Ry dWN0b3IgZXhwbGljaXQgYXMgaXQKKyAgICAgICAgICB0YWtlcyBvbmx5IDEgcGFyYW1ldGVyLgor CisgICAgICAgIChXZWJDb3JlOjpHbHlwaE1ldHJpY3NNYXA8VD46OmxvY2F0ZVBhZ2VTbG93Q2Fz ZSk6CisgICAgICAgIC0gVXNlIEhhc2hNYXA6OmVuc3VyZSgpIHRvIG1ha2UgdGhlIGNvZGUgYSBi aXQgbmljZXIuCisKIDIwMTYtMDctMTQgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29t PgogCiAgICAgICAgICJVc2VyIGRlbGV0ZSIgdGVzdHMgYXJlIGZsYWtleSB0aW1lb3V0cyAoYW5k L29yIERhdGFiYXNlUHJvY2VzcyBjcmFzaGVzKS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL0dseXBoTWV0cmljc01hcC5oIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvR2x5cGhNZXRyaWNzTWFwLmgKaW5kZXggZWU2MjJhMGJlZTVhNzc5ZDli ZGZiZTZlMGRjNmU0NjgxZGZhNzYzMC4uNzMwYzFkM2E2MTI0YTkyMGVlY2Q2ZmEyMjI2Y2YyZDc1 MmRhYTFjNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR2x5 cGhNZXRyaWNzTWFwLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR2x5 cGhNZXRyaWNzTWFwLmgKQEAgLTM4LDkgKzM4LDggQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogY29u c3QgZmxvYXQgY0dseXBoU2l6ZVVua25vd24gPSAtMTsKIAogdGVtcGxhdGU8Y2xhc3MgVD4gY2xh c3MgR2x5cGhNZXRyaWNzTWFwIHsKLSAgICBXVEZfTUFLRV9OT05DT1BZQUJMRShHbHlwaE1ldHJp Y3NNYXApOyBXVEZfTUFLRV9GQVNUX0FMTE9DQVRFRDsKKyAgICBXVEZfTUFLRV9GQVNUX0FMTE9D QVRFRDsKIHB1YmxpYzoKLSAgICBHbHlwaE1ldHJpY3NNYXAoKSA6IG1fZmlsbGVkUHJpbWFyeVBh Z2UoZmFsc2UpIHsgfQogICAgIFQgbWV0cmljc0ZvckdseXBoKEdseXBoIGdseXBoKQogICAgIHsK ICAgICAgICAgcmV0dXJuIGxvY2F0ZVBhZ2UoZ2x5cGggLyBHbHlwaE1ldHJpY3NQYWdlOjpzaXpl KS5tZXRyaWNzRm9yR2x5cGgoZ2x5cGgpOwpAQCAtNTYsMTAgKzU1LDkgQEAgcHJpdmF0ZToKICAg ICAgICAgV1RGX01BS0VfRkFTVF9BTExPQ0FURUQ7CiAgICAgcHVibGljOgogICAgICAgICBzdGF0 aWMgY29uc3Qgc2l6ZV90IHNpemUgPSAyNTY7IC8vIFVzdWFsbHkgY292ZXJzIExhdGluLTEgaW4g YSBzaW5nbGUgcGFnZS4KLSAgICAgICAgc3RkOjphcnJheTxULCBzaXplPiBtX21ldHJpY3M7CiAK ICAgICAgICAgR2x5cGhNZXRyaWNzUGFnZSgpID0gZGVmYXVsdDsKLSAgICAgICAgR2x5cGhNZXRy aWNzUGFnZShjb25zdCBUJiBpbml0aWFsVmFsdWUpCisgICAgICAgIGV4cGxpY2l0IEdseXBoTWV0 cmljc1BhZ2UoY29uc3QgVCYgaW5pdGlhbFZhbHVlKQogICAgICAgICB7CiAgICAgICAgICAgICBm aWxsKGluaXRpYWxWYWx1ZSk7CiAgICAgICAgIH0KQEAgLTc0LDEwICs3MiwxNCBAQCBwcml2YXRl OgogICAgICAgICB7CiAgICAgICAgICAgICBzZXRNZXRyaWNzRm9ySW5kZXgoZ2x5cGggJSBzaXpl LCBtZXRyaWNzKTsKICAgICAgICAgfQorCisgICAgcHJpdmF0ZToKICAgICAgICAgdm9pZCBzZXRN ZXRyaWNzRm9ySW5kZXgodW5zaWduZWQgaW5kZXgsIGNvbnN0IFQmIG1ldHJpY3MpCiAgICAgICAg IHsKICAgICAgICAgICAgIG1fbWV0cmljc1tpbmRleF0gPSBtZXRyaWNzOwogICAgICAgICB9CisK KyAgICAgICAgc3RkOjphcnJheTxULCBzaXplPiBtX21ldHJpY3M7CiAgICAgfTsKICAgICAKICAg ICBHbHlwaE1ldHJpY3NQYWdlJiBsb2NhdGVQYWdlKHVuc2lnbmVkIHBhZ2VOdW1iZXIpCkBAIC05 MSw3ICs5Myw3IEBAIHByaXZhdGU6CiAgICAgCiAgICAgc3RhdGljIFQgdW5rbm93bk1ldHJpY3Mo KTsKIAotICAgIGJvb2wgbV9maWxsZWRQcmltYXJ5UGFnZTsKKyAgICBib29sIG1fZmlsbGVkUHJp bWFyeVBhZ2UgeyBmYWxzZSB9OwogICAgIEdseXBoTWV0cmljc1BhZ2UgbV9wcmltYXJ5UGFnZTsg Ly8gV2Ugb3B0aW1pemUgZm9yIHRoZSBwYWdlIHRoYXQgY29udGFpbnMgZ2x5cGggaW5kaWNlcyAw LTI1NS4KICAgICBzdGQ6OnVuaXF1ZV9wdHI8SGFzaE1hcDxpbnQsIHN0ZDo6dW5pcXVlX3B0cjxH bHlwaE1ldHJpY3NQYWdlPj4+IG1fcGFnZXM7CiB9OwpAQCAtMTE3LDEwICsxMTksMTEgQEAgdGVt cGxhdGU8Y2xhc3MgVD4gdHlwZW5hbWUgR2x5cGhNZXRyaWNzTWFwPFQ+OjpHbHlwaE1ldHJpY3NQ YWdlJiBHbHlwaE1ldHJpY3NNYXAKIAogICAgIGlmICghbV9wYWdlcykKICAgICAgICAgbV9wYWdl cyA9IHN0ZDo6bWFrZV91bmlxdWU8SGFzaE1hcDxpbnQsIHN0ZDo6dW5pcXVlX3B0cjxHbHlwaE1l dHJpY3NQYWdlPj4+KCk7Ci0gICAgYXV0byYgcGFnZUluTWFwID0gbV9wYWdlcy0+YWRkKHBhZ2VO dW1iZXIsIG51bGxwdHIpLml0ZXJhdG9yLT52YWx1ZTsKLSAgICBpZiAoIXBhZ2VJbk1hcCkKLSAg ICAgICAgcGFnZUluTWFwID0gc3RkOjptYWtlX3VuaXF1ZTxHbHlwaE1ldHJpY3NQYWdlPih1bmtu b3duTWV0cmljcygpKTsKLSAgICByZXR1cm4gKnBhZ2VJbk1hcDsKKworICAgIGF1dG8mIHBhZ2Ug PSBtX3BhZ2VzLT5lbnN1cmUocGFnZU51bWJlciwgW10geworICAgICAgICByZXR1cm4gc3RkOjpt YWtlX3VuaXF1ZTxHbHlwaE1ldHJpY3NQYWdlPih1bmtub3duTWV0cmljcygpKTsKKyAgICB9KS5p dGVyYXRvci0+dmFsdWU7CisgICAgcmV0dXJuICpwYWdlOwogfQogICAgIAogfSAvLyBuYW1lc3Bh Y2UgV2ViQ29yZQo=