188941 2018-08-24 21:04:00 -0700 [LFC][Floating] FloatBox -> FloatAvoider 2018-08-26 22:03:27 -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 1453658 0 zalan 2018-08-24 21:04:00 -0700 This is in preparation for the float avoidance feature where formatting context root boxes avoid existing floats. 1453659 1 348072 zalan 2018-08-24 21:09:00 -0700 Created attachment 348072 Patch 1453706 2 348072 koivisto 2018-08-26 02:22:20 -0700 Comment on attachment 348072 Patch r=me for the rename, the patch is missing the renamed files though 1453792 3 zalan 2018-08-26 22:01:34 -0700 Committed r235352: <https://trac.webkit.org/changeset/235352> 1453793 4 webkit-bug-importer 2018-08-26 22:03:27 -0700 <rdar://problem/43742432> 348072 2018-08-24 21:09:00 -0700 2018-08-26 02:22:20 -0700 Patch Patch.txt text/plain 12135 zalan ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAxYzdkODY0NmRjOC4uNGJkODkzZjAzNzkgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzOCBAQAorMjAxOC0wOC0yNCAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgor CisgICAgICAgIFtMRkNdW0Zsb2F0aW5nXSBGbG9hdEJveCAtPiBGbG9hdEF2b2lkZXIKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4ODk0MQorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgaXMgaW4gcHJl cGFyYXRpb24gZm9yIHRoZSBmbG9hdCBhdm9pZGFuY2UgZmVhdHVyZSB3aGVyZSBmb3JtYXR0aW5n IGNvbnRleHQgcm9vdCBib3hlcyBhdm9pZCBleGlzdGluZyBmbG9hdHMuCisKKyAgICAgICAgKiBT b3VyY2VzLnR4dDoKKyAgICAgICAgKiBXZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2o6 CisgICAgICAgICogbGF5b3V0L2Rpc3BsYXl0cmVlL0Rpc3BsYXlCb3guaDoKKyAgICAgICAgKiBs YXlvdXQvZmxvYXRzL0Zsb2F0QXZvaWRlci5jcHA6IFJlbmFtZWQgZnJvbSBTb3VyY2UvV2ViQ29y ZS9sYXlvdXQvZmxvYXRzL0Zsb2F0Qm94LmNwcC4KKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6 RmxvYXRBdm9pZGVyOjpGbG9hdEF2b2lkZXIpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpG bG9hdEF2b2lkZXI6OmluaXRpYWxpemVQb3NpdGlvbik6CisgICAgICAgIChXZWJDb3JlOjpMYXlv dXQ6OkZsb2F0QXZvaWRlcjo6aXNMZWZ0QWxpZ25lZCBjb25zdCk6CisgICAgICAgIChXZWJDb3Jl OjpMYXlvdXQ6OkZsb2F0QXZvaWRlcjo6c2V0TGVmdCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlv dXQ6OkZsb2F0QXZvaWRlcjo6c2V0VG9wTGVmdCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6 OkZsb2F0QXZvaWRlcjo6cmVzZXRWZXJ0aWNhbGx5KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91 dDo6RmxvYXRBdm9pZGVyOjpyZXNldEhvcml6b250YWxseSk6CisgICAgICAgIChXZWJDb3JlOjpM YXlvdXQ6OkZsb2F0QXZvaWRlcjo6dG9wTGVmdEluQ29udGFpbmluZ0Jsb2NrIGNvbnN0KToKKyAg ICAgICAgKiBsYXlvdXQvZmxvYXRzL0Zsb2F0QXZvaWRlci5oOiBSZW5hbWVkIGZyb20gU291cmNl L1dlYkNvcmUvbGF5b3V0L2Zsb2F0cy9GbG9hdEJveC5oLgorICAgICAgICAoV2ViQ29yZTo6TGF5 b3V0OjpGbG9hdEF2b2lkZXI6OnRvcCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6 OkZsb2F0QXZvaWRlcjo6bGVmdCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkZs b2F0QXZvaWRlcjo6bWFyZ2luVG9wIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6 RmxvYXRBdm9pZGVyOjptYXJnaW5MZWZ0IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91 dDo6RmxvYXRBdm9pZGVyOjptYXJnaW5Cb3R0b20gY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6 TGF5b3V0OjpGbG9hdEF2b2lkZXI6Om1hcmdpblJpZ2h0IGNvbnN0KToKKyAgICAgICAgKFdlYkNv cmU6OkxheW91dDo6RmxvYXRBdm9pZGVyOjpyZWN0V2l0aE1hcmdpbiBjb25zdCk6CisgICAgICAg IChXZWJDb3JlOjpMYXlvdXQ6OkZsb2F0QXZvaWRlcjo6c2V0VG9wKToKKyAgICAgICAgKiBsYXlv dXQvZmxvYXRzL0Zsb2F0aW5nQ29udGV4dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6 OkZsb2F0aW5nQ29udGV4dDo6cG9zaXRpb25Gb3JGbG9hdCBjb25zdCk6CisgICAgICAgIChXZWJD b3JlOjpMYXlvdXQ6OkZsb2F0aW5nQ29udGV4dDo6ZmxvYXRpbmdQb3NpdGlvbiBjb25zdCk6Cisg ICAgICAgICogbGF5b3V0L2Zsb2F0cy9GbG9hdGluZ0NvbnRleHQuaDoKKwogMjAxOC0wOC0yMyAg WmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdW0Zsb2F0aW5n XSBTaW1wbGlmeSBGbG9hdGluZ1N0YXRlOjpGbG9hdEl0ZW0gY2xhc3MKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL1NvdXJjZXMudHh0IGIvU291cmNlL1dlYkNvcmUvU291cmNlcy50eHQKaW5k ZXggYTUxMmViYTQ1NzYuLjRhZTFjYWEyNTY1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9T b3VyY2VzLnR4dAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Tb3VyY2VzLnR4dApAQCAtMTIyOSw3ICsx MjI5LDcgQEAgbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdTdGF0ZS5jcHAK IGxheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tNYXJnaW5Db2xsYXBzZS5jcHAKIGxheW91dC9i bG9ja2Zvcm1hdHRpbmcvQmxvY2tJbnZhbGlkYXRpb24uY3BwCiBsYXlvdXQvZGlzcGxheXRyZWUv RGlzcGxheUJveC5jcHAKLWxheW91dC9mbG9hdHMvRmxvYXRCb3guY3BwCitsYXlvdXQvZmxvYXRz L0Zsb2F0QXZvaWRlci5jcHAKIGxheW91dC9mbG9hdHMvRmxvYXRpbmdDb250ZXh0LmNwcAogbGF5 b3V0L2Zsb2F0cy9GbG9hdGluZ1N0YXRlLmNwcAogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5s aW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9XZWJD b3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2ogYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnhj b2RlcHJvai9wcm9qZWN0LnBieHByb2oKaW5kZXggMmI4NDExNTRlNzYuLjI5YTZmMzFlOGExIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHBy b2oKKysrIGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9q CkBAIC0xOTg5LDcgKzE5ODksNyBAQAogCQk2Rjk5NUEzODFBNzA4MzM3MDBBNzM1RjQgLyogSlNX ZWJHTFRyYW5zZm9ybUZlZWRiYWNrLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZp bGU7IGZpbGVSZWYgPSA2Rjk5NUEyRTFBNzA4MzM3MDBBNzM1RjQgLyogSlNXZWJHTFRyYW5zZm9y bUZlZWRiYWNrLmggKi87IH07CiAJCTZGOTk1QTNBMUE3MDgzMzcwMEE3MzVGNCAvKiBKU1dlYkdM VmVydGV4QXJyYXlPYmplY3QuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsg ZmlsZVJlZiA9IDZGOTk1QTMwMUE3MDgzMzcwMEE3MzVGNCAvKiBKU1dlYkdMVmVydGV4QXJyYXlP YmplY3QuaCAqLzsgfTsKIAkJNkZBNDQ1NEU4OThGMkZDMTY4QkMzOEMxIC8qIEpTQmVmb3JlVW5s b2FkRXZlbnQuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9 IDI5RTA0QTI3QkVEMkY4MUY5OEU5MDIyQiAvKiBKU0JlZm9yZVVubG9hZEV2ZW50LmggKi87IH07 Ci0JCTZGRkRDNDQyMjEyRUZGMTcwMEE5Q0E5MSAvKiBGbG9hdEJveC5oIGluIEhlYWRlcnMgKi8g PSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gNkZGREM0NDAyMTJFRkYxNjAwQTlDQTkx IC8qIEZsb2F0Qm94LmggKi87IHNldHRpbmdzID0ge0FUVFJJQlVURVMgPSAoUHJpdmF0ZSwgKTsg fTsgfTsKKwkJNkZGREM0NDIyMTJFRkYxNzAwQTlDQTkxIC8qIEZsb2F0QXZvaWRlci5oIGluIEhl YWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gNkZGREM0NDAyMTJFRkYx NjAwQTlDQTkxIC8qIEZsb2F0QXZvaWRlci5oICovOyBzZXR0aW5ncyA9IHtBVFRSSUJVVEVTID0g KFByaXZhdGUsICk7IH07IH07CiAJCTcwOUEwMUZFMUUzRDBCREQwMDZCMEQ0QyAvKiBNb2R1bGVG ZXRjaEZhaWx1cmVLaW5kLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZp bGVSZWYgPSA3MDlBMDFGRDFFM0QwQkNDMDA2QjBENEMgLyogTW9kdWxlRmV0Y2hGYWlsdXJlS2lu ZC5oICovOyBzZXR0aW5ncyA9IHtBVFRSSUJVVEVTID0gKFByaXZhdGUsICk7IH07IH07CiAJCTcx MDI1RUNEMUY5OUYwQ0UwMDRBMjUwQyAvKiBBbmltYXRpb25UaW1lbGluZS5oIGluIEhlYWRlcnMg Ki8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gNzEwMjVFQzcxRjk5RjA5NjAwNEEy NTBDIC8qIEFuaW1hdGlvblRpbWVsaW5lLmggKi87IHNldHRpbmdzID0ge0FUVFJJQlVURVMgPSAo UHJpdmF0ZSwgKTsgfTsgfTsKIAkJNzEwMjVFRDAxRjk5RjBDRTAwNEEyNTBDIC8qIERvY3VtZW50 VGltZWxpbmUuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9 IDcxMDI1RUM1MUY5OUYwOTYwMDRBMjUwQyAvKiBEb2N1bWVudFRpbWVsaW5lLmggKi87IHNldHRp bmdzID0ge0FUVFJJQlVURVMgPSAoUHJpdmF0ZSwgKTsgfTsgfTsKQEAgLTg5NjcsOCArODk2Nyw4 IEBACiAJCTZGQ0QxOUMxMjBGOTcyN0EwMEZENDUyOSAvKiBUZXh0Q29udGVudFByb3ZpZGVyLmgg Ki8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vj b2RlLmMuaDsgcGF0aCA9IFRleHRDb250ZW50UHJvdmlkZXIuaDsgc291cmNlVHJlZSA9ICI8Z3Jv dXA+IjsgfTsKIAkJNkZDRDE5QzcyMEY5NzI3RDAwRkQ0NTI5IC8qIFRleHRDb250ZW50UHJvdmlk ZXIuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGxhc3RLbm93bkZpbGVUeXBlID0g c291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gVGV4dENvbnRlbnRQcm92aWRlci5jcHA7IHNvdXJj ZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTZGQ0Y5NzUyMjBGMDJCMzUwMDIxNDk2MCAvKiBSdW5z LmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3Vy Y2Vjb2RlLmMuaDsgcGF0aCA9IFJ1bnMuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKLQkJ NkZGREM0M0UyMTJFRkYxNjAwQTlDQTkxIC8qIEZsb2F0Qm94LmNwcCAqLyA9IHtpc2EgPSBQQlhG aWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJj ZWNvZGUuY3BwLmNwcDsgcGF0aCA9IEZsb2F0Qm94LmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+ IjsgfTsKLQkJNkZGREM0NDAyMTJFRkYxNjAwQTlDQTkxIC8qIEZsb2F0Qm94LmggKi8gPSB7aXNh ID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUg PSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IEZsb2F0Qm94Lmg7IHNvdXJjZVRyZWUgPSAiPGdyb3Vw PiI7IH07CisJCTZGRkRDNDNFMjEyRUZGMTYwMEE5Q0E5MSAvKiBGbG9hdEF2b2lkZXIuY3BwICov ID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZp bGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gRmxvYXRBdm9pZGVyLmNwcDsgc291 cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKKwkJNkZGREM0NDAyMTJFRkYxNjAwQTlDQTkxIC8qIEZs b2F0QXZvaWRlci5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9 IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBGbG9hdEF2b2lk ZXIuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJNzA5QTAxRkQxRTNEMEJDQzAwNkIw RDRDIC8qIE1vZHVsZUZldGNoRmFpbHVyZUtpbmQuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJl bmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5o OyBwYXRoID0gTW9kdWxlRmV0Y2hGYWlsdXJlS2luZC5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4i OyB9OwogCQk3MTAwNEI5RDFEQzEzOTg4MDBBNTJBMzggLyogcGxheWJhY2stc3VwcG9ydC5qcyAq LyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25G aWxlVHlwZSA9IHNvdXJjZWNvZGUuamF2YXNjcmlwdDsgcGF0aCA9ICJwbGF5YmFjay1zdXBwb3J0 LmpzIjsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJNzEwMjVFQzIxRjk5RjA5NjAwNEEy NTBDIC8qIFdlYkFuaW1hdGlvbi5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGxhc3RL bm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBXZWJBbmltYXRpb24uaDsgc291 cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKQEAgLTE5NDc3LDggKzE5NDc3LDggQEAKIAkJNkZDRkMw NTUyMTJEQUNDMjAwNzY5NUQyIC8qIGZsb2F0cyAqLyA9IHsKIAkJCWlzYSA9IFBCWEdyb3VwOwog CQkJY2hpbGRyZW4gPSAoCi0JCQkJNkZGREM0M0UyMTJFRkYxNjAwQTlDQTkxIC8qIEZsb2F0Qm94 LmNwcCAqLywKLQkJCQk2RkZEQzQ0MDIxMkVGRjE2MDBBOUNBOTEgLyogRmxvYXRCb3guaCAqLywK KwkJCQk2RkZEQzQzRTIxMkVGRjE2MDBBOUNBOTEgLyogRmxvYXRBdm9pZGVyLmNwcCAqLywKKwkJ CQk2RkZEQzQ0MDIxMkVGRjE2MDBBOUNBOTEgLyogRmxvYXRBdm9pZGVyLmggKi8sCiAJCQkJMTE1 Q0ZBODUyMDhCOTA2NjAwMUU2OTkxIC8qIEZsb2F0aW5nQ29udGV4dC5jcHAgKi8sCiAJCQkJMTE1 Q0ZBODQyMDhCOTA2NjAwMUU2OTkxIC8qIEZsb2F0aW5nQ29udGV4dC5oICovLAogCQkJCTExNUNG QTgxMjA4QjhFREEwMDFFNjk5MSAvKiBGbG9hdGluZ1N0YXRlLmNwcCAqLywKQEAgLTI3ODY3LDcg KzI3ODY3LDcgQEAKIAkJCQk0OUVDRUI3MDE0OTk3OTBEMDBDREQzQTQgLyogRmlsdGVyT3BlcmF0 aW9ucy5oIGluIEhlYWRlcnMgKi8sCiAJCQkJMzcyQzAwRDkxMjk2MTlGODAwNUM5NTc1IC8qIEZp bmRPcHRpb25zLmggaW4gSGVhZGVycyAqLywKIAkJCQlBOENGRjA0RjBBMTU0RjA5MDAwQTQyMzQg LyogRml4ZWRUYWJsZUxheW91dC5oIGluIEhlYWRlcnMgKi8sCi0JCQkJNkZGREM0NDIyMTJFRkYx NzAwQTlDQTkxIC8qIEZsb2F0Qm94LmggaW4gSGVhZGVycyAqLywKKwkJCQk2RkZEQzQ0MjIxMkVG RjE3MDBBOUNBOTEgLyogRmxvYXRBdm9pZGVyLmggaW4gSGVhZGVycyAqLywKIAkJCQlCQzA3M0JB QTBDMzk5QjFGMDAwRjU5NzkgLyogRmxvYXRDb252ZXJzaW9uLmggaW4gSGVhZGVycyAqLywKIAkJ CQkxMTVDRkE4NjIwOEI5MDY2MDAxRTY5OTEgLyogRmxvYXRpbmdDb250ZXh0LmggaW4gSGVhZGVy cyAqLywKIAkJCQk5QTUyOEU4NDE3RDdGNTJGMDBBQTk1MTggLyogRmxvYXRpbmdPYmplY3RzLmgg aW4gSGVhZGVycyAqLywKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9kaXNwbGF5 dHJlZS9EaXNwbGF5Qm94LmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZGlzcGxheXRyZWUvRGlz cGxheUJveC5oCmluZGV4IDIyODUxZjc2NDZmLi5jOTQ1YjQ0NTBiNiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2Rpc3BsYXl0cmVlL0Rpc3BsYXlCb3guaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvZGlzcGxheXRyZWUvRGlzcGxheUJveC5oCkBAIC0zNiw3ICszNiw3IEBA IG5hbWVzcGFjZSBXZWJDb3JlIHsKIGNsYXNzIFJlbmRlclN0eWxlOwogCiBuYW1lc3BhY2UgTGF5 b3V0IHsKLWNsYXNzIEZsb2F0Qm94OworY2xhc3MgRmxvYXRBdm9pZGVyOwogY2xhc3MgQmxvY2tG b3JtYXR0aW5nQ29udGV4dDsKIGNsYXNzIEZvcm1hdHRpbmdDb250ZXh0OwogY2xhc3MgRmxvYXRp bmdDb250ZXh0OwpAQCAtNDgsNyArNDgsNyBAQCBuYW1lc3BhY2UgRGlzcGxheSB7CiBjbGFzcyBC b3ggewogICAgIFdURl9NQUtFX0lTT19BTExPQ0FURUQoQm94KTsKIHB1YmxpYzoKLSAgICBmcmll bmQgY2xhc3MgTGF5b3V0OjpGbG9hdEJveDsKKyAgICBmcmllbmQgY2xhc3MgTGF5b3V0OjpGbG9h dEF2b2lkZXI7CiAgICAgZnJpZW5kIGNsYXNzIExheW91dDo6QmxvY2tGb3JtYXR0aW5nQ29udGV4 dDsKICAgICBmcmllbmQgY2xhc3MgTGF5b3V0OjpGb3JtYXR0aW5nQ29udGV4dDsKICAgICBmcmll bmQgY2xhc3MgTGF5b3V0OjpGbG9hdGluZ0NvbnRleHQ7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvZmxvYXRzL0Zsb2F0aW5nQ29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvZmxvYXRzL0Zsb2F0aW5nQ29udGV4dC5jcHAKaW5kZXggZTZkNTg0NzE4ZTkuLjcyZjlk NzcxMmUzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZmxvYXRzL0Zsb2F0aW5n Q29udGV4dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zsb2F0cy9GbG9hdGluZ0Nv bnRleHQuY3BwCkBAIC0yOSw3ICsyOSw3IEBACiAjaWYgRU5BQkxFKExBWU9VVF9GT1JNQVRUSU5H X0NPTlRFWFQpCiAKICNpbmNsdWRlICJEaXNwbGF5Qm94LmgiCi0jaW5jbHVkZSAiRmxvYXRCb3gu aCIKKyNpbmNsdWRlICJGbG9hdEF2b2lkZXIuaCIKICNpbmNsdWRlICJMYXlvdXRCb3guaCIKICNp bmNsdWRlICJMYXlvdXRDb250YWluZXIuaCIKICNpbmNsdWRlICJMYXlvdXRDb250ZXh0LmgiCkBA IC0xMzcsNyArMTM3LDcgQEAgUG9pbnRJbkNvbnRhaW5pbmdCbG9jayBGbG9hdGluZ0NvbnRleHQ6 OnBvc2l0aW9uRm9yRmxvYXQoY29uc3QgQm94JiBsYXlvdXRCb3gpIGMKICAgICB9CiAKICAgICAv LyBGaW5kIHRoZSB0b3AgbW9zdCBwb3NpdGlvbiB3aGVyZSB0aGUgZmxvYXQgYm94IGZpdHMuCi0g ICAgRmxvYXRCb3ggYWxpZ25lZEJveCA9IHsgbGF5b3V0Qm94LCBtX2Zsb2F0aW5nU3RhdGUsIGxh eW91dENvbnRleHQoKSB9OworICAgIEZsb2F0QXZvaWRlciBhbGlnbmVkQm94ID0geyBsYXlvdXRC b3gsIG1fZmxvYXRpbmdTdGF0ZSwgbGF5b3V0Q29udGV4dCgpIH07CiAgICAgZmxvYXRpbmdQb3Np dGlvbihhbGlnbmVkQm94KTsKICAgICByZXR1cm4gYWxpZ25lZEJveC50b3BMZWZ0SW5Db250YWlu aW5nQmxvY2soKTsKIH0KQEAgLTIxMywyOCArMjEzLDI4IEBAIHN0ZDo6b3B0aW9uYWw8UG9zaXRp b25JbkNvbnRhaW5pbmdCbG9jaz4gRmxvYXRpbmdDb250ZXh0Ojp2ZXJ0aWNhbFBvc2l0aW9uV2l0 aENsCiAgICAgcmV0dXJuIHsgfTsKIH0KIAotdm9pZCBGbG9hdGluZ0NvbnRleHQ6OmZsb2F0aW5n UG9zaXRpb24oRmxvYXRCb3gmIGZsb2F0Qm94KSBjb25zdAordm9pZCBGbG9hdGluZ0NvbnRleHQ6 OmZsb2F0aW5nUG9zaXRpb24oRmxvYXRBdm9pZGVyJiBmbG9hdEF2b2lkZXIpIGNvbnN0CiB7CiAg ICAgc3RkOjpvcHRpb25hbDxQb3NpdGlvbkluQ29udGV4dFJvb3Q+IGJvdHRvbU1vc3Q7Ci0gICAg YXV0byBpbml0aWFsTGVmdCA9IGZsb2F0Qm94LmxlZnQoKTsKKyAgICBhdXRvIGluaXRpYWxMZWZ0 ID0gZmxvYXRBdm9pZGVyLmxlZnQoKTsKICAgICBhdXRvIGVuZCA9IExheW91dDo6ZW5kKG1fZmxv YXRpbmdTdGF0ZSk7Ci0gICAgZm9yIChhdXRvIGl0ZXJhdG9yID0gYmVnaW4obV9mbG9hdGluZ1N0 YXRlLCBmbG9hdEJveC5yZWN0V2l0aE1hcmdpbigpLnRvcCgpKTsgaXRlcmF0b3IgIT0gZW5kOyAr K2l0ZXJhdG9yKSB7CisgICAgZm9yIChhdXRvIGl0ZXJhdG9yID0gYmVnaW4obV9mbG9hdGluZ1N0 YXRlLCBmbG9hdEF2b2lkZXIucmVjdFdpdGhNYXJnaW4oKS50b3AoKSk7IGl0ZXJhdG9yICE9IGVu ZDsgKytpdGVyYXRvcikgewogICAgICAgICBBU1NFUlQoISgqaXRlcmF0b3IpLmlzRW1wdHkoKSk7 CiAgICAgICAgIGF1dG8gZmxvYXRzID0gKml0ZXJhdG9yOwogCi0gICAgICAgIGZsb2F0Qm94LnNl dFRvcChmbG9hdHMudmVydGljYWxQb3NpdGlvbigpICsgZmxvYXRCb3gubWFyZ2luVG9wKCkpOwor ICAgICAgICBmbG9hdEF2b2lkZXIuc2V0VG9wKGZsb2F0cy52ZXJ0aWNhbFBvc2l0aW9uKCkgKyBm bG9hdEF2b2lkZXIubWFyZ2luVG9wKCkpOwogICAgICAgICAvLyBNb3ZlIHRoZSBib3ggaG9yaXpv bnRhbGx5IHNvIHRoYXQgaXQgZWl0aGVyCiAgICAgICAgIC8vIDEuIGFsaWducyB3aXRoIHRoZSBj dXJyZW50IGZsb2F0aW5nIHBhaXIKICAgICAgICAgLy8gMi4gb3Igd2l0aCB0aGUgY29udGFpbmlu ZyBibG9jaydzIGNvbnRlbnQgYm94IGlmIHRoZXJlJ3Mgbm8gZmxvYXQgdG8gYWxpZ24gd2l0aCBh dCB0aGlzIHZlcnRpY2FsIHBvc2l0aW9uLgotICAgICAgICBpZiAoYXV0byBob3JpenRvbmFsUG9z aXRpb24gPSBmbG9hdHMuaG9yaXp0b25hbFBvc2l0aW9uKGZsb2F0Qm94LmlzTGVmdEFsaWduZWQo KSA/IEZsb2F0OjpMZWZ0IDogRmxvYXQ6OlJpZ2h0KSkgewotICAgICAgICAgICAgaWYgKCFmbG9h dEJveC5pc0xlZnRBbGlnbmVkKCkpCi0gICAgICAgICAgICAgICAgaG9yaXp0b25hbFBvc2l0aW9u ID0gKmhvcml6dG9uYWxQb3NpdGlvbiAtIGZsb2F0Qm94LnJlY3RXaXRoTWFyZ2luKCkud2lkdGgo KTsKLSAgICAgICAgICAgIGZsb2F0Qm94LnNldExlZnQoKmhvcml6dG9uYWxQb3NpdGlvbiArIGZs b2F0Qm94Lm1hcmdpbkxlZnQoKSk7CisgICAgICAgIGlmIChhdXRvIGhvcml6dG9uYWxQb3NpdGlv biA9IGZsb2F0cy5ob3JpenRvbmFsUG9zaXRpb24oZmxvYXRBdm9pZGVyLmlzTGVmdEFsaWduZWQo KSA/IEZsb2F0OjpMZWZ0IDogRmxvYXQ6OlJpZ2h0KSkgeworICAgICAgICAgICAgaWYgKCFmbG9h dEF2b2lkZXIuaXNMZWZ0QWxpZ25lZCgpKQorICAgICAgICAgICAgICAgIGhvcml6dG9uYWxQb3Np dGlvbiA9ICpob3JpenRvbmFsUG9zaXRpb24gLSBmbG9hdEF2b2lkZXIucmVjdFdpdGhNYXJnaW4o KS53aWR0aCgpOworICAgICAgICAgICAgZmxvYXRBdm9pZGVyLnNldExlZnQoKmhvcml6dG9uYWxQ b3NpdGlvbiArIGZsb2F0QXZvaWRlci5tYXJnaW5MZWZ0KCkpOwogICAgICAgICB9IGVsc2UKLSAg ICAgICAgICAgIGZsb2F0Qm94LnJlc2V0SG9yaXpvbnRhbGx5KCk7CisgICAgICAgICAgICBmbG9h dEF2b2lkZXIucmVzZXRIb3Jpem9udGFsbHkoKTsKIAogICAgICAgICAvLyBDaGVjayBpZiB0aGUg Ym94IGZpdHMgYXQgdGhpcyBwb3NpdGlvbi4KLSAgICAgICAgaWYgKCFmbG9hdHMuaW50ZXJzZWN0 cyhmbG9hdEJveC5yZWN0V2l0aE1hcmdpbigpKSkKKyAgICAgICAgaWYgKCFmbG9hdHMuaW50ZXJz ZWN0cyhmbG9hdEF2b2lkZXIucmVjdFdpdGhNYXJnaW4oKSkpCiAgICAgICAgICAgICByZXR1cm47 CiAKICAgICAgICAgYm90dG9tTW9zdCA9IGZsb2F0cy5ib3R0b20oKTsKQEAgLTI0Niw3ICsyNDYs NyBAQCB2b2lkIEZsb2F0aW5nQ29udGV4dDo6ZmxvYXRpbmdQb3NpdGlvbihGbG9hdEJveCYgZmxv YXRCb3gpIGNvbnN0CiAgICAgICAgIHJldHVybjsKIAogICAgIC8vIFBhc3NlZCBhbGwgdGhlIGZs b2F0cyBhbmQgc3RpbGwgZG9lcyBub3QgZml0PyBQdXNoIGl0IGJlbG93IHRoZSBsYXN0IGZsb2F0 LgotICAgIGZsb2F0Qm94LnNldFRvcExlZnQoeyBpbml0aWFsTGVmdCwgKmJvdHRvbU1vc3QgKyBm bG9hdEJveC5tYXJnaW5Ub3AoKSB9KTsKKyAgICBmbG9hdEF2b2lkZXIuc2V0VG9wTGVmdCh7IGlu aXRpYWxMZWZ0LCAqYm90dG9tTW9zdCArIGZsb2F0QXZvaWRlci5tYXJnaW5Ub3AoKSB9KTsKIH0K IAogRmxvYXRpbmdQYWlyOjpGbG9hdGluZ1BhaXIoY29uc3QgRmxvYXRpbmdTdGF0ZTo6RmxvYXRM aXN0JiBmbG9hdHMpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZmxvYXRzL0Zs b2F0aW5nQ29udGV4dC5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zsb2F0cy9GbG9hdGluZ0Nv bnRleHQuaAppbmRleCA5OTg4ZTViYWU1NC4uZDI4ZGY1OTRlYWUgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9mbG9hdHMvRmxvYXRpbmdDb250ZXh0LmgKKysrIGIvU291cmNlL1dl YkNvcmUvbGF5b3V0L2Zsb2F0cy9GbG9hdGluZ0NvbnRleHQuaApAQCAtMzUsNyArMzUsNyBAQCBu YW1lc3BhY2UgV2ViQ29yZSB7CiAKIG5hbWVzcGFjZSBMYXlvdXQgewogCi1jbGFzcyBGbG9hdEJv eDsKK2NsYXNzIEZsb2F0QXZvaWRlcjsKIGNsYXNzIEJveDsKIGNsYXNzIENvbnRhaW5lcjsKIGNs YXNzIEZsb2F0aW5nUGFpcjsKQEAgLTU2LDcgKzU2LDcgQEAgcHVibGljOgogcHJpdmF0ZToKICAg ICBMYXlvdXRDb250ZXh0JiBsYXlvdXRDb250ZXh0KCkgY29uc3QgeyByZXR1cm4gbV9mbG9hdGlu Z1N0YXRlLmxheW91dENvbnRleHQoKTsgfQogCi0gICAgdm9pZCBmbG9hdGluZ1Bvc2l0aW9uKEZs b2F0Qm94JikgY29uc3Q7CisgICAgdm9pZCBmbG9hdGluZ1Bvc2l0aW9uKEZsb2F0QXZvaWRlciYp IGNvbnN0OwogCiAgICAgRmxvYXRpbmdTdGF0ZSYgbV9mbG9hdGluZ1N0YXRlOwogfTsK