216502 2020-09-14 16:34:31 -0700 [LFC][FFC] Block box flex items establish block formatting contexts 2020-09-14 17:41:16 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham simon.fraser webkit-bug-importer zalan oldest_to_newest 1688468 0 zalan 2020-09-14 16:34:31 -0700 1. A block box that establishes an independent formatting context establishes a new block formatting context for its contents. 2. The display value of a flex item is blockified: if the specified display of an in-flow child of an element generating a flex container is an inline-level value, it computes to its block-level equivalent. 1688472 1 408760 zalan 2020-09-14 16:40:51 -0700 Created attachment 408760 Patch 1688475 2 408760 simon.fraser 2020-09-14 16:47:05 -0700 Comment on attachment 408760 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=408760&action=review > Source/WebCore/layout/layouttree/LayoutBox.h:108 > bool isBlockLevelBox() const; > + bool isBlockBox() const; I think a comment is justified to explain the different between BlockLevelBox and BlockBox 1688477 3 zalan 2020-09-14 16:51:56 -0700 (In reply to Simon Fraser (smfr) from comment #2) > Comment on attachment 408760 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=408760&action=review > > > Source/WebCore/layout/layouttree/LayoutBox.h:108 > > bool isBlockLevelBox() const; > > + bool isBlockBox() const; > > I think a comment is justified to explain the different between > BlockLevelBox and BlockBox I can copy&paste them from the .cpp (these are all spec terms btw). 1688482 4 408763 zalan 2020-09-14 17:01:34 -0700 Created attachment 408763 Patch 1688507 5 ews-feeder 2020-09-14 17:40:23 -0700 Committed r267059: <https://trac.webkit.org/changeset/267059> All reviewed patches have been landed. Closing bug and clearing flags on attachment 408763. 1688509 6 webkit-bug-importer 2020-09-14 17:41:16 -0700 <rdar://problem/68889640> 408760 2020-09-14 16:40:51 -0700 2020-09-14 17:01:33 -0700 Patch bug-216502-20200914164050.patch text/plain 3549 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjY3MDE0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGMzMmFjOTQ3YTQxZDNj MTUyNmEwY2Y2YTliNDg5NmM0OWZmMTNkMi4uOWYyMzE4NTQ3ZGNmZDNiNTJjMWNmNDNlMDdiY2Iz YjZlYmVjMTY4ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIwLTA5LTE0ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bRkZDXSBCbG9jayBi b3ggZmxleCBpdGVtcyBlc3RhYmxpc2ggYmxvY2sgZm9ybWF0dGluZyBjb250ZXh0cworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE2NTAyCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgMS4gVGhlIGRpc3BsYXkg dmFsdWUgb2YgYSBmbGV4IGl0ZW0gaXMgYmxvY2tpZmllZDogaWYgdGhlIHNwZWNpZmllZCBkaXNw bGF5IG9mIGFuIGluLWZsb3cgY2hpbGQgb2YgYW4gZWxlbWVudAorICAgICAgICAgICBnZW5lcmF0 aW5nIGEgZmxleCBjb250YWluZXIgaXMgYW4gaW5saW5lLWxldmVsIHZhbHVlLCBpdCBjb21wdXRl cyB0byBpdHMgYmxvY2stbGV2ZWwgZXF1aXZhbGVudC4KKyAgICAgICAgMi4gQSBibG9jayBib3gg dGhhdCBlc3RhYmxpc2hlcyBhbiBpbmRlcGVuZGVudCBmb3JtYXR0aW5nIGNvbnRleHQgZXN0YWJs aXNoZXMgYSBuZXcgYmxvY2sgZm9ybWF0dGluZyBjb250ZXh0IGZvciBpdHMgY29udGVudHMuCisK KyAgICAgICAgKiBsYXlvdXQvbGF5b3V0dHJlZS9MYXlvdXRCb3guY3BwOgorICAgICAgICAoV2Vi Q29yZTo6TGF5b3V0OjpCb3g6OmVzdGFibGlzaGVzQmxvY2tGb3JtYXR0aW5nQ29udGV4dCBjb25z dCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkJveDo6aXNCbG9ja0JveCBjb25zdCk6Cisg ICAgICAgICogbGF5b3V0L2xheW91dHRyZWUvTGF5b3V0Qm94Lmg6CisKIDIwMjAtMDktMTQgIFph bGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZDXVtGRkNdIEVhY2gg aW4tZmxvdyBjaGlsZCBvZiBhIGZsZXggY29udGFpbmVyIGJlY29tZXMgYSBmbGV4IGl0ZW0uCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvbGF5b3V0dHJlZS9MYXlvdXRCb3guY3Bw IGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2xheW91dHRyZWUvTGF5b3V0Qm94LmNwcAppbmRleCBi YzNjMmFiNmRhZDg4ZmNkYTFlM2M1ZTZhMGUxNjU5MjUxNjc4YTIwLi4yMzdiYjA4NmI3ZjE0ZGE1 YjljOTA2NDc0ZGVmZjU0NTFhMjZlNTU4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvbGF5b3V0dHJlZS9MYXlvdXRCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9s YXlvdXR0cmVlL0xheW91dEJveC5jcHAKQEAgLTgxLDExICs4MSwxNSBAQCBib29sIEJveDo6ZXN0 YWJsaXNoZXNCbG9ja0Zvcm1hdHRpbmdDb250ZXh0KCkgY29uc3QKICAgICBpZiAoaXNUYWJsZVdy YXBwZXJCb3goKSkKICAgICAgICAgcmV0dXJuIHRydWU7CiAKKyAgICAvLyBBIGJsb2NrIGJveCB0 aGF0IGVzdGFibGlzaGVzIGFuIGluZGVwZW5kZW50IGZvcm1hdHRpbmcgY29udGV4dCBlc3RhYmxp c2hlcyBhIG5ldyBibG9jayBmb3JtYXR0aW5nIGNvbnRleHQgZm9yIGl0cyBjb250ZW50cy4KKyAg ICBpZiAoaXNCbG9ja0JveCgpICYmIGVzdGFibGlzaGVzSW5kZXBlbmRlbnRGb3JtYXR0aW5nQ29u dGV4dCgpKQorICAgICAgICByZXR1cm4gdHJ1ZTsKKwogICAgIC8vIDkuNC4xIEJsb2NrIGZvcm1h dHRpbmcgY29udGV4dHMKICAgICAvLyBGbG9hdHMsIGFic29sdXRlbHkgcG9zaXRpb25lZCBlbGVt ZW50cywgYmxvY2sgY29udGFpbmVycyAoc3VjaCBhcyBpbmxpbmUtYmxvY2tzLCB0YWJsZS1jZWxs cywgYW5kIHRhYmxlLWNhcHRpb25zKQogICAgIC8vIHRoYXQgYXJlIG5vdCBibG9jayBib3hlcywg YW5kIGJsb2NrIGJveGVzIHdpdGggJ292ZXJmbG93JyBvdGhlciB0aGFuICd2aXNpYmxlJyAoZXhj ZXB0IHdoZW4gdGhhdCB2YWx1ZSBoYXMgYmVlbiBwcm9wYWdhdGVkIHRvIHRoZSB2aWV3cG9ydCkK ICAgICAvLyBlc3RhYmxpc2ggbmV3IGJsb2NrIGZvcm1hdHRpbmcgY29udGV4dHMgZm9yIHRoZWly IGNvbnRlbnRzLgotICAgIGlmIChpc0Zsb2F0aW5nUG9zaXRpb25lZCgpIHx8IGlzQWJzb2x1dGVs eVBvc2l0aW9uZWQoKSkgeworICAgIGlmIChpc0Zsb2F0aW5nUG9zaXRpb25lZCgpKSB7CiAgICAg ICAgIC8vIE5vdCBhbGwgZmxvYXRpbmcgb3Igb3V0LW9mLXBvc2l0aW9uZWQgYmxvY2sgbGV2ZWwg Ym94ZXMgZXN0YWJsaXNoIEJGQy4KICAgICAgICAgLy8gU2VlIFs5LjcgUmVsYXRpb25zaGlwcyBi ZXR3ZWVuICdkaXNwbGF5JywgJ3Bvc2l0aW9uJywgYW5kICdmbG9hdCddIGZvciBkZXRhaWxzLgog ICAgICAgICByZXR1cm4gc3R5bGUoKS5kaXNwbGF5KCkgPT0gRGlzcGxheVR5cGU6OkJsb2NrOwpA QCAtMjk0LDYgKzI5OCwxMiBAQCBib29sIEJveDo6aXNCbG9ja0xldmVsQm94KCkgY29uc3QKICAg ICByZXR1cm4gZGlzcGxheSA9PSBEaXNwbGF5VHlwZTo6QmxvY2sgfHwgZGlzcGxheSA9PSBEaXNw bGF5VHlwZTo6TGlzdEl0ZW0gfHwgZGlzcGxheSA9PSBEaXNwbGF5VHlwZTo6VGFibGU7CiB9CiAK K2Jvb2wgQm94Ojppc0Jsb2NrQm94KCkgY29uc3QKK3sKKyAgICAvLyBBIGJsb2NrLWxldmVsIGJv eCB0aGF0IGlzIGFsc28gYSBibG9jayBjb250YWluZXIuCisgICAgcmV0dXJuIGlzQmxvY2tMZXZl bEJveCgpICYmIGlzQmxvY2tDb250YWluZXJCb3goKTsKK30KKwogYm9vbCBCb3g6OmlzSW5saW5l TGV2ZWxCb3goKSBjb25zdAogewogICAgIC8vIElubGluZSBsZXZlbCBlbGVtZW50cyBnZW5lcmF0 ZSBpbmxpbmUgbGV2ZWwgYm94ZXMuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv bGF5b3V0dHJlZS9MYXlvdXRCb3guaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9sYXlvdXR0cmVl L0xheW91dEJveC5oCmluZGV4IGZlZGZhZWRlNmE2ZmNlMWYwZmU2MGFiNjUwMGJhMmVkNmZjYzUz MzQuLjRmNmU3ZTJmNDQyOWU2ZjJlMjI5MjM0MmNkYzgwNzRjZGU0NjYxNmUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2xheW91dC9sYXlvdXR0cmVlL0xheW91dEJveC5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9sYXlvdXR0cmVlL0xheW91dEJveC5oCkBAIC0xMDUsNiArMTA1LDcg QEAgcHVibGljOgogICAgIGJvb2wgaXNBbm9ueW1vdXMoKSBjb25zdCB7IHJldHVybiBtX2lzQW5v bnltb3VzOyB9CiAKICAgICBib29sIGlzQmxvY2tMZXZlbEJveCgpIGNvbnN0OworICAgIGJvb2wg aXNCbG9ja0JveCgpIGNvbnN0OwogICAgIGJvb2wgaXNJbmxpbmVMZXZlbEJveCgpIGNvbnN0Owog ICAgIGJvb2wgaXNJbmxpbmVCb3goKSBjb25zdDsKICAgICBib29sIGlzQXRvbWljSW5saW5lTGV2 ZWxCb3goKSBjb25zdDsK 408763 2020-09-14 17:01:34 -0700 2020-09-14 17:40:24 -0700 Patch bug-216502-20200914170134.patch text/plain 5605 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjY3MDE0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGMzMmFjOTQ3YTQxZDNj MTUyNmEwY2Y2YTliNDg5NmM0OWZmMTNkMi4uYjA3ODZjYjA3OWZjZjdlYmNjZTVjMDRlZGIzNTdk M2YyNjRlMjVmZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIwLTA5LTE0ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bRkZDXSBCbG9jayBi b3ggZmxleCBpdGVtcyBlc3RhYmxpc2ggYmxvY2sgZm9ybWF0dGluZyBjb250ZXh0cworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE2NTAyCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgU2ltb24gRnJhc2VyLgorCisgICAgICAgIDEuIFRoZSBkaXNwbGF5IHZh bHVlIG9mIGEgZmxleCBpdGVtIGlzIGJsb2NraWZpZWQ6IGlmIHRoZSBzcGVjaWZpZWQgZGlzcGxh eSBvZiBhbiBpbi1mbG93IGNoaWxkIG9mIGFuIGVsZW1lbnQKKyAgICAgICAgICAgZ2VuZXJhdGlu ZyBhIGZsZXggY29udGFpbmVyIGlzIGFuIGlubGluZS1sZXZlbCB2YWx1ZSwgaXQgY29tcHV0ZXMg dG8gaXRzIGJsb2NrLWxldmVsIGVxdWl2YWxlbnQuCisgICAgICAgIDIuIEEgYmxvY2sgYm94IHRo YXQgZXN0YWJsaXNoZXMgYW4gaW5kZXBlbmRlbnQgZm9ybWF0dGluZyBjb250ZXh0IGVzdGFibGlz aGVzIGEgbmV3IGJsb2NrIGZvcm1hdHRpbmcgY29udGV4dCBmb3IgaXRzIGNvbnRlbnRzLgorCisg ICAgICAgICogbGF5b3V0L2xheW91dHRyZWUvTGF5b3V0Qm94LmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkxheW91dDo6Qm94Ojplc3RhYmxpc2hlc0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQgY29uc3Qp OgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpCb3g6OmlzQmxvY2tCb3ggY29uc3QpOgorICAg ICAgICAqIGxheW91dC9sYXlvdXR0cmVlL0xheW91dEJveC5oOgorCiAyMDIwLTA5LTE0ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW0xGQ11bRkZDXSBFYWNoIGlu LWZsb3cgY2hpbGQgb2YgYSBmbGV4IGNvbnRhaW5lciBiZWNvbWVzIGEgZmxleCBpdGVtLgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2xheW91dHRyZWUvTGF5b3V0Qm94LmNwcCBi L1NvdXJjZS9XZWJDb3JlL2xheW91dC9sYXlvdXR0cmVlL0xheW91dEJveC5jcHAKaW5kZXggYmMz YzJhYjZkYWQ4OGZjZGExZTNjNWU2YTBlMTY1OTI1MTY3OGEyMC4uNGMwZDkxZTQxZDBiYmI5MjIy NjZiY2FlNWVlNmUwZTc3MzEzYzZkOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2xheW91dHRyZWUvTGF5b3V0Qm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvbGF5 b3V0dHJlZS9MYXlvdXRCb3guY3BwCkBAIC04MSwxNyArODEsMjEgQEAgYm9vbCBCb3g6OmVzdGFi bGlzaGVzQmxvY2tGb3JtYXR0aW5nQ29udGV4dCgpIGNvbnN0CiAgICAgaWYgKGlzVGFibGVXcmFw cGVyQm94KCkpCiAgICAgICAgIHJldHVybiB0cnVlOwogCisgICAgLy8gQSBibG9jayBib3ggdGhh dCBlc3RhYmxpc2hlcyBhbiBpbmRlcGVuZGVudCBmb3JtYXR0aW5nIGNvbnRleHQgZXN0YWJsaXNo ZXMgYSBuZXcgYmxvY2sgZm9ybWF0dGluZyBjb250ZXh0IGZvciBpdHMgY29udGVudHMuCisgICAg aWYgKGlzQmxvY2tCb3goKSAmJiBlc3RhYmxpc2hlc0luZGVwZW5kZW50Rm9ybWF0dGluZ0NvbnRl eHQoKSkKKyAgICAgICAgcmV0dXJuIHRydWU7CisKICAgICAvLyA5LjQuMSBCbG9jayBmb3JtYXR0 aW5nIGNvbnRleHRzCiAgICAgLy8gRmxvYXRzLCBhYnNvbHV0ZWx5IHBvc2l0aW9uZWQgZWxlbWVu dHMsIGJsb2NrIGNvbnRhaW5lcnMgKHN1Y2ggYXMgaW5saW5lLWJsb2NrcywgdGFibGUtY2VsbHMs IGFuZCB0YWJsZS1jYXB0aW9ucykKICAgICAvLyB0aGF0IGFyZSBub3QgYmxvY2sgYm94ZXMsIGFu ZCBibG9jayBib3hlcyB3aXRoICdvdmVyZmxvdycgb3RoZXIgdGhhbiAndmlzaWJsZScgKGV4Y2Vw dCB3aGVuIHRoYXQgdmFsdWUgaGFzIGJlZW4gcHJvcGFnYXRlZCB0byB0aGUgdmlld3BvcnQpCiAg ICAgLy8gZXN0YWJsaXNoIG5ldyBibG9jayBmb3JtYXR0aW5nIGNvbnRleHRzIGZvciB0aGVpciBj b250ZW50cy4KLSAgICBpZiAoaXNGbG9hdGluZ1Bvc2l0aW9uZWQoKSB8fCBpc0Fic29sdXRlbHlQ b3NpdGlvbmVkKCkpIHsKKyAgICBpZiAoaXNGbG9hdGluZ1Bvc2l0aW9uZWQoKSkgewogICAgICAg ICAvLyBOb3QgYWxsIGZsb2F0aW5nIG9yIG91dC1vZi1wb3NpdGlvbmVkIGJsb2NrIGxldmVsIGJv eGVzIGVzdGFibGlzaCBCRkMuCiAgICAgICAgIC8vIFNlZSBbOS43IFJlbGF0aW9uc2hpcHMgYmV0 d2VlbiAnZGlzcGxheScsICdwb3NpdGlvbicsIGFuZCAnZmxvYXQnXSBmb3IgZGV0YWlscy4KICAg ICAgICAgcmV0dXJuIHN0eWxlKCkuZGlzcGxheSgpID09IERpc3BsYXlUeXBlOjpCbG9jazsKICAg ICB9CiAKLSAgICBpZiAoaXNCbG9ja0NvbnRhaW5lckJveCgpICYmICFpc0Jsb2NrTGV2ZWxCb3go KSkKKyAgICBpZiAoaXNCbG9ja0NvbnRhaW5lcigpICYmICFpc0Jsb2NrTGV2ZWxCb3goKSkKICAg ICAgICAgcmV0dXJuIHRydWU7CiAKICAgICBpZiAoaXNCbG9ja0xldmVsQm94KCkgJiYgIWlzT3Zl cmZsb3dWaXNpYmxlKCkpCkBAIC0xMDQsNyArMTA4LDcgQEAgYm9vbCBCb3g6OmVzdGFibGlzaGVz SW5saW5lRm9ybWF0dGluZ0NvbnRleHQoKSBjb25zdAogewogICAgIC8vIDkuNC4yIElubGluZSBm b3JtYXR0aW5nIGNvbnRleHRzCiAgICAgLy8gQW4gaW5saW5lIGZvcm1hdHRpbmcgY29udGV4dCBp cyBlc3RhYmxpc2hlZCBieSBhIGJsb2NrIGNvbnRhaW5lciBib3ggdGhhdCBjb250YWlucyBubyBi bG9jay1sZXZlbCBib3hlcy4KLSAgICBpZiAoIWlzQmxvY2tDb250YWluZXJCb3goKSkKKyAgICBp ZiAoIWlzQmxvY2tDb250YWluZXIoKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgaWYg KCFpc0NvbnRhaW5lckJveCgpKQpAQCAtMjA0LDcgKzIwOCw3IEBAIGNvbnN0IENvbnRhaW5lckJv eCYgQm94Ojpjb250YWluaW5nQmxvY2soKSBjb25zdAogICAgIGlmICghaXNQb3NpdGlvbmVkKCkg fHwgaXNJbkZsb3dQb3NpdGlvbmVkKCkpIHsKICAgICAgICAgYXV0byogYW5jZXN0b3IgPSAmcGFy ZW50KCk7CiAgICAgICAgIGZvciAoOyAhaXM8SW5pdGlhbENvbnRhaW5pbmdCbG9jaz4oKmFuY2Vz dG9yKTsgYW5jZXN0b3IgPSAmYW5jZXN0b3ItPnBhcmVudCgpKSB7Ci0gICAgICAgICAgICBpZiAo YW5jZXN0b3ItPmlzQmxvY2tDb250YWluZXJCb3goKSB8fCBhbmNlc3Rvci0+ZXN0YWJsaXNoZXNG b3JtYXR0aW5nQ29udGV4dCgpKQorICAgICAgICAgICAgaWYgKGFuY2VzdG9yLT5pc0Jsb2NrQ29u dGFpbmVyKCkgfHwgYW5jZXN0b3ItPmVzdGFibGlzaGVzRm9ybWF0dGluZ0NvbnRleHQoKSkKICAg ICAgICAgICAgICAgICByZXR1cm4gKmFuY2VzdG9yOwogICAgICAgICB9CiAgICAgICAgIHJldHVy biAqYW5jZXN0b3I7CkBAIC0yOTQsNiArMjk4LDEyIEBAIGJvb2wgQm94Ojppc0Jsb2NrTGV2ZWxC b3goKSBjb25zdAogICAgIHJldHVybiBkaXNwbGF5ID09IERpc3BsYXlUeXBlOjpCbG9jayB8fCBk aXNwbGF5ID09IERpc3BsYXlUeXBlOjpMaXN0SXRlbSB8fCBkaXNwbGF5ID09IERpc3BsYXlUeXBl OjpUYWJsZTsKIH0KIAorYm9vbCBCb3g6OmlzQmxvY2tCb3goKSBjb25zdAoreworICAgIC8vIEEg YmxvY2stbGV2ZWwgYm94IHRoYXQgaXMgYWxzbyBhIGJsb2NrIGNvbnRhaW5lci4KKyAgICByZXR1 cm4gaXNCbG9ja0xldmVsQm94KCkgJiYgaXNCbG9ja0NvbnRhaW5lcigpOworfQorCiBib29sIEJv eDo6aXNJbmxpbmVMZXZlbEJveCgpIGNvbnN0CiB7CiAgICAgLy8gSW5saW5lIGxldmVsIGVsZW1l bnRzIGdlbmVyYXRlIGlubGluZSBsZXZlbCBib3hlcy4KQEAgLTMyMSw3ICszMzEsNyBAQCBib29s IEJveDo6aXNGbGV4SXRlbSgpIGNvbnN0CiAgICAgcmV0dXJuIGlzSW5GbG93KCkgJiYgcGFyZW50 KCkuaXNGbGV4Qm94KCk7CiB9CiAKLWJvb2wgQm94Ojppc0Jsb2NrQ29udGFpbmVyQm94KCkgY29u c3QKK2Jvb2wgQm94Ojppc0Jsb2NrQ29udGFpbmVyKCkgY29uc3QKIHsKICAgICBhdXRvIGRpc3Bs YXkgPSBtX3N0eWxlLmRpc3BsYXkoKTsKICAgICByZXR1cm4gZGlzcGxheSA9PSBEaXNwbGF5VHlw ZTo6QmxvY2sgfHwgZGlzcGxheSA9PSBEaXNwbGF5VHlwZTo6TGlzdEl0ZW0gfHwgaXNJbmxpbmVC bG9ja0JveCgpIHx8IGlzVGFibGVDZWxsKCkgfHwgaXNUYWJsZUNhcHRpb24oKTsgLy8gVE9ETyAm JiAhcmVwbGFjZWQgZWxlbWVudApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2xh eW91dHRyZWUvTGF5b3V0Qm94LmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvbGF5b3V0dHJlZS9M YXlvdXRCb3guaAppbmRleCBmZWRmYWVkZTZhNmZjZTFmMGZlNjBhYjY1MDBiYTJlZDZmY2M1MzM0 Li4wNDAyZmNmNTBlNmY4NTFiZDBhM2YyOTFiYzkyMDFhNzA4MDAzYTNlIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvbGF5b3V0dHJlZS9MYXlvdXRCb3guaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvbGF5b3V0dHJlZS9MYXlvdXRCb3guaApAQCAtMTA0LDEzICsxMDQsMTcg QEAgcHVibGljOgogCiAgICAgYm9vbCBpc0Fub255bW91cygpIGNvbnN0IHsgcmV0dXJuIG1faXNB bm9ueW1vdXM7IH0KIAorICAgIC8vIEJsb2NrIGxldmVsIGVsZW1lbnRzIGdlbmVyYXRlIGJsb2Nr IGxldmVsIGJveGVzLgogICAgIGJvb2wgaXNCbG9ja0xldmVsQm94KCkgY29uc3Q7CisgICAgLy8g QSBibG9jay1sZXZlbCBib3ggdGhhdCBpcyBhbHNvIGEgYmxvY2sgY29udGFpbmVyLgorICAgIGJv b2wgaXNCbG9ja0JveCgpIGNvbnN0OworICAgIC8vIEEgYmxvY2stbGV2ZWwgYm94IGlzIGFsc28g YSBibG9jayBjb250YWluZXIgYm94IHVubGVzcyBpdCBpcyBhIHRhYmxlIGJveCBvciB0aGUgcHJp bmNpcGFsIGJveCBvZiBhIHJlcGxhY2VkIGVsZW1lbnQuCisgICAgYm9vbCBpc0Jsb2NrQ29udGFp bmVyKCkgY29uc3Q7CiAgICAgYm9vbCBpc0lubGluZUxldmVsQm94KCkgY29uc3Q7CiAgICAgYm9v bCBpc0lubGluZUJveCgpIGNvbnN0OwogICAgIGJvb2wgaXNBdG9taWNJbmxpbmVMZXZlbEJveCgp IGNvbnN0OwogICAgIGJvb2wgaXNJbmxpbmVCbG9ja0JveCgpIGNvbnN0OwogICAgIGJvb2wgaXNJ bmxpbmVUYWJsZUJveCgpIGNvbnN0OwotICAgIGJvb2wgaXNCbG9ja0NvbnRhaW5lckJveCgpIGNv bnN0OwogICAgIGJvb2wgaXNJbml0aWFsQ29udGFpbmluZ0Jsb2NrKCkgY29uc3QgeyByZXR1cm4g YmFzZVR5cGVGbGFncygpLmNvbnRhaW5zKEluaXRpYWxDb250YWluaW5nQmxvY2tGbGFnKTsgfQog CiAgICAgYm9vbCBpc0RvY3VtZW50Qm94KCkgY29uc3QgeyByZXR1cm4gbV9lbGVtZW50QXR0cmli dXRlcyAmJiBtX2VsZW1lbnRBdHRyaWJ1dGVzLnZhbHVlKCkuZWxlbWVudFR5cGUgPT0gRWxlbWVu dFR5cGU6OkRvY3VtZW50OyB9Cg==