213249 2020-06-16 07:37:12 -0700 [LFC][Floats] Remove redundant mapping functions 2020-06-17 08:48:16 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1663070 0 zalan 2020-06-16 07:37:12 -0700 ssia 1663071 1 402004 zalan 2020-06-16 07:40:57 -0700 Created attachment 402004 Patch 1663496 2 ews-feeder 2020-06-17 08:47:44 -0700 Committed r263149: <https://trac.webkit.org/changeset/263149> All reviewed patches have been landed. Closing bug and clearing flags on attachment 402004. 1663497 3 webkit-bug-importer 2020-06-17 08:48:16 -0700 <rdar://problem/64449755> 402004 2020-06-16 07:40:57 -0700 2020-06-17 08:47:44 -0700 Patch bug-213249-20200616074056.patch text/plain 12012 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjYyNDE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTBmNzZkOWMxYjMxZjVk OTM2NWU5NjcxM2Y1NTkwMDVkYjljNjQ3NC4uYWIxZGUwZDgzNmNmNTBkNzFkNDM0YWFmZTU1YjYy OTlhZmZmNDYyNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIwLTA2LTE2ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bRmxvYXRzXSBSZW1v dmUgcmVkdW5kYW50IG1hcHBpbmcgZnVuY3Rpb25zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTMyNDkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBJdCdzIGluY29ycmVjdCB0byBtYXAgdGhlIGVudGlyZSBk aXNwbGF5IGJveCB3aGVuIHRoZSBoZWlnaHQgaXMgbm8gZXZlbiBjb21wdXRlZCB5ZXQuCisKKyAg ICAgICAgKiBsYXlvdXQvZmxvYXRzL0Zsb2F0aW5nQ29udGV4dC5jcHA6CisgICAgICAgIChXZWJD b3JlOjpMYXlvdXQ6OkZsb2F0aW5nQ29udGV4dDo6cG9zaXRpb25Gb3JGbG9hdCBjb25zdCk6Cisg ICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkZsb2F0aW5nQ29udGV4dDo6cG9zaXRpb25Gb3JOb25G bG9hdGluZ0Zsb2F0QXZvaWRlciBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkZs b2F0aW5nQ29udGV4dDo6dmVydGljYWxQb3NpdGlvbldpdGhDbGVhcmFuY2UgY29uc3QpOgorICAg ICAgICAoV2ViQ29yZTo6TGF5b3V0OjpGbG9hdGluZ0NvbnRleHQ6OmFwcGVuZCk6CisgICAgICAg IChXZWJDb3JlOjpMYXlvdXQ6OkZsb2F0aW5nQ29udGV4dDo6YWJzb2x1dGVEaXNwbGF5Qm94Q29v cmRpbmF0ZXMgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpGbG9hdGluZ0NvbnRl eHQ6Om1hcFRvcExlZnRUb0Zsb2F0aW5nU3RhdGVSb290IGNvbnN0KToKKyAgICAgICAgKFdlYkNv cmU6OkxheW91dDo6RmxvYXRpbmdDb250ZXh0OjptYXBUb0Zsb2F0aW5nU3RhdGVSb290IGNvbnN0 KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6RmxvYXRpbmdDb250ZXh0Ojpt YXBUb3BUb0Zsb2F0aW5nU3RhdGVSb290IGNvbnN0KTogRGVsZXRlZC4KKyAgICAgICAgKiBsYXlv dXQvZmxvYXRzL0Zsb2F0aW5nQ29udGV4dC5oOgorCiAyMDIwLTA2LTE1ICBaYWxhbiBCdWp0YXMg IDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW0xGQ11GbG9hdHNdIENsZWFudXAgRmxvYXRB dm9pZGVyIGludGVyZmFjZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zsb2F0 cy9GbG9hdGluZ0NvbnRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zsb2F0cy9GbG9h dGluZ0NvbnRleHQuY3BwCmluZGV4IDhhN2I1NjlhMmNkNjczYzcxZWMzZDgyMzMzYTVhZTYwNWQw MWI2ODAuLmZkZmY1N2JlYzU4Mzk2MjQxNTdkYjQzZjliYmYzNTI2MDYyMTJmNWMgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mbG9hdHMvRmxvYXRpbmdDb250ZXh0LmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZmxvYXRzL0Zsb2F0aW5nQ29udGV4dC5jcHAKQEAgLTE5 Niw3ICsxOTYsNyBAQCBzdGF0aWMgRmxvYXRQYWlyOjpMZWZ0UmlnaHRJbmRleCBmaW5kQXZhaWxh YmxlUG9zaXRpb24oRmxvYXRBdm9pZGVyJiBmbG9hdEF2b2lkZQogfQogCiBzdHJ1Y3QgRmxvYXRp bmdDb250ZXh0OjpBYnNvbHV0ZUNvb3JkaW5hdGVWYWx1ZXNGb3JGbG9hdEF2b2lkZXIgewotICAg IERpc3BsYXk6OkJveCBkaXNwbGF5Qm94OworICAgIExheW91dFBvaW50IHRvcExlZnQ7CiAgICAg TGF5b3V0UG9pbnQgY29udGFpbmluZ0Jsb2NrVG9wTGVmdDsKICAgICBIb3Jpem9udGFsRWRnZXMg Y29udGFpbmluZ0Jsb2NrQ29udGVudEJveDsKIH07CkBAIC0yMjksMTYgKzIyOSwxNyBAQCBMYXlv dXRQb2ludCBGbG9hdGluZ0NvbnRleHQ6OnBvc2l0aW9uRm9yRmxvYXQoY29uc3QgQm94JiBsYXlv dXRCb3gsIGNvbnN0IEhvcml6bwogICAgIH0KIAogICAgIC8vIEZpbmQgdGhlIHRvcCBtb3N0IHBv c2l0aW9uIHdoZXJlIHRoZSBmbG9hdCBib3ggZml0cy4KLSAgICBhdXRvIGFic29sdXRlRGlzcGxh eUJveENvb3JkaW5hdGVzID0gdGhpcy0+YWJzb2x1dGVEaXNwbGF5Qm94Q29vcmRpbmF0ZXMobGF5 b3V0Qm94KTsKICAgICBBU1NFUlQoIWlzRW1wdHkoKSk7CiAgICAgYXV0byBwcmV2aW91c0Zsb2F0 QWJzb2x1dGVUb3AgPSBmbG9hdGluZ1N0YXRlKCkuZmxvYXRzKCkubGFzdCgpLnJlY3RXaXRoTWFy Z2luKCkudG9wKCk7Ci0gICAgYXV0byBhYnNvbHV0ZURpc3BsYXlCb3ggPSBhYnNvbHV0ZURpc3Bs YXlCb3hDb29yZGluYXRlcy5kaXNwbGF5Qm94OworICAgIGF1dG8gYWJzb2x1dGVEaXNwbGF5Qm94 Q29vcmRpbmF0ZXMgPSB0aGlzLT5hYnNvbHV0ZURpc3BsYXlCb3hDb29yZGluYXRlcyhsYXlvdXRC b3gpOworICAgIGF1dG8gYWJzb2x1dGVUb3BMZWZ0ID0gYWJzb2x1dGVEaXNwbGF5Qm94Q29vcmRp bmF0ZXMudG9wTGVmdDsKICAgICAvLyBJbmNvbWluZyBmbG9hdCBjYW5ub3QgYmUgcGxhY2VkIGhp Z2hlciB0aGFuIGV4aXN0aW5nIGZsb2F0cyAobWFyZ2luIGJveCBvZiB0aGUgbGFzdCBmbG9hdCku CiAgICAgLy8gVGFrZSB0aGUgc3RhdGljIHBvc2l0aW9uICh3aGVyZSB0aGUgYm94IHdvdWxkIGdv IGlmIGl0IHdhc24ndCBmbG9hdGluZykgYW5kIGFkanVzdCBpdCB3aXRoIHRoZSBsYXN0IGZsb2F0 LgotICAgIGF1dG8gYWRqdXN0ZWRUb3AgPSBzdGQ6Om1heChhYnNvbHV0ZURpc3BsYXlCb3gudG9w KCkgLSBhYnNvbHV0ZURpc3BsYXlCb3gubWFyZ2luQmVmb3JlKCksIHByZXZpb3VzRmxvYXRBYnNv bHV0ZVRvcCk7Ci0gICAgYWJzb2x1dGVEaXNwbGF5Qm94LnNldFRvcChhZGp1c3RlZFRvcCArIGFi c29sdXRlRGlzcGxheUJveC5tYXJnaW5CZWZvcmUoKSk7Ci0gICAgYXV0byBtYXJnaW5zID0gRWRn ZXMgeyB7IGFic29sdXRlRGlzcGxheUJveC5jb21wdXRlZE1hcmdpblN0YXJ0KCkudmFsdWVPcigw KSwgYWJzb2x1dGVEaXNwbGF5Qm94LmNvbXB1dGVkTWFyZ2luRW5kKCkudmFsdWVPcigwKSB9LCB7 IGFic29sdXRlRGlzcGxheUJveC5tYXJnaW5CZWZvcmUoKSwgYWJzb2x1dGVEaXNwbGF5Qm94Lm1h cmdpbkFmdGVyKCkgfSB9OwotICAgIGF1dG8gZmxvYXRCb3ggPSBGbG9hdEF2b2lkZXIgeyBsYXlv dXRCb3gsIGFic29sdXRlRGlzcGxheUJveC50b3BMZWZ0KCksIGFic29sdXRlRGlzcGxheUJveC53 aWR0aCgpLCBtYXJnaW5zLCBhYnNvbHV0ZURpc3BsYXlCb3hDb29yZGluYXRlcy5jb250YWluaW5n QmxvY2tDb250ZW50Qm94IH07CisgICAgYXV0byYgZGlzcGxheUJveCA9IGZvcm1hdHRpbmdDb250 ZXh0KCkuZ2VvbWV0cnlGb3JCb3gobGF5b3V0Qm94KTsKKyAgICBpZiAoYWJzb2x1dGVUb3BMZWZ0 LnkoKSAtIGRpc3BsYXlCb3gubWFyZ2luQmVmb3JlKCkgPCBwcmV2aW91c0Zsb2F0QWJzb2x1dGVU b3ApCisgICAgICAgIGFic29sdXRlVG9wTGVmdC5zZXRZKHByZXZpb3VzRmxvYXRBYnNvbHV0ZVRv cCArIGRpc3BsYXlCb3gubWFyZ2luQmVmb3JlKCkpOworICAgIGF1dG8gbWFyZ2lucyA9IEVkZ2Vz IHsgeyBkaXNwbGF5Qm94LmNvbXB1dGVkTWFyZ2luU3RhcnQoKS52YWx1ZU9yKDApLCBkaXNwbGF5 Qm94LmNvbXB1dGVkTWFyZ2luRW5kKCkudmFsdWVPcigwKSB9LCB7IGRpc3BsYXlCb3gubWFyZ2lu QmVmb3JlKCksIGRpc3BsYXlCb3gubWFyZ2luQWZ0ZXIoKSB9IH07CisgICAgYXV0byBmbG9hdEJv eCA9IEZsb2F0QXZvaWRlciB7IGxheW91dEJveCwgYWJzb2x1dGVUb3BMZWZ0LCBkaXNwbGF5Qm94 LndpZHRoKCksIG1hcmdpbnMsIGFic29sdXRlRGlzcGxheUJveENvb3JkaW5hdGVzLmNvbnRhaW5p bmdCbG9ja0NvbnRlbnRCb3ggfTsKICAgICBmaW5kQXZhaWxhYmxlUG9zaXRpb24oZmxvYXRCb3gs IG1fZmxvYXRpbmdTdGF0ZS5mbG9hdHMoKSk7CiAgICAgLy8gRnJvbSBmb3JtYXR0aW5nIHJvb3Qg Y29vcmRpbmF0ZSBzeXN0ZW0gYmFjayB0byBjb250YWluaW5nIGJsb2NrJ3MuCiAgICAgYXV0byBj b250YWluaW5nQmxvY2tUb3BMZWZ0ID0gYWJzb2x1dGVEaXNwbGF5Qm94Q29vcmRpbmF0ZXMuY29u dGFpbmluZ0Jsb2NrVG9wTGVmdDsKQEAgLTI1Niw5ICsyNTcsOSBAQCBMYXlvdXRQb2ludCBGbG9h dGluZ0NvbnRleHQ6OnBvc2l0aW9uRm9yTm9uRmxvYXRpbmdGbG9hdEF2b2lkZXIoY29uc3QgQm94 JiBsYXlvdQogICAgICAgICByZXR1cm4gZm9ybWF0dGluZ0NvbnRleHQoKS5nZW9tZXRyeUZvckJv eChsYXlvdXRCb3gpLnRvcExlZnQoKTsKIAogICAgIGF1dG8gYWJzb2x1dGVEaXNwbGF5Qm94Q29v cmRpbmF0ZXMgPSB0aGlzLT5hYnNvbHV0ZURpc3BsYXlCb3hDb29yZGluYXRlcyhsYXlvdXRCb3gp OwotICAgIGF1dG8gYWJzb2x1dGVEaXNwbGF5Qm94ID0gYWJzb2x1dGVEaXNwbGF5Qm94Q29vcmRp bmF0ZXMuZGlzcGxheUJveDsKLSAgICBhdXRvIG1hcmdpbnMgPSBFZGdlcyB7IHsgYWJzb2x1dGVE aXNwbGF5Qm94LmNvbXB1dGVkTWFyZ2luU3RhcnQoKS52YWx1ZU9yKDApLCBhYnNvbHV0ZURpc3Bs YXlCb3guY29tcHV0ZWRNYXJnaW5FbmQoKS52YWx1ZU9yKDApIH0sIHsgYWJzb2x1dGVEaXNwbGF5 Qm94Lm1hcmdpbkJlZm9yZSgpLCBhYnNvbHV0ZURpc3BsYXlCb3gubWFyZ2luQWZ0ZXIoKSB9IH07 Ci0gICAgYXV0byBmbG9hdEF2b2lkZXIgPSBGbG9hdEF2b2lkZXIgeyBsYXlvdXRCb3gsIGFic29s dXRlRGlzcGxheUJveC50b3BMZWZ0KCksIGFic29sdXRlRGlzcGxheUJveC53aWR0aCgpLCBtYXJn aW5zLCBhYnNvbHV0ZURpc3BsYXlCb3hDb29yZGluYXRlcy5jb250YWluaW5nQmxvY2tDb250ZW50 Qm94IH07CisgICAgYXV0byYgZGlzcGxheUJveCA9IGZvcm1hdHRpbmdDb250ZXh0KCkuZ2VvbWV0 cnlGb3JCb3gobGF5b3V0Qm94KTsKKyAgICBhdXRvIG1hcmdpbnMgPSBFZGdlcyB7IHsgZGlzcGxh eUJveC5jb21wdXRlZE1hcmdpblN0YXJ0KCkudmFsdWVPcigwKSwgZGlzcGxheUJveC5jb21wdXRl ZE1hcmdpbkVuZCgpLnZhbHVlT3IoMCkgfSwgeyBkaXNwbGF5Qm94Lm1hcmdpbkJlZm9yZSgpLCBk aXNwbGF5Qm94Lm1hcmdpbkFmdGVyKCkgfSB9OworICAgIGF1dG8gZmxvYXRBdm9pZGVyID0gRmxv YXRBdm9pZGVyIHsgbGF5b3V0Qm94LCBhYnNvbHV0ZURpc3BsYXlCb3hDb29yZGluYXRlcy50b3BM ZWZ0LCBkaXNwbGF5Qm94LndpZHRoKCksIG1hcmdpbnMsIGFic29sdXRlRGlzcGxheUJveENvb3Jk aW5hdGVzLmNvbnRhaW5pbmdCbG9ja0NvbnRlbnRCb3ggfTsKICAgICBmaW5kUG9zaXRpb25Gb3JG b3JtYXR0aW5nQ29udGV4dFJvb3QoZmxvYXRBdm9pZGVyKTsKICAgICBhdXRvIGNvbnRhaW5pbmdC bG9ja1RvcExlZnQgPSBhYnNvbHV0ZURpc3BsYXlCb3hDb29yZGluYXRlcy5jb250YWluaW5nQmxv Y2tUb3BMZWZ0OwogICAgIHJldHVybiB7IGZsb2F0QXZvaWRlci5sZWZ0KCkgLSBjb250YWluaW5n QmxvY2tUb3BMZWZ0LngoKSwgZmxvYXRBdm9pZGVyLnRvcCgpIC0gY29udGFpbmluZ0Jsb2NrVG9w TGVmdC55KCkgfTsKQEAgLTI4Myw3ICsyODQsNyBAQCBGbG9hdGluZ0NvbnRleHQ6OkNsZWFyYW5j ZVBvc2l0aW9uIEZsb2F0aW5nQ29udGV4dDo6dmVydGljYWxQb3NpdGlvbldpdGhDbGVhcmFuYwog ICAgICAgICAvLwogICAgICAgICAvLyAxLiBUaGUgYW1vdW50IG5lY2Vzc2FyeSB0byBwbGFjZSB0 aGUgYm9yZGVyIGVkZ2Ugb2YgdGhlIGJsb2NrIGV2ZW4gd2l0aCB0aGUgYm90dG9tIG91dGVyIGVk Z2Ugb2YgdGhlIGxvd2VzdCBmbG9hdCB0aGF0IGlzIHRvIGJlIGNsZWFyZWQuCiAgICAgICAgIC8v IDIuIFRoZSBhbW91bnQgbmVjZXNzYXJ5IHRvIHBsYWNlIHRoZSB0b3AgYm9yZGVyIGVkZ2Ugb2Yg dGhlIGJsb2NrIGF0IGl0cyBoeXBvdGhldGljYWwgcG9zaXRpb24uCi0gICAgICAgIGF1dG8gcm9v dFJlbGF0aXZlVG9wID0gbWFwVG9wVG9GbG9hdGluZ1N0YXRlUm9vdChsYXlvdXRCb3gpOworICAg ICAgICBhdXRvIHJvb3RSZWxhdGl2ZVRvcCA9IG1hcFRvcExlZnRUb0Zsb2F0aW5nU3RhdGVSb290 KGxheW91dEJveCkueSgpOwogICAgICAgICBhdXRvIGNsZWFyYW5jZSA9ICpmbG9hdEJvdHRvbSAt IHJvb3RSZWxhdGl2ZVRvcDsKICAgICAgICAgaWYgKGNsZWFyYW5jZSA8PSAwKQogICAgICAgICAg ICAgcmV0dXJuIHsgfTsKQEAgLTMxMSw3ICszMTIsNyBAQCBGbG9hdGluZ0NvbnRleHQ6OkNsZWFy YW5jZVBvc2l0aW9uIEZsb2F0aW5nQ29udGV4dDo6dmVydGljYWxQb3NpdGlvbldpdGhDbGVhcmFu YwogICAgICAgICBpZiAoJmxheW91dEJveC5jb250YWluaW5nQmxvY2soKSA9PSAmbV9mbG9hdGlu Z1N0YXRlLnJvb3QoKSkKICAgICAgICAgICAgIHJldHVybiB7IFBvc2l0aW9uIHsgcm9vdFJlbGF0 aXZlVG9wIH0sIGNsZWFyYW5jZSB9OwogCi0gICAgICAgIGF1dG8gY29udGFpbmluZ0Jsb2NrUm9v dFJlbGF0aXZlVG9wID0gbWFwVG9wVG9GbG9hdGluZ1N0YXRlUm9vdChsYXlvdXRCb3guY29udGFp bmluZ0Jsb2NrKCkpOworICAgICAgICBhdXRvIGNvbnRhaW5pbmdCbG9ja1Jvb3RSZWxhdGl2ZVRv cCA9IG1hcFRvcExlZnRUb0Zsb2F0aW5nU3RhdGVSb290KGxheW91dEJveC5jb250YWluaW5nQmxv Y2soKSkueSgpOwogICAgICAgICByZXR1cm4geyBQb3NpdGlvbiB7IHJvb3RSZWxhdGl2ZVRvcCAt IGNvbnRhaW5pbmdCbG9ja1Jvb3RSZWxhdGl2ZVRvcCB9LCBjbGVhcmFuY2UgfTsKICAgICB9Owog CkBAIC0zODgsNyArMzg5LDkgQEAgRmxvYXRpbmdDb250ZXh0OjpDb25zdHJhaW50cyBGbG9hdGlu Z0NvbnRleHQ6OmNvbnN0cmFpbnRzKExheW91dFVuaXQgY2FuZGlkYXRlVG8KIAogdm9pZCBGbG9h dGluZ0NvbnRleHQ6OmFwcGVuZChjb25zdCBCb3gmIGZsb2F0Qm94KQogewotICAgIGZsb2F0aW5n U3RhdGUoKS5hcHBlbmQoRmxvYXRpbmdTdGF0ZTo6RmxvYXRJdGVtIHsgZmxvYXRCb3gsIG1hcFRv RmxvYXRpbmdTdGF0ZVJvb3QoZmxvYXRCb3gpIH0pOworICAgIGF1dG8gYWJzb2x1dGVEaXNwbGF5 Qm94ID0gRGlzcGxheTo6Qm94KGZvcm1hdHRpbmdDb250ZXh0KCkuZ2VvbWV0cnlGb3JCb3goZmxv YXRCb3gpKTsKKyAgICBhYnNvbHV0ZURpc3BsYXlCb3guc2V0VG9wTGVmdChtYXBUb3BMZWZ0VG9G bG9hdGluZ1N0YXRlUm9vdChmbG9hdEJveCkpOworICAgIGZsb2F0aW5nU3RhdGUoKS5hcHBlbmQo RmxvYXRpbmdTdGF0ZTo6RmxvYXRJdGVtIHsgZmxvYXRCb3gsIGFic29sdXRlRGlzcGxheUJveCB9 KTsKIH0KIAogdm9pZCBGbG9hdGluZ0NvbnRleHQ6OmZpbmRQb3NpdGlvbkZvckZvcm1hdHRpbmdD b250ZXh0Um9vdChGbG9hdEF2b2lkZXImIGZsb2F0QXZvaWRlcikgY29uc3QKQEAgLTQ0MCwzNyAr NDQzLDIzIEBAIHZvaWQgRmxvYXRpbmdDb250ZXh0OjpmaW5kUG9zaXRpb25Gb3JGb3JtYXR0aW5n Q29udGV4dFJvb3QoRmxvYXRBdm9pZGVyJiBmbG9hdEF2CiBGbG9hdGluZ0NvbnRleHQ6OkFic29s dXRlQ29vcmRpbmF0ZVZhbHVlc0ZvckZsb2F0QXZvaWRlciBGbG9hdGluZ0NvbnRleHQ6OmFic29s dXRlRGlzcGxheUJveENvb3JkaW5hdGVzKGNvbnN0IEJveCYgZmxvYXRBdm9pZGVyKSBjb25zdAog ewogICAgIGF1dG8mIGNvbnRhaW5pbmdCbG9jayA9IGZsb2F0QXZvaWRlci5jb250YWluaW5nQmxv Y2soKTsKLSAgICBhdXRvIGRpc3BsYXlCb3ggPSBtYXBUb0Zsb2F0aW5nU3RhdGVSb290KGZsb2F0 QXZvaWRlcik7Ci0KLSAgICBpZiAoJmNvbnRhaW5pbmdCbG9jayA9PSAmZmxvYXRpbmdTdGF0ZSgp LnJvb3QoKSkgewotICAgICAgICBhdXRvIGNvbnRhaW5pbmdCbG9ja0dlb21ldHJ5ID0gZm9ybWF0 dGluZ0NvbnRleHQoKS5nZW9tZXRyeUZvckJveChjb250YWluaW5nQmxvY2ssIEZvcm1hdHRpbmdD b250ZXh0OjpFc2NhcGVSZWFzb246OkZsb2F0Qm94TmVlZHNUb0JlSW5BYnNvbHV0ZUNvb3JkaW5h dGVzKTsKLSAgICAgICAgcmV0dXJuIHsgZGlzcGxheUJveCwgeyB9LCB7ICBjb250YWluaW5nQmxv Y2tHZW9tZXRyeS5jb250ZW50Qm94TGVmdCgpLCBjb250YWluaW5nQmxvY2tHZW9tZXRyeS5jb250 ZW50Qm94UmlnaHQoKSB9IH07Ci0gICAgfQotICAgIGF1dG8gY29udGFpbmluZ0Jsb2NrQWJzb2x1 dGVEaXNwbGF5Qm94ID0gbWFwVG9GbG9hdGluZ1N0YXRlUm9vdChjb250YWluaW5nQmxvY2spOwot ICAgIGF1dG8gY29udGFpbmluZ0Jsb2NrTGVmdCA9IGNvbnRhaW5pbmdCbG9ja0Fic29sdXRlRGlz cGxheUJveC5sZWZ0KCk7Ci0gICAgcmV0dXJuIHsgZGlzcGxheUJveCwgY29udGFpbmluZ0Jsb2Nr QWJzb2x1dGVEaXNwbGF5Qm94LnRvcExlZnQoKSwgeyBjb250YWluaW5nQmxvY2tMZWZ0ICsgY29u dGFpbmluZ0Jsb2NrQWJzb2x1dGVEaXNwbGF5Qm94LmNvbnRlbnRCb3hMZWZ0KCksIGNvbnRhaW5p bmdCbG9ja0xlZnQgKyBjb250YWluaW5nQmxvY2tBYnNvbHV0ZURpc3BsYXlCb3guY29udGVudEJv eFJpZ2h0KCkgfSB9OwotfQorICAgIGF1dG8mIGNvbnRhaW5pbmdCbG9ja0dlb21ldHJ5ID0gZm9y bWF0dGluZ0NvbnRleHQoKS5nZW9tZXRyeUZvckJveChjb250YWluaW5nQmxvY2ssIEZvcm1hdHRp bmdDb250ZXh0OjpFc2NhcGVSZWFzb246OkZsb2F0Qm94TmVlZHNUb0JlSW5BYnNvbHV0ZUNvb3Jk aW5hdGVzKTsKKyAgICBhdXRvIGFic29sdXRlVG9wTGVmdCA9IG1hcFRvcExlZnRUb0Zsb2F0aW5n U3RhdGVSb290KGZsb2F0QXZvaWRlcik7CiAKLURpc3BsYXk6OkJveCBGbG9hdGluZ0NvbnRleHQ6 Om1hcFRvRmxvYXRpbmdTdGF0ZVJvb3QoY29uc3QgQm94JiBmbG9hdEJveCkgY29uc3QKLXsKLSAg ICBhdXRvJiBmbG9hdGluZ1N0YXRlUm9vdCA9IGZsb2F0aW5nU3RhdGUoKS5yb290KCk7Ci0gICAg YXV0byYgYm94R2VvbWV0cnkgPSBmb3JtYXR0aW5nQ29udGV4dCgpLmdlb21ldHJ5Rm9yQm94KGZs b2F0Qm94LCBGb3JtYXR0aW5nQ29udGV4dDo6RXNjYXBlUmVhc29uOjpGbG9hdEJveE5lZWRzVG9C ZUluQWJzb2x1dGVDb29yZGluYXRlcyk7Ci0gICAgYXV0byB0b3BMZWZ0ID0gYm94R2VvbWV0cnku dG9wTGVmdCgpOwotICAgIGZvciAoYXV0byogY29udGFpbmluZ0Jsb2NrID0gJmZsb2F0Qm94LmNv bnRhaW5pbmdCbG9jaygpOyBjb250YWluaW5nQmxvY2sgIT0gJmZsb2F0aW5nU3RhdGVSb290OyBj b250YWluaW5nQmxvY2sgPSAmY29udGFpbmluZ0Jsb2NrLT5jb250YWluaW5nQmxvY2soKSkKLSAg ICAgICAgdG9wTGVmdC5tb3ZlQnkoZm9ybWF0dGluZ0NvbnRleHQoKS5nZW9tZXRyeUZvckJveCgq Y29udGFpbmluZ0Jsb2NrLCBGb3JtYXR0aW5nQ29udGV4dDo6RXNjYXBlUmVhc29uOjpGbG9hdEJv eE5lZWRzVG9CZUluQWJzb2x1dGVDb29yZGluYXRlcykudG9wTGVmdCgpKTsKKyAgICBpZiAoJmNv bnRhaW5pbmdCbG9jayA9PSAmZmxvYXRpbmdTdGF0ZSgpLnJvb3QoKSkKKyAgICAgICAgcmV0dXJu IHsgYWJzb2x1dGVUb3BMZWZ0LCB7IH0sIHsgY29udGFpbmluZ0Jsb2NrR2VvbWV0cnkuY29udGVu dEJveExlZnQoKSwgY29udGFpbmluZ0Jsb2NrR2VvbWV0cnkuY29udGVudEJveFJpZ2h0KCkgfSB9 OwogCi0gICAgYXV0byBtYXBwZWREaXNwbGF5Qm94ID0gRGlzcGxheTo6Qm94KGJveEdlb21ldHJ5 KTsKLSAgICBtYXBwZWREaXNwbGF5Qm94LnNldFRvcExlZnQodG9wTGVmdCk7Ci0gICAgcmV0dXJu IG1hcHBlZERpc3BsYXlCb3g7CisgICAgYXV0byBjb250YWluaW5nQmxvY2tBYnNvbHV0ZVRvcExl ZnQgPSBtYXBUb3BMZWZ0VG9GbG9hdGluZ1N0YXRlUm9vdChjb250YWluaW5nQmxvY2spOworICAg IHJldHVybiB7IGFic29sdXRlVG9wTGVmdCwgY29udGFpbmluZ0Jsb2NrQWJzb2x1dGVUb3BMZWZ0 LCB7IGNvbnRhaW5pbmdCbG9ja0Fic29sdXRlVG9wTGVmdC54KCkgKyBjb250YWluaW5nQmxvY2tH ZW9tZXRyeS5jb250ZW50Qm94TGVmdCgpLCBjb250YWluaW5nQmxvY2tBYnNvbHV0ZVRvcExlZnQu eCgpICsgY29udGFpbmluZ0Jsb2NrR2VvbWV0cnkuY29udGVudEJveFJpZ2h0KCkgfSB9OwogfQog Ci1MYXlvdXRVbml0IEZsb2F0aW5nQ29udGV4dDo6bWFwVG9wVG9GbG9hdGluZ1N0YXRlUm9vdChj b25zdCBCb3gmIGZsb2F0Qm94KSBjb25zdAorTGF5b3V0UG9pbnQgRmxvYXRpbmdDb250ZXh0Ojpt YXBUb3BMZWZ0VG9GbG9hdGluZ1N0YXRlUm9vdChjb25zdCBCb3gmIGZsb2F0Qm94KSBjb25zdAog ewogICAgIGF1dG8mIGZsb2F0aW5nU3RhdGVSb290ID0gZmxvYXRpbmdTdGF0ZSgpLnJvb3QoKTsK LSAgICBhdXRvIHRvcCA9IGZvcm1hdHRpbmdDb250ZXh0KCkuZ2VvbWV0cnlGb3JCb3goZmxvYXRC b3gsIEZvcm1hdHRpbmdDb250ZXh0OjpFc2NhcGVSZWFzb246OkZsb2F0Qm94TmVlZHNUb0JlSW5B YnNvbHV0ZUNvb3JkaW5hdGVzKS50b3AoKTsKKyAgICBhdXRvIHRvcExlZnQgPSBmb3JtYXR0aW5n Q29udGV4dCgpLmdlb21ldHJ5Rm9yQm94KGZsb2F0Qm94LCBGb3JtYXR0aW5nQ29udGV4dDo6RXNj YXBlUmVhc29uOjpGbG9hdEJveE5lZWRzVG9CZUluQWJzb2x1dGVDb29yZGluYXRlcykudG9wTGVm dCgpOwogICAgIGZvciAoYXV0byogY29udGFpbmluZ0Jsb2NrID0gJmZsb2F0Qm94LmNvbnRhaW5p bmdCbG9jaygpOyBjb250YWluaW5nQmxvY2sgIT0gJmZsb2F0aW5nU3RhdGVSb290OyBjb250YWlu aW5nQmxvY2sgPSAmY29udGFpbmluZ0Jsb2NrLT5jb250YWluaW5nQmxvY2soKSkKLSAgICAgICAg dG9wICs9IGZvcm1hdHRpbmdDb250ZXh0KCkuZ2VvbWV0cnlGb3JCb3goKmNvbnRhaW5pbmdCbG9j aywgRm9ybWF0dGluZ0NvbnRleHQ6OkVzY2FwZVJlYXNvbjo6RmxvYXRCb3hOZWVkc1RvQmVJbkFi c29sdXRlQ29vcmRpbmF0ZXMpLnRvcCgpOwotICAgIHJldHVybiB0b3A7CisgICAgICAgIHRvcExl ZnQubW92ZUJ5KGZvcm1hdHRpbmdDb250ZXh0KCkuZ2VvbWV0cnlGb3JCb3goKmNvbnRhaW5pbmdC bG9jaywgRm9ybWF0dGluZ0NvbnRleHQ6OkVzY2FwZVJlYXNvbjo6RmxvYXRCb3hOZWVkc1RvQmVJ bkFic29sdXRlQ29vcmRpbmF0ZXMpLnRvcExlZnQoKSk7CisgICAgcmV0dXJuIHRvcExlZnQ7CiB9 CiAKIFBvaW50IEZsb2F0aW5nQ29udGV4dDo6bWFwUG9pbnRGcm9tRm9ybWF0dGluZ0NvbnRleHRS b290VG9GbG9hdGluZ1N0YXRlUm9vdChQb2ludCBwb3NpdGlvbikgY29uc3QKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2xheW91dC9mbG9hdHMvRmxvYXRpbmdDb250ZXh0LmggYi9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvZmxvYXRzL0Zsb2F0aW5nQ29udGV4dC5oCmluZGV4IDFhZDU0YzU2MDgw ZmJkYzM5MTgzODE2YTE0MmQyNDg5NThiOGUwMjkuLjMzMmQ5OWExNjIzY2RhNTQ4ZGVjYTQ0ZmQx MTU4MmU4ZmFlOTRiMDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mbG9hdHMv RmxvYXRpbmdDb250ZXh0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zsb2F0cy9GbG9h dGluZ0NvbnRleHQuaApAQCAtNzUsOCArNzUsNyBAQCBwcml2YXRlOgogCiAgICAgc3RydWN0IEFi c29sdXRlQ29vcmRpbmF0ZVZhbHVlc0ZvckZsb2F0QXZvaWRlcjsKICAgICBBYnNvbHV0ZUNvb3Jk aW5hdGVWYWx1ZXNGb3JGbG9hdEF2b2lkZXIgYWJzb2x1dGVEaXNwbGF5Qm94Q29vcmRpbmF0ZXMo Y29uc3QgQm94JikgY29uc3Q7Ci0gICAgRGlzcGxheTo6Qm94IG1hcFRvRmxvYXRpbmdTdGF0ZVJv b3QoY29uc3QgQm94JikgY29uc3Q7Ci0gICAgTGF5b3V0VW5pdCBtYXBUb3BUb0Zsb2F0aW5nU3Rh dGVSb290KGNvbnN0IEJveCYpIGNvbnN0OworICAgIExheW91dFBvaW50IG1hcFRvcExlZnRUb0Zs b2F0aW5nU3RhdGVSb290KGNvbnN0IEJveCYpIGNvbnN0OwogICAgIFBvaW50IG1hcFBvaW50RnJv bUZvcm1hdHRpbmdDb250ZXh0Um9vdFRvRmxvYXRpbmdTdGF0ZVJvb3QoUG9pbnQpIGNvbnN0Owog CiAgICAgV2Vha1B0cjxjb25zdCBDb250YWluZXJCb3g+IG1fcm9vdDsK