213250 2020-06-16 08:35:52 -0700 [LFC][Float] Move float avoiders' final position compute next to when the static position is computed 2020-06-17 09:25:18 -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 1663102 0 zalan 2020-06-16 08:35:52 -0700 now that we removed height dependency. 1663103 1 402008 zalan 2020-06-16 08:40:26 -0700 Created attachment 402008 Patch 1663531 2 ews-feeder 2020-06-17 09:24:38 -0700 Committed r263155: <https://trac.webkit.org/changeset/263155> All reviewed patches have been landed. Closing bug and clearing flags on attachment 402008. 1663532 3 webkit-bug-importer 2020-06-17 09:25:18 -0700 <rdar://problem/64451086> 402008 2020-06-16 08:40:26 -0700 2020-06-17 09:24:39 -0700 Patch bug-213250-20200616084025.patch text/plain 9083 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjYyNDE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWIxZGUwZDgzNmNmNTBk NzFkNDM0YWFmZTU1YjYyOTlhZmZmNDYyNC4uM2Y5ODQxMTg3YzUxNjQxMTMwYzAzMzYyZTEyNmU1 MzcyODU4OGE2YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIwLTA2LTE2ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bRmxvYXRdIE1vdmUg ZmxvYXQgYXZvaWRlcnMnIGZpbmFsIHBvc2l0aW9uIGNvbXB1dGUgbmV4dCB0byB3aGVuIHRoZSBz dGF0aWMgcG9zaXRpb24gaXMgY29tcHV0ZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIxMzI1MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIE5vdyB0aGF0IHRoZSBmbG9hdCBhdm9pZGVyJ3MgZmluYWwgcG9z aXRpb24gaGFzIG5vIGRlcGVuZGVjeSBvbiB0aGUgY29tcHV0ZWQgaGVpZ2h0LCB3ZSBjYW4KKyAg ICAgICAgbW92ZSBpdCBhbGwgdGhlIHdheSB1cCwgbmV4dCB0byB3aGVyZSB3ZSBjb21wdXRlZCB0 aGUgc3RhdGljIHBvc2l0aW9uLgorCisgICAgICAgICogbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9C bG9ja0Zvcm1hdHRpbmdDb250ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6Qmxv Y2tGb3JtYXR0aW5nQ29udGV4dDo6bGF5b3V0SW5GbG93Q29udGVudCk6CisgICAgICAgIChXZWJD b3JlOjpMYXlvdXQ6OkJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVQb3NpdGlvblRvQXZv aWRGbG9hdHMpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpCbG9ja0Zvcm1hdHRpbmdDb250 ZXh0Ojpjb21wdXRlSGVpZ2h0QW5kTWFyZ2luKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6 QmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6cHJlY29tcHV0ZVZlcnRpY2FsUG9zaXRpb25Gb3JBbmNl c3RvcnMpOiBEZWxldGVkLgorICAgICAgICAqIGxheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tG b3JtYXR0aW5nQ29udGV4dC5oOgorCiAyMDIwLTA2LTE2ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBh cHBsZS5jb20+CiAKICAgICAgICAgW0xGQ11bRmxvYXRzXSBSZW1vdmUgcmVkdW5kYW50IG1hcHBp bmcgZnVuY3Rpb25zCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3Jt YXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0LmNwcAppbmRleCA0ZmY3YzQx OTE1MGVmZDBjYTM0YThlYzdiMmE5YzBmY2NhMzVjYTRmLi4wMWE1Y2VkZDYwNDkyOWFhN2JiNjQz YjY4NDZkMzIzZDMyZmE4ZDNmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxv Y2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5jcHAKQEAg LTExMyw2ICsxMTMsNyBAQCB2b2lkIEJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6OmxheW91dEluRmxv d0NvbnRlbnQoSW52YWxpZGF0aW9uU3RhdGUmIGludmFsaWRhdGlvbgogICAgICAgICAgICAgY29t cHV0ZVN0YXRpY1ZlcnRpY2FsUG9zaXRpb24obGF5b3V0Qm94LCBjb250YWluaW5nQmxvY2tDb25z dHJhaW50cy52ZXJ0aWNhbCk7CiAgICAgICAgICAgICBjb21wdXRlV2lkdGhBbmRNYXJnaW4oZmxv YXRpbmdDb250ZXh0LCBsYXlvdXRCb3gsIHsgY29uc3RyYWludHMsIGNvbnRhaW5pbmdCbG9ja0Nv bnN0cmFpbnRzIH0pOwogICAgICAgICAgICAgY29tcHV0ZVN0YXRpY0hvcml6b250YWxQb3NpdGlv bihsYXlvdXRCb3gsIGNvbnRhaW5pbmdCbG9ja0NvbnN0cmFpbnRzLmhvcml6b250YWwpOworICAg ICAgICAgICAgY29tcHV0ZVBvc2l0aW9uVG9Bdm9pZEZsb2F0cyhmbG9hdGluZ0NvbnRleHQsIGxh eW91dEJveCwgeyBjb25zdHJhaW50cywgY29udGFpbmluZ0Jsb2NrQ29uc3RyYWludHMgfSk7CiAK ICAgICAgICAgICAgIGlmIChsYXlvdXRCb3guZXN0YWJsaXNoZXNGb3JtYXR0aW5nQ29udGV4dCgp KSB7CiAgICAgICAgICAgICAgICAgaWYgKGlzPENvbnRhaW5lckJveD4obGF5b3V0Qm94KSAmJiBk b3duY2FzdDxDb250YWluZXJCb3g+KGxheW91dEJveCkuaGFzSW5GbG93T3JGbG9hdGluZ0NoaWxk KCkpIHsKQEAgLTEyMCwxMiArMTIxLDYgQEAgdm9pZCBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0Ojps YXlvdXRJbkZsb3dDb250ZW50KEludmFsaWRhdGlvblN0YXRlJiBpbnZhbGlkYXRpb24KICAgICAg ICAgICAgICAgICAgICAgaWYgKGNvbnRhaW5lckJveC5lc3RhYmxpc2hlc0lubGluZUZvcm1hdHRp bmdDb250ZXh0KCkpIHsKICAgICAgICAgICAgICAgICAgICAgICAgIC8vIElGQ3MgaW5oZXJpdCBm bG9hdHMgZnJvbSBwYXJlbnQgRkNzLiBXZSBuZWVkIGZpbmFsIHZlcnRpY2FsIHBvc2l0aW9uIHRv IGZpbmQgaW50cnVkaW5nIGZsb2F0cy4KICAgICAgICAgICAgICAgICAgICAgICAgIHByZWNvbXB1 dGVWZXJ0aWNhbFBvc2l0aW9uRm9yQm94QW5kQW5jZXN0b3JzKGNvbnRhaW5lckJveCwgeyBjb25z dHJhaW50cywgY29udGFpbmluZ0Jsb2NrQ29uc3RyYWludHMgfSk7Ci0gICAgICAgICAgICAgICAg ICAgICAgICBpZiAoY29udGFpbmVyQm94Lmhhc0Zsb2F0Q2xlYXIoKSkgewotICAgICAgICAgICAg ICAgICAgICAgICAgICAgIC8vIFJvb3RzIHdpdGggY2xlYXIgc2V0IGFyZSBzcGVjaWFsIGJlY2F1 c2UgdGhleSBib3RoIGluaGVyaXQgZmxvYXRzIGJ1dCBhdm9pZCB0aGVtIHRoZSBzYW1lIHRpbWUu IAotICAgICAgICAgICAgICAgICAgICAgICAgICAgIC8vIElmIHdlIGp1c3QgbGV0IHRoZSByb290 IHNpdCBhdCB0aGUgcHJlLWNvbXB1dGVkIHN0YXRpYyB2ZXJ0aWNhbCBwb3NpdGlvbiwgd2UgbWln aHQgZmluZCB1bnJlbGF0ZWQKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAvLyBmbG9hdCBi b3hlcyB0aGVyZSAoYm94ZXMgdGhhdCB3ZSBuZWVkIHRvIGNsZWFyKS4KLSAgICAgICAgICAgICAg ICAgICAgICAgICAgICBjb21wdXRlVmVydGljYWxQb3NpdGlvbkZvckZsb2F0Q2xlYXIoZmxvYXRp bmdDb250ZXh0LCBjb250YWluZXJCb3gpOwotICAgICAgICAgICAgICAgICAgICAgICAgfQogICAg ICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgICAgIC8vIExheW91dCB0aGUgaW5m bG93IGRlc2NlbmRhbnRzIG9mIHRoaXMgZm9ybWF0dGluZyBjb250ZXh0IHJvb3QuCiAgICAgICAg ICAgICAgICAgICAgIExheW91dENvbnRleHQ6OmNyZWF0ZUZvcm1hdHRpbmdDb250ZXh0KGNvbnRh aW5lckJveCwgbGF5b3V0U3RhdGUoKSktPmxheW91dEluRmxvd0NvbnRlbnQoaW52YWxpZGF0aW9u U3RhdGUsIGdlb21ldHJ5KCkuY29uc3RyYWludHNGb3JJbkZsb3dDb250ZW50KGNvbnRhaW5lckJv eCkpOwpAQCAtMTQzLDYgKzEzOCw4IEBAIHZvaWQgQmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6bGF5 b3V0SW5GbG93Q29udGVudChJbnZhbGlkYXRpb25TdGF0ZSYgaW52YWxpZGF0aW9uCiAKICAgICAg ICAgICAgIC8vIEFsbCBpbmZsb3cgZGVzY2VuZGFudHMgKGlmIHRoZXJlIGFyZSBhbnkpIGFyZSBs YWlkIG91dCBieSBub3cuIExldCdzIGNvbXB1dGUgdGhlIGJveCdzIGhlaWdodC4KICAgICAgICAg ICAgIGNvbXB1dGVIZWlnaHRBbmRNYXJnaW4obGF5b3V0Qm94LCBjb250YWluaW5nQmxvY2tDb25z dHJhaW50cyk7CisgICAgICAgICAgICBpZiAobGF5b3V0Qm94LmlzRmxvYXRpbmdQb3NpdGlvbmVk KCkpCisgICAgICAgICAgICAgICAgZmxvYXRpbmdDb250ZXh0LmFwcGVuZChsYXlvdXRCb3gpOwog CiAgICAgICAgICAgICBhdXRvIGVzdGFibGlzaGVzRm9ybWF0dGluZ0NvbnRleHQgPSBsYXlvdXRC b3guZXN0YWJsaXNoZXNGb3JtYXR0aW5nQ29udGV4dCgpOyAKICAgICAgICAgICAgIGlmIChlc3Rh Ymxpc2hlc0Zvcm1hdHRpbmdDb250ZXh0KSB7CkBAIC0xNTIsMTIgKzE0OSw2IEBAIHZvaWQgQmxv Y2tGb3JtYXR0aW5nQ29udGV4dDo6bGF5b3V0SW5GbG93Q29udGVudChJbnZhbGlkYXRpb25TdGF0 ZSYgaW52YWxpZGF0aW9uCiAgICAgICAgICAgICAgICAgICAgIExheW91dENvbnRleHQ6OmNyZWF0 ZUZvcm1hdHRpbmdDb250ZXh0KGNvbnRhaW5lckJveCwgbGF5b3V0U3RhdGUoKSktPmxheW91dE91 dE9mRmxvd0NvbnRlbnQoaW52YWxpZGF0aW9uU3RhdGUsIGdlb21ldHJ5KCkuY29uc3RyYWludHNG b3JPdXRPZkZsb3dDb250ZW50KGNvbnRhaW5lckJveCkpOwogICAgICAgICAgICAgICAgIH0KICAg ICAgICAgICAgIH0KLSAgICAgICAgICAgIC8vIFJlc29sdmUgZmluYWwgcG9zaXRpb25zLgotICAg ICAgICAgICAgaWYgKGxheW91dEJveC5pc0Zsb2F0QXZvaWRlcigpKSB7Ci0gICAgICAgICAgICAg ICAgY29tcHV0ZVBvc2l0aW9uVG9Bdm9pZEZsb2F0cyhmbG9hdGluZ0NvbnRleHQsIGxheW91dEJv eCwgeyBjb25zdHJhaW50cywgY29udGFpbmluZ0Jsb2NrQ29uc3RyYWludHMgfSk7Ci0gICAgICAg ICAgICAgICAgaWYgKGxheW91dEJveC5pc0Zsb2F0aW5nUG9zaXRpb25lZCgpKQotICAgICAgICAg ICAgICAgICAgICBmbG9hdGluZ0NvbnRleHQuYXBwZW5kKGxheW91dEJveCk7Ci0gICAgICAgICAg ICB9CiAgICAgICAgICAgICBpZiAoIWVzdGFibGlzaGVzRm9ybWF0dGluZ0NvbnRleHQgJiYgaXM8 Q29udGFpbmVyQm94PihsYXlvdXRCb3gpKQogICAgICAgICAgICAgICAgIHBsYWNlSW5GbG93UG9z aXRpb25lZENoaWxkcmVuKGRvd25jYXN0PENvbnRhaW5lckJveD4obGF5b3V0Qm94KSwgY29udGFp bmluZ0Jsb2NrQ29uc3RyYWludHMuaG9yaXpvbnRhbCk7CiAKQEAgLTIzMywxMiArMjI0LDYgQEAg dm9pZCBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlU3RhdGljSG9yaXpvbnRhbFBvc2l0 aW9uKGNvbnN0IEJveCYgbGF5b3V0Qm8KICAgICBmb3JtYXR0aW5nU3RhdGUoKS5kaXNwbGF5Qm94 KGxheW91dEJveCkuc2V0TGVmdChnZW9tZXRyeSgpLnN0YXRpY0hvcml6b250YWxQb3NpdGlvbihs YXlvdXRCb3gsIGhvcml6b250YWxDb25zdHJhaW50cykpOwogfQogCi12b2lkIEJsb2NrRm9ybWF0 dGluZ0NvbnRleHQ6OnByZWNvbXB1dGVWZXJ0aWNhbFBvc2l0aW9uRm9yQW5jZXN0b3JzKGNvbnN0 IEJveCYgbGF5b3V0Qm94LCBjb25zdCBDb25zdHJhaW50c1BhaXImIGNvbnN0cmFpbnRzUGFpcikK LXsKLSAgICBBU1NFUlQobGF5b3V0Qm94LmlzRmxvYXRBdm9pZGVyKCkpOwotICAgIHByZWNvbXB1 dGVWZXJ0aWNhbFBvc2l0aW9uRm9yQm94QW5kQW5jZXN0b3JzKGxheW91dEJveC5jb250YWluaW5n QmxvY2soKSwgY29uc3RyYWludHNQYWlyKTsKLX0KLQogdm9pZCBCbG9ja0Zvcm1hdHRpbmdDb250 ZXh0OjpwcmVjb21wdXRlVmVydGljYWxQb3NpdGlvbkZvckJveEFuZEFuY2VzdG9ycyhjb25zdCBC b3gmIGxheW91dEJveCwgY29uc3QgQ29uc3RyYWludHNQYWlyJiBjb25zdHJhaW50c1BhaXIpCiB7 CiAgICAgLy8gSW4gb3JkZXIgdG8gZmlndXJlIG91dCB3aGV0aGVyIGEgYm94IHNob3VsZCBhdm9p ZCBhIGZsb2F0LCB3ZSBuZWVkIHRvIGtub3cgdGhlIGZpbmFsIHBvc2l0aW9ucyBvZiBib3RoIChp Z25vcmUgcmVsYXRpdmUgcG9zaXRpb25pbmcgZm9yIG5vdykuCkBAIC0yNzcsMjAgKzI2MiwyMSBA QCB2b2lkIEJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6OnByZWNvbXB1dGVWZXJ0aWNhbFBvc2l0aW9u Rm9yQm94QW5kQW5jZXN0b3JzKGNvbnN0CiAKIHZvaWQgQmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6 Y29tcHV0ZVBvc2l0aW9uVG9Bdm9pZEZsb2F0cyhjb25zdCBGbG9hdGluZ0NvbnRleHQmIGZsb2F0 aW5nQ29udGV4dCwgY29uc3QgQm94JiBsYXlvdXRCb3gsIGNvbnN0IENvbnN0cmFpbnRzUGFpciYg Y29uc3RyYWludHNQYWlyKQogewotICAgIEFTU0VSVChsYXlvdXRCb3guaXNGbG9hdEF2b2lkZXIo KSk7CisgICAgaWYgKCFsYXlvdXRCb3guaXNGbG9hdEF2b2lkZXIoKSkKKyAgICAgICAgcmV0dXJu OwogICAgIC8vIEluIG9yZGVyIHRvIHBvc2l0aW9uIGEgZmxvYXQgYXZvaWRlciB3ZSBuZWVkIHRv IGtub3cgaXRzIHZlcnRpY2FsIHBvc2l0aW9uIHJlbGF0aXZlIHRvIGl0cyBmb3JtYXR0aW5nIGNv bnRleHQgcm9vdCAoYW5kIG5vdCBqdXN0IGl0cyBjb250YWluaW5nIGJsb2NrKSwKICAgICAvLyBi ZWNhdXNlIGFsbCB0aGUgYWxyZWFkeS1wbGFjZWQgZmxvYXRzIChmbG9hdHMgdGhhdCB3ZSBhcmUg dHJ5aW5nIHRvIGF2b2lkIGhlcmUpIGluIHRoaXMgQkZDIG1pZ2h0IGJlbG9uZwogICAgIC8vIHRv IGEgZGlmZmVyZW50IHNldCBvZiBjb250YWluaW5nIGJsb2NrcyAoYnV0IHRoZXkgYWxsIGRlc2Nl bmRhbnRzIG9mIHRoZSBCRkMgcm9vdCkuCiAgICAgLy8gSG93ZXZlciBhY2NvcmRpbmcgdG8gdGhl IEJGQyBydWxlcywgYXQgdGhpcyBwb2ludCBvZiB0aGUgbGF5b3V0IGZsb3cgd2UgZG9uJ3QgeWV0 IGhhdmUgY29tcHV0ZWQgdmVydGljYWwgcG9zaXRpb25zIGZvciB0aGUgYW5jZXN0b3JzLgogICAg IGlmIChsYXlvdXRCb3guaXNGbG9hdGluZ1Bvc2l0aW9uZWQoKSkgewotICAgICAgICBwcmVjb21w dXRlVmVydGljYWxQb3NpdGlvbkZvckFuY2VzdG9ycyhsYXlvdXRCb3gsIGNvbnN0cmFpbnRzUGFp cik7CisgICAgICAgIHByZWNvbXB1dGVWZXJ0aWNhbFBvc2l0aW9uRm9yQm94QW5kQW5jZXN0b3Jz KGxheW91dEJveCwgY29uc3RyYWludHNQYWlyKTsKICAgICAgICAgZm9ybWF0dGluZ1N0YXRlKCku ZGlzcGxheUJveChsYXlvdXRCb3gpLnNldFRvcExlZnQoZmxvYXRpbmdDb250ZXh0LnBvc2l0aW9u Rm9yRmxvYXQobGF5b3V0Qm94LCBjb25zdHJhaW50c1BhaXIuY29udGFpbmluZ0Jsb2NrLmhvcml6 b250YWwpKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KICAgICAvLyBOb24tZmxvYXQgcG9zaXRp b25lZCBmbG9hdCBhdm9pZGVycyAoZm9ybWF0dGluZyBjb250ZXh0IHJvb3RzIGFuZCBjbGVhciBi b3hlcykgc2hvdWxkIGJlIGZpbmUgdW5sZXNzIHRoZXJlIGFyZSBmbG9hdHMgaW4gdGhpcyBjb250 ZXh0LgogICAgIGlmIChmbG9hdGluZ0NvbnRleHQuaXNFbXB0eSgpKQogICAgICAgICByZXR1cm47 Ci0gICAgcHJlY29tcHV0ZVZlcnRpY2FsUG9zaXRpb25Gb3JBbmNlc3RvcnMobGF5b3V0Qm94LCBj b25zdHJhaW50c1BhaXIpOworICAgIHByZWNvbXB1dGVWZXJ0aWNhbFBvc2l0aW9uRm9yQm94QW5k QW5jZXN0b3JzKGxheW91dEJveCwgY29uc3RyYWludHNQYWlyKTsKICAgICBpZiAobGF5b3V0Qm94 Lmhhc0Zsb2F0Q2xlYXIoKSkKICAgICAgICAgcmV0dXJuIGNvbXB1dGVWZXJ0aWNhbFBvc2l0aW9u Rm9yRmxvYXRDbGVhcihmbG9hdGluZ0NvbnRleHQsIGxheW91dEJveCk7CiAKQEAgLTM5Nyw3ICsz ODMsMTAgQEAgdm9pZCBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlSGVpZ2h0QW5kTWFy Z2luKGNvbnN0IEJveCYgbGF5b3V0Qm94LCBjb25zdAogICAgIH0KICNlbmRpZgogICAgIGF1dG8m IGRpc3BsYXlCb3ggPSBmb3JtYXR0aW5nU3RhdGUoKS5kaXNwbGF5Qm94KGxheW91dEJveCk7Ci0g ICAgZGlzcGxheUJveC5zZXRUb3AodmVydGljYWxQb3NpdGlvbldpdGhNYXJnaW4obGF5b3V0Qm94 LCB2ZXJ0aWNhbE1hcmdpbiwgY29uc3RyYWludHMudmVydGljYWwpKTsKKyAgICBpZiAoIWxheW91 dEJveC5pc0Zsb2F0QXZvaWRlcigpKSB7CisgICAgICAgIC8vIEZsb2F0IGF2b2lkZXJzIGhhdmUg cHJlLWNvbXB1dGVkIHZlcnRpY2FsIG1hcmdpbnMuCisgICAgICAgIGRpc3BsYXlCb3guc2V0VG9w KHZlcnRpY2FsUG9zaXRpb25XaXRoTWFyZ2luKGxheW91dEJveCwgdmVydGljYWxNYXJnaW4sIGNv bnN0cmFpbnRzLnZlcnRpY2FsKSk7CisgICAgfQogICAgIGRpc3BsYXlCb3guc2V0Q29udGVudEJv eEhlaWdodChjb250ZW50SGVpZ2h0QW5kTWFyZ2luLmNvbnRlbnRIZWlnaHQpOwogICAgIGRpc3Bs YXlCb3guc2V0VmVydGljYWxNYXJnaW4odmVydGljYWxNYXJnaW4pOwogICAgIC8vIEFkanVzdCB0 aGUgcHJldmlvdXMgc2libGluZydzIG1hcmdpbiBib3R0b20gbm93IHRoYXQgdGhpcyBib3gncyB2 ZXJ0aWNhbCBtYXJnaW4gaXMgY29tcHV0ZWQuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuaCBiL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5oCmlu ZGV4IDEyZDFhZWFkN2FiMjIwMDFkZGZlMjZkMTViNjAwYTI4NTQ3ZDRjMzkuLjk4M2YyNjFjMWM3 MTIzZDUxMWJkMTE2OTg5MzM0OGQ2Y2Y3MTIzYWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5oCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4 dC5oCkBAIC02NSw3ICs2NSw2IEBAIHByb3RlY3RlZDoKICAgICB2b2lkIGNvbXB1dGVQb3NpdGlv blRvQXZvaWRGbG9hdHMoY29uc3QgRmxvYXRpbmdDb250ZXh0JiwgY29uc3QgQm94JiwgY29uc3Qg Q29uc3RyYWludHNQYWlyJik7CiAgICAgdm9pZCBjb21wdXRlVmVydGljYWxQb3NpdGlvbkZvckZs b2F0Q2xlYXIoY29uc3QgRmxvYXRpbmdDb250ZXh0JiwgY29uc3QgQm94Jik7CiAKLSAgICB2b2lk IHByZWNvbXB1dGVWZXJ0aWNhbFBvc2l0aW9uRm9yQW5jZXN0b3JzKGNvbnN0IEJveCYsIGNvbnN0 IENvbnN0cmFpbnRzUGFpciYpOwogICAgIHZvaWQgcHJlY29tcHV0ZVZlcnRpY2FsUG9zaXRpb25G b3JCb3hBbmRBbmNlc3RvcnMoY29uc3QgQm94JiwgY29uc3QgQ29uc3RyYWludHNQYWlyJik7CiAK ICAgICBJbnRyaW5zaWNXaWR0aENvbnN0cmFpbnRzIGNvbXB1dGVkSW50cmluc2ljV2lkdGhDb25z dHJhaW50cygpIG92ZXJyaWRlOwo=