183731 2018-03-18 18:18:47 -0700 [LayoutReloaded] Remove left/right width/height setters from Layout.Box 2018-03-18 18:30:30 -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 1407311 0 zalan 2018-03-18 18:18:47 -0700 and use Display.Box directly 1407312 1 336029 zalan 2018-03-18 18:21:43 -0700 Created attachment 336029 Patch 1407313 2 zalan 2018-03-18 18:29:03 -0700 Committed r229702: <https://trac.webkit.org/changeset/229702> 1407314 3 webkit-bug-importer 2018-03-18 18:30:30 -0700 <rdar://problem/38604022> 336029 2018-03-18 18:21:43 -0700 2018-03-18 18:21:43 -0700 Patch bug-183731-20180318182143.patch text/plain 10602 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjI5NzAxCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMmYyM2NlMjY4YTA1MzkwMzRiYmExNDMzNzc3N2ZlZGUz Y2U0Y2Y3ZS4uMDU2ZTlhY2RlZmU2ZWMwNzg5OTI0Mjg5MDBlNTRhZTI2MDU5NmViNyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM1 IEBACisyMDE4LTAzLTE4ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAg ICAgW0xheW91dFJlbG9hZGVkXSBSZW1vdmUgbGVmdC9yaWdodCB3aWR0aC9oZWlnaHQgc2V0dGVy cyBmcm9tIExheW91dC5Cb3gKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE4MzczMQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIC4uLmFuZCB1c2UgRGlzcGxheS5Cb3ggaW5zdGVhZC4KKworICAgICAgICAqIExh eW91dFJlbG9hZGVkL0Zvcm1hdHRpbmdDb250ZXh0L0Jsb2NrRm9ybWF0dGluZy9CbG9ja0Zvcm1h dHRpbmdDb250ZXh0LmpzOgorICAgICAgICAoQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5wcm90b3R5 cGUuX2NvbXB1dGVTdGF0aWNQb3NpdGlvbik6CisgICAgICAgIChCbG9ja0Zvcm1hdHRpbmdDb250 ZXh0LnByb3RvdHlwZS5fY29tcHV0ZU91dE9mRmxvd1dpZHRoKToKKyAgICAgICAgKEJsb2NrRm9y bWF0dGluZ0NvbnRleHQucHJvdG90eXBlLl9jb21wdXRlRmxvYXRpbmdXaWR0aCk6CisgICAgICAg IChCbG9ja0Zvcm1hdHRpbmdDb250ZXh0LnByb3RvdHlwZS5fY29tcHV0ZUluRmxvd1dpZHRoKToK KyAgICAgICAgKEJsb2NrRm9ybWF0dGluZ0NvbnRleHQucHJvdG90eXBlLl9jb21wdXRlT3V0T2ZG bG93SGVpZ2h0KToKKyAgICAgICAgKEJsb2NrRm9ybWF0dGluZ0NvbnRleHQucHJvdG90eXBlLl9j b21wdXRlRmxvYXRpbmdIZWlnaHQpOgorICAgICAgICAoQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5w cm90b3R5cGUuX2NvbXB1dGVJbkZsb3dIZWlnaHQpOgorICAgICAgICAoQmxvY2tGb3JtYXR0aW5n Q29udGV4dC5wcm90b3R5cGUuX2NvbXB1dGVJbkZsb3dQb3NpdGlvbmVkUG9zaXRpb24pOgorICAg ICAgICAoQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5wcm90b3R5cGUuX2NvbXB1dGVPdXRPZkZsb3dQ b3NpdGlvbik6CisgICAgICAgICogTGF5b3V0UmVsb2FkZWQvRm9ybWF0dGluZ0NvbnRleHQvRmxv YXRpbmdDb250ZXh0LmpzOgorICAgICAgICAoRmxvYXRpbmdDb250ZXh0LnByb3RvdHlwZS5jb21w dXRlUG9zaXRpb24pOgorICAgICAgICAqIExheW91dFJlbG9hZGVkL0Zvcm1hdHRpbmdDb250ZXh0 L0Zvcm1hdHRpbmdDb250ZXh0LmpzOgorICAgICAgICAoRm9ybWF0dGluZ0NvbnRleHQucHJvdG90 eXBlLl90b0Rpc3BsYXlCb3gpOgorICAgICAgICAoRm9ybWF0dGluZ0NvbnRleHQucHJvdG90eXBl Ll90b0xheW91dEJveCk6CisgICAgICAgICogTGF5b3V0UmVsb2FkZWQvTGF5b3V0LmpzOgorICAg ICAgICAobGF5b3V0KToKKyAgICAgICAgKiBMYXlvdXRSZWxvYWRlZC9MYXlvdXRUcmVlL0JveC5q czoKKyAgICAgICAgKExheW91dC5Cb3gucHJvdG90eXBlLnNldFRvcExlZnQpOiBEZWxldGVkLgor ICAgICAgICAoTGF5b3V0LkJveC5wcm90b3R5cGUuc2V0U2l6ZSk6IERlbGV0ZWQuCisgICAgICAg IChMYXlvdXQuQm94LnByb3RvdHlwZS5zZXRXaWR0aCk6IERlbGV0ZWQuCisgICAgICAgIChMYXlv dXQuQm94LnByb3RvdHlwZS5zZXRIZWlnaHQpOiBEZWxldGVkLgorCiAyMDE4LTAzLTE4ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW0xheW91dFJlbG9hZGVkXSBD b2xsZWN0IG91dC1vZi1mbG93IHBvc2l0aW9uZWQgYm94ZXMgZm9yIGEgZ2l2ZW4gZm9ybWF0dGlu ZyBjb250ZXh0LgpkaWZmIC0tZ2l0IGEvVG9vbHMvTGF5b3V0UmVsb2FkZWQvRm9ybWF0dGluZ0Nv bnRleHQvQmxvY2tGb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuanMgYi9Ub29scy9M YXlvdXRSZWxvYWRlZC9Gb3JtYXR0aW5nQ29udGV4dC9CbG9ja0Zvcm1hdHRpbmcvQmxvY2tGb3Jt YXR0aW5nQ29udGV4dC5qcwppbmRleCA2OWVmYjM4NjkzMDI2Nzk0N2U3ZDRmMjNjNDAzYTBlYTUy ODhiZmRlLi4yYzI3M2RiNTk1YWNmZmY1ZDliZTE4ZGU2Y2M2YWZiNWI2ODI1YzY0IDEwMDY0NAot LS0gYS9Ub29scy9MYXlvdXRSZWxvYWRlZC9Gb3JtYXR0aW5nQ29udGV4dC9CbG9ja0Zvcm1hdHRp bmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5qcworKysgYi9Ub29scy9MYXlvdXRSZWxvYWRlZC9G b3JtYXR0aW5nQ29udGV4dC9CbG9ja0Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5q cwpAQCAtMTE1LDcgKzExNSw3IEBAIGNsYXNzIEJsb2NrRm9ybWF0dGluZ0NvbnRleHQgZXh0ZW5k cyBGb3JtYXR0aW5nQ29udGV4dCB7CiAgICAgICAgIGxldCBjb250ZW50Qm90dG9tID0gcHJldmlv dXNJbkZsb3dTaWJsaW5nID8gcHJldmlvdXNJbkZsb3dTaWJsaW5nLmJvdHRvbVJpZ2h0KCkudG9w KCkgKyB0aGlzLm1hcmdpbkJvdHRvbShwcmV2aW91c0luRmxvd1NpYmxpbmcpIDogcGFyZW50LmNv bnRlbnRCb3goKS50b3AoKTsKICAgICAgICAgbGV0IHBvc2l0aW9uID0gbmV3IExheW91dFBvaW50 KGNvbnRlbnRCb3R0b20sIHBhcmVudC5jb250ZW50Qm94KCkubGVmdCgpKTsKICAgICAgICAgcG9z aXRpb24ubW92ZUJ5KG5ldyBMYXlvdXRTaXplKHRoaXMubWFyZ2luTGVmdChsYXlvdXRCb3gpLCB0 aGlzLm1hcmdpblRvcChsYXlvdXRCb3gpKSk7Ci0gICAgICAgIGxheW91dEJveC5zZXRUb3BMZWZ0 KHBvc2l0aW9uKTsKKyAgICAgICAgdGhpcy50b0Rpc3BsYXlCb3gobGF5b3V0Qm94KS5zZXRUb3BM ZWZ0KHBvc2l0aW9uKTsKICAgICB9CiAKICAgICBfcGxhY2VJbkZsb3dQb3NpdGlvbmVkQ2hpbGRy ZW4oY29udGFpbmVyKSB7CkBAIC0xNzYsMTggKzE3NiwxOCBAQCBjbGFzcyBCbG9ja0Zvcm1hdHRp bmdDb250ZXh0IGV4dGVuZHMgRm9ybWF0dGluZ0NvbnRleHQgewogICAgICAgICBlbHNlCiAgICAg ICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKICAgICAgICAgd2lkdGggKz0gVXRpbHMuY29t cHV0ZWRIb3Jpem9udGFsQm9yZGVyQW5kUGFkZGluZyhsYXlvdXRCb3gubm9kZSgpKTsKLSAgICAg ICAgbGF5b3V0Qm94LnNldFdpZHRoKHdpZHRoKTsKKyAgICAgICAgdGhpcy50b0Rpc3BsYXlCb3go bGF5b3V0Qm94KS5zZXRXaWR0aCh3aWR0aCk7CiAgICAgfQogCiAgICAgX2NvbXB1dGVGbG9hdGlu Z1dpZHRoKGxheW91dEJveCkgewogICAgICAgICAvLyBGSVhNRTogbWlzc2luZyBjYXNlcwotICAg ICAgICBsYXlvdXRCb3guc2V0V2lkdGgoVXRpbHMud2lkdGgobGF5b3V0Qm94KSArIFV0aWxzLmNv bXB1dGVkSG9yaXpvbnRhbEJvcmRlckFuZFBhZGRpbmcobGF5b3V0Qm94Lm5vZGUoKSkpOworICAg ICAgICB0aGlzLnRvRGlzcGxheUJveChsYXlvdXRCb3gpLnNldFdpZHRoKFV0aWxzLndpZHRoKGxh eW91dEJveCkgKyBVdGlscy5jb21wdXRlZEhvcml6b250YWxCb3JkZXJBbmRQYWRkaW5nKGxheW91 dEJveC5ub2RlKCkpKTsKICAgICB9CiAKICAgICBfY29tcHV0ZUluRmxvd1dpZHRoKGxheW91dEJv eCkgewogICAgICAgICBpZiAoVXRpbHMuaXNXaWR0aEF1dG8obGF5b3V0Qm94KSkKLSAgICAgICAg ICAgIHJldHVybiBsYXlvdXRCb3guc2V0V2lkdGgodGhpcy5faG9yaXpvbnRhbENvbnN0cmFpbnQo bGF5b3V0Qm94KSk7Ci0gICAgICAgIHJldHVybiBsYXlvdXRCb3guc2V0V2lkdGgoVXRpbHMud2lk dGgobGF5b3V0Qm94KSArIFV0aWxzLmNvbXB1dGVkSG9yaXpvbnRhbEJvcmRlckFuZFBhZGRpbmco bGF5b3V0Qm94Lm5vZGUoKSkpOworICAgICAgICAgICAgcmV0dXJuIHRoaXMudG9EaXNwbGF5Qm94 KGxheW91dEJveCkuc2V0V2lkdGgodGhpcy5faG9yaXpvbnRhbENvbnN0cmFpbnQobGF5b3V0Qm94 KSk7CisgICAgICAgIHJldHVybiB0aGlzLnRvRGlzcGxheUJveChsYXlvdXRCb3gpLnNldFdpZHRo KFV0aWxzLndpZHRoKGxheW91dEJveCkgKyBVdGlscy5jb21wdXRlZEhvcml6b250YWxCb3JkZXJB bmRQYWRkaW5nKGxheW91dEJveC5ub2RlKCkpKTsKICAgICB9CiAKICAgICBfY29tcHV0ZU91dE9m Rmxvd0hlaWdodChsYXlvdXRCb3gpIHsKQEAgLTIyNCwxMiArMjI0LDEyIEBAIGNsYXNzIEJsb2Nr Rm9ybWF0dGluZ0NvbnRleHQgZXh0ZW5kcyBGb3JtYXR0aW5nQ29udGV4dCB7CiAgICAgICAgIGVs c2UKICAgICAgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwogICAgICAgICBoZWlnaHQgKz0g VXRpbHMuY29tcHV0ZWRWZXJ0aWNhbEJvcmRlckFuZFBhZGRpbmcobGF5b3V0Qm94Lm5vZGUoKSk7 Ci0gICAgICAgIGxheW91dEJveC5zZXRIZWlnaHQoaGVpZ2h0KTsKKyAgICAgICAgdGhpcy50b0Rp c3BsYXlCb3gobGF5b3V0Qm94KS5zZXRIZWlnaHQoaGVpZ2h0KTsKICAgICB9CiAKICAgICBfY29t cHV0ZUZsb2F0aW5nSGVpZ2h0KGxheW91dEJveCkgewogICAgICAgICAvLyBGSVhNRTogbWlzc2lu ZyBjYXNlcwotICAgICAgICBsYXlvdXRCb3guc2V0SGVpZ2h0KFV0aWxzLmhlaWdodChsYXlvdXRC b3gpICsgVXRpbHMuY29tcHV0ZWRWZXJ0aWNhbEJvcmRlckFuZFBhZGRpbmcobGF5b3V0Qm94Lm5v ZGUoKSkpOworICAgICAgICB0aGlzLnRvRGlzcGxheUJveChsYXlvdXRCb3gpLnNldEhlaWdodChV dGlscy5oZWlnaHQobGF5b3V0Qm94KSArIFV0aWxzLmNvbXB1dGVkVmVydGljYWxCb3JkZXJBbmRQ YWRkaW5nKGxheW91dEJveC5ub2RlKCkpKTsKICAgICB9CiAKICAgICBfY29tcHV0ZUluRmxvd0hl aWdodChsYXlvdXRCb3gpIHsKQEAgLTIzOSw5ICsyMzksOSBAQCBjbGFzcyBCbG9ja0Zvcm1hdHRp bmdDb250ZXh0IGV4dGVuZHMgRm9ybWF0dGluZ0NvbnRleHQgewogCiAgICAgICAgICAgICAvLyBU aGUgZWxlbWVudCdzIGhlaWdodCBpcyB0aGUgZGlzdGFuY2UgZnJvbSBpdHMgdG9wIGNvbnRlbnQg ZWRnZSB0byB0aGUgZmlyc3QgYXBwbGljYWJsZSBvZiB0aGUgZm9sbG93aW5nOgogICAgICAgICAg ICAgLy8gMS4gdGhlIGJvdHRvbSBlZGdlIG9mIHRoZSBsYXN0IGxpbmUgYm94LCBpZiB0aGUgYm94 IGVzdGFibGlzaGVzIGEgaW5saW5lIGZvcm1hdHRpbmcgY29udGV4dCB3aXRoIG9uZSBvciBtb3Jl IGxpbmVzCi0gICAgICAgICAgICByZXR1cm4gbGF5b3V0Qm94LnNldEhlaWdodCh0aGlzLl9jb250 ZW50SGVpZ2h0KGxheW91dEJveCkgKyBVdGlscy5jb21wdXRlZFZlcnRpY2FsQm9yZGVyQW5kUGFk ZGluZyhsYXlvdXRCb3gubm9kZSgpKSk7CisgICAgICAgICAgICByZXR1cm4gdGhpcy50b0Rpc3Bs YXlCb3gobGF5b3V0Qm94KS5zZXRIZWlnaHQodGhpcy5fY29udGVudEhlaWdodChsYXlvdXRCb3gp ICsgVXRpbHMuY29tcHV0ZWRWZXJ0aWNhbEJvcmRlckFuZFBhZGRpbmcobGF5b3V0Qm94Lm5vZGUo KSkpOwogICAgICAgICB9Ci0gICAgICAgIHJldHVybiBsYXlvdXRCb3guc2V0SGVpZ2h0KFV0aWxz LmhlaWdodChsYXlvdXRCb3gpICsgVXRpbHMuY29tcHV0ZWRWZXJ0aWNhbEJvcmRlckFuZFBhZGRp bmcobGF5b3V0Qm94Lm5vZGUoKSkpOworICAgICAgICByZXR1cm4gdGhpcy50b0Rpc3BsYXlCb3go bGF5b3V0Qm94KS5zZXRIZWlnaHQoVXRpbHMuaGVpZ2h0KGxheW91dEJveCkgKyBVdGlscy5jb21w dXRlZFZlcnRpY2FsQm9yZGVyQW5kUGFkZGluZyhsYXlvdXRCb3gubm9kZSgpKSk7CiAgICAgfQog CiAgICAgX2hvcml6b250YWxDb25zdHJhaW50KGxheW91dEJveCkgewpAQCAtMzAyLDcgKzMwMiw3 IEBAIGNsYXNzIEJsb2NrRm9ybWF0dGluZ0NvbnRleHQgZXh0ZW5kcyBGb3JtYXR0aW5nQ29udGV4 dCB7CiAgICAgICAgICAgICByZWxhdGl2ZVBvc2l0aW9uLnNoaWZ0TGVmdChVdGlscy5sZWZ0KGxh eW91dEJveCkpOwogICAgICAgICBlbHNlIGlmICghVXRpbHMuaXNSaWdodEF1dG8obGF5b3V0Qm94 KSkKICAgICAgICAgICAgIHJlbGF0aXZlUG9zaXRpb24uc2hpZnRMZWZ0KC1VdGlscy5yaWdodChs YXlvdXRCb3gpKTsKLSAgICAgICAgbGF5b3V0Qm94LnNldFRvcExlZnQocmVsYXRpdmVQb3NpdGlv bik7CisgICAgICAgIHRoaXMudG9EaXNwbGF5Qm94KGxheW91dEJveCkuc2V0VG9wTGVmdChyZWxh dGl2ZVBvc2l0aW9uKTsKICAgICB9CiAKICAgICBfY29tcHV0ZU91dE9mRmxvd1Bvc2l0aW9uKGxh eW91dEJveCkgewpAQCAtMzI5LDcgKzMyOSw3IEBAIGNsYXNzIEJsb2NrRm9ybWF0dGluZ0NvbnRl eHQgZXh0ZW5kcyBGb3JtYXR0aW5nQ29udGV4dCB7CiAgICAgICAgICAgICBsZWZ0ID0gY29udGFp bmVyU2l6ZS53aWR0aCgpIC0gVXRpbHMucmlnaHQobGF5b3V0Qm94KSAtIGxheW91dEJveC5yZWN0 KCkud2lkdGgoKSAtIHRoaXMubWFyZ2luUmlnaHQobGF5b3V0Qm94KTsKICAgICAgICAgZWxzZQog ICAgICAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7Ci0gICAgICAgIGxheW91dEJveC5zZXRU b3BMZWZ0KG5ldyBMYXlvdXRQb2ludCh0b3AsIGxlZnQpKTsKKyAgICAgICAgdGhpcy50b0Rpc3Bs YXlCb3gobGF5b3V0Qm94KS5zZXRUb3BMZWZ0KG5ldyBMYXlvdXRQb2ludCh0b3AsIGxlZnQpKTsK ICAgICB9CiAKICAgICBfc2hyaW5rVG9GaXRXaWR0aChsYXlvdXRCb3gpIHsKZGlmZiAtLWdpdCBh L1Rvb2xzL0xheW91dFJlbG9hZGVkL0Zvcm1hdHRpbmdDb250ZXh0L0Zsb2F0aW5nQ29udGV4dC5q cyBiL1Rvb2xzL0xheW91dFJlbG9hZGVkL0Zvcm1hdHRpbmdDb250ZXh0L0Zsb2F0aW5nQ29udGV4 dC5qcwppbmRleCBlNzIzY2RhNmQ2NDc2MTZkNDkxODZiYjIwNzQzMWNmMTc4NzEwZGEyLi5hNjJm NjI4MTRiMGNjMGI3MmM1MDg0ZjJiZmJmMjZkMTA1MzljNjE0IDEwMDY0NAotLS0gYS9Ub29scy9M YXlvdXRSZWxvYWRlZC9Gb3JtYXR0aW5nQ29udGV4dC9GbG9hdGluZ0NvbnRleHQuanMKKysrIGIv VG9vbHMvTGF5b3V0UmVsb2FkZWQvRm9ybWF0dGluZ0NvbnRleHQvRmxvYXRpbmdDb250ZXh0Lmpz CkBAIC0zNCwxNSArMzQsMTYgQEAgY2xhc3MgRmxvYXRpbmdDb250ZXh0IHsKICAgICBjb21wdXRl UG9zaXRpb24obGF5b3V0Qm94KSB7CiAgICAgICAgIGlmIChsYXlvdXRCb3guaXNPdXRPZkZsb3dQ b3NpdGlvbmVkKCkpCiAgICAgICAgICAgICByZXR1cm47CisgICAgICAgIGxldCBkaXNwbGF5Qm94 ID0gdGhpcy5fZm9ybWF0dGluZ0NvbnRleHQoKS50b0Rpc3BsYXlCb3gobGF5b3V0Qm94KTsKICAg ICAgICAgaWYgKGxheW91dEJveC5pc0Zsb2F0aW5nUG9zaXRpb25lZCgpKSB7CiAgICAgICAgICAg ICBsZXQgcG9zaXRpb24gPSB0aGlzLl9wb3NpdGlvbkZvckZsb2F0aW5nKGxheW91dEJveCk7CiAg ICAgICAgICAgICB0aGlzLl9hZGRGbG9hdGluZyhsYXlvdXRCb3gpOwotICAgICAgICAgICAgcmV0 dXJuIGxheW91dEJveC5zZXRUb3BMZWZ0KHBvc2l0aW9uKTsKKyAgICAgICAgICAgIHJldHVybiBk aXNwbGF5Qm94LnNldFRvcExlZnQocG9zaXRpb24pOwogICAgICAgICB9CiAgICAgICAgIGlmIChV dGlscy5oYXNDbGVhcihsYXlvdXRCb3gpKQotICAgICAgICAgICAgcmV0dXJuIGxheW91dEJveC5z ZXRUb3BMZWZ0KHRoaXMuX3Bvc2l0aW9uRm9yQ2xlYXIobGF5b3V0Qm94KSk7CisgICAgICAgICAg ICByZXR1cm4gZGlzcGxheUJveC5zZXRUb3BMZWZ0KHRoaXMuX3Bvc2l0aW9uRm9yQ2xlYXIobGF5 b3V0Qm94KSk7CiAgICAgICAgIC8vIEludHJ1ZGluZyBmbG9hdHMgbWlnaHQgZm9yY2UgdGhpcyBi b3ggbW92ZS4KLSAgICAgICAgcmV0dXJuIGxheW91dEJveC5zZXRUb3BMZWZ0KHRoaXMuX2NvbXB1 dGVQb3NpdGlvblRvQXZvaWRJbnRydWRpbmdGbG9hdHMobGF5b3V0Qm94KSk7CisgICAgICAgIGRp c3BsYXlCb3guc2V0VG9wTGVmdCh0aGlzLl9jb21wdXRlUG9zaXRpb25Ub0F2b2lkSW50cnVkaW5n RmxvYXRzKGxheW91dEJveCkpOwogICAgIH0KIAogICAgIGJvdHRvbSgpIHsKZGlmZiAtLWdpdCBh L1Rvb2xzL0xheW91dFJlbG9hZGVkL0Zvcm1hdHRpbmdDb250ZXh0L0Zvcm1hdHRpbmdDb250ZXh0 LmpzIGIvVG9vbHMvTGF5b3V0UmVsb2FkZWQvRm9ybWF0dGluZ0NvbnRleHQvRm9ybWF0dGluZ0Nv bnRleHQuanMKaW5kZXggOTIxZDA3YTJiNTc2NWQ0NjAzNDQyODFkYmYwN2QyMTllMjhjNTg0OS4u N2IxZDUyMjA0MWQyNjQwMTJmNTRmYmU4M2IyZjI1OWY5NGVmNjQxMiAxMDA2NDQKLS0tIGEvVG9v bHMvTGF5b3V0UmVsb2FkZWQvRm9ybWF0dGluZ0NvbnRleHQvRm9ybWF0dGluZ0NvbnRleHQuanMK KysrIGIvVG9vbHMvTGF5b3V0UmVsb2FkZWQvRm9ybWF0dGluZ0NvbnRleHQvRm9ybWF0dGluZ0Nv bnRleHQuanMKQEAgLTEzNiwxNiArMTM2LDE2IEBAIGNsYXNzIEZvcm1hdHRpbmdDb250ZXh0IHsK ICAgICAgICAgbGF5b3V0Qm94LnNldERpc3BsYXlCb3goZGlzcGxheUJveCk7CiAgICAgfQogCi0g ICAgX3RvRGlzcGxheUJveChsYXlvdXRCb3gpIHsKKyAgICB0b0Rpc3BsYXlCb3gobGF5b3V0Qm94 KSB7CiAgICAgICAgIEFTU0VSVChsYXlvdXRCb3gpOwogICAgICAgICBBU1NFUlQodGhpcy5tX2xh eW91dFRvRGlzcGxheS5oYXMobGF5b3V0Qm94KSk7Ci0gICAgICAgIHJldHVybiB0aGlzLm1fbGF5 b3V0VG9EaXNwbGF5LmdldChsYXlvdXQpOworICAgICAgICByZXR1cm4gdGhpcy5tX2xheW91dFRv RGlzcGxheS5nZXQobGF5b3V0Qm94KTsKICAgICB9CiAKLSAgICBfdG9MYXlvdXRCb3goZGlzcGxh eUJveCkgeworICAgIHRvTGF5b3V0Qm94KGRpc3BsYXlCb3gpIHsKICAgICAgICAgQVNTRVJUKGRp c3BsYXlCb3gpOwogICAgICAgICBBU1NFUlQodGhpcy5tX2Rpc3BsYXlUb0xheW91dC5oYXMoZGlz cGxheUJveCkpOwotICAgICAgICByZXR1cm4gdGhpcy5tX2Rpc3BsYXlUb0xheW91dC5nZXQobGF5 b3V0KTsKKyAgICAgICAgcmV0dXJuIHRoaXMubV9kaXNwbGF5VG9MYXlvdXQuZ2V0KGRpc3BsYXlC b3gpOwogICAgIH0KIAogICAgIF9vdXRPZkZsb3dEZXNjZW5kYW50cygpIHsKZGlmZiAtLWdpdCBh L1Rvb2xzL0xheW91dFJlbG9hZGVkL0xheW91dC5qcyBiL1Rvb2xzL0xheW91dFJlbG9hZGVkL0xh eW91dC5qcwppbmRleCAwYmVjNjk3ZmU3OGQ4YTYzMzJkM2VkN2YyMTI0YTVlOGQzNzA0OTdlLi42 NGMzN2E4OTRkNDRkNzdlNDQ3NDRhNTAyM2JiN2ZjY2FlMTkyMzNjIDEwMDY0NAotLS0gYS9Ub29s cy9MYXlvdXRSZWxvYWRlZC9MYXlvdXQuanMKKysrIGIvVG9vbHMvTGF5b3V0UmVsb2FkZWQvTGF5 b3V0LmpzCkBAIC0yNiw4ICsyNiw5IEBACiBmdW5jdGlvbiBsYXlvdXQod2luZG93LCB2aWV3cG9y dFNpemUpIHsKICAgICBsZXQgdHJlZUJ1aWxkZXIgPSBuZXcgVHJlZUJ1aWxkZXIoKTsKICAgICBs ZXQgaW5pdGlhbENvbnRhaW5pbmdCbG9jayA9IHRyZWVCdWlsZGVyLmNyZWF0ZVRyZWUod2luZG93 LmRvY3VtZW50LCB3aW5kb3cucmVuZGVyVHJlZVN0cnVjdHVyZSk7Ci0gICAgaW5pdGlhbENvbnRh aW5pbmdCbG9jay5zZXREaXNwbGF5Qm94KG5ldyBEaXNwbGF5LkJveCgpKTsKLSAgICBpbml0aWFs Q29udGFpbmluZ0Jsb2NrLnNldFNpemUodmlld3BvcnRTaXplKTsKKyAgICBsZXQgZGlzcGxheUJv eCA9IG5ldyBEaXNwbGF5LkJveCgpOworICAgIGRpc3BsYXlCb3guc2V0U2l6ZSh2aWV3cG9ydFNp emUpOworICAgIGluaXRpYWxDb250YWluaW5nQmxvY2suc2V0RGlzcGxheUJveChkaXNwbGF5Qm94 KTsKIAogICAgIGxldCBsYXlvdXRDb250ZXh0ID0gbmV3IExheW91dENvbnRleHQoaW5pdGlhbENv bnRhaW5pbmdCbG9jayk7CiAgICAgbGF5b3V0Q29udGV4dC5sYXlvdXRGb3JtYXR0aW5nQ29udGV4 dChpbml0aWFsQ29udGFpbmluZ0Jsb2NrLmVzdGFibGlzaGVkRm9ybWF0dGluZ0NvbnRleHQoKSk7 CmRpZmYgLS1naXQgYS9Ub29scy9MYXlvdXRSZWxvYWRlZC9MYXlvdXRUcmVlL0JveC5qcyBiL1Rv b2xzL0xheW91dFJlbG9hZGVkL0xheW91dFRyZWUvQm94LmpzCmluZGV4IDU0YzUzMDIxNGY1MDU2 MzVkMWJiNDM3NDgzMjQ5M2VjM2Y5MDk5MjYuLmZmYzhjMjY2NzMxZDRkZGEwYTQ5Y2ZjMzA2ODJi MTU2NDY3ZWUxMjAgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0xheW91dFJlbG9hZGVkL0xheW91dFRyZWUv Qm94LmpzCisrKyBiL1Rvb2xzL0xheW91dFJlbG9hZGVkL0xheW91dFRyZWUvQm94LmpzCkBAIC0x MzAsMjIgKzEzMCw2IEBAIExheW91dC5Cb3ggPSBjbGFzcyBCb3ggewogICAgICAgICByZXR1cm4g dGhpcy5yZWN0KCkuYm90dG9tUmlnaHQoKTsKICAgICB9CiAKLSAgICBzZXRUb3BMZWZ0KHRvcExl ZnQpIHsKLSAgICAgICAgdGhpcy5kaXNwbGF5Qm94KCkuc2V0VG9wTGVmdCh0b3BMZWZ0KTsKLSAg ICB9Ci0KLSAgICBzZXRTaXplKHNpemUpIHsKLSAgICAgICAgdGhpcy5kaXNwbGF5Qm94KCkuc2V0 U2l6ZShzaXplKTsKLSAgICB9Ci0KLSAgICBzZXRXaWR0aCh3aWR0aCkgewotICAgICAgICB0aGlz LmRpc3BsYXlCb3goKS5zZXRXaWR0aCh3aWR0aCk7Ci0gICAgfQotCi0gICAgc2V0SGVpZ2h0KGhl aWdodCkgewotICAgICAgICB0aGlzLmRpc3BsYXlCb3goKS5zZXRIZWlnaHQoaGVpZ2h0KTsKLSAg ICB9Ci0KICAgICBpc0NvbnRhaW5lcigpIHsKICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIH0K