234671 2021-12-24 13:57:33 -0800 [LFC][IFC] ContinuousContent should tell InlineContentBreaker if the candidate content is hanging 2021-12-26 07:04:18 -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 1826763 0 zalan 2021-12-24 13:57:33 -0800 ssia 1826778 1 447952 zalan 2021-12-24 16:15:55 -0800 Created attachment 447952 Patch 1826798 2 447952 koivisto 2021-12-25 01:34:55 -0800 Comment on attachment 447952 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=447952&action=review > Source/WebCore/layout/formattingContexts/inline/InlineLineBuilder.cpp:207 > + auto hangingContentWidth = [&]() -> std::optional<InlineLayoutUnit> { > + return isWhitespace && style.whiteSpace() == WhiteSpace::PreWrap ? std::make_optional(logicalWidth) : std::nullopt; > + }; maybe not to most necessary lambda 1826858 3 447972 zalan 2021-12-26 06:34:39 -0800 Created attachment 447972 Patch 1826859 4 ews-feeder 2021-12-26 07:03:42 -0800 Committed r287443 (245578@main): <https://commits.webkit.org/245578@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 447972. 1826860 5 webkit-bug-importer 2021-12-26 07:04:18 -0800 <rdar://problem/86916610> 447952 2021-12-24 16:15:55 -0800 2021-12-26 06:34:36 -0800 Patch bug-234671-20211224161554.patch text/plain 6923 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg3Mzk1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzMzMjcwMmFjNGQ2YjU2 YWFhY2FhODBhYzBlZjJmM2FjNDFjNDBkYS4uOGFlZTdlMmRmZTM1OWUzNTdmNGEyN2I4YmZlZjY0 MjIwNjY4MWRiMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIxLTEyLTI0ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIENvbnRpbnVv dXNDb250ZW50IHNob3VsZCB0ZWxsIElubGluZUNvbnRlbnRCcmVha2VyIGlmIHRoZSBjYW5kaWRh dGUgY29udGVudCBpcyBoYW5naW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0yMzQ2NzEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBDb250aW51b3VzQ29udGVudCBub3cga2VlcHMgdHJhY2sgb2Ygd2hldGhl ciB0aGUgY2FuZGlkYXRlIHJ1biBpcyBhIGhhbmdpbmcgY29udGVudC4KKyAgICAgICAgSXQgZW5h YmxlcyBJbmxpbmVDb250ZW50QnJlYWtlciB0byBqdXN0IHNpbXBseSBsb29rIGF0IHRoZSBmbGFn IHRvIGRlY2lkZSBpZiB0aGUgb3ZlcmZsb3dpbmcKKyAgICAgICAgKGhhbmdpbmcpIGNvbnRlbnQg c2hvdWxkIHN0YXkgb24gdGhlIGxpbmUgb3Igbm90LgorCisgICAgICAgICogbGF5b3V0L2Zvcm1h dHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lQ29udGVudEJyZWFrZXIuY3BwOgorICAgICAgICAo V2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVDb250ZW50QnJlYWtlcjo6cHJvY2Vzc092ZXJmbG93aW5n Q29udGVudCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUNvbnRlbnRC cmVha2VyOjpDb250aW51b3VzQ29udGVudDo6YXBwZW5kKToKKyAgICAgICAgKFdlYkNvcmU6Okxh eW91dDo6SW5saW5lQ29udGVudEJyZWFrZXI6OkNvbnRpbnVvdXNDb250ZW50OjpyZXNldCk6Cisg ICAgICAgICogbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lQ29udGVudEJy ZWFrZXIuaDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lQ29udGVudEJyZWFrZXI6 OkNvbnRpbnVvdXNDb250ZW50Ojppc0hhbmdpbmdDb250ZW50IGNvbnN0KToKKyAgICAgICAgKiBs YXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQnVpbGRlci5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVDYW5kaWRhdGU6OklubGluZUNvbnRlbnQ6OmFw cGVuZElubGluZUl0ZW0pOgorCiAyMDIxLTEyLTI0ICBBbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxl LmNvbT4KIAogICAgICAgICBbTEZDXVtJRkNdIFR1cm4gSW5saW5lQ29udGVudEJyZWFrZXI6OkNv bnRpbnVvdXNDb250ZW50J3MgbGVhZGluZy90cmFpbGluZyBtZW1iZXIgdmFyaWFibGVzIHRvIHN0 ZDo6b3B0aW9uYWw8SW5saW5lTGF5b3V0VW5pdD4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUNvbnRlbnRCcmVha2VyLmNw cCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGlu ZUNvbnRlbnRCcmVha2VyLmNwcAppbmRleCAxNjQ1YjUzOTdmMDZlNzg3NGNmYmZjNTJlZWRiMDJm YmZjZTdjOWRkLi40ZjM4OWYwOThjMTRkNjAyYWE4ZjkwNDJhZmRkMzNlMjExNGVkODU3IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9J bmxpbmVDb250ZW50QnJlYWtlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1h dHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lQ29udGVudEJyZWFrZXIuY3BwCkBAIC0xNzEsNiAr MTcxLDkgQEAgSW5saW5lQ29udGVudEJyZWFrZXI6OlJlc3VsdCBJbmxpbmVDb250ZW50QnJlYWtl cjo6cHJvY2Vzc092ZXJmbG93aW5nQ29udGVudChjb24KICAgICAgICAgICAgIH0KICAgICAgICAg fQogCisgICAgICAgIGlmIChjb250aW51b3VzQ29udGVudC5pc0hhbmdpbmdDb250ZW50KCkpCisg ICAgICAgICAgICByZXR1cm4gSW5saW5lQ29udGVudEJyZWFrZXI6OlJlc3VsdCB7IFJlc3VsdDo6 QWN0aW9uOjpLZWVwIH07CisKICAgICAgICAgYXV0byBjYW5JZ25vcmVOb25Db250ZW50VHJhaWxp bmdSdW5zID0gbGluZVN0YXR1cy5jb2xsYXBzaWJsZU9ySGFuZ2luZ1dpZHRoICYmIGlzTm9uQ29u dGVudFJ1bnNPbmx5KGNvbnRpbnVvdXNDb250ZW50KTsKICAgICAgICAgaWYgKGNhbklnbm9yZU5v bkNvbnRlbnRUcmFpbGluZ1J1bnMpIHsKICAgICAgICAgICAgIC8vIExldCdzIHNlZSBpZiB0aGUg bm9uLWNvbnRlbnQgcnVucyBmaXQgd2hlbiB0aGUgbGluZSBoYXMgdHJhaWxpbmcgY29sbGFwc2li bGUvaGFuZ2luZyBjb250ZW50LgpAQCAtMTc5LDE0ICsxODIsNiBAQCBJbmxpbmVDb250ZW50QnJl YWtlcjo6UmVzdWx0IElubGluZUNvbnRlbnRCcmVha2VyOjpwcm9jZXNzT3ZlcmZsb3dpbmdDb250 ZW50KGNvbgogICAgICAgICAgICAgICAgIHJldHVybiBJbmxpbmVDb250ZW50QnJlYWtlcjo6UmVz dWx0IHsgUmVzdWx0OjpBY3Rpb246OktlZXAgfTsKICAgICAgICAgfQogCi0gICAgICAgIGlmIChp c1Zpc3VhbGx5RW1wdHlXaGl0ZXNwYWNlQ29udGVudChjb250aW51b3VzQ29udGVudCkpIHsKLSAg ICAgICAgICAgIC8vIFRoaXMgb3ZlcmZsb3dpbmcgY29udGVudCBhcHBhcmVudGx5IGZhbGxzIGlu dG8gdGhlIHJlbW92ZS9oYW5nIGVuZC1vZi1saW5lLXNwYWNlcyBjYXRlZ29yeS4KLSAgICAgICAg ICAgIC8vIHNlZSBodHRwczovL3d3dy53My5vcmcvVFIvY3NzLXRleHQtMy8jd2hpdGUtc3BhY2Ut cHJvcGVydHkgbWF0cml4Ci0KLSAgICAgICAgICAgIC8vIEZJWE1FOiBSZXBsYWNlIGl0IHdpdGgg YSBoYW5naW5nIGZsYWcgb24gdGhlIGNvbnRpbnVvdXMgY29udGVudC4KLSAgICAgICAgICAgIGlm IChjb250aW51b3VzQ29udGVudC5ydW5zKClbKmZpcnN0VGV4dFJ1bkluZGV4KGNvbnRpbnVvdXND b250ZW50KV0uc3R5bGUud2hpdGVTcGFjZSgpID09IFdoaXRlU3BhY2U6OlByZVdyYXApCi0gICAg ICAgICAgICAgICAgcmV0dXJuIElubGluZUNvbnRlbnRCcmVha2VyOjpSZXN1bHQgeyBSZXN1bHQ6 OkFjdGlvbjo6S2VlcCB9OwotICAgICAgICB9CiAgICAgICAgIHJldHVybiB7IH07CiAgICAgfTsK ICAgICBpZiAoYXV0byByZXN1bHQgPSBjaGVja0ZvclRyYWlsaW5nQ29udGVudEZpdCgpKQpAQCAt NzIyLDExICs3MTcsMTkgQEAgdm9pZCBJbmxpbmVDb250ZW50QnJlYWtlcjo6Q29udGludW91c0Nv bnRlbnQ6OmFwcGVuZChjb25zdCBJbmxpbmVUZXh0SXRlbSYgaW5saW4KICAgICBtX3RyYWlsaW5n Q29sbGFwc2libGVXaWR0aCA9ICpjb2xsYXBzaWJsZVdpZHRoID09IGxvZ2ljYWxXaWR0aCA/IG1f dHJhaWxpbmdDb2xsYXBzaWJsZVdpZHRoLnZhbHVlX29yKDAuZikgKyBsb2dpY2FsV2lkdGggOiAq Y29sbGFwc2libGVXaWR0aDsKIH0KIAordm9pZCBJbmxpbmVDb250ZW50QnJlYWtlcjo6Q29udGlu dW91c0NvbnRlbnQ6OmFwcGVuZChjb25zdCBJbmxpbmVUZXh0SXRlbSYgaW5saW5lVGV4dEl0ZW0s IGNvbnN0IFJlbmRlclN0eWxlJiBzdHlsZSwgSW5saW5lTGF5b3V0VW5pdCBoYW5naW5nV2lkdGgp Cit7CisgICAgYXBwZW5kVG9SdW5MaXN0KGlubGluZVRleHRJdGVtLCBzdHlsZSwgaGFuZ2luZ1dp ZHRoKTsKKyAgICBtX3RyYWlsaW5nSGFuZ2luZ0NvbnRlbnRXaWR0aCA9IGhhbmdpbmdXaWR0aDsK KyAgICByZXNldFRyYWlsaW5nV2hpdGVzcGFjZSgpOworfQorCiB2b2lkIElubGluZUNvbnRlbnRC cmVha2VyOjpDb250aW51b3VzQ29udGVudDo6cmVzZXQoKQogewogICAgIG1fbG9naWNhbFdpZHRo ID0geyB9OwogICAgIG1fbGVhZGluZ0NvbGxhcHNpYmxlV2lkdGggPSB7IH07CiAgICAgbV90cmFp bGluZ0NvbGxhcHNpYmxlV2lkdGggPSB7IH07CisgICAgbV90cmFpbGluZ0hhbmdpbmdDb250ZW50 V2lkdGggPSB7IH07CiAgICAgbV9ydW5zLmNsZWFyKCk7CiB9CiB9CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVDb250ZW50 QnJlYWtlci5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxp bmUvSW5saW5lQ29udGVudEJyZWFrZXIuaAppbmRleCBkZmU1NWI2MWQzZDQ5ZTc0YTUwZjc4ODZh YWU2ZmE2NzVlODhlODZjLi5jZWU1YjY4OGJkZDMyYzYwNTIxMDZmZWY0ZmFjYjE5NWQ1Mjc0Y2I5 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lu bGluZS9JbmxpbmVDb250ZW50QnJlYWtlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9m b3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUNvbnRlbnRCcmVha2VyLmgKQEAgLTg1LDkg Kzg1LDExIEBAIHB1YmxpYzoKICAgICAgICAgc3RkOjpvcHRpb25hbDxJbmxpbmVMYXlvdXRVbml0 PiB0cmFpbGluZ0NvbGxhcHNpYmxlV2lkdGgoKSBjb25zdCB7IHJldHVybiBtX3RyYWlsaW5nQ29s bGFwc2libGVXaWR0aDsgfQogICAgICAgICBib29sIGhhc0NvbGxhcHNpYmxlQ29udGVudCgpIGNv bnN0IHsgcmV0dXJuIHRyYWlsaW5nQ29sbGFwc2libGVXaWR0aCgpIHx8IGxlYWRpbmdDb2xsYXBz aWJsZVdpZHRoKCk7IH0KICAgICAgICAgYm9vbCBpc0Z1bGx5Q29sbGFwc2libGUoKSBjb25zdDsK KyAgICAgICAgYm9vbCBpc0hhbmdpbmdDb250ZW50KCkgY29uc3QgeyByZXR1cm4gbV90cmFpbGlu Z0hhbmdpbmdDb250ZW50V2lkdGggJiYgbG9naWNhbFdpZHRoKCkgPT0gKm1fdHJhaWxpbmdIYW5n aW5nQ29udGVudFdpZHRoOyB9CiAKICAgICAgICAgdm9pZCBhcHBlbmQoY29uc3QgSW5saW5lSXRl bSYsIGNvbnN0IFJlbmRlclN0eWxlJiwgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsV2lkdGgpOwog ICAgICAgICB2b2lkIGFwcGVuZChjb25zdCBJbmxpbmVUZXh0SXRlbSYsIGNvbnN0IFJlbmRlclN0 eWxlJiwgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsV2lkdGgsIHN0ZDo6b3B0aW9uYWw8SW5saW5l TGF5b3V0VW5pdD4gY29sbGFwc2libGVXaWR0aCk7CisgICAgICAgIHZvaWQgYXBwZW5kKGNvbnN0 IElubGluZVRleHRJdGVtJiwgY29uc3QgUmVuZGVyU3R5bGUmLCBJbmxpbmVMYXlvdXRVbml0IGhh bmdpbmdXaWR0aCk7CiAgICAgICAgIHZvaWQgcmVzZXQoKTsKIAogICAgICAgICBzdHJ1Y3QgUnVu IHsKQEAgLTExMCw2ICsxMTIsNyBAQCBwdWJsaWM6CiAgICAgICAgIElubGluZUxheW91dFVuaXQg bV9sb2dpY2FsV2lkdGggeyAwIH07CiAgICAgICAgIHN0ZDo6b3B0aW9uYWw8SW5saW5lTGF5b3V0 VW5pdD4gbV9sZWFkaW5nQ29sbGFwc2libGVXaWR0aCB7IH07CiAgICAgICAgIHN0ZDo6b3B0aW9u YWw8SW5saW5lTGF5b3V0VW5pdD4gbV90cmFpbGluZ0NvbGxhcHNpYmxlV2lkdGggeyB9OworICAg ICAgICBzdGQ6Om9wdGlvbmFsPElubGluZUxheW91dFVuaXQ+IG1fdHJhaWxpbmdIYW5naW5nQ29u dGVudFdpZHRoIHsgfTsKICAgICB9OwogCiAgICAgc3RydWN0IExpbmVTdGF0dXMgewpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5s aW5lTGluZUJ1aWxkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250 ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJ1aWxkZXIuY3BwCmluZGV4IGI0YTAxMDk2OTA3OGYxMTMw NGFmMmFkMTYxZWQxY2Q1NjEwZDJiMzMuLjM1MjdkNzIxNWZmNDA4NmY3MjdjNDVmOTMzZTIzMjhj ODI0N2ExNjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29u dGV4dHMvaW5saW5lL0lubGluZUxpbmVCdWlsZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQnVpbGRlci5jcHAKQEAg LTIwMiw2ICsyMDIsMTIgQEAgaW5saW5lIHZvaWQgTGluZUNhbmRpZGF0ZTo6SW5saW5lQ29udGVu dDo6YXBwZW5kSW5saW5lSXRlbShjb25zdCBJbmxpbmVJdGVtJiBpbmwKICAgICAgICAgYXV0byYg aW5saW5lVGV4dEl0ZW0gPSBkb3duY2FzdDxJbmxpbmVUZXh0SXRlbT4oaW5saW5lSXRlbSk7CiAg ICAgICAgIGF1dG8gaXNXaGl0ZXNwYWNlID0gaW5saW5lVGV4dEl0ZW0uaXNXaGl0ZXNwYWNlKCk7 CiAKKyAgICAgICAgYXV0byBoYW5naW5nQ29udGVudFdpZHRoID0gWyZdKCkgLT4gc3RkOjpvcHRp b25hbDxJbmxpbmVMYXlvdXRVbml0PiB7CisgICAgICAgICAgICByZXR1cm4gaXNXaGl0ZXNwYWNl ICYmIHN0eWxlLndoaXRlU3BhY2UoKSA9PSBXaGl0ZVNwYWNlOjpQcmVXcmFwID8gc3RkOjptYWtl X29wdGlvbmFsKGxvZ2ljYWxXaWR0aCkgOiBzdGQ6Om51bGxvcHQ7CisgICAgICAgIH07CisgICAg ICAgIGlmIChhdXRvIGhhbmdpbmdXaWR0aCA9IGhhbmdpbmdDb250ZW50V2lkdGgoKSkKKyAgICAg ICAgICAgIHJldHVybiBtX2NvbnRpbnVvdXNDb250ZW50LmFwcGVuZChpbmxpbmVUZXh0SXRlbSwg c3R5bGUsICpoYW5naW5nV2lkdGgpOworCiAgICAgICAgIGF1dG8gY29sbGFwc2libGVXaWR0aCA9 IFsmXSgpIC0+IHN0ZDo6b3B0aW9uYWw8SW5saW5lTGF5b3V0VW5pdD4gewogICAgICAgICAgICAg aWYgKGlzV2hpdGVzcGFjZSAmJiAhSW5saW5lVGV4dEl0ZW06OnNob3VsZFByZXNlcnZlU3BhY2Vz QW5kVGFicyhpbmxpbmVUZXh0SXRlbSkpIHsKICAgICAgICAgICAgICAgICAvLyBGdWxseSBjb2xs YXBzaWJsZSB0cmFpbGluZyBjb250ZW50Lgo= 447972 2021-12-26 06:34:39 -0800 2021-12-26 07:03:43 -0800 Patch bug-234671-20211226063438.patch text/plain 6769 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg3NDQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmNmM2I0OWFiYTQxZTk2 NDIwZTIwMTk4MGJmNWI3ZjU2ZTc0ZWYyNC4uNzgyNzNiYzY3Y2ZiNjUyOGMxMjIyNzg2MjZkZjU4 ZGQxZmY2YzAwZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIxLTEyLTI2ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIENvbnRpbnVv dXNDb250ZW50IHNob3VsZCB0ZWxsIElubGluZUNvbnRlbnRCcmVha2VyIGlmIHRoZSBjYW5kaWRh dGUgY29udGVudCBpcyBoYW5naW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0yMzQ2NzEKKworICAgICAgICBSZXZpZXdlZCBieSBBbnR0aSBLb2l2aXN0 by4KKworICAgICAgICBDb250aW51b3VzQ29udGVudCBub3cga2VlcHMgdHJhY2sgb2Ygd2hldGhl ciB0aGUgY2FuZGlkYXRlIHJ1biBpcyBhIGhhbmdpbmcgY29udGVudC4KKyAgICAgICAgSXQgZW5h YmxlcyBJbmxpbmVDb250ZW50QnJlYWtlciB0byBqdXN0IHNpbXBseSBsb29rIGF0IHRoZSBmbGFn IHRvIGRlY2lkZSBpZiB0aGUgb3ZlcmZsb3dpbmcKKyAgICAgICAgKGhhbmdpbmcpIGNvbnRlbnQg c2hvdWxkIHN0YXkgb24gdGhlIGxpbmUgb3Igbm90LgorCisgICAgICAgICogbGF5b3V0L2Zvcm1h dHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lQ29udGVudEJyZWFrZXIuY3BwOgorICAgICAgICAo V2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVDb250ZW50QnJlYWtlcjo6cHJvY2Vzc092ZXJmbG93aW5n Q29udGVudCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUNvbnRlbnRC cmVha2VyOjpDb250aW51b3VzQ29udGVudDo6YXBwZW5kKToKKyAgICAgICAgKFdlYkNvcmU6Okxh eW91dDo6SW5saW5lQ29udGVudEJyZWFrZXI6OkNvbnRpbnVvdXNDb250ZW50OjpyZXNldCk6Cisg ICAgICAgICogbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lQ29udGVudEJy ZWFrZXIuaDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lQ29udGVudEJyZWFrZXI6 OkNvbnRpbnVvdXNDb250ZW50Ojppc0hhbmdpbmdDb250ZW50IGNvbnN0KToKKyAgICAgICAgKiBs YXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQnVpbGRlci5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVDYW5kaWRhdGU6OklubGluZUNvbnRlbnQ6OmFw cGVuZElubGluZUl0ZW0pOgorCiAyMDIxLTEyLTI1ICBBbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxl LmNvbT4KIAogICAgICAgICBbTEZDXVtJRkNdIFR1cm4gSW5saW5lQ29udGVudEJyZWFrZXI6OkNv bnRpbnVvdXNDb250ZW50J3MgbGVhZGluZy90cmFpbGluZyBtZW1iZXIgdmFyaWFibGVzIHRvIHN0 ZDo6b3B0aW9uYWw8SW5saW5lTGF5b3V0VW5pdD4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUNvbnRlbnRCcmVha2VyLmNw cCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGlu ZUNvbnRlbnRCcmVha2VyLmNwcAppbmRleCA2M2YxNDRhOWE0NGM5NDBhMmYzNmU1NmE2NTllOTZl NDUwMTlmNDZlLi40YzJiODUwMzZkYTA5MDViOWI4ODNmOTJkMDhkZDNlNDc3ZGU5NzM5IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9J bmxpbmVDb250ZW50QnJlYWtlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1h dHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lQ29udGVudEJyZWFrZXIuY3BwCkBAIC0xNzEsNiAr MTcxLDkgQEAgSW5saW5lQ29udGVudEJyZWFrZXI6OlJlc3VsdCBJbmxpbmVDb250ZW50QnJlYWtl cjo6cHJvY2Vzc092ZXJmbG93aW5nQ29udGVudChjb24KICAgICAgICAgICAgIH0KICAgICAgICAg fQogCisgICAgICAgIGlmIChjb250aW51b3VzQ29udGVudC5pc0hhbmdpbmdDb250ZW50KCkpCisg ICAgICAgICAgICByZXR1cm4gSW5saW5lQ29udGVudEJyZWFrZXI6OlJlc3VsdCB7IFJlc3VsdDo6 QWN0aW9uOjpLZWVwIH07CisKICAgICAgICAgYXV0byBjYW5JZ25vcmVOb25Db250ZW50VHJhaWxp bmdSdW5zID0gbGluZVN0YXR1cy5jb2xsYXBzaWJsZU9ySGFuZ2luZ1dpZHRoICYmIGlzTm9uQ29u dGVudFJ1bnNPbmx5KGNvbnRpbnVvdXNDb250ZW50KTsKICAgICAgICAgaWYgKGNhbklnbm9yZU5v bkNvbnRlbnRUcmFpbGluZ1J1bnMpIHsKICAgICAgICAgICAgIC8vIExldCdzIHNlZSBpZiB0aGUg bm9uLWNvbnRlbnQgcnVucyBmaXQgd2hlbiB0aGUgbGluZSBoYXMgdHJhaWxpbmcgY29sbGFwc2li bGUvaGFuZ2luZyBjb250ZW50LgpAQCAtMTc5LDE0ICsxODIsNiBAQCBJbmxpbmVDb250ZW50QnJl YWtlcjo6UmVzdWx0IElubGluZUNvbnRlbnRCcmVha2VyOjpwcm9jZXNzT3ZlcmZsb3dpbmdDb250 ZW50KGNvbgogICAgICAgICAgICAgICAgIHJldHVybiBJbmxpbmVDb250ZW50QnJlYWtlcjo6UmVz dWx0IHsgUmVzdWx0OjpBY3Rpb246OktlZXAgfTsKICAgICAgICAgfQogCi0gICAgICAgIGlmIChp c1Zpc3VhbGx5RW1wdHlXaGl0ZXNwYWNlQ29udGVudChjb250aW51b3VzQ29udGVudCkpIHsKLSAg ICAgICAgICAgIC8vIFRoaXMgb3ZlcmZsb3dpbmcgY29udGVudCBhcHBhcmVudGx5IGZhbGxzIGlu dG8gdGhlIHJlbW92ZS9oYW5nIGVuZC1vZi1saW5lLXNwYWNlcyBjYXRlZ29yeS4KLSAgICAgICAg ICAgIC8vIHNlZSBodHRwczovL3d3dy53My5vcmcvVFIvY3NzLXRleHQtMy8jd2hpdGUtc3BhY2Ut cHJvcGVydHkgbWF0cml4Ci0KLSAgICAgICAgICAgIC8vIEZJWE1FOiBSZXBsYWNlIGl0IHdpdGgg YSBoYW5naW5nIGZsYWcgb24gdGhlIGNvbnRpbnVvdXMgY29udGVudC4KLSAgICAgICAgICAgIGlm IChjb250aW51b3VzQ29udGVudC5ydW5zKClbKmZpcnN0VGV4dFJ1bkluZGV4KGNvbnRpbnVvdXND b250ZW50KV0uc3R5bGUud2hpdGVTcGFjZSgpID09IFdoaXRlU3BhY2U6OlByZVdyYXApCi0gICAg ICAgICAgICAgICAgcmV0dXJuIElubGluZUNvbnRlbnRCcmVha2VyOjpSZXN1bHQgeyBSZXN1bHQ6 OkFjdGlvbjo6S2VlcCB9OwotICAgICAgICB9CiAgICAgICAgIHJldHVybiB7IH07CiAgICAgfTsK ICAgICBpZiAoYXV0byByZXN1bHQgPSBjaGVja0ZvclRyYWlsaW5nQ29udGVudEZpdCgpKQpAQCAt NzIyLDExICs3MTcsMTkgQEAgdm9pZCBJbmxpbmVDb250ZW50QnJlYWtlcjo6Q29udGludW91c0Nv bnRlbnQ6OmFwcGVuZChjb25zdCBJbmxpbmVUZXh0SXRlbSYgaW5saW4KICAgICBtX3RyYWlsaW5n Q29sbGFwc2libGVXaWR0aCA9ICpjb2xsYXBzaWJsZVdpZHRoID09IGxvZ2ljYWxXaWR0aCA/IG1f dHJhaWxpbmdDb2xsYXBzaWJsZVdpZHRoLnZhbHVlX29yKDAuZikgKyBsb2dpY2FsV2lkdGggOiAq Y29sbGFwc2libGVXaWR0aDsKIH0KIAordm9pZCBJbmxpbmVDb250ZW50QnJlYWtlcjo6Q29udGlu dW91c0NvbnRlbnQ6OmFwcGVuZChjb25zdCBJbmxpbmVUZXh0SXRlbSYgaW5saW5lVGV4dEl0ZW0s IGNvbnN0IFJlbmRlclN0eWxlJiBzdHlsZSwgSW5saW5lTGF5b3V0VW5pdCBoYW5naW5nV2lkdGgp Cit7CisgICAgYXBwZW5kVG9SdW5MaXN0KGlubGluZVRleHRJdGVtLCBzdHlsZSwgaGFuZ2luZ1dp ZHRoKTsKKyAgICBtX3RyYWlsaW5nSGFuZ2luZ0NvbnRlbnRXaWR0aCA9IGhhbmdpbmdXaWR0aDsK KyAgICByZXNldFRyYWlsaW5nV2hpdGVzcGFjZSgpOworfQorCiB2b2lkIElubGluZUNvbnRlbnRC cmVha2VyOjpDb250aW51b3VzQ29udGVudDo6cmVzZXQoKQogewogICAgIG1fbG9naWNhbFdpZHRo ID0geyB9OwogICAgIG1fbGVhZGluZ0NvbGxhcHNpYmxlV2lkdGggPSB7IH07CiAgICAgbV90cmFp bGluZ0NvbGxhcHNpYmxlV2lkdGggPSB7IH07CisgICAgbV90cmFpbGluZ0hhbmdpbmdDb250ZW50 V2lkdGggPSB7IH07CiAgICAgbV9ydW5zLmNsZWFyKCk7CiB9CiB9CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVDb250ZW50 QnJlYWtlci5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxp bmUvSW5saW5lQ29udGVudEJyZWFrZXIuaAppbmRleCBkZmU1NWI2MWQzZDQ5ZTc0YTUwZjc4ODZh YWU2ZmE2NzVlODhlODZjLi5jZWU1YjY4OGJkZDMyYzYwNTIxMDZmZWY0ZmFjYjE5NWQ1Mjc0Y2I5 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lu bGluZS9JbmxpbmVDb250ZW50QnJlYWtlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9m b3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUNvbnRlbnRCcmVha2VyLmgKQEAgLTg1LDkg Kzg1LDExIEBAIHB1YmxpYzoKICAgICAgICAgc3RkOjpvcHRpb25hbDxJbmxpbmVMYXlvdXRVbml0 PiB0cmFpbGluZ0NvbGxhcHNpYmxlV2lkdGgoKSBjb25zdCB7IHJldHVybiBtX3RyYWlsaW5nQ29s bGFwc2libGVXaWR0aDsgfQogICAgICAgICBib29sIGhhc0NvbGxhcHNpYmxlQ29udGVudCgpIGNv bnN0IHsgcmV0dXJuIHRyYWlsaW5nQ29sbGFwc2libGVXaWR0aCgpIHx8IGxlYWRpbmdDb2xsYXBz aWJsZVdpZHRoKCk7IH0KICAgICAgICAgYm9vbCBpc0Z1bGx5Q29sbGFwc2libGUoKSBjb25zdDsK KyAgICAgICAgYm9vbCBpc0hhbmdpbmdDb250ZW50KCkgY29uc3QgeyByZXR1cm4gbV90cmFpbGlu Z0hhbmdpbmdDb250ZW50V2lkdGggJiYgbG9naWNhbFdpZHRoKCkgPT0gKm1fdHJhaWxpbmdIYW5n aW5nQ29udGVudFdpZHRoOyB9CiAKICAgICAgICAgdm9pZCBhcHBlbmQoY29uc3QgSW5saW5lSXRl bSYsIGNvbnN0IFJlbmRlclN0eWxlJiwgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsV2lkdGgpOwog ICAgICAgICB2b2lkIGFwcGVuZChjb25zdCBJbmxpbmVUZXh0SXRlbSYsIGNvbnN0IFJlbmRlclN0 eWxlJiwgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsV2lkdGgsIHN0ZDo6b3B0aW9uYWw8SW5saW5l TGF5b3V0VW5pdD4gY29sbGFwc2libGVXaWR0aCk7CisgICAgICAgIHZvaWQgYXBwZW5kKGNvbnN0 IElubGluZVRleHRJdGVtJiwgY29uc3QgUmVuZGVyU3R5bGUmLCBJbmxpbmVMYXlvdXRVbml0IGhh bmdpbmdXaWR0aCk7CiAgICAgICAgIHZvaWQgcmVzZXQoKTsKIAogICAgICAgICBzdHJ1Y3QgUnVu IHsKQEAgLTExMCw2ICsxMTIsNyBAQCBwdWJsaWM6CiAgICAgICAgIElubGluZUxheW91dFVuaXQg bV9sb2dpY2FsV2lkdGggeyAwIH07CiAgICAgICAgIHN0ZDo6b3B0aW9uYWw8SW5saW5lTGF5b3V0 VW5pdD4gbV9sZWFkaW5nQ29sbGFwc2libGVXaWR0aCB7IH07CiAgICAgICAgIHN0ZDo6b3B0aW9u YWw8SW5saW5lTGF5b3V0VW5pdD4gbV90cmFpbGluZ0NvbGxhcHNpYmxlV2lkdGggeyB9OworICAg ICAgICBzdGQ6Om9wdGlvbmFsPElubGluZUxheW91dFVuaXQ+IG1fdHJhaWxpbmdIYW5naW5nQ29u dGVudFdpZHRoIHsgfTsKICAgICB9OwogCiAgICAgc3RydWN0IExpbmVTdGF0dXMgewpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5s aW5lTGluZUJ1aWxkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250 ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJ1aWxkZXIuY3BwCmluZGV4IGI0YTAxMDk2OTA3OGYxMTMw NGFmMmFkMTYxZWQxY2Q1NjEwZDJiMzMuLmY5OWVlNTFmODQ1YmEzZjc4OTk1ZTA4YTg4NWYzY2E1 MWNhMjNjMzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29u dGV4dHMvaW5saW5lL0lubGluZUxpbmVCdWlsZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQnVpbGRlci5jcHAKQEAg LTIwMiw2ICsyMDIsMTAgQEAgaW5saW5lIHZvaWQgTGluZUNhbmRpZGF0ZTo6SW5saW5lQ29udGVu dDo6YXBwZW5kSW5saW5lSXRlbShjb25zdCBJbmxpbmVJdGVtJiBpbmwKICAgICAgICAgYXV0byYg aW5saW5lVGV4dEl0ZW0gPSBkb3duY2FzdDxJbmxpbmVUZXh0SXRlbT4oaW5saW5lSXRlbSk7CiAg ICAgICAgIGF1dG8gaXNXaGl0ZXNwYWNlID0gaW5saW5lVGV4dEl0ZW0uaXNXaGl0ZXNwYWNlKCk7 CiAKKyAgICAgICAgYXV0byBpc0hhbmdpbmdDb250ZW50ID0gaXNXaGl0ZXNwYWNlICYmIHN0eWxl LndoaXRlU3BhY2UoKSA9PSBXaGl0ZVNwYWNlOjpQcmVXcmFwOworICAgICAgICBpZiAoaXNIYW5n aW5nQ29udGVudCkKKyAgICAgICAgICAgIHJldHVybiBtX2NvbnRpbnVvdXNDb250ZW50LmFwcGVu ZChpbmxpbmVUZXh0SXRlbSwgc3R5bGUsIGxvZ2ljYWxXaWR0aCk7CisKICAgICAgICAgYXV0byBj b2xsYXBzaWJsZVdpZHRoID0gWyZdKCkgLT4gc3RkOjpvcHRpb25hbDxJbmxpbmVMYXlvdXRVbml0 PiB7CiAgICAgICAgICAgICBpZiAoaXNXaGl0ZXNwYWNlICYmICFJbmxpbmVUZXh0SXRlbTo6c2hv dWxkUHJlc2VydmVTcGFjZXNBbmRUYWJzKGlubGluZVRleHRJdGVtKSkgewogICAgICAgICAgICAg ICAgIC8vIEZ1bGx5IGNvbGxhcHNpYmxlIHRyYWlsaW5nIGNvbnRlbnQuCg==