232538 2021-10-30 20:04:34 -0700 [LFC][IFC] Add unicode-bidi control characters 2021-10-31 23:00:01 -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 1810476 0 zalan 2021-10-30 20:04:34 -0700 stub functions only. 1810477 1 442925 zalan 2021-10-30 20:14:09 -0700 Created attachment 442925 Patch 1810487 2 442925 koivisto 2021-10-30 22:46:03 -0700 Comment on attachment 442925 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=442925&action=review > Source/WebCore/layout/formattingContexts/inline/InlineItemsBuilder.cpp:220 > void InlineItemsBuilder::handleInlineBox(const Box& inlineBox, EnterInlineBox enterInlineBox, InlineItems& inlineItems) Maybe entering/exiting could be just two separate functions? 1810498 3 442934 zalan 2021-10-31 06:41:39 -0700 Created attachment 442934 Patch 1810501 4 ews-feeder 2021-10-31 07:25:51 -0700 Committed r285093 (243735@main): <https://commits.webkit.org/243735@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 442934. 1810502 5 webkit-bug-importer 2021-10-31 07:26:20 -0700 <rdar://problem/84856322> 1810560 6 442934 koivisto 2021-10-31 23:00:01 -0700 Comment on attachment 442934 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=442934&action=review > Source/WebCore/layout/formattingContexts/inline/InlineItemsBuilder.cpp:260 > + if (enteringContentControlChar) > + enterBidiContext(inlineBox, *enteringContentControlChar); > + if (nestedContentControlChar) > + enterBidiContext(inlineBox, *nestedContentControlChar); I think these calls could be inside the switch, avoiding the variables. > Source/WebCore/layout/formattingContexts/inline/InlineItemsBuilder.cpp:302 > + if (nestedContentControlChar) > + exitBidiContext(inlineBox, *nestedContentControlChar); > + if (exitingContentControlChar) > + exitBidiContext(inlineBox, *exitingContentControlChar); Here too. 442925 2021-10-30 20:14:09 -0700 2021-10-31 06:41:37 -0700 Patch bug-232538-20211030201409.patch text/plain 6342 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1MDMyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODM4MGMwZTYwYjI0MjJl NWZlOTRhMTQ5YjNlNDhhYzZlOGJkY2E1YS4uNDE1NGRmMzU0NDVkMDc4MTFiYWM1NzI5Y2Q3ZDE0 NjJjZmI2YzNjZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIxLTEwLTMwICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIEFkZCB1bmlj b2RlLWJpZGkgY29udHJvbCBjaGFyYWN0ZXJzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0yMzI1MzgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBUaGlzIGlzIHByZXBhcmF0aW9uIGZvciBpbmplY3RpbmcgZW50 ZXJpbmcvZXhpdGluZyBjb250cm9sIGNoYXJhY3RlcnMgaW50byB0aGUgcGFyYWdyYXBoIHN0cmlu ZyB1c2VkIGJ5IHViaWRpLgorCisgICAgICAgICogbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9p bmxpbmUvSW5saW5lSXRlbXNCdWlsZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6 SW5saW5lSXRlbXNCdWlsZGVyOjpoYW5kbGVJbmxpbmVCb3gpOgorICAgICAgICAoV2ViQ29yZTo6 TGF5b3V0OjpJbmxpbmVJdGVtc0J1aWxkZXI6OmVudGVyQmlkaUNvbnRleHQpOgorICAgICAgICAo V2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVJdGVtc0J1aWxkZXI6OmV4aXRCaWRpQ29udGV4dCk6Cisg ICAgICAgICogbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lSXRlbXNCdWls ZGVyLmg6CisKIDIwMjEtMTAtMzAgIEFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAg ICAgICAgIFtMRkNdW0lGQ10gQWRkIGJpZGkgbGV2ZWwgdG8gSW5saW5lRGlzcGxheTo6Qm94CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGlu ZS9JbmxpbmVJdGVtc0J1aWxkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRp bmdDb250ZXh0cy9pbmxpbmUvSW5saW5lSXRlbXNCdWlsZGVyLmNwcAppbmRleCAzZGNjZmM2N2Zl YzgyMGNhYmM5NThhZTA3ZTFjZGI4M2NkZWQzOTk0Li4yYjA4NDhmMDNmNzljZTY4OTUyMGMyODM1 YTI1NWU2ODQ4MWI5YzZlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0 dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVJdGVtc0J1aWxkZXIuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUl0ZW1zQnVpbGRl ci5jcHAKQEAgLTIxOSw4ICsyMTksODEgQEAgdm9pZCBJbmxpbmVJdGVtc0J1aWxkZXI6OmhhbmRs ZVRleHRDb250ZW50KGNvbnN0IElubGluZVRleHRCb3gmIGlubGluZVRleHRCb3gsIEkKIAogdm9p ZCBJbmxpbmVJdGVtc0J1aWxkZXI6OmhhbmRsZUlubGluZUJveChjb25zdCBCb3gmIGlubGluZUJv eCwgRW50ZXJJbmxpbmVCb3ggZW50ZXJJbmxpbmVCb3gsIElubGluZUl0ZW1zJiBpbmxpbmVJdGVt cykKIHsKLSAgICAvLyBGSVhNRTogSW5qZWN0IGJpZGkgY29udHJvbCBjb2RlcyB3aGVuIGNyb3Nz aW5nIGlubGluZSBib3hlcyB3aXRoIHVuaWNvZGUtYmlkaS9kaXJlY3Rpb24uCiAgICAgaW5saW5l SXRlbXMuYXBwZW5kKHsgaW5saW5lQm94LCBlbnRlcklubGluZUJveCA9PSBFbnRlcklubGluZUJv eDo6WWVzID8gSW5saW5lSXRlbTo6VHlwZTo6SW5saW5lQm94U3RhcnQgOiBJbmxpbmVJdGVtOjpU eXBlOjpJbmxpbmVCb3hFbmQgfSk7CisgICAgLy8gaHR0cHM6Ly9kcmFmdHMuY3Nzd2cub3JnL2Nz cy13cml0aW5nLW1vZGVzLyN1bmljb2RlLWJpZGkKKyAgICBhdXRvJiBzdHlsZSA9IGlubGluZUJv eC5zdHlsZSgpOworICAgIGlmIChzdHlsZS5ydGxPcmRlcmluZygpID09IE9yZGVyOjpWaXN1YWwp CisgICAgICAgIHJldHVybjsKKworICAgIGF1dG8gaXNMZWZ0VG9SaWdodERpcmVjdGlvbiA9IHN0 eWxlLmlzTGVmdFRvUmlnaHREaXJlY3Rpb24oKTsKKyAgICBpZiAoZW50ZXJJbmxpbmVCb3ggPT0g RW50ZXJJbmxpbmVCb3g6OlllcykgeworICAgICAgICBhdXRvIGVudGVyaW5nQ29udGVudENvbnRy b2xDaGFyID0gc3RkOjpvcHRpb25hbDxVQ2hhcj4geyB9OworICAgICAgICBhdXRvIG5lc3RlZENv bnRlbnRDb250cm9sQ2hhciA9IHN0ZDo6b3B0aW9uYWw8VUNoYXI+IHsgfTsKKworICAgICAgICBz d2l0Y2ggKHN0eWxlLnVuaWNvZGVCaWRpKCkpIHsKKyAgICAgICAgY2FzZSBFVW5pY29kZUJpZGk6 OlVCTm9ybWFsOgorICAgICAgICAgICAgLy8gVGhlIGJveCBkb2VzIG5vdCBvcGVuIGFuIGFkZGl0 aW9uYWwgbGV2ZWwgb2YgZW1iZWRkaW5nIHdpdGggcmVzcGVjdCB0byB0aGUgYmlkaXJlY3Rpb25h bCBhbGdvcml0aG0uCisgICAgICAgICAgICAvLyBGb3IgaW5saW5lIGJveGVzLCBpbXBsaWNpdCBy ZW9yZGVyaW5nIHdvcmtzIGFjcm9zcyBib3ggYm91bmRhcmllcy4KKyAgICAgICAgICAgIGJyZWFr OworICAgICAgICBjYXNlIEVVbmljb2RlQmlkaTo6RW1iZWQ6CisgICAgICAgICAgICBlbnRlcmlu Z0NvbnRlbnRDb250cm9sQ2hhciA9IGlzTGVmdFRvUmlnaHREaXJlY3Rpb24gPyBsZWZ0VG9SaWdo dEVtYmVkIDogcmlnaHRUb0xlZnRFbWJlZDsKKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICBj YXNlIEVVbmljb2RlQmlkaTo6T3ZlcnJpZGU6CisgICAgICAgICAgICBlbnRlcmluZ0NvbnRlbnRD b250cm9sQ2hhciA9IGlzTGVmdFRvUmlnaHREaXJlY3Rpb24gPyBsZWZ0VG9SaWdodE92ZXJyaWRl IDogcmlnaHRUb0xlZnRPdmVycmlkZTsKKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICBjYXNl IEVVbmljb2RlQmlkaTo6SXNvbGF0ZToKKyAgICAgICAgICAgIGVudGVyaW5nQ29udGVudENvbnRy b2xDaGFyID0gaXNMZWZ0VG9SaWdodERpcmVjdGlvbiA/IGxlZnRUb1JpZ2h0SXNvbGF0ZSA6IHJp Z2h0VG9MZWZ0SXNvbGF0ZTsKKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICBjYXNlIEVVbmlj b2RlQmlkaTo6UGxhaW50ZXh0OgorICAgICAgICAgICAgZW50ZXJpbmdDb250ZW50Q29udHJvbENo YXIgPSBmaXJzdFN0cm9uZ0lzb2xhdGU7CisgICAgICAgICAgICBicmVhazsKKyAgICAgICAgY2Fz ZSBFVW5pY29kZUJpZGk6Oklzb2xhdGVPdmVycmlkZToKKyAgICAgICAgICAgIGVudGVyaW5nQ29u dGVudENvbnRyb2xDaGFyID0gZmlyc3RTdHJvbmdJc29sYXRlOworICAgICAgICAgICAgbmVzdGVk Q29udGVudENvbnRyb2xDaGFyID0gaXNMZWZ0VG9SaWdodERpcmVjdGlvbiA/IGxlZnRUb1JpZ2h0 T3ZlcnJpZGUgOiByaWdodFRvTGVmdE92ZXJyaWRlOworICAgICAgICAgICAgYnJlYWs7CisgICAg ICAgIGRlZmF1bHQ6CisgICAgICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKyAgICAgICAg fQorCisgICAgICAgIGlmIChlbnRlcmluZ0NvbnRlbnRDb250cm9sQ2hhcikKKyAgICAgICAgICAg IGVudGVyQmlkaUNvbnRleHQoaW5saW5lQm94LCAqZW50ZXJpbmdDb250ZW50Q29udHJvbENoYXIp OworICAgICAgICBpZiAobmVzdGVkQ29udGVudENvbnRyb2xDaGFyKQorICAgICAgICAgICAgZW50 ZXJCaWRpQ29udGV4dChpbmxpbmVCb3gsICpuZXN0ZWRDb250ZW50Q29udHJvbENoYXIpOworICAg ICAgICByZXR1cm47CisgICAgfQorCisgICAgYXV0byBleGl0aW5nQ29udGVudENvbnRyb2xDaGFy ID0gc3RkOjpvcHRpb25hbDxVQ2hhcj4geyB9OworICAgIGF1dG8gbmVzdGVkQ29udGVudENvbnRy b2xDaGFyID0gc3RkOjpvcHRpb25hbDxVQ2hhcj4geyB9OworCisgICAgc3dpdGNoIChzdHlsZS51 bmljb2RlQmlkaSgpKSB7CisgICAgY2FzZSBFVW5pY29kZUJpZGk6OlVCTm9ybWFsOgorICAgICAg ICAvLyBUaGUgYm94IGRvZXMgbm90IG9wZW4gYW4gYWRkaXRpb25hbCBsZXZlbCBvZiBlbWJlZGRp bmcgd2l0aCByZXNwZWN0IHRvIHRoZSBiaWRpcmVjdGlvbmFsIGFsZ29yaXRobS4KKyAgICAgICAg Ly8gRm9yIGlubGluZSBib3hlcywgaW1wbGljaXQgcmVvcmRlcmluZyB3b3JrcyBhY3Jvc3MgYm94 IGJvdW5kYXJpZXMuCisgICAgICAgIGJyZWFrOworICAgIGNhc2UgRVVuaWNvZGVCaWRpOjpFbWJl ZDoKKyAgICAgICAgZXhpdGluZ0NvbnRlbnRDb250cm9sQ2hhciA9IHBvcERpcmVjdGlvbmFsRm9y bWF0dGluZzsKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBFVW5pY29kZUJpZGk6Ok92ZXJyaWRl OgorICAgICAgICBleGl0aW5nQ29udGVudENvbnRyb2xDaGFyID0gcG9wRGlyZWN0aW9uYWxGb3Jt YXR0aW5nOworICAgICAgICBicmVhazsKKyAgICBjYXNlIEVVbmljb2RlQmlkaTo6SXNvbGF0ZToK KyAgICAgICAgZXhpdGluZ0NvbnRlbnRDb250cm9sQ2hhciA9IHBvcERpcmVjdGlvbmFsSXNvbGF0 ZTsKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBFVW5pY29kZUJpZGk6OlBsYWludGV4dDoKKyAg ICAgICAgZXhpdGluZ0NvbnRlbnRDb250cm9sQ2hhciA9IHBvcERpcmVjdGlvbmFsSXNvbGF0ZTsK KyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBFVW5pY29kZUJpZGk6Oklzb2xhdGVPdmVycmlkZToK KyAgICAgICAgbmVzdGVkQ29udGVudENvbnRyb2xDaGFyID0gcG9wRGlyZWN0aW9uYWxGb3JtYXR0 aW5nOworICAgICAgICBleGl0aW5nQ29udGVudENvbnRyb2xDaGFyID0gcG9wRGlyZWN0aW9uYWxJ c29sYXRlOworICAgICAgICBicmVhazsKKyAgICBkZWZhdWx0OgorICAgICAgICBBU1NFUlRfTk9U X1JFQUNIRUQoKTsKKyAgICB9CisKKyAgICBpZiAobmVzdGVkQ29udGVudENvbnRyb2xDaGFyKQor ICAgICAgICBleGl0QmlkaUNvbnRleHQoaW5saW5lQm94LCAqbmVzdGVkQ29udGVudENvbnRyb2xD aGFyKTsKKyAgICBpZiAoZXhpdGluZ0NvbnRlbnRDb250cm9sQ2hhcikKKyAgICAgICAgZXhpdEJp ZGlDb250ZXh0KGlubGluZUJveCwgKmV4aXRpbmdDb250ZW50Q29udHJvbENoYXIpOwogfQogCiB2 b2lkIElubGluZUl0ZW1zQnVpbGRlcjo6aGFuZGxlSW5saW5lTGV2ZWxCb3goY29uc3QgQm94JiBs YXlvdXRCb3gsIElubGluZUl0ZW1zJiBpbmxpbmVJdGVtcykKQEAgLTIzNCw2ICszMDcsMTYgQEAg dm9pZCBJbmxpbmVJdGVtc0J1aWxkZXI6OmhhbmRsZUlubGluZUxldmVsQm94KGNvbnN0IEJveCYg bGF5b3V0Qm94LCBJbmxpbmVJdGVtcyYKICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKIH0KIAor dm9pZCBJbmxpbmVJdGVtc0J1aWxkZXI6OmVudGVyQmlkaUNvbnRleHQoY29uc3QgQm94JiwgVUNo YXIpCit7CisgICAgLy8gRklYTUU6IEluamVjdCB0aGUgY29udHJvbCBjaGFyYWN0ZXIgdG8gdGhl IHBhcmFncmFwaCBzdHJpbmcuCit9CisKK3ZvaWQgSW5saW5lSXRlbXNCdWlsZGVyOjpleGl0Qmlk aUNvbnRleHQoY29uc3QgQm94JiwgVUNoYXIpCit7CisgICAgLy8gRklYTUU6IEluamVjdCB0aGUg Y29udHJvbCBjaGFyYWN0ZXIgdG8gdGhlIHBhcmFncmFwaCBzdHJpbmcuCit9CisKIH0KIH0KIApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxp bmUvSW5saW5lSXRlbXNCdWlsZGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGlu Z0NvbnRleHRzL2lubGluZS9JbmxpbmVJdGVtc0J1aWxkZXIuaAppbmRleCBkYTBmN2E2NzE2MWI1 NWU4ZmFmOTI4NDY4ZWI1MGFlMDI0MTA5MjA5Li4xMWIyZDI3ZGQ3ZmQ5NzQ4YmZmMmEyNjRmNzBh MWQxZmFhNzRjMGEzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGlu Z0NvbnRleHRzL2lubGluZS9JbmxpbmVJdGVtc0J1aWxkZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVJdGVtc0J1aWxkZXIuaApA QCAtNDcsNiArNDcsOSBAQCBwcml2YXRlOgogICAgIGVudW0gY2xhc3MgRW50ZXJJbmxpbmVCb3gg eyBZZXMsIE5vIH07CiAgICAgdm9pZCBoYW5kbGVJbmxpbmVCb3goY29uc3QgQm94JiwgRW50ZXJJ bmxpbmVCb3gsIElubGluZUl0ZW1zJik7CiAgICAgdm9pZCBoYW5kbGVJbmxpbmVMZXZlbEJveChj b25zdCBCb3gmLCBJbmxpbmVJdGVtcyYpOworICAgIAorICAgIHZvaWQgZW50ZXJCaWRpQ29udGV4 dChjb25zdCBCb3gmLCBVQ2hhcik7CisgICAgdm9pZCBleGl0QmlkaUNvbnRleHQoY29uc3QgQm94 JiwgVUNoYXIpOwogCiAgICAgY29uc3QgQ29udGFpbmVyQm94JiByb290KCkgY29uc3QgeyByZXR1 cm4gbV9yb290OyB9CiAK 442934 2021-10-31 06:41:39 -0700 2021-10-31 23:00:01 -0700 Patch bug-232538-20211031064138.patch text/plain 8017 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1MDMyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODM4MGMwZTYwYjI0MjJl NWZlOTRhMTQ5YjNlNDhhYzZlOGJkY2E1YS4uMTU4MGFiOTQyN2M0MDBiMGNmODE0MTI4ODBkNTky ZjU5M2IwNDQwYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIxLTEwLTMwICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIEFkZCB1bmlj b2RlLWJpZGkgY29udHJvbCBjaGFyYWN0ZXJzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0yMzI1MzgKKworICAgICAgICBSZXZpZXdlZCBieSBBbnR0aSBL b2l2aXN0by4KKworICAgICAgICBUaGlzIGlzIHByZXBhcmF0aW9uIGZvciBpbmplY3RpbmcgZW50 ZXJpbmcvZXhpdGluZyBjb250cm9sIGNoYXJhY3RlcnMgaW50byB0aGUgcGFyYWdyYXBoIHN0cmlu ZyB1c2VkIGJ5IHViaWRpLgorCisgICAgICAgICogbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9p bmxpbmUvSW5saW5lSXRlbXNCdWlsZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6 SW5saW5lSXRlbXNCdWlsZGVyOjpoYW5kbGVJbmxpbmVCb3gpOgorICAgICAgICAoV2ViQ29yZTo6 TGF5b3V0OjpJbmxpbmVJdGVtc0J1aWxkZXI6OmVudGVyQmlkaUNvbnRleHQpOgorICAgICAgICAo V2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVJdGVtc0J1aWxkZXI6OmV4aXRCaWRpQ29udGV4dCk6Cisg ICAgICAgICogbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lSXRlbXNCdWls ZGVyLmg6CisKIDIwMjEtMTAtMzAgIEFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAg ICAgICAgIFtMRkNdW0lGQ10gQWRkIGJpZGkgbGV2ZWwgdG8gSW5saW5lRGlzcGxheTo6Qm94CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGlu ZS9JbmxpbmVJdGVtc0J1aWxkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRp bmdDb250ZXh0cy9pbmxpbmUvSW5saW5lSXRlbXNCdWlsZGVyLmNwcAppbmRleCAzZGNjZmM2N2Zl YzgyMGNhYmM5NThhZTA3ZTFjZGI4M2NkZWQzOTk0Li41YTNkOWIzZDBlNzcxNTA5YzhhYjUyZmU1 MzllYzEwNTRmMDgwNWQ4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0 dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVJdGVtc0J1aWxkZXIuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUl0ZW1zQnVpbGRl ci5jcHAKQEAgLTk5LDcgKzk5LDcgQEAgdm9pZCBJbmxpbmVJdGVtc0J1aWxkZXI6OmNvbGxlY3RJ bmxpbmVJdGVtcyhJbmxpbmVJdGVtcyYgaW5saW5lSXRlbXMpCiAgICAgICAgICAgICBpZiAoIWlz SW5saW5lQm94V2l0aElubGluZUNvbnRlbnQpCiAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAg ICAgICAgICAvLyBUaGlzIGlzIHRoZSBzdGFydCBvZiBhbiBpbmxpbmUgYm94IChlLmcuIDxzcGFu PikuCi0gICAgICAgICAgICBoYW5kbGVJbmxpbmVCb3gobGF5b3V0Qm94LCBFbnRlcklubGluZUJv eDo6WWVzLCBpbmxpbmVJdGVtcyk7CisgICAgICAgICAgICBoYW5kbGVJbmxpbmVCb3hTdGFydChs YXlvdXRCb3gsIGlubGluZUl0ZW1zKTsKICAgICAgICAgICAgIGF1dG8mIGlubGluZUJveCA9IGRv d25jYXN0PENvbnRhaW5lckJveD4obGF5b3V0Qm94KTsKICAgICAgICAgICAgIGlmICghaW5saW5l Qm94Lmhhc0NoaWxkKCkpCiAgICAgICAgICAgICAgICAgYnJlYWs7CkBAIC0xMTMsNyArMTEzLDcg QEAgdm9pZCBJbmxpbmVJdGVtc0J1aWxkZXI6OmNvbGxlY3RJbmxpbmVJdGVtcyhJbmxpbmVJdGVt cyYgaW5saW5lSXRlbXMpCiAgICAgICAgICAgICBlbHNlIGlmIChsYXlvdXRCb3guaXNBdG9taWNJ bmxpbmVMZXZlbEJveCgpIHx8IGxheW91dEJveC5pc0xpbmVCcmVha0JveCgpKQogICAgICAgICAg ICAgICAgIGhhbmRsZUlubGluZUxldmVsQm94KGxheW91dEJveCwgaW5saW5lSXRlbXMpOwogICAg ICAgICAgICAgZWxzZSBpZiAobGF5b3V0Qm94LmlzSW5saW5lQm94KCkpCi0gICAgICAgICAgICAg ICAgaGFuZGxlSW5saW5lQm94KGxheW91dEJveCwgRW50ZXJJbmxpbmVCb3g6Ok5vLCBpbmxpbmVJ dGVtcyk7CisgICAgICAgICAgICAgICAgaGFuZGxlSW5saW5lQm94RW5kKGxheW91dEJveCwgaW5s aW5lSXRlbXMpOwogICAgICAgICAgICAgZWxzZSBpZiAobGF5b3V0Qm94LmlzRmxvYXRpbmdQb3Np dGlvbmVkKCkpCiAgICAgICAgICAgICAgICAgaW5saW5lSXRlbXMuYXBwZW5kKHsgbGF5b3V0Qm94 LCBJbmxpbmVJdGVtOjpUeXBlOjpGbG9hdCB9KTsKICAgICAgICAgICAgIGVsc2UgaWYgKGxheW91 dEJveC5pc091dE9mRmxvd1Bvc2l0aW9uZWQoKSkgewpAQCAtMjE3LDEwICsyMTcsODkgQEAgdm9p ZCBJbmxpbmVJdGVtc0J1aWxkZXI6OmhhbmRsZVRleHRDb250ZW50KGNvbnN0IElubGluZVRleHRC b3gmIGlubGluZVRleHRCb3gsIEkKICAgICB9CiB9CiAKLXZvaWQgSW5saW5lSXRlbXNCdWlsZGVy OjpoYW5kbGVJbmxpbmVCb3goY29uc3QgQm94JiBpbmxpbmVCb3gsIEVudGVySW5saW5lQm94IGVu dGVySW5saW5lQm94LCBJbmxpbmVJdGVtcyYgaW5saW5lSXRlbXMpCit2b2lkIElubGluZUl0ZW1z QnVpbGRlcjo6aGFuZGxlSW5saW5lQm94U3RhcnQoY29uc3QgQm94JiBpbmxpbmVCb3gsIElubGlu ZUl0ZW1zJiBpbmxpbmVJdGVtcykKIHsKLSAgICAvLyBGSVhNRTogSW5qZWN0IGJpZGkgY29udHJv bCBjb2RlcyB3aGVuIGNyb3NzaW5nIGlubGluZSBib3hlcyB3aXRoIHVuaWNvZGUtYmlkaS9kaXJl Y3Rpb24uCi0gICAgaW5saW5lSXRlbXMuYXBwZW5kKHsgaW5saW5lQm94LCBlbnRlcklubGluZUJv eCA9PSBFbnRlcklubGluZUJveDo6WWVzID8gSW5saW5lSXRlbTo6VHlwZTo6SW5saW5lQm94U3Rh cnQgOiBJbmxpbmVJdGVtOjpUeXBlOjpJbmxpbmVCb3hFbmQgfSk7CisgICAgaW5saW5lSXRlbXMu YXBwZW5kKHsgaW5saW5lQm94LCBJbmxpbmVJdGVtOjpUeXBlOjpJbmxpbmVCb3hTdGFydCB9KTsK KyAgICAvLyBodHRwczovL2RyYWZ0cy5jc3N3Zy5vcmcvY3NzLXdyaXRpbmctbW9kZXMvI3VuaWNv ZGUtYmlkaQorICAgIGF1dG8mIHN0eWxlID0gaW5saW5lQm94LnN0eWxlKCk7CisgICAgaWYgKHN0 eWxlLnJ0bE9yZGVyaW5nKCkgPT0gT3JkZXI6OlZpc3VhbCkKKyAgICAgICAgcmV0dXJuOworCisg ICAgYXV0byBpc0xlZnRUb1JpZ2h0RGlyZWN0aW9uID0gc3R5bGUuaXNMZWZ0VG9SaWdodERpcmVj dGlvbigpOworICAgIGF1dG8gZW50ZXJpbmdDb250ZW50Q29udHJvbENoYXIgPSBzdGQ6Om9wdGlv bmFsPFVDaGFyPiB7IH07CisgICAgYXV0byBuZXN0ZWRDb250ZW50Q29udHJvbENoYXIgPSBzdGQ6 Om9wdGlvbmFsPFVDaGFyPiB7IH07CisKKyAgICBzd2l0Y2ggKHN0eWxlLnVuaWNvZGVCaWRpKCkp IHsKKyAgICBjYXNlIEVVbmljb2RlQmlkaTo6VUJOb3JtYWw6CisgICAgICAgIC8vIFRoZSBib3gg ZG9lcyBub3Qgb3BlbiBhbiBhZGRpdGlvbmFsIGxldmVsIG9mIGVtYmVkZGluZyB3aXRoIHJlc3Bl Y3QgdG8gdGhlIGJpZGlyZWN0aW9uYWwgYWxnb3JpdGhtLgorICAgICAgICAvLyBGb3IgaW5saW5l IGJveGVzLCBpbXBsaWNpdCByZW9yZGVyaW5nIHdvcmtzIGFjcm9zcyBib3ggYm91bmRhcmllcy4K KyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBFVW5pY29kZUJpZGk6OkVtYmVkOgorICAgICAgICBl bnRlcmluZ0NvbnRlbnRDb250cm9sQ2hhciA9IGlzTGVmdFRvUmlnaHREaXJlY3Rpb24gPyBsZWZ0 VG9SaWdodEVtYmVkIDogcmlnaHRUb0xlZnRFbWJlZDsKKyAgICAgICAgYnJlYWs7CisgICAgY2Fz ZSBFVW5pY29kZUJpZGk6Ok92ZXJyaWRlOgorICAgICAgICBlbnRlcmluZ0NvbnRlbnRDb250cm9s Q2hhciA9IGlzTGVmdFRvUmlnaHREaXJlY3Rpb24gPyBsZWZ0VG9SaWdodE92ZXJyaWRlIDogcmln aHRUb0xlZnRPdmVycmlkZTsKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBFVW5pY29kZUJpZGk6 Oklzb2xhdGU6CisgICAgICAgIGVudGVyaW5nQ29udGVudENvbnRyb2xDaGFyID0gaXNMZWZ0VG9S aWdodERpcmVjdGlvbiA/IGxlZnRUb1JpZ2h0SXNvbGF0ZSA6IHJpZ2h0VG9MZWZ0SXNvbGF0ZTsK KyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBFVW5pY29kZUJpZGk6OlBsYWludGV4dDoKKyAgICAg ICAgZW50ZXJpbmdDb250ZW50Q29udHJvbENoYXIgPSBmaXJzdFN0cm9uZ0lzb2xhdGU7CisgICAg ICAgIGJyZWFrOworICAgIGNhc2UgRVVuaWNvZGVCaWRpOjpJc29sYXRlT3ZlcnJpZGU6CisgICAg ICAgIGVudGVyaW5nQ29udGVudENvbnRyb2xDaGFyID0gZmlyc3RTdHJvbmdJc29sYXRlOworICAg ICAgICBuZXN0ZWRDb250ZW50Q29udHJvbENoYXIgPSBpc0xlZnRUb1JpZ2h0RGlyZWN0aW9uID8g bGVmdFRvUmlnaHRPdmVycmlkZSA6IHJpZ2h0VG9MZWZ0T3ZlcnJpZGU7CisgICAgICAgIGJyZWFr OworICAgIGRlZmF1bHQ6CisgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOworICAgIH0KKwor ICAgIGlmIChlbnRlcmluZ0NvbnRlbnRDb250cm9sQ2hhcikKKyAgICAgICAgZW50ZXJCaWRpQ29u dGV4dChpbmxpbmVCb3gsICplbnRlcmluZ0NvbnRlbnRDb250cm9sQ2hhcik7CisgICAgaWYgKG5l c3RlZENvbnRlbnRDb250cm9sQ2hhcikKKyAgICAgICAgZW50ZXJCaWRpQ29udGV4dChpbmxpbmVC b3gsICpuZXN0ZWRDb250ZW50Q29udHJvbENoYXIpOworfQorCit2b2lkIElubGluZUl0ZW1zQnVp bGRlcjo6aGFuZGxlSW5saW5lQm94RW5kKGNvbnN0IEJveCYgaW5saW5lQm94LCBJbmxpbmVJdGVt cyYgaW5saW5lSXRlbXMpCit7CisgICAgaW5saW5lSXRlbXMuYXBwZW5kKHsgaW5saW5lQm94LCBJ bmxpbmVJdGVtOjpUeXBlOjpJbmxpbmVCb3hFbmQgfSk7CisgICAgLy8gaHR0cHM6Ly9kcmFmdHMu Y3Nzd2cub3JnL2Nzcy13cml0aW5nLW1vZGVzLyN1bmljb2RlLWJpZGkKKyAgICBhdXRvJiBzdHls ZSA9IGlubGluZUJveC5zdHlsZSgpOworICAgIGlmIChzdHlsZS5ydGxPcmRlcmluZygpID09IE9y ZGVyOjpWaXN1YWwpCisgICAgICAgIHJldHVybjsKKworICAgIGF1dG8gZXhpdGluZ0NvbnRlbnRD b250cm9sQ2hhciA9IHN0ZDo6b3B0aW9uYWw8VUNoYXI+IHsgfTsKKyAgICBhdXRvIG5lc3RlZENv bnRlbnRDb250cm9sQ2hhciA9IHN0ZDo6b3B0aW9uYWw8VUNoYXI+IHsgfTsKKworICAgIHN3aXRj aCAoc3R5bGUudW5pY29kZUJpZGkoKSkgeworICAgIGNhc2UgRVVuaWNvZGVCaWRpOjpVQk5vcm1h bDoKKyAgICAgICAgLy8gVGhlIGJveCBkb2VzIG5vdCBvcGVuIGFuIGFkZGl0aW9uYWwgbGV2ZWwg b2YgZW1iZWRkaW5nIHdpdGggcmVzcGVjdCB0byB0aGUgYmlkaXJlY3Rpb25hbCBhbGdvcml0aG0u CisgICAgICAgIC8vIEZvciBpbmxpbmUgYm94ZXMsIGltcGxpY2l0IHJlb3JkZXJpbmcgd29ya3Mg YWNyb3NzIGJveCBib3VuZGFyaWVzLgorICAgICAgICBicmVhazsKKyAgICBjYXNlIEVVbmljb2Rl QmlkaTo6RW1iZWQ6CisgICAgICAgIGV4aXRpbmdDb250ZW50Q29udHJvbENoYXIgPSBwb3BEaXJl Y3Rpb25hbEZvcm1hdHRpbmc7CisgICAgICAgIGJyZWFrOworICAgIGNhc2UgRVVuaWNvZGVCaWRp OjpPdmVycmlkZToKKyAgICAgICAgZXhpdGluZ0NvbnRlbnRDb250cm9sQ2hhciA9IHBvcERpcmVj dGlvbmFsRm9ybWF0dGluZzsKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBFVW5pY29kZUJpZGk6 Oklzb2xhdGU6CisgICAgICAgIGV4aXRpbmdDb250ZW50Q29udHJvbENoYXIgPSBwb3BEaXJlY3Rp b25hbElzb2xhdGU7CisgICAgICAgIGJyZWFrOworICAgIGNhc2UgRVVuaWNvZGVCaWRpOjpQbGFp bnRleHQ6CisgICAgICAgIGV4aXRpbmdDb250ZW50Q29udHJvbENoYXIgPSBwb3BEaXJlY3Rpb25h bElzb2xhdGU7CisgICAgICAgIGJyZWFrOworICAgIGNhc2UgRVVuaWNvZGVCaWRpOjpJc29sYXRl T3ZlcnJpZGU6CisgICAgICAgIG5lc3RlZENvbnRlbnRDb250cm9sQ2hhciA9IHBvcERpcmVjdGlv bmFsRm9ybWF0dGluZzsKKyAgICAgICAgZXhpdGluZ0NvbnRlbnRDb250cm9sQ2hhciA9IHBvcERp cmVjdGlvbmFsSXNvbGF0ZTsKKyAgICAgICAgYnJlYWs7CisgICAgZGVmYXVsdDoKKyAgICAgICAg QVNTRVJUX05PVF9SRUFDSEVEKCk7CisgICAgfQorCisgICAgaWYgKG5lc3RlZENvbnRlbnRDb250 cm9sQ2hhcikKKyAgICAgICAgZXhpdEJpZGlDb250ZXh0KGlubGluZUJveCwgKm5lc3RlZENvbnRl bnRDb250cm9sQ2hhcik7CisgICAgaWYgKGV4aXRpbmdDb250ZW50Q29udHJvbENoYXIpCisgICAg ICAgIGV4aXRCaWRpQ29udGV4dChpbmxpbmVCb3gsICpleGl0aW5nQ29udGVudENvbnRyb2xDaGFy KTsKIH0KIAogdm9pZCBJbmxpbmVJdGVtc0J1aWxkZXI6OmhhbmRsZUlubGluZUxldmVsQm94KGNv bnN0IEJveCYgbGF5b3V0Qm94LCBJbmxpbmVJdGVtcyYgaW5saW5lSXRlbXMpCkBAIC0yMzQsNiAr MzEzLDE2IEBAIHZvaWQgSW5saW5lSXRlbXNCdWlsZGVyOjpoYW5kbGVJbmxpbmVMZXZlbEJveChj b25zdCBCb3gmIGxheW91dEJveCwgSW5saW5lSXRlbXMmCiAgICAgQVNTRVJUX05PVF9SRUFDSEVE KCk7CiB9CiAKK3ZvaWQgSW5saW5lSXRlbXNCdWlsZGVyOjplbnRlckJpZGlDb250ZXh0KGNvbnN0 IEJveCYsIFVDaGFyKQoreworICAgIC8vIEZJWE1FOiBJbmplY3QgdGhlIGNvbnRyb2wgY2hhcmFj dGVyIHRvIHRoZSBwYXJhZ3JhcGggc3RyaW5nLgorfQorCit2b2lkIElubGluZUl0ZW1zQnVpbGRl cjo6ZXhpdEJpZGlDb250ZXh0KGNvbnN0IEJveCYsIFVDaGFyKQoreworICAgIC8vIEZJWE1FOiBJ bmplY3QgdGhlIGNvbnRyb2wgY2hhcmFjdGVyIHRvIHRoZSBwYXJhZ3JhcGggc3RyaW5nLgorfQor CiB9CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29u dGV4dHMvaW5saW5lL0lubGluZUl0ZW1zQnVpbGRlci5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lSXRlbXNCdWlsZGVyLmgKaW5kZXggZGEw ZjdhNjcxNjFiNTVlOGZhZjkyODQ2OGViNTBhZTAyNDEwOTIwOS4uMjg0MTJjYjY4ZDljZDk5MGE4 ZmE0ZDc0NTJlN2JiNDg1Y2Q0ODNkYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lSXRlbXNCdWlsZGVyLmgKKysrIGIvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lSXRlbXNC dWlsZGVyLmgKQEAgLTQ0LDkgKzQ0LDEyIEBAIHByaXZhdGU6CiAgICAgdm9pZCBicmVha0lubGlu ZUl0ZW1zQXRCaWRpQm91bmRhcmllcyhJbmxpbmVJdGVtcyYpOwogCiAgICAgdm9pZCBoYW5kbGVU ZXh0Q29udGVudChjb25zdCBJbmxpbmVUZXh0Qm94JiwgSW5saW5lSXRlbXMmKTsKLSAgICBlbnVt IGNsYXNzIEVudGVySW5saW5lQm94IHsgWWVzLCBObyB9OwotICAgIHZvaWQgaGFuZGxlSW5saW5l Qm94KGNvbnN0IEJveCYsIEVudGVySW5saW5lQm94LCBJbmxpbmVJdGVtcyYpOworICAgIHZvaWQg aGFuZGxlSW5saW5lQm94U3RhcnQoY29uc3QgQm94JiwgSW5saW5lSXRlbXMmKTsKKyAgICB2b2lk IGhhbmRsZUlubGluZUJveEVuZChjb25zdCBCb3gmLCBJbmxpbmVJdGVtcyYpOwogICAgIHZvaWQg aGFuZGxlSW5saW5lTGV2ZWxCb3goY29uc3QgQm94JiwgSW5saW5lSXRlbXMmKTsKKyAgICAKKyAg ICB2b2lkIGVudGVyQmlkaUNvbnRleHQoY29uc3QgQm94JiwgVUNoYXIpOworICAgIHZvaWQgZXhp dEJpZGlDb250ZXh0KGNvbnN0IEJveCYsIFVDaGFyKTsKIAogICAgIGNvbnN0IENvbnRhaW5lckJv eCYgcm9vdCgpIGNvbnN0IHsgcmV0dXJuIG1fcm9vdDsgfQogCg==