184136 2018-03-29 08:33:26 -0700 [LayoutReloaded] Decouple formatting state and context lifetime 2018-03-29 08:40: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 1410266 0 zalan 2018-03-29 08:33:26 -0700 FormattingContext is just about the logic. We don't need to have it around in the state. 1410269 1 336772 zalan 2018-03-29 08:37:05 -0700 Created attachment 336772 Patch 1410275 2 zalan 2018-03-29 08:39:03 -0700 Committed r230075: <https://trac.webkit.org/changeset/230075> 1410276 3 webkit-bug-importer 2018-03-29 08:40:21 -0700 <rdar://problem/38999601> 336772 2018-03-29 08:37:05 -0700 2018-03-29 08:37:05 -0700 Patch bug-184136-20180329083725.patch text/plain 10914 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjMwMDY3CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMDBiODMxNzA2NDc1Y2UzNDAwODFiOTFjZDFlOGYyNmIz MjBlYTI3ZC4uNzJiMjU1MDVkYTBmYmE1ZGMwZDEwMDg5MDViZmQ0YmViMjQxOGMzYiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM4 IEBACisyMDE4LTAzLTI5ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAg ICAgW0xheW91dFJlbG9hZGVkXSBEZWNvdXBsZSBmb3JtYXR0aW5nIHN0YXRlIGFuZCBjb250ZXh0 IGxpZmV0aW1lLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTg0MTM2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgRm9ybWF0dGluZ0NvbnRleHQgaXMgYWJvdXQgdGhlIGxheW91dCBsb2dpYy4gV2UgZG9uJ3Qg bmVlZCB0byBob2xkIG9uIHRvIGl0LgorCisgICAgICAgICogTGF5b3V0UmVsb2FkZWQvRm9ybWF0 dGluZ0NvbnRleHQvRmxvYXRpbmdDb250ZXh0LmpzOgorICAgICAgICAoRmxvYXRpbmdDb250ZXh0 KToKKyAgICAgICAgKEZsb2F0aW5nQ29udGV4dC5wcm90b3R5cGUuY29tcHV0ZVBvc2l0aW9uKToK KyAgICAgICAgKEZsb2F0aW5nQ29udGV4dC5wcm90b3R5cGUuX3Bvc2l0aW9uRm9yQ2xlYXIpOgor ICAgICAgICAoRmxvYXRpbmdDb250ZXh0LnByb3RvdHlwZS5fY29tcHV0ZVBvc2l0aW9uVG9Bdm9p ZEludHJ1ZGluZ0Zsb2F0cyk6CisgICAgICAgIChGbG9hdGluZ0NvbnRleHQucHJvdG90eXBlLl9h ZGRGbG9hdGluZ0JveCk6CisgICAgICAgIChGbG9hdGluZ0NvbnRleHQucHJvdG90eXBlLl9mb3Jt YXR0aW5nQ29udGV4dCk6CisgICAgICAgIChGbG9hdGluZ0NvbnRleHQucHJvdG90eXBlLl9mb3Jt YXR0aW5nU3RhdGUpOgorICAgICAgICAqIExheW91dFJlbG9hZGVkL0Zvcm1hdHRpbmdDb250ZXh0 L0Zvcm1hdHRpbmdDb250ZXh0LmpzOgorICAgICAgICAoRm9ybWF0dGluZ0NvbnRleHQpOgorICAg ICAgICAqIExheW91dFJlbG9hZGVkL0Zvcm1hdHRpbmdTdGF0ZS9CbG9ja0Zvcm1hdHRpbmdTdGF0 ZS5qczoKKyAgICAgICAgKEJsb2NrRm9ybWF0dGluZ1N0YXRlKToKKyAgICAgICAgKiBMYXlvdXRS ZWxvYWRlZC9Gb3JtYXR0aW5nU3RhdGUvRmxvYXRpbmdTdGF0ZS5qczoKKyAgICAgICAgKEZsb2F0 aW5nU3RhdGUpOgorICAgICAgICAoRmxvYXRpbmdTdGF0ZS5wcm90b3R5cGUuYWRkRmxvYXRpbmcp OgorICAgICAgICAoRmxvYXRpbmdTdGF0ZS5wcm90b3R5cGUuZm9ybWF0dGluZ1N0YXRlKToKKyAg ICAgICAgKEZsb2F0aW5nU3RhdGUucHJvdG90eXBlLmZvcm1hdHRpbmdDb250ZXh0KTogRGVsZXRl ZC4KKyAgICAgICAgKiBMYXlvdXRSZWxvYWRlZC9Gb3JtYXR0aW5nU3RhdGUvRm9ybWF0dGluZ1N0 YXRlLmpzOgorICAgICAgICAoRm9ybWF0dGluZ1N0YXRlKToKKyAgICAgICAgKEZvcm1hdHRpbmdT dGF0ZS5wcm90b3R5cGUuZm9ybWF0dGluZ0NvbnRleHQpOiBEZWxldGVkLgorICAgICAgICAqIExh eW91dFJlbG9hZGVkL0Zvcm1hdHRpbmdTdGF0ZS9JbmxpbmVGb3JtYXR0aW5nU3RhdGUuanM6Cisg ICAgICAgIChJbmxpbmVGb3JtYXR0aW5nU3RhdGUpOgorICAgICAgICAqIExheW91dFJlbG9hZGVk L0xheW91dFN0YXRlLmpzOgorICAgICAgICAoTGF5b3V0U3RhdGUucHJvdG90eXBlLmxheW91dCk6 CisgICAgICAgIChMYXlvdXRTdGF0ZS5wcm90b3R5cGUuZm9ybWF0dGluZ0NvbnRleHQpOgorCiAy MDE4LTAzLTI4ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW0xh eW91dFJlbG9hZGVkXSBJbnRyb2R1Y2UgRmxvYXRpbmdTdGF0ZS4KZGlmZiAtLWdpdCBhL1Rvb2xz L0xheW91dFJlbG9hZGVkL0Zvcm1hdHRpbmdDb250ZXh0L0Zsb2F0aW5nQ29udGV4dC5qcyBiL1Rv b2xzL0xheW91dFJlbG9hZGVkL0Zvcm1hdHRpbmdDb250ZXh0L0Zsb2F0aW5nQ29udGV4dC5qcwpp bmRleCA5NjBlOTQyNjI0MTE2YjRiMWQ0YjM2MzQwZDNhYjNjYjlhNWIyNGI5Li5mNDM0ZDBlMTJm ZWRkZTU5YTI3NzRkYjlmOTQ3OWVhOTZlZTY0MWNlIDEwMDY0NAotLS0gYS9Ub29scy9MYXlvdXRS ZWxvYWRlZC9Gb3JtYXR0aW5nQ29udGV4dC9GbG9hdGluZ0NvbnRleHQuanMKKysrIGIvVG9vbHMv TGF5b3V0UmVsb2FkZWQvRm9ybWF0dGluZ0NvbnRleHQvRmxvYXRpbmdDb250ZXh0LmpzCkBAIC0y NSwxNyArMjUsMTggQEAKIAogLy8gQWxsIGdlb21ldHJ5IGhlcmUgaXMgYWJzb2x1dGUgdG8gdGhl IGZvcm1hdHRpbmcgY29udGV4dCdzIHJvb3QuCiBjbGFzcyBGbG9hdGluZ0NvbnRleHQgewotICAg IGNvbnN0cnVjdG9yKGZsb2F0aW5nU3RhdGUpIHsKKyAgICBjb25zdHJ1Y3RvcihmbG9hdGluZ1N0 YXRlLCBwYXJlbnRGb3JtYXR0aW5nQ29udGV4dCkgewogICAgICAgICB0aGlzLm1fZmxvYXRpbmdT dGF0ZSA9IGZsb2F0aW5nU3RhdGU7CisgICAgICAgIHRoaXMubV9wYXJlbnRGb3JtYXR0aW5nQ29u dGV4dCA9IHBhcmVudEZvcm1hdHRpbmdDb250ZXh0OwogICAgIH0KIAogICAgIGNvbXB1dGVQb3Np dGlvbihsYXlvdXRCb3gpIHsKICAgICAgICAgaWYgKGxheW91dEJveC5pc091dE9mRmxvd1Bvc2l0 aW9uZWQoKSkKICAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgbGV0IGRpc3BsYXlCb3ggPSB0 aGlzLl9mb3JtYXR0aW5nQ29udGV4dCgpLmRpc3BsYXlCb3gobGF5b3V0Qm94KTsKKyAgICAgICAg bGV0IGRpc3BsYXlCb3ggPSB0aGlzLl9mb3JtYXR0aW5nU3RhdGUoKS5kaXNwbGF5Qm94KGxheW91 dEJveCk7CiAgICAgICAgIGlmIChsYXlvdXRCb3guaXNGbG9hdGluZ1Bvc2l0aW9uZWQoKSkgewog ICAgICAgICAgICAgZGlzcGxheUJveC5zZXRUb3BMZWZ0KHRoaXMuX3Bvc2l0aW9uRm9yRmxvYXRp bmcobGF5b3V0Qm94KSk7Ci0gICAgICAgICAgICB0aGlzLl9mbG9hdGluZ1N0YXRlKCkuYWRkRmxv YXRpbmcobGF5b3V0Qm94KTsKKyAgICAgICAgICAgIHRoaXMuX2FkZEZsb2F0aW5nQm94KGxheW91 dEJveCk7CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KICAgICAgICAgaWYgKFV0aWxz Lmhhc0NsZWFyKGxheW91dEJveCkpCkBAIC03Myw3ICs3NCw3IEBAIGNsYXNzIEZsb2F0aW5nQ29u dGV4dCB7CiAKICAgICBfcG9zaXRpb25Gb3JDbGVhcihsYXlvdXRCb3gpIHsKICAgICAgICAgQVNT RVJUKFV0aWxzLmhhc0NsZWFyKGxheW91dEJveCkpOwotICAgICAgICBsZXQgZGlzcGxheUJveCA9 IHRoaXMuX2Zvcm1hdHRpbmdDb250ZXh0KCkuZGlzcGxheUJveChsYXlvdXRCb3gpOworICAgICAg ICBsZXQgZGlzcGxheUJveCA9IHRoaXMuX2Zvcm1hdHRpbmdTdGF0ZSgpLmRpc3BsYXlCb3gobGF5 b3V0Qm94KTsKICAgICAgICAgaWYgKHRoaXMuX2lzRW1wdHkoKSkKICAgICAgICAgICAgIHJldHVy biBkaXNwbGF5Qm94LnRvcExlZnQoKTsKIApAQCAtOTUsNyArOTYsNyBAQCBjbGFzcyBGbG9hdGlu Z0NvbnRleHQgewogCiAgICAgX2NvbXB1dGVQb3NpdGlvblRvQXZvaWRJbnRydWRpbmdGbG9hdHMo bGF5b3V0Qm94KSB7CiAgICAgICAgIGlmICghbGF5b3V0Qm94LmVzdGFibGlzaGVzQmxvY2tGb3Jt YXR0aW5nQ29udGV4dCgpIHx8IHRoaXMuX2lzRW1wdHkoKSkKLSAgICAgICAgICAgIHJldHVybiB0 aGlzLl9mb3JtYXR0aW5nQ29udGV4dCgpLmRpc3BsYXlCb3gobGF5b3V0Qm94KS50b3BMZWZ0KCk7 CisgICAgICAgICAgICByZXR1cm4gdGhpcy5fZm9ybWF0dGluZ1N0YXRlKCkuZGlzcGxheUJveChs YXlvdXRCb3gpLnRvcExlZnQoKTsKICAgICAgICAgLy8gVGhlIGJvcmRlciBib3ggb2YgYSB0YWJs ZSwgYSBibG9jay1sZXZlbCByZXBsYWNlZCBlbGVtZW50LCBvciBhbiBlbGVtZW50IGluIHRoZSBu b3JtYWwgZmxvdyB0aGF0IGVzdGFibGlzaGVzCiAgICAgICAgIC8vIGEgbmV3IGJsb2NrIGZvcm1h dHRpbmcgY29udGV4dCAoc3VjaCBhcyBhbiBlbGVtZW50IHdpdGggJ292ZXJmbG93JyBvdGhlciB0 aGFuICd2aXNpYmxlJykgbXVzdCBub3Qgb3ZlcmxhcCB0aGUKICAgICAgICAgLy8gbWFyZ2luIGJv eCBvZiBhbnkgZmxvYXRzIGluIHRoZSBzYW1lIGJsb2NrIGZvcm1hdHRpbmcgY29udGV4dCBhcyB0 aGUgZWxlbWVudCBpdHNlbGYuCkBAIC0xODQsMTIgKzE4NSwyMyBAQCBjbGFzcyBGbG9hdGluZ0Nv bnRleHQgewogICAgICAgICByZXR1cm4gbWF4OwogICAgIH0KIAorICAgIF9hZGRGbG9hdGluZ0Jv eChsYXlvdXRCb3gpIHsKKyAgICAgICAgLy8gQ29udmVydCBmbG9hdGluZyBib3ggdG8gYWJzb2x1 dGUuCisgICAgICAgIGxldCBjbG9uZWREaXNwbGF5Qm94ID0gdGhpcy5fZm9ybWF0dGluZ0NvbnRl eHQoKS5kaXNwbGF5Qm94KGxheW91dEJveCkuY2xvbmUoKTsKKyAgICAgICAgY2xvbmVkRGlzcGxh eUJveC5zZXRSZWN0KHRoaXMuX2Zvcm1hdHRpbmdDb250ZXh0KCkuYWJzb2x1dGVNYXJnaW5Cb3go bGF5b3V0Qm94KSk7CisgICAgICAgIHRoaXMuX2Zsb2F0aW5nU3RhdGUoKS5hZGRGbG9hdGluZyhs YXlvdXRCb3gsIGNsb25lZERpc3BsYXlCb3gpOworICAgIH0KKwogICAgIF9mbG9hdGluZ1N0YXRl KCkgewogICAgICAgICByZXR1cm4gdGhpcy5tX2Zsb2F0aW5nU3RhdGU7CiAgICAgfQogCiAgICAg X2Zvcm1hdHRpbmdDb250ZXh0KCkgewotICAgICAgICByZXR1cm4gdGhpcy5fZmxvYXRpbmdTdGF0 ZSgpLmZvcm1hdHRpbmdDb250ZXh0KCk7CisgICAgICAgIHJldHVybiB0aGlzLm1fcGFyZW50Rm9y bWF0dGluZ0NvbnRleHQ7CisgICAgfQorCisgICAgX2Zvcm1hdHRpbmdTdGF0ZSgpIHsKKyAgICAg ICAgcmV0dXJuIHRoaXMuX2Zsb2F0aW5nU3RhdGUoKS5mb3JtYXR0aW5nU3RhdGUoKTsKICAgICB9 CiAKICAgICBfbGFzdEZsb2F0aW5nKCkgewpkaWZmIC0tZ2l0IGEvVG9vbHMvTGF5b3V0UmVsb2Fk ZWQvRm9ybWF0dGluZ0NvbnRleHQvRm9ybWF0dGluZ0NvbnRleHQuanMgYi9Ub29scy9MYXlvdXRS ZWxvYWRlZC9Gb3JtYXR0aW5nQ29udGV4dC9Gb3JtYXR0aW5nQ29udGV4dC5qcwppbmRleCA3MzJj Mjg4MjcyMzQ3YjBlOGEyMDY1MmJmNDY2YjFiYmMyOGNjODcxLi40MjBlMzM5OWM5NzRkODFiMTQw MTViZjJiNzNmMDE1MTA0ZWExNzA2IDEwMDY0NAotLS0gYS9Ub29scy9MYXlvdXRSZWxvYWRlZC9G b3JtYXR0aW5nQ29udGV4dC9Gb3JtYXR0aW5nQ29udGV4dC5qcworKysgYi9Ub29scy9MYXlvdXRS ZWxvYWRlZC9Gb3JtYXR0aW5nQ29udGV4dC9Gb3JtYXR0aW5nQ29udGV4dC5qcwpAQCAtMjYsNyAr MjYsNyBAQAogY2xhc3MgRm9ybWF0dGluZ0NvbnRleHQgewogICAgIGNvbnN0cnVjdG9yKGZvcm1h dHRpbmdTdGF0ZSkgewogICAgICAgICB0aGlzLm1fZm9ybWF0dGluZ1N0YXRlID0gZm9ybWF0dGlu Z1N0YXRlOwotICAgICAgICB0aGlzLm1fZmxvYXRpbmdDb250ZXh0ID0gbmV3IEZsb2F0aW5nQ29u dGV4dChmb3JtYXR0aW5nU3RhdGUuZmxvYXRpbmdTdGF0ZSgpKTsKKyAgICAgICAgdGhpcy5tX2Zs b2F0aW5nQ29udGV4dCA9IG5ldyBGbG9hdGluZ0NvbnRleHQoZm9ybWF0dGluZ1N0YXRlLmZsb2F0 aW5nU3RhdGUoKSwgdGhpcyk7CiAgICAgICAgIHRoaXMubV9sYXlvdXRTdGFjayA9IG5ldyBBcnJh eSgpOwogICAgIH0KIApkaWZmIC0tZ2l0IGEvVG9vbHMvTGF5b3V0UmVsb2FkZWQvRm9ybWF0dGlu Z1N0YXRlL0Jsb2NrRm9ybWF0dGluZ1N0YXRlLmpzIGIvVG9vbHMvTGF5b3V0UmVsb2FkZWQvRm9y bWF0dGluZ1N0YXRlL0Jsb2NrRm9ybWF0dGluZ1N0YXRlLmpzCmluZGV4IGRmNjBkZDExNmZiNDI0 ZTFhYzFhN2NiNmEwNDQ3ZmQyZjgwNmIyZWUuLjA3YmQ5MGQ2M2Q4ZDkzYjBjZTQ0MTliMzYwOTBj MTRjYmRmZDhiMTEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0xheW91dFJlbG9hZGVkL0Zvcm1hdHRpbmdT dGF0ZS9CbG9ja0Zvcm1hdHRpbmdTdGF0ZS5qcworKysgYi9Ub29scy9MYXlvdXRSZWxvYWRlZC9G b3JtYXR0aW5nU3RhdGUvQmxvY2tGb3JtYXR0aW5nU3RhdGUuanMKQEAgLTI2LDggKzI2LDcgQEAK IGNsYXNzIEJsb2NrRm9ybWF0dGluZ1N0YXRlIGV4dGVuZHMgRm9ybWF0dGluZ1N0YXRlIHsKICAg ICBjb25zdHJ1Y3Rvcihmb3JtYXR0aW5nUm9vdCwgbGF5b3V0U3RhdGUpIHsKICAgICAgICAgc3Vw ZXIobGF5b3V0U3RhdGUsIGZvcm1hdHRpbmdSb290KTsKLSAgICAgICAgLy8gTmV3IGJsb2NrIGZv cm1hdHRpbmcgY29udGV4dCBhbHdheXMgZXN0YWJsaXNoZXMgYSBuZXcgZmxvYXRpbmcgY29udGV4 dC4KKyAgICAgICAgLy8gTmV3IGJsb2NrIGZvcm1hdHRpbmcgc3RhdGUgYWx3YXlzIGVzdGFibGlz aGVzIGEgbmV3IGZsb2F0aW5nIHN0YXRlLgogICAgICAgICB0aGlzLm1fZmxvYXRpbmdTdGF0ZSA9 IG5ldyBGbG9hdGluZ1N0YXRlKHRoaXMpOwotICAgICAgICB0aGlzLm1fZm9ybWF0dGluZ0NvbnRl eHQgPSBuZXcgQmxvY2tGb3JtYXR0aW5nQ29udGV4dCh0aGlzKTsKICAgICB9CiB9CmRpZmYgLS1n aXQgYS9Ub29scy9MYXlvdXRSZWxvYWRlZC9Gb3JtYXR0aW5nU3RhdGUvRmxvYXRpbmdTdGF0ZS5q cyBiL1Rvb2xzL0xheW91dFJlbG9hZGVkL0Zvcm1hdHRpbmdTdGF0ZS9GbG9hdGluZ1N0YXRlLmpz CmluZGV4IDE3YWQxYTIzZTRkMjg2MTFkNmJmNDgxMjc0Mzg3YjRhYTVkNDVmODguLmU3NTQ5OGE1 M2Q1OGNmYzM4OWNlM2JkZWQ1NTk1OTgzMmMxMTk3ZjYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0xheW91 dFJlbG9hZGVkL0Zvcm1hdHRpbmdTdGF0ZS9GbG9hdGluZ1N0YXRlLmpzCisrKyBiL1Rvb2xzL0xh eW91dFJlbG9hZGVkL0Zvcm1hdHRpbmdTdGF0ZS9GbG9hdGluZ1N0YXRlLmpzCkBAIC0yNCwyMyAr MjQsMjAgQEAKICAqLwogCiBjbGFzcyBGbG9hdGluZ1N0YXRlIHsKLSAgICBjb25zdHJ1Y3Rvcihm b3JtYXR0aW5nU3RhdGUpIHsKLSAgICAgICAgdGhpcy5tX2Zvcm1hdHRpbmdTdGF0ZSA9IGZvcm1h dHRpbmdTdGF0ZTsKKyAgICBjb25zdHJ1Y3RvcihwYXJlbnRGb3JtYXR0aW5nU3RhdGUpIHsKKyAg ICAgICAgdGhpcy5tX3BhcmVudEZvcm1hdHRpbmdTdGF0ZSA9IHBhcmVudEZvcm1hdHRpbmdTdGF0 ZTsKICAgICAgICAgdGhpcy5tX2xlZnRGbG9hdGluZ0JveFN0YWNrID0gbmV3IEFycmF5KCk7CiAg ICAgICAgIHRoaXMubV9yaWdodEZsb2F0aW5nQm94U3RhY2sgPSBuZXcgQXJyYXkoKTsKICAgICAg ICAgdGhpcy5tX2xhc3RGbG9hdGluZyA9IG51bGw7CiAgICAgfQogCi0gICAgYWRkRmxvYXRpbmco ZmxvYXRpbmdCb3gpIHsKLSAgICAgICAgLy8gQ29udmVydCBmbG9hdGluZyBib3ggdG8gYWJzb2x1 dGUuCi0gICAgICAgIGxldCBmbG9hdGluZ0Rpc3BsYXlCb3ggPSB0aGlzLmZvcm1hdHRpbmdDb250 ZXh0KCkuZGlzcGxheUJveChmbG9hdGluZ0JveCkuY2xvbmUoKTsKLSAgICAgICAgZmxvYXRpbmdE aXNwbGF5Qm94LnNldFJlY3QodGhpcy5mb3JtYXR0aW5nQ29udGV4dCgpLmFic29sdXRlTWFyZ2lu Qm94KGZsb2F0aW5nQm94KSk7Ci0gICAgICAgIHRoaXMubV9sYXN0RmxvYXRpbmcgPSBmbG9hdGlu Z0Rpc3BsYXlCb3g7Ci0gICAgICAgIGlmIChVdGlscy5pc0Zsb2F0aW5nTGVmdChmbG9hdGluZ0Jv eCkpIHsKLSAgICAgICAgICAgIHRoaXMubV9sZWZ0RmxvYXRpbmdCb3hTdGFjay5wdXNoKGZsb2F0 aW5nRGlzcGxheUJveCk7CisgICAgYWRkRmxvYXRpbmcobGF5b3V0Qm94LCBkaXNwbGF5Qm94KSB7 CisgICAgICAgIHRoaXMubV9sYXN0RmxvYXRpbmcgPSBkaXNwbGF5Qm94OworICAgICAgICBpZiAo VXRpbHMuaXNGbG9hdGluZ0xlZnQobGF5b3V0Qm94KSkgeworICAgICAgICAgICAgdGhpcy5tX2xl ZnRGbG9hdGluZ0JveFN0YWNrLnB1c2goZGlzcGxheUJveCk7CiAgICAgICAgICAgICByZXR1cm47 CiAgICAgICAgIH0KLSAgICAgICAgdGhpcy5tX3JpZ2h0RmxvYXRpbmdCb3hTdGFjay5wdXNoKGZs b2F0aW5nRGlzcGxheUJveCk7CisgICAgICAgIHRoaXMubV9yaWdodEZsb2F0aW5nQm94U3RhY2su cHVzaChkaXNwbGF5Qm94KTsKICAgICB9CiAKICAgICBsZWZ0RmxvYXRpbmdTdGFjaygpIHsKQEAg LTU1LDcgKzUyLDcgQEAgY2xhc3MgRmxvYXRpbmdTdGF0ZSB7CiAgICAgICAgIHJldHVybiB0aGlz Lm1fbGFzdEZsb2F0aW5nOwogICAgIH0KIAotICAgIGZvcm1hdHRpbmdDb250ZXh0KCkgewotICAg ICAgICByZXR1cm4gdGhpcy5tX2Zvcm1hdHRpbmdTdGF0ZS5mb3JtYXR0aW5nQ29udGV4dCgpOwor ICAgIGZvcm1hdHRpbmdTdGF0ZSgpIHsKKyAgICAgICAgcmV0dXJuIHRoaXMubV9wYXJlbnRGb3Jt YXR0aW5nU3RhdGU7CiAgICAgfQogfQpkaWZmIC0tZ2l0IGEvVG9vbHMvTGF5b3V0UmVsb2FkZWQv Rm9ybWF0dGluZ1N0YXRlL0Zvcm1hdHRpbmdTdGF0ZS5qcyBiL1Rvb2xzL0xheW91dFJlbG9hZGVk L0Zvcm1hdHRpbmdTdGF0ZS9Gb3JtYXR0aW5nU3RhdGUuanMKaW5kZXggMmE5ZWI4NmRhMDY2NTZj NGJjMmM4MzAyODAwODk0NWMxMGUyNGFjNi4uMmM2OTZkZWExZWRlZTM1YTllZWQ0NThhNjNiY2Ex YWM5NDQ4YmVjNyAxMDA2NDQKLS0tIGEvVG9vbHMvTGF5b3V0UmVsb2FkZWQvRm9ybWF0dGluZ1N0 YXRlL0Zvcm1hdHRpbmdTdGF0ZS5qcworKysgYi9Ub29scy9MYXlvdXRSZWxvYWRlZC9Gb3JtYXR0 aW5nU3RhdGUvRm9ybWF0dGluZ1N0YXRlLmpzCkBAIC0yNiwxNiArMjYsMTEgQEAKIGNsYXNzIEZv cm1hdHRpbmdTdGF0ZSB7CiAgICAgY29uc3RydWN0b3IobGF5b3V0U3RhdGUsIGZvcm1hdHRpbmdS b290KSB7CiAgICAgICAgIHRoaXMubV9sYXlvdXRTdGF0ZSA9IGxheW91dFN0YXRlOwotICAgICAg ICB0aGlzLm1fZm9ybWF0dGluZ0NvbnRleHQgPSBudWxsOwogICAgICAgICB0aGlzLm1fZm9ybWF0 dGluZ1Jvb3QgPSBmb3JtYXR0aW5nUm9vdDsKICAgICAgICAgdGhpcy5tX2Zsb2F0aW5nU3RhdGUg PSBudWxsOwogICAgICAgICB0aGlzLm1fZGlzcGxheVRvTGF5b3V0ID0gbmV3IE1hcCgpOwogICAg IH0KIAotICAgIGZvcm1hdHRpbmdDb250ZXh0KCkgewotICAgICAgICByZXR1cm4gdGhpcy5tX2Zv cm1hdHRpbmdDb250ZXh0OwotICAgIH0KLQogICAgIGZvcm1hdHRpbmdSb290KCkgewogICAgICAg ICByZXR1cm4gdGhpcy5tX2Zvcm1hdHRpbmdSb290OwogICAgIH0KZGlmZiAtLWdpdCBhL1Rvb2xz L0xheW91dFJlbG9hZGVkL0Zvcm1hdHRpbmdTdGF0ZS9JbmxpbmVGb3JtYXR0aW5nU3RhdGUuanMg Yi9Ub29scy9MYXlvdXRSZWxvYWRlZC9Gb3JtYXR0aW5nU3RhdGUvSW5saW5lRm9ybWF0dGluZ1N0 YXRlLmpzCmluZGV4IDI1YWFmZmZiOWY3NTcxODI0NmIyZTlhNDk2MTNiYjU2MmI2YTVhOTUuLmI5 YTg3NGUzNjNmY2U3MDU5YzM1YjlmNjE1OGI0MmU1YTk3NTg0NzcgMTAwNjQ0Ci0tLSBhL1Rvb2xz L0xheW91dFJlbG9hZGVkL0Zvcm1hdHRpbmdTdGF0ZS9JbmxpbmVGb3JtYXR0aW5nU3RhdGUuanMK KysrIGIvVG9vbHMvTGF5b3V0UmVsb2FkZWQvRm9ybWF0dGluZ1N0YXRlL0lubGluZUZvcm1hdHRp bmdTdGF0ZS5qcwpAQCAtMzIsNyArMzIsNiBAQCBjbGFzcyBJbmxpbmVGb3JtYXR0aW5nU3RhdGUg ZXh0ZW5kcyBGb3JtYXR0aW5nU3RhdGUgewogICAgICAgICBlbHNlIHsKICAgICAgICAgICAgIC8v IFRPRE86IHVzZSBwYXJlbnQgZm9ybWF0dGluZyBjb250ZXh0J3MgZmxvYXRpbmcgc3RhdGUuCiAg ICAgICAgIH0KLSAgICAgICAgdGhpcy5tX2Zvcm1hdHRpbmdDb250ZXh0ID0gbmV3IElubGluZUZv cm1hdHRpbmdDb250ZXh0KHRoaXMpOwogICAgICAgICB0aGlzLm1fbGluZXMgPSBuZXcgQXJyYXko KTsKICAgICB9CiAKZGlmZiAtLWdpdCBhL1Rvb2xzL0xheW91dFJlbG9hZGVkL0xheW91dFN0YXRl LmpzIGIvVG9vbHMvTGF5b3V0UmVsb2FkZWQvTGF5b3V0U3RhdGUuanMKaW5kZXggNGYwNTMzM2U5 ZmUzMmMzYTQ4N2Q0ZDk5ZDJhMWRiMWI3YWU1M2I0YS4uYjI0MWMxZGU2ZmMyY2UxODRhM2IwMzMx ZDBmOTM0NTRlY2E2MTgwZiAxMDA2NDQKLS0tIGEvVG9vbHMvTGF5b3V0UmVsb2FkZWQvTGF5b3V0 U3RhdGUuanMKKysrIGIvVG9vbHMvTGF5b3V0UmVsb2FkZWQvTGF5b3V0U3RhdGUuanMKQEAgLTMy LDcgKzMyLDcgQEAgY2xhc3MgTGF5b3V0U3RhdGUgewogICAgIGxheW91dChmb3JtYXR0aW5nUm9v dCkgewogICAgICAgICBsZXQgZm9ybWF0dGluZ1N0YXRlID0gdGhpcy5fY3JlYXRlRm9ybWF0dGlu Z1N0YXRlKGZvcm1hdHRpbmdSb290KTsKICAgICAgICAgdGhpcy5tX2Zvcm1hdHRpbmdTdGF0ZXMu c2V0KGZvcm1hdHRpbmdSb290LCBmb3JtYXR0aW5nU3RhdGUpOwotICAgICAgICBmb3JtYXR0aW5n U3RhdGUuZm9ybWF0dGluZ0NvbnRleHQoKS5sYXlvdXQoKTsKKyAgICAgICAgdGhpcy5mb3JtYXR0 aW5nQ29udGV4dChmb3JtYXR0aW5nU3RhdGUpLmxheW91dCgpOwogICAgIH0KIAogICAgIF9jcmVh dGVGb3JtYXR0aW5nU3RhdGUoZm9ybWF0dGluZ1Jvb3QpIHsKQEAgLTQ1LDYgKzQ1LDE1IEBAIGNs YXNzIExheW91dFN0YXRlIHsKICAgICAgICAgcmV0dXJuIG51bGw7CiAgICAgfQogCisgICAgZm9y bWF0dGluZ0NvbnRleHQoZm9ybWF0dGluZ1N0YXRlKSB7CisgICAgICAgIGlmIChmb3JtYXR0aW5n U3RhdGUgaW5zdGFuY2VvZiBCbG9ja0Zvcm1hdHRpbmdTdGF0ZSkKKyAgICAgICAgICAgIHJldHVy biBuZXcgQmxvY2tGb3JtYXR0aW5nQ29udGV4dChmb3JtYXR0aW5nU3RhdGUpOworICAgICAgICBp ZiAoZm9ybWF0dGluZ1N0YXRlIGluc3RhbmNlb2YgSW5saW5lRm9ybWF0dGluZ1N0YXRlKQorICAg ICAgICAgICAgcmV0dXJuIG5ldyBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dChmb3JtYXR0aW5nU3Rh dGUpOworICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKyAgICAgICAgcmV0dXJuIG51bGw7 CisgICAgfQorCiAgICAgZm9ybWF0dGluZ1N0YXRlcygpIHsKICAgICAgICAgcmV0dXJuIHRoaXMu bV9mb3JtYXR0aW5nU3RhdGVzOwogICAgIH0K