184527 2018-04-11 21:10:27 -0700 [LayoutReloaded] Introduce needsLayout flag 2018-04-11 21:20:24 -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 1413918 0 zalan 2018-04-11 21:10:27 -0700 ssia 1413919 1 337772 zalan 2018-04-11 21:12:47 -0700 Created attachment 337772 Patch 1413921 2 zalan 2018-04-11 21:19:40 -0700 Committed r230555: <https://trac.webkit.org/changeset/230555> 1413922 3 webkit-bug-importer 2018-04-11 21:20:24 -0700 <rdar://problem/39371052> 337772 2018-04-11 21:12:47 -0700 2018-04-11 21:12:47 -0700 Patch bug-184527-20180411211246.patch text/plain 11626 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjMwNDg0CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMWQ2ZTU0MTM3OWJmY2ViNjVhNjZkMjk2YjkxYzRlNzdj YTJlZGRjYS4uYTJmYmU0ZmFmMTE1MDk4MGE3NDc2YzE4NTA5MWYyNGZiZjk4NGZlNiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM1 IEBACisyMDE4LTA0LTExICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAg ICAgW0xheW91dFJlbG9hZGVkXSBJbnRyb2R1Y2UgbmVlZHNMYXlvdXQgZmxhZworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg0NTI3CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVXNlIHRoZSBmb3JtYXR0aW5n IHN0YXRlIHRvIG1hcmsgYm94ZXMgZGlydHkuCisKKyAgICAgICAgKiBMYXlvdXRSZWxvYWRlZC9G b3JtYXR0aW5nQ29udGV4dC9CbG9ja0Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5q czoKKyAgICAgICAgKEJsb2NrRm9ybWF0dGluZ0NvbnRleHQucHJvdG90eXBlLmxheW91dCk6Cisg ICAgICAgIChCbG9ja0Zvcm1hdHRpbmdDb250ZXh0LnByb3RvdHlwZS5fZmlyc3RJbkZsb3dDaGls ZFdpdGhOZWVkc0xheW91dCk6CisgICAgICAgIChCbG9ja0Zvcm1hdHRpbmdDb250ZXh0LnByb3Rv dHlwZS5fbmV4dEluRmxvd1NpYmxpbmdXaXRoTmVlZHNMYXlvdXQpOgorICAgICAgICAoQmxvY2tG b3JtYXR0aW5nQ29udGV4dCk6CisgICAgICAgICogTGF5b3V0UmVsb2FkZWQvRm9ybWF0dGluZ0Nv bnRleHQvRm9ybWF0dGluZ0NvbnRleHQuanM6CisgICAgICAgIChGb3JtYXR0aW5nQ29udGV4dC5w cm90b3R5cGUuX2xheW91dE91dE9mRmxvd0Rlc2NlbmRhbnRzKToKKyAgICAgICAgKiBMYXlvdXRS ZWxvYWRlZC9Gb3JtYXR0aW5nU3RhdGUvRm9ybWF0dGluZ1N0YXRlLmpzOgorICAgICAgICAoRm9y bWF0dGluZ1N0YXRlKToKKyAgICAgICAgKEZvcm1hdHRpbmdTdGF0ZS5wcm90b3R5cGUubWFya05l ZWRzTGF5b3V0KToKKyAgICAgICAgKEZvcm1hdHRpbmdTdGF0ZS5wcm90b3R5cGUuY2xlYXJOZWVk c0xheW91dCk6CisgICAgICAgIChGb3JtYXR0aW5nU3RhdGUucHJvdG90eXBlLm5lZWRzTGF5b3V0 KToKKyAgICAgICAgKEZvcm1hdHRpbmdTdGF0ZS5wcm90b3R5cGUubGF5b3V0TmVlZGVkKToKKyAg ICAgICAgKEZvcm1hdHRpbmdTdGF0ZS5wcm90b3R5cGUuX21hcmtTdWJUcmVlTmVlZHNMYXlvdXQp OgorICAgICAgICAqIExheW91dFJlbG9hZGVkL0xheW91dFN0YXRlLmpzOgorICAgICAgICAoTGF5 b3V0U3RhdGUucHJvdG90eXBlLmZvcm1hdHRpbmdTdGF0ZUZvckJveCk6CisgICAgICAgIChMYXlv dXRTdGF0ZS5wcm90b3R5cGUuc2V0TmVlZHNMYXlvdXQpOgorICAgICAgICAoTGF5b3V0U3RhdGUu cHJvdG90eXBlLm5lZWRzTGF5b3V0KToKKyAgICAgICAgKiBMYXlvdXRSZWxvYWRlZC9MYXlvdXRU cmVlL0JveC5qczoKKyAgICAgICAgKExheW91dC5Cb3gucHJvdG90eXBlLmlzRm9ybWF0dGluZ0Nv bnRleHREZXNjZW5kYW50KToKKyAgICAgICAgKiBMYXlvdXRSZWxvYWRlZC9MYXlvdXRUcmVlL0Nv bnRhaW5lci5qczoKKyAgICAgICAgKExheW91dC5Db250YWluZXIucHJvdG90eXBlLmlzQ29udGFp bmluZ0Jsb2NrRGVzY2VuZGFudCk6CisKIDIwMTgtMDQtMTAgIFphbGFuIEJ1anRhcyAgPHphbGFu QGFwcGxlLmNvbT4KIAogICAgICAgICBbTGF5b3V0UmVsb2FkZWRdIEFkZCBzdXBwb3J0IGZvciBv dXQtb2YtZmxvdyBkZXNjZW5kYW50cyBpbiBpbmxpbmUgZm9ybWF0dGluZyBjb250ZXh0LgpkaWZm IC0tZ2l0IGEvVG9vbHMvTGF5b3V0UmVsb2FkZWQvRm9ybWF0dGluZ0NvbnRleHQvQmxvY2tGb3Jt YXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuanMgYi9Ub29scy9MYXlvdXRSZWxvYWRlZC9G b3JtYXR0aW5nQ29udGV4dC9CbG9ja0Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5q cwppbmRleCBhMjQzYzI4Mzk4Y2FhMmE5NzNhZjZlNzg3YjIxODc0ZDliMzYxZDY3Li41MjRjMjY0 OTc2MjNmNDU4ZjY4YTYwODQ1OTQ3Zjg0YTVjZmI5YWVmIDEwMDY0NAotLS0gYS9Ub29scy9MYXlv dXRSZWxvYWRlZC9Gb3JtYXR0aW5nQ29udGV4dC9CbG9ja0Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0 aW5nQ29udGV4dC5qcworKysgYi9Ub29scy9MYXlvdXRSZWxvYWRlZC9Gb3JtYXR0aW5nQ29udGV4 dC9CbG9ja0Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5qcwpAQCAtMzUsOCArMzUs NyBAQCBjbGFzcyBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0IGV4dGVuZHMgRm9ybWF0dGluZ0NvbnRl eHQgewogCiAgICAgICAgIC8vIFRoaXMgaXMgYSBwb3N0LW9yZGVyIHRyZWUgdHJhdmVyc2FsIGxh eW91dC4KICAgICAgICAgLy8gVGhlIHJvb3QgY29udGFpbmVyIGxheW91dCBpcyBkb25lIGluIHRo ZSBmb3JtYXR0aW5nIGNvbnRleHQgaXQgbGl2ZXMgaW4sIG5vdCB0aGF0IG9uZSBpdCBjcmVhdGVz LCBzbyBsZXQncyBzdGFydCB3aXRoIHRoZSBmaXJzdCBjaGlsZC4KLSAgICAgICAgaWYgKHRoaXMu Zm9ybWF0dGluZ1Jvb3QoKS5maXJzdEluRmxvd09yRmxvYXRDaGlsZCgpKQotICAgICAgICAgICAg dGhpcy5fYWRkVG9MYXlvdXRRdWV1ZSh0aGlzLmZvcm1hdHRpbmdSb290KCkuZmlyc3RJbkZsb3dP ckZsb2F0Q2hpbGQoKSk7CisgICAgICAgIHRoaXMuX2FkZFRvTGF5b3V0UXVldWUodGhpcy5fZmly c3RJbkZsb3dDaGlsZFdpdGhOZWVkc0xheW91dCh0aGlzLmZvcm1hdHRpbmdSb290KCkpKTsKICAg ICAgICAgLy8gMS4gR28gYWxsIHRoZSB3YXkgZG93biB0byB0aGUgbGVhZiBub2RlCiAgICAgICAg IC8vIDIuIENvbXB1dGUgc3RhdGljIHBvc2l0aW9uIGFuZCB3aWR0aCBhcyB3ZSB0cmF2ZXJzIGRv d24KICAgICAgICAgLy8gMy4gQXMgd2UgY2xpbWIgYmFjayBvbiB0aGUgdHJlZSwgY29tcHV0ZSBo ZWlnaHQgYW5kIGZpbmlhbGl6ZSBwb3NpdGlvbgpAQCAtNTEsOSArNTAsMTAgQEAgY2xhc3MgQmxv Y2tGb3JtYXR0aW5nQ29udGV4dCBleHRlbmRzIEZvcm1hdHRpbmdDb250ZXh0IHsKICAgICAgICAg ICAgICAgICAgICAgdGhpcy5sYXlvdXRTdGF0ZSgpLmxheW91dChsYXlvdXRCb3gpOwogICAgICAg ICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICAgICAg aWYgKCFsYXlvdXRCb3guaXNDb250YWluZXIoKSB8fCAhbGF5b3V0Qm94Lmhhc0luRmxvd09yRmxv YXRDaGlsZCgpKQorICAgICAgICAgICAgICAgIGxldCBjaGlsZFRvTGF5b3V0ID0gdGhpcy5fZmly c3RJbkZsb3dDaGlsZFdpdGhOZWVkc0xheW91dChsYXlvdXRCb3gpOworICAgICAgICAgICAgICAg IGlmICghY2hpbGRUb0xheW91dCkKICAgICAgICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAg ICAgICAgICAgdGhpcy5fYWRkVG9MYXlvdXRRdWV1ZShsYXlvdXRCb3guZmlyc3RJbkZsb3dPckZs b2F0Q2hpbGQoKSk7CisgICAgICAgICAgICAgICAgdGhpcy5fYWRkVG9MYXlvdXRRdWV1ZShjaGls ZFRvTGF5b3V0KTsKICAgICAgICAgICAgIH0KIAogICAgICAgICAgICAgLy8gQ2xpbWIgYmFjayBv biB0aGUgYW5jZXN0b3JzIGFuZCBjb21wdXRlIGhlaWdodC9maW5hbCBwb3NpdGlvbi4KQEAgLTY3 LDggKzY3LDEwIEBAIGNsYXNzIEJsb2NrRm9ybWF0dGluZ0NvbnRleHQgZXh0ZW5kcyBGb3JtYXR0 aW5nQ29udGV4dCB7CiAgICAgICAgICAgICAgICAgdGhpcy5fcGxhY2VJbkZsb3dQb3NpdGlvbmVk Q2hpbGRyZW4obGF5b3V0Qm94KTsKICAgICAgICAgICAgICAgICAvLyBXZSBhcmUgZG9uZSB3aXRo IGxheWluZyBvdXQgdGhpcyBib3guCiAgICAgICAgICAgICAgICAgdGhpcy5fcmVtb3ZlRnJvbUxh eW91dFF1ZXVlKGxheW91dEJveCk7Ci0gICAgICAgICAgICAgICAgaWYgKGxheW91dEJveC5uZXh0 SW5GbG93T3JGbG9hdFNpYmxpbmcoKSkgewotICAgICAgICAgICAgICAgICAgICB0aGlzLl9hZGRU b0xheW91dFF1ZXVlKGxheW91dEJveC5uZXh0SW5GbG93T3JGbG9hdFNpYmxpbmcoKSk7CisgICAg ICAgICAgICAgICAgdGhpcy5mb3JtYXR0aW5nU3RhdGUoKS5jbGVhck5lZWRzTGF5b3V0KGxheW91 dEJveCk7CisgICAgICAgICAgICAgICAgbGV0IG5leHRTaWJsaW5nVG9MYXlvdXQgPSB0aGlzLl9u ZXh0SW5GbG93U2libGluZ1dpdGhOZWVkc0xheW91dChsYXlvdXRCb3gpOworICAgICAgICAgICAg ICAgIGlmIChuZXh0U2libGluZ1RvTGF5b3V0KSB7CisgICAgICAgICAgICAgICAgICAgIHRoaXMu X2FkZFRvTGF5b3V0UXVldWUobmV4dFNpYmxpbmdUb0xheW91dCk7CiAgICAgICAgICAgICAgICAg ICAgIGJyZWFrOwogICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgIH0KQEAgLTc3LDYgKzc5 LDcgQEAgY2xhc3MgQmxvY2tGb3JtYXR0aW5nQ29udGV4dCBleHRlbmRzIEZvcm1hdHRpbmdDb250 ZXh0IHsKICAgICAgICAgdGhpcy5fcGxhY2VJbkZsb3dQb3NpdGlvbmVkQ2hpbGRyZW4odGhpcy5m b3JtYXR0aW5nUm9vdCgpKTsKICAgICAgICAgLy8gQW5kIHRha2UgY2FyZSBvZiBvdXQtb2YtZmxv dyBib3hlcyBhcyB0aGUgZmluYWwgc3RlcC4KICAgICAgICAgdGhpcy5fbGF5b3V0T3V0T2ZGbG93 RGVzY2VuZGFudHMoKTsKKyAgICAgICAgQVNTRVJUKCF0aGlzLmZvcm1hdHRpbmdTdGF0ZSgpLmxh eW91dE5lZWRlZCgpKTsKICAgIH0KIAogICAgIGNvbXB1dGVXaWR0aChsYXlvdXRCb3gpIHsKQEAg LTE3NSw0ICsxNzgsMjIgQEAgY2xhc3MgQmxvY2tGb3JtYXR0aW5nQ29udGV4dCBleHRlbmRzIEZv cm1hdHRpbmdDb250ZXh0IHsKICAgICAgICAgfQogICAgICAgICByZXR1cm4gYm90dG9tOwogICAg IH0KKworICAgIF9maXJzdEluRmxvd0NoaWxkV2l0aE5lZWRzTGF5b3V0KGxheW91dEJveCkgewor ICAgICAgICBpZiAoIWxheW91dEJveC5pc0NvbnRhaW5lcigpKQorICAgICAgICAgICAgcmV0dXJu IG51bGw7CisgICAgICAgIGZvciAobGV0IGNoaWxkID0gbGF5b3V0Qm94LmZpcnN0SW5GbG93T3JG bG9hdENoaWxkKCk7IGNoaWxkOyBjaGlsZCA9IGNoaWxkLm5leHRJbkZsb3dPckZsb2F0U2libGlu ZygpKSB7CisgICAgICAgICAgICBpZiAodGhpcy5mb3JtYXR0aW5nU3RhdGUoKS5uZWVkc0xheW91 dChjaGlsZCkpCisgICAgICAgICAgICAgICAgcmV0dXJuIGNoaWxkOworICAgICAgICB9CisgICAg ICAgIHJldHVybiBudWxsOworICAgIH0KKworICAgIF9uZXh0SW5GbG93U2libGluZ1dpdGhOZWVk c0xheW91dChsYXlvdXRCb3gpIHsKKyAgICAgICAgZm9yIChsZXQgc2libGluZyA9IGxheW91dEJv eC5uZXh0SW5GbG93T3JGbG9hdFNpYmxpbmcoKTsgc2libGluZzsgc2libGluZyA9IHNpYmxpbmcu bmV4dEluRmxvd09yRmxvYXRTaWJsaW5nKCkpIHsKKyAgICAgICAgICAgIGlmICh0aGlzLmZvcm1h dHRpbmdTdGF0ZSgpLm5lZWRzTGF5b3V0KHNpYmxpbmcpKQorICAgICAgICAgICAgICAgIHJldHVy biBzaWJsaW5nOworICAgICAgICB9CisgICAgICAgIHJldHVybiBudWxsOworICAgIH0KIH0KZGlm ZiAtLWdpdCBhL1Rvb2xzL0xheW91dFJlbG9hZGVkL0Zvcm1hdHRpbmdDb250ZXh0L0Zvcm1hdHRp bmdDb250ZXh0LmpzIGIvVG9vbHMvTGF5b3V0UmVsb2FkZWQvRm9ybWF0dGluZ0NvbnRleHQvRm9y bWF0dGluZ0NvbnRleHQuanMKaW5kZXggNDI1ZTZhOTNiZTI3OGE1YmQ3MzU1Y2UwMjQyZjY4NTMw MWNkMzFmNi4uZTJjMThkOTNhMzMxMzc4OWQxOTIxOTNjZmFiZGMxNGQ5M2RkMTQ1YiAxMDA2NDQK LS0tIGEvVG9vbHMvTGF5b3V0UmVsb2FkZWQvRm9ybWF0dGluZ0NvbnRleHQvRm9ybWF0dGluZ0Nv bnRleHQuanMKKysrIGIvVG9vbHMvTGF5b3V0UmVsb2FkZWQvRm9ybWF0dGluZ0NvbnRleHQvRm9y bWF0dGluZ0NvbnRleHQuanMKQEAgLTE2NSw2ICsxNjUsNyBAQCBjbGFzcyBGb3JtYXR0aW5nQ29u dGV4dCB7CiAgICAgICAgICAgICB0aGlzLl9jb21wdXRlT3V0T2ZGbG93SGVpZ2h0KG91dE9mRmxv d0JveCk7CiAgICAgICAgICAgICB0aGlzLl9jb21wdXRlT3V0T2ZGbG93UG9zaXRpb24ob3V0T2ZG bG93Qm94KTsKICAgICAgICAgICAgIHRoaXMuX3JlbW92ZUZyb21MYXlvdXRRdWV1ZShvdXRPZkZs b3dCb3gpOworICAgICAgICAgICAgdGhpcy5mb3JtYXR0aW5nU3RhdGUoKS5jbGVhck5lZWRzTGF5 b3V0KG91dE9mRmxvd0JveCk7CiAgICAgICAgIH0KICAgICB9CiAKZGlmZiAtLWdpdCBhL1Rvb2xz L0xheW91dFJlbG9hZGVkL0Zvcm1hdHRpbmdTdGF0ZS9Gb3JtYXR0aW5nU3RhdGUuanMgYi9Ub29s cy9MYXlvdXRSZWxvYWRlZC9Gb3JtYXR0aW5nU3RhdGUvRm9ybWF0dGluZ1N0YXRlLmpzCmluZGV4 IDFlMjhmYWE1NmM5Y2VmZGQ4MzgwYmQ4YWZlMjkwMTljNWI0ODA0NDEuLjQwNmYyZWQ4M2VmYTY5 ZmJiODAxNjRlZWI2YjdkYzIyM2JkZWNlZTggMTAwNjQ0Ci0tLSBhL1Rvb2xzL0xheW91dFJlbG9h ZGVkL0Zvcm1hdHRpbmdTdGF0ZS9Gb3JtYXR0aW5nU3RhdGUuanMKKysrIGIvVG9vbHMvTGF5b3V0 UmVsb2FkZWQvRm9ybWF0dGluZ1N0YXRlL0Zvcm1hdHRpbmdTdGF0ZS5qcwpAQCAtMjksNiArMjks OCBAQCBjbGFzcyBGb3JtYXR0aW5nU3RhdGUgewogICAgICAgICB0aGlzLm1fZm9ybWF0dGluZ1Jv b3QgPSBmb3JtYXR0aW5nUm9vdDsKICAgICAgICAgdGhpcy5tX2Zsb2F0aW5nU3RhdGUgPSBudWxs OwogICAgICAgICB0aGlzLm1fZGlzcGxheVRvTGF5b3V0ID0gbmV3IE1hcCgpOworICAgICAgICB0 aGlzLm1fbmVlZHNMYXlvdXRCb3hMaXN0ID0gbmV3IE1hcCgpOworICAgICAgICB0aGlzLl9tYXJr U3ViVHJlZU5lZWRzTGF5b3V0KGZvcm1hdHRpbmdSb290KTsKICAgICB9CiAKICAgICBmb3JtYXR0 aW5nUm9vdCgpIHsKQEAgLTg2LDQgKzg4LDM0IEBAIGNsYXNzIEZvcm1hdHRpbmdTdGF0ZSB7CiAg ICAgICAgIEFTU0VSVCghbGF5b3V0Qm94LnBhcmVudCgpKTsKICAgICAgICAgcmV0dXJuIHRoaXMu bGF5b3V0U3RhdGUoKS5pbml0aWFsRGlzcGxheUJveCgpOwogICAgIH0KKworICAgIG1hcmtOZWVk c0xheW91dChsYXlvdXRCb3gpIHsKKyAgICAgICAgdGhpcy5tX25lZWRzTGF5b3V0Qm94TGlzdC5z ZXQobGF5b3V0Qm94KTsKKyAgICB9CisKKyAgICBjbGVhck5lZWRzTGF5b3V0KGxheW91dEJveCkg eworICAgICAgICB0aGlzLm1fbmVlZHNMYXlvdXRCb3hMaXN0LmRlbGV0ZShsYXlvdXRCb3gpOwor ICAgIH0KKworICAgIG5lZWRzTGF5b3V0KGxheW91dEJveCkgeworICAgICAgICByZXR1cm4gdGhp cy5tX25lZWRzTGF5b3V0Qm94TGlzdC5oYXMobGF5b3V0Qm94KTsKKyAgICB9CisKKyAgICAvLyBU aGlzIHNob3VsZCBqdXN0IGJlIG5lZWRzTGF5b3V0KCkKKyAgICBsYXlvdXROZWVkZWQoKSB7Cisg ICAgICAgIHJldHVybiB0aGlzLm1fbmVlZHNMYXlvdXRCb3hMaXN0LnNpemU7CisgICAgfQorCisg ICAgX21hcmtTdWJUcmVlTmVlZHNMYXlvdXQoc3ViVHJlZVJvb3QpIHsKKyAgICAgICAgaWYgKCFz dWJUcmVlUm9vdCkKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgLy8gT25seSBtYXJrIGNo aWxkcmVuIHRoYXQgYWN0dWFsbHkgYmVsb25nIHRvIHRoaXMgZm9ybWF0dGluZyBjb250ZXh0L3N0 YXRlLgorICAgICAgICBpZiAodGhpcy5mb3JtYXR0aW5nUm9vdCgpLmlzRm9ybWF0dGluZ0NvbnRl eHREZXNjZW5kYW50KHN1YlRyZWVSb290KSkKKyAgICAgICAgICAgIHRoaXMubWFya05lZWRzTGF5 b3V0KHN1YlRyZWVSb290KTsKKyAgICAgICAgaWYgKCFzdWJUcmVlUm9vdC5pc0NvbnRhaW5lcigp IHx8ICFzdWJUcmVlUm9vdC5oYXNDaGlsZCgpKQorICAgICAgICAgICAgcmV0dXJuOworICAgICAg ICBmb3IgKGxldCBjaGlsZCA9IHN1YlRyZWVSb290LmZpcnN0Q2hpbGQoKTsgY2hpbGQ7IGNoaWxk ID0gY2hpbGQubmV4dFNpYmxpbmcoKSkKKyAgICAgICAgICAgIHRoaXMuX21hcmtTdWJUcmVlTmVl ZHNMYXlvdXQoY2hpbGQpOworICAgIH0KKwogfQpkaWZmIC0tZ2l0IGEvVG9vbHMvTGF5b3V0UmVs b2FkZWQvTGF5b3V0U3RhdGUuanMgYi9Ub29scy9MYXlvdXRSZWxvYWRlZC9MYXlvdXRTdGF0ZS5q cwppbmRleCA5MmMyOWUyOTQxOThhMDYwMGEzNmZhMzE2MGE4N2QwNTA2NzE1YjBkLi41MzNkN2M5 NDA0NGM1NzUwOTQxNzAyNDBiYWNkZmQ4NDg2YzBmNDQ5IDEwMDY0NAotLS0gYS9Ub29scy9MYXlv dXRSZWxvYWRlZC9MYXlvdXRTdGF0ZS5qcworKysgYi9Ub29scy9MYXlvdXRSZWxvYWRlZC9MYXlv dXRTdGF0ZS5qcwpAQCAtNjQsMTQgKzY0LDI4IEBAIGNsYXNzIExheW91dFN0YXRlIHsKICAgICB9 CiAKICAgICBmb3JtYXR0aW5nU3RhdGVGb3JCb3gobGF5b3V0Qm94KSB7Ci0gICAgICAgIC8vIEZJ WE1FOiBXZSBzaG91bGQgcHJvYmFibHkgY2FjaGUgdGhpcyBzb21ld2hlcmUKLSAgICAgICAgbGV0 IGZvcm1hdHRpbmdTdGF0ZSA9IG51bGw7Ci0gICAgICAgIGxldCBhbmNlc3RvciA9IGxheW91dEJv eC5jb250YWluaW5nQmxvY2soKTsKLSAgICAgICAgZG8gewotICAgICAgICAgICAgZm9ybWF0dGlu Z1N0YXRlID0gdGhpcy5tX2Zvcm1hdHRpbmdTdGF0ZXMuZ2V0KGFuY2VzdG9yKTsKLSAgICAgICAg ICAgIGFuY2VzdG9yID0gYW5jZXN0b3IuY29udGFpbmluZ0Jsb2NrKCk7Ci0gICAgICAgIH0gd2hp bGUgKCFmb3JtYXR0aW5nU3RhdGUpOwotICAgICAgICByZXR1cm4gZm9ybWF0dGluZ1N0YXRlOwor ICAgICAgICBmb3IgKGxldCBmb3JtYXR0aW5nU3RhdGUgb2YgdGhpcy5mb3JtYXR0aW5nU3RhdGVz KCkpIHsKKyAgICAgICAgICAgIGlmIChmb3JtYXR0aW5nU3RhdGVbMF0uaXNGb3JtYXR0aW5nQ29u dGV4dERlc2NlbmRhbnQobGF5b3V0Qm94KSkKKyAgICAgICAgICAgICAgICByZXR1cm4gZm9ybWF0 dGluZ1N0YXRlWzFdOworICAgICAgICB9CisgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwor ICAgICAgICByZXR1cm4gbnVsbDsKKyAgICB9CisKKyAgICBzZXROZWVkc0xheW91dChsYXlvdXRC b3gpIHsKKyAgICAgICAgbGV0IGZvcm1hdHRpbmdTdGF0ZSA9IHRoaXMuZm9ybWF0dGluZ1N0YXRl Rm9yQm94KGxheW91dEJveCk7CisgICAgICAgIC8vIE5ld2x5IGNyZWF0ZWQgZm9ybWF0dGluZyBz dGF0ZSB3aWxsIG9idmlvdXNseSBtYXJrIGFsbCB0aGUgYm94ZXMgZGlydHkuCisgICAgICAgIGlm ICghZm9ybWF0dGluZ1N0YXRlKQorICAgICAgICAgICAgcmV0dXJuOworICAgICAgICBmb3JtYXR0 aW5nU3RhdGUuc2V0TmVlZHNMYXlvdXQobGF5b3V0Qm94KTsKKyAgICB9CisKKyAgICBuZWVkc0xh eW91dCgpIHsKKyAgICAgICAgZm9yIChsZXQgZm9ybWF0dGluZ1N0YXRlIG9mIHRoaXMuZm9ybWF0 dGluZ1N0YXRlcygpKSB7CisgICAgICAgICAgICBpZiAoZm9ybWF0dGluZ1N0YXRlWzFdLmxheW91 dE5lZWRlZCgpKQorICAgICAgICAgICAgICAgIHJldHVybiB0cnVlOworICAgICAgICB9CisgICAg ICAgIHJldHVybiBmYWxzZTsKICAgICB9CiAKICAgICBpbml0aWFsRGlzcGxheUJveCgpIHsKZGlm ZiAtLWdpdCBhL1Rvb2xzL0xheW91dFJlbG9hZGVkL0xheW91dFRyZWUvQm94LmpzIGIvVG9vbHMv TGF5b3V0UmVsb2FkZWQvTGF5b3V0VHJlZS9Cb3guanMKaW5kZXggZGM0ZWJjZTIwYjVhMWVmMzhj Mzg3YWY0YzFhOTBhYmI5NWQzOTliMC4uZjIwODdkNDVhNmUxYWYwMzk1MDVhMDllOTcxNjk1YWIz NTgwMzdiMCAxMDA2NDQKLS0tIGEvVG9vbHMvTGF5b3V0UmVsb2FkZWQvTGF5b3V0VHJlZS9Cb3gu anMKKysrIGIvVG9vbHMvTGF5b3V0UmVsb2FkZWQvTGF5b3V0VHJlZS9Cb3guanMKQEAgLTE2NSw2 ICsxNjUsMTggQEAgTGF5b3V0LkJveCA9IGNsYXNzIEJveCB7CiAgICAgICAgIHJldHVybiBmYWxz ZTsKICAgICB9CiAKKyAgICBpc0Zvcm1hdHRpbmdDb250ZXh0RGVzY2VuZGFudChsYXlvdXRCb3gp IHsKKyAgICAgICAgQVNTRVJUKHRoaXMuZXN0YWJsaXNoZXNGb3JtYXR0aW5nQ29udGV4dCgpKTsK KyAgICAgICAgLy8gSWYgd2UgaGl0IHRoZSAidGhpcyIgd2hpbGUgY2xpbWJpbmcgdXAgb24gdGhl IGNvbnRhaW5pbmcgYmxvY2sgY2hhaW4gYW5kIHdlIGRvbid0IHBhc3MgYSBmb3JtYXR0aW5nIGNv bnRleHQgcm9vdCAtPiBib3ggaXMgcGFydCBvZiB0aGlzIGJveCdzIGZvcm1hdHRpbmcgY29udGV4 dC4KKyAgICAgICAgZm9yIChsZXQgY29udGFpbmluZ0Jsb2NrID0gbGF5b3V0Qm94LmNvbnRhaW5p bmdCbG9jaygpOyBjb250YWluaW5nQmxvY2s7IGNvbnRhaW5pbmdCbG9jayA9IGNvbnRhaW5pbmdC bG9jay5jb250YWluaW5nQmxvY2soKSkgeworICAgICAgICAgICAgaWYgKGNvbnRhaW5pbmdCbG9j ayA9PSB0aGlzKQorICAgICAgICAgICAgICAgIHJldHVybiB0cnVlOworICAgICAgICAgICAgaWYg KGNvbnRhaW5pbmdCbG9jay5lc3RhYmxpc2hlc0Zvcm1hdHRpbmdDb250ZXh0KCkpCisgICAgICAg ICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICB9CisgICAgICAgIHJldHVybiBmYWxzZTsK KyAgICB9CisKICAgICBpc1Bvc2l0aW9uZWQoKSB7CiAgICAgICAgIHJldHVybiB0aGlzLmlzT3V0 T2ZGbG93UG9zaXRpb25lZCgpIHx8IHRoaXMuaXNSZWxhdGl2ZWx5UG9zaXRpb25lZCgpOwogICAg IH0KZGlmZiAtLWdpdCBhL1Rvb2xzL0xheW91dFJlbG9hZGVkL0xheW91dFRyZWUvQ29udGFpbmVy LmpzIGIvVG9vbHMvTGF5b3V0UmVsb2FkZWQvTGF5b3V0VHJlZS9Db250YWluZXIuanMKaW5kZXgg MDFiZjczZGQ3MTk5YTM3NDA4OTllNjFjMmI2MGQ0MmIzNDg1OWE2MC4uZDE2NDgwMjA3NjRlNDRj NWY0N2UyMTA1NzBkYWFiMjkzMmE4YTFlMSAxMDA2NDQKLS0tIGEvVG9vbHMvTGF5b3V0UmVsb2Fk ZWQvTGF5b3V0VHJlZS9Db250YWluZXIuanMKKysrIGIvVG9vbHMvTGF5b3V0UmVsb2FkZWQvTGF5 b3V0VHJlZS9Db250YWluZXIuanMKQEAgLTg1LDYgKzg1LDE4IEBAIExheW91dC5Db250YWluZXIg PSBjbGFzcyBDb250YWluZXIgZXh0ZW5kcyBMYXlvdXQuQm94IHsKICAgICAgICAgcmV0dXJuICEh dGhpcy5maXJzdEluRmxvd09yRmxvYXRDaGlsZCgpOwogICAgIH0KIAorICAgIGlzQ29udGFpbmlu Z0Jsb2NrRGVzY2VuZGFudChsYXlvdXRCb3gpIHsKKyAgICAgICAgQVNTRVJUKGxheW91dEJveCk7 CisgICAgICAgIC8vIElmIHdlIGhpdCB0aGUgInRoaXMiIHdoaWxlIGNsaW1iaW5nIHVwIG9uIHRo ZSBjb250YWluaW5nIGJsb2NrIGNoYWluIC0+IGJveCBpcyBwYXJ0IG9mIHRoaXMgYm94J3MgY29u dGFpbmluZyBibG9jayBzdWJ0cmVlLgorICAgICAgICBsZXQgY29udGFpbmluZ0Jsb2NrID0gbGF5 b3V0Qm94LmNvbnRhaW5pbmdCbG9jaygpOworICAgICAgICB3aGlsZSAoY29udGFpbmluZ0Jsb2Nr KSB7CisgICAgICAgICAgICBpZiAoY29udGFpbmluZ0Jsb2NrID09IHRoaXMpCisgICAgICAgICAg ICAgICAgcmV0dXJuIHRydWU7CisgICAgICAgICAgICBjb250YWluaW5nQmxvY2sgPSBjb250YWlu aW5nQmxvY2suY29udGFpbmluZ0Jsb2NrKCk7CisgICAgICAgIH0KKyAgICAgICAgcmV0dXJuIGZh bHNlOworICAgIH0KKwogICAgIG91dE9mRmxvd0Rlc2NlbmRhbnRzKCkgewogICAgICAgICBpZiAo IXRoaXMuaXNQb3NpdGlvbmVkKCkpCiAgICAgICAgICAgICByZXR1cm4gbmV3IEFycmF5KCk7Cg==