221867 2021-02-13 08:48:59 -0800 [LFC][Integration] Not every inline box contributes to line overflow 2021-02-13 11:08:13 -0800 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 1728925 0 zalan 2021-02-13 08:48:59 -0800 <span><img></span> -> in quirks mode the inline box (span) descent should not contribute to line overflow. 1728926 1 420220 zalan 2021-02-13 09:04:00 -0800 Created attachment 420220 Patch 1728927 2 420221 zalan 2021-02-13 09:04:44 -0800 Created attachment 420221 Patch 1728931 3 ews-feeder 2021-02-13 11:07:22 -0800 Committed r272834: <https://commits.webkit.org/r272834> All reviewed patches have been landed. Closing bug and clearing flags on attachment 420221. 1728932 4 webkit-bug-importer 2021-02-13 11:08:13 -0800 <rdar://problem/74312140> 420220 2021-02-13 09:04:00 -0800 2021-02-13 09:04:42 -0800 Patch bug-221867-20210213090359.patch text/plain 9768 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjcyNzgxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzRlNWY3YmZjZGMwNzky NWQyZjJkZDA3ZTJlODM0MjQ0NmUyNjk4Mi4uY2JhN2Y3NjcyNDUzOGM3Yjk2MjUyMjhiMTBjMmZl OTBlOTNlZjkzNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDIxLTAyLTEzICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSW50ZWdyYXRpb25d IE5vdCBldmVyeSBpbmxpbmUgYm94IGNvbnRyaWJ1dGUgdG8gbGluZSBvdmVyZmxvdworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIxODY3CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ29uc2lkZXIgdGhlIGZv bGxvdyBjb250ZW50OgorICAgICAgICA8ZGl2IHN0eWxlPSJmb250LXNpemU6IDIwcHg7Ij5jb250 ZW50PHNwYW4gc3R5bGU9ImZvbnQtc2l6ZTogMjAwcHg7Ij48aW1nPjwvc3Bhbj48L2Rpdj4KKwor ICAgICAgICBJbiBxdWlya3MgbW9kZSwgdGhlIGlubGluZSBib3ggKDxzcGFuPikgZG9lcyBub3Qg c3RyZXRjaCB0aGUgbGluZSBib3ggdmVydGljYWxseS4gV2hhdCBpdCBtZWFucyBpbiBwcmFjdGlj ZSBpcworICAgICAgICB0aGF0IHRoZSBpbmxpbmUgYm94J3MgZGVzY2VudCBpcyBpZ25vcmVkLiBX aGlsZSB0aGUgaW5saW5lIGJveCBoYXMgYSByZWxhdGl2ZWx5IGxhcmdlIGRlc2NlbnQgYW5kCisg ICAgICAgIGluIHRoZW9yeSBpdCBvdmVyZmxvd3MgdGhlIGxpbmUgKHNpbmNlIGl0IGlzIGxhcmdl ciB0aGFuIHRoZSByb290IGlubGluZSBib3gncyBkZXNjZW50KQorICAgICAgICBpdCBzaG91bGQg bm90IGJlIHRha2VuIGludG8gYWNjb3VudCB3aGVuIGNvbXB1dGluZyB0aGUgc2Nyb2xsYWJsZSBv dmVyZmxvdy4KKyAgICAgICAgSG93ZXZlciBhZGRpbmcgInBhZGRpbmc6IDFweCIgdG8gdGhlIDxz cGFuPiB3aWxsIG1ha2UgdGhlIGlubGluZSBib3ggc3RyZXRjaCB0aGUgbGluZSBhbmQgbm93IHRo aXMgIjFweCBwYWRkaW5nIiB3aWxsCisgICAgICAgIGNvbnRyaWJ1dGUgdG8gdGhlIHNjcm9sbGFi bGUgb3ZlcmZsb3cuCisKKyAgICAgICAgKiBsYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdy YXRpb25JbmxpbmVDb250ZW50QnVpbGRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXRJ bnRlZ3JhdGlvbjo6SW5saW5lQ29udGVudEJ1aWxkZXI6OmJ1aWxkIGNvbnN0KToKKyAgICAgICAg KFdlYkNvcmU6OkxheW91dEludGVncmF0aW9uOjpJbmxpbmVDb250ZW50QnVpbGRlcjo6Y3JlYXRl RGlzcGxheUxpbmVzIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dEludGVncmF0aW9u OjpJbmxpbmVDb250ZW50QnVpbGRlcjo6Y3JlYXRlRGlzcGxheU5vblJvb3RJbmxpbmVCb3hlcyBj b25zdCk6CisgICAgICAgICogbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uSW5s aW5lQ29udGVudEJ1aWxkZXIuaDoKKyAgICAgICAgKiBsYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0 SW50ZWdyYXRpb25MaW5lLmg6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXRJbnRlZ3JhdGlvbjo6 Tm9uUm9vdElubGluZUJveDo6Tm9uUm9vdElubGluZUJveCk6CisgICAgICAgIChXZWJDb3JlOjpM YXlvdXRJbnRlZ3JhdGlvbjo6Tm9uUm9vdElubGluZUJveDo6Y2FuQ29udHJpYnV0ZVRvTGluZU92 ZXJmbG93IGNvbnN0KToKKyAgICAgICAgKiBsYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdy YXRpb25MaW5lTGF5b3V0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dEludGVncmF0aW9u OjpMaW5lTGF5b3V0Ojpjb25zdHJ1Y3RDb250ZW50KToKKwogMjAyMS0wMi0xMiAgWmFsYW4gQnVq dGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdIFVwZGF0ZSB0aGUgYmxvY2sg Ym94L2NvbnRhaW5lciBsaXN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50 ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25JbmxpbmVDb250ZW50QnVpbGRlci5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25JbmxpbmVDb250 ZW50QnVpbGRlci5jcHAKaW5kZXggNTc4N2ZhYTRkZDBhZjY0ZDYwYTc1ZDAwMTMxOTRiYzE2NmIz YWM2Ny4uZGY1OWMwOWQ5NzE0Y2MxZDg1YWNkNmNjNDI2NmUxNzJiODdjZTE3YiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uSW5s aW5lQ29udGVudEJ1aWxkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3Jh dGlvbi9MYXlvdXRJbnRlZ3JhdGlvbklubGluZUNvbnRlbnRCdWlsZGVyLmNwcApAQCAtMTU2LDEx ICsxNTYsMTIgQEAgSW5saW5lQ29udGVudEJ1aWxkZXI6OklubGluZUNvbnRlbnRCdWlsZGVyKGNv bnN0IExheW91dDo6TGF5b3V0U3RhdGUmIGxheW91dFN0YXQKIHsKIH0KIAotdm9pZCBJbmxpbmVD b250ZW50QnVpbGRlcjo6YnVpbGQoY29uc3QgTGF5b3V0OjpJbmxpbmVGb3JtYXR0aW5nU3RhdGUm IGlubGluZUZvcm1hdHRpbmdTdGF0ZSwgSW5saW5lQ29udGVudCYgaW5saW5lQ29udGVudCkgY29u c3QKK3ZvaWQgSW5saW5lQ29udGVudEJ1aWxkZXI6OmJ1aWxkKGNvbnN0IExheW91dDo6SW5saW5l Rm9ybWF0dGluZ0NvbnRleHQmIGlubGluZUZvcm1hdHRpbmdDb250ZXh0LCBJbmxpbmVDb250ZW50 JiBpbmxpbmVDb250ZW50KSBjb25zdAogeworICAgIGF1dG8mIGlubGluZUZvcm1hdHRpbmdTdGF0 ZSA9IGlubGluZUZvcm1hdHRpbmdDb250ZXh0LmZvcm1hdHRpbmdTdGF0ZSgpOwogICAgIGF1dG8g bGluZUxldmVsVmlzdWFsQWRqdXN0bWVudHNGb3JSdW5zID0gY29tcHV0ZUxpbmVMZXZlbFZpc3Vh bEFkanVzdG1lbnRzRm9yUnVucyhpbmxpbmVGb3JtYXR0aW5nU3RhdGUpOwogICAgIGNyZWF0ZURp c3BsYXlMaW5lUnVucyhpbmxpbmVGb3JtYXR0aW5nU3RhdGUsIGlubGluZUNvbnRlbnQsIGxpbmVM ZXZlbFZpc3VhbEFkanVzdG1lbnRzRm9yUnVucyk7Ci0gICAgY3JlYXRlRGlzcGxheU5vblJvb3RJ bmxpbmVCb3hlcyhpbmxpbmVGb3JtYXR0aW5nU3RhdGUsIGlubGluZUNvbnRlbnQsIGxpbmVMZXZl bFZpc3VhbEFkanVzdG1lbnRzRm9yUnVucyk7CisgICAgY3JlYXRlRGlzcGxheU5vblJvb3RJbmxp bmVCb3hlcyhpbmxpbmVGb3JtYXR0aW5nQ29udGV4dCwgaW5saW5lQ29udGVudCk7CiAgICAgY3Jl YXRlRGlzcGxheUxpbmVzKGlubGluZUZvcm1hdHRpbmdTdGF0ZSwgaW5saW5lQ29udGVudCwgbGlu ZUxldmVsVmlzdWFsQWRqdXN0bWVudHNGb3JSdW5zKTsKIH0KIApAQCAtMzIyLDggKzMyMywxMSBA QCB2b2lkIElubGluZUNvbnRlbnRCdWlsZGVyOjpjcmVhdGVEaXNwbGF5TGluZXMoY29uc3QgTGF5 b3V0OjpJbmxpbmVGb3JtYXR0aW5nU3RhdAogICAgICAgICB3aGlsZSAocnVuSW5kZXggPCBydW5z LnNpemUoKSAmJiBydW5zW3J1bkluZGV4XS5saW5lSW5kZXgoKSA9PSBsaW5lSW5kZXgpCiAgICAg ICAgICAgICBsaW5lSW5rT3ZlcmZsb3dSZWN0LnVuaXRlKHJ1bnNbcnVuSW5kZXgrK10uaW5rT3Zl cmZsb3coKSk7CiAgICAgICAgIC8vIENvbGxlY3Qgc2Nyb2xsYWJsZSBvdmVyZmxvdyBmcm9tIGlu bGluZSBib3hlcy4gQWxsIG90aGVyIGlubGluZSBsZXZlbCBib3hlcyAoZS5nIGF0b21pYyBpbmxp bmUgbGV2ZWwgYm94ZXMpIHN0cmV0Y2ggdGhlIGxpbmUuCi0gICAgICAgIHdoaWxlIChpbmxpbmVC b3hJbmRleCA8IG5vblJvb3RJbmxpbmVCb3hlcy5zaXplKCkgJiYgbm9uUm9vdElubGluZUJveGVz W2lubGluZUJveEluZGV4XS5saW5lSW5kZXgoKSA9PSBsaW5lSW5kZXgpCi0gICAgICAgICAgICBz Y3JvbGxhYmxlT3ZlcmZsb3dSZWN0LnVuaXRlKG5vblJvb3RJbmxpbmVCb3hlc1tpbmxpbmVCb3hJ bmRleCsrXS5yZWN0KCkpOworICAgICAgICB3aGlsZSAoaW5saW5lQm94SW5kZXggPCBub25Sb290 SW5saW5lQm94ZXMuc2l6ZSgpICYmIG5vblJvb3RJbmxpbmVCb3hlc1tpbmxpbmVCb3hJbmRleF0u bGluZUluZGV4KCkgPT0gbGluZUluZGV4KSB7CisgICAgICAgICAgICBhdXRvJiBpbmxpbmVCb3gg PSBub25Sb290SW5saW5lQm94ZXNbaW5saW5lQm94SW5kZXgrK107CisgICAgICAgICAgICBpZiAo aW5saW5lQm94LmNhbkNvbnRyaWJ1dGVUb0xpbmVPdmVyZmxvdygpKQorICAgICAgICAgICAgICAg IHNjcm9sbGFibGVPdmVyZmxvd1JlY3QudW5pdGUoaW5saW5lQm94LnJlY3QoKSk7CisgICAgICAg IH0KIAogICAgICAgICBhdXRvIGFkanVzdGVkTGluZUJveFJlY3QgPSBGbG9hdFJlY3QgeyBsaW5l Qm94TG9naWNhbFJlY3QgfTsKICAgICAgICAgYXV0byBlbmNsb3NpbmdUb3BBbmRCb3R0b20gPSBs aW5lLmVuY2xvc2luZ1RvcEFuZEJvdHRvbSgpOwpAQCAtMzM3LDggKzM0MSwxMCBAQCB2b2lkIElu bGluZUNvbnRlbnRCdWlsZGVyOjpjcmVhdGVEaXNwbGF5TGluZXMoY29uc3QgTGF5b3V0OjpJbmxp bmVGb3JtYXR0aW5nU3RhdAogICAgIH0KIH0KIAotdm9pZCBJbmxpbmVDb250ZW50QnVpbGRlcjo6 Y3JlYXRlRGlzcGxheU5vblJvb3RJbmxpbmVCb3hlcyhjb25zdCBMYXlvdXQ6OklubGluZUZvcm1h dHRpbmdTdGF0ZSYgaW5saW5lRm9ybWF0dGluZ1N0YXRlLCBJbmxpbmVDb250ZW50JiBpbmxpbmVD b250ZW50LCBjb25zdCBMaW5lTGV2ZWxWaXN1YWxBZGp1c3RtZW50c0ZvclJ1bnNMaXN0JikgY29u c3QKK3ZvaWQgSW5saW5lQ29udGVudEJ1aWxkZXI6OmNyZWF0ZURpc3BsYXlOb25Sb290SW5saW5l Qm94ZXMoY29uc3QgTGF5b3V0OjpJbmxpbmVGb3JtYXR0aW5nQ29udGV4dCYgaW5saW5lRm9ybWF0 dGluZ0NvbnRleHQsIElubGluZUNvbnRlbnQmIGlubGluZUNvbnRlbnQpIGNvbnN0CiB7CisgICAg YXV0byYgaW5saW5lRm9ybWF0dGluZ1N0YXRlID0gaW5saW5lRm9ybWF0dGluZ0NvbnRleHQuZm9y bWF0dGluZ1N0YXRlKCk7CisgICAgYXV0byBpbmxpbmVRdWlya3MgPSBpbmxpbmVGb3JtYXR0aW5n Q29udGV4dC5xdWlya3MoKTsKICAgICBmb3IgKHNpemVfdCBsaW5lSW5kZXggPSAwOyBsaW5lSW5k ZXggPCBpbmxpbmVGb3JtYXR0aW5nU3RhdGUubGluZUJveGVzKCkuc2l6ZSgpOyArK2xpbmVJbmRl eCkgewogICAgICAgICBhdXRvJiBsaW5lQm94ID0gaW5saW5lRm9ybWF0dGluZ1N0YXRlLmxpbmVC b3hlcygpW2xpbmVJbmRleF07CiAgICAgICAgIGF1dG8mIGxpbmVCb3hMb2dpY2FsUmVjdCA9IGxp bmVCb3gubG9naWNhbFJlY3QoKTsKQEAgLTM1MSw3ICszNTcsNyBAQCB2b2lkIElubGluZUNvbnRl bnRCdWlsZGVyOjpjcmVhdGVEaXNwbGF5Tm9uUm9vdElubGluZUJveGVzKGNvbnN0IExheW91dDo6 SW5saW5lRgogICAgICAgICAgICAgYXV0byBpbmxpbmVCb3hSZWN0ID0gbGluZUJveC5sb2dpY2Fs UmVjdEZvcklubGluZUJveChsYXlvdXRCb3gsIGJveEdlb21ldHJ5KTsKICAgICAgICAgICAgIGlu bGluZUJveFJlY3QubW92ZUJ5KGxpbmVCb3hMb2dpY2FsUmVjdC50b3BMZWZ0KCkpOwogCi0gICAg ICAgICAgICBpbmxpbmVDb250ZW50Lm5vblJvb3RJbmxpbmVCb3hlcy5hcHBlbmQoeyBsaW5lSW5k ZXgsIGxheW91dEJveCwgaW5saW5lQm94UmVjdCB9KTsKKyAgICAgICAgICAgIGlubGluZUNvbnRl bnQubm9uUm9vdElubGluZUJveGVzLmFwcGVuZCh7IGxpbmVJbmRleCwgbGF5b3V0Qm94LCBpbmxp bmVCb3hSZWN0LCBpbmxpbmVRdWlya3MuaW5saW5lTGV2ZWxCb3hBZmZlY3RzTGluZUJveCgqaW5s aW5lTGV2ZWxCb3gsIGxpbmVCb3gpIH0pOwogICAgICAgICB9CiAgICAgfQogfQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uSW5s aW5lQ29udGVudEJ1aWxkZXIuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9M YXlvdXRJbnRlZ3JhdGlvbklubGluZUNvbnRlbnRCdWlsZGVyLmgKaW5kZXggNGI4YWYxMDQxM2Vk YTg4OTY1Yjk0MmFkMDI3MzA3OTY2MmExNmVlZC4uZDc0YWE5YjQ1MjFhNDU1ODdkY2I2ODdiOTBj ZWMyNjgwMmU0OWE1YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0 aW9uL0xheW91dEludGVncmF0aW9uSW5saW5lQ29udGVudEJ1aWxkZXIuaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25JbmxpbmVDb250ZW50 QnVpbGRlci5oCkBAIC0zNCw3ICszNCw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIGNsYXNzIFJl bmRlckJsb2NrRmxvdzsKIAogbmFtZXNwYWNlIExheW91dCB7Ci1jbGFzcyBJbmxpbmVGb3JtYXR0 aW5nU3RhdGU7CitjbGFzcyBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDsKIGNsYXNzIExheW91dFN0 YXRlOwogfQogCkBAIC00Nyw3ICs0Nyw3IEBAIGNsYXNzIElubGluZUNvbnRlbnRCdWlsZGVyIHsK IHB1YmxpYzoKICAgICBJbmxpbmVDb250ZW50QnVpbGRlcihjb25zdCBMYXlvdXQ6OkxheW91dFN0 YXRlJiwgY29uc3QgUmVuZGVyQmxvY2tGbG93Jik7CiAKLSAgICB2b2lkIGJ1aWxkKGNvbnN0IExh eW91dDo6SW5saW5lRm9ybWF0dGluZ1N0YXRlJiwgSW5saW5lQ29udGVudCYpIGNvbnN0OworICAg IHZvaWQgYnVpbGQoY29uc3QgTGF5b3V0OjpJbmxpbmVGb3JtYXR0aW5nQ29udGV4dCYsIElubGlu ZUNvbnRlbnQmKSBjb25zdDsKIAogcHJpdmF0ZToKICAgICB1c2luZyBMaW5lTGV2ZWxWaXN1YWxB ZGp1c3RtZW50c0ZvclJ1bnNMaXN0ID0gVmVjdG9yPExpbmVMZXZlbFZpc3VhbEFkanVzdG1lbnRz Rm9yUnVucz47CkBAIC01NSw3ICs1NSw3IEBAIHByaXZhdGU6CiAgICAgTGluZUxldmVsVmlzdWFs QWRqdXN0bWVudHNGb3JSdW5zTGlzdCBjb21wdXRlTGluZUxldmVsVmlzdWFsQWRqdXN0bWVudHNG b3JSdW5zKGNvbnN0IExheW91dDo6SW5saW5lRm9ybWF0dGluZ1N0YXRlJikgY29uc3Q7CiAgICAg dm9pZCBjcmVhdGVEaXNwbGF5TGluZVJ1bnMoY29uc3QgTGF5b3V0OjpJbmxpbmVGb3JtYXR0aW5n U3RhdGUmLCBJbmxpbmVDb250ZW50JiwgY29uc3QgTGluZUxldmVsVmlzdWFsQWRqdXN0bWVudHNG b3JSdW5zTGlzdCYpIGNvbnN0OwogICAgIHZvaWQgY3JlYXRlRGlzcGxheUxpbmVzKGNvbnN0IExh eW91dDo6SW5saW5lRm9ybWF0dGluZ1N0YXRlJiwgSW5saW5lQ29udGVudCYsIGNvbnN0IExpbmVM ZXZlbFZpc3VhbEFkanVzdG1lbnRzRm9yUnVuc0xpc3QmKSBjb25zdDsKLSAgICB2b2lkIGNyZWF0 ZURpc3BsYXlOb25Sb290SW5saW5lQm94ZXMoY29uc3QgTGF5b3V0OjpJbmxpbmVGb3JtYXR0aW5n U3RhdGUmLCBJbmxpbmVDb250ZW50JiwgY29uc3QgTGluZUxldmVsVmlzdWFsQWRqdXN0bWVudHNG b3JSdW5zTGlzdCYpIGNvbnN0OworICAgIHZvaWQgY3JlYXRlRGlzcGxheU5vblJvb3RJbmxpbmVC b3hlcyhjb25zdCBMYXlvdXQ6OklubGluZUZvcm1hdHRpbmdDb250ZXh0JiwgSW5saW5lQ29udGVu dCYpIGNvbnN0OwogCiAgICAgY29uc3QgTGF5b3V0OjpMYXlvdXRTdGF0ZSYgbV9sYXlvdXRTdGF0 ZTsKICAgICBjb25zdCBSZW5kZXJCbG9ja0Zsb3cmIG1fYmxvY2tGbG93OwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uTGluZS5o IGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uTGlu ZS5oCmluZGV4IDhkMWQ3MzZiY2E4Y2M4ZTFlNTE0OTZjOTkwYmI5ODNkY2M2NTI5OWIuLjJmMTE4 MDNiNWJiZWVkNDYyMzc3ZjE2ZmU0MTYzZmVjOGUyYjQ0NTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkxpbmUuaAorKysgYi9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25MaW5lLmgK QEAgLTg4LDEwICs4OCwxMSBAQCBwcml2YXRlOgogCiBjbGFzcyBOb25Sb290SW5saW5lQm94IHsK IHB1YmxpYzoKLSAgICBOb25Sb290SW5saW5lQm94KHNpemVfdCBsaW5lSW5kZXgsIGNvbnN0IExh eW91dDo6Qm94JiBsYXlvdXRCb3gsIGNvbnN0IEZsb2F0UmVjdCYgcmVjdCkKKyAgICBOb25Sb290 SW5saW5lQm94KHNpemVfdCBsaW5lSW5kZXgsIGNvbnN0IExheW91dDo6Qm94JiBsYXlvdXRCb3gs IGNvbnN0IEZsb2F0UmVjdCYgcmVjdCwgYm9vbCBjYW5Db250cmlidXRlVG9MaW5lT3ZlcmZsb3cp CiAgICAgICAgIDogbV9saW5lSW5kZXgobGluZUluZGV4KQogICAgICAgICAsIG1fbGF5b3V0Qm94 KG1ha2VXZWFrUHRyKGxheW91dEJveCkpCiAgICAgICAgICwgbV9yZWN0KHJlY3QpCisgICAgICAg ICwgbV9jYW5Db250cmlidXRlVG9MaW5lT3ZlcmZsb3coY2FuQ29udHJpYnV0ZVRvTGluZU92ZXJm bG93KQogICAgIHsKICAgICB9CiAKQEAgLTEwMiwxMCArMTAzLDEzIEBAIHB1YmxpYzoKIAogICAg IEZsb2F0UmVjdCByZWN0KCkgY29uc3QgeyByZXR1cm4gbV9yZWN0OyB9CiAKKyAgICBib29sIGNh bkNvbnRyaWJ1dGVUb0xpbmVPdmVyZmxvdygpIGNvbnN0IHsgcmV0dXJuIG1fY2FuQ29udHJpYnV0 ZVRvTGluZU92ZXJmbG93OyB9CisKIHByaXZhdGU6CiAgICAgY29uc3Qgc2l6ZV90IG1fbGluZUlu ZGV4OwogICAgIFdlYWtQdHI8Y29uc3QgTGF5b3V0OjpCb3g+IG1fbGF5b3V0Qm94OwogICAgIEZs b2F0UmVjdCBtX3JlY3Q7CisgICAgYm9vbCBtX2NhbkNvbnRyaWJ1dGVUb0xpbmVPdmVyZmxvdyB7 IGZhbHNlIH07CiB9OwogCiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50 ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25MaW5lTGF5b3V0LmNwcCBiL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVMYXlvdXQuY3BwCmluZGV4 IGJkZGI5Yjk3ZGM3ZjczMTNkYWVlZTI0MTdmZmZjMWZmOTZhNGU3N2EuLjlhY2NmMjJkODUxM2Iw MjU2ZGZjMDg1ZmU0MmI0NGE1MDcxNTRlMzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVMYXlvdXQuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVMYXlv dXQuY3BwCkBAIC0yMTQsOCArMjE0LDEwIEBAIHZvaWQgTGluZUxheW91dDo6bGF5b3V0KCkKIAog dm9pZCBMaW5lTGF5b3V0Ojpjb25zdHJ1Y3RDb250ZW50KCkKIHsKKyAgICBhdXRvIGlubGluZUZv cm1hdHRpbmdDb250ZXh0ID0gTGF5b3V0OjpJbmxpbmVGb3JtYXR0aW5nQ29udGV4dCB7IHJvb3RM YXlvdXRCb3goKSwgbV9pbmxpbmVGb3JtYXR0aW5nU3RhdGUgfTsKKwogICAgIGF1dG8gaW5saW5l Q29udGVudEJ1aWxkZXIgPSBJbmxpbmVDb250ZW50QnVpbGRlciB7IG1fbGF5b3V0U3RhdGUsIGZs b3coKSB9OwotICAgIGlubGluZUNvbnRlbnRCdWlsZGVyLmJ1aWxkKG1faW5saW5lRm9ybWF0dGlu Z1N0YXRlLCBlbnN1cmVJbmxpbmVDb250ZW50KCkpOworICAgIGlubGluZUNvbnRlbnRCdWlsZGVy LmJ1aWxkKGlubGluZUZvcm1hdHRpbmdDb250ZXh0LCBlbnN1cmVJbmxpbmVDb250ZW50KCkpOwog ICAgIEFTU0VSVChtX2lubGluZUNvbnRlbnQpOwogCiAgICAgZm9yIChhdXRvJiBydW4gOiBtX2lu bGluZUNvbnRlbnQtPnJ1bnMpIHsK 420221 2021-02-13 09:04:44 -0800 2021-02-13 11:07:23 -0800 Patch bug-221867-20210213090444.patch text/plain 9769 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjcyNzgxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzRlNWY3YmZjZGMwNzky NWQyZjJkZDA3ZTJlODM0MjQ0NmUyNjk4Mi4uY2FlYzE0OGQ0NDI2YTQ3MjhlNDk2ZWQ4NzZiMDM0 MTA3MmE0Y2NkYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDIxLTAyLTEzICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSW50ZWdyYXRpb25d IE5vdCBldmVyeSBpbmxpbmUgYm94IGNvbnRyaWJ1dGVzIHRvIGxpbmUgb3ZlcmZsb3cKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMTg2NworCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENvbnNpZGVyIHRoZSBm b2xsb3cgY29udGVudDoKKyAgICAgICAgPGRpdiBzdHlsZT0iZm9udC1zaXplOiAyMHB4OyI+Y29u dGVudDxzcGFuIHN0eWxlPSJmb250LXNpemU6IDIwMHB4OyI+PGltZz48L3NwYW4+PC9kaXY+CisK KyAgICAgICAgSW4gcXVpcmtzIG1vZGUsIHRoZSBpbmxpbmUgYm94ICg8c3Bhbj4pIGRvZXMgbm90 IHN0cmV0Y2ggdGhlIGxpbmUgYm94IHZlcnRpY2FsbHkuIFdoYXQgaXQgbWVhbnMgaW4gcHJhY3Rp Y2UgaXMKKyAgICAgICAgdGhhdCB0aGUgaW5saW5lIGJveCdzIGRlc2NlbnQgaXMgaWdub3JlZC4g V2hpbGUgdGhlIGlubGluZSBib3ggaGFzIGEgcmVsYXRpdmVseSBsYXJnZSBkZXNjZW50IGFuZAor ICAgICAgICBpbiB0aGVvcnkgaXQgb3ZlcmZsb3dzIHRoZSBsaW5lIChzaW5jZSBpdCBpcyBsYXJn ZXIgdGhhbiB0aGUgcm9vdCBpbmxpbmUgYm94J3MgZGVzY2VudCkKKyAgICAgICAgaXQgc2hvdWxk IG5vdCBiZSB0YWtlbiBpbnRvIGFjY291bnQgd2hlbiBjb21wdXRpbmcgdGhlIHNjcm9sbGFibGUg b3ZlcmZsb3cuCisgICAgICAgIEhvd2V2ZXIgYWRkaW5nICJwYWRkaW5nOiAxcHgiIHRvIHRoZSA8 c3Bhbj4gd2lsbCBtYWtlIHRoZSBpbmxpbmUgYm94IHN0cmV0Y2ggdGhlIGxpbmUgYW5kIG5vdyB0 aGlzICIxcHggcGFkZGluZyIgd2lsbAorICAgICAgICBjb250cmlidXRlIHRvIHRoZSBzY3JvbGxh YmxlIG92ZXJmbG93LgorCisgICAgICAgICogbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVn cmF0aW9uSW5saW5lQ29udGVudEJ1aWxkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0 SW50ZWdyYXRpb246OklubGluZUNvbnRlbnRCdWlsZGVyOjpidWlsZCBjb25zdCk6CisgICAgICAg IChXZWJDb3JlOjpMYXlvdXRJbnRlZ3JhdGlvbjo6SW5saW5lQ29udGVudEJ1aWxkZXI6OmNyZWF0 ZURpc3BsYXlMaW5lcyBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXRJbnRlZ3JhdGlv bjo6SW5saW5lQ29udGVudEJ1aWxkZXI6OmNyZWF0ZURpc3BsYXlOb25Sb290SW5saW5lQm94ZXMg Y29uc3QpOgorICAgICAgICAqIGxheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbklu bGluZUNvbnRlbnRCdWlsZGVyLmg6CisgICAgICAgICogbGF5b3V0L2ludGVncmF0aW9uL0xheW91 dEludGVncmF0aW9uTGluZS5oOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0SW50ZWdyYXRpb246 Ok5vblJvb3RJbmxpbmVCb3g6Ok5vblJvb3RJbmxpbmVCb3gpOgorICAgICAgICAoV2ViQ29yZTo6 TGF5b3V0SW50ZWdyYXRpb246Ok5vblJvb3RJbmxpbmVCb3g6OmNhbkNvbnRyaWJ1dGVUb0xpbmVP dmVyZmxvdyBjb25zdCk6CisgICAgICAgICogbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVn cmF0aW9uTGluZUxheW91dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXRJbnRlZ3JhdGlv bjo6TGluZUxheW91dDo6Y29uc3RydWN0Q29udGVudCk6CisKIDIwMjEtMDItMTIgIFphbGFuIEJ1 anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZDXSBVcGRhdGUgdGhlIGJsb2Nr IGJveC9jb250YWluZXIgbGlzdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lu dGVncmF0aW9uL0xheW91dEludGVncmF0aW9uSW5saW5lQ29udGVudEJ1aWxkZXIuY3BwIGIvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uSW5saW5lQ29u dGVudEJ1aWxkZXIuY3BwCmluZGV4IDU3ODdmYWE0ZGQwYWY2NGQ2MGE3NWQwMDEzMTk0YmMxNjZi M2FjNjcuLmRmNTljMDlkOTcxNGNjMWQ4NWFjZDZjYzQyNjZlMTcyYjg3Y2UxN2IgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbklu bGluZUNvbnRlbnRCdWlsZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdy YXRpb24vTGF5b3V0SW50ZWdyYXRpb25JbmxpbmVDb250ZW50QnVpbGRlci5jcHAKQEAgLTE1Niwx MSArMTU2LDEyIEBAIElubGluZUNvbnRlbnRCdWlsZGVyOjpJbmxpbmVDb250ZW50QnVpbGRlcihj b25zdCBMYXlvdXQ6OkxheW91dFN0YXRlJiBsYXlvdXRTdGF0CiB7CiB9CiAKLXZvaWQgSW5saW5l Q29udGVudEJ1aWxkZXI6OmJ1aWxkKGNvbnN0IExheW91dDo6SW5saW5lRm9ybWF0dGluZ1N0YXRl JiBpbmxpbmVGb3JtYXR0aW5nU3RhdGUsIElubGluZUNvbnRlbnQmIGlubGluZUNvbnRlbnQpIGNv bnN0Cit2b2lkIElubGluZUNvbnRlbnRCdWlsZGVyOjpidWlsZChjb25zdCBMYXlvdXQ6OklubGlu ZUZvcm1hdHRpbmdDb250ZXh0JiBpbmxpbmVGb3JtYXR0aW5nQ29udGV4dCwgSW5saW5lQ29udGVu dCYgaW5saW5lQ29udGVudCkgY29uc3QKIHsKKyAgICBhdXRvJiBpbmxpbmVGb3JtYXR0aW5nU3Rh dGUgPSBpbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5mb3JtYXR0aW5nU3RhdGUoKTsKICAgICBhdXRv IGxpbmVMZXZlbFZpc3VhbEFkanVzdG1lbnRzRm9yUnVucyA9IGNvbXB1dGVMaW5lTGV2ZWxWaXN1 YWxBZGp1c3RtZW50c0ZvclJ1bnMoaW5saW5lRm9ybWF0dGluZ1N0YXRlKTsKICAgICBjcmVhdGVE aXNwbGF5TGluZVJ1bnMoaW5saW5lRm9ybWF0dGluZ1N0YXRlLCBpbmxpbmVDb250ZW50LCBsaW5l TGV2ZWxWaXN1YWxBZGp1c3RtZW50c0ZvclJ1bnMpOwotICAgIGNyZWF0ZURpc3BsYXlOb25Sb290 SW5saW5lQm94ZXMoaW5saW5lRm9ybWF0dGluZ1N0YXRlLCBpbmxpbmVDb250ZW50LCBsaW5lTGV2 ZWxWaXN1YWxBZGp1c3RtZW50c0ZvclJ1bnMpOworICAgIGNyZWF0ZURpc3BsYXlOb25Sb290SW5s aW5lQm94ZXMoaW5saW5lRm9ybWF0dGluZ0NvbnRleHQsIGlubGluZUNvbnRlbnQpOwogICAgIGNy ZWF0ZURpc3BsYXlMaW5lcyhpbmxpbmVGb3JtYXR0aW5nU3RhdGUsIGlubGluZUNvbnRlbnQsIGxp bmVMZXZlbFZpc3VhbEFkanVzdG1lbnRzRm9yUnVucyk7CiB9CiAKQEAgLTMyMiw4ICszMjMsMTEg QEAgdm9pZCBJbmxpbmVDb250ZW50QnVpbGRlcjo6Y3JlYXRlRGlzcGxheUxpbmVzKGNvbnN0IExh eW91dDo6SW5saW5lRm9ybWF0dGluZ1N0YXQKICAgICAgICAgd2hpbGUgKHJ1bkluZGV4IDwgcnVu cy5zaXplKCkgJiYgcnVuc1tydW5JbmRleF0ubGluZUluZGV4KCkgPT0gbGluZUluZGV4KQogICAg ICAgICAgICAgbGluZUlua092ZXJmbG93UmVjdC51bml0ZShydW5zW3J1bkluZGV4KytdLmlua092 ZXJmbG93KCkpOwogICAgICAgICAvLyBDb2xsZWN0IHNjcm9sbGFibGUgb3ZlcmZsb3cgZnJvbSBp bmxpbmUgYm94ZXMuIEFsbCBvdGhlciBpbmxpbmUgbGV2ZWwgYm94ZXMgKGUuZyBhdG9taWMgaW5s aW5lIGxldmVsIGJveGVzKSBzdHJldGNoIHRoZSBsaW5lLgotICAgICAgICB3aGlsZSAoaW5saW5l Qm94SW5kZXggPCBub25Sb290SW5saW5lQm94ZXMuc2l6ZSgpICYmIG5vblJvb3RJbmxpbmVCb3hl c1tpbmxpbmVCb3hJbmRleF0ubGluZUluZGV4KCkgPT0gbGluZUluZGV4KQotICAgICAgICAgICAg c2Nyb2xsYWJsZU92ZXJmbG93UmVjdC51bml0ZShub25Sb290SW5saW5lQm94ZXNbaW5saW5lQm94 SW5kZXgrK10ucmVjdCgpKTsKKyAgICAgICAgd2hpbGUgKGlubGluZUJveEluZGV4IDwgbm9uUm9v dElubGluZUJveGVzLnNpemUoKSAmJiBub25Sb290SW5saW5lQm94ZXNbaW5saW5lQm94SW5kZXhd LmxpbmVJbmRleCgpID09IGxpbmVJbmRleCkgeworICAgICAgICAgICAgYXV0byYgaW5saW5lQm94 ID0gbm9uUm9vdElubGluZUJveGVzW2lubGluZUJveEluZGV4KytdOworICAgICAgICAgICAgaWYg KGlubGluZUJveC5jYW5Db250cmlidXRlVG9MaW5lT3ZlcmZsb3coKSkKKyAgICAgICAgICAgICAg ICBzY3JvbGxhYmxlT3ZlcmZsb3dSZWN0LnVuaXRlKGlubGluZUJveC5yZWN0KCkpOworICAgICAg ICB9CiAKICAgICAgICAgYXV0byBhZGp1c3RlZExpbmVCb3hSZWN0ID0gRmxvYXRSZWN0IHsgbGlu ZUJveExvZ2ljYWxSZWN0IH07CiAgICAgICAgIGF1dG8gZW5jbG9zaW5nVG9wQW5kQm90dG9tID0g bGluZS5lbmNsb3NpbmdUb3BBbmRCb3R0b20oKTsKQEAgLTMzNyw4ICszNDEsMTAgQEAgdm9pZCBJ bmxpbmVDb250ZW50QnVpbGRlcjo6Y3JlYXRlRGlzcGxheUxpbmVzKGNvbnN0IExheW91dDo6SW5s aW5lRm9ybWF0dGluZ1N0YXQKICAgICB9CiB9CiAKLXZvaWQgSW5saW5lQ29udGVudEJ1aWxkZXI6 OmNyZWF0ZURpc3BsYXlOb25Sb290SW5saW5lQm94ZXMoY29uc3QgTGF5b3V0OjpJbmxpbmVGb3Jt YXR0aW5nU3RhdGUmIGlubGluZUZvcm1hdHRpbmdTdGF0ZSwgSW5saW5lQ29udGVudCYgaW5saW5l Q29udGVudCwgY29uc3QgTGluZUxldmVsVmlzdWFsQWRqdXN0bWVudHNGb3JSdW5zTGlzdCYpIGNv bnN0Cit2b2lkIElubGluZUNvbnRlbnRCdWlsZGVyOjpjcmVhdGVEaXNwbGF5Tm9uUm9vdElubGlu ZUJveGVzKGNvbnN0IExheW91dDo6SW5saW5lRm9ybWF0dGluZ0NvbnRleHQmIGlubGluZUZvcm1h dHRpbmdDb250ZXh0LCBJbmxpbmVDb250ZW50JiBpbmxpbmVDb250ZW50KSBjb25zdAogeworICAg IGF1dG8mIGlubGluZUZvcm1hdHRpbmdTdGF0ZSA9IGlubGluZUZvcm1hdHRpbmdDb250ZXh0LmZv cm1hdHRpbmdTdGF0ZSgpOworICAgIGF1dG8gaW5saW5lUXVpcmtzID0gaW5saW5lRm9ybWF0dGlu Z0NvbnRleHQucXVpcmtzKCk7CiAgICAgZm9yIChzaXplX3QgbGluZUluZGV4ID0gMDsgbGluZUlu ZGV4IDwgaW5saW5lRm9ybWF0dGluZ1N0YXRlLmxpbmVCb3hlcygpLnNpemUoKTsgKytsaW5lSW5k ZXgpIHsKICAgICAgICAgYXV0byYgbGluZUJveCA9IGlubGluZUZvcm1hdHRpbmdTdGF0ZS5saW5l Qm94ZXMoKVtsaW5lSW5kZXhdOwogICAgICAgICBhdXRvJiBsaW5lQm94TG9naWNhbFJlY3QgPSBs aW5lQm94LmxvZ2ljYWxSZWN0KCk7CkBAIC0zNTEsNyArMzU3LDcgQEAgdm9pZCBJbmxpbmVDb250 ZW50QnVpbGRlcjo6Y3JlYXRlRGlzcGxheU5vblJvb3RJbmxpbmVCb3hlcyhjb25zdCBMYXlvdXQ6 OklubGluZUYKICAgICAgICAgICAgIGF1dG8gaW5saW5lQm94UmVjdCA9IGxpbmVCb3gubG9naWNh bFJlY3RGb3JJbmxpbmVCb3gobGF5b3V0Qm94LCBib3hHZW9tZXRyeSk7CiAgICAgICAgICAgICBp bmxpbmVCb3hSZWN0Lm1vdmVCeShsaW5lQm94TG9naWNhbFJlY3QudG9wTGVmdCgpKTsKIAotICAg ICAgICAgICAgaW5saW5lQ29udGVudC5ub25Sb290SW5saW5lQm94ZXMuYXBwZW5kKHsgbGluZUlu ZGV4LCBsYXlvdXRCb3gsIGlubGluZUJveFJlY3QgfSk7CisgICAgICAgICAgICBpbmxpbmVDb250 ZW50Lm5vblJvb3RJbmxpbmVCb3hlcy5hcHBlbmQoeyBsaW5lSW5kZXgsIGxheW91dEJveCwgaW5s aW5lQm94UmVjdCwgaW5saW5lUXVpcmtzLmlubGluZUxldmVsQm94QWZmZWN0c0xpbmVCb3goKmlu bGluZUxldmVsQm94LCBsaW5lQm94KSB9KTsKICAgICAgICAgfQogICAgIH0KIH0KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbklu bGluZUNvbnRlbnRCdWlsZGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24v TGF5b3V0SW50ZWdyYXRpb25JbmxpbmVDb250ZW50QnVpbGRlci5oCmluZGV4IDRiOGFmMTA0MTNl ZGE4ODk2NWI5NDJhZDAyNzMwNzk2NjJhMTZlZWQuLmQ3NGFhOWI0NTIxYTQ1NTg3ZGNiNjg3Yjkw Y2VjMjY4MDJlNDlhNWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3Jh dGlvbi9MYXlvdXRJbnRlZ3JhdGlvbklubGluZUNvbnRlbnRCdWlsZGVyLmgKKysrIGIvU291cmNl L1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uSW5saW5lQ29udGVu dEJ1aWxkZXIuaApAQCAtMzQsNyArMzQsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiBjbGFzcyBS ZW5kZXJCbG9ja0Zsb3c7CiAKIG5hbWVzcGFjZSBMYXlvdXQgewotY2xhc3MgSW5saW5lRm9ybWF0 dGluZ1N0YXRlOworY2xhc3MgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ7CiBjbGFzcyBMYXlvdXRT dGF0ZTsKIH0KIApAQCAtNDcsNyArNDcsNyBAQCBjbGFzcyBJbmxpbmVDb250ZW50QnVpbGRlciB7 CiBwdWJsaWM6CiAgICAgSW5saW5lQ29udGVudEJ1aWxkZXIoY29uc3QgTGF5b3V0OjpMYXlvdXRT dGF0ZSYsIGNvbnN0IFJlbmRlckJsb2NrRmxvdyYpOwogCi0gICAgdm9pZCBidWlsZChjb25zdCBM YXlvdXQ6OklubGluZUZvcm1hdHRpbmdTdGF0ZSYsIElubGluZUNvbnRlbnQmKSBjb25zdDsKKyAg ICB2b2lkIGJ1aWxkKGNvbnN0IExheW91dDo6SW5saW5lRm9ybWF0dGluZ0NvbnRleHQmLCBJbmxp bmVDb250ZW50JikgY29uc3Q7CiAKIHByaXZhdGU6CiAgICAgdXNpbmcgTGluZUxldmVsVmlzdWFs QWRqdXN0bWVudHNGb3JSdW5zTGlzdCA9IFZlY3RvcjxMaW5lTGV2ZWxWaXN1YWxBZGp1c3RtZW50 c0ZvclJ1bnM+OwpAQCAtNTUsNyArNTUsNyBAQCBwcml2YXRlOgogICAgIExpbmVMZXZlbFZpc3Vh bEFkanVzdG1lbnRzRm9yUnVuc0xpc3QgY29tcHV0ZUxpbmVMZXZlbFZpc3VhbEFkanVzdG1lbnRz Rm9yUnVucyhjb25zdCBMYXlvdXQ6OklubGluZUZvcm1hdHRpbmdTdGF0ZSYpIGNvbnN0OwogICAg IHZvaWQgY3JlYXRlRGlzcGxheUxpbmVSdW5zKGNvbnN0IExheW91dDo6SW5saW5lRm9ybWF0dGlu Z1N0YXRlJiwgSW5saW5lQ29udGVudCYsIGNvbnN0IExpbmVMZXZlbFZpc3VhbEFkanVzdG1lbnRz Rm9yUnVuc0xpc3QmKSBjb25zdDsKICAgICB2b2lkIGNyZWF0ZURpc3BsYXlMaW5lcyhjb25zdCBM YXlvdXQ6OklubGluZUZvcm1hdHRpbmdTdGF0ZSYsIElubGluZUNvbnRlbnQmLCBjb25zdCBMaW5l TGV2ZWxWaXN1YWxBZGp1c3RtZW50c0ZvclJ1bnNMaXN0JikgY29uc3Q7Ci0gICAgdm9pZCBjcmVh dGVEaXNwbGF5Tm9uUm9vdElubGluZUJveGVzKGNvbnN0IExheW91dDo6SW5saW5lRm9ybWF0dGlu Z1N0YXRlJiwgSW5saW5lQ29udGVudCYsIGNvbnN0IExpbmVMZXZlbFZpc3VhbEFkanVzdG1lbnRz Rm9yUnVuc0xpc3QmKSBjb25zdDsKKyAgICB2b2lkIGNyZWF0ZURpc3BsYXlOb25Sb290SW5saW5l Qm94ZXMoY29uc3QgTGF5b3V0OjpJbmxpbmVGb3JtYXR0aW5nQ29udGV4dCYsIElubGluZUNvbnRl bnQmKSBjb25zdDsKIAogICAgIGNvbnN0IExheW91dDo6TGF5b3V0U3RhdGUmIG1fbGF5b3V0U3Rh dGU7CiAgICAgY29uc3QgUmVuZGVyQmxvY2tGbG93JiBtX2Jsb2NrRmxvdzsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkxpbmUu aCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkxp bmUuaAppbmRleCA4ZDFkNzM2YmNhOGNjOGUxZTUxNDk2Yzk5MGJiOTgzZGNjNjUyOTliLi4yZjEx ODAzYjViYmVlZDQ2MjM3N2YxNmZlNDE2M2ZlYzhlMmI0NDUyIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25MaW5lLmgKKysrIGIv U291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uTGluZS5o CkBAIC04OCwxMCArODgsMTEgQEAgcHJpdmF0ZToKIAogY2xhc3MgTm9uUm9vdElubGluZUJveCB7 CiBwdWJsaWM6Ci0gICAgTm9uUm9vdElubGluZUJveChzaXplX3QgbGluZUluZGV4LCBjb25zdCBM YXlvdXQ6OkJveCYgbGF5b3V0Qm94LCBjb25zdCBGbG9hdFJlY3QmIHJlY3QpCisgICAgTm9uUm9v dElubGluZUJveChzaXplX3QgbGluZUluZGV4LCBjb25zdCBMYXlvdXQ6OkJveCYgbGF5b3V0Qm94 LCBjb25zdCBGbG9hdFJlY3QmIHJlY3QsIGJvb2wgY2FuQ29udHJpYnV0ZVRvTGluZU92ZXJmbG93 KQogICAgICAgICA6IG1fbGluZUluZGV4KGxpbmVJbmRleCkKICAgICAgICAgLCBtX2xheW91dEJv eChtYWtlV2Vha1B0cihsYXlvdXRCb3gpKQogICAgICAgICAsIG1fcmVjdChyZWN0KQorICAgICAg ICAsIG1fY2FuQ29udHJpYnV0ZVRvTGluZU92ZXJmbG93KGNhbkNvbnRyaWJ1dGVUb0xpbmVPdmVy ZmxvdykKICAgICB7CiAgICAgfQogCkBAIC0xMDIsMTAgKzEwMywxMyBAQCBwdWJsaWM6CiAKICAg ICBGbG9hdFJlY3QgcmVjdCgpIGNvbnN0IHsgcmV0dXJuIG1fcmVjdDsgfQogCisgICAgYm9vbCBj YW5Db250cmlidXRlVG9MaW5lT3ZlcmZsb3coKSBjb25zdCB7IHJldHVybiBtX2NhbkNvbnRyaWJ1 dGVUb0xpbmVPdmVyZmxvdzsgfQorCiBwcml2YXRlOgogICAgIGNvbnN0IHNpemVfdCBtX2xpbmVJ bmRleDsKICAgICBXZWFrUHRyPGNvbnN0IExheW91dDo6Qm94PiBtX2xheW91dEJveDsKICAgICBG bG9hdFJlY3QgbV9yZWN0OworICAgIGJvb2wgbV9jYW5Db250cmlidXRlVG9MaW5lT3ZlcmZsb3cg eyBmYWxzZSB9OwogfTsKIAogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lu dGVncmF0aW9uL0xheW91dEludGVncmF0aW9uTGluZUxheW91dC5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25MaW5lTGF5b3V0LmNwcAppbmRl eCBiZGRiOWI5N2RjN2Y3MzEzZGFlZWUyNDE3ZmZmYzFmZjk2YTRlNzdhLi45YWNjZjIyZDg1MTNi MDI1NmRmYzA4NWZlNDJiNDRhNTA3MTU0ZTMyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25MaW5lTGF5b3V0LmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25MaW5lTGF5 b3V0LmNwcApAQCAtMjE0LDggKzIxNCwxMCBAQCB2b2lkIExpbmVMYXlvdXQ6OmxheW91dCgpCiAK IHZvaWQgTGluZUxheW91dDo6Y29uc3RydWN0Q29udGVudCgpCiB7CisgICAgYXV0byBpbmxpbmVG b3JtYXR0aW5nQ29udGV4dCA9IExheW91dDo6SW5saW5lRm9ybWF0dGluZ0NvbnRleHQgeyByb290 TGF5b3V0Qm94KCksIG1faW5saW5lRm9ybWF0dGluZ1N0YXRlIH07CisKICAgICBhdXRvIGlubGlu ZUNvbnRlbnRCdWlsZGVyID0gSW5saW5lQ29udGVudEJ1aWxkZXIgeyBtX2xheW91dFN0YXRlLCBm bG93KCkgfTsKLSAgICBpbmxpbmVDb250ZW50QnVpbGRlci5idWlsZChtX2lubGluZUZvcm1hdHRp bmdTdGF0ZSwgZW5zdXJlSW5saW5lQ29udGVudCgpKTsKKyAgICBpbmxpbmVDb250ZW50QnVpbGRl ci5idWlsZChpbmxpbmVGb3JtYXR0aW5nQ29udGV4dCwgZW5zdXJlSW5saW5lQ29udGVudCgpKTsK ICAgICBBU1NFUlQobV9pbmxpbmVDb250ZW50KTsKIAogICAgIGZvciAoYXV0byYgcnVuIDogbV9p bmxpbmVDb250ZW50LT5ydW5zKSB7Cg==