183766 2018-03-19 21:58:04 -0700 [LayoutReloaded] Layout.Box should not create the formatting context. 2018-03-19 22:03:32 -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 1407580 0 zalan 2018-03-19 21:58:04 -0700 LayoutContext will do it instead. 1407581 1 336100 zalan 2018-03-19 22:00:22 -0700 Created attachment 336100 Patch 1407582 2 zalan 2018-03-19 22:02:46 -0700 Committed r229739: <https://trac.webkit.org/changeset/229739> 1407583 3 webkit-bug-importer 2018-03-19 22:03:32 -0700 <rdar://problem/38651039> 336100 2018-03-19 22:00:22 -0700 2018-03-19 22:00:22 -0700 Patch bug-183766-20180319220021.patch text/plain 12890 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjI5NzM0CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMzk5NDY1ODg5YmFmMDJiZjI3YTc1YmY2NzQwYjYwNDQx NGY4OWNiNS4uOGI0N2ZjNTA4NTAxYzdkMWUwOGViMDliOGYxNjkzZmQxOTc0ZmNhNCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM4 IEBACisyMDE4LTAzLTE5ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAg ICAgW0xheW91dFJlbG9hZGVkXSBMYXlvdXQuQm94IHNob3VsZCBub3QgY3JlYXRlIHRoZSBmb3Jt YXR0aW5nIGNvbnRleHQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xODM3NjYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBTaW5jZSB0aGUgZm9ybWF0dGluZ0NvbnRleHQncyBsaWZldGltZSBpcyB0aWVkIHRv IHRoZSBsYXlvdXQsIHRoZSBMYXlvdXRDb250ZXh0CisgICAgICAgIHNob3VsZCBjb25zdHJ1Y3Qg aXQgaW5zdGVhZC4KKworICAgICAgICAqIExheW91dFJlbG9hZGVkL0Zvcm1hdHRpbmdDb250ZXh0 L0Jsb2NrRm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0LmpzOgorICAgICAgICAoQmxv Y2tGb3JtYXR0aW5nQ29udGV4dCk6CisgICAgICAgIChCbG9ja0Zvcm1hdHRpbmdDb250ZXh0LnBy b3RvdHlwZS5sYXlvdXQpOgorICAgICAgICAoQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5wcm90b3R5 cGUuX2xheW91dE91dE9mRmxvd0Rlc2NlbmRhbnRzKToKKyAgICAgICAgKEJsb2NrRm9ybWF0dGlu Z0NvbnRleHQucHJvdG90eXBlLl9jb250ZW50SGVpZ2h0KToKKyAgICAgICAgKiBMYXlvdXRSZWxv YWRlZC9Gb3JtYXR0aW5nQ29udGV4dC9Gb3JtYXR0aW5nQ29udGV4dC5qczoKKyAgICAgICAgKEZv cm1hdHRpbmdDb250ZXh0KToKKyAgICAgICAgKEZvcm1hdHRpbmdDb250ZXh0LnByb3RvdHlwZS5s YXlvdXRDb250ZXh0KToKKyAgICAgICAgKEZvcm1hdHRpbmdDb250ZXh0LnByb3RvdHlwZS50b0Rp c3BsYXlCb3gpOgorICAgICAgICAoRm9ybWF0dGluZ0NvbnRleHQucHJvdG90eXBlLl9vdXRPZkZs b3dEZXNjZW5kYW50cyk6CisgICAgICAgICogTGF5b3V0UmVsb2FkZWQvRm9ybWF0dGluZ0NvbnRl eHQvSW5saW5lRm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5qczoKKyAgICAgICAg KElubGluZUZvcm1hdHRpbmdDb250ZXh0KToKKyAgICAgICAgKElubGluZUZvcm1hdHRpbmdDb250 ZXh0LnByb3RvdHlwZS5sYXlvdXQpOgorICAgICAgICAqIExheW91dFJlbG9hZGVkL0xheW91dC5q czoKKyAgICAgICAgKGxheW91dCk6CisgICAgICAgICogTGF5b3V0UmVsb2FkZWQvTGF5b3V0Q29u dGV4dC5qczoKKyAgICAgICAgKExheW91dENvbnRleHQucHJvdG90eXBlLmxheW91dCk6CisgICAg ICAgIChMYXlvdXRDb250ZXh0LnByb3RvdHlwZS5fY3JlYXRlRm9ybWF0dGluZ0NvbnRleHQpOgor ICAgICAgICAoTGF5b3V0Q29udGV4dCk6CisgICAgICAgIChMYXlvdXRDb250ZXh0LnByb3RvdHlw ZS5sYXlvdXRGb3JtYXR0aW5nQ29udGV4dCk6IERlbGV0ZWQuCisgICAgICAgICogTGF5b3V0UmVs b2FkZWQvTGF5b3V0VHJlZS9Cb3guanM6CisgICAgICAgIChMYXlvdXQuQm94KToKKyAgICAgICAg KExheW91dC5Cb3gucHJvdG90eXBlLmVzdGFibGlzaGVkRm9ybWF0dGluZ0NvbnRleHQpOiBEZWxl dGVkLgorICAgICAgICAqIExheW91dFJlbG9hZGVkL21pc2MvaGVhZGVycy9Cb3guaDoKKwogMjAx OC0wMy0xOSAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtMYXlv dXRSZWxvYWRlZF0gUmVtb3ZlIGJvcmRlci9wYWRkaW5nL2NvbnRlbnRCb3goKSBmdW5jdGlvbnMg ZnJvbSBMYXlvdXQuQm94CmRpZmYgLS1naXQgYS9Ub29scy9MYXlvdXRSZWxvYWRlZC9Gb3JtYXR0 aW5nQ29udGV4dC9CbG9ja0Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5qcyBiL1Rv b2xzL0xheW91dFJlbG9hZGVkL0Zvcm1hdHRpbmdDb250ZXh0L0Jsb2NrRm9ybWF0dGluZy9CbG9j a0Zvcm1hdHRpbmdDb250ZXh0LmpzCmluZGV4IGU5MTc5NjMyMmFmMmFmMjE2OTliZjc4MDA5NTAy MWFjZDQxZTkwMzUuLmQ4ZWEyZjBiZWE1M2QyYmM2YmYxMDIwMzM2Yzg0NGIyODZmYzIyNGYgMTAw NjQ0Ci0tLSBhL1Rvb2xzL0xheW91dFJlbG9hZGVkL0Zvcm1hdHRpbmdDb250ZXh0L0Jsb2NrRm9y bWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0LmpzCisrKyBiL1Rvb2xzL0xheW91dFJlbG9h ZGVkL0Zvcm1hdHRpbmdDb250ZXh0L0Jsb2NrRm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250 ZXh0LmpzCkBAIC0yMywxMyArMjMsMTMgQEAKICAqIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYg QURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCiAgKi8KIGNsYXNzIEJs b2NrRm9ybWF0dGluZ0NvbnRleHQgZXh0ZW5kcyBGb3JtYXR0aW5nQ29udGV4dCB7Ci0gICAgY29u c3RydWN0b3Iocm9vdCkgewotICAgICAgICBzdXBlcihyb290KTsKKyAgICBjb25zdHJ1Y3Rvcihy b290LCBsYXlvdXRDb250ZXh0KSB7CisgICAgICAgIHN1cGVyKHJvb3QsIGxheW91dENvbnRleHQp OwogICAgICAgICAvLyBOZXcgYmxvY2sgZm9ybWF0dGluZyBjb250ZXh0IGFsd2F5cyBlc3RhYmxp c2hlcyBhIG5ldyBmbG9hdGluZyBjb250ZXh0LgogICAgICAgICB0aGlzLm1fZmxvYXRpbmdDb250 ZXh0ID0gbmV3IEZsb2F0aW5nQ29udGV4dCh0aGlzKTsKICAgICB9CiAKLSAgICBsYXlvdXQobGF5 b3V0Q29udGV4dCkgeworICAgIGxheW91dCgpIHsKICAgICAgICAgLy8gOS40LjEgQmxvY2sgZm9y bWF0dGluZyBjb250ZXh0cwogICAgICAgICAvLyBJbiBhIGJsb2NrIGZvcm1hdHRpbmcgY29udGV4 dCwgYm94ZXMgYXJlIGxhaWQgb3V0IG9uZSBhZnRlciB0aGUgb3RoZXIsIHZlcnRpY2FsbHksIGJl Z2lubmluZyBhdCB0aGUgdG9wIG9mIGEgY29udGFpbmluZyBibG9jay4KICAgICAgICAgLy8gVGhl IHZlcnRpY2FsIGRpc3RhbmNlIGJldHdlZW4gdHdvIHNpYmxpbmcgYm94ZXMgaXMgZGV0ZXJtaW5l ZCBieSB0aGUgJ21hcmdpbicgcHJvcGVydGllcy4KQEAgLTUwLDcgKzUwLDcgQEAgY2xhc3MgQmxv Y2tGb3JtYXR0aW5nQ29udGV4dCBleHRlbmRzIEZvcm1hdHRpbmdDb250ZXh0IHsKICAgICAgICAg ICAgICAgICB0aGlzLmNvbXB1dGVXaWR0aChsYXlvdXRCb3gpOwogICAgICAgICAgICAgICAgIHRo aXMuX2NvbXB1dGVTdGF0aWNQb3NpdGlvbihsYXlvdXRCb3gpOwogICAgICAgICAgICAgICAgIGlm IChsYXlvdXRCb3guZXN0YWJsaXNoZXNGb3JtYXR0aW5nQ29udGV4dCgpKSB7Ci0gICAgICAgICAg ICAgICAgICAgIGxheW91dENvbnRleHQubGF5b3V0Rm9ybWF0dGluZ0NvbnRleHQobGF5b3V0Qm94 LmVzdGFibGlzaGVkRm9ybWF0dGluZ0NvbnRleHQoKSk7CisgICAgICAgICAgICAgICAgICAgIHRo aXMubGF5b3V0Q29udGV4dCgpLmxheW91dChsYXlvdXRCb3gpOwogICAgICAgICAgICAgICAgICAg ICBicmVhazsKICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgaWYgKCFsYXlvdXRC b3guaXNDb250YWluZXIoKSB8fCAhbGF5b3V0Qm94Lmhhc0luRmxvd09yRmxvYXRDaGlsZCgpKQpA QCAtNzgsNyArNzgsNyBAQCBjbGFzcyBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0IGV4dGVuZHMgRm9y bWF0dGluZ0NvbnRleHQgewogICAgICAgICAvLyBQbGFjZSB0aGUgaW5mbG93IHBvc2l0aW9uZWQg Y2hpbGRyZW4uCiAgICAgICAgIHRoaXMuX3BsYWNlSW5GbG93UG9zaXRpb25lZENoaWxkcmVuKHRo aXMucm9vdENvbnRhaW5lcigpKTsKICAgICAgICAgLy8gQW5kIHRha2UgY2FyZSBvZiBvdXQtb2Yt ZmxvdyBib3hlcyBhcyB0aGUgZmluYWwgc3RlcC4KLSAgICAgICAgdGhpcy5fbGF5b3V0T3V0T2ZG bG93RGVzY2VuZGFudHMobGF5b3V0Q29udGV4dCk7CisgICAgICAgIHRoaXMuX2xheW91dE91dE9m Rmxvd0Rlc2NlbmRhbnRzKCk7CiAgICB9CiAKICAgICBjb21wdXRlV2lkdGgobGF5b3V0Qm94KSB7 CkBAIC0xMzQsMTQgKzEzNCwxNCBAQCBjbGFzcyBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0IGV4dGVu ZHMgRm9ybWF0dGluZ0NvbnRleHQgewogICAgICAgICB9CiAgICAgfQogCi0gICAgX2xheW91dE91 dE9mRmxvd0Rlc2NlbmRhbnRzKGxheW91dENvbnRleHQpIHsKKyAgICBfbGF5b3V0T3V0T2ZGbG93 RGVzY2VuZGFudHMoKSB7CiAgICAgICAgIC8vIFRoaXMgbGF5cyBvdXQgYWxsIHRoZSBvdXQtb2Yt ZmxvdyBib3hlcyB0aGF0IGJlbG9uZyB0byB0aGlzIGZvcm1hdHRpbmcgY29udGV4dCBldmVuIGlm CiAgICAgICAgIC8vIHRoZSByb290IGNvbnRhaW5lciBpcyBub3QgdGhlIGNvbnRhaW5pbmcgYmxv Y2suCiAgICAgICAgIGxldCBvdXRPZkZsb3dEZXNjZW5kYW50cyA9IHRoaXMuX291dE9mRmxvd0Rl c2NlbmRhbnRzKCk7CiAgICAgICAgIGZvciAobGV0IG91dE9mRmxvd0JveCBvZiBvdXRPZkZsb3dE ZXNjZW5kYW50cykgewogICAgICAgICAgICAgdGhpcy5fYWRkVG9MYXlvdXRRdWV1ZShvdXRPZkZs b3dCb3gpOwogICAgICAgICAgICAgdGhpcy5jb21wdXRlV2lkdGgob3V0T2ZGbG93Qm94KTsKLSAg ICAgICAgICAgIGxheW91dENvbnRleHQubGF5b3V0Rm9ybWF0dGluZ0NvbnRleHQob3V0T2ZGbG93 Qm94LmVzdGFibGlzaGVkRm9ybWF0dGluZ0NvbnRleHQoKSk7CisgICAgICAgICAgICB0aGlzLmxh eW91dENvbnRleHQoKS5sYXlvdXQob3V0T2ZGbG93Qm94KTsKICAgICAgICAgICAgIHRoaXMuY29t cHV0ZUhlaWdodChvdXRPZkZsb3dCb3gpOwogICAgICAgICAgICAgdGhpcy5fY29tcHV0ZU91dE9m Rmxvd1Bvc2l0aW9uKG91dE9mRmxvd0JveCk7CiAgICAgICAgICAgICB0aGlzLl9yZW1vdmVGcm9t TGF5b3V0UXVldWUob3V0T2ZGbG93Qm94KTsKQEAgLTI2Myw3ICsyNjMsNiBAQCBjbGFzcyBCbG9j a0Zvcm1hdHRpbmdDb250ZXh0IGV4dGVuZHMgRm9ybWF0dGluZ0NvbnRleHQgewogICAgICAgICBp ZiAoIWxheW91dEJveC5pc0NvbnRhaW5lcigpIHx8ICFsYXlvdXRCb3guaGFzSW5GbG93Q2hpbGQo KSkKICAgICAgICAgICAgIHJldHVybiAwOwogICAgICAgICBpZiAobGF5b3V0Qm94LmVzdGFibGlz aGVzSW5saW5lRm9ybWF0dGluZ0NvbnRleHQoKSkgewotICAgICAgICAgICAgQVNTRVJUKGxheW91 dEJveC5lc3RhYmxpc2hlZEZvcm1hdHRpbmdDb250ZXh0KCkpOwogICAgICAgICAgICAgbGV0IGxp bmVzID0gbGF5b3V0Qm94LmVzdGFibGlzaGVkRm9ybWF0dGluZ0NvbnRleHQoKS5saW5lcygpOwog ICAgICAgICAgICAgaWYgKCFsaW5lcy5sZW5ndGgpCiAgICAgICAgICAgICAgICAgcmV0dXJuIDA7 CmRpZmYgLS1naXQgYS9Ub29scy9MYXlvdXRSZWxvYWRlZC9Gb3JtYXR0aW5nQ29udGV4dC9Gb3Jt YXR0aW5nQ29udGV4dC5qcyBiL1Rvb2xzL0xheW91dFJlbG9hZGVkL0Zvcm1hdHRpbmdDb250ZXh0 L0Zvcm1hdHRpbmdDb250ZXh0LmpzCmluZGV4IGE2YTY0Njg0MzUyNjQ0NTBjNTQ4ZGQ2YjMyYzk5 YTNlNWI4OWRlNTYuLmI5MWQxMGEyNmJhM2YwNTI0ZjYwZGEzZTAyMzM3MWUyYWU0NWExMDMgMTAw NjQ0Ci0tLSBhL1Rvb2xzL0xheW91dFJlbG9hZGVkL0Zvcm1hdHRpbmdDb250ZXh0L0Zvcm1hdHRp bmdDb250ZXh0LmpzCisrKyBiL1Rvb2xzL0xheW91dFJlbG9hZGVkL0Zvcm1hdHRpbmdDb250ZXh0 L0Zvcm1hdHRpbmdDb250ZXh0LmpzCkBAIC0yNCw4ICsyNCw5IEBACiAgKi8KIAogY2xhc3MgRm9y bWF0dGluZ0NvbnRleHQgewotICAgIGNvbnN0cnVjdG9yKHJvb3RDb250YWluZXIpIHsKKyAgICBj b25zdHJ1Y3Rvcihyb290Q29udGFpbmVyLCBsYXlvdXRDb250ZXh0KSB7CiAgICAgICAgIHRoaXMu bV9yb290Q29udGFpbmVyID0gcm9vdENvbnRhaW5lcjsKKyAgICAgICAgdGhpcy5tX2xheW91dENv bnRleHQgPSBsYXlvdXRDb250ZXh0OwogICAgICAgICB0aGlzLm1fZmxvYXRpbmdDb250ZXh0ID0g bnVsbDsKICAgICAgICAgdGhpcy5tX2Rpc3BsYXlUb0xheW91dCA9IG5ldyBNYXAoKTsKICAgICAg ICAgdGhpcy5tX2xheW91dFRvRGlzcGxheSA9IG5ldyBNYXAoKTsKQEAgLTM2LDYgKzM3LDEwIEBA IGNsYXNzIEZvcm1hdHRpbmdDb250ZXh0IHsKICAgICAgICAgcmV0dXJuIHRoaXMubV9yb290Q29u dGFpbmVyOwogICAgIH0KIAorICAgIGxheW91dENvbnRleHQoKSB7CisgICAgICAgIHJldHVybiB0 aGlzLm1fbGF5b3V0Q29udGV4dDsKKyAgICB9CisKICAgICBmbG9hdGluZ0NvbnRleHQoKSB7CiAg ICAgICAgIHJldHVybiB0aGlzLm1fZmxvYXRpbmdDb250ZXh0OwogICAgIH0KQEAgLTE0MywxMCAr MTQ4LDcgQEAgY2xhc3MgRm9ybWF0dGluZ0NvbnRleHQgewogCiAgICAgdG9EaXNwbGF5Qm94KGxh eW91dEJveCkgewogICAgICAgICBBU1NFUlQobGF5b3V0Qm94KTsKLSAgICAgICAgQVNTRVJUKHRo aXMubV9sYXlvdXRUb0Rpc3BsYXkuaGFzKGxheW91dEJveCkgfHwgbGF5b3V0Qm94LmVzdGFibGlz aGVkRm9ybWF0dGluZ0NvbnRleHQoKSA9PSB0aGlzKTsKLSAgICAgICAgaWYgKGxheW91dEJveC5l c3RhYmxpc2hlZEZvcm1hdHRpbmdDb250ZXh0KCkgPT0gdGhpcykKLSAgICAgICAgICAgIHJldHVy biBsYXlvdXRCb3guZGlzcGxheUJveCgpOwotICAgICAgICByZXR1cm4gdGhpcy5tX2xheW91dFRv RGlzcGxheS5nZXQobGF5b3V0Qm94KTsKKyAgICAgICAgcmV0dXJuIGxheW91dEJveC5kaXNwbGF5 Qm94KCk7CiAgICAgfQogCiAgICAgdG9MYXlvdXRCb3goZGlzcGxheUJveCkgewpAQCAtMTgyLDcg KzE4NCw3IEBAIGNsYXNzIEZvcm1hdHRpbmdDb250ZXh0IHsKICAgICAgICAgICAgIGlmIChjb250 YWluaW5nQmxvY2sgPT0gdGhpcy5yb290Q29udGFpbmVyKCkpCiAgICAgICAgICAgICAgICAgb3V0 T2ZGbG93Qm94ZXMucHVzaChvdXRPZkZsb3dCb3gpOwogICAgICAgICAgICAgZWxzZSBpZiAoY29u dGFpbmluZ0Jsb2NrLmlzRGVzY2VuZGFudE9mKHRoaXMucm9vdENvbnRhaW5lcigpKSkgewotICAg ICAgICAgICAgICAgIGlmICghY29udGFpbmluZ0Jsb2NrLmVzdGFibGlzaGVkRm9ybWF0dGluZ0Nv bnRleHQoKSB8fCAhY29udGFpbmluZ0Jsb2NrLmlzUG9zaXRpb25lZCgpKQorICAgICAgICAgICAg ICAgIGlmICghY29udGFpbmluZ0Jsb2NrLmVzdGFibGlzaGVzRm9ybWF0dGluZ0NvbnRleHQoKSB8 fCAhY29udGFpbmluZ0Jsb2NrLmlzUG9zaXRpb25lZCgpKQogICAgICAgICAgICAgICAgICAgICBv dXRPZkZsb3dCb3hlcy5wdXNoKG91dE9mRmxvd0JveCk7CiAgICAgICAgICAgICB9CiAgICAgICAg IH0KZGlmZiAtLWdpdCBhL1Rvb2xzL0xheW91dFJlbG9hZGVkL0Zvcm1hdHRpbmdDb250ZXh0L0lu bGluZUZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuanMgYi9Ub29scy9MYXlvdXRS ZWxvYWRlZC9Gb3JtYXR0aW5nQ29udGV4dC9JbmxpbmVGb3JtYXR0aW5nL0lubGluZUZvcm1hdHRp bmdDb250ZXh0LmpzCmluZGV4IGM2ZTAwMzYyMDQ0MjBmNjc0OGQ5YTgyMjIxMmY2NDkzZDg2YTg1 NTUuLjFiOTkxZWU3YzJjNzVlY2U3NzM5NDkxZGI0MTU0N2UxZmRmZTZiOGIgMTAwNjQ0Ci0tLSBh L1Rvb2xzL0xheW91dFJlbG9hZGVkL0Zvcm1hdHRpbmdDb250ZXh0L0lubGluZUZvcm1hdHRpbmcv SW5saW5lRm9ybWF0dGluZ0NvbnRleHQuanMKKysrIGIvVG9vbHMvTGF5b3V0UmVsb2FkZWQvRm9y bWF0dGluZ0NvbnRleHQvSW5saW5lRm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5q cwpAQCAtMjQsOCArMjQsOCBAQAogICovCiAKIGNsYXNzIElubGluZUZvcm1hdHRpbmdDb250ZXh0 IGV4dGVuZHMgRm9ybWF0dGluZ0NvbnRleHQgewotICAgIGNvbnN0cnVjdG9yKHJvb3QpIHsKLSAg ICAgICAgc3VwZXIocm9vdCk7CisgICAgY29uc3RydWN0b3Iocm9vdCwgbGF5b3V0Q29udGV4dCkg eworICAgICAgICBzdXBlcihyb290LCBsYXlvdXRDb250ZXh0KTsKICAgICAgICAgLy8gSWYgdGhl IGJsb2NrIGNvbnRhaW5lciBib3ggdGhhdCBpbml0aWF0ZXMgdGhpcyBpbmxpbmUgZm9ybWF0dGlu ZyBjb250ZXggYWxzbyBlc3RhYmxpc2hlcyBhIGJsb2NrIGNvbnRleHQsIGNyZWF0ZSBhIG5ldyBm bG9hdCBmb3IgdXMuCiAgICAgICAgIEFTU0VSVChyb290LmlzQmxvY2tDb250YWluZXJCb3goKSk7 CiAgICAgICAgIGlmIChyb290LmVzdGFibGlzaGVzQmxvY2tGb3JtYXR0aW5nQ29udGV4dCgpKQpA QCAtMzksNyArMzksNyBAQCBjbGFzcyBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dCBleHRlbmRzIEZv cm1hdHRpbmdDb250ZXh0IHsKICAgICAgICAgcmV0dXJuIHRoaXMubV9saW5lczsKICAgICB9CiAK LSAgICBsYXlvdXQobGF5b3V0Q29udGV4dCkgeworICAgIGxheW91dCgpIHsKICAgICAgICAgLy8g OS40LjIgSW5saW5lIGZvcm1hdHRpbmcgY29udGV4dHMKICAgICAgICAgLy8gSW4gYW4gaW5saW5l IGZvcm1hdHRpbmcgY29udGV4dCwgYm94ZXMgYXJlIGxhaWQgb3V0IGhvcml6b250YWxseSwgb25l IGFmdGVyIHRoZSBvdGhlciwgYmVnaW5uaW5nIGF0IHRoZSB0b3Agb2YgYSBjb250YWluaW5nIGJs b2NrLgogICAgICAgICBpZiAoIXRoaXMucm9vdENvbnRhaW5lcigpLmZpcnN0Q2hpbGQoKSkKQEAg LTUyLDcgKzUyLDcgQEAgY2xhc3MgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQgZXh0ZW5kcyBGb3Jt YXR0aW5nQ29udGV4dCB7CiAgICAgICAgICAgICB3aGlsZSAodHJ1ZSkgewogICAgICAgICAgICAg ICAgIGxldCBsYXlvdXRCb3ggPSB0aGlzLl9uZXh0SW5MYXlvdXRRdWV1ZSgpOwogICAgICAgICAg ICAgICAgIGlmIChsYXlvdXRCb3guZXN0YWJsaXNoZXNGb3JtYXR0aW5nQ29udGV4dCgpKSB7Ci0g ICAgICAgICAgICAgICAgICAgIGxheW91dENvbnRleHQubGF5b3V0Rm9ybWF0dGluZ0NvbnRleHQo bGF5b3V0Qm94LmVzdGFibGlzaGVkRm9ybWF0dGluZ0NvbnRleHQoKSk7CisgICAgICAgICAgICAg ICAgICAgIHRoaXMubGF5b3V0Q29udGV4dCgpLmxheW91dChsYXlvdXRCb3gpOwogICAgICAgICAg ICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgaWYg KCFsYXlvdXRCb3guaXNDb250YWluZXIoKSB8fCAhbGF5b3V0Qm94Lmhhc0NoaWxkKCkpCmRpZmYg LS1naXQgYS9Ub29scy9MYXlvdXRSZWxvYWRlZC9MYXlvdXQuanMgYi9Ub29scy9MYXlvdXRSZWxv YWRlZC9MYXlvdXQuanMKaW5kZXggNjRjMzdhODk0ZDQ0ZDc3ZTQ0NzQ0YTUwMjNiYjdmY2NhZTE5 MjMzYy4uYmRiYTVjMmVjMTM3NTg0NmQ2ODkwMTY2ZTM1MWRlZDVjZDI4MDk4NCAxMDA2NDQKLS0t IGEvVG9vbHMvTGF5b3V0UmVsb2FkZWQvTGF5b3V0LmpzCisrKyBiL1Rvb2xzL0xheW91dFJlbG9h ZGVkL0xheW91dC5qcwpAQCAtMzEsNiArMzEsNiBAQCBmdW5jdGlvbiBsYXlvdXQod2luZG93LCB2 aWV3cG9ydFNpemUpIHsKICAgICBpbml0aWFsQ29udGFpbmluZ0Jsb2NrLnNldERpc3BsYXlCb3go ZGlzcGxheUJveCk7CiAKICAgICBsZXQgbGF5b3V0Q29udGV4dCA9IG5ldyBMYXlvdXRDb250ZXh0 KGluaXRpYWxDb250YWluaW5nQmxvY2spOwotICAgIGxheW91dENvbnRleHQubGF5b3V0Rm9ybWF0 dGluZ0NvbnRleHQoaW5pdGlhbENvbnRhaW5pbmdCbG9jay5lc3RhYmxpc2hlZEZvcm1hdHRpbmdD b250ZXh0KCkpOworICAgIGxheW91dENvbnRleHQubGF5b3V0KGluaXRpYWxDb250YWluaW5nQmxv Y2spOwogICAgIHJldHVybiBVdGlscy5sYXlvdXRUcmVlRHVtcChpbml0aWFsQ29udGFpbmluZ0Js b2NrKTsKIH0KZGlmZiAtLWdpdCBhL1Rvb2xzL0xheW91dFJlbG9hZGVkL0xheW91dENvbnRleHQu anMgYi9Ub29scy9MYXlvdXRSZWxvYWRlZC9MYXlvdXRDb250ZXh0LmpzCmluZGV4IDgxNGEyZjEw ODM1OWYyNzMxOTA2ZjdlMDE5ZTRkYTQxYjdiNjRjYWIuLmE3Y2U4NWVhOGZmN2U5ZjVkOGUzYTIx MjlhZTE1ZDZjMGEwYjJmMjcgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0xheW91dFJlbG9hZGVkL0xheW91 dENvbnRleHQuanMKKysrIGIvVG9vbHMvTGF5b3V0UmVsb2FkZWQvTGF5b3V0Q29udGV4dC5qcwpA QCAtMjcsNyArMjcsMTggQEAgY2xhc3MgTGF5b3V0Q29udGV4dCB7CiAgICAgY29uc3RydWN0b3Io KSB7CiAgICAgfQogCi0gICAgbGF5b3V0Rm9ybWF0dGluZ0NvbnRleHQoZm9ybWF0dGluZ0NvbnRl eHQpIHsKLSAgICAgICAgZm9ybWF0dGluZ0NvbnRleHQubGF5b3V0KHRoaXMpOworICAgIGxheW91 dChmb3JtYXR0aW5nUm9vdCkgeworICAgICAgICBsZXQgZm9ybWF0dGluZ0NvbnRleHQgPSB0aGlz Ll9jcmVhdGVGb3JtYXR0aW5nQ29udGV4dChmb3JtYXR0aW5nUm9vdCk7CisgICAgICAgIGZvcm1h dHRpbmdDb250ZXh0LmxheW91dCgpOworICAgIH0KKworICAgIF9jcmVhdGVGb3JtYXR0aW5nQ29u dGV4dChmb3JtYXR0aW5nUm9vdCkgeworICAgICAgICBBU1NFUlQoZm9ybWF0dGluZ1Jvb3QuZXN0 YWJsaXNoZXNGb3JtYXR0aW5nQ29udGV4dCgpKTsKKyAgICAgICAgaWYgKGZvcm1hdHRpbmdSb290 LmVzdGFibGlzaGVzQmxvY2tGb3JtYXR0aW5nQ29udGV4dCgpKQorICAgICAgICAgICAgcmV0dXJu IG5ldyBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0KGZvcm1hdHRpbmdSb290LCB0aGlzKTsKKyAgICAg ICAgaWYgKGZvcm1hdHRpbmdSb290LmVzdGFibGlzaGVzSW5saW5lRm9ybWF0dGluZ0NvbnRleHQo KSkKKyAgICAgICAgICAgIHJldHVybiBuZXcgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQoZm9ybWF0 dGluZ1Jvb3QsIHRoaXMpOworICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKyAgICAgICAg cmV0dXJuIG51bGw7CiAgICAgfQogfQpkaWZmIC0tZ2l0IGEvVG9vbHMvTGF5b3V0UmVsb2FkZWQv TGF5b3V0VHJlZS9Cb3guanMgYi9Ub29scy9MYXlvdXRSZWxvYWRlZC9MYXlvdXRUcmVlL0JveC5q cwppbmRleCBkY2M1YTQzZTkxYjI4NzBjYjljZWM4ZTYzMWQ1ZjQyOWUzYTcyNmU0Li41OWE3NmRl NWEzZDc0M2IyZTg3OTcyODEyYTA3NDJhYjk1MDlkOGQ0IDEwMDY0NAotLS0gYS9Ub29scy9MYXlv dXRSZWxvYWRlZC9MYXlvdXRUcmVlL0JveC5qcworKysgYi9Ub29scy9MYXlvdXRSZWxvYWRlZC9M YXlvdXRUcmVlL0JveC5qcwpAQCAtMzQsNyArMzQsNiBAQCBMYXlvdXQuQm94ID0gY2xhc3MgQm94 IHsKICAgICAgICAgdGhpcy5tX25leHRTaWJsaW5nID0gbnVsbDsKICAgICAgICAgdGhpcy5tX3By ZXZpb3VzU2libGluZyA9IG51bGw7CiAgICAgICAgIHRoaXMubV9pc0Fub255bW91cyA9IGZhbHNl OwotICAgICAgICB0aGlzLm1fZXN0YWJsaXNoZWRGb3JtYXR0aW5nQ29udGV4dCA9IG51bGw7CiAg ICAgICAgIHRoaXMubV9kaXNwbGF5Qm94ID0gbnVsbDsKICAgICB9CiAKQEAgLTE0OCwxMiArMTQ3 LDYgQEAgTGF5b3V0LkJveCA9IGNsYXNzIEJveCB7CiAgICAgICAgIHJldHVybiB0aGlzLmVzdGFi bGlzaGVzQmxvY2tGb3JtYXR0aW5nQ29udGV4dCgpIHx8IHRoaXMuZXN0YWJsaXNoZXNJbmxpbmVG b3JtYXR0aW5nQ29udGV4dCgpOwogICAgIH0KIAotICAgIGVzdGFibGlzaGVkRm9ybWF0dGluZ0Nv bnRleHQoKSB7Ci0gICAgICAgIGlmICh0aGlzLmVzdGFibGlzaGVzRm9ybWF0dGluZ0NvbnRleHQo KSAmJiAhdGhpcy5tX2VzdGFibGlzaGVkRm9ybWF0dGluZ0NvbnRleHQpCi0gICAgICAgICAgICB0 aGlzLm1fZXN0YWJsaXNoZWRGb3JtYXR0aW5nQ29udGV4dCA9IHRoaXMuZXN0YWJsaXNoZXNCbG9j a0Zvcm1hdHRpbmdDb250ZXh0KCkgPyBuZXcgQmxvY2tGb3JtYXR0aW5nQ29udGV4dCh0aGlzKSA6 IG5ldyBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dCh0aGlzKTsKLSAgICAgICAgcmV0dXJuIHRoaXMu bV9lc3RhYmxpc2hlZEZvcm1hdHRpbmdDb250ZXh0OwotICAgIH0KLQogICAgIGVzdGFibGlzaGVz QmxvY2tGb3JtYXR0aW5nQ29udGV4dCgpIHsKICAgICAgICAgLy8gOS40LjEgQmxvY2sgZm9ybWF0 dGluZyBjb250ZXh0cwogICAgICAgICAvLyBGbG9hdHMsIGFic29sdXRlbHkgcG9zaXRpb25lZCBl bGVtZW50cywgYmxvY2sgY29udGFpbmVycyAoc3VjaCBhcyBpbmxpbmUtYmxvY2tzLCB0YWJsZS1j ZWxscywgYW5kIHRhYmxlLWNhcHRpb25zKQpkaWZmIC0tZ2l0IGEvVG9vbHMvTGF5b3V0UmVsb2Fk ZWQvbWlzYy9oZWFkZXJzL0JveC5oIGIvVG9vbHMvTGF5b3V0UmVsb2FkZWQvbWlzYy9oZWFkZXJz L0JveC5oCmluZGV4IDQ0MGJlOTc4MTQ5ZmMxMjc5OTM0NzQzMGNkMGM1NWM2YzY4M2Y5NjcuLmVh ODg1OGU0N2ZlOWY4YzNiMDg4N2Y2MmEwM2JhOTlmNjlhM2ExN2MgMTAwNjQ0Ci0tLSBhL1Rvb2xz L0xheW91dFJlbG9hZGVkL21pc2MvaGVhZGVycy9Cb3guaAorKysgYi9Ub29scy9MYXlvdXRSZWxv YWRlZC9taXNjL2hlYWRlcnMvQm94LmgKQEAgLTY0LDggKzY0LDYgQEAgY2xhc3MgQm94IHsKICAg ICBib29sIGVzdGFibGlzaGVzRm9ybWF0dGluZ0NvbnRleHQoKSBjb25zdDsKICAgICBib29sIGVz dGFibGlzaGVzQmxvY2tGb3JtYXR0aW5nQ29udGV4dCgpIGNvbnN0OwogCi0gICAgRm9ybWF0dGlu Z0NvbnRleHQqIGVzdGFibGlzaGVkRm9ybWF0dGluZ0NvbnRleHQoKTsKLQogICAgIGJvb2wgaXNJ bkZsb3coKSBjb25zdDsKICAgICBib29sIGlzUG9zaXRpb25lZCgpIGNvbnN0OwogICAgIGJvb2wg aXNSZWxhdGl2ZWx5UG9zaXRpb25lZCgpIGNvbnN0OwpAQCAtOTEsNyArODksNiBAQCBwcml2YXRl OgogICAgIEJveCogbV9wcmV2aW91c1NpYmxpbmcgeyBudWxscHRyIH07CiAgICAgYm9vbCBtX2lz QW5vbnltb3VzIHsgZmFsc2UgfTsKICAgICBMYXlvdXRSZWN0IG1fcmVjdDsKLSAgICBGb3JtYXR0 aW5nQ29udGV4dCogbV9lc3RhYmxpc2hlZEZvcm1hdHRpbmdDb250ZXh0IHsgbnVsbHB0ciB9Owog fTsKIAogfQo=