183730 2018-03-18 09:31:46 -0700 [LayoutReloaded] Collect out-of-flow positioned boxes for a given formatting context. 2018-03-18 09:42:21 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan webkit-bug-importer oldest_to_newest 1407294 0 zalan 2018-03-18 09:31:46 -0700 and run layout on them as the final step. 1407295 1 336025 zalan 2018-03-18 09:39:44 -0700 Created attachment 336025 Patch 1407296 2 zalan 2018-03-18 09:41:51 -0700 Committed r229701: <https://trac.webkit.org/changeset/229701> 1407297 3 webkit-bug-importer 2018-03-18 09:42:21 -0700 <rdar://problem/38597597> 336025 2018-03-18 09:39:44 -0700 2018-03-18 09:39:44 -0700 Patch bug-183730-20180318093944.patch text/plain 15226 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjI5Njk4CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYmJlMTkzNDM3ZDVlOTdlZWFhMDE2NzZmYTJiMGMzZjFk OTMzYzlkNS4uZTAwMTAyN2Y3MjhkNmUwZjQ2M2U1N2E5MmVlYjVlZDdkMzdlMjRkZiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0 IEBACisyMDE4LTAzLTE4ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAg ICAgW0xheW91dFJlbG9hZGVkXSBDb2xsZWN0IG91dC1vZi1mbG93IHBvc2l0aW9uZWQgYm94ZXMg Zm9yIGEgZ2l2ZW4gZm9ybWF0dGluZyBjb250ZXh0LgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTgzNzMwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgQ29sbGVjdCBhbmQgbGF5b3V0IG91dC1vZi1mbG93IHBv c2l0aW9uZWQgYm94ZXMgYXMgdGhlIGZpbmFsIHN0ZXAgb2YgdGhlIGZvcm1hdHRpbmcgY29udGV4 dCBsYXlvdXQuCisKKyAgICAgICAgKiBMYXlvdXRSZWxvYWRlZC9Gb3JtYXR0aW5nQ29udGV4dC9C bG9ja0Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5qczoKKyAgICAgICAgKEJsb2Nr Rm9ybWF0dGluZ0NvbnRleHQucHJvdG90eXBlLmxheW91dCk6CisgICAgICAgIChCbG9ja0Zvcm1h dHRpbmdDb250ZXh0LnByb3RvdHlwZS5fcGxhY2VJbkZsb3dQb3NpdGlvbmVkQ2hpbGRyZW4pOgor ICAgICAgICAoQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5wcm90b3R5cGUuX2xheW91dE91dE9mRmxv d0Rlc2NlbmRhbnRzKToKKyAgICAgICAgKEJsb2NrRm9ybWF0dGluZ0NvbnRleHQucHJvdG90eXBl Ll9wbGFjZVBvc2l0aW9uZWREZXNjZW5kYW50cyk6IERlbGV0ZWQuCisgICAgICAgIChCbG9ja0Zv cm1hdHRpbmdDb250ZXh0LnByb3RvdHlwZS5fcGxhY2VPdXRPZkZsb3dEZXNjZW5kYW50cyk6IERl bGV0ZWQuCisgICAgICAgICogTGF5b3V0UmVsb2FkZWQvRm9ybWF0dGluZ0NvbnRleHQvRm9ybWF0 dGluZ0NvbnRleHQuanM6CisgICAgICAgIChGb3JtYXR0aW5nQ29udGV4dC5wcm90b3R5cGUuX3Rv QWJzb2x1dGVQb3NpdGlvbik6CisgICAgICAgIChGb3JtYXR0aW5nQ29udGV4dC5wcm90b3R5cGUu X291dE9mRmxvd0Rlc2NlbmRhbnRzKToKKyAgICAgICAgKEZvcm1hdHRpbmdDb250ZXh0KToKKyAg ICAgICAgKiBMYXlvdXRSZWxvYWRlZC9MYXlvdXRUcmVlL0JveC5qczoKKyAgICAgICAgKExheW91 dC5Cb3gucHJvdG90eXBlLm5leHRJbkZsb3dPckZsb2F0U2libGluZyk6CisgICAgICAgIChMYXlv dXQuQm94LnByb3RvdHlwZS5pc0Rlc2NlbmRhbnRPZik6CisgICAgICAgICogTGF5b3V0UmVsb2Fk ZWQvTGF5b3V0VHJlZS9Db250YWluZXIuanM6CisgICAgICAgIChMYXlvdXQuQ29udGFpbmVyLnBy b3RvdHlwZS5maXJzdEluRmxvd09yRmxvYXRDaGlsZCk6CisgICAgICAgIChMYXlvdXQuQ29udGFp bmVyLnByb3RvdHlwZS5oYXNJbkZsb3dPckZsb2F0Q2hpbGQpOgorICAgICAgICAoTGF5b3V0LkNv bnRhaW5lci5wcm90b3R5cGUub3V0T2ZGbG93RGVzY2VuZGFudHMpOgorICAgICAgICAoTGF5b3V0 LkNvbnRhaW5lcik6CisgICAgICAgICogTGF5b3V0UmVsb2FkZWQvVXRpbHMuanM6CisgICAgICAg IChVdGlscy5pc0Rlc2NlbmRhbnRPZik6IERlbGV0ZWQuCisgICAgICAgIChVdGlscy5jb2xsZWN0 T3V0T2ZGbG93RGVzY2VuZGFudHMpOiBEZWxldGVkLgorCiAyMDE4LTAzLTE3ICBaYWxhbiBCdWp0 YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW0xheW91dFJlbG9hZGVkXSBCbG9ja0Zv cm1hdHRpbmdDb250ZXh0OjpwbGFjZVBvc2l0aW9uZWREZXNjZW5kYW50cyB0YWtlcyBjYXJlIG9m IGJvdGggaW4tIGFuZCBvdXQtb2YtZmxvdyBwbGFjZW1lbnQKZGlmZiAtLWdpdCBhL1Rvb2xzL0xh eW91dFJlbG9hZGVkL0Zvcm1hdHRpbmdDb250ZXh0L0Jsb2NrRm9ybWF0dGluZy9CbG9ja0Zvcm1h dHRpbmdDb250ZXh0LmpzIGIvVG9vbHMvTGF5b3V0UmVsb2FkZWQvRm9ybWF0dGluZ0NvbnRleHQv QmxvY2tGb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuanMKaW5kZXggNmZjMzk0M2Iy ZjAxNWU2YjFkYzU1MjBiNGQ0YTVkOTZkZTljMmQ1YS4uNjllZmIzODY5MzAyNjc5NDdlN2Q0ZjIz YzQwM2EwZWE1Mjg4YmZkZSAxMDA2NDQKLS0tIGEvVG9vbHMvTGF5b3V0UmVsb2FkZWQvRm9ybWF0 dGluZ0NvbnRleHQvQmxvY2tGb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuanMKKysr IGIvVG9vbHMvTGF5b3V0UmVsb2FkZWQvRm9ybWF0dGluZ0NvbnRleHQvQmxvY2tGb3JtYXR0aW5n L0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuanMKQEAgLTM0LDExICszNCwxMSBAQCBjbGFzcyBCbG9j a0Zvcm1hdHRpbmdDb250ZXh0IGV4dGVuZHMgRm9ybWF0dGluZ0NvbnRleHQgewogICAgICAgICAv LyBJbiBhIGJsb2NrIGZvcm1hdHRpbmcgY29udGV4dCwgYm94ZXMgYXJlIGxhaWQgb3V0IG9uZSBh ZnRlciB0aGUgb3RoZXIsIHZlcnRpY2FsbHksIGJlZ2lubmluZyBhdCB0aGUgdG9wIG9mIGEgY29u dGFpbmluZyBibG9jay4KICAgICAgICAgLy8gVGhlIHZlcnRpY2FsIGRpc3RhbmNlIGJldHdlZW4g dHdvIHNpYmxpbmcgYm94ZXMgaXMgZGV0ZXJtaW5lZCBieSB0aGUgJ21hcmdpbicgcHJvcGVydGll cy4KICAgICAgICAgLy8gVmVydGljYWwgbWFyZ2lucyBiZXR3ZWVuIGFkamFjZW50IGJsb2NrLWxl dmVsIGJveGVzIGluIGEgYmxvY2sgZm9ybWF0dGluZyBjb250ZXh0IGNvbGxhcHNlLgotICAgICAg ICBpZiAoIXRoaXMucm9vdENvbnRhaW5lcigpLmZpcnN0Q2hpbGQoKSkKLSAgICAgICAgICAgIHJl dHVybjsKKwogICAgICAgICAvLyBUaGlzIGlzIGEgcG9zdC1vcmRlciB0cmVlIHRyYXZlcnNhbCBs YXlvdXQuCiAgICAgICAgIC8vIFRoZSByb290IGNvbnRhaW5lciBsYXlvdXQgaXMgZG9uZSBpbiB0 aGUgZm9ybWF0dGluZyBjb250ZXh0IGl0IGxpdmVzIGluLCBub3QgdGhhdCBvbmUgaXQgY3JlYXRl cywgc28gbGV0J3Mgc3RhcnQgd2l0aCB0aGUgZmlyc3QgY2hpbGQuCi0gICAgICAgIHRoaXMuX2Fk ZFRvTGF5b3V0UXVldWUodGhpcy5yb290Q29udGFpbmVyKCkuZmlyc3RDaGlsZCgpKTsKKyAgICAg ICAgaWYgKHRoaXMucm9vdENvbnRhaW5lcigpLmZpcnN0SW5GbG93T3JGbG9hdENoaWxkKCkpCisg ICAgICAgICAgICB0aGlzLl9hZGRUb0xheW91dFF1ZXVlKHRoaXMucm9vdENvbnRhaW5lcigpLmZp cnN0SW5GbG93T3JGbG9hdENoaWxkKCkpOwogICAgICAgICAvLyAxLiBHbyBhbGwgdGhlIHdheSBk b3duIHRvIHRoZSBsZWFmIG5vZGUKICAgICAgICAgLy8gMi4gQ29tcHV0ZSBzdGF0aWMgcG9zaXRp b24gYW5kIHdpZHRoIGFzIHdlIHRyYXZlcnMgZG93bgogICAgICAgICAvLyAzLiBBcyB3ZSBjbGlt YiBiYWNrIG9uIHRoZSB0cmVlLCBjb21wdXRlIGhlaWdodCBhbmQgZmluaWFsaXplIHBvc2l0aW9u CkBAIC01Myw5ICs1Myw5IEBAIGNsYXNzIEJsb2NrRm9ybWF0dGluZ0NvbnRleHQgZXh0ZW5kcyBG b3JtYXR0aW5nQ29udGV4dCB7CiAgICAgICAgICAgICAgICAgICAgIGxheW91dENvbnRleHQubGF5 b3V0Rm9ybWF0dGluZ0NvbnRleHQobGF5b3V0Qm94LmVzdGFibGlzaGVkRm9ybWF0dGluZ0NvbnRl eHQoKSk7CiAgICAgICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgICAgIH0KLSAg ICAgICAgICAgICAgICBpZiAoIWxheW91dEJveC5pc0NvbnRhaW5lcigpIHx8ICFsYXlvdXRCb3gu aGFzQ2hpbGQoKSkKKyAgICAgICAgICAgICAgICBpZiAoIWxheW91dEJveC5pc0NvbnRhaW5lcigp IHx8ICFsYXlvdXRCb3guaGFzSW5GbG93T3JGbG9hdENoaWxkKCkpCiAgICAgICAgICAgICAgICAg ICAgIGJyZWFrOwotICAgICAgICAgICAgICAgIHRoaXMuX2FkZFRvTGF5b3V0UXVldWUobGF5b3V0 Qm94LmZpcnN0Q2hpbGQoKSk7CisgICAgICAgICAgICAgICAgdGhpcy5fYWRkVG9MYXlvdXRRdWV1 ZShsYXlvdXRCb3guZmlyc3RJbkZsb3dPckZsb2F0Q2hpbGQoKSk7CiAgICAgICAgICAgICB9CiAK ICAgICAgICAgICAgIC8vIENsaW1iIGJhY2sgb24gdGhlIGFuY2VzdG9ycyBhbmQgY29tcHV0ZSBo ZWlnaHQvZmluYWwgcG9zaXRpb24uCkBAIC02NSwxOCArNjUsMjAgQEAgY2xhc3MgQmxvY2tGb3Jt YXR0aW5nQ29udGV4dCBleHRlbmRzIEZvcm1hdHRpbmdDb250ZXh0IHsKICAgICAgICAgICAgICAg ICB0aGlzLmNvbXB1dGVIZWlnaHQobGF5b3V0Qm94KTsKICAgICAgICAgICAgICAgICAvLyBBZGp1 c3QgcG9zaXRpb24gbm93IHRoYXQgd2UgaGF2ZSBhbGwgdGhlIHByZXZpb3VzIGZsb2F0cyBwbGFj ZWQgaW4gdGhpcyBjb250ZXh0IC1pZiBuZWVkZWQuCiAgICAgICAgICAgICAgICAgdGhpcy5mbG9h dGluZ0NvbnRleHQoKS5jb21wdXRlUG9zaXRpb24obGF5b3V0Qm94KTsKLSAgICAgICAgICAgICAg ICAvLyBNb3ZlIHBvc2l0aW9uZWQgY2hpbGRyZW4gdG8gdGhlaXIgZmluYWwgcG9zaXRpb24uCi0g ICAgICAgICAgICAgICAgdGhpcy5fcGxhY2VQb3NpdGlvbmVkRGVzY2VuZGFudHMobGF5b3V0Qm94 KTsKKyAgICAgICAgICAgICAgICAvLyBNb3ZlIGluLWZsb3cgcG9zaXRpb25lZCBjaGlsZHJlbiB0 byB0aGVpciBmaW5hbCBwb3NpdGlvbi4KKyAgICAgICAgICAgICAgICB0aGlzLl9wbGFjZUluRmxv d1Bvc2l0aW9uZWRDaGlsZHJlbihsYXlvdXRCb3gpOwogICAgICAgICAgICAgICAgIC8vIFdlIGFy ZSBkb25lIHdpdGggbGF5aW5nIG91dCB0aGlzIGJveC4KICAgICAgICAgICAgICAgICB0aGlzLl9y ZW1vdmVGcm9tTGF5b3V0UXVldWUobGF5b3V0Qm94KTsKLSAgICAgICAgICAgICAgICBpZiAobGF5 b3V0Qm94Lm5leHRTaWJsaW5nKCkpIHsKLSAgICAgICAgICAgICAgICAgICAgdGhpcy5fYWRkVG9M YXlvdXRRdWV1ZShsYXlvdXRCb3gubmV4dFNpYmxpbmcoKSk7CisgICAgICAgICAgICAgICAgaWYg KGxheW91dEJveC5uZXh0SW5GbG93T3JGbG9hdFNpYmxpbmcoKSkgeworICAgICAgICAgICAgICAg ICAgICB0aGlzLl9hZGRUb0xheW91dFF1ZXVlKGxheW91dEJveC5uZXh0SW5GbG93T3JGbG9hdFNp YmxpbmcoKSk7CiAgICAgICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgICAgIH0K ICAgICAgICAgICAgIH0KICAgICAgICAgfQotICAgICAgICAvLyBBbmQgZmluYWxseSBwbGFjZSB0 aGUgaW4tIGFuZCBvdXQtb2YtZmxvdyBkZXNjZW5kYW50cy4KLSAgICAgICAgdGhpcy5fcGxhY2VQ b3NpdGlvbmVkRGVzY2VuZGFudHModGhpcy5yb290Q29udGFpbmVyKCkpOworICAgICAgICAvLyBQ bGFjZSB0aGUgaW5mbG93IHBvc2l0aW9uZWQgY2hpbGRyZW4uCisgICAgICAgIHRoaXMuX3BsYWNl SW5GbG93UG9zaXRpb25lZENoaWxkcmVuKHRoaXMucm9vdENvbnRhaW5lcigpKTsKKyAgICAgICAg Ly8gQW5kIHRha2UgY2FyZSBvZiBvdXQtb2YtZmxvdyBib3hlcyBhcyB0aGUgZmluYWwgc3RlcC4K KyAgICAgICAgdGhpcy5fbGF5b3V0T3V0T2ZGbG93RGVzY2VuZGFudHMobGF5b3V0Q29udGV4dCk7 CiAgICB9CiAKICAgICBjb21wdXRlV2lkdGgobGF5b3V0Qm94KSB7CkBAIC0xMTYsMTcgKzExOCwx MiBAQCBjbGFzcyBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0IGV4dGVuZHMgRm9ybWF0dGluZ0NvbnRl eHQgewogICAgICAgICBsYXlvdXRCb3guc2V0VG9wTGVmdChwb3NpdGlvbik7CiAgICAgfQogCi0g ICAgX3BsYWNlUG9zaXRpb25lZERlc2NlbmRhbnRzKGxheW91dEJveCkgewotICAgICAgICBpZiAo IWxheW91dEJveC5pc0NvbnRhaW5lcigpKQorICAgIF9wbGFjZUluRmxvd1Bvc2l0aW9uZWRDaGls ZHJlbihjb250YWluZXIpIHsKKyAgICAgICAgaWYgKCFjb250YWluZXIuaXNDb250YWluZXIoKSkK ICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgLy8gSWYgdGhpcyBsYXlvdXRCb3ggYWxzbyBl c3RhYmxpc2hlcyBhIGZvcm1hdHRpbmcgY29udGV4dCwgdGhlbiBwb3NpdGlvbmluZyBhbHJlYWR5 IGhhcyBoYXBwZW5kIGF0IHRoZSBmb3JtYXR0aW5nIGNvbnRleHQuCi0gICAgICAgIGlmIChsYXlv dXRCb3guZXN0YWJsaXNoZXNGb3JtYXR0aW5nQ29udGV4dCgpICYmIGxheW91dEJveCAhPSB0aGlz LnJvb3RDb250YWluZXIoKSkKKyAgICAgICAgaWYgKGNvbnRhaW5lci5lc3RhYmxpc2hlc0Zvcm1h dHRpbmdDb250ZXh0KCkgJiYgY29udGFpbmVyICE9IHRoaXMucm9vdENvbnRhaW5lcigpKQogICAg ICAgICAgICAgcmV0dXJuOwotICAgICAgICB0aGlzLl9wbGFjZUluRmxvd1Bvc2l0aW9uZWRDaGls ZHJlbihsYXlvdXRCb3gpOwotICAgICAgICB0aGlzLl9wbGFjZU91dE9mRmxvd0Rlc2NlbmRhbnRz KGxheW91dEJveCk7Ci0gICAgfQotCi0gICAgX3BsYWNlSW5GbG93UG9zaXRpb25lZENoaWxkcmVu KGNvbnRhaW5lcikgewogICAgICAgICBBU1NFUlQoY29udGFpbmVyLmlzQ29udGFpbmVyKCkpOwog ICAgICAgICBmb3IgKGxldCBpbkZsb3dDaGlsZCA9IGNvbnRhaW5lci5maXJzdEluRmxvd0NoaWxk KCk7IGluRmxvd0NoaWxkOyBpbkZsb3dDaGlsZCA9IGluRmxvd0NoaWxkLm5leHRJbkZsb3dTaWJs aW5nKCkpIHsKICAgICAgICAgICAgIGlmICghaW5GbG93Q2hpbGQuaXNJbkZsb3dQb3NpdGlvbmVk KCkpCkBAIC0xMzUsMTEgKzEzMiwxOSBAQCBjbGFzcyBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0IGV4 dGVuZHMgRm9ybWF0dGluZ0NvbnRleHQgewogICAgICAgICB9CiAgICAgfQogCi0gICAgX3BsYWNl T3V0T2ZGbG93RGVzY2VuZGFudHMoY29udGFpbmVyKSB7Ci0gICAgICAgIEFTU0VSVChjb250YWlu ZXIuaXNDb250YWluZXIoKSk7Ci0gICAgICAgIGxldCBvdXRPZkZsb3dEZXNjZW5kYW50cyA9IFV0 aWxzLmNvbGxlY3RPdXRPZkZsb3dEZXNjZW5kYW50cyhjb250YWluZXIpOwotICAgICAgICBmb3Ig KGxldCBvdXRPZkZsb3dCb3ggb2Ygb3V0T2ZGbG93RGVzY2VuZGFudHMpCisgICAgX2xheW91dE91 dE9mRmxvd0Rlc2NlbmRhbnRzKGxheW91dENvbnRleHQpIHsKKyAgICAgICAgLy8gVGhpcyBsYXlz IG91dCBhbGwgdGhlIG91dC1vZi1mbG93IGJveGVzIHRoYXQgYmVsb25nIHRvIHRoaXMgZm9ybWF0 dGluZyBjb250ZXh0IGV2ZW4gaWYKKyAgICAgICAgLy8gdGhlIHJvb3QgY29udGFpbmVyIGlzIG5v dCB0aGUgY29udGFpbmluZyBibG9jay4KKyAgICAgICAgbGV0IG91dE9mRmxvd0Rlc2NlbmRhbnRz ID0gdGhpcy5fb3V0T2ZGbG93RGVzY2VuZGFudHMoKTsKKyAgICAgICAgZm9yIChsZXQgb3V0T2ZG bG93Qm94IG9mIG91dE9mRmxvd0Rlc2NlbmRhbnRzKSB7CisgICAgICAgICAgICB0aGlzLl9hZGRU b0xheW91dFF1ZXVlKG91dE9mRmxvd0JveCk7CisgICAgICAgICAgICB0aGlzLmNvbXB1dGVXaWR0 aChvdXRPZkZsb3dCb3gpOworICAgICAgICAgICAgdGhpcy5fY29tcHV0ZVN0YXRpY1Bvc2l0aW9u KG91dE9mRmxvd0JveCk7CisgICAgICAgICAgICBsYXlvdXRDb250ZXh0LmxheW91dEZvcm1hdHRp bmdDb250ZXh0KG91dE9mRmxvd0JveC5lc3RhYmxpc2hlZEZvcm1hdHRpbmdDb250ZXh0KCkpOwor ICAgICAgICAgICAgdGhpcy5jb21wdXRlSGVpZ2h0KG91dE9mRmxvd0JveCk7CiAgICAgICAgICAg ICB0aGlzLl9jb21wdXRlT3V0T2ZGbG93UG9zaXRpb24ob3V0T2ZGbG93Qm94KTsKKyAgICAgICAg ICAgIHRoaXMuX3JlbW92ZUZyb21MYXlvdXRRdWV1ZShvdXRPZkZsb3dCb3gpOworICAgICAgICB9 CiAgICAgfQogCiAgICAgX2NvbXB1dGVPdXRPZkZsb3dXaWR0aChsYXlvdXRCb3gpIHsKZGlmZiAt LWdpdCBhL1Rvb2xzL0xheW91dFJlbG9hZGVkL0Zvcm1hdHRpbmdDb250ZXh0L0Zvcm1hdHRpbmdD b250ZXh0LmpzIGIvVG9vbHMvTGF5b3V0UmVsb2FkZWQvRm9ybWF0dGluZ0NvbnRleHQvRm9ybWF0 dGluZ0NvbnRleHQuanMKaW5kZXggZTkyNTFmNjE3YzMwNzAyOWVkYzI0OTQ5YTE4MmQ1MDZjZDYw ODAxZi4uOTIxZDA3YTJiNTc2NWQ0NjAzNDQyODFkYmYwN2QyMTllMjhjNTg0OSAxMDA2NDQKLS0t IGEvVG9vbHMvTGF5b3V0UmVsb2FkZWQvRm9ybWF0dGluZ0NvbnRleHQvRm9ybWF0dGluZ0NvbnRl eHQuanMKKysrIGIvVG9vbHMvTGF5b3V0UmVsb2FkZWQvRm9ybWF0dGluZ0NvbnRleHQvRm9ybWF0 dGluZ0NvbnRleHQuanMKQEAgLTk2LDcgKzk2LDcgQEAgY2xhc3MgRm9ybWF0dGluZ0NvbnRleHQg ewogICAgIF90b0Fic29sdXRlUG9zaXRpb24obGF5b3V0Qm94KSB7CiAgICAgICAgIC8vIFdlIHNo b3VsZCBuZXZlciBuZWVkIHRvIGdvIGJleW9uZCB0aGUgcm9vdCBjb250YWluZXIuCiAgICAgICAg IGxldCBjb250YWluaW5nQmxvY2sgPSBsYXlvdXRCb3guY29udGFpbmluZ0Jsb2NrKCk7Ci0gICAg ICAgIEFTU0VSVChjb250YWluaW5nQmxvY2sgPT0gdGhpcy5yb290Q29udGFpbmVyKCkgfHwgVXRp bHMuaXNEZXNjZW5kYW50T2YoY29udGFpbmluZ0Jsb2NrLCB0aGlzLnJvb3RDb250YWluZXIoKSkp OworICAgICAgICBBU1NFUlQoY29udGFpbmluZ0Jsb2NrID09IHRoaXMucm9vdENvbnRhaW5lcigp IHx8IGNvbnRhaW5pbmdCbG9jay5pc0Rlc2NlbmRhbnRPZih0aGlzLnJvb3RDb250YWluZXIoKSkp OwogICAgICAgICBsZXQgdG9wTGVmdCA9IGxheW91dEJveC5yZWN0KCkudG9wTGVmdCgpOwogICAg ICAgICBsZXQgYXNjZW5kYW50ID0gbGF5b3V0Qm94LnBhcmVudCgpOwogICAgICAgICB3aGlsZSAo YXNjZW5kYW50ICYmIGFzY2VuZGFudCAhPSBjb250YWluaW5nQmxvY2spIHsKQEAgLTE0Nyw0ICsx NDcsMzkgQEAgY2xhc3MgRm9ybWF0dGluZ0NvbnRleHQgewogICAgICAgICBBU1NFUlQodGhpcy5t X2Rpc3BsYXlUb0xheW91dC5oYXMoZGlzcGxheUJveCkpOwogICAgICAgICByZXR1cm4gdGhpcy5t X2Rpc3BsYXlUb0xheW91dC5nZXQobGF5b3V0KTsKICAgICB9CisKKyAgICBfb3V0T2ZGbG93RGVz Y2VuZGFudHMoKSB7CisgICAgICAgIC8vIEZJWE1FOiBUaGlzIGlzIGhpZ2hseSBpbmVmZmljaWVu dCBidXQgd2lsbCBkbyBmb3Igbm93LgorICAgICAgICAvLyAxLiBDb2xsZWN0IGFsbCB0aGUgb3V0 LW9mLWZsb3cgZGVzY2VuZGFudHMgZmlyc3QuCisgICAgICAgIC8vIDIuIENoZWNrIGlmIHRoZXkg YXJlIGFsbCBiZWxvbmcgdG8gdGhpcyBmb3JtYXR0aW5nIGNvbnRleHQuCisgICAgICAgIC8vICAg IC0gZWl0aGVyIHRoZSByb290IGNvbnRhaW5lciBpcyB0aGUgY29udGFpbmluZyBibG9jay4KKyAg ICAgICAgLy8gICAgLSBvciBhIGRlc2NlbmRhbnQgb2YgdGhlIHJvb3QgY29udGFpbmVyIGlzIHRo ZSBjb250YWluaW5nIGJsb2NrCisgICAgICAgIC8vICAgICAgYW5kIHRoZXJlIGlzIG5vdCBvdGhl ciBmb3JtYXR0aW5nIGNvbnRleHQgaW5iZXR3ZWVuLgorICAgICAgICBsZXQgYWxsT3V0T2ZGbG93 Qm94ZXMgPSBuZXcgQXJyYXkoKTsKKyAgICAgICAgbGV0IGRlc2NlbmRhbnRzID0gbmV3IEFycmF5 KCk7CisgICAgICAgIGZvciAobGV0IGNoaWxkID0gdGhpcy5yb290Q29udGFpbmVyKCkuZmlyc3RD aGlsZCgpOyBjaGlsZDsgY2hpbGQgPSBjaGlsZC5uZXh0U2libGluZygpKQorICAgICAgICAgICAg ZGVzY2VuZGFudHMucHVzaChjaGlsZCk7CisgICAgICAgIHdoaWxlIChkZXNjZW5kYW50cy5sZW5n dGgpIHsKKyAgICAgICAgICAgIGxldCBkZXNjZW5kYW50ID0gZGVzY2VuZGFudHMucG9wKCk7Cisg ICAgICAgICAgICBpZiAoZGVzY2VuZGFudC5pc091dE9mRmxvd1Bvc2l0aW9uZWQoKSkKKyAgICAg ICAgICAgICAgICBhbGxPdXRPZkZsb3dCb3hlcy5wdXNoKGRlc2NlbmRhbnQpOworICAgICAgICAg ICAgaWYgKCFkZXNjZW5kYW50LmlzQ29udGFpbmVyKCkpCisgICAgICAgICAgICAgICAgY29udGlu dWU7CisgICAgICAgICAgICBmb3IgKGxldCBjaGlsZCA9IGRlc2NlbmRhbnQubGFzdENoaWxkKCk7 IGNoaWxkOyBjaGlsZCA9IGNoaWxkLnByZXZpb3VzU2libGluZygpKQorICAgICAgICAgICAgICAg IGRlc2NlbmRhbnRzLnB1c2goY2hpbGQpOworICAgICAgICB9CisgICAgICAgIGxldCBvdXRPZkZs b3dCb3hlcyA9IG5ldyBBcnJheSgpOworICAgICAgICBmb3IgKGxldCBvdXRPZkZsb3dCb3ggb2Yg YWxsT3V0T2ZGbG93Qm94ZXMpIHsKKyAgICAgICAgICAgIGxldCBjb250YWluaW5nQmxvY2sgPSBv dXRPZkZsb3dCb3guY29udGFpbmluZ0Jsb2NrKCk7CisgICAgICAgICAgICAvLyBDb2xsZWN0IHRo ZSBvdXQtb2YtZmxvdyBkZXNjZW5kYW50IHRoYXQgYmVsb25nIHRvIHRoaXMgZm9ybWF0dGluZyBj b250ZXh0LgorICAgICAgICAgICAgaWYgKGNvbnRhaW5pbmdCbG9jayA9PSB0aGlzLnJvb3RDb250 YWluZXIoKSkKKyAgICAgICAgICAgICAgICBvdXRPZkZsb3dCb3hlcy5wdXNoKG91dE9mRmxvd0Jv eCk7CisgICAgICAgICAgICBlbHNlIGlmIChjb250YWluaW5nQmxvY2suaXNEZXNjZW5kYW50T2Yo dGhpcy5yb290Q29udGFpbmVyKCkpKSB7CisgICAgICAgICAgICAgICAgaWYgKCFjb250YWluaW5n QmxvY2suZXN0YWJsaXNoZWRGb3JtYXR0aW5nQ29udGV4dCgpIHx8ICFjb250YWluaW5nQmxvY2su aXNQb3NpdGlvbmVkKCkpCisgICAgICAgICAgICAgICAgICAgIG91dE9mRmxvd0JveGVzLnB1c2go b3V0T2ZGbG93Qm94KTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgfQorICAgICAgICByZXR1cm4g b3V0T2ZGbG93Qm94ZXM7CisgICAgfQorCiB9CmRpZmYgLS1naXQgYS9Ub29scy9MYXlvdXRSZWxv YWRlZC9MYXlvdXRUcmVlL0JveC5qcyBiL1Rvb2xzL0xheW91dFJlbG9hZGVkL0xheW91dFRyZWUv Qm94LmpzCmluZGV4IGQ4ZWQ4YTgwZDdlZTMxMDZiNTJmNTdiYzczMjExODI4MDc0M2Q2ZTMuLjU0 YzUzMDIxNGY1MDU2MzVkMWJiNDM3NDgzMjQ5M2VjM2Y5MDk5MjYgMTAwNjQ0Ci0tLSBhL1Rvb2xz L0xheW91dFJlbG9hZGVkL0xheW91dFRyZWUvQm94LmpzCisrKyBiL1Rvb2xzL0xheW91dFJlbG9h ZGVkL0xheW91dFRyZWUvQm94LmpzCkBAIC03Miw2ICs3MiwxNiBAQCBMYXlvdXQuQm94ID0gY2xh c3MgQm94IHsKICAgICAgICAgcmV0dXJuIG51bGw7CiAgICAgfQogCisgICAgbmV4dEluRmxvd09y RmxvYXRTaWJsaW5nKCkgeworICAgICAgICBsZXQgbmV4dEluRmxvd1NpYmxpbmcgPSB0aGlzLm5l eHRTaWJsaW5nKCk7CisgICAgICAgIHdoaWxlIChuZXh0SW5GbG93U2libGluZykgeworICAgICAg ICAgICAgaWYgKG5leHRJbkZsb3dTaWJsaW5nLmlzSW5GbG93KCkgfHwgbmV4dEluRmxvd1NpYmxp bmcuaXNGbG9hdGluZ1Bvc2l0aW9uZWQoKSkKKyAgICAgICAgICAgICAgICByZXR1cm4gbmV4dElu Rmxvd1NpYmxpbmc7CisgICAgICAgICAgICBuZXh0SW5GbG93U2libGluZyA9IG5leHRJbkZsb3dT aWJsaW5nLm5leHRTaWJsaW5nKCk7CisgICAgICAgIH0KKyAgICAgICAgcmV0dXJuIG51bGw7Cisg ICAgfQorCiAgICAgcHJldmlvdXNTaWJsaW5nKCkgewogICAgICAgICByZXR1cm4gdGhpcy5tX3By ZXZpb3VzU2libGluZzsKICAgICB9CkBAIC0yNTAsNiArMjYwLDE0IEBAIExheW91dC5Cb3ggPSBj bGFzcyBCb3ggewogICAgICAgICByZXR1cm4gbnVsbDsKICAgICB9CiAKKyAgICBpc0Rlc2NlbmRh bnRPZihjb250YWluZXIpIHsKKyAgICAgICAgQVNTRVJUKGNvbnRhaW5lcik7CisgICAgICAgIGxl dCBhc2NlbmRhbnQgPSB0aGlzLnBhcmVudCgpOworICAgICAgICB3aGlsZSAoYXNjZW5kYW50ICYm IGFzY2VuZGFudCAhPSBjb250YWluZXIpCisgICAgICAgICAgICBhc2NlbmRhbnQgPSBhc2NlbmRh bnQucGFyZW50KCk7CisgICAgICAgIHJldHVybiAhIWFzY2VuZGFudDsKKyAgICB9CisKICAgICBi b3JkZXJCb3goKSB7CiAgICAgICAgIHJldHVybiB0aGlzLmRpc3BsYXlCb3goKS5ib3JkZXJCb3go KTsKICAgICB9CmRpZmYgLS1naXQgYS9Ub29scy9MYXlvdXRSZWxvYWRlZC9MYXlvdXRUcmVlL0Nv bnRhaW5lci5qcyBiL1Rvb2xzL0xheW91dFJlbG9hZGVkL0xheW91dFRyZWUvQ29udGFpbmVyLmpz CmluZGV4IDEwNDJiZjUzOWVkYmJlMzNjMWY4ZmNjY2UyY2M3ZmMxMzBiNjFlMWQuLmI4ZGQxZWU5 OGJhNzc5ZjZmNWFiOTQ1NDlhMmE1N2JmNGRjMWI5MDMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0xheW91 dFJlbG9hZGVkL0xheW91dFRyZWUvQ29udGFpbmVyLmpzCisrKyBiL1Rvb2xzL0xheW91dFJlbG9h ZGVkL0xheW91dFRyZWUvQ29udGFpbmVyLmpzCkBAIC01NSw2ICs1NSwxNSBAQCBMYXlvdXQuQ29u dGFpbmVyID0gY2xhc3MgQ29udGFpbmVyIGV4dGVuZHMgTGF5b3V0LkJveCB7CiAgICAgICAgIHJl dHVybiBmaXJzdENoaWxkLm5leHRJbkZsb3dTaWJsaW5nKCk7CiAgICAgfQogCisgICAgZmlyc3RJ bkZsb3dPckZsb2F0Q2hpbGQoKSB7CisgICAgICAgIGlmICghdGhpcy5oYXNDaGlsZCgpKQorICAg ICAgICAgICAgcmV0dXJuIG51bGw7CisgICAgICAgIGxldCBmaXJzdENoaWxkID0gdGhpcy5maXJz dENoaWxkKCk7CisgICAgICAgIGlmIChmaXJzdENoaWxkLmlzSW5GbG93KCkgfHwgZmlyc3RDaGls ZC5pc0Zsb2F0aW5nUG9zaXRpb25lZCgpKQorICAgICAgICAgICAgcmV0dXJuIGZpcnN0Q2hpbGQ7 CisgICAgICAgIHJldHVybiBmaXJzdENoaWxkLm5leHRJbkZsb3dPckZsb2F0U2libGluZygpOwor ICAgIH0KKwogICAgIGxhc3RDaGlsZCgpIHsKICAgICAgICAgcmV0dXJuIHRoaXMubV9sYXN0Q2hp bGQ7CiAgICAgfQpAQCAtNzUsNCArODQsMjkgQEAgTGF5b3V0LkNvbnRhaW5lciA9IGNsYXNzIENv bnRhaW5lciBleHRlbmRzIExheW91dC5Cb3ggewogICAgIGhhc0luRmxvd0NoaWxkKCkgewogICAg ICAgICByZXR1cm4gISF0aGlzLmZpcnN0SW5GbG93Q2hpbGQoKTsKICAgICB9CisKKyAgICBoYXNJ bkZsb3dPckZsb2F0Q2hpbGQoKSB7CisgICAgICAgIHJldHVybiAhIXRoaXMuZmlyc3RJbkZsb3dP ckZsb2F0Q2hpbGQoKTsKKyAgICB9CisKKyAgICBvdXRPZkZsb3dEZXNjZW5kYW50cygpIHsKKyAg ICAgICAgaWYgKCF0aGlzLmlzUG9zaXRpb25lZCgpKQorICAgICAgICAgICAgcmV0dXJuIG5ldyBB cnJheSgpOworICAgICAgICBsZXQgb3V0T2ZGbG93Qm94ZXMgPSBuZXcgQXJyYXkoKTsKKyAgICAg ICAgbGV0IGRlc2NlbmRhbnRzID0gbmV3IEFycmF5KCk7CisgICAgICAgIGZvciAobGV0IGNoaWxk ID0gdGhpcy5maXJzdENoaWxkKCk7IGNoaWxkOyBjaGlsZCA9IGNoaWxkLm5leHRTaWJsaW5nKCkp CisgICAgICAgICAgICBkZXNjZW5kYW50cy5wdXNoKGNoaWxkKTsKKyAgICAgICAgd2hpbGUgKGRl c2NlbmRhbnRzLmxlbmd0aCkgeworICAgICAgICAgICAgbGV0IGRlc2NlbmRhbnQgPSBkZXNjZW5k YW50cy5wb3AoKTsKKyAgICAgICAgICAgIGlmIChkZXNjZW5kYW50LmlzT3V0T2ZGbG93UG9zaXRp b25lZCgpICYmIGRlc2NlbmRhbnQuY29udGFpbmluZ0Jsb2NrKCkgPT0gdGhpcykKKyAgICAgICAg ICAgICAgICBvdXRPZkZsb3dCb3hlcy5wdXNoKGRlc2NlbmRhbnQpOworICAgICAgICAgICAgaWYg KCFkZXNjZW5kYW50LmlzQ29udGFpbmVyKCkpCisgICAgICAgICAgICAgICAgY29udGludWU7Cisg ICAgICAgICAgICBmb3IgKGxldCBjaGlsZCA9IGRlc2NlbmRhbnQubGFzdENoaWxkKCk7IGNoaWxk OyBjaGlsZCA9IGNoaWxkLnByZXZpb3VzU2libGluZygpKQorICAgICAgICAgICAgICAgIGRlc2Nl bmRhbnRzLnB1c2goY2hpbGQpOworICAgICAgICB9CisgICAgICAgIHJldHVybiBvdXRPZkZsb3dC b3hlczsKKyAgICB9CisKKwogfQpkaWZmIC0tZ2l0IGEvVG9vbHMvTGF5b3V0UmVsb2FkZWQvVXRp bHMuanMgYi9Ub29scy9MYXlvdXRSZWxvYWRlZC9VdGlscy5qcwppbmRleCAyODdmNTE5ZDFlMjcz Nzk1MzAzMDRjNzU1MDNlZDk4ODI5OTUxYmMzLi5iNjMzYzkwODg2NWJiYzJjMmQ2ZmJjMGJlZDIz MTkyMTA0NWYyZDcwIDEwMDY0NAotLS0gYS9Ub29scy9MYXlvdXRSZWxvYWRlZC9VdGlscy5qcwor KysgYi9Ub29scy9MYXlvdXRSZWxvYWRlZC9VdGlscy5qcwpAQCAtNDc5LDMxICs0NzksNiBAQCBj bGFzcyBVdGlscyB7CiAgICAgICAgIHJldHVybiBuZXcgTGF5b3V0UmVjdCh0b3BMZWZ0LCBib3gu cmVjdCgpLnNpemUoKSk7CiAgICAgfQogCi0gICAgc3RhdGljIGlzRGVzY2VuZGFudE9mKGxheW91 dEJveCwgY29udGFpbmVyKSB7Ci0gICAgICAgIEFTU0VSVChjb250YWluZXIpOwotICAgICAgICBs ZXQgYXNjZW5kYW50ID0gbGF5b3V0Qm94LnBhcmVudCgpOwotICAgICAgICB3aGlsZSAoYXNjZW5k YW50ICYmIGFzY2VuZGFudCAhPSBjb250YWluZXIpCi0gICAgICAgICAgICBhc2NlbmRhbnQgPSBh c2NlbmRhbnQucGFyZW50KCk7Ci0gICAgICAgIHJldHVybiAhIWFzY2VuZGFudDsKLSAgICB9Ci0K LSAgICBzdGF0aWMgY29sbGVjdE91dE9mRmxvd0Rlc2NlbmRhbnRzKGNvbnRhaW50QmxvY2spIHsK LSAgICAgICAgbGV0IG91dE9mRmxvd0JveGVzID0gbmV3IEFycmF5KCk7Ci0gICAgICAgIGxldCBk ZXNjZW5kYW50cyA9IG5ldyBBcnJheSgpOwotICAgICAgICBmb3IgKGxldCBjaGlsZCA9IGNvbnRh aW50QmxvY2suZmlyc3RDaGlsZCgpOyBjaGlsZDsgY2hpbGQgPSBjaGlsZC5uZXh0U2libGluZygp KQotICAgICAgICAgICAgZGVzY2VuZGFudHMucHVzaChjaGlsZCk7Ci0gICAgICAgIHdoaWxlIChk ZXNjZW5kYW50cy5sZW5ndGgpIHsKLSAgICAgICAgICAgIGxldCBkZXNjZW5kYW50ID0gZGVzY2Vu ZGFudHMucG9wKCk7Ci0gICAgICAgICAgICBpZiAoZGVzY2VuZGFudC5pc091dE9mRmxvd1Bvc2l0 aW9uZWQoKSAmJiBkZXNjZW5kYW50LmNvbnRhaW5pbmdCbG9jaygpID09IGNvbnRhaW50QmxvY2sp Ci0gICAgICAgICAgICAgICAgb3V0T2ZGbG93Qm94ZXMucHVzaChkZXNjZW5kYW50KTsKLSAgICAg ICAgICAgIGlmICghZGVzY2VuZGFudC5pc0NvbnRhaW5lcigpKQotICAgICAgICAgICAgICAgIGNv bnRpbnVlOwotICAgICAgICAgICAgZm9yIChsZXQgY2hpbGQgPSBkZXNjZW5kYW50Lmxhc3RDaGls ZCgpOyBjaGlsZDsgY2hpbGQgPSBjaGlsZC5wcmV2aW91c1NpYmxpbmcoKSkKLSAgICAgICAgICAg ICAgICBkZXNjZW5kYW50cy5wdXNoKGNoaWxkKTsKLSAgICAgICAgfQotICAgICAgICByZXR1cm4g b3V0T2ZGbG93Qm94ZXM7Ci0gICAgfQotCiAgICAgc3RhdGljIG5leHRCcmVha2luZ09wcG9ydHVu aXR5KHRleHRCb3gsIGN1cnJlbnRQb3NpdGlvbikKICAgICB7CiAgICAgICAgIHJldHVybiB3aW5k b3cubmV4dEJyZWFraW5nT3Bwb3J0dW5pdHkodGV4dEJveC5jb250ZW50KCksIGN1cnJlbnRQb3Np dGlvbik7Cg==