215055 2020-08-01 00:55:16 -0700 Make FontCascade.drawText() return a FloatSize instead of a float 2020-08-07 23:23:13 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 206208 1 mmaxfield mmaxfield darin dino ews-watchlist hi joepeck jonlee simon.fraser thorton webkit-bug-importer zalan oldest_to_newest 1677100 0 mmaxfield 2020-08-01 00:55:16 -0700 Make FontCascade.drawText() return a FloatSize instead of a float 1677101 1 405777 mmaxfield 2020-08-01 01:01:59 -0700 Created attachment 405777 Patch 1677140 2 mmaxfield 2020-08-01 12:25:16 -0700 Windows failure looks unrelated. 1677142 3 405791 mmaxfield 2020-08-01 12:28:21 -0700 Created attachment 405791 Patch 1677446 4 ews-feeder 2020-08-03 15:21:14 -0700 Tools/Scripts/svn-apply failed to apply attachment 405791 to trunk. Please resolve the conflicts and upload a new patch. 1677512 5 mmaxfield 2020-08-03 17:15:21 -0700 Committed r265231: <https://trac.webkit.org/changeset/265231> 1677513 6 webkit-bug-importer 2020-08-03 17:16:26 -0700 <rdar://problem/66499470> 405777 2020-08-01 01:01:59 -0700 2020-08-01 12:28:20 -0700 Patch bug-215055-20200801010159.patch text/plain 9610 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMjY1MTcxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzQzMzUzZmU1ZThjOTRh NWQ1ZmNkOTgzNTc4YWNmOTQzYTIzM2M5Mi4uMDhlNDAxNjZiYzA5ZDVhOTg4MTA2YmM0YjQ2MWNl NTMxMzVmMGRkMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDIwLTA4LTAxICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgTWFrZSBGb250 Q2FzY2FkZS5kcmF3VGV4dCgpIHJldHVybiBhIEZsb2F0U2l6ZSBpbnN0ZWFkIG9mIGEgZmxvYXQK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNTA1NQor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkdmFuY2Vz IGFyZSBwaGlsb3NvcGhpY2FsbHkgdHdvLWRpbWVuc2lvbmFsIGRhdGEgc3RydWN0dXJlcy4KKwor ICAgICAgICBUaGlzIGlzIGluIHByZXBhcmF0aW9uIGZvciBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MjE0NzY5CisgICAgICAgIGFuZCBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA2MjA4LgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyBiZWNh dXNlIHRoZXJlIHNob3VsZG4ndCBiZSBhbnkgYmVoYXZpb3IgY2hhbmdlLiBCdXQgaW4gdGhlIHdl aXJkCisgICAgICAgIHJhcmUgY2FzZSB3aGVyZSB0aGVyZSBtaWdodCBiZSwgd2Ugc2hvdWxkIGJl IGRlZmVuc2l2ZSBhbmQgaGFuZGxlIGl0IGNvcnJlY3RseS4KKyAgICAgICAgSSd2ZSBuZXZlciBz ZWVuIG9uZSBvZiB0aGVzZSBjYXNlcywgdGhvdWdoLgorCisgICAgICAgICogaW5zcGVjdG9yL0lu c3BlY3Rvck92ZXJsYXkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yT3ZlcmxheTo6 ZHJhd0VsZW1lbnRUaXRsZSk6CisgICAgICAgICogcGFnZS9EZWJ1Z1BhZ2VPdmVybGF5cy5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpkcmF3UmlnaHRBbGlnbmVkVGV4dCk6CisgICAgICAgICogcGxh dGZvcm0vZ3JhcGhpY3MvRm9udENhc2NhZGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Rm9udENh c2NhZGU6OmRyYXdUZXh0IGNvbnN0KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9Gb250 Q2FzY2FkZS5oOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dC5j cHA6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQ6OmRyYXdUZXh0KToKKyAgICAg ICAgKFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dDo6ZHJhd0JpZGlUZXh0KToKKyAgICAgICAgKiBw bGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQuaDoKKwogMjAyMC0wNy0zMSAgTXlsZXMg Qy4gTWF4ZmllbGQgIDxtbWF4ZmllbGRAYXBwbGUuY29tPgogCiAgICAgICAgIENsZWFuIHVwIHRl eHQgbGF5b3V0IGNvZGUgYSBiaXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9JbnNwZWN0b3JPdmVybGF5LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0 b3JPdmVybGF5LmNwcAppbmRleCAzYWU3NWYzNTM2MzVmM2IxNjQ3YTU2Mzg3NGYwYTc4Y2M1YzRi YWUwLi4xMjlmMjk1NjcxMzIxNjk0NzM0NDMzODVjZTFjOWEzZjg5MDYyYWY4IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yT3ZlcmxheS5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvck92ZXJsYXkuY3BwCkBAIC0xMDU4LDE0ICsx MDU4LDEzIEBAIFBhdGggSW5zcGVjdG9yT3ZlcmxheTo6ZHJhd0VsZW1lbnRUaXRsZShHcmFwaGlj c0NvbnRleHQmIGNvbnRleHQsIE5vZGUmIG5vZGUsIGNvCiAKICAgICBjb250ZXh0LnN0cm9rZVBh dGgocGF0aCk7CiAKLSAgICBmbG9hdCB0ZXh0UG9zaXRpb25YID0gYm94WCArIGVsZW1lbnREYXRh U3BhY2luZzsKLSAgICBmbG9hdCB0ZXh0UG9zaXRpb25ZID0gYm94WSAtIChlbGVtZW50RGF0YVNw YWNpbmcgLyAyLjBmKSArIGZvbnRIZWlnaHQ7CisgICAgRmxvYXRQb2ludCB0ZXh0UG9zaXRpb24o Ym94WCArIGVsZW1lbnREYXRhU3BhY2luZywgYm94WSAtIChlbGVtZW50RGF0YVNwYWNpbmcgLyAy LjBmKSArIGZvbnRIZWlnaHQpOwogICAgIGNvbnN0IGF1dG8gZHJhd1RleHQgPSBbJl0gKGNvbnN0 IFN0cmluZyYgdGV4dCwgU1JHQkE8dWludDhfdD4gY29sb3IpIHsKICAgICAgICAgaWYgKHRleHQu aXNFbXB0eSgpKQogICAgICAgICAgICAgcmV0dXJuOwogCiAgICAgICAgIGNvbnRleHQuc2V0Rmls bENvbG9yKGNvbG9yKTsKLSAgICAgICAgdGV4dFBvc2l0aW9uWCArPSBjb250ZXh0LmRyYXdUZXh0 KGZvbnQsIFRleHRSdW4odGV4dCksIHsgdGV4dFBvc2l0aW9uWCwgdGV4dFBvc2l0aW9uWSB9KTsK KyAgICAgICAgdGV4dFBvc2l0aW9uICs9IGNvbnRleHQuZHJhd1RleHQoZm9udCwgVGV4dFJ1bih0 ZXh0KSwgdGV4dFBvc2l0aW9uKTsKICAgICB9OwogCiAgICAgZHJhd1RleHQoZWxlbWVudFRhZ05h bWUsIHsgMTM2LCAxOCwgMTI4IH0pOyAvLyBLZWVwIHRoaXMgaW4gc3luYyB3aXRoIFhNTFZpZXdl ci5jc3MgKC50YWcpCkBAIC0xMDgyLDkgKzEwODEsNiBAQCBQYXRoIEluc3BlY3Rvck92ZXJsYXk6 OmRyYXdFbGVtZW50VGl0bGUoR3JhcGhpY3NDb250ZXh0JiBjb250ZXh0LCBOb2RlJiBub2RlLCBj bwogICAgIGRyYXdUZXh0KCJweCJfcywgQ29sb3I6OmRhcmtHcmF5KTsKIAogICAgIGlmIChoYXNT ZWNvbmRMaW5lKSB7Ci0gICAgICAgIHRleHRQb3NpdGlvblggPSBib3hYICsgZWxlbWVudERhdGFT cGFjaW5nOwotICAgICAgICB0ZXh0UG9zaXRpb25ZICs9IGZvbnRIZWlnaHQ7Ci0KICAgICAgICAg ZHJhd1RleHQoIlJvbGUiX3MsIHsgMTcwLCAxMywgMTQ1IH0pOwogICAgICAgICBkcmF3VGV4dCgi ICJfcywgQ29sb3I6OmJsYWNrKTsKICAgICAgICAgZHJhd1RleHQoZWxlbWVudFJvbGUsIENvbG9y OjpibGFjayk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0RlYnVnUGFnZU92ZXJs YXlzLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRGVidWdQYWdlT3ZlcmxheXMuY3BwCmluZGV4 IGVlZjBkYmY5ZWZmZDE4ZGRmZWNkZjMyOWMyYjU3NzljZjZlMzM1MzkuLmNmYmZkMjk0MGQ3OTY1 ZDhhZTNmYmVjM2RkMmRiOTA2MmVlMzg1OWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bh Z2UvRGVidWdQYWdlT3ZlcmxheXMuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRGVidWdQ YWdlT3ZlcmxheXMuY3BwCkBAIC0xNjcsOCArMTY3LDcgQEAgc3RhdGljIHZvaWQgZHJhd1JpZ2h0 QWxpZ25lZFRleHQoY29uc3QgU3RyaW5nJiB0ZXh0LCBHcmFwaGljc0NvbnRleHQmIGNvbnRleHQs IGMKICAgICBmbG9hdCB0ZXh0QmFzZWxpbmVGcm9tVG9wID0gMTQ7CiAKICAgICBUZXh0UnVuIHRl eHRSdW4gPSBUZXh0UnVuKHRleHQpOwotICAgIGNvbnRleHQuc2V0RmlsbENvbG9yKENvbG9yOjp0 cmFuc3BhcmVudEJsYWNrKTsKLSAgICBmbG9hdCB0ZXh0V2lkdGggPSBjb250ZXh0LmRyYXdUZXh0 KGZvbnQsIHRleHRSdW4sIHsgfSk7CisgICAgZmxvYXQgdGV4dFdpZHRoID0gZm9udC53aWR0aCh0 ZXh0UnVuKTsKICAgICBjb250ZXh0LnNldEZpbGxDb2xvcihDb2xvcjo6YmxhY2spOwogICAgIGNv bnRleHQuZHJhd1RleHQoZm9udCwgdGV4dFJ1biwgYm94TG9jYXRpb24gKyBGbG9hdFNpemUoLSh0 ZXh0V2lkdGggKyB0ZXh0R2FwKSwgdGV4dEJhc2VsaW5lRnJvbVRvcCkpOwogfQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udENhc2NhZGUuY3BwIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udENhc2NhZGUuY3BwCmluZGV4IDY4ODA3 MjYwM2MwMTMxZjJiNmJlNTBjZmUwN2YzMzI2NzdlYzg4NGEuLjhjMTExMDlmZGIyZWEzM2NmMmIy ODg4ZjljZDBkMTAwYTk5NGJjMGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL0ZvbnRDYXNjYWRlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9Gb250Q2FzY2FkZS5jcHAKQEAgLTI5MywxOCArMjkzLDE3IEBAIEdseXBoQnVmZmVy IEZvbnRDYXNjYWRlOjpsYXlvdXRUZXh0KENvZGVQYXRoIGNvZGVQYXRoVG9Vc2UsIGNvbnN0IFRl eHRSdW4mIHJ1biwKICAgICByZXR1cm4gbGF5b3V0Q29tcGxleFRleHQocnVuLCBmcm9tLCB0bywg c2hvdWxkU2F2ZU9mZnNldHMsIGZvclRleHRFbXBoYXNpcyk7CiB9CiAKLWZsb2F0IEZvbnRDYXNj YWRlOjpkcmF3VGV4dChHcmFwaGljc0NvbnRleHQmIGNvbnRleHQsIGNvbnN0IFRleHRSdW4mIHJ1 biwgY29uc3QgRmxvYXRQb2ludCYgcG9pbnQsIHVuc2lnbmVkIGZyb20sIE9wdGlvbmFsPHVuc2ln bmVkPiB0bywgQ3VzdG9tRm9udE5vdFJlYWR5QWN0aW9uIGN1c3RvbUZvbnROb3RSZWFkeUFjdGlv bikgY29uc3QKK0Zsb2F0U2l6ZSBGb250Q2FzY2FkZTo6ZHJhd1RleHQoR3JhcGhpY3NDb250ZXh0 JiBjb250ZXh0LCBjb25zdCBUZXh0UnVuJiBydW4sIGNvbnN0IEZsb2F0UG9pbnQmIHBvaW50LCB1 bnNpZ25lZCBmcm9tLCBPcHRpb25hbDx1bnNpZ25lZD4gdG8sIEN1c3RvbUZvbnROb3RSZWFkeUFj dGlvbiBjdXN0b21Gb250Tm90UmVhZHlBY3Rpb24pIGNvbnN0CiB7CiAgICAgdW5zaWduZWQgZGVz dGluYXRpb24gPSB0by52YWx1ZU9yKHJ1bi5sZW5ndGgoKSk7CiAgICAgYXV0byBnbHlwaEJ1ZmZl ciA9IGxheW91dFRleHQoY29kZVBhdGgocnVuLCBmcm9tLCB0byksIHJ1biwgZnJvbSwgZGVzdGlu YXRpb24pOwotICAgIEZsb2F0UG9pbnQgc3RhcnRQb2ludCA9IHBvaW50ICsgRmxvYXRTaXplKGds eXBoQnVmZmVyLmluaXRpYWxBZHZhbmNlKCkpOwotICAgIC8vIFdlIGNvdWxkbid0IGdlbmVyYXRl IGFueSBnbHlwaHMgZm9yIHRoZSBydW4uIEdpdmUgdXAuCisKICAgICBpZiAoZ2x5cGhCdWZmZXIu aXNFbXB0eSgpKQotICAgICAgICByZXR1cm4gMDsKLSAgICAvLyBEcmF3IHRoZSBnbHlwaCBidWZm ZXIgbm93IGF0IHRoZSBzdGFydGluZyBwb2ludCByZXR1cm5lZCBpbiBzdGFydFguCi0gICAgZmxv YXQgb2xkU3RhcnRYID0gc3RhcnRQb2ludC54KCk7CisgICAgICAgIHJldHVybiBGbG9hdFNpemUo KTsKKworICAgIEZsb2F0UG9pbnQgc3RhcnRQb2ludCA9IHBvaW50ICsgRmxvYXRTaXplKGdseXBo QnVmZmVyLmluaXRpYWxBZHZhbmNlKCkpOwogICAgIGRyYXdHbHlwaEJ1ZmZlcihjb250ZXh0LCBn bHlwaEJ1ZmZlciwgc3RhcnRQb2ludCwgY3VzdG9tRm9udE5vdFJlYWR5QWN0aW9uKTsKLSAgICBy ZXR1cm4gc3RhcnRQb2ludC54KCkgLSBvbGRTdGFydFg7CisgICAgcmV0dXJuIHN0YXJ0UG9pbnQg LSBwb2ludDsKIH0KIAogdm9pZCBGb250Q2FzY2FkZTo6ZHJhd0VtcGhhc2lzTWFya3MoR3JhcGhp Y3NDb250ZXh0JiBjb250ZXh0LCBjb25zdCBUZXh0UnVuJiBydW4sIGNvbnN0IEF0b21TdHJpbmcm IG1hcmssIGNvbnN0IEZsb2F0UG9pbnQmIHBvaW50LCB1bnNpZ25lZCBmcm9tLCBPcHRpb25hbDx1 bnNpZ25lZD4gdG8pIGNvbnN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9Gb250Q2FzY2FkZS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Rm9udENhc2NhZGUuaAppbmRleCA5NTlkOGYzMzE5Mzk3NzkxMDZmOGE2OTYwNTI2OTU1MzNjODY1 YzVkLi4wMmY1ZDMzNTU1NGQwMGU2MjE2MDA5MDBiMjY1MjhmMjVjNjIyYTVmIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250Q2FzY2FkZS5oCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnRDYXNjYWRlLmgKQEAgLTEwOCw3ICsx MDgsNyBAQCBwdWJsaWM6CiAgICAgV0VCQ09SRV9FWFBPUlQgdm9pZCB1cGRhdGUoUmVmUHRyPEZv bnRTZWxlY3Rvcj4mJiA9IG51bGxwdHIpIGNvbnN0OwogCiAgICAgZW51bSBDdXN0b21Gb250Tm90 UmVhZHlBY3Rpb24geyBEb05vdFBhaW50SWZGb250Tm90UmVhZHksIFVzZUZhbGxiYWNrSWZGb250 Tm90UmVhZHkgfTsKLSAgICBXRUJDT1JFX0VYUE9SVCBmbG9hdCBkcmF3VGV4dChHcmFwaGljc0Nv bnRleHQmLCBjb25zdCBUZXh0UnVuJiwgY29uc3QgRmxvYXRQb2ludCYsIHVuc2lnbmVkIGZyb20g PSAwLCBPcHRpb25hbDx1bnNpZ25lZD4gdG8gPSBXVEY6Om51bGxvcHQsIEN1c3RvbUZvbnROb3RS ZWFkeUFjdGlvbiA9IERvTm90UGFpbnRJZkZvbnROb3RSZWFkeSkgY29uc3Q7CisgICAgV0VCQ09S RV9FWFBPUlQgRmxvYXRTaXplIGRyYXdUZXh0KEdyYXBoaWNzQ29udGV4dCYsIGNvbnN0IFRleHRS dW4mLCBjb25zdCBGbG9hdFBvaW50JiwgdW5zaWduZWQgZnJvbSA9IDAsIE9wdGlvbmFsPHVuc2ln bmVkPiB0byA9IFdURjo6bnVsbG9wdCwgQ3VzdG9tRm9udE5vdFJlYWR5QWN0aW9uID0gRG9Ob3RQ YWludElmRm9udE5vdFJlYWR5KSBjb25zdDsKICAgICBzdGF0aWMgdm9pZCBkcmF3R2x5cGhzKEdy YXBoaWNzQ29udGV4dCYsIGNvbnN0IEZvbnQmLCBjb25zdCBHbHlwaEJ1ZmZlciYsIHVuc2lnbmVk IGZyb20sIHVuc2lnbmVkIG51bUdseXBocywgY29uc3QgRmxvYXRQb2ludCYsIEZvbnRTbW9vdGhp bmdNb2RlKTsKICAgICB2b2lkIGRyYXdFbXBoYXNpc01hcmtzKEdyYXBoaWNzQ29udGV4dCYsIGNv bnN0IFRleHRSdW4mLCBjb25zdCBBdG9tU3RyaW5nJiBtYXJrLCBjb25zdCBGbG9hdFBvaW50Jiwg dW5zaWduZWQgZnJvbSA9IDAsIE9wdGlvbmFsPHVuc2lnbmVkPiB0byA9IFdURjo6bnVsbG9wdCkg Y29uc3Q7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dy YXBoaWNzQ29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFw aGljc0NvbnRleHQuY3BwCmluZGV4IGU0ODBkMDg1NGE4Mjg5NWUyMjc2MzUwYWE4ODYzMWYyMzVh MzZhZDIuLmE4NGY2MjljYWE1OTRiNjM2NTBjMGMyYzQyNDZjMGEzOWI2MDJmZjggMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dC5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250ZXh0LmNw cApAQCAtNjYwLDEwICs2NjAsMTAgQEAgdm9pZCBHcmFwaGljc0NvbnRleHQ6OmVuZFRyYW5zcGFy ZW5jeUxheWVyKCkKICAgICAtLW1fdHJhbnNwYXJlbmN5Q291bnQ7CiB9CiAKLWZsb2F0IEdyYXBo aWNzQ29udGV4dDo6ZHJhd1RleHQoY29uc3QgRm9udENhc2NhZGUmIGZvbnQsIGNvbnN0IFRleHRS dW4mIHJ1biwgY29uc3QgRmxvYXRQb2ludCYgcG9pbnQsIHVuc2lnbmVkIGZyb20sIE9wdGlvbmFs PHVuc2lnbmVkPiB0bykKK0Zsb2F0U2l6ZSBHcmFwaGljc0NvbnRleHQ6OmRyYXdUZXh0KGNvbnN0 IEZvbnRDYXNjYWRlJiBmb250LCBjb25zdCBUZXh0UnVuJiBydW4sIGNvbnN0IEZsb2F0UG9pbnQm IHBvaW50LCB1bnNpZ25lZCBmcm9tLCBPcHRpb25hbDx1bnNpZ25lZD4gdG8pCiB7CiAgICAgaWYg KHBhaW50aW5nRGlzYWJsZWQoKSkKLSAgICAgICAgcmV0dXJuIDA7CisgICAgICAgIHJldHVybiBG bG9hdFNpemUoKTsKIAogICAgIC8vIERpc3BsYXkgbGlzdCByZWNvcmRpbmcgZm9yIHRleHQgY29u dGVudCBpcyBkb25lIGF0IGdseXBocyBsZXZlbC4gU2VlIEdyYXBoaWNzQ29udGV4dDo6ZHJhd0ds eXBocy4KICAgICByZXR1cm4gZm9udC5kcmF3VGV4dCgqdGhpcywgcnVuLCBwb2ludCwgZnJvbSwg dG8pOwpAQCAtNzE1LDggKzcxNSw4IEBAIHZvaWQgR3JhcGhpY3NDb250ZXh0OjpkcmF3QmlkaVRl eHQoY29uc3QgRm9udENhc2NhZGUmIGZvbnQsIGNvbnN0IFRleHRSdW4mIHJ1biwKICAgICAgICAg c3VicnVuLnNldERpcmVjdGlvbihpc1JUTCA/IFRleHREaXJlY3Rpb246OlJUTCA6IFRleHREaXJl Y3Rpb246OkxUUik7CiAgICAgICAgIHN1YnJ1bi5zZXREaXJlY3Rpb25hbE92ZXJyaWRlKGJpZGlS dW4tPmRpck92ZXJyaWRlKGZhbHNlKSk7CiAKLSAgICAgICAgZmxvYXQgd2lkdGggPSBmb250LmRy YXdUZXh0KCp0aGlzLCBzdWJydW4sIGN1cnJQb2ludCwgMCwgV1RGOjpudWxsb3B0LCBjdXN0b21G b250Tm90UmVhZHlBY3Rpb24pOwotICAgICAgICBjdXJyUG9pbnQubW92ZSh3aWR0aCwgMCk7Cisg ICAgICAgIGF1dG8gYWR2YW5jZSA9IGZvbnQuZHJhd1RleHQoKnRoaXMsIHN1YnJ1biwgY3VyclBv aW50LCAwLCBXVEY6Om51bGxvcHQsIGN1c3RvbUZvbnROb3RSZWFkeUFjdGlvbik7CisgICAgICAg IGN1cnJQb2ludC5tb3ZlKGFkdmFuY2UpOwogCiAgICAgICAgIGJpZGlSdW4gPSBiaWRpUnVuLT5u ZXh0KCk7CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvR3JhcGhpY3NDb250ZXh0LmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9H cmFwaGljc0NvbnRleHQuaAppbmRleCA5ZGNkZGU5OThmMzQxMzQyNzcyMjY4Njk0Yzk5OGFiZTYw Yzg0YWQ5Li4yMjA1YThjY2RjMjZiNzliMGYwYTFhNDMxNzc2MmUxMTUwMDNlODdhIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQuaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQuaApA QCAtNDE5LDcgKzQxOSw3IEBAIHB1YmxpYzoKICAgICBib29sIHVzZURhcmtBcHBlYXJhbmNlKCkg Y29uc3QgeyByZXR1cm4gbV9zdGF0ZS51c2VEYXJrQXBwZWFyYW5jZTsgfQogI2VuZGlmCiAKLSAg ICBmbG9hdCBkcmF3VGV4dChjb25zdCBGb250Q2FzY2FkZSYsIGNvbnN0IFRleHRSdW4mLCBjb25z dCBGbG9hdFBvaW50JiwgdW5zaWduZWQgZnJvbSA9IDAsIE9wdGlvbmFsPHVuc2lnbmVkPiB0byA9 IFdURjo6bnVsbG9wdCk7CisgICAgRmxvYXRTaXplIGRyYXdUZXh0KGNvbnN0IEZvbnRDYXNjYWRl JiwgY29uc3QgVGV4dFJ1biYsIGNvbnN0IEZsb2F0UG9pbnQmLCB1bnNpZ25lZCBmcm9tID0gMCwg T3B0aW9uYWw8dW5zaWduZWQ+IHRvID0gV1RGOjpudWxsb3B0KTsKICAgICB2b2lkIGRyYXdHbHlw aHMoY29uc3QgRm9udCYsIGNvbnN0IEdseXBoQnVmZmVyJiwgdW5zaWduZWQgZnJvbSwgdW5zaWdu ZWQgbnVtR2x5cGhzLCBjb25zdCBGbG9hdFBvaW50JiwgRm9udFNtb290aGluZ01vZGUpOwogICAg IHZvaWQgZHJhd0VtcGhhc2lzTWFya3MoY29uc3QgRm9udENhc2NhZGUmLCBjb25zdCBUZXh0UnVu JiwgY29uc3QgQXRvbVN0cmluZyYgbWFyaywgY29uc3QgRmxvYXRQb2ludCYsIHVuc2lnbmVkIGZy b20gPSAwLCBPcHRpb25hbDx1bnNpZ25lZD4gdG8gPSBXVEY6Om51bGxvcHQpOwogICAgIHZvaWQg ZHJhd0JpZGlUZXh0KGNvbnN0IEZvbnRDYXNjYWRlJiwgY29uc3QgVGV4dFJ1biYsIGNvbnN0IEZs b2F0UG9pbnQmLCBGb250Q2FzY2FkZTo6Q3VzdG9tRm9udE5vdFJlYWR5QWN0aW9uID0gRm9udENh c2NhZGU6OkRvTm90UGFpbnRJZkZvbnROb3RSZWFkeSk7Cg== 405791 2020-08-01 12:28:21 -0700 2020-08-03 15:21:14 -0700 Patch bug-215055-20200801122821.patch text/plain 9610 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMjY1MTcxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzQzMzUzZmU1ZThjOTRh NWQ1ZmNkOTgzNTc4YWNmOTQzYTIzM2M5Mi4uMDhlNDAxNjZiYzA5ZDVhOTg4MTA2YmM0YjQ2MWNl NTMxMzVmMGRkMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDIwLTA4LTAxICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgTWFrZSBGb250 Q2FzY2FkZS5kcmF3VGV4dCgpIHJldHVybiBhIEZsb2F0U2l6ZSBpbnN0ZWFkIG9mIGEgZmxvYXQK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNTA1NQor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkdmFuY2Vz IGFyZSBwaGlsb3NvcGhpY2FsbHkgdHdvLWRpbWVuc2lvbmFsIGRhdGEgc3RydWN0dXJlcy4KKwor ICAgICAgICBUaGlzIGlzIGluIHByZXBhcmF0aW9uIGZvciBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MjE0NzY5CisgICAgICAgIGFuZCBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA2MjA4LgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyBiZWNh dXNlIHRoZXJlIHNob3VsZG4ndCBiZSBhbnkgYmVoYXZpb3IgY2hhbmdlLiBCdXQgaW4gdGhlIHdl aXJkCisgICAgICAgIHJhcmUgY2FzZSB3aGVyZSB0aGVyZSBtaWdodCBiZSwgd2Ugc2hvdWxkIGJl IGRlZmVuc2l2ZSBhbmQgaGFuZGxlIGl0IGNvcnJlY3RseS4KKyAgICAgICAgSSd2ZSBuZXZlciBz ZWVuIG9uZSBvZiB0aGVzZSBjYXNlcywgdGhvdWdoLgorCisgICAgICAgICogaW5zcGVjdG9yL0lu c3BlY3Rvck92ZXJsYXkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yT3ZlcmxheTo6 ZHJhd0VsZW1lbnRUaXRsZSk6CisgICAgICAgICogcGFnZS9EZWJ1Z1BhZ2VPdmVybGF5cy5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpkcmF3UmlnaHRBbGlnbmVkVGV4dCk6CisgICAgICAgICogcGxh dGZvcm0vZ3JhcGhpY3MvRm9udENhc2NhZGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Rm9udENh c2NhZGU6OmRyYXdUZXh0IGNvbnN0KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9Gb250 Q2FzY2FkZS5oOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dC5j cHA6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQ6OmRyYXdUZXh0KToKKyAgICAg ICAgKFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dDo6ZHJhd0JpZGlUZXh0KToKKyAgICAgICAgKiBw bGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQuaDoKKwogMjAyMC0wNy0zMSAgTXlsZXMg Qy4gTWF4ZmllbGQgIDxtbWF4ZmllbGRAYXBwbGUuY29tPgogCiAgICAgICAgIENsZWFuIHVwIHRl eHQgbGF5b3V0IGNvZGUgYSBiaXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9JbnNwZWN0b3JPdmVybGF5LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0 b3JPdmVybGF5LmNwcAppbmRleCAzYWU3NWYzNTM2MzVmM2IxNjQ3YTU2Mzg3NGYwYTc4Y2M1YzRi YWUwLi4xMjlmMjk1NjcxMzIxNjk0NzM0NDMzODVjZTFjOWEzZjg5MDYyYWY4IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yT3ZlcmxheS5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvck92ZXJsYXkuY3BwCkBAIC0xMDU4LDE0ICsx MDU4LDEzIEBAIFBhdGggSW5zcGVjdG9yT3ZlcmxheTo6ZHJhd0VsZW1lbnRUaXRsZShHcmFwaGlj c0NvbnRleHQmIGNvbnRleHQsIE5vZGUmIG5vZGUsIGNvCiAKICAgICBjb250ZXh0LnN0cm9rZVBh dGgocGF0aCk7CiAKLSAgICBmbG9hdCB0ZXh0UG9zaXRpb25YID0gYm94WCArIGVsZW1lbnREYXRh U3BhY2luZzsKLSAgICBmbG9hdCB0ZXh0UG9zaXRpb25ZID0gYm94WSAtIChlbGVtZW50RGF0YVNw YWNpbmcgLyAyLjBmKSArIGZvbnRIZWlnaHQ7CisgICAgRmxvYXRQb2ludCB0ZXh0UG9zaXRpb24o Ym94WCArIGVsZW1lbnREYXRhU3BhY2luZywgYm94WSAtIChlbGVtZW50RGF0YVNwYWNpbmcgLyAy LjBmKSArIGZvbnRIZWlnaHQpOwogICAgIGNvbnN0IGF1dG8gZHJhd1RleHQgPSBbJl0gKGNvbnN0 IFN0cmluZyYgdGV4dCwgU1JHQkE8dWludDhfdD4gY29sb3IpIHsKICAgICAgICAgaWYgKHRleHQu aXNFbXB0eSgpKQogICAgICAgICAgICAgcmV0dXJuOwogCiAgICAgICAgIGNvbnRleHQuc2V0Rmls bENvbG9yKGNvbG9yKTsKLSAgICAgICAgdGV4dFBvc2l0aW9uWCArPSBjb250ZXh0LmRyYXdUZXh0 KGZvbnQsIFRleHRSdW4odGV4dCksIHsgdGV4dFBvc2l0aW9uWCwgdGV4dFBvc2l0aW9uWSB9KTsK KyAgICAgICAgdGV4dFBvc2l0aW9uICs9IGNvbnRleHQuZHJhd1RleHQoZm9udCwgVGV4dFJ1bih0 ZXh0KSwgdGV4dFBvc2l0aW9uKTsKICAgICB9OwogCiAgICAgZHJhd1RleHQoZWxlbWVudFRhZ05h bWUsIHsgMTM2LCAxOCwgMTI4IH0pOyAvLyBLZWVwIHRoaXMgaW4gc3luYyB3aXRoIFhNTFZpZXdl ci5jc3MgKC50YWcpCkBAIC0xMDgyLDkgKzEwODEsNiBAQCBQYXRoIEluc3BlY3Rvck92ZXJsYXk6 OmRyYXdFbGVtZW50VGl0bGUoR3JhcGhpY3NDb250ZXh0JiBjb250ZXh0LCBOb2RlJiBub2RlLCBj bwogICAgIGRyYXdUZXh0KCJweCJfcywgQ29sb3I6OmRhcmtHcmF5KTsKIAogICAgIGlmIChoYXNT ZWNvbmRMaW5lKSB7Ci0gICAgICAgIHRleHRQb3NpdGlvblggPSBib3hYICsgZWxlbWVudERhdGFT cGFjaW5nOwotICAgICAgICB0ZXh0UG9zaXRpb25ZICs9IGZvbnRIZWlnaHQ7Ci0KICAgICAgICAg ZHJhd1RleHQoIlJvbGUiX3MsIHsgMTcwLCAxMywgMTQ1IH0pOwogICAgICAgICBkcmF3VGV4dCgi ICJfcywgQ29sb3I6OmJsYWNrKTsKICAgICAgICAgZHJhd1RleHQoZWxlbWVudFJvbGUsIENvbG9y OjpibGFjayk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0RlYnVnUGFnZU92ZXJs YXlzLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRGVidWdQYWdlT3ZlcmxheXMuY3BwCmluZGV4 IGVlZjBkYmY5ZWZmZDE4ZGRmZWNkZjMyOWMyYjU3NzljZjZlMzM1MzkuLmNmYmZkMjk0MGQ3OTY1 ZDhhZTNmYmVjM2RkMmRiOTA2MmVlMzg1OWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bh Z2UvRGVidWdQYWdlT3ZlcmxheXMuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRGVidWdQ YWdlT3ZlcmxheXMuY3BwCkBAIC0xNjcsOCArMTY3LDcgQEAgc3RhdGljIHZvaWQgZHJhd1JpZ2h0 QWxpZ25lZFRleHQoY29uc3QgU3RyaW5nJiB0ZXh0LCBHcmFwaGljc0NvbnRleHQmIGNvbnRleHQs IGMKICAgICBmbG9hdCB0ZXh0QmFzZWxpbmVGcm9tVG9wID0gMTQ7CiAKICAgICBUZXh0UnVuIHRl eHRSdW4gPSBUZXh0UnVuKHRleHQpOwotICAgIGNvbnRleHQuc2V0RmlsbENvbG9yKENvbG9yOjp0 cmFuc3BhcmVudEJsYWNrKTsKLSAgICBmbG9hdCB0ZXh0V2lkdGggPSBjb250ZXh0LmRyYXdUZXh0 KGZvbnQsIHRleHRSdW4sIHsgfSk7CisgICAgZmxvYXQgdGV4dFdpZHRoID0gZm9udC53aWR0aCh0 ZXh0UnVuKTsKICAgICBjb250ZXh0LnNldEZpbGxDb2xvcihDb2xvcjo6YmxhY2spOwogICAgIGNv bnRleHQuZHJhd1RleHQoZm9udCwgdGV4dFJ1biwgYm94TG9jYXRpb24gKyBGbG9hdFNpemUoLSh0 ZXh0V2lkdGggKyB0ZXh0R2FwKSwgdGV4dEJhc2VsaW5lRnJvbVRvcCkpOwogfQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udENhc2NhZGUuY3BwIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udENhc2NhZGUuY3BwCmluZGV4IDY4ODA3 MjYwM2MwMTMxZjJiNmJlNTBjZmUwN2YzMzI2NzdlYzg4NGEuLjhjMTExMDlmZGIyZWEzM2NmMmIy ODg4ZjljZDBkMTAwYTk5NGJjMGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL0ZvbnRDYXNjYWRlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9Gb250Q2FzY2FkZS5jcHAKQEAgLTI5MywxOCArMjkzLDE3IEBAIEdseXBoQnVmZmVy IEZvbnRDYXNjYWRlOjpsYXlvdXRUZXh0KENvZGVQYXRoIGNvZGVQYXRoVG9Vc2UsIGNvbnN0IFRl eHRSdW4mIHJ1biwKICAgICByZXR1cm4gbGF5b3V0Q29tcGxleFRleHQocnVuLCBmcm9tLCB0bywg c2hvdWxkU2F2ZU9mZnNldHMsIGZvclRleHRFbXBoYXNpcyk7CiB9CiAKLWZsb2F0IEZvbnRDYXNj YWRlOjpkcmF3VGV4dChHcmFwaGljc0NvbnRleHQmIGNvbnRleHQsIGNvbnN0IFRleHRSdW4mIHJ1 biwgY29uc3QgRmxvYXRQb2ludCYgcG9pbnQsIHVuc2lnbmVkIGZyb20sIE9wdGlvbmFsPHVuc2ln bmVkPiB0bywgQ3VzdG9tRm9udE5vdFJlYWR5QWN0aW9uIGN1c3RvbUZvbnROb3RSZWFkeUFjdGlv bikgY29uc3QKK0Zsb2F0U2l6ZSBGb250Q2FzY2FkZTo6ZHJhd1RleHQoR3JhcGhpY3NDb250ZXh0 JiBjb250ZXh0LCBjb25zdCBUZXh0UnVuJiBydW4sIGNvbnN0IEZsb2F0UG9pbnQmIHBvaW50LCB1 bnNpZ25lZCBmcm9tLCBPcHRpb25hbDx1bnNpZ25lZD4gdG8sIEN1c3RvbUZvbnROb3RSZWFkeUFj dGlvbiBjdXN0b21Gb250Tm90UmVhZHlBY3Rpb24pIGNvbnN0CiB7CiAgICAgdW5zaWduZWQgZGVz dGluYXRpb24gPSB0by52YWx1ZU9yKHJ1bi5sZW5ndGgoKSk7CiAgICAgYXV0byBnbHlwaEJ1ZmZl ciA9IGxheW91dFRleHQoY29kZVBhdGgocnVuLCBmcm9tLCB0byksIHJ1biwgZnJvbSwgZGVzdGlu YXRpb24pOwotICAgIEZsb2F0UG9pbnQgc3RhcnRQb2ludCA9IHBvaW50ICsgRmxvYXRTaXplKGds eXBoQnVmZmVyLmluaXRpYWxBZHZhbmNlKCkpOwotICAgIC8vIFdlIGNvdWxkbid0IGdlbmVyYXRl IGFueSBnbHlwaHMgZm9yIHRoZSBydW4uIEdpdmUgdXAuCisKICAgICBpZiAoZ2x5cGhCdWZmZXIu aXNFbXB0eSgpKQotICAgICAgICByZXR1cm4gMDsKLSAgICAvLyBEcmF3IHRoZSBnbHlwaCBidWZm ZXIgbm93IGF0IHRoZSBzdGFydGluZyBwb2ludCByZXR1cm5lZCBpbiBzdGFydFguCi0gICAgZmxv YXQgb2xkU3RhcnRYID0gc3RhcnRQb2ludC54KCk7CisgICAgICAgIHJldHVybiBGbG9hdFNpemUo KTsKKworICAgIEZsb2F0UG9pbnQgc3RhcnRQb2ludCA9IHBvaW50ICsgRmxvYXRTaXplKGdseXBo QnVmZmVyLmluaXRpYWxBZHZhbmNlKCkpOwogICAgIGRyYXdHbHlwaEJ1ZmZlcihjb250ZXh0LCBn bHlwaEJ1ZmZlciwgc3RhcnRQb2ludCwgY3VzdG9tRm9udE5vdFJlYWR5QWN0aW9uKTsKLSAgICBy ZXR1cm4gc3RhcnRQb2ludC54KCkgLSBvbGRTdGFydFg7CisgICAgcmV0dXJuIHN0YXJ0UG9pbnQg LSBwb2ludDsKIH0KIAogdm9pZCBGb250Q2FzY2FkZTo6ZHJhd0VtcGhhc2lzTWFya3MoR3JhcGhp Y3NDb250ZXh0JiBjb250ZXh0LCBjb25zdCBUZXh0UnVuJiBydW4sIGNvbnN0IEF0b21TdHJpbmcm IG1hcmssIGNvbnN0IEZsb2F0UG9pbnQmIHBvaW50LCB1bnNpZ25lZCBmcm9tLCBPcHRpb25hbDx1 bnNpZ25lZD4gdG8pIGNvbnN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9Gb250Q2FzY2FkZS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Rm9udENhc2NhZGUuaAppbmRleCA5NTlkOGYzMzE5Mzk3NzkxMDZmOGE2OTYwNTI2OTU1MzNjODY1 YzVkLi4wMmY1ZDMzNTU1NGQwMGU2MjE2MDA5MDBiMjY1MjhmMjVjNjIyYTVmIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250Q2FzY2FkZS5oCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnRDYXNjYWRlLmgKQEAgLTEwOCw3ICsx MDgsNyBAQCBwdWJsaWM6CiAgICAgV0VCQ09SRV9FWFBPUlQgdm9pZCB1cGRhdGUoUmVmUHRyPEZv bnRTZWxlY3Rvcj4mJiA9IG51bGxwdHIpIGNvbnN0OwogCiAgICAgZW51bSBDdXN0b21Gb250Tm90 UmVhZHlBY3Rpb24geyBEb05vdFBhaW50SWZGb250Tm90UmVhZHksIFVzZUZhbGxiYWNrSWZGb250 Tm90UmVhZHkgfTsKLSAgICBXRUJDT1JFX0VYUE9SVCBmbG9hdCBkcmF3VGV4dChHcmFwaGljc0Nv bnRleHQmLCBjb25zdCBUZXh0UnVuJiwgY29uc3QgRmxvYXRQb2ludCYsIHVuc2lnbmVkIGZyb20g PSAwLCBPcHRpb25hbDx1bnNpZ25lZD4gdG8gPSBXVEY6Om51bGxvcHQsIEN1c3RvbUZvbnROb3RS ZWFkeUFjdGlvbiA9IERvTm90UGFpbnRJZkZvbnROb3RSZWFkeSkgY29uc3Q7CisgICAgV0VCQ09S RV9FWFBPUlQgRmxvYXRTaXplIGRyYXdUZXh0KEdyYXBoaWNzQ29udGV4dCYsIGNvbnN0IFRleHRS dW4mLCBjb25zdCBGbG9hdFBvaW50JiwgdW5zaWduZWQgZnJvbSA9IDAsIE9wdGlvbmFsPHVuc2ln bmVkPiB0byA9IFdURjo6bnVsbG9wdCwgQ3VzdG9tRm9udE5vdFJlYWR5QWN0aW9uID0gRG9Ob3RQ YWludElmRm9udE5vdFJlYWR5KSBjb25zdDsKICAgICBzdGF0aWMgdm9pZCBkcmF3R2x5cGhzKEdy YXBoaWNzQ29udGV4dCYsIGNvbnN0IEZvbnQmLCBjb25zdCBHbHlwaEJ1ZmZlciYsIHVuc2lnbmVk IGZyb20sIHVuc2lnbmVkIG51bUdseXBocywgY29uc3QgRmxvYXRQb2ludCYsIEZvbnRTbW9vdGhp bmdNb2RlKTsKICAgICB2b2lkIGRyYXdFbXBoYXNpc01hcmtzKEdyYXBoaWNzQ29udGV4dCYsIGNv bnN0IFRleHRSdW4mLCBjb25zdCBBdG9tU3RyaW5nJiBtYXJrLCBjb25zdCBGbG9hdFBvaW50Jiwg dW5zaWduZWQgZnJvbSA9IDAsIE9wdGlvbmFsPHVuc2lnbmVkPiB0byA9IFdURjo6bnVsbG9wdCkg Y29uc3Q7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dy YXBoaWNzQ29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFw aGljc0NvbnRleHQuY3BwCmluZGV4IGU0ODBkMDg1NGE4Mjg5NWUyMjc2MzUwYWE4ODYzMWYyMzVh MzZhZDIuLmE4NGY2MjljYWE1OTRiNjM2NTBjMGMyYzQyNDZjMGEzOWI2MDJmZjggMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dC5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250ZXh0LmNw cApAQCAtNjYwLDEwICs2NjAsMTAgQEAgdm9pZCBHcmFwaGljc0NvbnRleHQ6OmVuZFRyYW5zcGFy ZW5jeUxheWVyKCkKICAgICAtLW1fdHJhbnNwYXJlbmN5Q291bnQ7CiB9CiAKLWZsb2F0IEdyYXBo aWNzQ29udGV4dDo6ZHJhd1RleHQoY29uc3QgRm9udENhc2NhZGUmIGZvbnQsIGNvbnN0IFRleHRS dW4mIHJ1biwgY29uc3QgRmxvYXRQb2ludCYgcG9pbnQsIHVuc2lnbmVkIGZyb20sIE9wdGlvbmFs PHVuc2lnbmVkPiB0bykKK0Zsb2F0U2l6ZSBHcmFwaGljc0NvbnRleHQ6OmRyYXdUZXh0KGNvbnN0 IEZvbnRDYXNjYWRlJiBmb250LCBjb25zdCBUZXh0UnVuJiBydW4sIGNvbnN0IEZsb2F0UG9pbnQm IHBvaW50LCB1bnNpZ25lZCBmcm9tLCBPcHRpb25hbDx1bnNpZ25lZD4gdG8pCiB7CiAgICAgaWYg KHBhaW50aW5nRGlzYWJsZWQoKSkKLSAgICAgICAgcmV0dXJuIDA7CisgICAgICAgIHJldHVybiBG bG9hdFNpemUoKTsKIAogICAgIC8vIERpc3BsYXkgbGlzdCByZWNvcmRpbmcgZm9yIHRleHQgY29u dGVudCBpcyBkb25lIGF0IGdseXBocyBsZXZlbC4gU2VlIEdyYXBoaWNzQ29udGV4dDo6ZHJhd0ds eXBocy4KICAgICByZXR1cm4gZm9udC5kcmF3VGV4dCgqdGhpcywgcnVuLCBwb2ludCwgZnJvbSwg dG8pOwpAQCAtNzE1LDggKzcxNSw4IEBAIHZvaWQgR3JhcGhpY3NDb250ZXh0OjpkcmF3QmlkaVRl eHQoY29uc3QgRm9udENhc2NhZGUmIGZvbnQsIGNvbnN0IFRleHRSdW4mIHJ1biwKICAgICAgICAg c3VicnVuLnNldERpcmVjdGlvbihpc1JUTCA/IFRleHREaXJlY3Rpb246OlJUTCA6IFRleHREaXJl Y3Rpb246OkxUUik7CiAgICAgICAgIHN1YnJ1bi5zZXREaXJlY3Rpb25hbE92ZXJyaWRlKGJpZGlS dW4tPmRpck92ZXJyaWRlKGZhbHNlKSk7CiAKLSAgICAgICAgZmxvYXQgd2lkdGggPSBmb250LmRy YXdUZXh0KCp0aGlzLCBzdWJydW4sIGN1cnJQb2ludCwgMCwgV1RGOjpudWxsb3B0LCBjdXN0b21G b250Tm90UmVhZHlBY3Rpb24pOwotICAgICAgICBjdXJyUG9pbnQubW92ZSh3aWR0aCwgMCk7Cisg ICAgICAgIGF1dG8gYWR2YW5jZSA9IGZvbnQuZHJhd1RleHQoKnRoaXMsIHN1YnJ1biwgY3VyclBv aW50LCAwLCBXVEY6Om51bGxvcHQsIGN1c3RvbUZvbnROb3RSZWFkeUFjdGlvbik7CisgICAgICAg IGN1cnJQb2ludC5tb3ZlKGFkdmFuY2UpOwogCiAgICAgICAgIGJpZGlSdW4gPSBiaWRpUnVuLT5u ZXh0KCk7CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvR3JhcGhpY3NDb250ZXh0LmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9H cmFwaGljc0NvbnRleHQuaAppbmRleCA5ZGNkZGU5OThmMzQxMzQyNzcyMjY4Njk0Yzk5OGFiZTYw Yzg0YWQ5Li4yMjA1YThjY2RjMjZiNzliMGYwYTFhNDMxNzc2MmUxMTUwMDNlODdhIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQuaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQuaApA QCAtNDE5LDcgKzQxOSw3IEBAIHB1YmxpYzoKICAgICBib29sIHVzZURhcmtBcHBlYXJhbmNlKCkg Y29uc3QgeyByZXR1cm4gbV9zdGF0ZS51c2VEYXJrQXBwZWFyYW5jZTsgfQogI2VuZGlmCiAKLSAg ICBmbG9hdCBkcmF3VGV4dChjb25zdCBGb250Q2FzY2FkZSYsIGNvbnN0IFRleHRSdW4mLCBjb25z dCBGbG9hdFBvaW50JiwgdW5zaWduZWQgZnJvbSA9IDAsIE9wdGlvbmFsPHVuc2lnbmVkPiB0byA9 IFdURjo6bnVsbG9wdCk7CisgICAgRmxvYXRTaXplIGRyYXdUZXh0KGNvbnN0IEZvbnRDYXNjYWRl JiwgY29uc3QgVGV4dFJ1biYsIGNvbnN0IEZsb2F0UG9pbnQmLCB1bnNpZ25lZCBmcm9tID0gMCwg T3B0aW9uYWw8dW5zaWduZWQ+IHRvID0gV1RGOjpudWxsb3B0KTsKICAgICB2b2lkIGRyYXdHbHlw aHMoY29uc3QgRm9udCYsIGNvbnN0IEdseXBoQnVmZmVyJiwgdW5zaWduZWQgZnJvbSwgdW5zaWdu ZWQgbnVtR2x5cGhzLCBjb25zdCBGbG9hdFBvaW50JiwgRm9udFNtb290aGluZ01vZGUpOwogICAg IHZvaWQgZHJhd0VtcGhhc2lzTWFya3MoY29uc3QgRm9udENhc2NhZGUmLCBjb25zdCBUZXh0UnVu JiwgY29uc3QgQXRvbVN0cmluZyYgbWFyaywgY29uc3QgRmxvYXRQb2ludCYsIHVuc2lnbmVkIGZy b20gPSAwLCBPcHRpb25hbDx1bnNpZ25lZD4gdG8gPSBXVEY6Om51bGxvcHQpOwogICAgIHZvaWQg ZHJhd0JpZGlUZXh0KGNvbnN0IEZvbnRDYXNjYWRlJiwgY29uc3QgVGV4dFJ1biYsIGNvbnN0IEZs b2F0UG9pbnQmLCBGb250Q2FzY2FkZTo6Q3VzdG9tRm9udE5vdFJlYWR5QWN0aW9uID0gRm9udENh c2NhZGU6OkRvTm90UGFpbnRJZkZvbnROb3RSZWFkeSk7Cg==