228046 2021-07-16 21:00:38 -0700 [LFC][IFC] Remove redundant LineBox functions 2021-08-19 16:21:58 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 228045 1 zalan zalan bfulgham sam simon.fraser webkit-bug-importer zalan oldest_to_newest 1777695 0 zalan 2021-07-16 21:00:38 -0700 ssia 1777697 1 433727 zalan 2021-07-16 21:04:34 -0700 Created attachment 433727 Patch 1779297 2 webkit-bug-importer 2021-07-23 21:01:14 -0700 <rdar://problem/81047372> 1785602 3 435910 zalan 2021-08-19 15:41:21 -0700 Created attachment 435910 Patch 1785611 4 ews-feeder 2021-08-19 16:21:56 -0700 Committed r281280 (240705@main): <https://commits.webkit.org/240705@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 435910. 433727 2021-07-16 21:04:34 -0700 2021-08-19 15:41:19 -0700 Patch bug-228046-20210716210433.patch text/plain 7891 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjgwMDE1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2YxZGM1ZTcxNzgxYzNi MjIzM2Q2ZmYzNjE0ZDE1NTE2NTQ4ZDUzMi4uZWU0MWRkNjA4OTBhMDQyMDI0NjY1YmE2MmRmNWE3 YjRiN2NiMTY2ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDIxLTA3LTE2ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIFJlbW92ZSBy ZWR1bmRhbnQgTGluZUJveCBmdW5jdGlvbnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIyODA0NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFRoZSBsaW5lIGJveCdzIGNvbnRlbnRMb2dpY2FsV2lkdGggYWx3 YXlzIG1hdGNoZXMgdGhlIHJvb3QgaW5saW5lYm94J3MgbG9naWNhbCB3aWR0aC4gCisKKyAgICAg ICAgKiBsYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVGb3JtYXR0aW5nQ29u dGV4dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUZvcm1hdHRpbmdDb250 ZXh0Ojpjb21wdXRlR2VvbWV0cnlGb3JMaW5lQ29udGVudCk6CisgICAgICAgICogbGF5b3V0L2Zv cm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRm9ybWF0dGluZ0dlb21ldHJ5LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJveEJ1aWxkZXI6OmNvbnN0cnVjdEFuZEFsaWdu SW5saW5lTGV2ZWxCb3hlcyk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCb3hCdWls ZGVyOjpjb21wdXRlTGluZUJveEhlaWdodEFuZEFsaWduSW5saW5lTGV2ZWxCb3hlc1ZlcnRpY2Fs bHkpOgorICAgICAgICAqIGxheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxp bmVCb3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQm94OjpMaW5lQm94KToK KyAgICAgICAgKiBsYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQm94 Lmg6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCb3g6OmxvZ2ljYWxSZWN0IGNvbnN0 KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJveDo6bG9naWNhbFdpZHRoIGNvbnN0 KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJveDo6bG9naWNhbEhl aWdodCBjb25zdCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCb3g6 OmxvZ2ljYWxUb3BMZWZ0IGNvbnN0KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkxheW91 dDo6TGluZUJveDo6bG9naWNhbFNpemUgY29uc3QpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29y ZTo6TGF5b3V0OjpMaW5lQm94Ojpjb250ZW50TG9naWNhbFdpZHRoIGNvbnN0KTogRGVsZXRlZC4K KwogMjAyMS0wNy0xNiAgQWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAg W0xGQ11bSUZDXSBNb3ZlIElubGluZUxldmVsQm94IGNsYXNzIHRvIGl0cyBvd24gZmlsZQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUv SW5saW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1h dHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwCmluZGV4IGFm YjUzMjI0NzhhOGY2N2RjYzJlMmNjNDFhZGEzY2RhMjEzOWNmZjQuLmQ0N2NhNjlmZWI4MTA0YjJm ZjhjNTMyOWZkZGQwMDRjMzZiZTkxYmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9Jbmxp bmVGb3JtYXR0aW5nQ29udGV4dC5jcHAKQEAgLTQ3NCw3ICs0NzQsNyBAQCBJbmxpbmVSZWN0IElu bGluZUZvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlR2VvbWV0cnlGb3JMaW5lQ29udGVudChjb25z dCBMaW5lQnVpbAogICAgIGF1dG8mIGxpbmVCb3hMb2dpY2FsUmVjdCA9IGxpbmVCb3gubG9naWNh bFJlY3QoKTsKICAgICBpZiAoIWxpbmVCb3guaGFzQ29udGVudCgpKSB7CiAgICAgICAgIC8vIEZh c3QgcGF0aCBmb3IgbGluZXMgd2l0aCBubyBjb250ZW50IGUuZy4gPGRpdj48c3Bhbj48L3NwYW4+ PHNwYW4+PC9zcGFuPjwvZGl2PiBvciA8c3Bhbj48ZGl2PjwvZGl2Pjwvc3Bhbj4gd2hlcmUgd2Ug Y29uc3RydWN0IGVtcHR5IHByZSBhbmQgcG9zdCBibG9ja3MuCi0gICAgICAgIEFTU0VSVCghbGlu ZUJveC5jb250ZW50TG9naWNhbFdpZHRoKCkgJiYgIWxpbmVCb3hMb2dpY2FsUmVjdC5oZWlnaHQo KSk7CisgICAgICAgIEFTU0VSVCghbGluZUJveC5yb290SW5saW5lQm94KCkuaGFzQ29udGVudCgp ICYmICFsaW5lQm94TG9naWNhbFJlY3QuaGVpZ2h0KCkpOwogICAgICAgICBhdXRvIHVwZGF0ZUlu bGluZUJveGVzR2VvbWV0cnlJZkFwcGxpY2FibGUgPSBbJl0gewogICAgICAgICAgICAgaWYgKCFs aW5lQm94Lmhhc0lubGluZUJveCgpKQogICAgICAgICAgICAgICAgIHJldHVybjsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGlu ZUZvcm1hdHRpbmdHZW9tZXRyeS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGlu Z0NvbnRleHRzL2lubGluZS9JbmxpbmVGb3JtYXR0aW5nR2VvbWV0cnkuY3BwCmluZGV4IGZmY2Ri ZmI5OWJmOWQ4Nzc2OWQ3YTlmMTBlYzIzNzFmNzg3MjY2NzYuLmVjZDMyM2NlOTVlZGFmNzMwMDFi ZDAzMjczODM5ZmRhZjE4MjY3ZjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9m b3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUZvcm1hdHRpbmdHZW9tZXRyeS5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5l Rm9ybWF0dGluZ0dlb21ldHJ5LmNwcApAQCAtMjQ5LDcgKzI0OSw3IEBAIHZvaWQgTGluZUJveEJ1 aWxkZXI6OmNvbnN0cnVjdEFuZEFsaWduSW5saW5lTGV2ZWxCb3hlcyhMaW5lQm94JiBsaW5lQm94 LCBjb25zdCBMCiAgICAgICAgIH0KICAgICAgICAgLy8gQ29uc3RydWN0IHRoZSBtaXNzaW5nIExp bmVCb3g6OklubGluZUJveGVzIHN0YXJ0aW5nIHdpdGggdGhlIHRvcG1vc3QgbGF5b3V0IGJveC4K ICAgICAgICAgZm9yIChhdXRvKiBsYXlvdXRCb3ggOiBXVEY6Om1ha2VSZXZlcnNlZFJhbmdlKGxh eW91dEJveGVzV2l0aG91dElubGluZUJveGVzKSkgewotICAgICAgICAgICAgYXV0byBpbmxpbmVC b3ggPSBJbmxpbmVMZXZlbEJveDo6Y3JlYXRlSW5saW5lQm94KCpsYXlvdXRCb3gsIHJvb3RJbmxp bmVCb3gubG9naWNhbExlZnQoKSwgbGluZUJveC5jb250ZW50TG9naWNhbFdpZHRoKCkpOworICAg ICAgICAgICAgYXV0byBpbmxpbmVCb3ggPSBJbmxpbmVMZXZlbEJveDo6Y3JlYXRlSW5saW5lQm94 KCpsYXlvdXRCb3gsIHJvb3RJbmxpbmVCb3gubG9naWNhbExlZnQoKSwgcm9vdElubGluZUJveC5s b2dpY2FsV2lkdGgoKSk7CiAgICAgICAgICAgICBzZXRWZXJ0aWNhbEdlb21ldHJ5Rm9ySW5saW5l Qm94KGlubGluZUJveCk7CiAgICAgICAgICAgICBzaW1wbGlmaWVkQWxpZ25WZXJ0aWNhbGx5SWZB cHBsaWNhYmxlKGlubGluZUJveCwgeyB9KTsKICAgICAgICAgICAgIGxpbmVCb3guYWRkSW5saW5l TGV2ZWxCb3goV1RGTW92ZShpbmxpbmVCb3gpKTsKQEAgLTMxMiw3ICszMTIsNyBAQCB2b2lkIExp bmVCb3hCdWlsZGVyOjpjb25zdHJ1Y3RBbmRBbGlnbklubGluZUxldmVsQm94ZXMoTGluZUJveCYg bGluZUJveCwgY29uc3QgTAogICAgICAgICBpZiAocnVuLmlzSW5saW5lQm94U3RhcnQoKSkgewog ICAgICAgICAgICAgLy8gQXQgdGhpcyBwb2ludCB3ZSBkb24ndCBrbm93IHlldCBob3cgd2lkZSB0 aGlzIGlubGluZSBib3ggaXMuIExldCdzIGFzc3VtZSBpdCdzIGFzIGxvbmcgYXMgdGhlIGxpbmUg aXMKICAgICAgICAgICAgIC8vIGFuZCBhZGp1c3QgaXQgbGF0ZXIgaWYgd2UgY29tZSBhY3Jvc3Mg YW4gaW5saW5lQm94RW5kIHJ1biAoc2VlIGJlbG93KS4KLSAgICAgICAgICAgIGF1dG8gaW5pdGlh bExvZ2ljYWxXaWR0aCA9IGxpbmVCb3guY29udGVudExvZ2ljYWxXaWR0aCgpIC0gcnVuLmxvZ2lj YWxMZWZ0KCk7CisgICAgICAgICAgICBhdXRvIGluaXRpYWxMb2dpY2FsV2lkdGggPSByb290SW5s aW5lQm94LmxvZ2ljYWxXaWR0aCgpIC0gcnVuLmxvZ2ljYWxMZWZ0KCk7CiAgICAgICAgICAgICBB U1NFUlQoaW5pdGlhbExvZ2ljYWxXaWR0aCA+PSAwKTsKICAgICAgICAgICAgIC8vIElubGluZSBi b3ggcnVuIGlzIGJhc2VkIG9uIG1hcmdpbiBib3guIExldCdzIGNvbnZlcnQgaXQgdG8gYm9yZGVy IGJveC4KICAgICAgICAgICAgIGF1dG8gbWFyZ2luU3RhcnQgPSBzdGQ6Om1heCgwX2x1LCBmb3Jt YXR0aW5nQ29udGV4dCgpLmdlb21ldHJ5Rm9yQm94KGxheW91dEJveCkubWFyZ2luU3RhcnQoKSk7 CkBAIC01ODYsNyArNTg2LDcgQEAgdm9pZCBMaW5lQm94QnVpbGRlcjo6Y29tcHV0ZUxpbmVCb3hI ZWlnaHRBbmRBbGlnbklubGluZUxldmVsQm94ZXNWZXJ0aWNhbGx5KExpbmUKICAgICAgICAgICAg ICAgICBicmVhazsKICAgICAgICAgICAgIGNhc2UgVmVydGljYWxBbGlnbjo6Qm90dG9tOgogICAg ICAgICAgICAgICAgIC8vIE5vdGUgdGhhdCB0aGlzIGxvZ2ljYWwgdG9wIGlzIG5vdCByZWxhdGl2 ZSB0byB0aGUgcGFyZW50IGlubGluZSBib3guCi0gICAgICAgICAgICAgICAgbG9naWNhbFRvcCA9 IGxpbmVCb3gubG9naWNhbEhlaWdodCgpIC0gaW5saW5lTGV2ZWxCb3gubGF5b3V0Qm91bmRzKCku ZGVzY2VudCAtIGlubGluZUxldmVsQm94LmJhc2VsaW5lKCk7CisgICAgICAgICAgICAgICAgbG9n aWNhbFRvcCA9IGxpbmVCb3gubG9naWNhbFJlY3QoKS5oZWlnaHQoKSAtIGlubGluZUxldmVsQm94 LmxheW91dEJvdW5kcygpLmRlc2NlbnQgLSBpbmxpbmVMZXZlbEJveC5iYXNlbGluZSgpOwogICAg ICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgZGVmYXVsdDoKICAgICAgICAgICAgICAg ICBBU1NFUlRfTk9UX0lNUExFTUVOVEVEX1lFVCgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJveC5jcHAgYi9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5l Qm94LmNwcAppbmRleCA5YzEwZjEyMDgwZGViMjYyYzc1ZTRhMmQzYzQwOTQ3NWQ1ZDE2OWQ0Li42 Y2Y0YjZlMDExOThhMmVmMjdlYWExMmNlMzA1NGQyMTcwYzZkMTRlIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQm94 LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGlu ZS9JbmxpbmVMaW5lQm94LmNwcApAQCAtMzYsNyArMzYsNiBAQCBuYW1lc3BhY2UgTGF5b3V0IHsK IAogTGluZUJveDo6TGluZUJveChjb25zdCBCb3gmIHJvb3RMYXlvdXRCb3gsIGNvbnN0IElubGlu ZUxheW91dFBvaW50JiBsb2dpY2FsVG9wbGVmdCwgSW5saW5lTGF5b3V0VW5pdCBsaW5lTG9naWNh bFdpZHRoLCBJbmxpbmVMYXlvdXRVbml0IGNvbnRlbnRMb2dpY2FsTGVmdCwgSW5saW5lTGF5b3V0 VW5pdCBjb250ZW50TG9naWNhbFdpZHRoLCBzaXplX3Qgbm9uU3Bhbm5pbmdJbmxpbmVMZXZlbEJv eENvdW50KQogICAgIDogbV9sb2dpY2FsUmVjdChsb2dpY2FsVG9wbGVmdCwgSW5saW5lTGF5b3V0 U2l6ZSB7IGxpbmVMb2dpY2FsV2lkdGgsIHsgfSB9KQotICAgICwgbV9jb250ZW50TG9naWNhbFdp ZHRoKGNvbnRlbnRMb2dpY2FsV2lkdGgpCiAgICAgLCBtX3Jvb3RJbmxpbmVCb3gocm9vdExheW91 dEJveCwgY29udGVudExvZ2ljYWxMZWZ0LCBJbmxpbmVMYXlvdXRTaXplIHsgY29udGVudExvZ2lj YWxXaWR0aCwgeyB9IH0sIElubGluZUxldmVsQm94OjpUeXBlOjpSb290SW5saW5lQm94KQogewog ICAgIG1fbm9uUm9vdElubGluZUxldmVsQm94TGlzdC5yZXNlcnZlSW5pdGlhbENhcGFjaXR5KG5v blNwYW5uaW5nSW5saW5lTGV2ZWxCb3hDb3VudCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQm94LmggYi9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQm94 LmgKaW5kZXggNTA5NzRmOGNmYmM2MjZmYzkwOTgxY2NhMGVhYWQ4NWMxOTRiZGNhZC4uMjE5Y2Nm Y2Y4ZWU1N2U5ZDk2MDMyMzZjZDEyMDQ3ZmJiZTNmMGIzOSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJveC5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGlu ZUxpbmVCb3guaApAQCAtNjMsMTIgKzYzLDYgQEAgcHVibGljOgogICAgIExpbmVCb3goY29uc3Qg Qm94JiByb290TGF5b3V0Qm94LCBjb25zdCBJbmxpbmVMYXlvdXRQb2ludCYgbG9naWNhbFRvcExl ZnQsIElubGluZUxheW91dFVuaXQgY29udGVudExvZ2ljYWxMZWZ0LCBJbmxpbmVMYXlvdXRVbml0 IGxpbmVMb2dpY2FsV2lkdGgsIElubGluZUxheW91dFVuaXQgY29udGVudExvZ2ljYWxXaWR0aCwg c2l6ZV90IG5vblNwYW5uaW5nSW5saW5lTGV2ZWxCb3hDb3VudCk7CiAKICAgICBjb25zdCBJbmxp bmVSZWN0JiBsb2dpY2FsUmVjdCgpIGNvbnN0IHsgcmV0dXJuIG1fbG9naWNhbFJlY3Q7IH0KLSAg ICBJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxXaWR0aCgpIGNvbnN0IHsgcmV0dXJuIGxvZ2ljYWxT aXplKCkud2lkdGgoKTsgfQotICAgIElubGluZUxheW91dFVuaXQgbG9naWNhbEhlaWdodCgpIGNv bnN0IHsgcmV0dXJuIGxvZ2ljYWxTaXplKCkuaGVpZ2h0KCk7IH0KLSAgICBJbmxpbmVMYXlvdXRQ b2ludCBsb2dpY2FsVG9wTGVmdCgpIGNvbnN0IHsgcmV0dXJuIGxvZ2ljYWxSZWN0KCkudG9wTGVm dCgpOyB9Ci0gICAgSW5saW5lTGF5b3V0U2l6ZSBsb2dpY2FsU2l6ZSgpIGNvbnN0IHsgcmV0dXJu IGxvZ2ljYWxSZWN0KCkuc2l6ZSgpOyB9Ci0gICAgSW5saW5lTGF5b3V0VW5pdCBjb250ZW50TG9n aWNhbFdpZHRoKCkgY29uc3QgeyByZXR1cm4gbV9jb250ZW50TG9naWNhbFdpZHRoOyB9Ci0KICAg ICAvLyBOb3RlIHRoYXQgdGhlIGxpbmUgY2FuIGhhdmUgbWFueSBpbmxpbmUgYm94ZXMgYW5kIGJl ICJlbXB0eSIgdGhlIHNhbWUgdGltZSBlLmcuIDxkaXY+PHNwYW4+PC9zcGFuPjxzcGFuPjwvc3Bh bj48L2Rpdj4KICAgICBib29sIGhhc0NvbnRlbnQoKSBjb25zdCB7IHJldHVybiBtX2hhc0NvbnRl bnQ7IH0KICAgICBib29sIGhhc0lubGluZUJveCgpIGNvbnN0IHsgcmV0dXJuIG1fYm94VHlwZXMu Y29udGFpbnMoSW5saW5lTGV2ZWxCb3g6OlR5cGU6OklubGluZUJveCk7IH0KQEAgLTEwNiw3ICsx MDAsNiBAQCBwcml2YXRlOgogCiBwcml2YXRlOgogICAgIElubGluZVJlY3QgbV9sb2dpY2FsUmVj dDsKLSAgICBJbmxpbmVMYXlvdXRVbml0IG1fY29udGVudExvZ2ljYWxXaWR0aCB7IDAgfTsKICAg ICBib29sIG1faGFzQ29udGVudCB7IGZhbHNlIH07CiAgICAgT3B0aW9uU2V0PElubGluZUxldmVs Qm94OjpUeXBlPiBtX2JveFR5cGVzOwogCg== 435910 2021-08-19 15:41:21 -0700 2021-08-19 16:21:57 -0700 Patch bug-228046-20210819154120.patch text/plain 7934 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxMjc1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmIxZWU3NjY4ZGNmYWQ5 NzQ0MDE1NGJhMzk0N2ZiOTBlMjExY2VkOS4uNGEwN2EzN2IzYzE5YjU1YmVkYzRkMzFlODczMmNk MTE0MTQyNTU1YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDIxLTA4LTE5ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIFJlbW92ZSBy ZWR1bmRhbnQgTGluZUJveCBmdW5jdGlvbnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIyODA0NgorCisgICAgICAgIFJldmlld2VkIGJ5IFNhbSBXZWlu aWcuCisKKyAgICAgICAgVGhlIGxpbmUgYm94J3MgY29udGVudExvZ2ljYWxXaWR0aCBhbHdheXMg bWF0Y2hlcyB0aGUgcm9vdCBpbmxpbmVib3gncyBsb2dpY2FsIHdpZHRoLiAKKworICAgICAgICAq IGxheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUZvcm1hdHRpbmdDb250ZXh0 LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6 OmNvbXB1dGVHZW9tZXRyeUZvckxpbmVDb250ZW50KToKKyAgICAgICAgKiBsYXlvdXQvZm9ybWF0 dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVGb3JtYXR0aW5nR2VvbWV0cnkuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQm94QnVpbGRlcjo6Y29uc3RydWN0QW5kQWxpZ25Jbmxp bmVMZXZlbEJveGVzKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJveEJ1aWxkZXI6 OmNvbXB1dGVMaW5lQm94SGVpZ2h0QW5kQWxpZ25JbmxpbmVMZXZlbEJveGVzVmVydGljYWxseSk6 CisgICAgICAgICogbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJv eC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCb3g6OkxpbmVCb3gpOgorICAg ICAgICAqIGxheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCb3guaDoK KyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJveDo6bG9naWNhbFJlY3QgY29uc3QpOgor ICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQm94Ojpsb2dpY2FsV2lkdGggY29uc3QpOiBE ZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQm94Ojpsb2dpY2FsSGVpZ2h0 IGNvbnN0KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJveDo6bG9n aWNhbFRvcExlZnQgY29uc3QpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpM aW5lQm94Ojpsb2dpY2FsU2l6ZSBjb25zdCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpM YXlvdXQ6OkxpbmVCb3g6OmNvbnRlbnRMb2dpY2FsV2lkdGggY29uc3QpOiBEZWxldGVkLgorCiAy MDIxLTA4LTE5ICBBbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbTGlu ZSBsYXlvdXRdICJ6ZXJvIHdpZHRoIHNwYWNlIiAoVSsyMDBCKSBpcyBhIGJyZWFraW5nIHNwYWNl CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lu bGluZS9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv Zm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHAKaW5k ZXggYWZiNTMyMjQ3OGE4ZjY3ZGNjMmUyY2M0MWFkYTNjZGEyMTM5Y2ZmNC4uZDQ3Y2E2OWZlYjgx MDRiMmZmOGM1MzI5ZmRkZDAwNGMzNmJlOTFiYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv bGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5l L0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmNwcApAQCAtNDc0LDcgKzQ3NCw3IEBAIElubGluZVJl Y3QgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVHZW9tZXRyeUZvckxpbmVDb250ZW50 KGNvbnN0IExpbmVCdWlsCiAgICAgYXV0byYgbGluZUJveExvZ2ljYWxSZWN0ID0gbGluZUJveC5s b2dpY2FsUmVjdCgpOwogICAgIGlmICghbGluZUJveC5oYXNDb250ZW50KCkpIHsKICAgICAgICAg Ly8gRmFzdCBwYXRoIGZvciBsaW5lcyB3aXRoIG5vIGNvbnRlbnQgZS5nLiA8ZGl2PjxzcGFuPjwv c3Bhbj48c3Bhbj48L3NwYW4+PC9kaXY+IG9yIDxzcGFuPjxkaXY+PC9kaXY+PC9zcGFuPiB3aGVy ZSB3ZSBjb25zdHJ1Y3QgZW1wdHkgcHJlIGFuZCBwb3N0IGJsb2Nrcy4KLSAgICAgICAgQVNTRVJU KCFsaW5lQm94LmNvbnRlbnRMb2dpY2FsV2lkdGgoKSAmJiAhbGluZUJveExvZ2ljYWxSZWN0Lmhl aWdodCgpKTsKKyAgICAgICAgQVNTRVJUKCFsaW5lQm94LnJvb3RJbmxpbmVCb3goKS5oYXNDb250 ZW50KCkgJiYgIWxpbmVCb3hMb2dpY2FsUmVjdC5oZWlnaHQoKSk7CiAgICAgICAgIGF1dG8gdXBk YXRlSW5saW5lQm94ZXNHZW9tZXRyeUlmQXBwbGljYWJsZSA9IFsmXSB7CiAgICAgICAgICAgICBp ZiAoIWxpbmVCb3guaGFzSW5saW5lQm94KCkpCiAgICAgICAgICAgICAgICAgcmV0dXJuOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUv SW5saW5lRm9ybWF0dGluZ0dlb21ldHJ5LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3Jt YXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUZvcm1hdHRpbmdHZW9tZXRyeS5jcHAKaW5kZXgg NmM5OGU3YzM3NzA3YmRlMjhmZTE2ZjhkNDI3ZjQ4MWVhZGY5NTUyMy4uODNkODExZjE2NDg1NTU4 ODExNzNmY2M2ZjU5MTVhZjlhMjljYzczZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRm9ybWF0dGluZ0dlb21ldHJ5LmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9J bmxpbmVGb3JtYXR0aW5nR2VvbWV0cnkuY3BwCkBAIC0yNDksNyArMjQ5LDcgQEAgdm9pZCBMaW5l Qm94QnVpbGRlcjo6Y29uc3RydWN0QW5kQWxpZ25JbmxpbmVMZXZlbEJveGVzKExpbmVCb3gmIGxp bmVCb3gsIGNvbnN0IEwKICAgICAgICAgfQogICAgICAgICAvLyBDb25zdHJ1Y3QgdGhlIG1pc3Np bmcgTGluZUJveDo6SW5saW5lQm94ZXMgc3RhcnRpbmcgd2l0aCB0aGUgdG9wbW9zdCBsYXlvdXQg Ym94LgogICAgICAgICBmb3IgKGF1dG8qIGxheW91dEJveCA6IFdURjo6bWFrZVJldmVyc2VkUmFu Z2UobGF5b3V0Qm94ZXNXaXRob3V0SW5saW5lQm94ZXMpKSB7Ci0gICAgICAgICAgICBhdXRvIGlu bGluZUJveCA9IElubGluZUxldmVsQm94OjpjcmVhdGVJbmxpbmVCb3goKmxheW91dEJveCwgcm9v dElubGluZUJveC5sb2dpY2FsTGVmdCgpLCBsaW5lQm94LmNvbnRlbnRMb2dpY2FsV2lkdGgoKSk7 CisgICAgICAgICAgICBhdXRvIGlubGluZUJveCA9IElubGluZUxldmVsQm94OjpjcmVhdGVJbmxp bmVCb3goKmxheW91dEJveCwgcm9vdElubGluZUJveC5sb2dpY2FsTGVmdCgpLCByb290SW5saW5l Qm94LmxvZ2ljYWxXaWR0aCgpKTsKICAgICAgICAgICAgIHNldFZlcnRpY2FsR2VvbWV0cnlGb3JJ bmxpbmVCb3goaW5saW5lQm94KTsKICAgICAgICAgICAgIHNpbXBsaWZpZWRBbGlnblZlcnRpY2Fs bHlJZkFwcGxpY2FibGUoaW5saW5lQm94LCB7IH0pOwogICAgICAgICAgICAgbGluZUJveC5hZGRJ bmxpbmVMZXZlbEJveChXVEZNb3ZlKGlubGluZUJveCkpOwpAQCAtMzE0LDcgKzMxNCw3IEBAIHZv aWQgTGluZUJveEJ1aWxkZXI6OmNvbnN0cnVjdEFuZEFsaWduSW5saW5lTGV2ZWxCb3hlcyhMaW5l Qm94JiBsaW5lQm94LCBjb25zdCBMCiAgICAgICAgICAgICAvLyBhbmQgYWRqdXN0IGl0IGxhdGVy IGlmIHdlIGNvbWUgYWNyb3NzIGFuIGlubGluZUJveEVuZCBydW4gKHNlZSBiZWxvdykuCiAgICAg ICAgICAgICAvLyBJbmxpbmUgYm94IHJ1biBpcyBiYXNlZCBvbiBtYXJnaW4gYm94LiBMZXQncyBj b252ZXJ0IGl0IHRvIGJvcmRlciBib3guCiAgICAgICAgICAgICBhdXRvIG1hcmdpblN0YXJ0ID0g Zm9ybWF0dGluZ0NvbnRleHQoKS5nZW9tZXRyeUZvckJveChsYXlvdXRCb3gpLm1hcmdpblN0YXJ0 KCk7Ci0gICAgICAgICAgICBhdXRvIGluaXRpYWxMb2dpY2FsV2lkdGggPSBsaW5lQm94LmNvbnRl bnRMb2dpY2FsV2lkdGgoKSAtIChydW4ubG9naWNhbExlZnQoKSArIG1hcmdpblN0YXJ0KTsKKyAg ICAgICAgICAgIGF1dG8gaW5pdGlhbExvZ2ljYWxXaWR0aCA9IHJvb3RJbmxpbmVCb3gubG9naWNh bFdpZHRoKCkgLSAocnVuLmxvZ2ljYWxMZWZ0KCkgKyBtYXJnaW5TdGFydCk7CiAgICAgICAgICAg ICBBU1NFUlQoaW5pdGlhbExvZ2ljYWxXaWR0aCA+PSAwKTsKICAgICAgICAgICAgIGF1dG8gaW5s aW5lQm94ID0gSW5saW5lTGV2ZWxCb3g6OmNyZWF0ZUlubGluZUJveChsYXlvdXRCb3gsIGxvZ2lj YWxMZWZ0ICsgbWFyZ2luU3RhcnQsIGluaXRpYWxMb2dpY2FsV2lkdGgpOwogICAgICAgICAgICAg c2V0VmVydGljYWxHZW9tZXRyeUZvcklubGluZUJveChpbmxpbmVCb3gpOwpAQCAtNTg5LDcgKzU4 OSw3IEBAIHZvaWQgTGluZUJveEJ1aWxkZXI6OmNvbXB1dGVMaW5lQm94SGVpZ2h0QW5kQWxpZ25J bmxpbmVMZXZlbEJveGVzVmVydGljYWxseShMaW5lCiAgICAgICAgICAgICAgICAgYnJlYWs7CiAg ICAgICAgICAgICBjYXNlIFZlcnRpY2FsQWxpZ246OkJvdHRvbToKICAgICAgICAgICAgICAgICAv LyBOb3RlIHRoYXQgdGhpcyBsb2dpY2FsIHRvcCBpcyBub3QgcmVsYXRpdmUgdG8gdGhlIHBhcmVu dCBpbmxpbmUgYm94LgotICAgICAgICAgICAgICAgIGxvZ2ljYWxUb3AgPSBsaW5lQm94LmxvZ2lj YWxIZWlnaHQoKSAtIGlubGluZUxldmVsQm94LmxheW91dEJvdW5kcygpLmRlc2NlbnQgLSBpbmxp bmVMZXZlbEJveC5iYXNlbGluZSgpOworICAgICAgICAgICAgICAgIGxvZ2ljYWxUb3AgPSBsaW5l Qm94LmxvZ2ljYWxSZWN0KCkuaGVpZ2h0KCkgLSBpbmxpbmVMZXZlbEJveC5sYXlvdXRCb3VuZHMo KS5kZXNjZW50IC0gaW5saW5lTGV2ZWxCb3guYmFzZWxpbmUoKTsKICAgICAgICAgICAgICAgICBi cmVhazsKICAgICAgICAgICAgIGRlZmF1bHQ6CiAgICAgICAgICAgICAgICAgQVNTRVJUX05PVF9J TVBMRU1FTlRFRF9ZRVQoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3Jt YXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCb3guY3BwIGIvU291cmNlL1dlYkNvcmUv bGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJveC5jcHAKaW5kZXgg OWMxMGYxMjA4MGRlYjI2MmM3NWU0YTJkM2M0MDk0NzVkNWQxNjlkNC4uNmNmNGI2ZTAxMTk4YTJl ZjI3ZWFhMTJjZTMwNTRkMjE3MGM2ZDE0ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJveC5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJv eC5jcHAKQEAgLTM2LDcgKzM2LDYgQEAgbmFtZXNwYWNlIExheW91dCB7CiAKIExpbmVCb3g6Okxp bmVCb3goY29uc3QgQm94JiByb290TGF5b3V0Qm94LCBjb25zdCBJbmxpbmVMYXlvdXRQb2ludCYg bG9naWNhbFRvcGxlZnQsIElubGluZUxheW91dFVuaXQgbGluZUxvZ2ljYWxXaWR0aCwgSW5saW5l TGF5b3V0VW5pdCBjb250ZW50TG9naWNhbExlZnQsIElubGluZUxheW91dFVuaXQgY29udGVudExv Z2ljYWxXaWR0aCwgc2l6ZV90IG5vblNwYW5uaW5nSW5saW5lTGV2ZWxCb3hDb3VudCkKICAgICA6 IG1fbG9naWNhbFJlY3QobG9naWNhbFRvcGxlZnQsIElubGluZUxheW91dFNpemUgeyBsaW5lTG9n aWNhbFdpZHRoLCB7IH0gfSkKLSAgICAsIG1fY29udGVudExvZ2ljYWxXaWR0aChjb250ZW50TG9n aWNhbFdpZHRoKQogICAgICwgbV9yb290SW5saW5lQm94KHJvb3RMYXlvdXRCb3gsIGNvbnRlbnRM b2dpY2FsTGVmdCwgSW5saW5lTGF5b3V0U2l6ZSB7IGNvbnRlbnRMb2dpY2FsV2lkdGgsIHsgfSB9 LCBJbmxpbmVMZXZlbEJveDo6VHlwZTo6Um9vdElubGluZUJveCkKIHsKICAgICBtX25vblJvb3RJ bmxpbmVMZXZlbEJveExpc3QucmVzZXJ2ZUluaXRpYWxDYXBhY2l0eShub25TcGFubmluZ0lubGlu ZUxldmVsQm94Q291bnQpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1h dHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJveC5oIGIvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJveC5oCmluZGV4IDUwOTc0 ZjhjZmJjNjI2ZmM5MDk4MWNjYTBlYWFkODVjMTk0YmRjYWQuLjIxOWNjZmNmOGVlNTdlOWQ5NjAz MjM2Y2QxMjA0N2ZiYmUzZjBiMzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9m b3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCb3guaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQm94LmgKQEAg LTYzLDEyICs2Myw2IEBAIHB1YmxpYzoKICAgICBMaW5lQm94KGNvbnN0IEJveCYgcm9vdExheW91 dEJveCwgY29uc3QgSW5saW5lTGF5b3V0UG9pbnQmIGxvZ2ljYWxUb3BMZWZ0LCBJbmxpbmVMYXlv dXRVbml0IGNvbnRlbnRMb2dpY2FsTGVmdCwgSW5saW5lTGF5b3V0VW5pdCBsaW5lTG9naWNhbFdp ZHRoLCBJbmxpbmVMYXlvdXRVbml0IGNvbnRlbnRMb2dpY2FsV2lkdGgsIHNpemVfdCBub25TcGFu bmluZ0lubGluZUxldmVsQm94Q291bnQpOwogCiAgICAgY29uc3QgSW5saW5lUmVjdCYgbG9naWNh bFJlY3QoKSBjb25zdCB7IHJldHVybiBtX2xvZ2ljYWxSZWN0OyB9Ci0gICAgSW5saW5lTGF5b3V0 VW5pdCBsb2dpY2FsV2lkdGgoKSBjb25zdCB7IHJldHVybiBsb2dpY2FsU2l6ZSgpLndpZHRoKCk7 IH0KLSAgICBJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxIZWlnaHQoKSBjb25zdCB7IHJldHVybiBs b2dpY2FsU2l6ZSgpLmhlaWdodCgpOyB9Ci0gICAgSW5saW5lTGF5b3V0UG9pbnQgbG9naWNhbFRv cExlZnQoKSBjb25zdCB7IHJldHVybiBsb2dpY2FsUmVjdCgpLnRvcExlZnQoKTsgfQotICAgIElu bGluZUxheW91dFNpemUgbG9naWNhbFNpemUoKSBjb25zdCB7IHJldHVybiBsb2dpY2FsUmVjdCgp LnNpemUoKTsgfQotICAgIElubGluZUxheW91dFVuaXQgY29udGVudExvZ2ljYWxXaWR0aCgpIGNv bnN0IHsgcmV0dXJuIG1fY29udGVudExvZ2ljYWxXaWR0aDsgfQotCiAgICAgLy8gTm90ZSB0aGF0 IHRoZSBsaW5lIGNhbiBoYXZlIG1hbnkgaW5saW5lIGJveGVzIGFuZCBiZSAiZW1wdHkiIHRoZSBz YW1lIHRpbWUgZS5nLiA8ZGl2PjxzcGFuPjwvc3Bhbj48c3Bhbj48L3NwYW4+PC9kaXY+CiAgICAg Ym9vbCBoYXNDb250ZW50KCkgY29uc3QgeyByZXR1cm4gbV9oYXNDb250ZW50OyB9CiAgICAgYm9v bCBoYXNJbmxpbmVCb3goKSBjb25zdCB7IHJldHVybiBtX2JveFR5cGVzLmNvbnRhaW5zKElubGlu ZUxldmVsQm94OjpUeXBlOjpJbmxpbmVCb3gpOyB9CkBAIC0xMDYsNyArMTAwLDYgQEAgcHJpdmF0 ZToKIAogcHJpdmF0ZToKICAgICBJbmxpbmVSZWN0IG1fbG9naWNhbFJlY3Q7Ci0gICAgSW5saW5l TGF5b3V0VW5pdCBtX2NvbnRlbnRMb2dpY2FsV2lkdGggeyAwIH07CiAgICAgYm9vbCBtX2hhc0Nv bnRlbnQgeyBmYWxzZSB9OwogICAgIE9wdGlvblNldDxJbmxpbmVMZXZlbEJveDo6VHlwZT4gbV9i b3hUeXBlczsKIAo=