216445 2020-09-12 14:58:32 -0700 Use an OptionSet<> for LayoutBox::BaseTypeFlags 2020-09-12 18:31:15 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser bfulgham darin simon.fraser webkit-bug-importer zalan oldest_to_newest 1687985 0 simon.fraser 2020-09-12 14:58:32 -0700 Use an OptionSet<> for LayoutBox::BaseTypeFlags 1687987 1 408613 simon.fraser 2020-09-12 15:01:11 -0700 Created attachment 408613 Patch 1687988 2 408613 simon.fraser 2020-09-12 15:01:52 -0700 Comment on attachment 408613 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=408613&action=review > Source/WebCore/layout/layouttree/LayoutContainerBox.cpp:40 > + : Box(attributes, WTFMove(style), baseTypeFlags | OptionSet<BaseTypeFlag>(ContainerBoxFlag)) Is there a better way to do this? 1687999 3 408613 darin 2020-09-12 15:22:16 -0700 Comment on attachment 408613 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=408613&action=review > Source/WebCore/layout/layouttree/LayoutBox.h:113 > + bool isInitialContainingBlock() const { return OptionSet<BaseTypeFlag>::fromRaw(m_baseTypeFlags).contains(InitialContainingBlockFlag); } I think we should make a getter that does OptionSet<BaseTypeFlag>::fromRaw(m_baseTypeFlags) so we don’t have to repeat it 5 times. Can be private and can call it flags() or baseTypeFlags(). >> Source/WebCore/layout/layouttree/LayoutContainerBox.cpp:40 >> + : Box(attributes, WTFMove(style), baseTypeFlags | OptionSet<BaseTypeFlag>(ContainerBoxFlag)) > > Is there a better way to do this? Doesn’t it work without the explicit constructor call? baseTypeFlags | ContainerBoxFlag I’d think it would because of the OptionSet constructor that takes a value of the underlying enumeration. If not (and I don’t know why not) we could: 1) Add an overload of the | operator that takes underlying enumeration type. But why is this needed? 2) Add a free function version of add. Then we could just write: add(baseTypeFlags, ContainerBoxFlag). Pretty sure that would work even if the operator doesn’t. > Source/WebCore/layout/layouttree/LayoutContainerBox.h:42 > + ContainerBox(Optional<ElementAttributes>, RenderStyle&&, OptionSet<BaseTypeFlag> = { Box::ContainerBoxFlag }); Not new, but no need for the "Box::" here. 1688008 4 408619 simon.fraser 2020-09-12 15:48:04 -0700 Created attachment 408619 Patch 1688038 5 ews-feeder 2020-09-12 18:30:17 -0700 Committed r266985: <https://trac.webkit.org/changeset/266985> All reviewed patches have been landed. Closing bug and clearing flags on attachment 408619. 1688039 6 webkit-bug-importer 2020-09-12 18:31:15 -0700 <rdar://problem/68783520> 408613 2020-09-12 15:01:11 -0700 2020-09-12 15:22:16 -0700 Patch bug-216445-20200912150110.patch text/plain 6800 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjY2ODk5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzMwZmM3ZWQ3OWFhMjM5 NDg2YmU2MDZjYzk5YjJlZTdhYTUyYjU5NS4uMGM1MTc1NmEyNWIwMmJkYWVmYjBkNTQ4MmM3MDFh Y2RhMzFhNDA2NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDIwLTA5LTEyICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFVzZSBhbiBPcHRp b25TZXQ8PiBmb3IgTGF5b3V0Qm94OjpCYXNlVHlwZUZsYWdzCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTY0NDUKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBVc2UgYW4gT3B0aW9uU2V0PD4gZm9yIExheW91 dEJveDo6QmFzZVR5cGVGbGFncy4KKworICAgICAgICAqIGxheW91dC9sYXlvdXR0cmVlL0xheW91 dEJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkJveDo6Qm94KToKKyAgICAgICAg KiBsYXlvdXQvbGF5b3V0dHJlZS9MYXlvdXRCb3guaDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91 dDo6Qm94Ojppc0luaXRpYWxDb250YWluaW5nQmxvY2sgY29uc3QpOgorICAgICAgICAoV2ViQ29y ZTo6TGF5b3V0OjpCb3g6OmlzQ29udGFpbmVyQm94IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6 OkxheW91dDo6Qm94Ojppc0lubGluZVRleHRCb3ggY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6 TGF5b3V0OjpCb3g6OmlzTGluZUJyZWFrQm94IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6Okxh eW91dDo6Qm94Ojppc1JlcGxhY2VkQm94IGNvbnN0KToKKyAgICAgICAgKiBsYXlvdXQvbGF5b3V0 dHJlZS9MYXlvdXRDb250YWluZXJCb3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpD b250YWluZXJCb3g6OkNvbnRhaW5lckJveCk6CisgICAgICAgICogbGF5b3V0L2xheW91dHRyZWUv TGF5b3V0Q29udGFpbmVyQm94Lmg6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkNvbnRhaW5l ckJveDo6Q29udGFpbmVyQm94KToKKwogMjAyMC0wOS0xMCAgV2Vuc29uIEhzaWVoICA8d2Vuc29u X2hzaWVoQGFwcGxlLmNvbT4KIAogICAgICAgICBBZGRyZXNzIGEgcG9zdC1jb21taXQgcmV2aWV3 IGNvbW1lbnQgYWZ0ZXIgcjI2Njg4NwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2xheW91dHRyZWUvTGF5b3V0Qm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9sYXlvdXR0 cmVlL0xheW91dEJveC5jcHAKaW5kZXggNjM5YzQ2YjlhNDY0ZmIyZjk4NzMzYzU5ZmExMDU4ODIy NjVkNjE5NS4uNzY3NzdkYmViNDYxMzU4YTJkOWJmMDliZmE1ZDBmMGY2Mzc5NjlkZiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2xheW91dHRyZWUvTGF5b3V0Qm94LmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvbGF5b3V0dHJlZS9MYXlvdXRCb3guY3BwCkBAIC00MSwx MCArNDEsMTAgQEAgbmFtZXNwYWNlIExheW91dCB7CiAKIFdURl9NQUtFX0lTT19BTExPQ0FURURf SU1QTChCb3gpOwogCi1Cb3g6OkJveChPcHRpb25hbDxFbGVtZW50QXR0cmlidXRlcz4gYXR0cmli dXRlcywgUmVuZGVyU3R5bGUmJiBzdHlsZSwgQmFzZVR5cGVGbGFncyBiYXNlVHlwZUZsYWdzKQor Qm94OjpCb3goT3B0aW9uYWw8RWxlbWVudEF0dHJpYnV0ZXM+IGF0dHJpYnV0ZXMsIFJlbmRlclN0 eWxlJiYgc3R5bGUsIE9wdGlvblNldDxCYXNlVHlwZUZsYWc+IGJhc2VUeXBlRmxhZ3MpCiAgICAg OiBtX3N0eWxlKFdURk1vdmUoc3R5bGUpKQogICAgICwgbV9lbGVtZW50QXR0cmlidXRlcyhhdHRy aWJ1dGVzKQotICAgICwgbV9iYXNlVHlwZUZsYWdzKGJhc2VUeXBlRmxhZ3MpCisgICAgLCBtX2Jh c2VUeXBlRmxhZ3MoYmFzZVR5cGVGbGFncy50b1JhdygpKQogICAgICwgbV9oYXNSYXJlRGF0YShm YWxzZSkKICAgICAsIG1faXNBbm9ueW1vdXMoZmFsc2UpCiB7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvbGF5b3V0dHJlZS9MYXlvdXRCb3guaCBiL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9sYXlvdXR0cmVlL0xheW91dEJveC5oCmluZGV4IDFlYWMxOGFmZTgwMWUwMmNiZDA4MzYy ZmYwNTQ4ZGVjMjAzYjAwNzQuLmNjNjliMTc5MDE5MTdlZGU1YWJhNDE0NjdhODE1NTgzNWM5YTcy OTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9sYXlvdXR0cmVlL0xheW91dEJv eC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9sYXlvdXR0cmVlL0xheW91dEJveC5oCkBA IC02Miw3ICs2Miw3IEBAIHB1YmxpYzoKICAgICAgICAgRWxlbWVudFR5cGUgZWxlbWVudFR5cGU7 CiAgICAgfTsKIAotICAgIGVudW0gQmFzZVR5cGVGbGFnIHsKKyAgICBlbnVtIEJhc2VUeXBlRmxh ZyA6IHVpbnQ4X3QgewogICAgICAgICBCb3hGbGFnICAgICAgICAgICAgICAgICAgICA9IDEgPDwg MCwKICAgICAgICAgSW5saW5lVGV4dEJveEZsYWcgICAgICAgICAgPSAxIDw8IDEsCiAgICAgICAg IExpbmVCcmVha0JveEZsYWcgICAgICAgICAgID0gMSA8PCAyLApAQCAtNzAsNyArNzAsNiBAQCBw dWJsaWM6CiAgICAgICAgIEluaXRpYWxDb250YWluaW5nQmxvY2tGbGFnID0gMSA8PCA0LAogICAg ICAgICBDb250YWluZXJCb3hGbGFnICAgICAgICAgICA9IDEgPDwgNQogICAgIH07Ci0gICAgdHlw ZWRlZiB1bnNpZ25lZCBCYXNlVHlwZUZsYWdzOwogCiAgICAgdmlydHVhbCB+Qm94KCk7CiAKQEAg LTExMSw3ICsxMTAsNyBAQCBwdWJsaWM6CiAgICAgYm9vbCBpc0lubGluZUJsb2NrQm94KCkgY29u c3Q7CiAgICAgYm9vbCBpc0lubGluZVRhYmxlQm94KCkgY29uc3Q7CiAgICAgYm9vbCBpc0Jsb2Nr Q29udGFpbmVyQm94KCkgY29uc3Q7Ci0gICAgYm9vbCBpc0luaXRpYWxDb250YWluaW5nQmxvY2so KSBjb25zdCB7IHJldHVybiBtX2Jhc2VUeXBlRmxhZ3MgJiBJbml0aWFsQ29udGFpbmluZ0Jsb2Nr RmxhZzsgfQorICAgIGJvb2wgaXNJbml0aWFsQ29udGFpbmluZ0Jsb2NrKCkgY29uc3QgeyByZXR1 cm4gT3B0aW9uU2V0PEJhc2VUeXBlRmxhZz46OmZyb21SYXcobV9iYXNlVHlwZUZsYWdzKS5jb250 YWlucyhJbml0aWFsQ29udGFpbmluZ0Jsb2NrRmxhZyk7IH0KIAogICAgIGJvb2wgaXNEb2N1bWVu dEJveCgpIGNvbnN0IHsgcmV0dXJuIG1fZWxlbWVudEF0dHJpYnV0ZXMgJiYgbV9lbGVtZW50QXR0 cmlidXRlcy52YWx1ZSgpLmVsZW1lbnRUeXBlID09IEVsZW1lbnRUeXBlOjpEb2N1bWVudDsgfQog ICAgIGJvb2wgaXNCb2R5Qm94KCkgY29uc3QgeyByZXR1cm4gbV9lbGVtZW50QXR0cmlidXRlcyAm JiBtX2VsZW1lbnRBdHRyaWJ1dGVzLnZhbHVlKCkuZWxlbWVudFR5cGUgPT0gRWxlbWVudFR5cGU6 OkJvZHk7IH0KQEAgLTEzOSwxMCArMTM4LDEwIEBAIHB1YmxpYzoKICAgICAvLyBGSVhNRTogVGhp cyBpcyBjdXJyZW50bHkgbmVlZGVkIGZvciBzdHlsZSB1cGRhdGVzLgogICAgIEJveCogbmV4dFNp YmxpbmcoKSB7IHJldHVybiBtX25leHRTaWJsaW5nOyB9CiAKLSAgICBib29sIGlzQ29udGFpbmVy Qm94KCkgY29uc3QgeyByZXR1cm4gbV9iYXNlVHlwZUZsYWdzICYgQ29udGFpbmVyQm94RmxhZzsg fQotICAgIGJvb2wgaXNJbmxpbmVUZXh0Qm94KCkgY29uc3QgeyByZXR1cm4gbV9iYXNlVHlwZUZs YWdzICYgSW5saW5lVGV4dEJveEZsYWc7IH0KLSAgICBib29sIGlzTGluZUJyZWFrQm94KCkgY29u c3QgeyByZXR1cm4gbV9iYXNlVHlwZUZsYWdzICYgTGluZUJyZWFrQm94RmxhZzsgfQotICAgIGJv b2wgaXNSZXBsYWNlZEJveCgpIGNvbnN0IHsgcmV0dXJuIG1fYmFzZVR5cGVGbGFncyAmIFJlcGxh Y2VkQm94RmxhZzsgfQorICAgIGJvb2wgaXNDb250YWluZXJCb3goKSBjb25zdCB7IHJldHVybiBP cHRpb25TZXQ8QmFzZVR5cGVGbGFnPjo6ZnJvbVJhdyhtX2Jhc2VUeXBlRmxhZ3MpLmNvbnRhaW5z KENvbnRhaW5lckJveEZsYWcpOyB9CisgICAgYm9vbCBpc0lubGluZVRleHRCb3goKSBjb25zdCB7 IHJldHVybiBPcHRpb25TZXQ8QmFzZVR5cGVGbGFnPjo6ZnJvbVJhdyhtX2Jhc2VUeXBlRmxhZ3Mp LmNvbnRhaW5zKElubGluZVRleHRCb3hGbGFnKTsgfQorICAgIGJvb2wgaXNMaW5lQnJlYWtCb3go KSBjb25zdCB7IHJldHVybiBPcHRpb25TZXQ8QmFzZVR5cGVGbGFnPjo6ZnJvbVJhdyhtX2Jhc2VU eXBlRmxhZ3MpLmNvbnRhaW5zKExpbmVCcmVha0JveEZsYWcpOyB9CisgICAgYm9vbCBpc1JlcGxh Y2VkQm94KCkgY29uc3QgeyByZXR1cm4gT3B0aW9uU2V0PEJhc2VUeXBlRmxhZz46OmZyb21SYXco bV9iYXNlVHlwZUZsYWdzKS5jb250YWlucyhSZXBsYWNlZEJveEZsYWcpOyB9CiAKICAgICBib29s IGlzUGFkZGluZ0FwcGxpY2FibGUoKSBjb25zdDsKICAgICBib29sIGlzT3ZlcmZsb3dWaXNpYmxl KCkgY29uc3Q7CkBAIC0xNzEsNyArMTcwLDcgQEAgcHVibGljOgogICAgIHZvaWQgc2V0Q2FjaGVk RGlzcGxheUJveEZvckxheW91dFN0YXRlKExheW91dFN0YXRlJiwgc3RkOjp1bmlxdWVfcHRyPERp c3BsYXk6OkJveD4pIGNvbnN0OwogCiBwcm90ZWN0ZWQ6Ci0gICAgQm94KE9wdGlvbmFsPEVsZW1l bnRBdHRyaWJ1dGVzPiwgUmVuZGVyU3R5bGUmJiwgQmFzZVR5cGVGbGFncyk7CisgICAgQm94KE9w dGlvbmFsPEVsZW1lbnRBdHRyaWJ1dGVzPiwgUmVuZGVyU3R5bGUmJiwgT3B0aW9uU2V0PEJhc2VU eXBlRmxhZz4pOwogCiBwcml2YXRlOgogICAgIGNsYXNzIEJveFJhcmVEYXRhIHsKQEAgLTIwNCw3 ICsyMDMsNyBAQCBwcml2YXRlOgogICAgIG11dGFibGUgV2Vha1B0cjxMYXlvdXRTdGF0ZT4gbV9j YWNoZWRMYXlvdXRTdGF0ZTsKICAgICBtdXRhYmxlIHN0ZDo6dW5pcXVlX3B0cjxEaXNwbGF5OjpC b3g+IG1fY2FjaGVkRGlzcGxheUJveEZvckxheW91dFN0YXRlOwogCi0gICAgdW5zaWduZWQgbV9i YXNlVHlwZUZsYWdzIDogNjsKKyAgICB1bnNpZ25lZCBtX2Jhc2VUeXBlRmxhZ3MgOiA2OyAvLyBP cHRpb25TZXQ8QmFzZVR5cGVGbGFnPgogICAgIGJvb2wgbV9oYXNSYXJlRGF0YSA6IDE7CiAgICAg Ym9vbCBtX2lzQW5vbnltb3VzIDogMTsKIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvbGF5b3V0dHJlZS9MYXlvdXRDb250YWluZXJCb3guY3BwIGIvU291cmNlL1dlYkNvcmUv bGF5b3V0L2xheW91dHRyZWUvTGF5b3V0Q29udGFpbmVyQm94LmNwcAppbmRleCAwMWI4OTFiNjg5 YjAzYmRjNWE4OTVlN2ZhMzVjYTAyNTExYjIxZjhiLi5mZjAzOGNiYzE0MDViOTZiMjJjODc3MDc0 M2IzOWU4M2Q2NmY5NTA2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvbGF5b3V0 dHJlZS9MYXlvdXRDb250YWluZXJCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9s YXlvdXR0cmVlL0xheW91dENvbnRhaW5lckJveC5jcHAKQEAgLTM2LDggKzM2LDggQEAgbmFtZXNw YWNlIExheW91dCB7CiAKIFdURl9NQUtFX0lTT19BTExPQ0FURURfSU1QTChDb250YWluZXJCb3gp OwogCi1Db250YWluZXJCb3g6OkNvbnRhaW5lckJveChPcHRpb25hbDxFbGVtZW50QXR0cmlidXRl cz4gYXR0cmlidXRlcywgUmVuZGVyU3R5bGUmJiBzdHlsZSwgQmFzZVR5cGVGbGFncyBiYXNlVHlw ZUZsYWdzKQotICAgIDogQm94KGF0dHJpYnV0ZXMsIFdURk1vdmUoc3R5bGUpLCBiYXNlVHlwZUZs YWdzIHwgQ29udGFpbmVyQm94RmxhZykKK0NvbnRhaW5lckJveDo6Q29udGFpbmVyQm94KE9wdGlv bmFsPEVsZW1lbnRBdHRyaWJ1dGVzPiBhdHRyaWJ1dGVzLCBSZW5kZXJTdHlsZSYmIHN0eWxlLCBP cHRpb25TZXQ8QmFzZVR5cGVGbGFnPiBiYXNlVHlwZUZsYWdzKQorICAgIDogQm94KGF0dHJpYnV0 ZXMsIFdURk1vdmUoc3R5bGUpLCBiYXNlVHlwZUZsYWdzIHwgT3B0aW9uU2V0PEJhc2VUeXBlRmxh Zz4oQ29udGFpbmVyQm94RmxhZykpCiB7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9sYXlvdXR0cmVlL0xheW91dENvbnRhaW5lckJveC5oIGIvU291cmNlL1dlYkNvcmUv bGF5b3V0L2xheW91dHRyZWUvTGF5b3V0Q29udGFpbmVyQm94LmgKaW5kZXggMTNmMTBkMGUxM2I1 ZTUzYTAyZTYyNzk3YzYxZDI0MmFhNTJhZGVjMy4uN2ExNzU2Mjc4MmFiZTYxMjM4Mzg0ODhhZDI0 OTFiNmM5YmFhMDdjMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2xheW91dHRy ZWUvTGF5b3V0Q29udGFpbmVyQm94LmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2xheW91 dHRyZWUvTGF5b3V0Q29udGFpbmVyQm94LmgKQEAgLTM5LDcgKzM5LDcgQEAgbmFtZXNwYWNlIExh eW91dCB7CiBjbGFzcyBDb250YWluZXJCb3ggOiBwdWJsaWMgQm94IHsKICAgICBXVEZfTUFLRV9J U09fQUxMT0NBVEVEKENvbnRhaW5lckJveCk7CiBwdWJsaWM6Ci0gICAgQ29udGFpbmVyQm94KE9w dGlvbmFsPEVsZW1lbnRBdHRyaWJ1dGVzPiwgUmVuZGVyU3R5bGUmJiwgQmFzZVR5cGVGbGFncyA9 IEJveDo6Q29udGFpbmVyQm94RmxhZyk7CisgICAgQ29udGFpbmVyQm94KE9wdGlvbmFsPEVsZW1l bnRBdHRyaWJ1dGVzPiwgUmVuZGVyU3R5bGUmJiwgT3B0aW9uU2V0PEJhc2VUeXBlRmxhZz4gPSB7 IEJveDo6Q29udGFpbmVyQm94RmxhZyB9KTsKIAogICAgIGNvbnN0IEJveCogZmlyc3RDaGlsZCgp IGNvbnN0IHsgcmV0dXJuIG1fZmlyc3RDaGlsZDsgfQogICAgIGNvbnN0IEJveCogZmlyc3RJbkZs b3dDaGlsZCgpIGNvbnN0Owo= 408619 2020-09-12 15:48:04 -0700 2020-09-12 18:30:18 -0700 Patch bug-216445-20200912154803.patch text/plain 6856 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjY2ODk5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzMwZmM3ZWQ3OWFhMjM5 NDg2YmU2MDZjYzk5YjJlZTdhYTUyYjU5NS4uZDk3YjhiMDkwNjlmOTkxNmMwYWY3Nzk3ZmI0Nzgy NmY1MTk1NjJlMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDIwLTA5LTEyICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFVzZSBhbiBPcHRp b25TZXQ8PiBmb3IgTGF5b3V0Qm94OjpCYXNlVHlwZUZsYWdzCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTY0NDUKKworICAgICAgICBSZXZpZXdlZCBi eSBEYXJpbiBBZGxlci4KKworICAgICAgICBVc2UgYW4gT3B0aW9uU2V0PD4gZm9yIExheW91dEJv eDo6QmFzZVR5cGVGbGFncy4KKworICAgICAgICAqIGxheW91dC9sYXlvdXR0cmVlL0xheW91dEJv eC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkJveDo6Qm94KToKKyAgICAgICAgKiBs YXlvdXQvbGF5b3V0dHJlZS9MYXlvdXRCb3guaDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6 Qm94Ojppc0luaXRpYWxDb250YWluaW5nQmxvY2sgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6 TGF5b3V0OjpCb3g6OmlzQ29udGFpbmVyQm94IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6Okxh eW91dDo6Qm94Ojppc0lubGluZVRleHRCb3ggY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TGF5 b3V0OjpCb3g6OmlzTGluZUJyZWFrQm94IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91 dDo6Qm94Ojppc1JlcGxhY2VkQm94IGNvbnN0KToKKyAgICAgICAgKiBsYXlvdXQvbGF5b3V0dHJl ZS9MYXlvdXRDb250YWluZXJCb3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpDb250 YWluZXJCb3g6OkNvbnRhaW5lckJveCk6CisgICAgICAgICogbGF5b3V0L2xheW91dHRyZWUvTGF5 b3V0Q29udGFpbmVyQm94Lmg6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkNvbnRhaW5lckJv eDo6Q29udGFpbmVyQm94KToKKwogMjAyMC0wOS0xMCAgV2Vuc29uIEhzaWVoICA8d2Vuc29uX2hz aWVoQGFwcGxlLmNvbT4KIAogICAgICAgICBBZGRyZXNzIGEgcG9zdC1jb21taXQgcmV2aWV3IGNv bW1lbnQgYWZ0ZXIgcjI2Njg4NwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2xh eW91dHRyZWUvTGF5b3V0Qm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9sYXlvdXR0cmVl L0xheW91dEJveC5jcHAKaW5kZXggNjM5YzQ2YjlhNDY0ZmIyZjk4NzMzYzU5ZmExMDU4ODIyNjVk NjE5NS4uNzY3NzdkYmViNDYxMzU4YTJkOWJmMDliZmE1ZDBmMGY2Mzc5NjlkZiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2xheW91dHRyZWUvTGF5b3V0Qm94LmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvbGF5b3V0dHJlZS9MYXlvdXRCb3guY3BwCkBAIC00MSwxMCAr NDEsMTAgQEAgbmFtZXNwYWNlIExheW91dCB7CiAKIFdURl9NQUtFX0lTT19BTExPQ0FURURfSU1Q TChCb3gpOwogCi1Cb3g6OkJveChPcHRpb25hbDxFbGVtZW50QXR0cmlidXRlcz4gYXR0cmlidXRl cywgUmVuZGVyU3R5bGUmJiBzdHlsZSwgQmFzZVR5cGVGbGFncyBiYXNlVHlwZUZsYWdzKQorQm94 OjpCb3goT3B0aW9uYWw8RWxlbWVudEF0dHJpYnV0ZXM+IGF0dHJpYnV0ZXMsIFJlbmRlclN0eWxl JiYgc3R5bGUsIE9wdGlvblNldDxCYXNlVHlwZUZsYWc+IGJhc2VUeXBlRmxhZ3MpCiAgICAgOiBt X3N0eWxlKFdURk1vdmUoc3R5bGUpKQogICAgICwgbV9lbGVtZW50QXR0cmlidXRlcyhhdHRyaWJ1 dGVzKQotICAgICwgbV9iYXNlVHlwZUZsYWdzKGJhc2VUeXBlRmxhZ3MpCisgICAgLCBtX2Jhc2VU eXBlRmxhZ3MoYmFzZVR5cGVGbGFncy50b1JhdygpKQogICAgICwgbV9oYXNSYXJlRGF0YShmYWxz ZSkKICAgICAsIG1faXNBbm9ueW1vdXMoZmFsc2UpCiB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvbGF5b3V0dHJlZS9MYXlvdXRCb3guaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9sYXlvdXR0cmVlL0xheW91dEJveC5oCmluZGV4IDFlYWMxOGFmZTgwMWUwMmNiZDA4MzYyZmYw NTQ4ZGVjMjAzYjAwNzQuLmE3YWM5ODFjNmY4MzY5N2M0YjVkYjQ1MzQxNDUwMDdjOGIzMTU1MGIg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9sYXlvdXR0cmVlL0xheW91dEJveC5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9sYXlvdXR0cmVlL0xheW91dEJveC5oCkBAIC02 Miw3ICs2Miw3IEBAIHB1YmxpYzoKICAgICAgICAgRWxlbWVudFR5cGUgZWxlbWVudFR5cGU7CiAg ICAgfTsKIAotICAgIGVudW0gQmFzZVR5cGVGbGFnIHsKKyAgICBlbnVtIEJhc2VUeXBlRmxhZyA6 IHVpbnQ4X3QgewogICAgICAgICBCb3hGbGFnICAgICAgICAgICAgICAgICAgICA9IDEgPDwgMCwK ICAgICAgICAgSW5saW5lVGV4dEJveEZsYWcgICAgICAgICAgPSAxIDw8IDEsCiAgICAgICAgIExp bmVCcmVha0JveEZsYWcgICAgICAgICAgID0gMSA8PCAyLApAQCAtNzAsNyArNzAsNiBAQCBwdWJs aWM6CiAgICAgICAgIEluaXRpYWxDb250YWluaW5nQmxvY2tGbGFnID0gMSA8PCA0LAogICAgICAg ICBDb250YWluZXJCb3hGbGFnICAgICAgICAgICA9IDEgPDwgNQogICAgIH07Ci0gICAgdHlwZWRl ZiB1bnNpZ25lZCBCYXNlVHlwZUZsYWdzOwogCiAgICAgdmlydHVhbCB+Qm94KCk7CiAKQEAgLTEx MSw3ICsxMTAsNyBAQCBwdWJsaWM6CiAgICAgYm9vbCBpc0lubGluZUJsb2NrQm94KCkgY29uc3Q7 CiAgICAgYm9vbCBpc0lubGluZVRhYmxlQm94KCkgY29uc3Q7CiAgICAgYm9vbCBpc0Jsb2NrQ29u dGFpbmVyQm94KCkgY29uc3Q7Ci0gICAgYm9vbCBpc0luaXRpYWxDb250YWluaW5nQmxvY2soKSBj b25zdCB7IHJldHVybiBtX2Jhc2VUeXBlRmxhZ3MgJiBJbml0aWFsQ29udGFpbmluZ0Jsb2NrRmxh ZzsgfQorICAgIGJvb2wgaXNJbml0aWFsQ29udGFpbmluZ0Jsb2NrKCkgY29uc3QgeyByZXR1cm4g YmFzZVR5cGVGbGFncygpLmNvbnRhaW5zKEluaXRpYWxDb250YWluaW5nQmxvY2tGbGFnKTsgfQog CiAgICAgYm9vbCBpc0RvY3VtZW50Qm94KCkgY29uc3QgeyByZXR1cm4gbV9lbGVtZW50QXR0cmli dXRlcyAmJiBtX2VsZW1lbnRBdHRyaWJ1dGVzLnZhbHVlKCkuZWxlbWVudFR5cGUgPT0gRWxlbWVu dFR5cGU6OkRvY3VtZW50OyB9CiAgICAgYm9vbCBpc0JvZHlCb3goKSBjb25zdCB7IHJldHVybiBt X2VsZW1lbnRBdHRyaWJ1dGVzICYmIG1fZWxlbWVudEF0dHJpYnV0ZXMudmFsdWUoKS5lbGVtZW50 VHlwZSA9PSBFbGVtZW50VHlwZTo6Qm9keTsgfQpAQCAtMTM5LDEwICsxMzgsMTAgQEAgcHVibGlj OgogICAgIC8vIEZJWE1FOiBUaGlzIGlzIGN1cnJlbnRseSBuZWVkZWQgZm9yIHN0eWxlIHVwZGF0 ZXMuCiAgICAgQm94KiBuZXh0U2libGluZygpIHsgcmV0dXJuIG1fbmV4dFNpYmxpbmc7IH0KIAot ICAgIGJvb2wgaXNDb250YWluZXJCb3goKSBjb25zdCB7IHJldHVybiBtX2Jhc2VUeXBlRmxhZ3Mg JiBDb250YWluZXJCb3hGbGFnOyB9Ci0gICAgYm9vbCBpc0lubGluZVRleHRCb3goKSBjb25zdCB7 IHJldHVybiBtX2Jhc2VUeXBlRmxhZ3MgJiBJbmxpbmVUZXh0Qm94RmxhZzsgfQotICAgIGJvb2wg aXNMaW5lQnJlYWtCb3goKSBjb25zdCB7IHJldHVybiBtX2Jhc2VUeXBlRmxhZ3MgJiBMaW5lQnJl YWtCb3hGbGFnOyB9Ci0gICAgYm9vbCBpc1JlcGxhY2VkQm94KCkgY29uc3QgeyByZXR1cm4gbV9i YXNlVHlwZUZsYWdzICYgUmVwbGFjZWRCb3hGbGFnOyB9CisgICAgYm9vbCBpc0NvbnRhaW5lckJv eCgpIGNvbnN0IHsgcmV0dXJuIGJhc2VUeXBlRmxhZ3MoKS5jb250YWlucyhDb250YWluZXJCb3hG bGFnKTsgfQorICAgIGJvb2wgaXNJbmxpbmVUZXh0Qm94KCkgY29uc3QgeyByZXR1cm4gYmFzZVR5 cGVGbGFncygpLmNvbnRhaW5zKElubGluZVRleHRCb3hGbGFnKTsgfQorICAgIGJvb2wgaXNMaW5l QnJlYWtCb3goKSBjb25zdCB7IHJldHVybiBiYXNlVHlwZUZsYWdzKCkuY29udGFpbnMoTGluZUJy ZWFrQm94RmxhZyk7IH0KKyAgICBib29sIGlzUmVwbGFjZWRCb3goKSBjb25zdCB7IHJldHVybiBi YXNlVHlwZUZsYWdzKCkuY29udGFpbnMoUmVwbGFjZWRCb3hGbGFnKTsgfQogCiAgICAgYm9vbCBp c1BhZGRpbmdBcHBsaWNhYmxlKCkgY29uc3Q7CiAgICAgYm9vbCBpc092ZXJmbG93VmlzaWJsZSgp IGNvbnN0OwpAQCAtMTcxLDcgKzE3MCw3IEBAIHB1YmxpYzoKICAgICB2b2lkIHNldENhY2hlZERp c3BsYXlCb3hGb3JMYXlvdXRTdGF0ZShMYXlvdXRTdGF0ZSYsIHN0ZDo6dW5pcXVlX3B0cjxEaXNw bGF5OjpCb3g+KSBjb25zdDsKIAogcHJvdGVjdGVkOgotICAgIEJveChPcHRpb25hbDxFbGVtZW50 QXR0cmlidXRlcz4sIFJlbmRlclN0eWxlJiYsIEJhc2VUeXBlRmxhZ3MpOworICAgIEJveChPcHRp b25hbDxFbGVtZW50QXR0cmlidXRlcz4sIFJlbmRlclN0eWxlJiYsIE9wdGlvblNldDxCYXNlVHlw ZUZsYWc+KTsKIAogcHJpdmF0ZToKICAgICBjbGFzcyBCb3hSYXJlRGF0YSB7CkBAIC0xODgsNiAr MTg3LDggQEAgcHJpdmF0ZToKICAgICBjb25zdCBCb3hSYXJlRGF0YSYgcmFyZURhdGEoKSBjb25z dDsKICAgICBCb3hSYXJlRGF0YSYgZW5zdXJlUmFyZURhdGEoKTsKICAgICB2b2lkIHJlbW92ZVJh cmVEYXRhKCk7CisgICAgCisgICAgT3B0aW9uU2V0PEJhc2VUeXBlRmxhZz4gYmFzZVR5cGVGbGFn cygpIGNvbnN0IHsgcmV0dXJuIE9wdGlvblNldDxCYXNlVHlwZUZsYWc+Ojpmcm9tUmF3KG1fYmFz ZVR5cGVGbGFncyk7IH0KIAogICAgIHR5cGVkZWYgSGFzaE1hcDxjb25zdCBCb3gqLCBzdGQ6OnVu aXF1ZV9wdHI8Qm94UmFyZURhdGE+PiBSYXJlRGF0YU1hcDsKIApAQCAtMjA0LDcgKzIwNSw3IEBA IHByaXZhdGU6CiAgICAgbXV0YWJsZSBXZWFrUHRyPExheW91dFN0YXRlPiBtX2NhY2hlZExheW91 dFN0YXRlOwogICAgIG11dGFibGUgc3RkOjp1bmlxdWVfcHRyPERpc3BsYXk6OkJveD4gbV9jYWNo ZWREaXNwbGF5Qm94Rm9yTGF5b3V0U3RhdGU7CiAKLSAgICB1bnNpZ25lZCBtX2Jhc2VUeXBlRmxh Z3MgOiA2OworICAgIHVuc2lnbmVkIG1fYmFzZVR5cGVGbGFncyA6IDY7IC8vIE9wdGlvblNldDxC YXNlVHlwZUZsYWc+CiAgICAgYm9vbCBtX2hhc1JhcmVEYXRhIDogMTsKICAgICBib29sIG1faXNB bm9ueW1vdXMgOiAxOwogfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9sYXlv dXR0cmVlL0xheW91dENvbnRhaW5lckJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvbGF5 b3V0dHJlZS9MYXlvdXRDb250YWluZXJCb3guY3BwCmluZGV4IDAxYjg5MWI2ODliMDNiZGM1YTg5 NWU3ZmEzNWNhMDI1MTFiMjFmOGIuLjFkYjJmMzg1MmVmYTNiNzZhYzExNmU2N2Y5Mzk2NmExOGMy Njc0MTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9sYXlvdXR0cmVlL0xheW91 dENvbnRhaW5lckJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2xheW91dHRyZWUv TGF5b3V0Q29udGFpbmVyQm94LmNwcApAQCAtMzYsNyArMzYsNyBAQCBuYW1lc3BhY2UgTGF5b3V0 IHsKIAogV1RGX01BS0VfSVNPX0FMTE9DQVRFRF9JTVBMKENvbnRhaW5lckJveCk7CiAKLUNvbnRh aW5lckJveDo6Q29udGFpbmVyQm94KE9wdGlvbmFsPEVsZW1lbnRBdHRyaWJ1dGVzPiBhdHRyaWJ1 dGVzLCBSZW5kZXJTdHlsZSYmIHN0eWxlLCBCYXNlVHlwZUZsYWdzIGJhc2VUeXBlRmxhZ3MpCitD b250YWluZXJCb3g6OkNvbnRhaW5lckJveChPcHRpb25hbDxFbGVtZW50QXR0cmlidXRlcz4gYXR0 cmlidXRlcywgUmVuZGVyU3R5bGUmJiBzdHlsZSwgT3B0aW9uU2V0PEJhc2VUeXBlRmxhZz4gYmFz ZVR5cGVGbGFncykKICAgICA6IEJveChhdHRyaWJ1dGVzLCBXVEZNb3ZlKHN0eWxlKSwgYmFzZVR5 cGVGbGFncyB8IENvbnRhaW5lckJveEZsYWcpCiB7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvbGF5b3V0dHJlZS9MYXlvdXRDb250YWluZXJCb3guaCBiL1NvdXJjZS9XZWJD b3JlL2xheW91dC9sYXlvdXR0cmVlL0xheW91dENvbnRhaW5lckJveC5oCmluZGV4IDEzZjEwZDBl MTNiNWU1M2EwMmU2Mjc5N2M2MWQyNDJhYTUyYWRlYzMuLjYxMWQ5YzRiZDM1MWExMTZjOGZiZDhh ZjY5ODU0ZWM1Y2Q3ZTg3NmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9sYXlv dXR0cmVlL0xheW91dENvbnRhaW5lckJveC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9s YXlvdXR0cmVlL0xheW91dENvbnRhaW5lckJveC5oCkBAIC0zOSw3ICszOSw3IEBAIG5hbWVzcGFj ZSBMYXlvdXQgewogY2xhc3MgQ29udGFpbmVyQm94IDogcHVibGljIEJveCB7CiAgICAgV1RGX01B S0VfSVNPX0FMTE9DQVRFRChDb250YWluZXJCb3gpOwogcHVibGljOgotICAgIENvbnRhaW5lckJv eChPcHRpb25hbDxFbGVtZW50QXR0cmlidXRlcz4sIFJlbmRlclN0eWxlJiYsIEJhc2VUeXBlRmxh Z3MgPSBCb3g6OkNvbnRhaW5lckJveEZsYWcpOworICAgIENvbnRhaW5lckJveChPcHRpb25hbDxF bGVtZW50QXR0cmlidXRlcz4sIFJlbmRlclN0eWxlJiYsIE9wdGlvblNldDxCYXNlVHlwZUZsYWc+ ID0geyBDb250YWluZXJCb3hGbGFnIH0pOwogCiAgICAgY29uc3QgQm94KiBmaXJzdENoaWxkKCkg Y29uc3QgeyByZXR1cm4gbV9maXJzdENoaWxkOyB9CiAgICAgY29uc3QgQm94KiBmaXJzdEluRmxv d0NoaWxkKCkgY29uc3Q7Cg==