217541 2020-10-09 16:24:58 -0700 [GPU Process] Delete DisplayList::DrawGlyphs::m_blockLocation because it's always 0 2020-10-09 17:42:15 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 217506 1 mmaxfield mmaxfield dino jonlee sabouhallawa simon.fraser thorton webkit-bug-importer wenson_hsieh oldest_to_newest 1696391 0 mmaxfield 2020-10-09 16:24:58 -0700 [GPU Process] Delete DisplayList::DrawGlyphs::m_blockLocation because it's always 0 1696392 1 410981 mmaxfield 2020-10-09 16:25:54 -0700 Created attachment 410981 Patch 1696407 2 ews-feeder 2020-10-09 17:10:09 -0700 Tools/Scripts/svn-apply failed to apply attachment 410981 to trunk. Please resolve the conflicts and upload a new patch. 1696420 3 mmaxfield 2020-10-09 17:41:29 -0700 Committed r268304: <https://trac.webkit.org/changeset/268304> 1696421 4 webkit-bug-importer 2020-10-09 17:42:15 -0700 <rdar://problem/70160839> 410981 2020-10-09 16:25:54 -0700 2020-10-09 17:10:09 -0700 Patch bug-217541-20201009162553.patch text/plain 10452 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMjY4MDY1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTkyOWVmZmE5Mjk3ZjE1 ZWEzNDhhZjQ0ZDJkOWNkMjcxNmMxZjA2MS4uNDU2NjI5OWFlNDlkMzA3MmE0YzQzZDc4ZWQzODEy NTFlODE0Yjk1MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDIwLTEwLTA5ICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgW0dQVSBQcm9j ZXNzXSBEZWxldGUgRGlzcGxheUxpc3Q6OkRyYXdHbHlwaHM6Om1fYmxvY2tMb2NhdGlvbiBiZWNh dXNlIGl0J3MgYWx3YXlzIDAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTIxNzU0MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFRoZXJlJ3Mgbm8gcmVhc29uIGZvciBpdCB0byBleGlzdC4KKworICAgICAgICBO byBuZXcgdGVzdHMgYmVjYXVzZSB0aGVyZSBpcyBubyBiZWhhdmlvciBjaGFuZ2UuCisKKyAgICAg ICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9kaXNwbGF5bGlzdHMvRGlzcGxheUxpc3RJdGVtcy5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpEaXNwbGF5TGlzdDo6RHJhd0dseXBoczo6RHJhd0dseXBocyk6 CisgICAgICAgIChXZWJDb3JlOjpEaXNwbGF5TGlzdDo6RHJhd0dseXBoczo6Y29tcHV0ZUJvdW5k cyk6CisgICAgICAgIChXZWJDb3JlOjpEaXNwbGF5TGlzdDo6RHJhd0dseXBoczo6bG9jYWxCb3Vu ZHMgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6RGlzcGxheUxpc3Q6Om9wZXJhdG9yPDwpOgor ICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Rpc3BsYXlsaXN0cy9EaXNwbGF5TGlzdEl0ZW1z Lmg6CisgICAgICAgIChXZWJDb3JlOjpEaXNwbGF5TGlzdDo6RHJhd0dseXBoczo6Y3JlYXRlKToK KyAgICAgICAgKFdlYkNvcmU6OkRpc3BsYXlMaXN0OjpEcmF3R2x5cGhzOjpsb2NhbEFuY2hvciBj b25zdCk6CisgICAgICAgIChXZWJDb3JlOjpEaXNwbGF5TGlzdDo6RHJhd0dseXBoczo6YW5jaG9y UG9pbnQgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6RGlzcGxheUxpc3Q6OkRyYXdHbHlwaHM6 OmVuY29kZSBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpEaXNwbGF5TGlzdDo6RHJhd0dseXBo czo6ZGVjb2RlKToKKyAgICAgICAgKFdlYkNvcmU6OkRpc3BsYXlMaXN0OjpEcmF3R2x5cGhzOjpi bG9ja0xvY2F0aW9uIGNvbnN0KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkRpc3BsYXlM aXN0OjpEcmF3R2x5cGhzOjpzZXRCbG9ja0xvY2F0aW9uKTogRGVsZXRlZC4KKyAgICAgICAgKiBw bGF0Zm9ybS9ncmFwaGljcy9kaXNwbGF5bGlzdHMvRGlzcGxheUxpc3RSZWNvcmRlci5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpEaXNwbGF5TGlzdDo6UmVjb3JkZXI6OmRyYXdHbHlwaHMpOgorCiAy MDIwLTEwLTA2ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CiAK ICAgICAgICAgUmVuYW1lIG5hbWVzcGFjZSBQYWNrZWQgdG8gbmFtZXNwYWNlIFBhY2tlZENvbG9y CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9kaXNwbGF5bGlz dHMvRGlzcGxheUxpc3RJdGVtcy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9kaXNwbGF5bGlzdHMvRGlzcGxheUxpc3RJdGVtcy5jcHAKaW5kZXggZGJmMTg4NGEyMWEzNDlm NmFhMDMzMzdmNzZlZDU5MjkyM2MwNGRlMy4uMzk4MWFkNDM3OTllMGM4YTQ4NTZkMzU4Mzk5MjY5 NGVlMjU4MjljMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv ZGlzcGxheWxpc3RzL0Rpc3BsYXlMaXN0SXRlbXMuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2Rpc3BsYXlsaXN0cy9EaXNwbGF5TGlzdEl0ZW1zLmNwcApAQCAtNTM5 LDIyICs1MzksMjAgQEAgc3RhdGljIFRleHRTdHJlYW0mIG9wZXJhdG9yPDwoVGV4dFN0cmVhbSYg dHMsIGNvbnN0IENsaXBUb0RyYXdpbmdDb21tYW5kcyYgaXRlbSkKICAgICByZXR1cm4gdHM7CiB9 CiAKLURyYXdHbHlwaHM6OkRyYXdHbHlwaHMoY29uc3QgRm9udCYgZm9udCwgVmVjdG9yPEdseXBo QnVmZmVyR2x5cGgsIDEyOD4mJiBnbHlwaHMsIFZlY3RvcjxHbHlwaEJ1ZmZlckFkdmFuY2UsIDEy OD4mJiBhZHZhbmNlcywgY29uc3QgRmxvYXRQb2ludCYgYmxvY2tMb2NhdGlvbiwgY29uc3QgRmxv YXRTaXplJiBsb2NhbEFuY2hvciwgRm9udFNtb290aGluZ01vZGUgc21vb3RoaW5nTW9kZSkKK0Ry YXdHbHlwaHM6OkRyYXdHbHlwaHMoY29uc3QgRm9udCYgZm9udCwgVmVjdG9yPEdseXBoQnVmZmVy R2x5cGgsIDEyOD4mJiBnbHlwaHMsIFZlY3RvcjxHbHlwaEJ1ZmZlckFkdmFuY2UsIDEyOD4mJiBh ZHZhbmNlcywgY29uc3QgRmxvYXRQb2ludCYgbG9jYWxBbmNob3IsIEZvbnRTbW9vdGhpbmdNb2Rl IHNtb290aGluZ01vZGUpCiAgICAgOiBEcmF3aW5nSXRlbShJdGVtVHlwZTo6RHJhd0dseXBocykK ICAgICAsIG1fZm9udChjb25zdF9jYXN0PEZvbnQmPihmb250KSkKICAgICAsIG1fZ2x5cGhzKFdU Rk1vdmUoZ2x5cGhzKSkKICAgICAsIG1fYWR2YW5jZXMoV1RGTW92ZShhZHZhbmNlcykpCi0gICAg LCBtX2Jsb2NrTG9jYXRpb24oYmxvY2tMb2NhdGlvbikKICAgICAsIG1fbG9jYWxBbmNob3IobG9j YWxBbmNob3IpCiAgICAgLCBtX3Ntb290aGluZ01vZGUoc21vb3RoaW5nTW9kZSkKIHsKICAgICBj b21wdXRlQm91bmRzKCk7CiB9CiAKLURyYXdHbHlwaHM6OkRyYXdHbHlwaHMoY29uc3QgRm9udCYg Zm9udCwgY29uc3QgR2x5cGhCdWZmZXJHbHlwaCogZ2x5cGhzLCBjb25zdCBHbHlwaEJ1ZmZlckFk dmFuY2UqIGFkdmFuY2VzLCB1bnNpZ25lZCBjb3VudCwgY29uc3QgRmxvYXRQb2ludCYgYmxvY2tM b2NhdGlvbiwgY29uc3QgRmxvYXRTaXplJiBsb2NhbEFuY2hvciwgRm9udFNtb290aGluZ01vZGUg c21vb3RoaW5nTW9kZSkKK0RyYXdHbHlwaHM6OkRyYXdHbHlwaHMoY29uc3QgRm9udCYgZm9udCwg Y29uc3QgR2x5cGhCdWZmZXJHbHlwaCogZ2x5cGhzLCBjb25zdCBHbHlwaEJ1ZmZlckFkdmFuY2Uq IGFkdmFuY2VzLCB1bnNpZ25lZCBjb3VudCwgY29uc3QgRmxvYXRQb2ludCYgbG9jYWxBbmNob3Is IEZvbnRTbW9vdGhpbmdNb2RlIHNtb290aGluZ01vZGUpCiAgICAgOiBEcmF3aW5nSXRlbShJdGVt VHlwZTo6RHJhd0dseXBocykKICAgICAsIG1fZm9udChjb25zdF9jYXN0PEZvbnQmPihmb250KSkK LSAgICAsIG1fYmxvY2tMb2NhdGlvbihibG9ja0xvY2F0aW9uKQogICAgICwgbV9sb2NhbEFuY2hv cihsb2NhbEFuY2hvcikKICAgICAsIG1fc21vb3RoaW5nTW9kZShzbW9vdGhpbmdNb2RlKQogewpA QCAtNTg4LDcgKzU4Niw3IEBAIHZvaWQgRHJhd0dseXBoczo6Y29tcHV0ZUJvdW5kcygpCiAgICAg Ly8gdGhlIGdseXBoIGxpZXMgZW50aXJlbHkgd2l0aGluIGl0cyBbKGFzY2VudCArIGRlc2NlbnQp LCBhZHZhbmNlXSByZWN0LgogICAgIGZsb2F0IGFzY2VudCA9IG1fZm9udC0+Zm9udE1ldHJpY3Mo KS5mbG9hdEFzY2VudCgpOwogICAgIGZsb2F0IGRlc2NlbnQgPSBtX2ZvbnQtPmZvbnRNZXRyaWNz KCkuZmxvYXREZXNjZW50KCk7Ci0gICAgRmxvYXRQb2ludCBjdXJyZW50ID0gdG9GbG9hdFBvaW50 KGxvY2FsQW5jaG9yKCkpOworICAgIEZsb2F0UG9pbnQgY3VycmVudCA9IGxvY2FsQW5jaG9yKCk7 CiAgICAgc2l6ZV90IG51bUdseXBocyA9IG1fZ2x5cGhzLnNpemUoKTsKICAgICBmb3IgKHNpemVf dCBpID0gMDsgaSA8IG51bUdseXBoczsgKytpKSB7CiAgICAgICAgIEdseXBoQnVmZmVyQWR2YW5j ZSBhZHZhbmNlID0gbV9hZHZhbmNlc1tpXTsKQEAgLTYwMSwxNiArNTk5LDEzIEBAIHZvaWQgRHJh d0dseXBoczo6Y29tcHV0ZUJvdW5kcygpCiAKIE9wdGlvbmFsPEZsb2F0UmVjdD4gRHJhd0dseXBo czo6bG9jYWxCb3VuZHMoY29uc3QgR3JhcGhpY3NDb250ZXh0JikgY29uc3QKIHsKLSAgICBGbG9h dFJlY3QgbG9jYWxCb3VuZHMgPSBtX2JvdW5kczsKLSAgICBsb2NhbEJvdW5kcy5tb3ZlKG1fYmxv Y2tMb2NhdGlvbi54KCksIG1fYmxvY2tMb2NhdGlvbi55KCkpOwotICAgIHJldHVybiBsb2NhbEJv dW5kczsKKyAgICByZXR1cm4gbV9ib3VuZHM7CiB9CiAKIHN0YXRpYyBUZXh0U3RyZWFtJiBvcGVy YXRvcjw8KFRleHRTdHJlYW0mIHRzLCBjb25zdCBEcmF3R2x5cGhzJiBpdGVtKQogewogICAgIHRz IDw8IHN0YXRpY19jYXN0PGNvbnN0IERyYXdpbmdJdGVtJj4oaXRlbSk7CiAgICAgLy8gRklYTUU6 IGR1bXAgbW9yZSBzdHVmZi4KLSAgICB0cy5kdW1wUHJvcGVydHkoImJsb2NrLWxvY2F0aW9uIiwg aXRlbS5ibG9ja0xvY2F0aW9uKCkpOwogICAgIHRzLmR1bXBQcm9wZXJ0eSgibG9jYWwtYW5jaG9y IiwgaXRlbS5sb2NhbEFuY2hvcigpKTsKICAgICB0cy5kdW1wUHJvcGVydHkoImFuY2hvci1wb2lu dCIsIGl0ZW0uYW5jaG9yUG9pbnQoKSk7CiAgICAgdHMuZHVtcFByb3BlcnR5KCJsZW5ndGgiLCBp dGVtLmdseXBocygpLnNpemUoKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9kaXNwbGF5bGlzdHMvRGlzcGxheUxpc3RJdGVtcy5oIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvZGlzcGxheWxpc3RzL0Rpc3BsYXlMaXN0SXRlbXMuaAppbmRl eCBmMDU1ODY5ZTE3YWFhOTY2NGViNTNmYjFiZWU3OTU4MDY0MjhkMzYzLi4zMGM1Nzg1NTQxNzk1 NDFiYTE1MmM5ZTdlYTYyODNiYjk0MzRmZDI5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9kaXNwbGF5bGlzdHMvRGlzcGxheUxpc3RJdGVtcy5oCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Rpc3BsYXlsaXN0cy9EaXNwbGF5TGlzdEl0 ZW1zLmgKQEAgLTExMDAsMjQgKzExMDAsMjEgQEAgT3B0aW9uYWw8UmVmPENsaXBUb0RyYXdpbmdD b21tYW5kcz4+IENsaXBUb0RyYXdpbmdDb21tYW5kczo6ZGVjb2RlKERlY29kZXImIGRlY28KIAog Y2xhc3MgRHJhd0dseXBocyA6IHB1YmxpYyBEcmF3aW5nSXRlbSB7CiBwdWJsaWM6Ci0gICAgc3Rh dGljIFJlZjxEcmF3R2x5cGhzPiBjcmVhdGUoY29uc3QgRm9udCYgZm9udCwgY29uc3QgR2x5cGhC dWZmZXJHbHlwaCogZ2x5cGhzLCBjb25zdCBHbHlwaEJ1ZmZlckFkdmFuY2UqIGFkdmFuY2VzLCB1 bnNpZ25lZCBjb3VudCwgY29uc3QgRmxvYXRQb2ludCYgYmxvY2tMb2NhdGlvbiwgY29uc3QgRmxv YXRTaXplJiBsb2NhbEFuY2hvciwgRm9udFNtb290aGluZ01vZGUgc21vb3RoaW5nTW9kZSkKKyAg ICBzdGF0aWMgUmVmPERyYXdHbHlwaHM+IGNyZWF0ZShjb25zdCBGb250JiBmb250LCBjb25zdCBH bHlwaEJ1ZmZlckdseXBoKiBnbHlwaHMsIGNvbnN0IEdseXBoQnVmZmVyQWR2YW5jZSogYWR2YW5j ZXMsIHVuc2lnbmVkIGNvdW50LCBjb25zdCBGbG9hdFBvaW50JiBsb2NhbEFuY2hvciwgRm9udFNt b290aGluZ01vZGUgc21vb3RoaW5nTW9kZSkKICAgICB7Ci0gICAgICAgIHJldHVybiBhZG9wdFJl ZigqbmV3IERyYXdHbHlwaHMoZm9udCwgZ2x5cGhzLCBhZHZhbmNlcywgY291bnQsIGJsb2NrTG9j YXRpb24sIGxvY2FsQW5jaG9yLCBzbW9vdGhpbmdNb2RlKSk7CisgICAgICAgIHJldHVybiBhZG9w dFJlZigqbmV3IERyYXdHbHlwaHMoZm9udCwgZ2x5cGhzLCBhZHZhbmNlcywgY291bnQsIGxvY2Fs QW5jaG9yLCBzbW9vdGhpbmdNb2RlKSk7CiAgICAgfQogCi0gICAgc3RhdGljIFJlZjxEcmF3R2x5 cGhzPiBjcmVhdGUoY29uc3QgRm9udCYgZm9udCwgVmVjdG9yPEdseXBoQnVmZmVyR2x5cGgsIDEy OD4mJiBnbHlwaHMsIFZlY3RvcjxHbHlwaEJ1ZmZlckFkdmFuY2UsIDEyOD4mJiBhZHZhbmNlcywg Y29uc3QgRmxvYXRQb2ludCYgYmxvY2tMb2NhdGlvbiwgY29uc3QgRmxvYXRTaXplJiBsb2NhbEFu Y2hvciwgRm9udFNtb290aGluZ01vZGUgc21vb3RoaW5nTW9kZSkKKyAgICBzdGF0aWMgUmVmPERy YXdHbHlwaHM+IGNyZWF0ZShjb25zdCBGb250JiBmb250LCBWZWN0b3I8R2x5cGhCdWZmZXJHbHlw aCwgMTI4PiYmIGdseXBocywgVmVjdG9yPEdseXBoQnVmZmVyQWR2YW5jZSwgMTI4PiYmIGFkdmFu Y2VzLCBjb25zdCBGbG9hdFBvaW50JiBsb2NhbEFuY2hvciwgRm9udFNtb290aGluZ01vZGUgc21v b3RoaW5nTW9kZSkKICAgICB7Ci0gICAgICAgIHJldHVybiBhZG9wdFJlZigqbmV3IERyYXdHbHlw aHMoZm9udCwgV1RGTW92ZShnbHlwaHMpLCBXVEZNb3ZlKGFkdmFuY2VzKSwgYmxvY2tMb2NhdGlv biwgbG9jYWxBbmNob3IsIHNtb290aGluZ01vZGUpKTsKKyAgICAgICAgcmV0dXJuIGFkb3B0UmVm KCpuZXcgRHJhd0dseXBocyhmb250LCBXVEZNb3ZlKGdseXBocyksIFdURk1vdmUoYWR2YW5jZXMp LCBsb2NhbEFuY2hvciwgc21vb3RoaW5nTW9kZSkpOwogICAgIH0KIAogICAgIFdFQkNPUkVfRVhQ T1JUIHZpcnR1YWwgfkRyYXdHbHlwaHMoKTsKIAotICAgIGNvbnN0IEZsb2F0UG9pbnQmIGJsb2Nr TG9jYXRpb24oKSBjb25zdCB7IHJldHVybiBtX2Jsb2NrTG9jYXRpb247IH0KLSAgICB2b2lkIHNl dEJsb2NrTG9jYXRpb24oY29uc3QgRmxvYXRQb2ludCYgYmxvY2tMb2NhdGlvbikgeyBtX2Jsb2Nr TG9jYXRpb24gPSBibG9ja0xvY2F0aW9uOyB9Ci0KLSAgICBjb25zdCBGbG9hdFNpemUmIGxvY2Fs QW5jaG9yKCkgY29uc3QgeyByZXR1cm4gbV9sb2NhbEFuY2hvcjsgfQorICAgIGNvbnN0IEZsb2F0 UG9pbnQmIGxvY2FsQW5jaG9yKCkgY29uc3QgeyByZXR1cm4gbV9sb2NhbEFuY2hvcjsgfQogCi0g ICAgRmxvYXRQb2ludCBhbmNob3JQb2ludCgpIGNvbnN0IHsgcmV0dXJuIG1fYmxvY2tMb2NhdGlv biArIG1fbG9jYWxBbmNob3I7IH0KKyAgICBGbG9hdFBvaW50IGFuY2hvclBvaW50KCkgY29uc3Qg eyByZXR1cm4gbV9sb2NhbEFuY2hvcjsgfQogCiAgICAgY29uc3QgVmVjdG9yPEdseXBoQnVmZmVy R2x5cGgsIDEyOD4mIGdseXBocygpIGNvbnN0IHsgcmV0dXJuIG1fZ2x5cGhzOyB9CiAKQEAgLTEx MjUsOCArMTEyMiw4IEBAIHB1YmxpYzoKICAgICB0ZW1wbGF0ZTxjbGFzcyBEZWNvZGVyPiBzdGF0 aWMgT3B0aW9uYWw8UmVmPERyYXdHbHlwaHM+PiBkZWNvZGUoRGVjb2RlciYpOwogCiBwcml2YXRl OgotICAgIERyYXdHbHlwaHMoY29uc3QgRm9udCYsIGNvbnN0IEdseXBoQnVmZmVyR2x5cGgqLCBj b25zdCBHbHlwaEJ1ZmZlckFkdmFuY2UqLCB1bnNpZ25lZCBjb3VudCwgY29uc3QgRmxvYXRQb2lu dCYgYmxvY2tMb2NhdGlvbiwgY29uc3QgRmxvYXRTaXplJiBsb2NhbEFuY2hvciwgRm9udFNtb290 aGluZ01vZGUpOwotICAgIFdFQkNPUkVfRVhQT1JUIERyYXdHbHlwaHMoY29uc3QgRm9udCYsIFZl Y3RvcjxHbHlwaEJ1ZmZlckdseXBoLCAxMjg+JiYsIFZlY3RvcjxHbHlwaEJ1ZmZlckFkdmFuY2Us IDEyOD4mJiwgY29uc3QgRmxvYXRQb2ludCYgYmxvY2tMb2NhdGlvbiwgY29uc3QgRmxvYXRTaXpl JiBsb2NhbEFuY2hvciwgRm9udFNtb290aGluZ01vZGUpOworICAgIERyYXdHbHlwaHMoY29uc3Qg Rm9udCYsIGNvbnN0IEdseXBoQnVmZmVyR2x5cGgqLCBjb25zdCBHbHlwaEJ1ZmZlckFkdmFuY2Uq LCB1bnNpZ25lZCBjb3VudCwgY29uc3QgRmxvYXRQb2ludCYgbG9jYWxBbmNob3IsIEZvbnRTbW9v dGhpbmdNb2RlKTsKKyAgICBXRUJDT1JFX0VYUE9SVCBEcmF3R2x5cGhzKGNvbnN0IEZvbnQmLCBW ZWN0b3I8R2x5cGhCdWZmZXJHbHlwaCwgMTI4PiYmLCBWZWN0b3I8R2x5cGhCdWZmZXJBZHZhbmNl LCAxMjg+JiYsIGNvbnN0IEZsb2F0UG9pbnQmIGxvY2FsQW5jaG9yLCBGb250U21vb3RoaW5nTW9k ZSk7CiAKICAgICB2b2lkIGNvbXB1dGVCb3VuZHMoKTsKIApAQCAtMTE0MCw4ICsxMTM3LDcgQEAg cHJpdmF0ZToKICAgICBWZWN0b3I8R2x5cGhCdWZmZXJHbHlwaCwgMTI4PiBtX2dseXBoczsKICAg ICBWZWN0b3I8R2x5cGhCdWZmZXJBZHZhbmNlLCAxMjg+IG1fYWR2YW5jZXM7CiAgICAgRmxvYXRS ZWN0IG1fYm91bmRzOwotICAgIEZsb2F0UG9pbnQgbV9ibG9ja0xvY2F0aW9uOwotICAgIEZsb2F0 U2l6ZSBtX2xvY2FsQW5jaG9yOworICAgIEZsb2F0UG9pbnQgbV9sb2NhbEFuY2hvcjsKICAgICBG b250U21vb3RoaW5nTW9kZSBtX3Ntb290aGluZ01vZGU7CiB9OwogCkBAIC0xMTUxLDcgKzExNDcs NiBAQCB2b2lkIERyYXdHbHlwaHM6OmVuY29kZShFbmNvZGVyJiBlbmNvZGVyKSBjb25zdAogICAg IGVuY29kZXIgPDwgbV9mb250OwogICAgIGVuY29kZXIgPDwgbV9nbHlwaHM7CiAgICAgZW5jb2Rl ciA8PCBtX2FkdmFuY2VzOwotICAgIGVuY29kZXIgPDwgbV9ibG9ja0xvY2F0aW9uOwogICAgIGVu Y29kZXIgPDwgbV9sb2NhbEFuY2hvcjsKICAgICBlbmNvZGVyIDw8IG1fc21vb3RoaW5nTW9kZTsK IH0KQEAgLTExNzcsMTIgKzExNzIsNyBAQCBPcHRpb25hbDxSZWY8RHJhd0dseXBocz4+IERyYXdH bHlwaHM6OmRlY29kZShEZWNvZGVyJiBkZWNvZGVyKQogICAgIGlmIChnbHlwaHMtPnNpemUoKSAh PSBhZHZhbmNlcy0+c2l6ZSgpKQogICAgICAgICByZXR1cm4gV1RGOjpudWxsb3B0OwogCi0gICAg T3B0aW9uYWw8RmxvYXRQb2ludD4gYmxvY2tMb2NhdGlvbjsKLSAgICBkZWNvZGVyID4+IGJsb2Nr TG9jYXRpb247Ci0gICAgaWYgKCFibG9ja0xvY2F0aW9uKQotICAgICAgICByZXR1cm4gV1RGOjpu dWxsb3B0OwotCi0gICAgT3B0aW9uYWw8RmxvYXRTaXplPiBsb2NhbEFuY2hvcjsKKyAgICBPcHRp b25hbDxGbG9hdFBvaW50PiBsb2NhbEFuY2hvcjsKICAgICBkZWNvZGVyID4+IGxvY2FsQW5jaG9y OwogICAgIGlmICghbG9jYWxBbmNob3IpCiAgICAgICAgIHJldHVybiBXVEY6Om51bGxvcHQ7CkBA IC0xMTkyLDcgKzExODIsNyBAQCBPcHRpb25hbDxSZWY8RHJhd0dseXBocz4+IERyYXdHbHlwaHM6 OmRlY29kZShEZWNvZGVyJiBkZWNvZGVyKQogICAgIGlmICghc21vb3RoaW5nTW9kZSkKICAgICAg ICAgcmV0dXJuIFdURjo6bnVsbG9wdDsKIAotICAgIHJldHVybiBEcmF3R2x5cGhzOjpjcmVhdGUo Zm9udC0+Z2V0KCksIFdURk1vdmUoKmdseXBocyksIFdURk1vdmUoKmFkdmFuY2VzKSwgKmJsb2Nr TG9jYXRpb24sICpsb2NhbEFuY2hvciwgKnNtb290aGluZ01vZGUpOworICAgIHJldHVybiBEcmF3 R2x5cGhzOjpjcmVhdGUoZm9udC0+Z2V0KCksIFdURk1vdmUoKmdseXBocyksIFdURk1vdmUoKmFk dmFuY2VzKSwgKmxvY2FsQW5jaG9yLCAqc21vb3RoaW5nTW9kZSk7CiB9CiAKIGNsYXNzIERyYXdJ bWFnZSA6IHB1YmxpYyBEcmF3aW5nSXRlbSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9kaXNwbGF5bGlzdHMvRGlzcGxheUxpc3RSZWNvcmRlci5jcHAgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9kaXNwbGF5bGlzdHMvRGlzcGxheUxpc3RS ZWNvcmRlci5jcHAKaW5kZXggYmQwNDM4YzZhNGIyNTZjODg1NmJiMTI5YTNhYjVmYTIzZTc4ZGM4 YS4uYzM4NTY0Y2Y4NTJkNTc5Y2Y1YWY4NDM5NTE0Y2YzMzU0NDU4NDI1OCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZGlzcGxheWxpc3RzL0Rpc3BsYXlMaXN0 UmVjb3JkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Rpc3Bs YXlsaXN0cy9EaXNwbGF5TGlzdFJlY29yZGVyLmNwcApAQCAtMTExLDcgKzExMSw3IEBAIHZvaWQg UmVjb3JkZXI6OnNldE1pdGVyTGltaXQoZmxvYXQgbWl0ZXJMaW1pdCkKIAogdm9pZCBSZWNvcmRl cjo6ZHJhd0dseXBocyhjb25zdCBGb250JiBmb250LCBjb25zdCBHbHlwaEJ1ZmZlciYgZ2x5cGhC dWZmZXIsIHVuc2lnbmVkIGZyb20sIHVuc2lnbmVkIG51bUdseXBocywgY29uc3QgRmxvYXRQb2lu dCYgc3RhcnRQb2ludCwgRm9udFNtb290aGluZ01vZGUgc21vb3RoaW5nTW9kZSkKIHsKLSAgICBE cmF3aW5nSXRlbSYgbmV3SXRlbSA9IGRvd25jYXN0PERyYXdpbmdJdGVtPihhcHBlbmRJdGVtKERy YXdHbHlwaHM6OmNyZWF0ZShmb250LCBnbHlwaEJ1ZmZlci5nbHlwaHMoZnJvbSksIGdseXBoQnVm ZmVyLmFkdmFuY2VzKGZyb20pLCBudW1HbHlwaHMsIEZsb2F0UG9pbnQoKSwgdG9GbG9hdFNpemUo c3RhcnRQb2ludCksIHNtb290aGluZ01vZGUpKSk7CisgICAgRHJhd2luZ0l0ZW0mIG5ld0l0ZW0g PSBkb3duY2FzdDxEcmF3aW5nSXRlbT4oYXBwZW5kSXRlbShEcmF3R2x5cGhzOjpjcmVhdGUoZm9u dCwgZ2x5cGhCdWZmZXIuZ2x5cGhzKGZyb20pLCBnbHlwaEJ1ZmZlci5hZHZhbmNlcyhmcm9tKSwg bnVtR2x5cGhzLCBzdGFydFBvaW50LCBzbW9vdGhpbmdNb2RlKSkpOwogICAgIHVwZGF0ZUl0ZW1F eHRlbnQobmV3SXRlbSk7CiB9CiAK