258331 2023-06-20 17:47:28 -0700 [IFC] If white-space-collapse is preserve and text-wrap is not nowrap, the UA must hang this sequence 2023-06-22 09:13:18 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 258233 1 zalan zalan bfulgham ntim simon.fraser webkit-bug-importer zalan oldest_to_newest 1962698 0 zalan 2023-06-20 17:47:28 -0700 https://www.w3.org/TR/css-text-4/#white-space-phase-2 1962699 1 466770 zalan 2023-06-20 17:48:54 -0700 Created attachment 466770 Patch 1963044 2 466796 zalan 2023-06-22 07:17:47 -0700 Created attachment 466796 Patch 1963061 3 ews-feeder 2023-06-22 09:12:33 -0700 Committed 265406@main (66f8c85cf0ab): <https://commits.webkit.org/265406@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 466796. 1963062 4 webkit-bug-importer 2023-06-22 09:13:18 -0700 <rdar://problem/111163856> 466770 2023-06-20 17:48:54 -0700 2023-06-22 07:17:45 -0700 Patch bug-258331-20230620174853.patch text/plain 6773 zalan RnJvbSBjZjUwMDhiOTQxNjhmMTZhODYyYzg5ZjBiZTZkZWUzM2U1NmE0NzNmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IFR1ZSwgMjAgSnVuIDIwMjMgMTc6NDc6NDAgLTA3MDAKU3ViamVjdDogW1BBVENIXSBbSUZDXSBJ ZiB3aGl0ZS1zcGFjZS1jb2xsYXBzZSBpcyBwcmVzZXJ2ZSBhbmQgdGV4dC13cmFwIGlzCiBub3Qg bm93cmFwLCB0aGUgVUEgbXVzdCBoYW5nIHRoaXMgc2VxdWVuY2UKIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNTgzMzEKClJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgoKaHR0cHM6Ly93d3cudzMub3JnL1RSL2Nzcy10ZXh0LTQvI3doaXRlLXNwYWNlLXBoYXNlLTIK CiogU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5l TGluZS5jcHA6CihXZWJDb3JlOjpMYXlvdXQ6OkxpbmU6OmFwcGVuZFRleHRDb250ZW50KToKKiBT b3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5l Lmg6CihXZWJDb3JlOjpMYXlvdXQ6OkxpbmU6OlJ1bjo6c3R5bGUgY29uc3QpOgooV2ViQ29yZTo6 TGF5b3V0OjpMaW5lOjpSdW46OnNob3VsZFRyYWlsaW5nV2hpdGVzcGFjZUhhbmcgY29uc3QpOiBE ZWxldGVkLgoqIFNvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5l L0lubGluZUxpbmVCdWlsZGVyLmNwcDoKKFdlYkNvcmU6OkxheW91dDo6TGluZUNhbmRpZGF0ZTo6 SW5saW5lQ29udGVudDo6YXBwZW5kSW5saW5lSXRlbSk6CiogU291cmNlL1dlYkNvcmUvbGF5b3V0 L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvdGV4dC9UZXh0VXRpbC5jcHA6CihXZWJDb3JlOjpM YXlvdXQ6OlRleHRVdGlsOjpzaG91bGRUcmFpbGluZ1doaXRlc3BhY2VIYW5nKToKKiBTb3VyY2Uv V2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS90ZXh0L1RleHRVdGlsLmg6 Ci0tLQogLi4uL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmUuY3Bw ICAgICAgICB8IDIgKy0KIC4uLi9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5s aW5lL0lubGluZUxpbmUuaCAgfCA3ICstLS0tLS0KIC4uLi9sYXlvdXQvZm9ybWF0dGluZ0NvbnRl eHRzL2lubGluZS9JbmxpbmVMaW5lQnVpbGRlci5jcHAgfCAzICsrLQogLi4uL2xheW91dC9mb3Jt YXR0aW5nQ29udGV4dHMvaW5saW5lL3RleHQvVGV4dFV0aWwuY3BwICAgICB8IDYgKysrKysrCiAu Li4vbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvdGV4dC9UZXh0VXRpbC5oICAgICAg IHwgMSArCiA1IGZpbGVzIGNoYW5nZWQsIDExIGluc2VydGlvbnMoKyksIDggZGVsZXRpb25zKC0p CgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9p bmxpbmUvSW5saW5lTGluZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0Nv bnRleHRzL2lubGluZS9JbmxpbmVMaW5lLmNwcAppbmRleCAyYWQ4OTE5NzE2ZTAuLjI4MzgzNmY5 MDI5YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0 cy9pbmxpbmUvSW5saW5lTGluZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1h dHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZS5jcHAKQEAgLTUxOSw3ICs1MTksNyBAQCB2 b2lkIExpbmU6OmFwcGVuZFRleHRDb250ZW50KGNvbnN0IElubGluZVRleHRJdGVtJiBpbmxpbmVU ZXh0SXRlbSwgY29uc3QgUmVuZGVyUwogICAgICAgICBpZiAocnVuSGFzSGFuZ2FibGVQdW5jdHVh dGlvblN0YXJ0KQogICAgICAgICAgICAgbV9oYW5naW5nQ29udGVudC5zZXRMZWFkaW5nUHVuY3R1 YXRpb24oVGV4dFV0aWw6OmhhbmdhYmxlUHVuY3R1YXRpb25TdGFydFdpZHRoKGlubGluZVRleHRJ dGVtLCBzdHlsZSkpOwogCi0gICAgICAgIGF1dG8gcnVuSGFzSGFuZ2FibGVXaGl0ZXNwYWNlRW5k ID0gaW5saW5lVGV4dEl0ZW0uaXNXaGl0ZXNwYWNlKCkgJiYgIWlzVHJpbW1hYmxlICYmIG1fcnVu c1tsYXN0UnVuSW5kZXhdLnNob3VsZFRyYWlsaW5nV2hpdGVzcGFjZUhhbmcoKTsKKyAgICAgICAg YXV0byBydW5IYXNIYW5nYWJsZVdoaXRlc3BhY2VFbmQgPSAhaXNUcmltbWFibGUgJiYgaW5saW5l VGV4dEl0ZW0uaXNXaGl0ZXNwYWNlKCkgJiYgVGV4dFV0aWw6OnNob3VsZFRyYWlsaW5nV2hpdGVz cGFjZUhhbmcobV9ydW5zW2xhc3RSdW5JbmRleF0uc3R5bGUoKSk7CiAgICAgICAgIGlmIChydW5I YXNIYW5nYWJsZVdoaXRlc3BhY2VFbmQpIHsKICAgICAgICAgICAgIG1faGFuZ2luZ0NvbnRlbnQu c2V0VHJhaWxpbmdXaGl0ZXNwYWNlKGlubGluZVRleHRJdGVtLmxlbmd0aCgpLCBsb2dpY2FsV2lk dGgpOwogICAgICAgICAgICAgcmV0dXJuOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZS5oIGIvU291cmNlL1dlYkNv cmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZS5oCmluZGV4IGVi MGUyM2JhODM1ZS4uYjdmNTI2YmRkZWQ4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lLmgKKysrIGIvU291cmNlL1dl YkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZS5oCkBAIC0x MjQsNyArMTI0LDYgQEAgcHVibGljOgogICAgICAgICBJbmxpbmVMYXlvdXRVbml0IHRyYWlsaW5n V2hpdGVzcGFjZVdpZHRoKCkgY29uc3QgeyByZXR1cm4gbV90cmFpbGluZ1doaXRlc3BhY2UgPyBt X3RyYWlsaW5nV2hpdGVzcGFjZS0+d2lkdGggOiAwLmY7IH0KICAgICAgICAgYm9vbCBpc1doaXRl c3BhY2VPbmx5KCkgY29uc3QgeyByZXR1cm4gaGFzVHJhaWxpbmdXaGl0ZXNwYWNlKCkgJiYgbV90 cmFpbGluZ1doaXRlc3BhY2UtPmxlbmd0aCA9PSBtX3RleHRDb250ZW50LT5sZW5ndGg7IH0KIAot ICAgICAgICBib29sIHNob3VsZFRyYWlsaW5nV2hpdGVzcGFjZUhhbmcoKSBjb25zdDsKICAgICAg ICAgVGV4dERpcmVjdGlvbiBpbmxpbmVEaXJlY3Rpb24oKSBjb25zdDsKICAgICAgICAgSW5saW5l TGF5b3V0VW5pdCBsZXR0ZXJTcGFjaW5nKCkgY29uc3Q7CiAgICAgICAgIGlubGluZSBib29sIGhh c1RleHRDb21iaW5lKCkgY29uc3Q7CkBAIC0xNDAsNiArMTM5LDcgQEAgcHVibGljOgogICAgICAg ICBSdW4oY29uc3QgSW5saW5lSXRlbSYsIGNvbnN0IFJlbmRlclN0eWxlJiwgSW5saW5lTGF5b3V0 VW5pdCBsb2dpY2FsTGVmdCk7CiAgICAgICAgIFJ1bihjb25zdCBJbmxpbmVJdGVtJiBsaW5lU3Bh bm5pbmdJbmxpbmVCb3hJdGVtLCBJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxMZWZ0LCBJbmxpbmVM YXlvdXRVbml0IGxvZ2ljYWxXaWR0aCk7CiAKKyAgICAgICAgY29uc3QgUmVuZGVyU3R5bGUmIHN0 eWxlKCkgY29uc3QgeyByZXR1cm4gbV9zdHlsZTsgfQogICAgICAgICB2b2lkIGV4cGFuZChjb25z dCBJbmxpbmVUZXh0SXRlbSYsIElubGluZUxheW91dFVuaXQgbG9naWNhbFdpZHRoKTsKICAgICAg ICAgdm9pZCBtb3ZlSG9yaXpvbnRhbGx5KElubGluZUxheW91dFVuaXQgb2Zmc2V0KSB7IG1fbG9n aWNhbExlZnQgKz0gb2Zmc2V0OyB9CiAgICAgICAgIHZvaWQgc2hyaW5rSG9yaXpvbnRhbGx5KElu bGluZUxheW91dFVuaXQgd2lkdGgpIHsgbV9sb2dpY2FsV2lkdGggLT0gd2lkdGg7IH0KQEAgLTMz OSwxMSArMzM5LDYgQEAgaW5saW5lIHZvaWQgTGluZTo6UnVuOjpzZXROZWVkc0h5cGhlbihJbmxp bmVMYXlvdXRVbml0IGh5cGhlbkxvZ2ljYWxXaWR0aCkKICAgICBtX2xvZ2ljYWxXaWR0aCArPSBo eXBoZW5Mb2dpY2FsV2lkdGg7CiB9CiAKLWlubGluZSBib29sIExpbmU6OlJ1bjo6c2hvdWxkVHJh aWxpbmdXaGl0ZXNwYWNlSGFuZygpIGNvbnN0Ci17Ci0gICAgcmV0dXJuIG1fc3R5bGUud2hpdGVT cGFjZSgpID09IFdoaXRlU3BhY2U6OlByZVdyYXA7Ci19Ci0KIGlubGluZSBUZXh0RGlyZWN0aW9u IExpbmU6OlJ1bjo6aW5saW5lRGlyZWN0aW9uKCkgY29uc3QKIHsKICAgICByZXR1cm4gbV9zdHls ZS5kaXJlY3Rpb24oKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0 aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCdWlsZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCdWlsZGVyLmNwcApp bmRleCBkMzI0YTkxNjZkMzAuLjQ0YWQzYWNlOWIwYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJ1aWxkZXIuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lu bGluZUxpbmVCdWlsZGVyLmNwcApAQCAtMjM5LDcgKzIzOSw4IEBAIGlubGluZSB2b2lkIExpbmVD YW5kaWRhdGU6OklubGluZUNvbnRlbnQ6OmFwcGVuZElubGluZUl0ZW0oY29uc3QgSW5saW5lSXRl bSYgaW5sCiAKICAgICBpZiAoaW5saW5lSXRlbS5pc1RleHQoKSkgewogICAgICAgICBhdXRvJiBp bmxpbmVUZXh0SXRlbSA9IGRvd25jYXN0PElubGluZVRleHRJdGVtPihpbmxpbmVJdGVtKTsKLSAg ICAgICAgYXV0byBpc1RyYWlsaW5nSGFuZ2luZ0NvbnRlbnQgPSBpbmxpbmVUZXh0SXRlbS5pc1do aXRlc3BhY2UoKSAmJiBzdHlsZS53aGl0ZVNwYWNlKCkgPT0gV2hpdGVTcGFjZTo6UHJlV3JhcDsK KyAgICAgICAgLy8gaHR0cHM6Ly93d3cudzMub3JnL1RSL2Nzcy10ZXh0LTQvI3doaXRlLXNwYWNl LXBoYXNlLTIKKyAgICAgICAgYXV0byBpc1RyYWlsaW5nSGFuZ2luZ0NvbnRlbnQgPSBpbmxpbmVU ZXh0SXRlbS5pc1doaXRlc3BhY2UoKSAmJiBUZXh0VXRpbDo6c2hvdWxkVHJhaWxpbmdXaGl0ZXNw YWNlSGFuZyhzdHlsZSk7CiAgICAgICAgIGF1dG8gdHJpbW1hYmxlV2lkdGggPSBbJl0oKSAtPiBz dGQ6Om9wdGlvbmFsPElubGluZUxheW91dFVuaXQ+IHsKICAgICAgICAgICAgIGlmIChpc1RyYWls aW5nSGFuZ2luZ0NvbnRlbnQpCiAgICAgICAgICAgICAgICAgcmV0dXJuIHsgfTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL3RleHQv VGV4dFV0aWwuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9p bmxpbmUvdGV4dC9UZXh0VXRpbC5jcHAKaW5kZXggNjFjMTAyNmY2YjY1Li5kMzRjMDM1NmNjMjMg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5s aW5lL3RleHQvVGV4dFV0aWwuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0 aW5nQ29udGV4dHMvaW5saW5lL3RleHQvVGV4dFV0aWwuY3BwCkBAIC0zNTUsNiArMzU1LDEyIEBA IGJvb2wgVGV4dFV0aWw6OmlzV3JhcHBpbmdBbGxvd2VkKGNvbnN0IFJlbmRlclN0eWxlJiBzdHls ZSkKICAgICByZXR1cm4gc3R5bGUud2hpdGVTcGFjZSgpICE9IFdoaXRlU3BhY2U6OlByZSAmJiBz dHlsZS53aGl0ZVNwYWNlKCkgIT0gV2hpdGVTcGFjZTo6Tm9XcmFwOwogfQogCitib29sIFRleHRV dGlsOjpzaG91bGRUcmFpbGluZ1doaXRlc3BhY2VIYW5nKGNvbnN0IFJlbmRlclN0eWxlJiBzdHls ZSkKK3sKKyAgICAvLyBodHRwczovL3d3dy53My5vcmcvVFIvY3NzLXRleHQtNC8jd2hpdGUtc3Bh Y2UtcGhhc2UtMgorICAgIHJldHVybiBzdHlsZS53aGl0ZVNwYWNlQ29sbGFwc2UoKSA9PSBXaGl0 ZVNwYWNlQ29sbGFwc2U6OlByZXNlcnZlICYmIHN0eWxlLnRleHRXcmFwKCkgIT0gVGV4dFdyYXA6 Ok5vV3JhcDsKK30KKwogVGV4dEJyZWFrSXRlcmF0b3I6OkxpbmVNb2RlOjpCZWhhdmlvciBUZXh0 VXRpbDo6bGluZUJyZWFrSXRlcmF0b3JNb2RlKExpbmVCcmVhayBsaW5lQnJlYWspCiB7CiAgICAg c3dpdGNoIChsaW5lQnJlYWspIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9m b3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL3RleHQvVGV4dFV0aWwuaCBiL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL3RleHQvVGV4dFV0aWwuaAppbmRleCBm ZTI5Mjc3NmFmNGMuLjQzMDgxNmNkYjQxZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvdGV4dC9UZXh0VXRpbC5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL3RleHQvVGV4dFV0aWwu aApAQCAtNzYsNiArNzYsNyBAQCBwdWJsaWM6CiAgICAgc3RhdGljIGJvb2wgc2hvdWxkUHJlc2Vy dmVTcGFjZXNBbmRUYWJzKGNvbnN0IEJveCYpOwogICAgIHN0YXRpYyBib29sIHNob3VsZFByZXNl cnZlTmV3bGluZShjb25zdCBCb3gmKTsKICAgICBzdGF0aWMgYm9vbCBpc1dyYXBwaW5nQWxsb3dl ZChjb25zdCBSZW5kZXJTdHlsZSYpOworICAgIHN0YXRpYyBib29sIHNob3VsZFRyYWlsaW5nV2hp dGVzcGFjZUhhbmcoY29uc3QgUmVuZGVyU3R5bGUmKTsKICAgICBzdGF0aWMgYm9vbCBjb250YWlu c1N0cm9uZ0RpcmVjdGlvbmFsaXR5VGV4dChTdHJpbmdWaWV3KTsKIAogICAgIHN0YXRpYyBUZXh0 UnVuIGVsbGlwc2lzVGV4dFJ1bihib29sIGlzSG9yaXpvbnRhbCA9IHRydWUpOwo= 466796 2023-06-22 07:17:47 -0700 2023-06-22 09:12:34 -0700 Patch bug-258331-20230622071746.patch text/plain 6724 zalan RnJvbSBhNGUwYjc4ZmE3MzQzYWMwNDA2YWZiYjA5ZjFhZDg0ZTQ3YTQ0Y2JhIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IFRodSwgMjIgSnVuIDIwMjMgMDc6MTY6MjMgLTA3MDAKU3ViamVjdDogW1BBVENIXSBbSUZDXSBJ ZiB3aGl0ZS1zcGFjZS1jb2xsYXBzZSBpcyBwcmVzZXJ2ZSBhbmQgdGV4dC13cmFwIGlzCiBub3Qg bm93cmFwLCB0aGUgVUEgbXVzdCBoYW5nIHRoaXMgc2VxdWVuY2UKIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNTgzMzEKClJldmlld2VkIGJ5IFRpbSBOZ3V5ZW4uCgpo dHRwczovL3d3dy53My5vcmcvVFIvY3NzLXRleHQtNC8jd2hpdGUtc3BhY2UtcGhhc2UtMgoKKiBT b3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5l LmNwcDoKKFdlYkNvcmU6OkxheW91dDo6TGluZTo6YXBwZW5kVGV4dENvbnRlbnQpOgoqIFNvdXJj ZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmUuaDoK KFdlYkNvcmU6OkxheW91dDo6TGluZTo6UnVuOjpzdHlsZSBjb25zdCk6CihXZWJDb3JlOjpMYXlv dXQ6OkxpbmU6OlJ1bjo6c2hvdWxkVHJhaWxpbmdXaGl0ZXNwYWNlSGFuZyBjb25zdCk6IERlbGV0 ZWQuCiogU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5s aW5lTGluZUJ1aWxkZXIuY3BwOgooV2ViQ29yZTo6TGF5b3V0OjpMaW5lQ2FuZGlkYXRlOjpJbmxp bmVDb250ZW50OjphcHBlbmRJbmxpbmVJdGVtKToKKiBTb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9y bWF0dGluZ0NvbnRleHRzL2lubGluZS90ZXh0L1RleHRVdGlsLmNwcDoKKFdlYkNvcmU6OkxheW91 dDo6VGV4dFV0aWw6OnNob3VsZFRyYWlsaW5nV2hpdGVzcGFjZUhhbmcpOgoqIFNvdXJjZS9XZWJD b3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL3RleHQvVGV4dFV0aWwuaDoKLS0t CiAuLi4vbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZS5jcHAgICAg ICAgIHwgMiArLQogLi4uL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUv SW5saW5lTGluZS5oICB8IDcgKy0tLS0tLQogLi4uL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMv aW5saW5lL0lubGluZUxpbmVCdWlsZGVyLmNwcCB8IDMgKystCiAuLi4vbGF5b3V0L2Zvcm1hdHRp bmdDb250ZXh0cy9pbmxpbmUvdGV4dC9UZXh0VXRpbC5jcHAgICAgIHwgNiArKysrKysKIC4uLi9s YXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS90ZXh0L1RleHRVdGlsLmggICAgICAgfCAx ICsKIDUgZmlsZXMgY2hhbmdlZCwgMTEgaW5zZXJ0aW9ucygrKSwgOCBkZWxldGlvbnMoLSkKCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGlu ZS9JbmxpbmVMaW5lLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4 dHMvaW5saW5lL0lubGluZUxpbmUuY3BwCmluZGV4IDJhZDg5MTk3MTZlMC4uMjgzODM2ZjkwMjlj IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lu bGluZS9JbmxpbmVMaW5lLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGlu Z0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lLmNwcApAQCAtNTE5LDcgKzUxOSw3IEBAIHZvaWQg TGluZTo6YXBwZW5kVGV4dENvbnRlbnQoY29uc3QgSW5saW5lVGV4dEl0ZW0mIGlubGluZVRleHRJ dGVtLCBjb25zdCBSZW5kZXJTCiAgICAgICAgIGlmIChydW5IYXNIYW5nYWJsZVB1bmN0dWF0aW9u U3RhcnQpCiAgICAgICAgICAgICBtX2hhbmdpbmdDb250ZW50LnNldExlYWRpbmdQdW5jdHVhdGlv bihUZXh0VXRpbDo6aGFuZ2FibGVQdW5jdHVhdGlvblN0YXJ0V2lkdGgoaW5saW5lVGV4dEl0ZW0s IHN0eWxlKSk7CiAKLSAgICAgICAgYXV0byBydW5IYXNIYW5nYWJsZVdoaXRlc3BhY2VFbmQgPSBp bmxpbmVUZXh0SXRlbS5pc1doaXRlc3BhY2UoKSAmJiAhaXNUcmltbWFibGUgJiYgbV9ydW5zW2xh c3RSdW5JbmRleF0uc2hvdWxkVHJhaWxpbmdXaGl0ZXNwYWNlSGFuZygpOworICAgICAgICBhdXRv IHJ1bkhhc0hhbmdhYmxlV2hpdGVzcGFjZUVuZCA9ICFpc1RyaW1tYWJsZSAmJiBpbmxpbmVUZXh0 SXRlbS5pc1doaXRlc3BhY2UoKSAmJiBUZXh0VXRpbDo6c2hvdWxkVHJhaWxpbmdXaGl0ZXNwYWNl SGFuZyhtX3J1bnNbbGFzdFJ1bkluZGV4XS5zdHlsZSgpKTsKICAgICAgICAgaWYgKHJ1bkhhc0hh bmdhYmxlV2hpdGVzcGFjZUVuZCkgewogICAgICAgICAgICAgbV9oYW5naW5nQ29udGVudC5zZXRU cmFpbGluZ1doaXRlc3BhY2UoaW5saW5lVGV4dEl0ZW0ubGVuZ3RoKCksIGxvZ2ljYWxXaWR0aCk7 CiAgICAgICAgICAgICByZXR1cm47CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv Zm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lLmggYi9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lLmgKaW5kZXggZWIwZTIz YmE4MzVlLi5iN2Y1MjZiZGRlZDggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9m b3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmUuaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lLmgKQEAgLTEyNCw3 ICsxMjQsNiBAQCBwdWJsaWM6CiAgICAgICAgIElubGluZUxheW91dFVuaXQgdHJhaWxpbmdXaGl0 ZXNwYWNlV2lkdGgoKSBjb25zdCB7IHJldHVybiBtX3RyYWlsaW5nV2hpdGVzcGFjZSA/IG1fdHJh aWxpbmdXaGl0ZXNwYWNlLT53aWR0aCA6IDAuZjsgfQogICAgICAgICBib29sIGlzV2hpdGVzcGFj ZU9ubHkoKSBjb25zdCB7IHJldHVybiBoYXNUcmFpbGluZ1doaXRlc3BhY2UoKSAmJiBtX3RyYWls aW5nV2hpdGVzcGFjZS0+bGVuZ3RoID09IG1fdGV4dENvbnRlbnQtPmxlbmd0aDsgfQogCi0gICAg ICAgIGJvb2wgc2hvdWxkVHJhaWxpbmdXaGl0ZXNwYWNlSGFuZygpIGNvbnN0OwogICAgICAgICBU ZXh0RGlyZWN0aW9uIGlubGluZURpcmVjdGlvbigpIGNvbnN0OwogICAgICAgICBJbmxpbmVMYXlv dXRVbml0IGxldHRlclNwYWNpbmcoKSBjb25zdDsKICAgICAgICAgaW5saW5lIGJvb2wgaGFzVGV4 dENvbWJpbmUoKSBjb25zdDsKQEAgLTE0MCw2ICsxMzksNyBAQCBwdWJsaWM6CiAgICAgICAgIFJ1 bihjb25zdCBJbmxpbmVJdGVtJiwgY29uc3QgUmVuZGVyU3R5bGUmLCBJbmxpbmVMYXlvdXRVbml0 IGxvZ2ljYWxMZWZ0KTsKICAgICAgICAgUnVuKGNvbnN0IElubGluZUl0ZW0mIGxpbmVTcGFubmlu Z0lubGluZUJveEl0ZW0sIElubGluZUxheW91dFVuaXQgbG9naWNhbExlZnQsIElubGluZUxheW91 dFVuaXQgbG9naWNhbFdpZHRoKTsKIAorICAgICAgICBjb25zdCBSZW5kZXJTdHlsZSYgc3R5bGUo KSBjb25zdCB7IHJldHVybiBtX3N0eWxlOyB9CiAgICAgICAgIHZvaWQgZXhwYW5kKGNvbnN0IElu bGluZVRleHRJdGVtJiwgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsV2lkdGgpOwogICAgICAgICB2 b2lkIG1vdmVIb3Jpem9udGFsbHkoSW5saW5lTGF5b3V0VW5pdCBvZmZzZXQpIHsgbV9sb2dpY2Fs TGVmdCArPSBvZmZzZXQ7IH0KICAgICAgICAgdm9pZCBzaHJpbmtIb3Jpem9udGFsbHkoSW5saW5l TGF5b3V0VW5pdCB3aWR0aCkgeyBtX2xvZ2ljYWxXaWR0aCAtPSB3aWR0aDsgfQpAQCAtMzM5LDEx ICszMzksNiBAQCBpbmxpbmUgdm9pZCBMaW5lOjpSdW46OnNldE5lZWRzSHlwaGVuKElubGluZUxh eW91dFVuaXQgaHlwaGVuTG9naWNhbFdpZHRoKQogICAgIG1fbG9naWNhbFdpZHRoICs9IGh5cGhl bkxvZ2ljYWxXaWR0aDsKIH0KIAotaW5saW5lIGJvb2wgTGluZTo6UnVuOjpzaG91bGRUcmFpbGlu Z1doaXRlc3BhY2VIYW5nKCkgY29uc3QKLXsKLSAgICByZXR1cm4gbV9zdHlsZS53aGl0ZVNwYWNl KCkgPT0gV2hpdGVTcGFjZTo6UHJlV3JhcDsKLX0KLQogaW5saW5lIFRleHREaXJlY3Rpb24gTGlu ZTo6UnVuOjppbmxpbmVEaXJlY3Rpb24oKSBjb25zdAogewogICAgIHJldHVybiBtX3N0eWxlLmRp cmVjdGlvbigpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdD b250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJ1aWxkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJ1aWxkZXIuY3BwCmluZGV4 IGJmOGE0MjhlZDg1YS4uM2JjNDk4NjhjMWE5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQnVpbGRlci5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5l TGluZUJ1aWxkZXIuY3BwCkBAIC0yMzksNyArMjM5LDggQEAgaW5saW5lIHZvaWQgTGluZUNhbmRp ZGF0ZTo6SW5saW5lQ29udGVudDo6YXBwZW5kSW5saW5lSXRlbShjb25zdCBJbmxpbmVJdGVtJiBp bmwKIAogICAgIGlmIChpbmxpbmVJdGVtLmlzVGV4dCgpKSB7CiAgICAgICAgIGF1dG8mIGlubGlu ZVRleHRJdGVtID0gZG93bmNhc3Q8SW5saW5lVGV4dEl0ZW0+KGlubGluZUl0ZW0pOwotICAgICAg ICBhdXRvIGlzVHJhaWxpbmdIYW5naW5nQ29udGVudCA9IGlubGluZVRleHRJdGVtLmlzV2hpdGVz cGFjZSgpICYmIHN0eWxlLndoaXRlU3BhY2UoKSA9PSBXaGl0ZVNwYWNlOjpQcmVXcmFwOworICAg ICAgICAvLyBodHRwczovL3d3dy53My5vcmcvVFIvY3NzLXRleHQtNC8jd2hpdGUtc3BhY2UtcGhh c2UtMgorICAgICAgICBhdXRvIGlzVHJhaWxpbmdIYW5naW5nQ29udGVudCA9IGlubGluZVRleHRJ dGVtLmlzV2hpdGVzcGFjZSgpICYmIFRleHRVdGlsOjpzaG91bGRUcmFpbGluZ1doaXRlc3BhY2VI YW5nKHN0eWxlKTsKICAgICAgICAgYXV0byB0cmltbWFibGVXaWR0aCA9IFsmXSgpIC0+IHN0ZDo6 b3B0aW9uYWw8SW5saW5lTGF5b3V0VW5pdD4gewogICAgICAgICAgICAgaWYgKGlzVHJhaWxpbmdI YW5naW5nQ29udGVudCkKICAgICAgICAgICAgICAgICByZXR1cm4geyB9OwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvdGV4dC9UZXh0 VXRpbC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGlu ZS90ZXh0L1RleHRVdGlsLmNwcAppbmRleCBmOTNjNzZiN2UwODguLmU4NjQ5NmE5YzY2NiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUv dGV4dC9UZXh0VXRpbC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdD b250ZXh0cy9pbmxpbmUvdGV4dC9UZXh0VXRpbC5jcHAKQEAgLTM1NSw2ICszNTUsMTIgQEAgYm9v bCBUZXh0VXRpbDo6aXNXcmFwcGluZ0FsbG93ZWQoY29uc3QgUmVuZGVyU3R5bGUmIHN0eWxlKQog ICAgIHJldHVybiBzdHlsZS50ZXh0V3JhcCgpICE9IFRleHRXcmFwOjpOb1dyYXA7CiB9CiAKK2Jv b2wgVGV4dFV0aWw6OnNob3VsZFRyYWlsaW5nV2hpdGVzcGFjZUhhbmcoY29uc3QgUmVuZGVyU3R5 bGUmIHN0eWxlKQoreworICAgIC8vIGh0dHBzOi8vd3d3LnczLm9yZy9UUi9jc3MtdGV4dC00LyN3 aGl0ZS1zcGFjZS1waGFzZS0yCisgICAgcmV0dXJuIHN0eWxlLndoaXRlU3BhY2VDb2xsYXBzZSgp ID09IFdoaXRlU3BhY2VDb2xsYXBzZTo6UHJlc2VydmUgJiYgc3R5bGUudGV4dFdyYXAoKSAhPSBU ZXh0V3JhcDo6Tm9XcmFwOworfQorCiBUZXh0QnJlYWtJdGVyYXRvcjo6TGluZU1vZGU6OkJlaGF2 aW9yIFRleHRVdGlsOjpsaW5lQnJlYWtJdGVyYXRvck1vZGUoTGluZUJyZWFrIGxpbmVCcmVhaykK IHsKICAgICBzd2l0Y2ggKGxpbmVCcmVhaykgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv bGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvdGV4dC9UZXh0VXRpbC5oIGIvU291cmNl L1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvdGV4dC9UZXh0VXRpbC5o CmluZGV4IGZlMjkyNzc2YWY0Yy4uNDMwODE2Y2RiNDFmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS90ZXh0L1RleHRVdGlsLmgKKysr IGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvdGV4dC9U ZXh0VXRpbC5oCkBAIC03Niw2ICs3Niw3IEBAIHB1YmxpYzoKICAgICBzdGF0aWMgYm9vbCBzaG91 bGRQcmVzZXJ2ZVNwYWNlc0FuZFRhYnMoY29uc3QgQm94Jik7CiAgICAgc3RhdGljIGJvb2wgc2hv dWxkUHJlc2VydmVOZXdsaW5lKGNvbnN0IEJveCYpOwogICAgIHN0YXRpYyBib29sIGlzV3JhcHBp bmdBbGxvd2VkKGNvbnN0IFJlbmRlclN0eWxlJik7CisgICAgc3RhdGljIGJvb2wgc2hvdWxkVHJh aWxpbmdXaGl0ZXNwYWNlSGFuZyhjb25zdCBSZW5kZXJTdHlsZSYpOwogICAgIHN0YXRpYyBib29s IGNvbnRhaW5zU3Ryb25nRGlyZWN0aW9uYWxpdHlUZXh0KFN0cmluZ1ZpZXcpOwogCiAgICAgc3Rh dGljIFRleHRSdW4gZWxsaXBzaXNUZXh0UnVuKGJvb2wgaXNIb3Jpem9udGFsID0gdHJ1ZSk7Cg==