182824 2018-02-15 00:22:20 -0800 Clean up HarfBuzzFaceCairo 2018-02-15 02:13:19 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zan zan bugs-noreply cgarcia webkit-bug-importer oldest_to_newest 1399405 0 zan 2018-02-15 00:22:20 -0800 Clean up HarfBuzzFaceCairo 1399406 1 333884 zan 2018-02-15 00:34:49 -0800 Created attachment 333884 Patch 1399412 2 333884 cgarcia 2018-02-15 01:48:31 -0800 Comment on attachment 333884 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=333884&action=review > Source/WebCore/platform/graphics/harfbuzz/HarfBuzzFaceCairo.cpp:91 > + cairo_scaled_font_t* scaledFont = hbFontData.cairoScaledFont.get(); auto* > Source/WebCore/platform/graphics/harfbuzz/HarfBuzzFaceCairo.cpp:94 > + WTF::HashMap<uint32_t, uint16_t>::AddResult result = hbFontData.glyphCacheForFaceCacheEntry->add(unicode, 0); 0 -> nullptr > Source/WebCore/platform/graphics/harfbuzz/HarfBuzzFaceCairo.cpp:117 > + cairo_scaled_font_t* scaledFont = hbFontData.cairoScaledFont.get(); auto* > Source/WebCore/platform/graphics/harfbuzz/HarfBuzzFaceCairo.cpp:135 > + cairo_scaled_font_t* scaledFont = hbFontData.cairoScaledFont.get(); auto* 1399414 3 333884 zan 2018-02-15 02:05:05 -0800 Comment on attachment 333884 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=333884&action=review >> Source/WebCore/platform/graphics/harfbuzz/HarfBuzzFaceCairo.cpp:94 >> + WTF::HashMap<uint32_t, uint16_t>::AddResult result = hbFontData.glyphCacheForFaceCacheEntry->add(unicode, 0); > > 0 -> nullptr This is an integer, uint16_t. 1399415 4 333888 zan 2018-02-15 02:05:33 -0800 Created attachment 333888 Patch for landing 1399421 5 333888 zan 2018-02-15 02:12:41 -0800 Comment on attachment 333888 Patch for landing Clearing flags on attachment: 333888 Committed r228509: <https://trac.webkit.org/changeset/228509> 1399422 6 zan 2018-02-15 02:12:45 -0800 All reviewed patches have been landed. Closing bug. 1399423 7 webkit-bug-importer 2018-02-15 02:13:19 -0800 <rdar://problem/37564056> 333884 2018-02-15 00:34:49 -0800 2018-02-15 02:05:30 -0800 Patch bug-182824-20180215093448.patch text/plain 7217 zan U3VidmVyc2lvbiBSZXZpc2lvbjogMjI4NTAzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzQ5YzM4MmIyZjAwMTJj MjQxZjQwNDM2NTIzMzY5NDM5NjYxNmJhMC4uY2UzZDQ0M2FkYWYyMDQ1YjBmNzA4ZjYwMjk4ODBi OWNiM2ZkNGFkNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQwIEBACisyMDE4LTAyLTE1ICBaYW4g RG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KKworICAgICAgICBDbGVhbiB1cCBIYXJm QnV6ekZhY2VDYWlybworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTgyODI0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgQ2xlYW4gdXAgQ2Fpcm8tc3BlY2lmaWMgYml0cyBvZiBIYXJmQnV6ekZhY2UgaW1wbGVt ZW50YXRpb24uCisKKyAgICAgICAgSGFyZkJ1enpGb250RGF0YSBpcyBzaW1wbGlmaWVkLCByZW1v dmluZyB0aGUgY29uc3RydWN0b3IgYW5kIHR1cm5pbmcgdGhlCisgICAgICAgIGNhaXJvX3NjYWxl ZF9mb250X3QgbWVtYmVyIGludG8gYSBSZWZQdHI8PiwgdHlpbmcgdGhlIENhaXJvIG9iamVjdCdz CisgICAgICAgIGxpZmV0aW1lIHRvIHRoZSBsaWZldGltZSBvZiB0aGUgSGFyZkJ1enpGb250RGF0 YSBpbnN0YW5jZS4KKworICAgICAgICBIYXJmQnV6eiBmb250IGNhbGxiYWNrcyBoYXZlIHRoZSBI YXJmQnV6ekZvbnREYXRhIGNhc3RpbmcgY2xlYW5lZCB1cCwKKyAgICAgICAgY2FzdGluZyB0aGUg dXNlciBkYXRhIHBvaW50ZXIgc3RyYWlnaHQgaW50byBhIEhhcmZCdXp6Rm9udERhdGEgcmVmZXJl bmNlCisgICAgICAgIHRoYXQncyB0aGVuIHVzZWQgaW4gdGhlIGZ1bmN0aW9ucy4gSGFyZkJ1enpG b250RGF0YSBtZW1iZXIgYWNjZXNzIGlzCisgICAgICAgIGFsc28gYWRqdXN0ZWQuCisKKyAgICAg ICAgSGFyZkJ1enpGYWNlOjpjcmVhdGVGYWNlKCkgbm93IHJlZmVyZW5jZXMgdGhlIGNhaXJvX3Nj YWxlZF9mb250X3Qgb2JqZWN0CisgICAgICAgIHRoYXQgaXMgdGhlbiBzZXQgYXMgdGhlIHVzZXIg ZGF0YSBwb2ludGVyLCB3aXRoIHRoZSBkZXN0cm95IGNhbGxiYWNrCisgICAgICAgIHRoYXQgZGVy ZWZlcmVuY2VzIHRoYXQgb2JqZWN0IGFsc28gc3BlY2lmaWVkLiBXaXRoIGhiX2ZhY2VfdCBiZWlu ZyBhCisgICAgICAgIHJlZmVyZW5jZS1jb3VudGVkIG9iamVjdCBpdHNlbGYsIHRoaXMgZW5zdXJl cyB0aGUgY2Fpcm9fc2NhbGVkX2ZvbnRfdAorICAgICAgICBvYmplY3QgZG9lc24ndCBnZXQgZGVz dHJveWVkIHdoaWxlIGhiX2ZhY2VfdCBpcyBzdGlsbCBhbGl2ZS4KKworICAgICAgICBJbiBIYXJm QnV6ekZhY2U6OmNyZWF0ZUZvbnQoKSwgdGhlIGhiX2ZvbnRfdCBjcmVhdGlvbiBpcyBjbGVhbmVk IHVwLAorICAgICAgICB3aXRoIGEgQysrIGxhbWJkYSB1c2VkIGFzIHRoZSBkZXN0cm95IGNhbGxi YWNrLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvaGFyZmJ1enovSGFyZkJ1enpGYWNl Q2Fpcm8uY3BwOgorICAgICAgICAoV2ViQ29yZTo6aGFyZkJ1enpHZXRHbHlwaCk6CisgICAgICAg IChXZWJDb3JlOjpoYXJmQnV6ekdldEdseXBoSG9yaXpvbnRhbEFkdmFuY2UpOgorICAgICAgICAo V2ViQ29yZTo6aGFyZkJ1enpHZXRHbHlwaEV4dGVudHMpOgorICAgICAgICAoV2ViQ29yZTo6aGFy ZkJ1enpDYWlyb0dldFRhYmxlKToKKyAgICAgICAgKFdlYkNvcmU6OkhhcmZCdXp6RmFjZTo6Y3Jl YXRlRmFjZSk6CisgICAgICAgIChXZWJDb3JlOjpIYXJmQnV6ekZhY2U6OmNyZWF0ZUZvbnQpOgor ICAgICAgICAoV2ViQ29yZTo6SGFyZkJ1enpGb250RGF0YTo6SGFyZkJ1enpGb250RGF0YSk6IERl bGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpkZXN0cm95SGFyZkJ1enpGb250RGF0YSk6IERlbGV0 ZWQuCisKIDIwMTgtMDItMTQgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAg ICAgICBbUmVuZGVyVHJlZUJ1aWxkZXJdIE1vdmUgUmVuZGVyTWF0aE1MRmVuY2VkOjphZGRDaGls ZCgpIHRvIFJlbmRlclRyZWVCdWlsZGVyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9oYXJmYnV6ei9IYXJmQnV6ekZhY2VDYWlyby5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9oYXJmYnV6ei9IYXJmQnV6ekZhY2VDYWlyby5jcHAKaW5k ZXggY2QyNTRlZjJiMzdjY2M0MzhhNWMwMDQwNjk3OTVjMzQzM2E2Zjg0OC4uNGVjMzRlOWE2YWZk MmM2MmJhY2I2MmRkM2UwOWEwYTdjN2E5MDIyZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvaGFyZmJ1enovSGFyZkJ1enpGYWNlQ2Fpcm8uY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2hhcmZidXp6L0hhcmZCdXp6RmFjZUNhaXJv LmNwcApAQCAtNTAsMTIgKzUwLDggQEAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogc3RydWN0IEhh cmZCdXp6Rm9udERhdGEgewotICAgIEhhcmZCdXp6Rm9udERhdGEoV1RGOjpIYXNoTWFwPHVpbnQz Ml90LCB1aW50MTZfdD4qIGdseXBoQ2FjaGVGb3JGYWNlQ2FjaGVFbnRyeSwgY2Fpcm9fc2NhbGVk X2ZvbnRfdCogY2Fpcm9TY2FsZWRGb250KQotICAgICAgICA6IG1fZ2x5cGhDYWNoZUZvckZhY2VD YWNoZUVudHJ5KGdseXBoQ2FjaGVGb3JGYWNlQ2FjaGVFbnRyeSkKLSAgICAgICAgLCBtX2NhaXJv U2NhbGVkRm9udChjYWlyb1NjYWxlZEZvbnQpCi0gICAgeyB9Ci0gICAgV1RGOjpIYXNoTWFwPHVp bnQzMl90LCB1aW50MTZfdD4qIG1fZ2x5cGhDYWNoZUZvckZhY2VDYWNoZUVudHJ5OwotICAgIGNh aXJvX3NjYWxlZF9mb250X3QqIG1fY2Fpcm9TY2FsZWRGb250OworICAgIFdURjo6SGFzaE1hcDx1 aW50MzJfdCwgdWludDE2X3Q+KiBnbHlwaENhY2hlRm9yRmFjZUNhY2hlRW50cnk7CisgICAgUmVm UHRyPGNhaXJvX3NjYWxlZF9mb250X3Q+IGNhaXJvU2NhbGVkRm9udDsKIH07CiAKIHN0YXRpYyBo Yl9wb3NpdGlvbl90IGZsb2F0VG9IYXJmQnV6elBvc2l0aW9uKGZsb2F0IHZhbHVlKQpAQCAtOTEs MTEgKzg3LDExIEBAIHN0YXRpYyB2b2lkIENhaXJvR2V0R2x5cGhXaWR0aEFuZEV4dGVudHMoY2Fp cm9fc2NhbGVkX2ZvbnRfdCogc2NhbGVkRm9udCwgaGJfY29kCiAKIHN0YXRpYyBoYl9ib29sX3Qg aGFyZkJ1enpHZXRHbHlwaChoYl9mb250X3QqLCB2b2lkKiBmb250RGF0YSwgaGJfY29kZXBvaW50 X3QgdW5pY29kZSwgaGJfY29kZXBvaW50X3QsIGhiX2NvZGVwb2ludF90KiBnbHlwaCwgdm9pZCop CiB7Ci0gICAgSGFyZkJ1enpGb250RGF0YSogaGJGb250RGF0YSA9IHJlaW50ZXJwcmV0X2Nhc3Q8 SGFyZkJ1enpGb250RGF0YSo+KGZvbnREYXRhKTsKLSAgICBjYWlyb19zY2FsZWRfZm9udF90KiBz Y2FsZWRGb250ID0gaGJGb250RGF0YS0+bV9jYWlyb1NjYWxlZEZvbnQ7CisgICAgYXV0byYgaGJG b250RGF0YSA9ICpzdGF0aWNfY2FzdDxIYXJmQnV6ekZvbnREYXRhKj4oZm9udERhdGEpOworICAg IGNhaXJvX3NjYWxlZF9mb250X3QqIHNjYWxlZEZvbnQgPSBoYkZvbnREYXRhLmNhaXJvU2NhbGVk Rm9udC5nZXQoKTsKICAgICBBU1NFUlQoc2NhbGVkRm9udCk7CiAKLSAgICBXVEY6Okhhc2hNYXA8 dWludDMyX3QsIHVpbnQxNl90Pjo6QWRkUmVzdWx0IHJlc3VsdCA9IGhiRm9udERhdGEtPm1fZ2x5 cGhDYWNoZUZvckZhY2VDYWNoZUVudHJ5LT5hZGQodW5pY29kZSwgMCk7CisgICAgV1RGOjpIYXNo TWFwPHVpbnQzMl90LCB1aW50MTZfdD46OkFkZFJlc3VsdCByZXN1bHQgPSBoYkZvbnREYXRhLmds eXBoQ2FjaGVGb3JGYWNlQ2FjaGVFbnRyeS0+YWRkKHVuaWNvZGUsIDApOwogICAgIGlmIChyZXN1 bHQuaXNOZXdFbnRyeSkgewogICAgICAgICBjYWlyb19nbHlwaF90KiBnbHlwaHMgPSAwOwogICAg ICAgICBpbnQgbnVtR2x5cGhzID0gMDsKQEAgLTExNyw4ICsxMTMsOCBAQCBzdGF0aWMgaGJfYm9v bF90IGhhcmZCdXp6R2V0R2x5cGgoaGJfZm9udF90Kiwgdm9pZCogZm9udERhdGEsIGhiX2NvZGVw b2ludF90IHVuaQogCiBzdGF0aWMgaGJfcG9zaXRpb25fdCBoYXJmQnV6ekdldEdseXBoSG9yaXpv bnRhbEFkdmFuY2UoaGJfZm9udF90Kiwgdm9pZCogZm9udERhdGEsIGhiX2NvZGVwb2ludF90IGds eXBoLCB2b2lkKikKIHsKLSAgICBIYXJmQnV6ekZvbnREYXRhKiBoYkZvbnREYXRhID0gcmVpbnRl cnByZXRfY2FzdDxIYXJmQnV6ekZvbnREYXRhKj4oZm9udERhdGEpOwotICAgIGNhaXJvX3NjYWxl ZF9mb250X3QqIHNjYWxlZEZvbnQgPSBoYkZvbnREYXRhLT5tX2NhaXJvU2NhbGVkRm9udDsKKyAg ICBhdXRvJiBoYkZvbnREYXRhID0gKnN0YXRpY19jYXN0PEhhcmZCdXp6Rm9udERhdGEqPihmb250 RGF0YSk7CisgICAgY2Fpcm9fc2NhbGVkX2ZvbnRfdCogc2NhbGVkRm9udCA9IGhiRm9udERhdGEu Y2Fpcm9TY2FsZWRGb250LmdldCgpOwogICAgIEFTU0VSVChzY2FsZWRGb250KTsKIAogICAgIGhi X3Bvc2l0aW9uX3QgYWR2YW5jZSA9IDA7CkBAIC0xMzUsOCArMTMxLDggQEAgc3RhdGljIGhiX2Jv b2xfdCBoYXJmQnV6ekdldEdseXBoSG9yaXpvbnRhbE9yaWdpbihoYl9mb250X3QqLCB2b2lkKiwg aGJfY29kZXBvaW4KIAogc3RhdGljIGhiX2Jvb2xfdCBoYXJmQnV6ekdldEdseXBoRXh0ZW50cyho Yl9mb250X3QqLCB2b2lkKiBmb250RGF0YSwgaGJfY29kZXBvaW50X3QgZ2x5cGgsIGhiX2dseXBo X2V4dGVudHNfdCogZXh0ZW50cywgdm9pZCopCiB7Ci0gICAgSGFyZkJ1enpGb250RGF0YSogaGJG b250RGF0YSA9IHJlaW50ZXJwcmV0X2Nhc3Q8SGFyZkJ1enpGb250RGF0YSo+KGZvbnREYXRhKTsK LSAgICBjYWlyb19zY2FsZWRfZm9udF90KiBzY2FsZWRGb250ID0gaGJGb250RGF0YS0+bV9jYWly b1NjYWxlZEZvbnQ7CisgICAgYXV0byYgaGJGb250RGF0YSA9ICpzdGF0aWNfY2FzdDxIYXJmQnV6 ekZvbnREYXRhKj4oZm9udERhdGEpOworICAgIGNhaXJvX3NjYWxlZF9mb250X3QqIHNjYWxlZEZv bnQgPSBoYkZvbnREYXRhLmNhaXJvU2NhbGVkRm9udC5nZXQoKTsKICAgICBBU1NFUlQoc2NhbGVk Rm9udCk7CiAKICAgICBDYWlyb0dldEdseXBoV2lkdGhBbmRFeHRlbnRzKHNjYWxlZEZvbnQsIGds eXBoLCAwLCBleHRlbnRzKTsKQEAgLTE2Miw3ICsxNTgsNyBAQCBzdGF0aWMgaGJfZm9udF9mdW5j c190KiBoYXJmQnV6ekNhaXJvVGV4dEdldEZvbnRGdW5jcygpCiAKIHN0YXRpYyBoYl9ibG9iX3Qq IGhhcmZCdXp6Q2Fpcm9HZXRUYWJsZShoYl9mYWNlX3QqLCBoYl90YWdfdCB0YWcsIHZvaWQqIHVz ZXJEYXRhKQogewotICAgIGNhaXJvX3NjYWxlZF9mb250X3QqIHNjYWxlZEZvbnQgPSByZWludGVy cHJldF9jYXN0PGNhaXJvX3NjYWxlZF9mb250X3QqPih1c2VyRGF0YSk7CisgICAgYXV0byogc2Nh bGVkRm9udCA9IHN0YXRpY19jYXN0PGNhaXJvX3NjYWxlZF9mb250X3QqPih1c2VyRGF0YSk7CiAg ICAgaWYgKCFzY2FsZWRGb250KQogICAgICAgICByZXR1cm4gMDsKIApAQCAtMTg5LDE1ICsxODUs MTYgQEAgc3RhdGljIGhiX2Jsb2JfdCogaGFyZkJ1enpDYWlyb0dldFRhYmxlKGhiX2ZhY2VfdCos IGhiX3RhZ190IHRhZywgdm9pZCogdXNlckRhdGEKICAgICByZXR1cm4gaGJfYmxvYl9jcmVhdGUo cmVpbnRlcnByZXRfY2FzdDxjb25zdCBjaGFyKj4oYnVmZmVyKSwgdGFibGVTaXplLCBIQl9NRU1P UllfTU9ERV9XUklUQUJMRSwgYnVmZmVyLCBmYXN0RnJlZSk7CiB9CiAKLXN0YXRpYyB2b2lkIGRl c3Ryb3lIYXJmQnV6ekZvbnREYXRhKHZvaWQqIHVzZXJEYXRhKQotewotICAgIEhhcmZCdXp6Rm9u dERhdGEqIGhiRm9udERhdGEgPSByZWludGVycHJldF9jYXN0PEhhcmZCdXp6Rm9udERhdGEqPih1 c2VyRGF0YSk7Ci0gICAgZGVsZXRlIGhiRm9udERhdGE7Ci19Ci0KIGhiX2ZhY2VfdCogSGFyZkJ1 enpGYWNlOjpjcmVhdGVGYWNlKCkKIHsKLSAgICBoYl9mYWNlX3QqIGZhY2UgPSBoYl9mYWNlX2Ny ZWF0ZV9mb3JfdGFibGVzKGhhcmZCdXp6Q2Fpcm9HZXRUYWJsZSwgbV9wbGF0Zm9ybURhdGEtPnNj YWxlZEZvbnQoKSwgMCk7CisgICAgYXV0byogc2NhbGVkRm9udCA9IG1fcGxhdGZvcm1EYXRhLT5z Y2FsZWRGb250KCk7CisgICAgY2Fpcm9fc2NhbGVkX2ZvbnRfcmVmZXJlbmNlKHNjYWxlZEZvbnQp OworCisgICAgaGJfZmFjZV90KiBmYWNlID0gaGJfZmFjZV9jcmVhdGVfZm9yX3RhYmxlcyhoYXJm QnV6ekNhaXJvR2V0VGFibGUsIHNjYWxlZEZvbnQsCisgICAgICAgIFtdKHZvaWQqIGRhdGEpCisg ICAgICAgIHsKKyAgICAgICAgICAgIGNhaXJvX3NjYWxlZF9mb250X2Rlc3Ryb3koc3RhdGljX2Nh c3Q8Y2Fpcm9fc2NhbGVkX2ZvbnRfdCo+KGRhdGEpKTsKKyAgICAgICAgfSk7CiAgICAgQVNTRVJU KGZhY2UpOwogICAgIHJldHVybiBmYWNlOwogfQpAQCAtMjA1LDggKzIwMiwxMiBAQCBoYl9mYWNl X3QqIEhhcmZCdXp6RmFjZTo6Y3JlYXRlRmFjZSgpCiBoYl9mb250X3QqIEhhcmZCdXp6RmFjZTo6 Y3JlYXRlRm9udCgpCiB7CiAgICAgaGJfZm9udF90KiBmb250ID0gaGJfZm9udF9jcmVhdGUobV9m YWNlKTsKLSAgICBIYXJmQnV6ekZvbnREYXRhKiBoYkZvbnREYXRhID0gbmV3IEhhcmZCdXp6Rm9u dERhdGEobV9nbHlwaENhY2hlRm9yRmFjZUNhY2hlRW50cnksIG1fcGxhdGZvcm1EYXRhLT5zY2Fs ZWRGb250KCkpOwotICAgIGhiX2ZvbnRfc2V0X2Z1bmNzKGZvbnQsIGhhcmZCdXp6Q2Fpcm9UZXh0 R2V0Rm9udEZ1bmNzKCksIGhiRm9udERhdGEsIGRlc3Ryb3lIYXJmQnV6ekZvbnREYXRhKTsKKyAg ICBoYl9mb250X3NldF9mdW5jcyhmb250LCBoYXJmQnV6ekNhaXJvVGV4dEdldEZvbnRGdW5jcygp LCBuZXcgSGFyZkJ1enpGb250RGF0YSB7IG1fZ2x5cGhDYWNoZUZvckZhY2VDYWNoZUVudHJ5LCBt X3BsYXRmb3JtRGF0YS0+c2NhbGVkRm9udCgpIH0sCisgICAgICAgIFtdKHZvaWQqIGRhdGEpCisg ICAgICAgIHsKKyAgICAgICAgICAgIGRlbGV0ZSBzdGF0aWNfY2FzdDxIYXJmQnV6ekZvbnREYXRh Kj4oZGF0YSk7CisgICAgICAgIH0pOworCiAgICAgY29uc3QgZmxvYXQgc2l6ZSA9IG1fcGxhdGZv cm1EYXRhLT5zaXplKCk7CiAgICAgaWYgKGZsb29yZihzaXplKSA9PSBzaXplKQogICAgICAgICBo Yl9mb250X3NldF9wcGVtKGZvbnQsIHNpemUsIHNpemUpOwo= 333888 2018-02-15 02:05:33 -0800 2018-02-15 02:05:33 -0800 Patch for landing bug-182824-20180215110532.patch text/plain 7178 zan U3VidmVyc2lvbiBSZXZpc2lvbjogMjI4NTAzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzQ5YzM4MmIyZjAwMTJj MjQxZjQwNDM2NTIzMzY5NDM5NjYxNmJhMC4uNDhiYmQwNzE2YzEyYzc4OGVlMTYwNGM0MTUwYTQx NDNmNjIzZDBiYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQwIEBACisyMDE4LTAyLTE1ICBaYW4g RG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KKworICAgICAgICBDbGVhbiB1cCBIYXJm QnV6ekZhY2VDYWlybworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTgyODI0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQ2FybG9zIEdhcmNpYSBDYW1wb3Mu CisKKyAgICAgICAgQ2xlYW4gdXAgQ2Fpcm8tc3BlY2lmaWMgYml0cyBvZiBIYXJmQnV6ekZhY2Ug aW1wbGVtZW50YXRpb24uCisKKyAgICAgICAgSGFyZkJ1enpGb250RGF0YSBpcyBzaW1wbGlmaWVk LCByZW1vdmluZyB0aGUgY29uc3RydWN0b3IgYW5kIHR1cm5pbmcgdGhlCisgICAgICAgIGNhaXJv X3NjYWxlZF9mb250X3QgbWVtYmVyIGludG8gYSBSZWZQdHI8PiwgdHlpbmcgdGhlIENhaXJvIG9i amVjdCdzCisgICAgICAgIGxpZmV0aW1lIHRvIHRoZSBsaWZldGltZSBvZiB0aGUgSGFyZkJ1enpG b250RGF0YSBpbnN0YW5jZS4KKworICAgICAgICBIYXJmQnV6eiBmb250IGNhbGxiYWNrcyBoYXZl IHRoZSBIYXJmQnV6ekZvbnREYXRhIGNhc3RpbmcgY2xlYW5lZCB1cCwKKyAgICAgICAgY2FzdGlu ZyB0aGUgdXNlciBkYXRhIHBvaW50ZXIgc3RyYWlnaHQgaW50byBhIEhhcmZCdXp6Rm9udERhdGEg cmVmZXJlbmNlCisgICAgICAgIHRoYXQncyB0aGVuIHVzZWQgaW4gdGhlIGZ1bmN0aW9ucy4gSGFy ZkJ1enpGb250RGF0YSBtZW1iZXIgYWNjZXNzIGlzCisgICAgICAgIGFsc28gYWRqdXN0ZWQuCisK KyAgICAgICAgSGFyZkJ1enpGYWNlOjpjcmVhdGVGYWNlKCkgbm93IHJlZmVyZW5jZXMgdGhlIGNh aXJvX3NjYWxlZF9mb250X3Qgb2JqZWN0CisgICAgICAgIHRoYXQgaXMgdGhlbiBzZXQgYXMgdGhl IHVzZXIgZGF0YSBwb2ludGVyLCB3aXRoIHRoZSBkZXN0cm95IGNhbGxiYWNrCisgICAgICAgIHRo YXQgZGVyZWZlcmVuY2VzIHRoYXQgb2JqZWN0IGFsc28gc3BlY2lmaWVkLiBXaXRoIGhiX2ZhY2Vf dCBiZWluZyBhCisgICAgICAgIHJlZmVyZW5jZS1jb3VudGVkIG9iamVjdCBpdHNlbGYsIHRoaXMg ZW5zdXJlcyB0aGUgY2Fpcm9fc2NhbGVkX2ZvbnRfdAorICAgICAgICBvYmplY3QgZG9lc24ndCBn ZXQgZGVzdHJveWVkIHdoaWxlIGhiX2ZhY2VfdCBpcyBzdGlsbCBhbGl2ZS4KKworICAgICAgICBJ biBIYXJmQnV6ekZhY2U6OmNyZWF0ZUZvbnQoKSwgdGhlIGhiX2ZvbnRfdCBjcmVhdGlvbiBpcyBj bGVhbmVkIHVwLAorICAgICAgICB3aXRoIGEgQysrIGxhbWJkYSB1c2VkIGFzIHRoZSBkZXN0cm95 IGNhbGxiYWNrLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvaGFyZmJ1enovSGFyZkJ1 enpGYWNlQ2Fpcm8uY3BwOgorICAgICAgICAoV2ViQ29yZTo6aGFyZkJ1enpHZXRHbHlwaCk6Cisg ICAgICAgIChXZWJDb3JlOjpoYXJmQnV6ekdldEdseXBoSG9yaXpvbnRhbEFkdmFuY2UpOgorICAg ICAgICAoV2ViQ29yZTo6aGFyZkJ1enpHZXRHbHlwaEV4dGVudHMpOgorICAgICAgICAoV2ViQ29y ZTo6aGFyZkJ1enpDYWlyb0dldFRhYmxlKToKKyAgICAgICAgKFdlYkNvcmU6OkhhcmZCdXp6RmFj ZTo6Y3JlYXRlRmFjZSk6CisgICAgICAgIChXZWJDb3JlOjpIYXJmQnV6ekZhY2U6OmNyZWF0ZUZv bnQpOgorICAgICAgICAoV2ViQ29yZTo6SGFyZkJ1enpGb250RGF0YTo6SGFyZkJ1enpGb250RGF0 YSk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpkZXN0cm95SGFyZkJ1enpGb250RGF0YSk6 IERlbGV0ZWQuCisKIDIwMTgtMDItMTQgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4K IAogICAgICAgICBbUmVuZGVyVHJlZUJ1aWxkZXJdIE1vdmUgUmVuZGVyTWF0aE1MRmVuY2VkOjph ZGRDaGlsZCgpIHRvIFJlbmRlclRyZWVCdWlsZGVyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9oYXJmYnV6ei9IYXJmQnV6ekZhY2VDYWlyby5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9oYXJmYnV6ei9IYXJmQnV6ekZhY2VDYWlyby5j cHAKaW5kZXggY2QyNTRlZjJiMzdjY2M0MzhhNWMwMDQwNjk3OTVjMzQzM2E2Zjg0OC4uMWUxZGU0 YTczZTQ1OThmYjg0NzdhM2M0M2U3NTI3NmM0MWJkMzc2MiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvaGFyZmJ1enovSGFyZkJ1enpGYWNlQ2Fpcm8uY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2hhcmZidXp6L0hhcmZCdXp6RmFj ZUNhaXJvLmNwcApAQCAtNTAsMTIgKzUwLDggQEAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogc3Ry dWN0IEhhcmZCdXp6Rm9udERhdGEgewotICAgIEhhcmZCdXp6Rm9udERhdGEoV1RGOjpIYXNoTWFw PHVpbnQzMl90LCB1aW50MTZfdD4qIGdseXBoQ2FjaGVGb3JGYWNlQ2FjaGVFbnRyeSwgY2Fpcm9f c2NhbGVkX2ZvbnRfdCogY2Fpcm9TY2FsZWRGb250KQotICAgICAgICA6IG1fZ2x5cGhDYWNoZUZv ckZhY2VDYWNoZUVudHJ5KGdseXBoQ2FjaGVGb3JGYWNlQ2FjaGVFbnRyeSkKLSAgICAgICAgLCBt X2NhaXJvU2NhbGVkRm9udChjYWlyb1NjYWxlZEZvbnQpCi0gICAgeyB9Ci0gICAgV1RGOjpIYXNo TWFwPHVpbnQzMl90LCB1aW50MTZfdD4qIG1fZ2x5cGhDYWNoZUZvckZhY2VDYWNoZUVudHJ5Owot ICAgIGNhaXJvX3NjYWxlZF9mb250X3QqIG1fY2Fpcm9TY2FsZWRGb250OworICAgIFdURjo6SGFz aE1hcDx1aW50MzJfdCwgdWludDE2X3Q+KiBnbHlwaENhY2hlRm9yRmFjZUNhY2hlRW50cnk7Cisg ICAgUmVmUHRyPGNhaXJvX3NjYWxlZF9mb250X3Q+IGNhaXJvU2NhbGVkRm9udDsKIH07CiAKIHN0 YXRpYyBoYl9wb3NpdGlvbl90IGZsb2F0VG9IYXJmQnV6elBvc2l0aW9uKGZsb2F0IHZhbHVlKQpA QCAtOTEsMTEgKzg3LDExIEBAIHN0YXRpYyB2b2lkIENhaXJvR2V0R2x5cGhXaWR0aEFuZEV4dGVu dHMoY2Fpcm9fc2NhbGVkX2ZvbnRfdCogc2NhbGVkRm9udCwgaGJfY29kCiAKIHN0YXRpYyBoYl9i b29sX3QgaGFyZkJ1enpHZXRHbHlwaChoYl9mb250X3QqLCB2b2lkKiBmb250RGF0YSwgaGJfY29k ZXBvaW50X3QgdW5pY29kZSwgaGJfY29kZXBvaW50X3QsIGhiX2NvZGVwb2ludF90KiBnbHlwaCwg dm9pZCopCiB7Ci0gICAgSGFyZkJ1enpGb250RGF0YSogaGJGb250RGF0YSA9IHJlaW50ZXJwcmV0 X2Nhc3Q8SGFyZkJ1enpGb250RGF0YSo+KGZvbnREYXRhKTsKLSAgICBjYWlyb19zY2FsZWRfZm9u dF90KiBzY2FsZWRGb250ID0gaGJGb250RGF0YS0+bV9jYWlyb1NjYWxlZEZvbnQ7CisgICAgYXV0 byYgaGJGb250RGF0YSA9ICpzdGF0aWNfY2FzdDxIYXJmQnV6ekZvbnREYXRhKj4oZm9udERhdGEp OworICAgIGF1dG8qIHNjYWxlZEZvbnQgPSBoYkZvbnREYXRhLmNhaXJvU2NhbGVkRm9udC5nZXQo KTsKICAgICBBU1NFUlQoc2NhbGVkRm9udCk7CiAKLSAgICBXVEY6Okhhc2hNYXA8dWludDMyX3Qs IHVpbnQxNl90Pjo6QWRkUmVzdWx0IHJlc3VsdCA9IGhiRm9udERhdGEtPm1fZ2x5cGhDYWNoZUZv ckZhY2VDYWNoZUVudHJ5LT5hZGQodW5pY29kZSwgMCk7CisgICAgV1RGOjpIYXNoTWFwPHVpbnQz Ml90LCB1aW50MTZfdD46OkFkZFJlc3VsdCByZXN1bHQgPSBoYkZvbnREYXRhLmdseXBoQ2FjaGVG b3JGYWNlQ2FjaGVFbnRyeS0+YWRkKHVuaWNvZGUsIDApOwogICAgIGlmIChyZXN1bHQuaXNOZXdF bnRyeSkgewogICAgICAgICBjYWlyb19nbHlwaF90KiBnbHlwaHMgPSAwOwogICAgICAgICBpbnQg bnVtR2x5cGhzID0gMDsKQEAgLTExNyw4ICsxMTMsOCBAQCBzdGF0aWMgaGJfYm9vbF90IGhhcmZC dXp6R2V0R2x5cGgoaGJfZm9udF90Kiwgdm9pZCogZm9udERhdGEsIGhiX2NvZGVwb2ludF90IHVu aQogCiBzdGF0aWMgaGJfcG9zaXRpb25fdCBoYXJmQnV6ekdldEdseXBoSG9yaXpvbnRhbEFkdmFu Y2UoaGJfZm9udF90Kiwgdm9pZCogZm9udERhdGEsIGhiX2NvZGVwb2ludF90IGdseXBoLCB2b2lk KikKIHsKLSAgICBIYXJmQnV6ekZvbnREYXRhKiBoYkZvbnREYXRhID0gcmVpbnRlcnByZXRfY2Fz dDxIYXJmQnV6ekZvbnREYXRhKj4oZm9udERhdGEpOwotICAgIGNhaXJvX3NjYWxlZF9mb250X3Qq IHNjYWxlZEZvbnQgPSBoYkZvbnREYXRhLT5tX2NhaXJvU2NhbGVkRm9udDsKKyAgICBhdXRvJiBo YkZvbnREYXRhID0gKnN0YXRpY19jYXN0PEhhcmZCdXp6Rm9udERhdGEqPihmb250RGF0YSk7Cisg ICAgYXV0byogc2NhbGVkRm9udCA9IGhiRm9udERhdGEuY2Fpcm9TY2FsZWRGb250LmdldCgpOwog ICAgIEFTU0VSVChzY2FsZWRGb250KTsKIAogICAgIGhiX3Bvc2l0aW9uX3QgYWR2YW5jZSA9IDA7 CkBAIC0xMzUsOCArMTMxLDggQEAgc3RhdGljIGhiX2Jvb2xfdCBoYXJmQnV6ekdldEdseXBoSG9y aXpvbnRhbE9yaWdpbihoYl9mb250X3QqLCB2b2lkKiwgaGJfY29kZXBvaW4KIAogc3RhdGljIGhi X2Jvb2xfdCBoYXJmQnV6ekdldEdseXBoRXh0ZW50cyhoYl9mb250X3QqLCB2b2lkKiBmb250RGF0 YSwgaGJfY29kZXBvaW50X3QgZ2x5cGgsIGhiX2dseXBoX2V4dGVudHNfdCogZXh0ZW50cywgdm9p ZCopCiB7Ci0gICAgSGFyZkJ1enpGb250RGF0YSogaGJGb250RGF0YSA9IHJlaW50ZXJwcmV0X2Nh c3Q8SGFyZkJ1enpGb250RGF0YSo+KGZvbnREYXRhKTsKLSAgICBjYWlyb19zY2FsZWRfZm9udF90 KiBzY2FsZWRGb250ID0gaGJGb250RGF0YS0+bV9jYWlyb1NjYWxlZEZvbnQ7CisgICAgYXV0byYg aGJGb250RGF0YSA9ICpzdGF0aWNfY2FzdDxIYXJmQnV6ekZvbnREYXRhKj4oZm9udERhdGEpOwor ICAgIGF1dG8qIHNjYWxlZEZvbnQgPSBoYkZvbnREYXRhLmNhaXJvU2NhbGVkRm9udC5nZXQoKTsK ICAgICBBU1NFUlQoc2NhbGVkRm9udCk7CiAKICAgICBDYWlyb0dldEdseXBoV2lkdGhBbmRFeHRl bnRzKHNjYWxlZEZvbnQsIGdseXBoLCAwLCBleHRlbnRzKTsKQEAgLTE2Miw3ICsxNTgsNyBAQCBz dGF0aWMgaGJfZm9udF9mdW5jc190KiBoYXJmQnV6ekNhaXJvVGV4dEdldEZvbnRGdW5jcygpCiAK IHN0YXRpYyBoYl9ibG9iX3QqIGhhcmZCdXp6Q2Fpcm9HZXRUYWJsZShoYl9mYWNlX3QqLCBoYl90 YWdfdCB0YWcsIHZvaWQqIHVzZXJEYXRhKQogewotICAgIGNhaXJvX3NjYWxlZF9mb250X3QqIHNj YWxlZEZvbnQgPSByZWludGVycHJldF9jYXN0PGNhaXJvX3NjYWxlZF9mb250X3QqPih1c2VyRGF0 YSk7CisgICAgYXV0byogc2NhbGVkRm9udCA9IHN0YXRpY19jYXN0PGNhaXJvX3NjYWxlZF9mb250 X3QqPih1c2VyRGF0YSk7CiAgICAgaWYgKCFzY2FsZWRGb250KQogICAgICAgICByZXR1cm4gMDsK IApAQCAtMTg5LDE1ICsxODUsMTYgQEAgc3RhdGljIGhiX2Jsb2JfdCogaGFyZkJ1enpDYWlyb0dl dFRhYmxlKGhiX2ZhY2VfdCosIGhiX3RhZ190IHRhZywgdm9pZCogdXNlckRhdGEKICAgICByZXR1 cm4gaGJfYmxvYl9jcmVhdGUocmVpbnRlcnByZXRfY2FzdDxjb25zdCBjaGFyKj4oYnVmZmVyKSwg dGFibGVTaXplLCBIQl9NRU1PUllfTU9ERV9XUklUQUJMRSwgYnVmZmVyLCBmYXN0RnJlZSk7CiB9 CiAKLXN0YXRpYyB2b2lkIGRlc3Ryb3lIYXJmQnV6ekZvbnREYXRhKHZvaWQqIHVzZXJEYXRhKQot ewotICAgIEhhcmZCdXp6Rm9udERhdGEqIGhiRm9udERhdGEgPSByZWludGVycHJldF9jYXN0PEhh cmZCdXp6Rm9udERhdGEqPih1c2VyRGF0YSk7Ci0gICAgZGVsZXRlIGhiRm9udERhdGE7Ci19Ci0K IGhiX2ZhY2VfdCogSGFyZkJ1enpGYWNlOjpjcmVhdGVGYWNlKCkKIHsKLSAgICBoYl9mYWNlX3Qq IGZhY2UgPSBoYl9mYWNlX2NyZWF0ZV9mb3JfdGFibGVzKGhhcmZCdXp6Q2Fpcm9HZXRUYWJsZSwg bV9wbGF0Zm9ybURhdGEtPnNjYWxlZEZvbnQoKSwgMCk7CisgICAgYXV0byogc2NhbGVkRm9udCA9 IG1fcGxhdGZvcm1EYXRhLT5zY2FsZWRGb250KCk7CisgICAgY2Fpcm9fc2NhbGVkX2ZvbnRfcmVm ZXJlbmNlKHNjYWxlZEZvbnQpOworCisgICAgaGJfZmFjZV90KiBmYWNlID0gaGJfZmFjZV9jcmVh dGVfZm9yX3RhYmxlcyhoYXJmQnV6ekNhaXJvR2V0VGFibGUsIHNjYWxlZEZvbnQsCisgICAgICAg IFtdKHZvaWQqIGRhdGEpCisgICAgICAgIHsKKyAgICAgICAgICAgIGNhaXJvX3NjYWxlZF9mb250 X2Rlc3Ryb3koc3RhdGljX2Nhc3Q8Y2Fpcm9fc2NhbGVkX2ZvbnRfdCo+KGRhdGEpKTsKKyAgICAg ICAgfSk7CiAgICAgQVNTRVJUKGZhY2UpOwogICAgIHJldHVybiBmYWNlOwogfQpAQCAtMjA1LDgg KzIwMiwxMiBAQCBoYl9mYWNlX3QqIEhhcmZCdXp6RmFjZTo6Y3JlYXRlRmFjZSgpCiBoYl9mb250 X3QqIEhhcmZCdXp6RmFjZTo6Y3JlYXRlRm9udCgpCiB7CiAgICAgaGJfZm9udF90KiBmb250ID0g aGJfZm9udF9jcmVhdGUobV9mYWNlKTsKLSAgICBIYXJmQnV6ekZvbnREYXRhKiBoYkZvbnREYXRh ID0gbmV3IEhhcmZCdXp6Rm9udERhdGEobV9nbHlwaENhY2hlRm9yRmFjZUNhY2hlRW50cnksIG1f cGxhdGZvcm1EYXRhLT5zY2FsZWRGb250KCkpOwotICAgIGhiX2ZvbnRfc2V0X2Z1bmNzKGZvbnQs IGhhcmZCdXp6Q2Fpcm9UZXh0R2V0Rm9udEZ1bmNzKCksIGhiRm9udERhdGEsIGRlc3Ryb3lIYXJm QnV6ekZvbnREYXRhKTsKKyAgICBoYl9mb250X3NldF9mdW5jcyhmb250LCBoYXJmQnV6ekNhaXJv VGV4dEdldEZvbnRGdW5jcygpLCBuZXcgSGFyZkJ1enpGb250RGF0YSB7IG1fZ2x5cGhDYWNoZUZv ckZhY2VDYWNoZUVudHJ5LCBtX3BsYXRmb3JtRGF0YS0+c2NhbGVkRm9udCgpIH0sCisgICAgICAg IFtdKHZvaWQqIGRhdGEpCisgICAgICAgIHsKKyAgICAgICAgICAgIGRlbGV0ZSBzdGF0aWNfY2Fz dDxIYXJmQnV6ekZvbnREYXRhKj4oZGF0YSk7CisgICAgICAgIH0pOworCiAgICAgY29uc3QgZmxv YXQgc2l6ZSA9IG1fcGxhdGZvcm1EYXRhLT5zaXplKCk7CiAgICAgaWYgKGZsb29yZihzaXplKSA9 PSBzaXplKQogICAgICAgICBoYl9mb250X3NldF9wcGVtKGZvbnQsIHNpemUsIHNpemUpOwo=