161814 2016-09-09 14:10:22 -0700 Remove unused member of GlyphBuffer 2016-09-09 17:05:02 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified REOPENED P2 Normal --- 161823 1 mmaxfield mmaxfield commit-queue ryanhaddad oldest_to_newest 1228332 0 mmaxfield 2016-09-09 14:10:22 -0700 Remove unused member of GlyphBuffer 1228334 1 288438 mmaxfield 2016-09-09 14:11:35 -0700 Created attachment 288438 Patch 1228339 2 288440 mmaxfield 2016-09-09 14:19:42 -0700 Created attachment 288440 Patch 1228357 3 288440 commit-queue 2016-09-09 14:56:33 -0700 Comment on attachment 288440 Patch Clearing flags on attachment: 288440 Committed r205771: <http://trac.webkit.org/changeset/205771> 1228358 4 commit-queue 2016-09-09 14:56:38 -0700 All reviewed patches have been landed. Closing bug. 1228379 5 ryanhaddad 2016-09-09 16:40:57 -0700 This change broke the Windows build (as EWS predicted it would): https://build.webkit.org/builders/Apple%20Win%20Release%20%28Build%29/builds/80389 1228388 6 mmaxfield 2016-09-09 17:04:53 -0700 It's used in FontCGWin.cpp :( 1228390 7 commit-queue 2016-09-09 17:05:02 -0700 Re-opened since this is blocked by bug 161823 288438 2016-09-09 14:11:35 -0700 2016-09-09 14:19:40 -0700 Patch bug-161814-20160909140907.patch text/plain 5224 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMjA1NzY2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGNmM2Q4ZTU2NmUyMDMy YjYxNGQ4ZGUyNDYxYmI0MmVmYTY0MjkwMi4uY2ZkMzQ5OTg1MWUxYzBhYzlkZTc2ZWQ2YTM1NWRk NjcyNjc4NjBiYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDE2LTA5LTA5ICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgUmVtb3ZlIHVu dXNlZCBtZW1iZXIgb2YgR2x5cGhCdWZmZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTE2MTgxNAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFRoaXMgbV9vZmZzZXRzIG1lbWJlciBuZXZlciBhY3R1YWxseSBh ZmZlY3RlZCBhbnl0aGluZy4gSXQganVzdCBtYWRlCisgICAgICAgIEZvbnRDYXNjYWRlOjpkcmF3 R2x5cGhCdWZmZXIoKSBzbG93ZXIuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIGJlY2F1c2UgdGhl cmUgaXMgbm8gYmVoYXZpb3IgY2hhbmdlLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mv Rm9udENhc2NhZGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Rm9udENhc2NhZGU6OmRyYXdHbHlw aEJ1ZmZlcik6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvR2x5cGhCdWZmZXIuaDoKKyAg ICAgICAgKFdlYkNvcmU6OkdseXBoQnVmZmVyOjpjbGVhcik6CisgICAgICAgIChXZWJDb3JlOjpH bHlwaEJ1ZmZlcjo6YWR2YW5jZUF0KToKKyAgICAgICAgKFdlYkNvcmU6OkdseXBoQnVmZmVyOjph ZGQpOgorICAgICAgICAoV2ViQ29yZTo6R2x5cGhCdWZmZXI6OnNocmluayk6CisgICAgICAgIChX ZWJDb3JlOjpHbHlwaEJ1ZmZlcjo6c3dhcCk6CisgICAgICAgIChXZWJDb3JlOjpHbHlwaEJ1ZmZl cjo6b2Zmc2V0QXQpOiBEZWxldGVkLgorCiAyMDE2LTA5LTA5ICBUaW0gSG9ydG9uICA8dGltb3Ro eV9ob3J0b25AYXBwbGUuY29tPgogCiAgICAgICAgIFRleHQgcmVwbGFjZW1lbnQgY2FuZGlkYXRl cyBkb24ndCBhbHdheXMgb3ZlcndyaXRlIHRoZSBlbnRpcmUgb3JpZ2luYWwgc3RyaW5nCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250Q2FzY2FkZS5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250Q2FzY2FkZS5jcHAKaW5kZXgg YWU5NzUxOGIxNjllMTAxYzdiZmVjMTgzMDI4ODMxMDMwYTgyZTZiOC4uYzUxY2I3ZThjZGUyYmRk OWRmNjQwZmY3MmQyNzk2NTRlMTQ0Y2Q2NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvRm9udENhc2NhZGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL0ZvbnRDYXNjYWRlLmNwcApAQCAtMTI4NCw3ICsxMjg0LDYgQEAgdm9pZCBG b250Q2FzY2FkZTo6ZHJhd0dseXBoQnVmZmVyKEdyYXBoaWNzQ29udGV4dCYgY29udGV4dCwgY29u c3QgR2x5cGhCdWZmZXImIGcKIHsKICAgICAvLyBEcmF3IGVhY2ggY29udGlndW91cyBydW4gb2Yg Z2x5cGhzIHRoYXQgdXNlIHRoZSBzYW1lIGZvbnQgZGF0YS4KICAgICBjb25zdCBGb250KiBmb250 RGF0YSA9IGdseXBoQnVmZmVyLmZvbnRBdCgwKTsKLSAgICBGbG9hdFNpemUgb2Zmc2V0ID0gZ2x5 cGhCdWZmZXIub2Zmc2V0QXQoMCk7CiAgICAgRmxvYXRQb2ludCBzdGFydFBvaW50KHBvaW50Lngo KSwgcG9pbnQueSgpIC0gZ2x5cGhCdWZmZXIuaW5pdGlhbEFkdmFuY2UoKS5oZWlnaHQoKSk7CiAg ICAgZmxvYXQgbmV4dFggPSBzdGFydFBvaW50LngoKSArIGdseXBoQnVmZmVyLmFkdmFuY2VBdCgw KS53aWR0aCgpOwogICAgIGZsb2F0IG5leHRZID0gc3RhcnRQb2ludC55KCkgKyBnbHlwaEJ1ZmZl ci5hZHZhbmNlQXQoMCkuaGVpZ2h0KCk7CkBAIC0xMjkyLDE0ICsxMjkxLDEyIEBAIHZvaWQgRm9u dENhc2NhZGU6OmRyYXdHbHlwaEJ1ZmZlcihHcmFwaGljc0NvbnRleHQmIGNvbnRleHQsIGNvbnN0 IEdseXBoQnVmZmVyJiBnCiAgICAgdW5zaWduZWQgbmV4dEdseXBoID0gMTsKICAgICB3aGlsZSAo bmV4dEdseXBoIDwgZ2x5cGhCdWZmZXIuc2l6ZSgpKSB7CiAgICAgICAgIGNvbnN0IEZvbnQqIG5l eHRGb250RGF0YSA9IGdseXBoQnVmZmVyLmZvbnRBdChuZXh0R2x5cGgpOwotICAgICAgICBGbG9h dFNpemUgbmV4dE9mZnNldCA9IGdseXBoQnVmZmVyLm9mZnNldEF0KG5leHRHbHlwaCk7CiAKLSAg ICAgICAgaWYgKG5leHRGb250RGF0YSAhPSBmb250RGF0YSB8fCBuZXh0T2Zmc2V0ICE9IG9mZnNl dCkgeworICAgICAgICBpZiAobmV4dEZvbnREYXRhICE9IGZvbnREYXRhKSB7CiAgICAgICAgICAg ICBjb250ZXh0LmRyYXdHbHlwaHMoKnRoaXMsICpmb250RGF0YSwgZ2x5cGhCdWZmZXIsIGxhc3RG cm9tLCBuZXh0R2x5cGggLSBsYXN0RnJvbSwgc3RhcnRQb2ludCk7CiAKICAgICAgICAgICAgIGxh c3RGcm9tID0gbmV4dEdseXBoOwogICAgICAgICAgICAgZm9udERhdGEgPSBuZXh0Rm9udERhdGE7 Ci0gICAgICAgICAgICBvZmZzZXQgPSBuZXh0T2Zmc2V0OwogICAgICAgICAgICAgc3RhcnRQb2lu dC5zZXRYKG5leHRYKTsKICAgICAgICAgICAgIHN0YXJ0UG9pbnQuc2V0WShuZXh0WSk7CiAgICAg ICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dseXBo QnVmZmVyLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HbHlwaEJ1ZmZlci5o CmluZGV4IDBiMjQzYjJhZDgzMmZlNDA3OGMzMjllZjc1MjQ5NzI1YWU5NjBkOTkuLjIyYmViZGJh YTIzYmEzOGE4NGVkNzM1MDZmNTU4ZWFjZmQyYjUwZTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dseXBoQnVmZmVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvR2x5cGhCdWZmZXIuaApAQCAtODcsOSArODcsNiBAQCBwdWJsaWM6 CiAgICAgICAgIG1fYWR2YW5jZXMuY2xlYXIoKTsKICAgICAgICAgaWYgKG1fb2Zmc2V0c0luU3Ry aW5nKQogICAgICAgICAgICAgbV9vZmZzZXRzSW5TdHJpbmctPmNsZWFyKCk7Ci0jaWYgUExBVEZP Uk0oV0lOKQotICAgICAgICBtX29mZnNldHMuY2xlYXIoKTsKLSNlbmRpZgogICAgIH0KIAogICAg IEdseXBoQnVmZmVyR2x5cGgqIGdseXBocyh1bnNpZ25lZCBmcm9tKSB7IHJldHVybiBtX2dseXBo cy5kYXRhKCkgKyBmcm9tOyB9CkBAIC0xMTgsMTkgKzExNSw5IEBAIHB1YmxpYzoKICAgICB7CiAg ICAgICAgIHJldHVybiBtX2FkdmFuY2VzW2luZGV4XTsKICAgICB9Ci0KLSAgICBGbG9hdFNpemUg b2Zmc2V0QXQodW5zaWduZWQgaW5kZXgpIGNvbnN0Ci0gICAgewotI2lmIFBMQVRGT1JNKFdJTikK LSAgICAgICAgcmV0dXJuIG1fb2Zmc2V0c1tpbmRleF07Ci0jZWxzZQotICAgICAgICBVTlVTRURf UEFSQU0oaW5kZXgpOwotICAgICAgICByZXR1cm4gRmxvYXRTaXplKCk7Ci0jZW5kaWYKLSAgICB9 CiAgICAgCiAgICAgc3RhdGljIGNvbnN0IHVuc2lnbmVkIG5vT2Zmc2V0ID0gVUlOVF9NQVg7Ci0g ICAgdm9pZCBhZGQoR2x5cGggZ2x5cGgsIGNvbnN0IEZvbnQqIGZvbnQsIGZsb2F0IHdpZHRoLCB1 bnNpZ25lZCBvZmZzZXRJblN0cmluZyA9IG5vT2Zmc2V0LCBjb25zdCBGbG9hdFNpemUqIG9mZnNl dCA9IDApCisgICAgdm9pZCBhZGQoR2x5cGggZ2x5cGgsIGNvbnN0IEZvbnQqIGZvbnQsIGZsb2F0 IHdpZHRoLCB1bnNpZ25lZCBvZmZzZXRJblN0cmluZyA9IG5vT2Zmc2V0KQogICAgIHsKICAgICAg ICAgbV9mb250LmFwcGVuZChmb250KTsKIApAQCAtMTQ4LDE1ICsxMzUsNiBAQCBwdWJsaWM6CiAj ZWxzZQogICAgICAgICBtX2FkdmFuY2VzLmFwcGVuZChGbG9hdFNpemUod2lkdGgsIDApKTsKICNl bmRpZgotCi0jaWYgUExBVEZPUk0oV0lOKQotICAgICAgICBpZiAob2Zmc2V0KQotICAgICAgICAg ICAgbV9vZmZzZXRzLmFwcGVuZCgqb2Zmc2V0KTsKLSAgICAgICAgZWxzZQotICAgICAgICAgICAg bV9vZmZzZXRzLmFwcGVuZChGbG9hdFNpemUoKSk7Ci0jZWxzZQotICAgICAgICBVTlVTRURfUEFS QU0ob2Zmc2V0KTsKLSNlbmRpZgogICAgICAgICAKICAgICAgICAgaWYgKG9mZnNldEluU3RyaW5n ICE9IG5vT2Zmc2V0ICYmIG1fb2Zmc2V0c0luU3RyaW5nKQogICAgICAgICAgICAgbV9vZmZzZXRz SW5TdHJpbmctPmFwcGVuZChvZmZzZXRJblN0cmluZyk7CkBAIC0yMTIsOSArMTkwLDYgQEAgcHVi bGljOgogICAgICAgICBtX2FkdmFuY2VzLnNocmluayh0cnVuY2F0aW9uUG9pbnQpOwogICAgICAg ICBpZiAobV9vZmZzZXRzSW5TdHJpbmcpCiAgICAgICAgICAgICBtX29mZnNldHNJblN0cmluZy0+ c2hyaW5rKHRydW5jYXRpb25Qb2ludCk7Ci0jaWYgUExBVEZPUk0oV0lOKQotICAgICAgICBtX29m ZnNldHMuc2hyaW5rKHRydW5jYXRpb25Qb2ludCk7Ci0jZW5kaWYKICAgICB9CiAKIHByaXZhdGU6 CkBAIC0yMzEsMTIgKzIwNiw2IEBAIHByaXZhdGU6CiAgICAgICAgIEdseXBoQnVmZmVyQWR2YW5j ZSBzID0gbV9hZHZhbmNlc1tpbmRleDFdOwogICAgICAgICBtX2FkdmFuY2VzW2luZGV4MV0gPSBt X2FkdmFuY2VzW2luZGV4Ml07CiAgICAgICAgIG1fYWR2YW5jZXNbaW5kZXgyXSA9IHM7Ci0KLSNp ZiBQTEFURk9STShXSU4pCi0gICAgICAgIEZsb2F0U2l6ZSBvZmZzZXQgPSBtX29mZnNldHNbaW5k ZXgxXTsKLSAgICAgICAgbV9vZmZzZXRzW2luZGV4MV0gPSBtX29mZnNldHNbaW5kZXgyXTsKLSAg ICAgICAgbV9vZmZzZXRzW2luZGV4Ml0gPSBvZmZzZXQ7Ci0jZW5kaWYKICAgICB9CiAKICAgICBW ZWN0b3I8Y29uc3QgRm9udCosIDIwNDg+IG1fZm9udDsKQEAgLTI0NCw5ICsyMTMsNiBAQCBwcml2 YXRlOgogICAgIFZlY3RvcjxHbHlwaEJ1ZmZlckFkdmFuY2UsIDIwNDg+IG1fYWR2YW5jZXM7CiAg ICAgR2x5cGhCdWZmZXJBZHZhbmNlIG1faW5pdGlhbEFkdmFuY2U7CiAgICAgc3RkOjp1bmlxdWVf cHRyPFZlY3Rvcjx1bnNpZ25lZCwgMjA0OD4+IG1fb2Zmc2V0c0luU3RyaW5nOwotI2lmIFBMQVRG T1JNKFdJTikKLSAgICBWZWN0b3I8RmxvYXRTaXplLCAyMDQ4PiBtX29mZnNldHM7Ci0jZW5kaWYK ICAgICBmbG9hdCBtX2xlYWRpbmdFeHBhbnNpb247CiB9OwogCg== 288440 2016-09-09 14:19:42 -0700 2016-09-09 14:56:33 -0700 Patch bug-161814-20160909141714.patch text/plain 6157 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMjA1NzY2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGNmM2Q4ZTU2NmUyMDMy YjYxNGQ4ZGUyNDYxYmI0MmVmYTY0MjkwMi4uM2Y5NGEwNjI4MWNmYjExMmNjMjkzOTUxMWNjMzAw MDgwMzBmYzlhOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE2LTA5LTA5ICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgUmVtb3ZlIHVu dXNlZCBtZW1iZXIgb2YgR2x5cGhCdWZmZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTE2MTgxNAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFRoaXMgbV9vZmZzZXRzIG1lbWJlciBuZXZlciBhY3R1YWxseSBh ZmZlY3RlZCBhbnl0aGluZy4gSXQganVzdCBtYWRlCisgICAgICAgIEZvbnRDYXNjYWRlOjpkcmF3 R2x5cGhCdWZmZXIoKSBzbG93ZXIuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIGJlY2F1c2UgdGhl cmUgaXMgbm8gYmVoYXZpb3IgY2hhbmdlLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mv Rm9udENhc2NhZGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Rm9udENhc2NhZGU6OmRyYXdHbHlw aEJ1ZmZlcik6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvR2x5cGhCdWZmZXIuaDoKKyAg ICAgICAgKFdlYkNvcmU6OkdseXBoQnVmZmVyOjpjbGVhcik6CisgICAgICAgIChXZWJDb3JlOjpH bHlwaEJ1ZmZlcjo6YWR2YW5jZUF0KToKKyAgICAgICAgKFdlYkNvcmU6OkdseXBoQnVmZmVyOjph ZGQpOgorICAgICAgICAoV2ViQ29yZTo6R2x5cGhCdWZmZXI6OnNocmluayk6CisgICAgICAgIChX ZWJDb3JlOjpHbHlwaEJ1ZmZlcjo6c3dhcCk6CisgICAgICAgIChXZWJDb3JlOjpHbHlwaEJ1ZmZl cjo6b2Zmc2V0QXQpOiBEZWxldGVkLgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3dpbi9V bmlzY3JpYmVDb250cm9sbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlVuaXNjcmliZUNvbnRy b2xsZXI6OnNoYXBlQW5kUGxhY2VJdGVtKToKKwogMjAxNi0wOS0wOSAgVGltIEhvcnRvbiAgPHRp bW90aHlfaG9ydG9uQGFwcGxlLmNvbT4KIAogICAgICAgICBUZXh0IHJlcGxhY2VtZW50IGNhbmRp ZGF0ZXMgZG9uJ3QgYWx3YXlzIG92ZXJ3cml0ZSB0aGUgZW50aXJlIG9yaWdpbmFsIHN0cmluZwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udENhc2NhZGUu Y3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udENhc2NhZGUuY3BwCmlu ZGV4IGFlOTc1MThiMTY5ZTEwMWM3YmZlYzE4MzAyODgzMTAzMGE4MmU2YjguLmM1MWNiN2U4Y2Rl MmJkZDlkZjY0MGZmNzJkMjc5NjU0ZTE0NGNkNjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnRDYXNjYWRlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9Gb250Q2FzY2FkZS5jcHAKQEAgLTEyODQsNyArMTI4NCw2IEBAIHZv aWQgRm9udENhc2NhZGU6OmRyYXdHbHlwaEJ1ZmZlcihHcmFwaGljc0NvbnRleHQmIGNvbnRleHQs IGNvbnN0IEdseXBoQnVmZmVyJiBnCiB7CiAgICAgLy8gRHJhdyBlYWNoIGNvbnRpZ3VvdXMgcnVu IG9mIGdseXBocyB0aGF0IHVzZSB0aGUgc2FtZSBmb250IGRhdGEuCiAgICAgY29uc3QgRm9udCog Zm9udERhdGEgPSBnbHlwaEJ1ZmZlci5mb250QXQoMCk7Ci0gICAgRmxvYXRTaXplIG9mZnNldCA9 IGdseXBoQnVmZmVyLm9mZnNldEF0KDApOwogICAgIEZsb2F0UG9pbnQgc3RhcnRQb2ludChwb2lu dC54KCksIHBvaW50LnkoKSAtIGdseXBoQnVmZmVyLmluaXRpYWxBZHZhbmNlKCkuaGVpZ2h0KCkp OwogICAgIGZsb2F0IG5leHRYID0gc3RhcnRQb2ludC54KCkgKyBnbHlwaEJ1ZmZlci5hZHZhbmNl QXQoMCkud2lkdGgoKTsKICAgICBmbG9hdCBuZXh0WSA9IHN0YXJ0UG9pbnQueSgpICsgZ2x5cGhC dWZmZXIuYWR2YW5jZUF0KDApLmhlaWdodCgpOwpAQCAtMTI5MiwxNCArMTI5MSwxMiBAQCB2b2lk IEZvbnRDYXNjYWRlOjpkcmF3R2x5cGhCdWZmZXIoR3JhcGhpY3NDb250ZXh0JiBjb250ZXh0LCBj b25zdCBHbHlwaEJ1ZmZlciYgZwogICAgIHVuc2lnbmVkIG5leHRHbHlwaCA9IDE7CiAgICAgd2hp bGUgKG5leHRHbHlwaCA8IGdseXBoQnVmZmVyLnNpemUoKSkgewogICAgICAgICBjb25zdCBGb250 KiBuZXh0Rm9udERhdGEgPSBnbHlwaEJ1ZmZlci5mb250QXQobmV4dEdseXBoKTsKLSAgICAgICAg RmxvYXRTaXplIG5leHRPZmZzZXQgPSBnbHlwaEJ1ZmZlci5vZmZzZXRBdChuZXh0R2x5cGgpOwog Ci0gICAgICAgIGlmIChuZXh0Rm9udERhdGEgIT0gZm9udERhdGEgfHwgbmV4dE9mZnNldCAhPSBv ZmZzZXQpIHsKKyAgICAgICAgaWYgKG5leHRGb250RGF0YSAhPSBmb250RGF0YSkgewogICAgICAg ICAgICAgY29udGV4dC5kcmF3R2x5cGhzKCp0aGlzLCAqZm9udERhdGEsIGdseXBoQnVmZmVyLCBs YXN0RnJvbSwgbmV4dEdseXBoIC0gbGFzdEZyb20sIHN0YXJ0UG9pbnQpOwogCiAgICAgICAgICAg ICBsYXN0RnJvbSA9IG5leHRHbHlwaDsKICAgICAgICAgICAgIGZvbnREYXRhID0gbmV4dEZvbnRE YXRhOwotICAgICAgICAgICAgb2Zmc2V0ID0gbmV4dE9mZnNldDsKICAgICAgICAgICAgIHN0YXJ0 UG9pbnQuc2V0WChuZXh0WCk7CiAgICAgICAgICAgICBzdGFydFBvaW50LnNldFkobmV4dFkpOwog ICAgICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9H bHlwaEJ1ZmZlci5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR2x5cGhCdWZm ZXIuaAppbmRleCAwYjI0M2IyYWQ4MzJmZTQwNzhjMzI5ZWY3NTI0OTcyNWFlOTYwZDk5Li4yMmJl YmRiYWEyM2JhMzhhODRlZDczNTA2ZjU1OGVhY2ZkMmI1MGU1IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HbHlwaEJ1ZmZlci5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dseXBoQnVmZmVyLmgKQEAgLTg3LDkgKzg3LDYgQEAgcHVi bGljOgogICAgICAgICBtX2FkdmFuY2VzLmNsZWFyKCk7CiAgICAgICAgIGlmIChtX29mZnNldHNJ blN0cmluZykKICAgICAgICAgICAgIG1fb2Zmc2V0c0luU3RyaW5nLT5jbGVhcigpOwotI2lmIFBM QVRGT1JNKFdJTikKLSAgICAgICAgbV9vZmZzZXRzLmNsZWFyKCk7Ci0jZW5kaWYKICAgICB9CiAK ICAgICBHbHlwaEJ1ZmZlckdseXBoKiBnbHlwaHModW5zaWduZWQgZnJvbSkgeyByZXR1cm4gbV9n bHlwaHMuZGF0YSgpICsgZnJvbTsgfQpAQCAtMTE4LDE5ICsxMTUsOSBAQCBwdWJsaWM6CiAgICAg ewogICAgICAgICByZXR1cm4gbV9hZHZhbmNlc1tpbmRleF07CiAgICAgfQotCi0gICAgRmxvYXRT aXplIG9mZnNldEF0KHVuc2lnbmVkIGluZGV4KSBjb25zdAotICAgIHsKLSNpZiBQTEFURk9STShX SU4pCi0gICAgICAgIHJldHVybiBtX29mZnNldHNbaW5kZXhdOwotI2Vsc2UKLSAgICAgICAgVU5V U0VEX1BBUkFNKGluZGV4KTsKLSAgICAgICAgcmV0dXJuIEZsb2F0U2l6ZSgpOwotI2VuZGlmCi0g ICAgfQogICAgIAogICAgIHN0YXRpYyBjb25zdCB1bnNpZ25lZCBub09mZnNldCA9IFVJTlRfTUFY OwotICAgIHZvaWQgYWRkKEdseXBoIGdseXBoLCBjb25zdCBGb250KiBmb250LCBmbG9hdCB3aWR0 aCwgdW5zaWduZWQgb2Zmc2V0SW5TdHJpbmcgPSBub09mZnNldCwgY29uc3QgRmxvYXRTaXplKiBv ZmZzZXQgPSAwKQorICAgIHZvaWQgYWRkKEdseXBoIGdseXBoLCBjb25zdCBGb250KiBmb250LCBm bG9hdCB3aWR0aCwgdW5zaWduZWQgb2Zmc2V0SW5TdHJpbmcgPSBub09mZnNldCkKICAgICB7CiAg ICAgICAgIG1fZm9udC5hcHBlbmQoZm9udCk7CiAKQEAgLTE0OCwxNSArMTM1LDYgQEAgcHVibGlj OgogI2Vsc2UKICAgICAgICAgbV9hZHZhbmNlcy5hcHBlbmQoRmxvYXRTaXplKHdpZHRoLCAwKSk7 CiAjZW5kaWYKLQotI2lmIFBMQVRGT1JNKFdJTikKLSAgICAgICAgaWYgKG9mZnNldCkKLSAgICAg ICAgICAgIG1fb2Zmc2V0cy5hcHBlbmQoKm9mZnNldCk7Ci0gICAgICAgIGVsc2UKLSAgICAgICAg ICAgIG1fb2Zmc2V0cy5hcHBlbmQoRmxvYXRTaXplKCkpOwotI2Vsc2UKLSAgICAgICAgVU5VU0VE X1BBUkFNKG9mZnNldCk7Ci0jZW5kaWYKICAgICAgICAgCiAgICAgICAgIGlmIChvZmZzZXRJblN0 cmluZyAhPSBub09mZnNldCAmJiBtX29mZnNldHNJblN0cmluZykKICAgICAgICAgICAgIG1fb2Zm c2V0c0luU3RyaW5nLT5hcHBlbmQob2Zmc2V0SW5TdHJpbmcpOwpAQCAtMjEyLDkgKzE5MCw2IEBA IHB1YmxpYzoKICAgICAgICAgbV9hZHZhbmNlcy5zaHJpbmsodHJ1bmNhdGlvblBvaW50KTsKICAg ICAgICAgaWYgKG1fb2Zmc2V0c0luU3RyaW5nKQogICAgICAgICAgICAgbV9vZmZzZXRzSW5TdHJp bmctPnNocmluayh0cnVuY2F0aW9uUG9pbnQpOwotI2lmIFBMQVRGT1JNKFdJTikKLSAgICAgICAg bV9vZmZzZXRzLnNocmluayh0cnVuY2F0aW9uUG9pbnQpOwotI2VuZGlmCiAgICAgfQogCiBwcml2 YXRlOgpAQCAtMjMxLDEyICsyMDYsNiBAQCBwcml2YXRlOgogICAgICAgICBHbHlwaEJ1ZmZlckFk dmFuY2UgcyA9IG1fYWR2YW5jZXNbaW5kZXgxXTsKICAgICAgICAgbV9hZHZhbmNlc1tpbmRleDFd ID0gbV9hZHZhbmNlc1tpbmRleDJdOwogICAgICAgICBtX2FkdmFuY2VzW2luZGV4Ml0gPSBzOwot Ci0jaWYgUExBVEZPUk0oV0lOKQotICAgICAgICBGbG9hdFNpemUgb2Zmc2V0ID0gbV9vZmZzZXRz W2luZGV4MV07Ci0gICAgICAgIG1fb2Zmc2V0c1tpbmRleDFdID0gbV9vZmZzZXRzW2luZGV4Ml07 Ci0gICAgICAgIG1fb2Zmc2V0c1tpbmRleDJdID0gb2Zmc2V0OwotI2VuZGlmCiAgICAgfQogCiAg ICAgVmVjdG9yPGNvbnN0IEZvbnQqLCAyMDQ4PiBtX2ZvbnQ7CkBAIC0yNDQsOSArMjEzLDYgQEAg cHJpdmF0ZToKICAgICBWZWN0b3I8R2x5cGhCdWZmZXJBZHZhbmNlLCAyMDQ4PiBtX2FkdmFuY2Vz OwogICAgIEdseXBoQnVmZmVyQWR2YW5jZSBtX2luaXRpYWxBZHZhbmNlOwogICAgIHN0ZDo6dW5p cXVlX3B0cjxWZWN0b3I8dW5zaWduZWQsIDIwNDg+PiBtX29mZnNldHNJblN0cmluZzsKLSNpZiBQ TEFURk9STShXSU4pCi0gICAgVmVjdG9yPEZsb2F0U2l6ZSwgMjA0OD4gbV9vZmZzZXRzOwotI2Vu ZGlmCiAgICAgZmxvYXQgbV9sZWFkaW5nRXhwYW5zaW9uOwogfTsKIApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL1VuaXNjcmliZUNvbnRyb2xsZXIuY3Bw IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL1VuaXNjcmliZUNvbnRyb2xs ZXIuY3BwCmluZGV4IDAwYjAzODdlZmE3MTQwYjI5ZDNkZWNhZGI4NTAyNDk4YjU5YjkwMzYuLjFh MTE1NWMxOTMzMDc5YTRiMmJhMzJhNzEzYzE3NjI0ZDYzYzliNjYgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9VbmlzY3JpYmVDb250cm9sbGVyLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW4vVW5pc2NyaWJlQ29udHJv bGxlci5jcHAKQEAgLTM2NSw3ICszNjUsNyBAQCBib29sIFVuaXNjcmliZUNvbnRyb2xsZXI6OnNo YXBlQW5kUGxhY2VJdGVtKGNvbnN0IFVDaGFyKiBjcCwgdW5zaWduZWQgaSwgY29uc3QgRgogICAg ICAgICAvLyB0cmFuc2xhdGlvbi4KICAgICAgICAgaWYgKGdseXBoQnVmZmVyKSB7CiAgICAgICAg ICAgICBGbG9hdFNpemUgc2l6ZShvZmZzZXRYLCAtb2Zmc2V0WSk7Ci0gICAgICAgICAgICBnbHlw aEJ1ZmZlci0+YWRkKGdseXBoLCBmb250RGF0YSwgYWR2YW5jZSwgR2x5cGhCdWZmZXI6Om5vT2Zm c2V0LCAmc2l6ZSk7CisgICAgICAgICAgICBnbHlwaEJ1ZmZlci0+YWRkKGdseXBoLCBmb250RGF0 YSwgYWR2YW5jZSwgR2x5cGhCdWZmZXI6Om5vT2Zmc2V0KTsKICAgICAgICAgfQogCiAgICAgICAg IEZsb2F0UmVjdCBnbHlwaEJvdW5kcyA9IGZvbnREYXRhLT5ib3VuZHNGb3JHbHlwaChnbHlwaCk7 Cg==