183734 2018-03-18 19:54:18 -0700 [LayoutReloaded] Remove left/right width/height getters from Layout.Box 2018-03-18 20:01:40 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham simon.fraser webkit-bug-importer zalan oldest_to_newest 1407319 0 zalan 2018-03-18 19:54:18 -0700 use FormattingContext::toDisplayBox() instead. 1407320 1 336030 zalan 2018-03-18 19:56:03 -0700 Created attachment 336030 Patch 1407321 2 zalan 2018-03-18 20:00:31 -0700 Committed r229703: <https://trac.webkit.org/changeset/229703> 1407322 3 webkit-bug-importer 2018-03-18 20:01:40 -0700 <rdar://problem/38605348> 336030 2018-03-18 19:56:03 -0700 2018-03-18 19:56:03 -0700 Patch bug-183734-20180318195602.patch text/plain 15487 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjI5NzAyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYTgyNDcwMTI5N2E1ZWNiZDJkNmQ3ZGNjYzQ5NzgzODEx ZmVmNjUxNS4uMDMyY2UxYTRmOTEzY2UzMDY5NGY1MDZjYTg3NTc1N2ZhZWQ0ZDBlMiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQx IEBACisyMDE4LTAzLTE4ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAg ICAgW0xheW91dFJlbG9hZGVkXSBSZW1vdmUgbGVmdC9yaWdodCB3aWR0aC9oZWlnaHQgZ2V0dGVy cyBmcm9tIExheW91dC5Cb3gKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE4MzczNAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIC4uLmFuZCB1c2UgRGlzcGxheS5Cb3ggaW5zdGVhZC4KKworICAgICAgICAqIExh eW91dFJlbG9hZGVkL0Rpc3BsYXlUcmVlL0JveC5qczoKKyAgICAgICAgKERpc3BsYXkuQm94LnBy b3RvdHlwZS5ib3R0b21SaWdodCk6CisgICAgICAgIChEaXNwbGF5LkJveC5wcm90b3R5cGUuc2l6 ZSk6CisgICAgICAgIChEaXNwbGF5LkJveC5wcm90b3R5cGUuaGVpZ2h0KToKKyAgICAgICAgKERp c3BsYXkuQm94LnByb3RvdHlwZS53aWR0aCk6CisgICAgICAgICogTGF5b3V0UmVsb2FkZWQvRm9y bWF0dGluZ0NvbnRleHQvQmxvY2tGb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuanM6 CisgICAgICAgIChCbG9ja0Zvcm1hdHRpbmdDb250ZXh0LnByb3RvdHlwZS5fY29tcHV0ZVN0YXRp Y1Bvc2l0aW9uKToKKyAgICAgICAgKEJsb2NrRm9ybWF0dGluZ0NvbnRleHQucHJvdG90eXBlLl9h ZGp1c3RCb3R0b21XaXRoRklYTUUpOgorICAgICAgICAoQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5w cm90b3R5cGUuX2NvbXB1dGVJbkZsb3dQb3NpdGlvbmVkUG9zaXRpb24pOgorICAgICAgICAoQmxv Y2tGb3JtYXR0aW5nQ29udGV4dC5wcm90b3R5cGUuX2NvbXB1dGVPdXRPZkZsb3dQb3NpdGlvbik6 CisgICAgICAgICogTGF5b3V0UmVsb2FkZWQvRm9ybWF0dGluZ0NvbnRleHQvRmxvYXRpbmdDb250 ZXh0LmpzOgorICAgICAgICAoRmxvYXRpbmdDb250ZXh0LnByb3RvdHlwZS5fcG9zaXRpb25Gb3JD bGVhcik6CisgICAgICAgIChGbG9hdGluZ0NvbnRleHQucHJvdG90eXBlLl9jb21wdXRlUG9zaXRp b25Ub0F2b2lkSW50cnVkaW5nRmxvYXRzKToKKyAgICAgICAgKEZsb2F0aW5nQ29udGV4dC5wcm90 b3R5cGUuX2FkanVzdGVkRmxvYXRpbmdQb3NpdGlvbik6CisgICAgICAgICogTGF5b3V0UmVsb2Fk ZWQvRm9ybWF0dGluZ0NvbnRleHQvRm9ybWF0dGluZ0NvbnRleHQuanM6CisgICAgICAgIChGb3Jt YXR0aW5nQ29udGV4dC5wcm90b3R5cGUuYWJzb2x1dGVNYXJnaW5Cb3gpOgorICAgICAgICAoRm9y bWF0dGluZ0NvbnRleHQucHJvdG90eXBlLmFic29sdXRlQm9yZGVyQm94KToKKyAgICAgICAgKEZv cm1hdHRpbmdDb250ZXh0LnByb3RvdHlwZS5hYnNvbHV0ZVBhZGRpbmdCb3gpOgorICAgICAgICAo Rm9ybWF0dGluZ0NvbnRleHQucHJvdG90eXBlLmFic29sdXRlQ29udGVudEJveCk6CisgICAgICAg IChGb3JtYXR0aW5nQ29udGV4dC5wcm90b3R5cGUuX3RvQWJzb2x1dGVQb3NpdGlvbik6CisgICAg ICAgIChGb3JtYXR0aW5nQ29udGV4dC5wcm90b3R5cGUuX3RvUm9vdEFic29sdXRlUG9zaXRpb24p OgorICAgICAgICAqIExheW91dFJlbG9hZGVkL0xheW91dFRyZWUvQm94LmpzOgorICAgICAgICAo TGF5b3V0LkJveC5wcm90b3R5cGUucmVjdCk6IERlbGV0ZWQuCisgICAgICAgIChMYXlvdXQuQm94 LnByb3RvdHlwZS50b3BMZWZ0KTogRGVsZXRlZC4KKyAgICAgICAgKExheW91dC5Cb3gucHJvdG90 eXBlLmJvdHRvbVJpZ2h0KTogRGVsZXRlZC4KKyAgICAgICAgKiBMYXlvdXRSZWxvYWRlZC9VdGls cy5qczoKKyAgICAgICAgKFV0aWxzLl9kdW1wQm94KToKKyAgICAgICAgKFV0aWxzLm1hcFRvQ29u dGFpbmVyKTogRGVsZXRlZC4KKwogMjAxOC0wMy0xOCAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBw bGUuY29tPgogCiAgICAgICAgIFtMYXlvdXRSZWxvYWRlZF0gUmVtb3ZlIGxlZnQvcmlnaHQgd2lk dGgvaGVpZ2h0IHNldHRlcnMgZnJvbSBMYXlvdXQuQm94CmRpZmYgLS1naXQgYS9Ub29scy9MYXlv dXRSZWxvYWRlZC9EaXNwbGF5VHJlZS9Cb3guanMgYi9Ub29scy9MYXlvdXRSZWxvYWRlZC9EaXNw bGF5VHJlZS9Cb3guanMKaW5kZXggODEzNmQ2MzcxYTMyY2E4NTcyOWY2N2Q2YTg5YzBhYzk3ZjM0 ZjU5Mi4uOTkxZWU2NDhlZmEyZjUzNjc1MjZhNGQwZDgxNDVmN2U2OGVhODIxNSAxMDA2NDQKLS0t IGEvVG9vbHMvTGF5b3V0UmVsb2FkZWQvRGlzcGxheVRyZWUvQm94LmpzCisrKyBiL1Rvb2xzL0xh eW91dFJlbG9hZGVkL0Rpc3BsYXlUcmVlL0JveC5qcwpAQCAtNTksNiArNTksMTggQEAgRGlzcGxh eS5Cb3ggPSBjbGFzcyBCb3ggewogICAgICAgICByZXR1cm4gdGhpcy5yZWN0KCkuYm90dG9tUmln aHQoKTsKICAgICB9CiAKKyAgICBzaXplKCkgeworICAgICAgICByZXR1cm4gdGhpcy5yZWN0KCku c2l6ZSgpOworICAgIH0KKworICAgIGhlaWdodCgpIHsKKyAgICAgICAgcmV0dXJuIHRoaXMucmVj dCgpLmhlaWdodCgpOworICAgIH0KKworICAgIHdpZHRoKCkgeworICAgICAgICByZXR1cm4gdGhp cy5yZWN0KCkud2lkdGgoKTsKKyAgICB9CisKICAgICBzZXRUb3BMZWZ0KHRvcExlZnQpIHsKICAg ICAgICAgdGhpcy5tX3JlY3Quc2V0VG9wTGVmdCh0b3BMZWZ0KTsKICAgICB9CmRpZmYgLS1naXQg YS9Ub29scy9MYXlvdXRSZWxvYWRlZC9Gb3JtYXR0aW5nQ29udGV4dC9CbG9ja0Zvcm1hdHRpbmcv QmxvY2tGb3JtYXR0aW5nQ29udGV4dC5qcyBiL1Rvb2xzL0xheW91dFJlbG9hZGVkL0Zvcm1hdHRp bmdDb250ZXh0L0Jsb2NrRm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0LmpzCmluZGV4 IDJjMjczZGI1OTVhY2ZmZjVkOWJlMThkZTZjYzZhZmI1YjY4MjVjNjQuLjhkYjIyMTNiNjcwNmI1 YTRmMjA4OTZkZjhhZTQ1MGQxNWRjNmZjMGEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0xheW91dFJlbG9h ZGVkL0Zvcm1hdHRpbmdDb250ZXh0L0Jsb2NrRm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250 ZXh0LmpzCisrKyBiL1Rvb2xzL0xheW91dFJlbG9hZGVkL0Zvcm1hdHRpbmdDb250ZXh0L0Jsb2Nr Rm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0LmpzCkBAIC0xMTIsNyArMTEyLDkgQEAg Y2xhc3MgQmxvY2tGb3JtYXR0aW5nQ29udGV4dCBleHRlbmRzIEZvcm1hdHRpbmdDb250ZXh0IHsK ICAgICAgICAgbGV0IHBhcmVudCA9IGxheW91dEJveC5wYXJlbnQoKTsKICAgICAgICAgLy8gU3Rh cnQgZnJvbSB0aGUgdG9wIG9mIHRoZSBjb250YWluZXIncyBjb250ZW50IGJveC4KICAgICAgICAg bGV0IHByZXZpb3VzSW5GbG93U2libGluZyA9IGxheW91dEJveC5wcmV2aW91c0luRmxvd1NpYmxp bmcoKTsKLSAgICAgICAgbGV0IGNvbnRlbnRCb3R0b20gPSBwcmV2aW91c0luRmxvd1NpYmxpbmcg PyBwcmV2aW91c0luRmxvd1NpYmxpbmcuYm90dG9tUmlnaHQoKS50b3AoKSArIHRoaXMubWFyZ2lu Qm90dG9tKHByZXZpb3VzSW5GbG93U2libGluZykgOiBwYXJlbnQuY29udGVudEJveCgpLnRvcCgp OworICAgICAgICBsZXQgY29udGVudEJvdHRvbSA9IHBhcmVudC5jb250ZW50Qm94KCkudG9wKCkK KyAgICAgICAgaWYgKHByZXZpb3VzSW5GbG93U2libGluZykKKyAgICAgICAgICAgIGNvbnRlbnRC b3R0b20gPSB0aGlzLnRvRGlzcGxheUJveChwcmV2aW91c0luRmxvd1NpYmxpbmcpLmJvdHRvbVJp Z2h0KCkudG9wKCkgKyB0aGlzLm1hcmdpbkJvdHRvbShwcmV2aW91c0luRmxvd1NpYmxpbmcpOwog ICAgICAgICBsZXQgcG9zaXRpb24gPSBuZXcgTGF5b3V0UG9pbnQoY29udGVudEJvdHRvbSwgcGFy ZW50LmNvbnRlbnRCb3goKS5sZWZ0KCkpOwogICAgICAgICBwb3NpdGlvbi5tb3ZlQnkobmV3IExh eW91dFNpemUodGhpcy5tYXJnaW5MZWZ0KGxheW91dEJveCksIHRoaXMubWFyZ2luVG9wKGxheW91 dEJveCkpKTsKICAgICAgICAgdGhpcy50b0Rpc3BsYXlCb3gobGF5b3V0Qm94KS5zZXRUb3BMZWZ0 KHBvc2l0aW9uKTsKQEAgLTI3NSw4ICsyNzcsMTAgQEAgY2xhc3MgQmxvY2tGb3JtYXR0aW5nQ29u dGV4dCBleHRlbmRzIEZvcm1hdHRpbmdDb250ZXh0IHsKICAgICB9CiAKICAgICBfYWRqdXN0Qm90 dG9tV2l0aEZJWE1FKGxheW91dEJveCkgeworICAgICAgICAvLyBGSVhNRTogVGhpcyBmdW5jdGlv biBpcyBhIGJpZyBGSVhNRS4KICAgICAgICAgbGV0IGxhc3RJbkZsb3dDaGlsZCA9IGxheW91dEJv eC5sYXN0SW5GbG93Q2hpbGQoKTsKLSAgICAgICAgbGV0IGJvdHRvbSA9IGxhc3RJbkZsb3dDaGls ZC5yZWN0KCkuYm90dG9tKCkgKyB0aGlzLm1hcmdpbkJvdHRvbShsYXN0SW5GbG93Q2hpbGQpOwor ICAgICAgICBsZXQgbGFzdEluRmxvd0Rpc3BsYXlCb3ggPSBsYXN0SW5GbG93Q2hpbGQuZGlzcGxh eUJveCgpOworICAgICAgICBsZXQgYm90dG9tID0gbGFzdEluRmxvd0Rpc3BsYXlCb3guYm90dG9t KCkgKyB0aGlzLm1hcmdpbkJvdHRvbShsYXN0SW5GbG93Q2hpbGQpOwogICAgICAgICAvLyBGSVhN RTogbWFyZ2luIGZvciBib2R5CiAgICAgICAgIGlmIChsYXN0SW5GbG93Q2hpbGQubmFtZSgpID09 ICJSZW5kZXJCb2R5IiAmJiBVdGlscy5pc0hlaWdodEF1dG8obGFzdEluRmxvd0NoaWxkKSAmJiAh bGFzdEluRmxvd0NoaWxkLmNvbnRlbnRCb3goKS5oZWlnaHQoKSkKICAgICAgICAgICAgIGJvdHRv bSAtPSB0aGlzLm1hcmdpbkJvdHRvbShsYXN0SW5GbG93Q2hpbGQpOwpAQCAtMjkxLDcgKzI5NSw4 IEBAIGNsYXNzIEJsb2NrRm9ybWF0dGluZ0NvbnRleHQgZXh0ZW5kcyBGb3JtYXR0aW5nQ29udGV4 dCB7CiAKICAgICBfY29tcHV0ZUluRmxvd1Bvc2l0aW9uZWRQb3NpdGlvbihsYXlvdXRCb3gpIHsK ICAgICAgICAgLy8gU3RhcnQgd2l0aCB0aGUgb3JpZ2luYWwsIHN0YXRpYyBwb3NpdGlvbi4KLSAg ICAgICAgbGV0IHJlbGF0aXZlUG9zaXRpb24gPSBsYXlvdXRCb3gudG9wTGVmdCgpOworICAgICAg ICBsZXQgZGlzcGxheUJveCA9IHRoaXMudG9EaXNwbGF5Qm94KGxheW91dEJveCk7CisgICAgICAg IGxldCByZWxhdGl2ZVBvc2l0aW9uID0gZGlzcGxheUJveC50b3BMZWZ0KCk7CiAgICAgICAgIC8v IFRvcC9ib3R0b20KICAgICAgICAgaWYgKCFVdGlscy5pc1RvcEF1dG8obGF5b3V0Qm94KSkKICAg ICAgICAgICAgIHJlbGF0aXZlUG9zaXRpb24uc2hpZnRUb3AoVXRpbHMudG9wKGxheW91dEJveCkp OwpAQCAtMzAyLDEwICszMDcsMTEgQEAgY2xhc3MgQmxvY2tGb3JtYXR0aW5nQ29udGV4dCBleHRl bmRzIEZvcm1hdHRpbmdDb250ZXh0IHsKICAgICAgICAgICAgIHJlbGF0aXZlUG9zaXRpb24uc2hp ZnRMZWZ0KFV0aWxzLmxlZnQobGF5b3V0Qm94KSk7CiAgICAgICAgIGVsc2UgaWYgKCFVdGlscy5p c1JpZ2h0QXV0byhsYXlvdXRCb3gpKQogICAgICAgICAgICAgcmVsYXRpdmVQb3NpdGlvbi5zaGlm dExlZnQoLVV0aWxzLnJpZ2h0KGxheW91dEJveCkpOwotICAgICAgICB0aGlzLnRvRGlzcGxheUJv eChsYXlvdXRCb3gpLnNldFRvcExlZnQocmVsYXRpdmVQb3NpdGlvbik7CisgICAgICAgIGRpc3Bs YXlCb3guc2V0VG9wTGVmdChyZWxhdGl2ZVBvc2l0aW9uKTsKICAgICB9CiAKICAgICBfY29tcHV0 ZU91dE9mRmxvd1Bvc2l0aW9uKGxheW91dEJveCkgeworICAgICAgICBsZXQgZGlzcGxheUJveCA9 IHRoaXMudG9EaXNwbGF5Qm94KGxheW91dEJveCk7CiAgICAgICAgIGxldCBjb250YWluZXJTaXpl ID0gbGF5b3V0Qm94LmNvbnRhaW5pbmdCbG9jaygpLmNvbnRlbnRCb3goKS5zaXplKCk7CiAgICAg ICAgIC8vIFRvcC9ib3R0b20KICAgICAgICAgbGV0IHRvcCA9IE51bWJlci5OYU47CkBAIC0zMTUs NyArMzIxLDcgQEAgY2xhc3MgQmxvY2tGb3JtYXR0aW5nQ29udGV4dCBleHRlbmRzIEZvcm1hdHRp bmdDb250ZXh0IHsKICAgICAgICAgfSBlbHNlIGlmICghVXRpbHMuaXNUb3BBdXRvKGxheW91dEJv eCkpCiAgICAgICAgICAgICB0b3AgPSBVdGlscy50b3AobGF5b3V0Qm94KSArIHRoaXMubWFyZ2lu VG9wKGxheW91dEJveCk7CiAgICAgICAgIGVsc2UgaWYgKCFVdGlscy5pc0JvdHRvbUF1dG8obGF5 b3V0Qm94KSkKLSAgICAgICAgICAgIHRvcCA9IGNvbnRhaW5lclNpemUuaGVpZ2h0KCkgLSBVdGls cy5ib3R0b20obGF5b3V0Qm94KSAtIGxheW91dEJveC5yZWN0KCkuaGVpZ2h0KCkgLSB0aGlzLm1h cmdpbkJvdHRvbShsYXlvdXRCb3gpOworICAgICAgICAgICAgdG9wID0gY29udGFpbmVyU2l6ZS5o ZWlnaHQoKSAtIFV0aWxzLmJvdHRvbShsYXlvdXRCb3gpIC0gZGlzcGxheUJveC5oZWlnaHQoKSAt IHRoaXMubWFyZ2luQm90dG9tKGxheW91dEJveCk7CiAgICAgICAgIGVsc2UKICAgICAgICAgICAg IEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwogICAgICAgICAvLyBMZWZ0L3JpZ2h0CkBAIC0zMjYsMTAg KzMzMiwxMCBAQCBjbGFzcyBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0IGV4dGVuZHMgRm9ybWF0dGlu Z0NvbnRleHQgewogICAgICAgICB9IGVsc2UgaWYgKCFVdGlscy5pc0xlZnRBdXRvKGxheW91dEJv eCkpCiAgICAgICAgICAgICBsZWZ0ID0gVXRpbHMubGVmdChsYXlvdXRCb3gpICsgdGhpcy5tYXJn aW5MZWZ0KGxheW91dEJveCk7CiAgICAgICAgIGVsc2UgaWYgKCFVdGlscy5pc1JpZ2h0QXV0byhs YXlvdXRCb3gpKQotICAgICAgICAgICAgbGVmdCA9IGNvbnRhaW5lclNpemUud2lkdGgoKSAtIFV0 aWxzLnJpZ2h0KGxheW91dEJveCkgLSBsYXlvdXRCb3gucmVjdCgpLndpZHRoKCkgLSB0aGlzLm1h cmdpblJpZ2h0KGxheW91dEJveCk7CisgICAgICAgICAgICBsZWZ0ID0gY29udGFpbmVyU2l6ZS53 aWR0aCgpIC0gVXRpbHMucmlnaHQobGF5b3V0Qm94KSAtIGRpc3BsYXlCb3gud2lkdGgoKSAtIHRo aXMubWFyZ2luUmlnaHQobGF5b3V0Qm94KTsKICAgICAgICAgZWxzZQogICAgICAgICAgICAgQVNT RVJUX05PVF9SRUFDSEVEKCk7Ci0gICAgICAgIHRoaXMudG9EaXNwbGF5Qm94KGxheW91dEJveCku c2V0VG9wTGVmdChuZXcgTGF5b3V0UG9pbnQodG9wLCBsZWZ0KSk7CisgICAgICAgIGRpc3BsYXlC b3guc2V0VG9wTGVmdChuZXcgTGF5b3V0UG9pbnQodG9wLCBsZWZ0KSk7CiAgICAgfQogCiAgICAg X3Nocmlua1RvRml0V2lkdGgobGF5b3V0Qm94KSB7CmRpZmYgLS1naXQgYS9Ub29scy9MYXlvdXRS ZWxvYWRlZC9Gb3JtYXR0aW5nQ29udGV4dC9GbG9hdGluZ0NvbnRleHQuanMgYi9Ub29scy9MYXlv dXRSZWxvYWRlZC9Gb3JtYXR0aW5nQ29udGV4dC9GbG9hdGluZ0NvbnRleHQuanMKaW5kZXggYTYy ZjYyODE0YjBjYzBiNzJjNTA4NGYyYmZiZjI2ZDEwNTM5YzYxNC4uYjA5MTM5N2RhNWQ3ZDI2YTEz NWIwNDc3ZjFiMDk0MDIzMTUwMWQ4ZCAxMDA2NDQKLS0tIGEvVG9vbHMvTGF5b3V0UmVsb2FkZWQv Rm9ybWF0dGluZ0NvbnRleHQvRmxvYXRpbmdDb250ZXh0LmpzCisrKyBiL1Rvb2xzL0xheW91dFJl bG9hZGVkL0Zvcm1hdHRpbmdDb250ZXh0L0Zsb2F0aW5nQ29udGV4dC5qcwpAQCAtNzQsOCArNzQs OSBAQCBjbGFzcyBGbG9hdGluZ0NvbnRleHQgewogCiAgICAgX3Bvc2l0aW9uRm9yQ2xlYXIobGF5 b3V0Qm94KSB7CiAgICAgICAgIEFTU0VSVChVdGlscy5oYXNDbGVhcihsYXlvdXRCb3gpKTsKKyAg ICAgICAgbGV0IGRpc3BsYXlCb3ggPSB0aGlzLl9mb3JtYXR0aW5nQ29udGV4dCgpLnRvRGlzcGxh eUJveChsYXlvdXRCb3gpOwogICAgICAgICBpZiAodGhpcy5faXNFbXB0eSgpKQotICAgICAgICAg ICAgcmV0dXJuIGxheW91dEJveC50b3BMZWZ0KCk7CisgICAgICAgICAgICByZXR1cm4gZGlzcGxh eUJveC50b3BMZWZ0KCk7CiAKICAgICAgICAgbGV0IGxlZnRCb3R0b20gPSBOdW1iZXIuTmFOOwog ICAgICAgICBsZXQgcmlnaHRCb3R0b20gPSBOdW1iZXIuTmFOOwpAQCAtODUsMTcgKzg2LDE3IEBA IGNsYXNzIEZsb2F0aW5nQ29udGV4dCB7CiAgICAgICAgICAgICByaWdodEJvdHRvbSA9IHRoaXMu X2JvdHRvbSh0aGlzLm1fcmlnaHRGbG9hdGluZ0JveFN0YWNrKTsKIAogICAgICAgICBpZiAoIU51 bWJlci5pc05hTihsZWZ0Qm90dG9tKSAmJiAhTnVtYmVyLmlzTmFOKHJpZ2h0Qm90dG9tKSkKLSAg ICAgICAgICAgIHJldHVybiBuZXcgTGF5b3V0UG9pbnQoTWF0aC5tYXgobGVmdEJvdHRvbSwgcmln aHRCb3R0b20pLCBsYXlvdXRCb3gucmVjdCgpLmxlZnQoKSk7CisgICAgICAgICAgICByZXR1cm4g bmV3IExheW91dFBvaW50KE1hdGgubWF4KGxlZnRCb3R0b20sIHJpZ2h0Qm90dG9tKSwgZGlzcGxh eUJveC5sZWZ0KCkpOwogICAgICAgICBpZiAoIU51bWJlci5pc05hTihsZWZ0Qm90dG9tKSkKLSAg ICAgICAgICAgIHJldHVybiBuZXcgTGF5b3V0UG9pbnQobGVmdEJvdHRvbSwgbGF5b3V0Qm94LnJl Y3QoKS5sZWZ0KCkpOworICAgICAgICAgICAgcmV0dXJuIG5ldyBMYXlvdXRQb2ludChsZWZ0Qm90 dG9tLCBkaXNwbGF5Qm94LmxlZnQoKSk7CiAgICAgICAgIGlmICghTnVtYmVyLmlzTmFOKHJpZ2h0 Qm90dG9tKSkKLSAgICAgICAgICAgIHJldHVybiBuZXcgTGF5b3V0UG9pbnQocmlnaHRCb3R0b20s IGxheW91dEJveC5yZWN0KCkubGVmdCgpKTsKLSAgICAgICAgcmV0dXJuIGxheW91dEJveC50b3BM ZWZ0KCk7CisgICAgICAgICAgICByZXR1cm4gbmV3IExheW91dFBvaW50KHJpZ2h0Qm90dG9tLCBk aXNwbGF5Qm94LmxlZnQoKSk7CisgICAgICAgIHJldHVybiBkaXNwbGF5Qm94LnRvcExlZnQoKTsK ICAgICB9CiAKICAgICBfY29tcHV0ZVBvc2l0aW9uVG9Bdm9pZEludHJ1ZGluZ0Zsb2F0cyhsYXlv dXRCb3gpIHsKICAgICAgICAgaWYgKCFsYXlvdXRCb3guZXN0YWJsaXNoZXNCbG9ja0Zvcm1hdHRp bmdDb250ZXh0KCkgfHwgdGhpcy5faXNFbXB0eSgpKQotICAgICAgICAgICAgcmV0dXJuIGxheW91 dEJveC50b3BMZWZ0KCk7CisgICAgICAgICAgICByZXR1cm4gdGhpcy5fZm9ybWF0dGluZ0NvbnRl eHQoKS50b0Rpc3BsYXlCb3gobGF5b3V0Qm94KS50b3BMZWZ0KCk7CiAgICAgICAgIC8vIFRoZSBi b3JkZXIgYm94IG9mIGEgdGFibGUsIGEgYmxvY2stbGV2ZWwgcmVwbGFjZWQgZWxlbWVudCwgb3Ig YW4gZWxlbWVudCBpbiB0aGUgbm9ybWFsIGZsb3cgdGhhdCBlc3RhYmxpc2hlcwogICAgICAgICAv LyBhIG5ldyBibG9jayBmb3JtYXR0aW5nIGNvbnRleHQgKHN1Y2ggYXMgYW4gZWxlbWVudCB3aXRo ICdvdmVyZmxvdycgb3RoZXIgdGhhbiAndmlzaWJsZScpIG11c3Qgbm90IG92ZXJsYXAgdGhlCiAg ICAgICAgIC8vIG1hcmdpbiBib3ggb2YgYW55IGZsb2F0cyBpbiB0aGUgc2FtZSBibG9jayBmb3Jt YXR0aW5nIGNvbnRleHQgYXMgdGhlIGVsZW1lbnQgaXRzZWxmLgpAQCAtMTgwLDcgKzE4MSw3IEBA IGNsYXNzIEZsb2F0aW5nQ29udGV4dCB7CiAKICAgICAgICAgaWYgKFV0aWxzLmlzRmxvYXRpbmdM ZWZ0KGZsb2F0aW5nQm94KSB8fCAhVXRpbHMuaXNGbG9hdGluZ1Bvc2l0aW9uZWQoZmxvYXRpbmdC b3gpKQogICAgICAgICAgICAgcmV0dXJuIG5ldyBMYXlvdXRQb2ludCh2ZXJ0aWNhbFBvc2l0aW9u LCBsZWZ0KTsKLSAgICAgICAgcmV0dXJuIG5ldyBMYXlvdXRQb2ludCh2ZXJ0aWNhbFBvc2l0aW9u LCByaWdodCAtIGZsb2F0aW5nQm94LnJlY3QoKS53aWR0aCgpKTsKKyAgICAgICAgcmV0dXJuIG5l dyBMYXlvdXRQb2ludCh2ZXJ0aWNhbFBvc2l0aW9uLCByaWdodCAtIHRoaXMuX2Zvcm1hdHRpbmdD b250ZXh0KCkudG9EaXNwbGF5Qm94KGZsb2F0aW5nQm94KS5yZWN0KCkud2lkdGgoKSk7CiAgICAg fQogCiAgICAgX2JvdHRvbShmbG9hdGluZ1N0YWNrKSB7CmRpZmYgLS1naXQgYS9Ub29scy9MYXlv dXRSZWxvYWRlZC9Gb3JtYXR0aW5nQ29udGV4dC9Gb3JtYXR0aW5nQ29udGV4dC5qcyBiL1Rvb2xz L0xheW91dFJlbG9hZGVkL0Zvcm1hdHRpbmdDb250ZXh0L0Zvcm1hdHRpbmdDb250ZXh0LmpzCmlu ZGV4IDdiMWQ1MjIwNDFkMjY0MDEyZjU0ZmJlODNiMmYyNTlmOTRlZjY0MTIuLjc2NzE0OGZkMjUx NjRkNDgxZGMwNTM5M2FhZjkzNTA2OTQxOWYwNTMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0xheW91dFJl bG9hZGVkL0Zvcm1hdHRpbmdDb250ZXh0L0Zvcm1hdHRpbmdDb250ZXh0LmpzCisrKyBiL1Rvb2xz L0xheW91dFJlbG9hZGVkL0Zvcm1hdHRpbmdDb250ZXh0L0Zvcm1hdHRpbmdDb250ZXh0LmpzCkBA IC02Niw3ICs2Niw3IEBAIGNsYXNzIEZvcm1hdHRpbmdDb250ZXh0IHsKICAgICB9CiAKICAgICBh YnNvbHV0ZU1hcmdpbkJveChsYXlvdXRCb3gpIHsKLSAgICAgICAgbGV0IGFic29sdXRlQ29udGVu dEJveCA9IFV0aWxzLm1hcFRvQ29udGFpbmVyKGxheW91dEJveCwgdGhpcy5yb290Q29udGFpbmVy KCkpOworICAgICAgICBsZXQgYWJzb2x1dGVDb250ZW50Qm94ID0gdGhpcy5fdG9Sb290QWJzb2x1 dGVQb3NpdGlvbihsYXlvdXRCb3gpOwogICAgICAgICBhYnNvbHV0ZUNvbnRlbnRCb3gubW92ZUJ5 KG5ldyBMYXlvdXRTaXplKC10aGlzLm1hcmdpbkxlZnQobGF5b3V0Qm94KSwgLXRoaXMubWFyZ2lu VG9wKGxheW91dEJveCkpKTsKICAgICAgICAgYWJzb2x1dGVDb250ZW50Qm94Lmdyb3dCeShuZXcg TGF5b3V0U2l6ZSh0aGlzLm1hcmdpbkxlZnQobGF5b3V0Qm94KSArIHRoaXMubWFyZ2luUmlnaHQo bGF5b3V0Qm94KSwgdGhpcy5tYXJnaW5Ub3AobGF5b3V0Qm94KSArIHRoaXMubWFyZ2luQm90dG9t KGxheW91dEJveCkpKTsKICAgICAgICAgcmV0dXJuIGFic29sdXRlQ29udGVudEJveDsKQEAgLTc0 LDIxICs3NCwyMSBAQCBjbGFzcyBGb3JtYXR0aW5nQ29udGV4dCB7CiAKICAgICBhYnNvbHV0ZUJv cmRlckJveChsYXlvdXRCb3gpIHsKICAgICAgICAgbGV0IGJvcmRlckJveCA9IGxheW91dEJveC5i b3JkZXJCb3goKTsKLSAgICAgICAgbGV0IGFic29sdXRlUmVjdCA9IG5ldyBMYXlvdXRSZWN0KFV0 aWxzLm1hcFRvQ29udGFpbmVyKGxheW91dEJveCwgdGhpcy5yb290Q29udGFpbmVyKCkpLnRvcExl ZnQoKSwgYm9yZGVyQm94LnNpemUoKSk7CisgICAgICAgIGxldCBhYnNvbHV0ZVJlY3QgPSBuZXcg TGF5b3V0UmVjdCh0aGlzLl90b1Jvb3RBYnNvbHV0ZVBvc2l0aW9uKGxheW91dEJveCkudG9wTGVm dCgpLCBib3JkZXJCb3guc2l6ZSgpKTsKICAgICAgICAgYWJzb2x1dGVSZWN0Lm1vdmVCeShib3Jk ZXJCb3gudG9wTGVmdCgpKTsKICAgICAgICAgcmV0dXJuIGFic29sdXRlUmVjdDsKICAgICB9CiAK ICAgICBhYnNvbHV0ZVBhZGRpbmdCb3gobGF5b3V0Qm94KSB7CiAgICAgICAgIGxldCBwYWRkaW5n Qm94ID0gbGF5b3V0Qm94LnBhZGRpbmdCb3goKTsKLSAgICAgICAgbGV0IGFic29sdXRlUmVjdCA9 IG5ldyBMYXlvdXRSZWN0KFV0aWxzLm1hcFRvQ29udGFpbmVyKGxheW91dEJveCwgdGhpcy5yb290 Q29udGFpbmVyKCkpLnRvcExlZnQoKSwgcGFkZGluZ0JveC5zaXplKCkpOworICAgICAgICBsZXQg YWJzb2x1dGVSZWN0ID0gbmV3IExheW91dFJlY3QodGhpcy5fdG9Sb290QWJzb2x1dGVQb3NpdGlv bihsYXlvdXRCb3gpLnRvcExlZnQoKSwgcGFkZGluZ0JveC5zaXplKCkpOwogICAgICAgICBhYnNv bHV0ZVJlY3QubW92ZUJ5KHBhZGRpbmdCb3gudG9wTGVmdCgpKTsKICAgICAgICAgcmV0dXJuIGFi c29sdXRlUmVjdDsKICAgICB9CiAKICAgICBhYnNvbHV0ZUNvbnRlbnRCb3gobGF5b3V0Qm94KSB7 CiAgICAgICAgIGxldCBjb250ZW50Qm94ID0gbGF5b3V0Qm94LmNvbnRlbnRCb3goKTsKLSAgICAg ICAgbGV0IGFic29sdXRlUmVjdCA9IG5ldyBMYXlvdXRSZWN0KFV0aWxzLm1hcFRvQ29udGFpbmVy KGxheW91dEJveCwgdGhpcy5yb290Q29udGFpbmVyKCkpLnRvcExlZnQoKSwgY29udGVudEJveC5z aXplKCkpOworICAgICAgICBsZXQgYWJzb2x1dGVSZWN0ID0gbmV3IExheW91dFJlY3QodGhpcy5f dG9Sb290QWJzb2x1dGVQb3NpdGlvbihsYXlvdXRCb3gpLnRvcExlZnQoKSwgY29udGVudEJveC5z aXplKCkpOwogICAgICAgICBhYnNvbHV0ZVJlY3QubW92ZUJ5KGNvbnRlbnRCb3gudG9wTGVmdCgp KTsKICAgICAgICAgcmV0dXJuIGFic29sdXRlUmVjdDsKICAgICB9CkBAIC05NywxNSArOTcsMjgg QEAgY2xhc3MgRm9ybWF0dGluZ0NvbnRleHQgewogICAgICAgICAvLyBXZSBzaG91bGQgbmV2ZXIg bmVlZCB0byBnbyBiZXlvbmQgdGhlIHJvb3QgY29udGFpbmVyLgogICAgICAgICBsZXQgY29udGFp bmluZ0Jsb2NrID0gbGF5b3V0Qm94LmNvbnRhaW5pbmdCbG9jaygpOwogICAgICAgICBBU1NFUlQo Y29udGFpbmluZ0Jsb2NrID09IHRoaXMucm9vdENvbnRhaW5lcigpIHx8IGNvbnRhaW5pbmdCbG9j ay5pc0Rlc2NlbmRhbnRPZih0aGlzLnJvb3RDb250YWluZXIoKSkpOwotICAgICAgICBsZXQgdG9w TGVmdCA9IGxheW91dEJveC5yZWN0KCkudG9wTGVmdCgpOworICAgICAgICBsZXQgdG9wTGVmdCA9 IHRoaXMudG9EaXNwbGF5Qm94KGxheW91dEJveCkudG9wTGVmdCgpOwogICAgICAgICBsZXQgYXNj ZW5kYW50ID0gbGF5b3V0Qm94LnBhcmVudCgpOwogICAgICAgICB3aGlsZSAoYXNjZW5kYW50ICYm IGFzY2VuZGFudCAhPSBjb250YWluaW5nQmxvY2spIHsKLSAgICAgICAgICAgIHRvcExlZnQubW92 ZUJ5KGFzY2VuZGFudC5yZWN0KCkudG9wTGVmdCgpKTsKKyAgICAgICAgICAgIHRvcExlZnQubW92 ZUJ5KHRoaXMudG9EaXNwbGF5Qm94KGFzY2VuZGFudCkudG9wTGVmdCgpKTsKICAgICAgICAgICAg IGFzY2VuZGFudCA9IGFzY2VuZGFudC5wYXJlbnQoKTsKICAgICAgICAgfQotICAgICAgICByZXR1 cm4gbmV3IExheW91dFJlY3QodG9wTGVmdCwgbGF5b3V0Qm94LnJlY3QoKS5zaXplKCkpOworICAg ICAgICByZXR1cm4gbmV3IExheW91dFJlY3QodG9wTGVmdCwgdGhpcy50b0Rpc3BsYXlCb3gobGF5 b3V0Qm94KS5zaXplKCkpOwogICAgIH0KIAorICAgIF90b1Jvb3RBYnNvbHV0ZVBvc2l0aW9uKGxh eW91dEJveCkgeworICAgICAgICBsZXQgZGlzcGxheUJveCA9IHRoaXMudG9EaXNwbGF5Qm94KGxh eW91dEJveCk7CisgICAgICAgIGxldCB0b3BMZWZ0ID0gZGlzcGxheUJveC50b3BMZWZ0KCk7Cisg ICAgICAgIGxldCBhc2NlbmRhbnQgPSBsYXlvdXRCb3gucGFyZW50KCk7CisgICAgICAgIHdoaWxl IChhc2NlbmRhbnQgJiYgYXNjZW5kYW50ICE9IHRoaXMucm9vdENvbnRhaW5lcigpKSB7CisgICAg ICAgICAgICB0b3BMZWZ0Lm1vdmVCeSh0aGlzLnRvRGlzcGxheUJveChhc2NlbmRhbnQpLnRvcExl ZnQoKSk7CisgICAgICAgICAgICBhc2NlbmRhbnQgPSBhc2NlbmRhbnQucGFyZW50KCk7CisgICAg ICAgIH0KKyAgICAgICAgQVNTRVJUKGFzY2VuZGFudCk7CisgICAgICAgIHJldHVybiBuZXcgTGF5 b3V0UmVjdCh0b3BMZWZ0LCBkaXNwbGF5Qm94LnNpemUoKSk7CisgICAgfQorCisKICAgICBfZGVz Y2VuZGFudE5lZWRzTGF5b3V0KCkgewogICAgICAgICByZXR1cm4gdGhpcy5tX2xheW91dFN0YWNr Lmxlbmd0aDsKICAgICB9CmRpZmYgLS1naXQgYS9Ub29scy9MYXlvdXRSZWxvYWRlZC9MYXlvdXRU cmVlL0JveC5qcyBiL1Rvb2xzL0xheW91dFJlbG9hZGVkL0xheW91dFRyZWUvQm94LmpzCmluZGV4 IGZmYzhjMjY2NzMxZDRkZGEwYTQ5Y2ZjMzA2ODJiMTU2NDY3ZWUxMjAuLmMyMmQ1NmU3YzM1ODM0 MjIzMGFiMzYzNjllZmY5YzU2MjFjZTIzN2QgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0xheW91dFJlbG9h ZGVkL0xheW91dFRyZWUvQm94LmpzCisrKyBiL1Rvb2xzL0xheW91dFJlbG9hZGVkL0xheW91dFRy ZWUvQm94LmpzCkBAIC0xMTgsMTggKzExOCw2IEBAIExheW91dC5Cb3ggPSBjbGFzcyBCb3ggewog ICAgICAgICByZXR1cm4gdGhpcy5tX2Rpc3BsYXlCb3g7CiAgICAgfQogCi0gICAgcmVjdCgpIHsK LSAgICAgICAgcmV0dXJuIHRoaXMuZGlzcGxheUJveCgpLnJlY3QoKTsKLSAgICB9Ci0KLSAgICB0 b3BMZWZ0KCkgewotICAgICAgICByZXR1cm4gdGhpcy5yZWN0KCkudG9wTGVmdCgpOwotICAgIH0K LQotICAgIGJvdHRvbVJpZ2h0KCkgewotICAgICAgICByZXR1cm4gdGhpcy5yZWN0KCkuYm90dG9t UmlnaHQoKTsKLSAgICB9Ci0KICAgICBpc0NvbnRhaW5lcigpIHsKICAgICAgICAgcmV0dXJuIGZh bHNlOwogICAgIH0KZGlmZiAtLWdpdCBhL1Rvb2xzL0xheW91dFJlbG9hZGVkL1V0aWxzLmpzIGIv VG9vbHMvTGF5b3V0UmVsb2FkZWQvVXRpbHMuanMKaW5kZXggYjYzM2M5MDg4NjViYmMyYzJkNmZi YzBiZWQyMzE5MjEwNDVmMmQ3MC4uYWJlYjBlYzJlNGEyNjc0NTgxNzJmNGJhMzM1NjJiOGE5NTU0 ZWI4ZiAxMDA2NDQKLS0tIGEvVG9vbHMvTGF5b3V0UmVsb2FkZWQvVXRpbHMuanMKKysrIGIvVG9v bHMvTGF5b3V0UmVsb2FkZWQvVXRpbHMuanMKQEAgLTQ2OCwxNyArNDY4LDYgQEAgY2xhc3MgVXRp bHMgewogICAgICAgICByZXR1cm4gd2luZG93LmdldENvbXB1dGVkU3R5bGUobm9kZSkuZmxvYXQg PT0gImxlZnQiOwogICAgIH0KIAotICAgIHN0YXRpYyBtYXBUb0NvbnRhaW5lcihib3gsIGNvbnRh aW5lcikgewotICAgICAgICBsZXQgdG9wTGVmdCA9IGJveC5yZWN0KCkudG9wTGVmdCgpOwotICAg ICAgICBsZXQgYXNjZW5kYW50ID0gYm94LnBhcmVudCgpOwotICAgICAgICB3aGlsZSAoYXNjZW5k YW50ICYmIGFzY2VuZGFudCAhPSBjb250YWluZXIpIHsKLSAgICAgICAgICAgIHRvcExlZnQubW92 ZUJ5KGFzY2VuZGFudC5yZWN0KCkudG9wTGVmdCgpKTsKLSAgICAgICAgICAgIGFzY2VuZGFudCA9 IGFzY2VuZGFudC5wYXJlbnQoKTsKLSAgICAgICAgfQotICAgICAgICBBU1NFUlQoYXNjZW5kYW50 KTsKLSAgICAgICAgcmV0dXJuIG5ldyBMYXlvdXRSZWN0KHRvcExlZnQsIGJveC5yZWN0KCkuc2l6 ZSgpKTsKLSAgICB9Ci0KICAgICBzdGF0aWMgbmV4dEJyZWFraW5nT3Bwb3J0dW5pdHkodGV4dEJv eCwgY3VycmVudFBvc2l0aW9uKQogICAgIHsKICAgICAgICAgcmV0dXJuIHdpbmRvdy5uZXh0QnJl YWtpbmdPcHBvcnR1bml0eSh0ZXh0Qm94LmNvbnRlbnQoKSwgY3VycmVudFBvc2l0aW9uKTsKQEAg LTUwOSw3ICs0OTgsOCBAQCBjbGFzcyBVdGlscyB7CiAgICAgICAgIH0KICAgICAgICAgaWYgKGJv eC5pc0Fub255bW91cygpKQogICAgICAgICAgICAgcmV0dXJuICIiOwotICAgICAgICBsZXQgYm94 UmVjdCA9IGJveC5yZWN0KCk7CisgICAgICAgIGxldCBkaXNwbGF5Qm94ID0gYm94LmRpc3BsYXlC b3goKTsKKyAgICAgICAgbGV0IGJveFJlY3QgPSBkaXNwbGF5Qm94LnJlY3QoKTsKICAgICAgICAg cmV0dXJuIGluZGVudGF0aW9uICsgKGJveC5ub2RlKCkudGFnTmFtZSA/IChib3gubm9kZSgpLnRh Z05hbWUgKyAiICIpIDogIiIpICArIGJveC5uYW1lKCkgKyAiIGF0ICgiICsgYm94UmVjdC5sZWZ0 KCkgKyAiLCIgKyBib3hSZWN0LnRvcCgpICsgIikgc2l6ZSAiICsgYm94UmVjdC53aWR0aCgpICsg IngiICsgYm94UmVjdC5oZWlnaHQoKSArICJcbiI7CiAgICAgfQogCg==