184215 2018-03-31 19:05:01 -0700 [LayoutReloaded] Remove all FormattingContext::absolute*Box functions. 2018-03-31 19:08:22 -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 1410905 0 zalan 2018-03-31 19:05:01 -0700 Use Display.Box instead. 1410906 1 336944 zalan 2018-03-31 19:06:06 -0700 Created attachment 336944 Patch 1410907 2 zalan 2018-03-31 19:07:30 -0700 Committed r230137: <https://trac.webkit.org/changeset/230137> 1410908 3 webkit-bug-importer 2018-03-31 19:08:22 -0700 <rdar://problem/39079470> 336944 2018-03-31 19:06:06 -0700 2018-03-31 19:06:06 -0700 Patch bug-184215-20180331190605.patch text/plain 11548 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjMwMTM2CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMzllMTZjNTQxZWU4M2I2ZmJhM2JlNGRmM2VhZDYwMzQ5 NTc4NjI2Ny4uN2ViOGUxYjQyMTVkNzRlNTMxNDlkYjVjMWFkYzQxYjY0ZDk5NzIxOCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMx IEBACisyMDE4LTAzLTMxICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAg ICAgW0xheW91dFJlbG9hZGVkXSBSZW1vdmUgYWxsIEZvcm1hdHRpbmdDb250ZXh0OjphYnNvbHV0 ZSpCb3ggZnVuY3Rpb25zLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTg0MjE1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgVXNlIERpc3BsYXkuQm94IGluc3RlYWQuCisKKyAgICAgICAgKiBMYXlvdXRSZWxv YWRlZC9Gb3JtYXR0aW5nQ29udGV4dC9CbG9ja0Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29u dGV4dC5qczoKKyAgICAgICAgKEJsb2NrRm9ybWF0dGluZ0NvbnRleHQucHJvdG90eXBlLl9jb21w dXRlT3V0T2ZGbG93UG9zaXRpb24pOgorICAgICAgICAqIExheW91dFJlbG9hZGVkL0Zvcm1hdHRp bmdDb250ZXh0L0Zsb2F0aW5nQ29udGV4dC5qczoKKyAgICAgICAgKEZsb2F0aW5nQ29udGV4dC5w cm90b3R5cGUuX2F2YWlsYWJsZVNwYWNlKToKKyAgICAgICAgKEZsb2F0aW5nQ29udGV4dC5wcm90 b3R5cGUuX2FkanVzdGVkRmxvYXRpbmdQb3NpdGlvbik6CisgICAgICAgIChGbG9hdGluZ0NvbnRl eHQucHJvdG90eXBlLl9tYXBCb3JkZXJCb3hUb0Zvcm1hdHRpbmdSb290KToKKyAgICAgICAgKEZs b2F0aW5nQ29udGV4dC5wcm90b3R5cGUuX21hcENvbnRlbnRCb3hUb0Zvcm1hdHRpbmdSb290KToK KyAgICAgICAgKiBMYXlvdXRSZWxvYWRlZC9Gb3JtYXR0aW5nQ29udGV4dC9Gb3JtYXR0aW5nQ29u dGV4dC5qczoKKyAgICAgICAgKEZvcm1hdHRpbmdDb250ZXh0LnByb3RvdHlwZS5hYnNvbHV0ZUJv cmRlckJveCk6IERlbGV0ZWQuCisgICAgICAgIChGb3JtYXR0aW5nQ29udGV4dC5wcm90b3R5cGUu YWJzb2x1dGVQYWRkaW5nQm94KTogRGVsZXRlZC4KKyAgICAgICAgKEZvcm1hdHRpbmdDb250ZXh0 LnByb3RvdHlwZS5hYnNvbHV0ZUNvbnRlbnRCb3gpOiBEZWxldGVkLgorICAgICAgICAoRm9ybWF0 dGluZ0NvbnRleHQucHJvdG90eXBlLl90b0Fic29sdXRlUG9zaXRpb24pOiBEZWxldGVkLgorICAg ICAgICAoRm9ybWF0dGluZ0NvbnRleHQucHJvdG90eXBlLl90b1Jvb3RBYnNvbHV0ZVBvc2l0aW9u KTogRGVsZXRlZC4KKyAgICAgICAgKiBMYXlvdXRSZWxvYWRlZC9VdGlscy5qczoKKyAgICAgICAg KFV0aWxzLm1hcFBvc2l0aW9uKToKKyAgICAgICAgKFV0aWxzLm1hcmdpbkJveCk6CisgICAgICAg IChVdGlscy5ib3JkZXJCb3gpOgorICAgICAgICAoVXRpbHMuY29udGVudEJveCk6CisKIDIwMTgt MDMtMzEgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbTGF5b3V0 UmVsb2FkZWRdIFJlbW92ZSBGb3JtYXR0aW5nQ29udGV4dDo6YWJzb2x1dGVNYXJnaW5Cb3gKZGlm ZiAtLWdpdCBhL1Rvb2xzL0xheW91dFJlbG9hZGVkL0Zvcm1hdHRpbmdDb250ZXh0L0Jsb2NrRm9y bWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0LmpzIGIvVG9vbHMvTGF5b3V0UmVsb2FkZWQv Rm9ybWF0dGluZ0NvbnRleHQvQmxvY2tGb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQu anMKaW5kZXggNGJlMDY4ODhkNDJjMGI4YzE2ZDY3YzZhODQ3NjJlNGJlMzU0ZDhlYi4uOTYzYWU5 MThmNGFkY2VjNmIxZjg3OWJlOTFiNWM0Y2Y2MDVhMGNiMyAxMDA2NDQKLS0tIGEvVG9vbHMvTGF5 b3V0UmVsb2FkZWQvRm9ybWF0dGluZ0NvbnRleHQvQmxvY2tGb3JtYXR0aW5nL0Jsb2NrRm9ybWF0 dGluZ0NvbnRleHQuanMKKysrIGIvVG9vbHMvTGF5b3V0UmVsb2FkZWQvRm9ybWF0dGluZ0NvbnRl eHQvQmxvY2tGb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuanMKQEAgLTMyMSw4ICsz MjEsMTAgQEAgY2xhc3MgQmxvY2tGb3JtYXR0aW5nQ29udGV4dCBleHRlbmRzIEZvcm1hdHRpbmdD b250ZXh0IHsKICAgICAgICAgICAgIGxldCBjb250ZW50Qm90dG9tID0gcHJldmlvdXNJbkZsb3dT aWJsaW5nID8gdGhpcy5kaXNwbGF5Qm94KHByZXZpb3VzSW5GbG93U2libGluZykuYm90dG9tKCkg OiBwYXJlbnREaXNwbGF5Qm94LmNvbnRlbnRCb3goKS50b3AoKTsKICAgICAgICAgICAgIHRvcCA9 IGNvbnRlbnRCb3R0b20gKyB0aGlzLm1hcmdpblRvcChsYXlvdXRCb3gpOwogICAgICAgICAgICAg Ly8gQ29udmVydCBzdGF0aWMgcG9zaXRpb24gKGluIHBhcmVudCBjb29yZGluYXRlIHN5c3RlbSkg dG8gYWJzb2x1dGUgKGluIGNvbnRhaW5pbmcgYmxvY2sgY29vcmRpbmRhdGUgc3lzdGVtKS4KLSAg ICAgICAgICAgIGlmIChwYXJlbnQgIT0gbGF5b3V0Qm94LmNvbnRhaW5pbmdCbG9jaygpKQotICAg ICAgICAgICAgICAgIHRvcCArPSB0aGlzLl90b0Fic29sdXRlUG9zaXRpb24ocGFyZW50RGlzcGxh eUJveC50b3BMZWZ0KCksIHBhcmVudCwgbGF5b3V0Qm94LmNvbnRhaW5pbmdCbG9jaygpKS50b3Ao KTsKKyAgICAgICAgICAgIGlmIChwYXJlbnQgIT0gbGF5b3V0Qm94LmNvbnRhaW5pbmdCbG9jaygp KSB7CisgICAgICAgICAgICAgICAgQVNTRVJUKGRpc3BsYXlCb3gucGFyZW50KCkgPT0gdGhpcy5k aXNwbGF5Qm94KGxheW91dEJveC5jb250YWluaW5nQmxvY2soKSkpOworICAgICAgICAgICAgICAg IHRvcCArPSBVdGlscy5tYXBQb3NpdGlvbihwYXJlbnREaXNwbGF5Qm94LnRvcExlZnQoKSwgcGFy ZW50RGlzcGxheUJveCwgZGlzcGxheUJveC5wYXJlbnQoKSkudG9wKCk7CisgICAgICAgICAgICB9 CiAgICAgICAgIH0gZWxzZSBpZiAoIVV0aWxzLmlzVG9wQXV0byhsYXlvdXRCb3gpKQogICAgICAg ICAgICAgdG9wID0gVXRpbHMudG9wKGxheW91dEJveCkgKyB0aGlzLm1hcmdpblRvcChsYXlvdXRC b3gpOwogICAgICAgICBlbHNlIGlmICghVXRpbHMuaXNCb3R0b21BdXRvKGxheW91dEJveCkpCkBA IC0zMzksOCArMzQxLDEwIEBAIGNsYXNzIEJsb2NrRm9ybWF0dGluZ0NvbnRleHQgZXh0ZW5kcyBG b3JtYXR0aW5nQ29udGV4dCB7CiAgICAgICAgICAgICBsZXQgcGFyZW50RGlzcGxheUJveCA9IHRo aXMuZGlzcGxheUJveChwYXJlbnQpOwogICAgICAgICAgICAgbGVmdCA9IHBhcmVudERpc3BsYXlC b3guY29udGVudEJveCgpLmxlZnQoKSArIHRoaXMubWFyZ2luTGVmdChsYXlvdXRCb3gpOwogICAg ICAgICAgICAgLy8gQ29udmVydCBzdGF0aWMgcG9zaXRpb24gKGluIHBhcmVudCBjb29yZGluYXRl IHN5c3RlbSkgdG8gYWJzb2x1dGUgKGluIGNvbnRhaW5pbmcgYmxvY2sgY29vcmRpbmRhdGUgc3lz dGVtKS4KLSAgICAgICAgICAgIGlmIChwYXJlbnQgIT0gbGF5b3V0Qm94LmNvbnRhaW5pbmdCbG9j aygpKQotICAgICAgICAgICAgICAgIGxlZnQgKz0gdGhpcy5fdG9BYnNvbHV0ZVBvc2l0aW9uKHBh cmVudERpc3BsYXlCb3gucmVjdCgpLCBwYXJlbnQsIGxheW91dEJveC5jb250YWluaW5nQmxvY2so KSkubGVmdCgpOworICAgICAgICAgICAgaWYgKHBhcmVudCAhPSBsYXlvdXRCb3guY29udGFpbmlu Z0Jsb2NrKCkpIHsKKyAgICAgICAgICAgICAgICBBU1NFUlQoZGlzcGxheUJveC5wYXJlbnQoKSA9 PSB0aGlzLmRpc3BsYXlCb3gobGF5b3V0Qm94LmNvbnRhaW5pbmdCbG9jaygpKSk7CisgICAgICAg ICAgICAgICAgbGVmdCArPSBVdGlscy5tYXBQb3NpdGlvbihwYXJlbnREaXNwbGF5Qm94LnRvcExl ZnQoKSwgcGFyZW50RGlzcGxheUJveCwgZGlzcGxheUJveC5wYXJlbnQoKSkubGVmdCgpOworICAg ICAgICAgICAgfQogICAgICAgICB9IGVsc2UgaWYgKCFVdGlscy5pc0xlZnRBdXRvKGxheW91dEJv eCkpCiAgICAgICAgICAgICBsZWZ0ID0gVXRpbHMubGVmdChsYXlvdXRCb3gpICsgdGhpcy5tYXJn aW5MZWZ0KGxheW91dEJveCk7CiAgICAgICAgIGVsc2UgaWYgKCFVdGlscy5pc1JpZ2h0QXV0byhs YXlvdXRCb3gpKQpkaWZmIC0tZ2l0IGEvVG9vbHMvTGF5b3V0UmVsb2FkZWQvRm9ybWF0dGluZ0Nv bnRleHQvRmxvYXRpbmdDb250ZXh0LmpzIGIvVG9vbHMvTGF5b3V0UmVsb2FkZWQvRm9ybWF0dGlu Z0NvbnRleHQvRmxvYXRpbmdDb250ZXh0LmpzCmluZGV4IGVhMjZhYmM4ODMyN2E5N2JjMjk4ZTJj YmQ4NGY2NjAyZTBhNGQ1NTQuLmQ3ZjQxZjQ4N2ExN2IxZTY0MzAwZjUyMjg5MjRmNTQyMTBhOWIy MjAgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0xheW91dFJlbG9hZGVkL0Zvcm1hdHRpbmdDb250ZXh0L0Zs b2F0aW5nQ29udGV4dC5qcworKysgYi9Ub29scy9MYXlvdXRSZWxvYWRlZC9Gb3JtYXR0aW5nQ29u dGV4dC9GbG9hdGluZ0NvbnRleHQuanMKQEAgLTEyNyw3ICsxMjcsNyBAQCBjbGFzcyBGbG9hdGlu Z0NvbnRleHQgewogICAgICAgICBpZiAoZmxvYXRpbmdQYWlyLmxlZnQgJiYgZmxvYXRpbmdQYWly LnJpZ2h0KQogICAgICAgICAgICAgcmV0dXJuIGZsb2F0aW5nUGFpci5yaWdodC5sZWZ0KCkgLSBm bG9hdGluZ1BhaXIubGVmdC5yaWdodCgpOwogICAgICAgICBpZiAoZmxvYXRpbmdQYWlyLmxlZnQp Ci0gICAgICAgICAgICByZXR1cm4gY29udGFpbmluZ0Jsb2NrQ29udGVudEJveC53aWR0aCgpIC0g KGZsb2F0aW5nUGFpci5sZWZ0LnJpZ2h0KCkgLSB0aGlzLl9mb3JtYXR0aW5nQ29udGV4dCgpLmFi c29sdXRlQm9yZGVyQm94KGNvbnRhaW5pbmdCbG9jaykubGVmdCgpKTsKKyAgICAgICAgICAgIHJl dHVybiBjb250YWluaW5nQmxvY2tDb250ZW50Qm94LndpZHRoKCkgLSAoZmxvYXRpbmdQYWlyLmxl ZnQucmlnaHQoKSAtIHRoaXMuX21hcEJvcmRlckJveFRvRm9ybWF0dGluZ1Jvb3QoY29udGFpbmlu Z0Jsb2NrKS5sZWZ0KCkpOwogICAgICAgICBpZiAoZmxvYXRpbmdQYWlyLnJpZ2h0KQogICAgICAg ICAgICAgcmV0dXJuIGZsb2F0aW5nUGFpci5yaWdodC5sZWZ0KCk7CiAgICAgICAgIHJldHVybiBj b250YWluaW5nQmxvY2tDb250ZW50Qm94LndpZHRoKCk7CkBAIC0xNDYsOCArMTQ2LDggQEAgY2xh c3MgRmxvYXRpbmdDb250ZXh0IHsKICAgICBfYWRqdXN0ZWRGbG9hdGluZ1Bvc2l0aW9uKGZsb2F0 aW5nQm94LCB2ZXJ0aWNhbFBvc2l0aW9uLCBsZWZ0UmlnaHRGbG9hdGluZ3MpIHsKICAgICAgICAg bGV0IGNvbnRhaW5pbmdCbG9jayA9IGZsb2F0aW5nQm94LmNvbnRhaW5pbmdCbG9jaygpOwogICAg ICAgICAvLyBDb252ZXJ0IGFsbCBjb29yZGluYXRlcyByZWxhdGl2ZSB0byBmb3JtYXR0aW5nIGNv bnRleHQncyByb290LgotICAgICAgICBsZXQgbGVmdCA9IHRoaXMuX2Zvcm1hdHRpbmdDb250ZXh0 KCkuYWJzb2x1dGVDb250ZW50Qm94KGNvbnRhaW5pbmdCbG9jaykubGVmdCgpOwotICAgICAgICBs ZXQgcmlnaHQgPSB0aGlzLl9mb3JtYXR0aW5nQ29udGV4dCgpLmFic29sdXRlQ29udGVudEJveChj b250YWluaW5nQmxvY2spLnJpZ2h0KCk7CisgICAgICAgIGxldCBsZWZ0ID0gdGhpcy5fbWFwQ29u dGVudEJveFRvRm9ybWF0dGluZ1Jvb3QoY29udGFpbmluZ0Jsb2NrKS5sZWZ0KCk7CisgICAgICAg IGxldCByaWdodCA9IHRoaXMuX21hcENvbnRlbnRCb3hUb0Zvcm1hdHRpbmdSb290KGNvbnRhaW5p bmdCbG9jaykucmlnaHQoKTsKICAgICAgICAgaWYgKGxlZnRSaWdodEZsb2F0aW5ncykgewogICAg ICAgICAgICAgaWYgKGxlZnRSaWdodEZsb2F0aW5ncy5sZWZ0KSB7CiAgICAgICAgICAgICAgICAg bGV0IGZsb2F0aW5nQm94UmlnaHQgPSBsZWZ0UmlnaHRGbG9hdGluZ3MubGVmdC5yaWdodCgpOwpA QCAtMTY1LDggKzE2NSw4IEBAIGNsYXNzIEZsb2F0aW5nQ29udGV4dCB7CiAgICAgICAgIHJpZ2h0 IC09IHRoaXMuX2Zvcm1hdHRpbmdDb250ZXh0KCkubWFyZ2luUmlnaHQoZmxvYXRpbmdCb3gpOwog ICAgICAgICB2ZXJ0aWNhbFBvc2l0aW9uICs9IHRoaXMuX2Zvcm1hdHRpbmdDb250ZXh0KCkubWFy Z2luVG9wKGZsb2F0aW5nQm94KTsKICAgICAgICAgLy8gTm8gY29udmVydCB0aGVtIGJhY2sgcmVs YXRpdmUgdG8gdGhlIGZsb2F0aW5nQm94J3MgY29udGFpbmluZyBibG9jay4KLSAgICAgICAgbGV0 IGNvbnRhaW5pbmdCbG9ja0xlZnQgPSB0aGlzLl9mb3JtYXR0aW5nQ29udGV4dCgpLmFic29sdXRl Qm9yZGVyQm94KGNvbnRhaW5pbmdCbG9jaykubGVmdCgpOwotICAgICAgICBsZXQgY29udGFpbmlu Z0Jsb2NrVG9wID0gdGhpcy5fZm9ybWF0dGluZ0NvbnRleHQoKS5hYnNvbHV0ZUJvcmRlckJveChj b250YWluaW5nQmxvY2spLnRvcCgpOworICAgICAgICBsZXQgY29udGFpbmluZ0Jsb2NrTGVmdCA9 IHRoaXMuX21hcEJvcmRlckJveFRvRm9ybWF0dGluZ1Jvb3QoY29udGFpbmluZ0Jsb2NrKS5sZWZ0 KCk7CisgICAgICAgIGxldCBjb250YWluaW5nQmxvY2tUb3AgPSB0aGlzLl9tYXBCb3JkZXJCb3hU b0Zvcm1hdHRpbmdSb290KGNvbnRhaW5pbmdCbG9jaykudG9wKCk7CiAgICAgICAgIGxlZnQgLT0g Y29udGFpbmluZ0Jsb2NrTGVmdDsKICAgICAgICAgcmlnaHQgLT0gY29udGFpbmluZ0Jsb2NrTGVm dDsKICAgICAgICAgdmVydGljYWxQb3NpdGlvbiAtPSBjb250YWluaW5nQmxvY2tUb3A7CkBAIC0x OTgsNiArMTk4LDE4IEBAIGNsYXNzIEZsb2F0aW5nQ29udGV4dCB7CiAgICAgICAgIHJldHVybiBV dGlscy5tYXJnaW5Cb3goZGlzcGxheUJveCwgcm9vdERpc3BsYXlCb3gpOwogICAgIH0KIAorICAg IF9tYXBCb3JkZXJCb3hUb0Zvcm1hdHRpbmdSb290KGxheW91dEJveCkgeworICAgICAgICBsZXQg ZGlzcGxheUJveCA9IHRoaXMuX2Zvcm1hdHRpbmdTdGF0ZSgpLmRpc3BsYXlCb3gobGF5b3V0Qm94 KTsKKyAgICAgICAgbGV0IHJvb3REaXNwbGF5Qm94ID0gdGhpcy5fZm9ybWF0dGluZ1N0YXRlKCku ZGlzcGxheUJveCh0aGlzLl9mb3JtYXR0aW5nUm9vdCgpKTsKKyAgICAgICAgcmV0dXJuIFV0aWxz LmJvcmRlckJveChkaXNwbGF5Qm94LCByb290RGlzcGxheUJveCk7CisgICAgfQorCisgICAgX21h cENvbnRlbnRCb3hUb0Zvcm1hdHRpbmdSb290KGxheW91dEJveCkgeworICAgICAgICBsZXQgZGlz cGxheUJveCA9IHRoaXMuX2Zvcm1hdHRpbmdTdGF0ZSgpLmRpc3BsYXlCb3gobGF5b3V0Qm94KTsK KyAgICAgICAgbGV0IHJvb3REaXNwbGF5Qm94ID0gdGhpcy5fZm9ybWF0dGluZ1N0YXRlKCkuZGlz cGxheUJveCh0aGlzLl9mb3JtYXR0aW5nUm9vdCgpKTsKKyAgICAgICAgcmV0dXJuIFV0aWxzLmNv bnRlbnRCb3goZGlzcGxheUJveCwgcm9vdERpc3BsYXlCb3gpOworICAgIH0KKwogICAgIF9mbG9h dGluZ1N0YXRlKCkgewogICAgICAgICByZXR1cm4gdGhpcy5tX2Zsb2F0aW5nU3RhdGU7CiAgICAg fQpkaWZmIC0tZ2l0IGEvVG9vbHMvTGF5b3V0UmVsb2FkZWQvRm9ybWF0dGluZ0NvbnRleHQvRm9y bWF0dGluZ0NvbnRleHQuanMgYi9Ub29scy9MYXlvdXRSZWxvYWRlZC9Gb3JtYXR0aW5nQ29udGV4 dC9Gb3JtYXR0aW5nQ29udGV4dC5qcwppbmRleCAxM2Y5MTJhMTFjMWZmNWZiZDkzYTQzZDNkYjEy YTYyODU0YTI3ZDI2Li5mNTIxZjA1NGUzNTJmZGQxY2NhMmZkZDAwMGZhNzAwMGEzNGYyNmNmIDEw MDY0NAotLS0gYS9Ub29scy9MYXlvdXRSZWxvYWRlZC9Gb3JtYXR0aW5nQ29udGV4dC9Gb3JtYXR0 aW5nQ29udGV4dC5qcworKysgYi9Ub29scy9MYXlvdXRSZWxvYWRlZC9Gb3JtYXR0aW5nQ29udGV4 dC9Gb3JtYXR0aW5nQ29udGV4dC5qcwpAQCAtNzIsNDQgKzcyLDYgQEAgY2xhc3MgRm9ybWF0dGlu Z0NvbnRleHQgewogICAgICAgICByZXR1cm4gVXRpbHMuY29tcHV0ZWRNYXJnaW5SaWdodChsYXlv dXRCb3gubm9kZSgpKTsKICAgICB9CiAKLSAgICBhYnNvbHV0ZUJvcmRlckJveChsYXlvdXRCb3gp IHsKLSAgICAgICAgbGV0IGJvcmRlckJveCA9IHRoaXMuZGlzcGxheUJveChsYXlvdXRCb3gpLmJv cmRlckJveCgpOwotICAgICAgICBsZXQgYWJzb2x1dGVSZWN0ID0gbmV3IExheW91dFJlY3QodGhp cy5fdG9Sb290QWJzb2x1dGVQb3NpdGlvbihsYXlvdXRCb3gpLCBib3JkZXJCb3guc2l6ZSgpKTsK LSAgICAgICAgYWJzb2x1dGVSZWN0Lm1vdmVCeShib3JkZXJCb3gudG9wTGVmdCgpKTsKLSAgICAg ICAgcmV0dXJuIGFic29sdXRlUmVjdDsKLSAgICB9Ci0KLSAgICBhYnNvbHV0ZVBhZGRpbmdCb3go bGF5b3V0Qm94KSB7Ci0gICAgICAgIGxldCBwYWRkaW5nQm94ID0gdGhpcy5kaXNwbGF5Qm94KGxh eW91dEJveCkucGFkZGluZ0JveCgpOwotICAgICAgICBsZXQgYWJzb2x1dGVSZWN0ID0gbmV3IExh eW91dFJlY3QodGhpcy5fdG9Sb290QWJzb2x1dGVQb3NpdGlvbihsYXlvdXRCb3gpLCBwYWRkaW5n Qm94LnNpemUoKSk7Ci0gICAgICAgIGFic29sdXRlUmVjdC5tb3ZlQnkocGFkZGluZ0JveC50b3BM ZWZ0KCkpOwotICAgICAgICByZXR1cm4gYWJzb2x1dGVSZWN0OwotICAgIH0KLQotICAgIGFic29s dXRlQ29udGVudEJveChsYXlvdXRCb3gpIHsKLSAgICAgICAgbGV0IGNvbnRlbnRCb3ggPSB0aGlz LmRpc3BsYXlCb3gobGF5b3V0Qm94KS5jb250ZW50Qm94KCk7Ci0gICAgICAgIGxldCBhYnNvbHV0 ZVJlY3QgPSBuZXcgTGF5b3V0UmVjdCh0aGlzLl90b1Jvb3RBYnNvbHV0ZVBvc2l0aW9uKGxheW91 dEJveCksIGNvbnRlbnRCb3guc2l6ZSgpKTsKLSAgICAgICAgYWJzb2x1dGVSZWN0Lm1vdmVCeShj b250ZW50Qm94LnRvcExlZnQoKSk7Ci0gICAgICAgIHJldHVybiBhYnNvbHV0ZVJlY3Q7Ci0gICAg fQotCi0gICAgX3RvQWJzb2x1dGVQb3NpdGlvbihwb3NpdGlvbiwgbGF5b3V0Qm94LCBjb250YWlu ZXIpIHsKLSAgICAgICAgLy8gV2Ugc2hvdWxkIG5ldmVyIG5lZWQgdG8gZ28gYmV5b25kIHRoZSBy b290IGNvbnRhaW5lci4KLSAgICAgICAgQVNTRVJUKGNvbnRhaW5lciA9PSB0aGlzLmZvcm1hdHRp bmdSb290KCkgfHwgY29udGFpbmVyLmlzRGVzY2VuZGFudE9mKHRoaXMuZm9ybWF0dGluZ1Jvb3Qo KSkpOwotICAgICAgICBsZXQgYWJzb2x1dGVQb3NpdGlvbiA9IHBvc2l0aW9uOwotICAgICAgICBs ZXQgYXNjZW5kYW50ID0gbGF5b3V0Qm94LmNvbnRhaW5pbmdCbG9jaygpOwotICAgICAgICB3aGls ZSAoYXNjZW5kYW50ICYmIGFzY2VuZGFudCAhPSBjb250YWluZXIpIHsKLSAgICAgICAgICAgIEFT U0VSVChhc2NlbmRhbnQuaXNEZXNjZW5kYW50T2YodGhpcy5mb3JtYXR0aW5nUm9vdCgpKSk7Ci0g ICAgICAgICAgICBhYnNvbHV0ZVBvc2l0aW9uLm1vdmVCeSh0aGlzLmRpc3BsYXlCb3goYXNjZW5k YW50KS50b3BMZWZ0KCkpOwotICAgICAgICAgICAgYXNjZW5kYW50ID0gYXNjZW5kYW50LmNvbnRh aW5pbmdCbG9jaygpOwotICAgICAgICB9Ci0gICAgICAgIHJldHVybiBhYnNvbHV0ZVBvc2l0aW9u OwotICAgIH0KLQotICAgIF90b1Jvb3RBYnNvbHV0ZVBvc2l0aW9uKGxheW91dEJveCkgewotICAg ICAgICByZXR1cm4gdGhpcy5fdG9BYnNvbHV0ZVBvc2l0aW9uKHRoaXMuZGlzcGxheUJveChsYXlv dXRCb3gpLnRvcExlZnQoKSwgbGF5b3V0Qm94LCB0aGlzLmZvcm1hdHRpbmdSb290KCkpOwotICAg IH0KLQogICAgIF9kZXNjZW5kYW50TmVlZHNMYXlvdXQoKSB7CiAgICAgICAgIHJldHVybiB0aGlz Lm1fbGF5b3V0U3RhY2subGVuZ3RoOwogICAgIH0KZGlmZiAtLWdpdCBhL1Rvb2xzL0xheW91dFJl bG9hZGVkL1V0aWxzLmpzIGIvVG9vbHMvTGF5b3V0UmVsb2FkZWQvVXRpbHMuanMKaW5kZXggYjUz ZjljOTAxZDgxNGM5NzUwNDc5ODZmZTQ4MjE0YzIyOTMyMWUxOC4uMmU2MTIyOGE1NzRiOTliZDNi NWEyZmZkNGQwYmZiMjFiZWVhZDgyYyAxMDA2NDQKLS0tIGEvVG9vbHMvTGF5b3V0UmVsb2FkZWQv VXRpbHMuanMKKysrIGIvVG9vbHMvTGF5b3V0UmVsb2FkZWQvVXRpbHMuanMKQEAgLTQ3NSwxOCAr NDc1LDM2IEBAIGNsYXNzIFV0aWxzIHsKICAgICAgICAgcmV0dXJuIHdpbmRvdy5nZXRDb21wdXRl ZFN0eWxlKG5vZGUpLmZsb2F0ID09ICJsZWZ0IjsKICAgICB9CiAKLSAgICBzdGF0aWMgbWFyZ2lu Qm94KGJveCwgY29udGFpbmVyKSB7CisgICAgc3RhdGljIG1hcFBvc2l0aW9uKHBvc2l0aW9uLCBi b3gsIGNvbnRhaW5lcikgewogICAgICAgICBBU1NFUlQoYm94IGluc3RhbmNlb2YgRGlzcGxheS5C b3gpOwogICAgICAgICBBU1NFUlQoY29udGFpbmVyIGluc3RhbmNlb2YgRGlzcGxheS5Cb3gpOwog Ci0gICAgICAgIGxldCBtYXJnaW5Cb3ggPSBib3gubWFyZ2luQm94KCk7CiAgICAgICAgIGlmIChi b3ggPT0gY29udGFpbmVyKQotICAgICAgICAgICAgcmV0dXJuIG1hcmdpbkJveDsKKyAgICAgICAg ICAgIHJldHVybiBwb3NpdGlvbjsKICAgICAgICAgZm9yIChsZXQgYXNjZW5kYW50ID0gYm94LnBh cmVudCgpOyBhc2NlbmRhbnQgJiYgYXNjZW5kYW50ICE9IGNvbnRhaW5lcjsgYXNjZW5kYW50ID0g YXNjZW5kYW50LnBhcmVudCgpKQotICAgICAgICAgICAgbWFyZ2luQm94Lm1vdmVCeShhc2NlbmRh bnQudG9wTGVmdCgpKTsKLSAgICAgICAgcmV0dXJuIG1hcmdpbkJveDsKKyAgICAgICAgICAgIHBv c2l0aW9uLm1vdmVCeShhc2NlbmRhbnQudG9wTGVmdCgpKTsKKyAgICAgICAgcmV0dXJuIHBvc2l0 aW9uOwogICAgIH0KIAorICAgIHN0YXRpYyBtYXJnaW5Cb3goYm94LCBjb250YWluZXIpIHsKKyAg ICAgICAgbGV0IG1hcmdpbkJveCA9IGJveC5tYXJnaW5Cb3goKTsKKyAgICAgICAgbGV0IG1hcHBl ZFBvc2l0aW9uID0gVXRpbHMubWFwUG9zaXRpb24obWFyZ2luQm94LnRvcExlZnQoKSwgYm94LCBj b250YWluZXIpOworICAgICAgICByZXR1cm4gbmV3IExheW91dFJlY3QobWFwcGVkUG9zaXRpb24s IG1hcmdpbkJveC5zaXplKCkpOworICAgIH0KKworICAgIHN0YXRpYyBib3JkZXJCb3goYm94LCBj b250YWluZXIpIHsKKyAgICAgICAgbGV0IGJvcmRlckJveCA9IGJveC5ib3JkZXJCb3goKTsKKyAg ICAgICAgbGV0IG1hcHBlZFBvc2l0aW9uID0gVXRpbHMubWFwUG9zaXRpb24oYm94LnRvcExlZnQo KSwgYm94LCBjb250YWluZXIpOworICAgICAgICBtYXBwZWRQb3NpdGlvbi5tb3ZlQnkoYm9yZGVy Qm94LnRvcExlZnQoKSk7CisgICAgICAgIHJldHVybiBuZXcgTGF5b3V0UmVjdChtYXBwZWRQb3Np dGlvbiwgYm9yZGVyQm94LnNpemUoKSk7CisgICAgfQorCisgICAgc3RhdGljIGNvbnRlbnRCb3go Ym94LCBjb250YWluZXIpIHsKKyAgICAgICAgbGV0IGNvbnRlbnRCb3ggPSBib3guY29udGVudEJv eCgpOworICAgICAgICBsZXQgbWFwcGVkUG9zaXRpb24gPSBVdGlscy5tYXBQb3NpdGlvbihib3gu dG9wTGVmdCgpLCBib3gsIGNvbnRhaW5lcik7CisgICAgICAgIG1hcHBlZFBvc2l0aW9uLm1vdmVC eShjb250ZW50Qm94LnRvcExlZnQoKSk7CisgICAgICAgIHJldHVybiBuZXcgTGF5b3V0UmVjdCht YXBwZWRQb3NpdGlvbiwgY29udGVudEJveC5zaXplKCkpOworICAgIH0KIAogICAgIHN0YXRpYyB0 ZXh0UnVucyh0ZXh0LCBjb250YWluZXIpIHsKICAgICAgICAgcmV0dXJuIHdpbmRvdy5jb2xsZWN0 VGV4dFJ1bnModGV4dCwgY29udGFpbmVyLm5vZGUoKSk7Cg==