184434 2018-04-09 18:45:33 -0700 [LayoutReloaded] Add support for inline-block. 2018-04-09 18:54:19 -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 1413135 0 zalan 2018-04-09 18:45:33 -0700 ssia 1413136 1 337573 zalan 2018-04-09 18:47:38 -0700 Created attachment 337573 Patch 1413137 2 zalan 2018-04-09 18:53:07 -0700 Committed r230464: <https://trac.webkit.org/changeset/230464> 1413138 3 webkit-bug-importer 2018-04-09 18:54:19 -0700 <rdar://problem/39302182> 337573 2018-04-09 18:47:38 -0700 2018-04-09 18:47:38 -0700 Patch bug-184434-20180409184737.patch text/plain 12892 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjMwMzg2CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZTY5MzhmNjg4YmRiNDUxZTdjY2ViMGI4ZjVlNmVkYjE1 OWZjMTdiOC4uMTc5ZjFkOTQ3YjBlNzVkNDY3NGNiZTI5NGZjY2YxODg5NDc3ZTU2NiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMx IEBACisyMDE4LTA0LTA5ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAg ICAgW0xheW91dFJlbG9hZGVkXSBBZGQgc3VwcG9ydCBmb3IgaW5saW5lLWJsb2NrLgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg0NDM0CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBMYXlvdXRSZWxvYWRl ZC9Gb3JtYXR0aW5nQ29udGV4dC9JbmxpbmVGb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250 ZXh0LmpzOgorICAgICAgICAoSW5saW5lRm9ybWF0dGluZ0NvbnRleHQpOgorICAgICAgICAoSW5s aW5lRm9ybWF0dGluZ0NvbnRleHQucHJvdG90eXBlLmxheW91dCk6CisgICAgICAgIChJbmxpbmVG b3JtYXR0aW5nQ29udGV4dC5wcm90b3R5cGUuX2hhbmRsZUlubGluZUNvbnRhaW5lcik6CisgICAg ICAgIChJbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5wcm90b3R5cGUuX2hhbmRsZUlubGluZUJsb2Nr Q29udGFpbmVyKToKKyAgICAgICAgKElubGluZUZvcm1hdHRpbmdDb250ZXh0LnByb3RvdHlwZS5f aGFuZGxlSW5saW5lQ29udGVudCk6CisgICAgICAgICogTGF5b3V0UmVsb2FkZWQvRm9ybWF0dGlu Z0NvbnRleHQvSW5saW5lRm9ybWF0dGluZy9MaW5lLmpzOgorICAgICAgICAoTGluZS5wcm90b3R5 cGUuYWRkSW5saW5lQ29udGFpbmVyQm94KToKKyAgICAgICAgKExpbmUucHJvdG90eXBlLmFkZFRl eHRMaW5lQm94KToKKyAgICAgICAgKExpbmUpOgorICAgICAgICAqIExheW91dFJlbG9hZGVkL0xh eW91dFRyZWUvQm94LmpzOgorICAgICAgICAoTGF5b3V0LkJveC5wcm90b3R5cGUuaXNJbmxpbmVC bG9ja0JveCk6CisgICAgICAgICogTGF5b3V0UmVsb2FkZWQvVXRpbHMuanM6CisgICAgICAgIChM YXlvdXRSZWN0LnByb3RvdHlwZS5ncm93SG9yaXpvbnRhbGx5KToKKyAgICAgICAgKFV0aWxzLmlz QmxvY2tDb250YWluZXJFbGVtZW50KToKKyAgICAgICAgKFV0aWxzLmlzSW5saW5lQmxvY2tFbGVt ZW50KToKKyAgICAgICAgKFV0aWxzLl9kdW1wTGluZXMuKToKKyAgICAgICAgKFV0aWxzLl9kdW1w TGluZXMpOgorICAgICAgICAqIExheW91dFJlbG9hZGVkL3Rlc3QvaW5kZXguaHRtbDoKKyAgICAg ICAgKiBMYXlvdXRSZWxvYWRlZC90ZXN0L2lubGluZS1ibG9jay13aXRoLWZpeGVkLXdpZHRoLWhl aWdodC5odG1sOiBBZGRlZC4KKwogMjAxOC0wNC0wOCAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBw bGUuY29tPgogCiAgICAgICAgIFtMYXlvdXRSZWxvYWRlZF0gQWRqdXN0IGxpbmUgd2l0aCBpbmxp bmUgY29udGFpbmVyJ3MgbWFyZ2luIGJvcmRlciBhbmQgcGFkZGluZwpkaWZmIC0tZ2l0IGEvVG9v bHMvTGF5b3V0UmVsb2FkZWQvRm9ybWF0dGluZ0NvbnRleHQvSW5saW5lRm9ybWF0dGluZy9Jbmxp bmVGb3JtYXR0aW5nQ29udGV4dC5qcyBiL1Rvb2xzL0xheW91dFJlbG9hZGVkL0Zvcm1hdHRpbmdD b250ZXh0L0lubGluZUZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuanMKaW5kZXgg ZmUwYWUzZDk0MzI3OGI0ZWQ2OGVmODg0MDE5ZDRiMmE2NDNmNjgyMy4uOTMyNDVkMGJjNzYzMDkw ZTIyOWQ5NzdmZjA2YWVhNjFjZjgzYzI5MiAxMDA2NDQKLS0tIGEvVG9vbHMvTGF5b3V0UmVsb2Fk ZWQvRm9ybWF0dGluZ0NvbnRleHQvSW5saW5lRm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29u dGV4dC5qcworKysgYi9Ub29scy9MYXlvdXRSZWxvYWRlZC9Gb3JtYXR0aW5nQ29udGV4dC9Jbmxp bmVGb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmpzCkBAIC0yNyw2ICsyNyw3IEBA IGNsYXNzIElubGluZUZvcm1hdHRpbmdDb250ZXh0IGV4dGVuZHMgRm9ybWF0dGluZ0NvbnRleHQg ewogICAgIGNvbnN0cnVjdG9yKGlubGluZUZvcm1hdHRpbmdTdGF0ZSkgewogICAgICAgICBzdXBl cihpbmxpbmVGb3JtYXR0aW5nU3RhdGUpOwogICAgICAgICBBU1NFUlQodGhpcy5mb3JtYXR0aW5n Um9vdCgpLmlzQmxvY2tDb250YWluZXJCb3goKSk7CisgICAgICAgIHRoaXMubV9pbmxpbmVDb250 YWluZXJTdGFjayA9IG5ldyBBcnJheSgpOwogICAgIH0KIAogICAgIGxheW91dCgpIHsKQEAgLTM5 LDQ1ICs0MCw2NCBAQCBjbGFzcyBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dCBleHRlbmRzIEZvcm1h dHRpbmdDb250ZXh0IHsKICAgICAgICAgdGhpcy5fYWRkVG9MYXlvdXRRdWV1ZSh0aGlzLmZvcm1h dHRpbmdSb290KCkuZmlyc3RJbkZsb3dPckZsb2F0Q2hpbGQoKSk7CiAgICAgICAgIHdoaWxlICh0 aGlzLl9kZXNjZW5kYW50TmVlZHNMYXlvdXQoKSkgewogICAgICAgICAgICAgbGV0IGxheW91dEJv eCA9IHRoaXMuX25leHRJbkxheW91dFF1ZXVlKCk7Ci0gICAgICAgICAgICBpZiAobGF5b3V0Qm94 LmlzSW5saW5lQ29udGFpbmVyKCkpIHsKLSAgICAgICAgICAgICAgICBpZiAoaW5saW5lQ29udGFp bmVyU3RhY2suaW5kZXhPZihsYXlvdXRCb3gpID09IC0xKSB7Ci0gICAgICAgICAgICAgICAgICAg IGlubGluZUNvbnRhaW5lclN0YWNrLnB1c2gobGF5b3V0Qm94KTsKLSAgICAgICAgICAgICAgICAg ICAgdGhpcy5fYWRqdXN0TGluZUZvcklubGluZUNvbnRhaW5lclN0YXJ0KGxheW91dEJveCk7Ci0g ICAgICAgICAgICAgICAgICAgIGlmIChsYXlvdXRCb3guZXN0YWJsaXNoZXNGb3JtYXR0aW5nQ29u dGV4dCgpKQotICAgICAgICAgICAgICAgICAgICAgICAgdGhpcy5sYXlvdXRTdGF0ZSgpLmxheW91 dChsYXlvdXRCb3gpOwotICAgICAgICAgICAgICAgICAgICBlbHNlCi0gICAgICAgICAgICAgICAg ICAgICAgICB0aGlzLl9hZGRUb0xheW91dFF1ZXVlKGxheW91dEJveC5maXJzdEluRmxvd09yRmxv YXRDaGlsZCgpKTsKLSAgICAgICAgICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgICAgICAg ICBpbmxpbmVDb250YWluZXJTdGFjay5wb3AobGF5b3V0Qm94KTsKLSAgICAgICAgICAgICAgICAg ICAgdGhpcy5fYWRqdXN0TGluZUZvcklubGluZUNvbnRhaW5lckVuZChsYXlvdXRCb3gpOwotICAg ICAgICAgICAgICAgICAgICB0aGlzLl9yZW1vdmVGcm9tTGF5b3V0UXVldWUobGF5b3V0Qm94KTsK LSAgICAgICAgICAgICAgICAgICAgdGhpcy5fYWRkVG9MYXlvdXRRdWV1ZShsYXlvdXRCb3gubmV4 dEluRmxvd09yRmxvYXRTaWJsaW5nKCkpOwotICAgICAgICAgICAgICAgICAgICAvLyBQbGFjZSB0 aGUgaW5mbG93IHBvc2l0aW9uZWQgY2hpbGRyZW4uCi0gICAgICAgICAgICAgICAgICAgIHRoaXMu X3BsYWNlSW5GbG93UG9zaXRpb25lZENoaWxkcmVuKHRoaXMuZm9ybWF0dGluZ1Jvb3QoKSk7Ci0g ICAgICAgICAgICAgICAgfQotICAgICAgICAgICAgICAgIGNvbnRpbnVlOwotICAgICAgICAgICAg fQotICAgICAgICAgICAgdGhpcy5faGFuZGxlSW5saW5lQ29udGVudChsYXlvdXRCb3gpOwotICAg ICAgICAgICAgdGhpcy5fcmVtb3ZlRnJvbUxheW91dFF1ZXVlKGxheW91dEJveCk7Ci0gICAgICAg ICAgICB0aGlzLl9hZGRUb0xheW91dFF1ZXVlKGxheW91dEJveC5uZXh0SW5GbG93T3JGbG9hdFNp YmxpbmcoKSk7CisgICAgICAgICAgICBpZiAobGF5b3V0Qm94LmlzSW5saW5lQ29udGFpbmVyKCkp CisgICAgICAgICAgICAgICAgdGhpcy5faGFuZGxlSW5saW5lQ29udGFpbmVyKGxheW91dEJveCk7 CisgICAgICAgICAgICBlbHNlIGlmIChsYXlvdXRCb3guaXNJbmxpbmVCbG9ja0JveCgpKQorICAg ICAgICAgICAgICAgIHRoaXMuX2hhbmRsZUlubGluZUJsb2NrQ29udGFpbmVyKGxheW91dEJveCk7 CisgICAgICAgICAgICBlbHNlCisgICAgICAgICAgICAgICAgdGhpcy5faGFuZGxlSW5saW5lQ29u dGVudChsYXlvdXRCb3gpOwogICAgICAgICB9CiAgICAgICAgIC8vIFBsYWNlIHRoZSBpbmZsb3cg cG9zaXRpb25lZCBjaGlsZHJlbi4KICAgICAgICAgdGhpcy5fcGxhY2VJbkZsb3dQb3NpdGlvbmVk Q2hpbGRyZW4odGhpcy5mb3JtYXR0aW5nUm9vdCgpKTsKICAgICAgICAgLy8gQW5kIHRha2UgY2Fy ZSBvZiBvdXQtb2YtZmxvdyBib3hlcyBhcyB0aGUgZmluYWwgc3RlcC4KICAgICAgICAgdGhpcy5f cGxhY2VPdXRPZkZsb3dEZXNjZW5kYW50cyh0aGlzLmZvcm1hdHRpbmdSb290KCkpOwogICAgICAg ICB0aGlzLl9jb21taXRMaW5lKCk7CisgICAgICAgIEFTU0VSVCghdGhpcy5tX2lubGluZUNvbnRh aW5lclN0YWNrLmxlbmd0aCk7CiAgICB9CiAKLSAgICBfaGFuZGxlSW5saW5lQ29udGVudChsYXlv dXRCb3gpIHsKLSAgICAgICAgaWYgKGxheW91dEJveC5pc0lubGluZUJveCgpKSB7Ci0gICAgICAg ICAgICB0aGlzLl9oYW5kbGVJbmxpbmVCb3gobGF5b3V0Qm94KTsKKyAgICBfaGFuZGxlSW5saW5l Q29udGFpbmVyKGlubGluZUNvbnRhaW5lcikgeworICAgICAgICBBU1NFUlQoIWlubGluZUNvbnRh aW5lci5lc3RhYmxpc2hlc0Zvcm1hdHRpbmdDb250ZXh0KCkpOworICAgICAgICBsZXQgaW5saW5l Q29udGFpbmVyU3RhcnQgPSB0aGlzLm1faW5saW5lQ29udGFpbmVyU3RhY2suaW5kZXhPZihpbmxp bmVDb250YWluZXIpID09IC0xOworICAgICAgICBpZiAoaW5saW5lQ29udGFpbmVyU3RhcnQpIHsK KyAgICAgICAgICAgIHRoaXMubV9pbmxpbmVDb250YWluZXJTdGFjay5wdXNoKGlubGluZUNvbnRh aW5lcik7CisgICAgICAgICAgICB0aGlzLl9hZGp1c3RMaW5lRm9ySW5saW5lQ29udGFpbmVyU3Rh cnQoaW5saW5lQ29udGFpbmVyKTsKKyAgICAgICAgICAgIHRoaXMuX2FkZFRvTGF5b3V0UXVldWUo aW5saW5lQ29udGFpbmVyLmZpcnN0SW5GbG93T3JGbG9hdENoaWxkKCkpOworICAgICAgICAgICAg Ly8gS2VlcCB0aGUgaW5saW5lIGNvbnRhaW5lciBpbiB0aGUgbGF5b3V0IHN0YWNrIHNvIHRoYXQg d2UgY2FuIGZpbmlzaCBpdCB3aGVuIGFsbCB0aGUgZGVzY2VuZGFudHMgYXJlIGFsbCBzZXQuCiAg ICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KLSAgICAgICAgaWYgKGxheW91dEJveC5pc0Zs b2F0aW5nUG9zaXRpb25lZCgpKSB7CisgICAgICAgIHRoaXMubV9pbmxpbmVDb250YWluZXJTdGFj ay5wb3AoaW5saW5lQ29udGFpbmVyKTsKKyAgICAgICAgdGhpcy5fYWRqdXN0TGluZUZvcklubGlu ZUNvbnRhaW5lckVuZChpbmxpbmVDb250YWluZXIpOworICAgICAgICB0aGlzLl9yZW1vdmVGcm9t TGF5b3V0UXVldWUoaW5saW5lQ29udGFpbmVyKTsKKyAgICAgICAgdGhpcy5fYWRkVG9MYXlvdXRR dWV1ZShpbmxpbmVDb250YWluZXIubmV4dEluRmxvd09yRmxvYXRTaWJsaW5nKCkpOworICAgICAg ICAvLyBQbGFjZSB0aGUgaW4tIGFuZCBvdXQtb2YtZmxvdyBwb3NpdGlvbmVkIGNoaWxkcmVuLgor ICAgICAgICB0aGlzLl9wbGFjZUluRmxvd1Bvc2l0aW9uZWRDaGlsZHJlbihpbmxpbmVDb250YWlu ZXIpOworICAgICAgICB0aGlzLl9wbGFjZU91dE9mRmxvd0Rlc2NlbmRhbnRzKGlubGluZUNvbnRh aW5lcik7CisgICAgfQorCisKKyAgICBfaGFuZGxlSW5saW5lQmxvY2tDb250YWluZXIoaW5saW5l QmxvY2tDb250YWluZXIpIHsKKyAgICAgICAgQVNTRVJUKGlubGluZUJsb2NrQ29udGFpbmVyLmVz dGFibGlzaGVzRm9ybWF0dGluZ0NvbnRleHQoKSk7CisgICAgICAgIHRoaXMuX2FkanVzdExpbmVG b3JJbmxpbmVDb250YWluZXJTdGFydChpbmxpbmVCbG9ja0NvbnRhaW5lcik7CisgICAgICAgIC8v IFRPRE86IGF1dG8gd2lkdGgvaGVpZ2h0CisgICAgICAgIGxldCBkaXNwbGF5Qm94ID0gdGhpcy5k aXNwbGF5Qm94KGlubGluZUJsb2NrQ29udGFpbmVyKTsKKyAgICAgICAgZGlzcGxheUJveC5zZXRX aWR0aChVdGlscy53aWR0aChpbmxpbmVCbG9ja0NvbnRhaW5lcikgKyBVdGlscy5jb21wdXRlZEhv cml6b250YWxCb3JkZXJBbmRQYWRkaW5nKGlubGluZUJsb2NrQ29udGFpbmVyLm5vZGUoKSkpOwor ICAgICAgICBkaXNwbGF5Qm94LnNldEhlaWdodChVdGlscy5oZWlnaHQoaW5saW5lQmxvY2tDb250 YWluZXIpICsgVXRpbHMuY29tcHV0ZWRWZXJ0aWNhbEJvcmRlckFuZFBhZGRpbmcoaW5saW5lQmxv Y2tDb250YWluZXIubm9kZSgpKSk7CisgICAgICAgIHRoaXMubGF5b3V0U3RhdGUoKS5sYXlvdXQo aW5saW5lQmxvY2tDb250YWluZXIpOworICAgICAgICB0aGlzLl9saW5lKCkuYWRkSW5saW5lQ29u dGFpbmVyQm94KGRpc3BsYXlCb3guc2l6ZSgpKTsKKyAgICAgICAgdGhpcy5fYWRqdXN0TGluZUZv cklubGluZUNvbnRhaW5lckVuZChpbmxpbmVCbG9ja0NvbnRhaW5lcik7CisgICAgICAgIHRoaXMu X3JlbW92ZUZyb21MYXlvdXRRdWV1ZShpbmxpbmVCbG9ja0NvbnRhaW5lcik7CisgICAgICAgIHRo aXMuX2FkZFRvTGF5b3V0UXVldWUoaW5saW5lQmxvY2tDb250YWluZXIubmV4dEluRmxvd09yRmxv YXRTaWJsaW5nKCkpOworICAgIH0KKworICAgIF9oYW5kbGVJbmxpbmVDb250ZW50KGxheW91dEJv eCkgeworICAgICAgICBpZiAobGF5b3V0Qm94LmlzSW5saW5lQm94KCkpCisgICAgICAgICAgICB0 aGlzLl9oYW5kbGVJbmxpbmVCb3gobGF5b3V0Qm94KTsKKyAgICAgICAgZWxzZSBpZiAobGF5b3V0 Qm94LmlzRmxvYXRpbmdQb3NpdGlvbmVkKCkpCiAgICAgICAgICAgICB0aGlzLl9oYW5kbGVGbG9h dGluZ0JveChsYXlvdXRCb3gpOwotICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICB9Ci0gICAg ICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOworICAgICAgICBlbHNlCisgICAgICAgICAgICBBU1NF UlRfTk9UX1JFQUNIRUQoKTsKKyAgICAgICAgdGhpcy5fcmVtb3ZlRnJvbUxheW91dFF1ZXVlKGxh eW91dEJveCk7CisgICAgICAgIHRoaXMuX2FkZFRvTGF5b3V0UXVldWUobGF5b3V0Qm94Lm5leHRJ bkZsb3dPckZsb2F0U2libGluZygpKTsKICAgICB9CiAKICAgICBfaGFuZGxlSW5saW5lQm94KGlu bGluZUJveCkgewpkaWZmIC0tZ2l0IGEvVG9vbHMvTGF5b3V0UmVsb2FkZWQvRm9ybWF0dGluZ0Nv bnRleHQvSW5saW5lRm9ybWF0dGluZy9MaW5lLmpzIGIvVG9vbHMvTGF5b3V0UmVsb2FkZWQvRm9y bWF0dGluZ0NvbnRleHQvSW5saW5lRm9ybWF0dGluZy9MaW5lLmpzCmluZGV4IDRkOWI5MmFmZmIz MzEyMjAxNGZhOGM4NTY5NzhkOTdhOTIxY2UyM2EuLmY0ZmExMWZlYzFhOTc0OWZhN2ZmNTkyZWZi YzFkMzRlNjQwNmQ1N2IgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0xheW91dFJlbG9hZGVkL0Zvcm1hdHRp bmdDb250ZXh0L0lubGluZUZvcm1hdHRpbmcvTGluZS5qcworKysgYi9Ub29scy9MYXlvdXRSZWxv YWRlZC9Gb3JtYXR0aW5nQ29udGV4dC9JbmxpbmVGb3JtYXR0aW5nL0xpbmUuanMKQEAgLTYyLDEy ICs2MiwyMiBAQCBjbGFzcyBMaW5lIHsKICAgICAgICAgdGhpcy5tX2xpbmVSZWN0Lm1vdmVIb3Jp em9udGFsbHkob2Zmc2V0KTsKICAgICB9CiAKKyAgICBhZGRJbmxpbmVDb250YWluZXJCb3goc2l6 ZSkgeworICAgICAgICBsZXQgd2lkdGggPSBzaXplLndpZHRoKCk7CisgICAgICAgIEFTU0VSVCh3 aWR0aCA8PSB0aGlzLm1fYXZhaWxhYmxlV2lkdGgpOworICAgICAgICB0aGlzLnNocmluayh3aWR0 aCk7CisgICAgICAgIGxldCBsaW5lQm94UmVjdCA9IG5ldyBMYXlvdXRSZWN0KHRoaXMucmVjdCgp LnRvcFJpZ2h0KCksIHNpemUpOworICAgICAgICB0aGlzLm1fbGluZUJveGVzLnB1c2goe2xpbmVC b3hSZWN0fSk7CisgICAgICAgIHRoaXMubV9saW5lUmVjdC5ncm93SG9yaXpvbnRhbGx5KHdpZHRo KTsKKyAgICB9CisKICAgICBhZGRUZXh0TGluZUJveChzdGFydFBvc2l0aW9uLCBlbmRQb3NpdGlv biwgc2l6ZSkgewotICAgICAgICBBU1NFUlQoc2l6ZS53aWR0aCgpIDw9IHRoaXMubV9hdmFpbGFi bGVXaWR0aCk7Ci0gICAgICAgIHRoaXMubV9hdmFpbGFibGVXaWR0aCAtPSBzaXplLndpZHRoKCk7 CisgICAgICAgIGxldCB3aWR0aCA9IHNpemUud2lkdGgoKTsKKyAgICAgICAgQVNTRVJUKHdpZHRo IDw9IHRoaXMubV9hdmFpbGFibGVXaWR0aCk7CisgICAgICAgIHRoaXMuc2hyaW5rKHdpZHRoKTsK ICAgICAgICAgLy8gVE9ETzogdXNlIHRoZSBhY3R1YWwgaGVpZ2h0IGluc3RlYWQgb2YgdGhlIGxp bmUgaGVpZ2h0LgotICAgICAgICBsZXQgbGluZUJveFJlY3QgPSBuZXcgTGF5b3V0UmVjdCh0aGlz LnJlY3QoKS50b3BSaWdodCgpLCBuZXcgTGF5b3V0U2l6ZShzaXplLndpZHRoKCksIHRoaXMucmVj dCgpLmhlaWdodCgpKSk7CisgICAgICAgIGxldCBsaW5lQm94UmVjdCA9IG5ldyBMYXlvdXRSZWN0 KHRoaXMucmVjdCgpLnRvcFJpZ2h0KCksIG5ldyBMYXlvdXRTaXplKHdpZHRoLCB0aGlzLnJlY3Qo KS5oZWlnaHQoKSkpOwogICAgICAgICB0aGlzLm1fbGluZUJveGVzLnB1c2goe3N0YXJ0UG9zaXRp b24sIGVuZFBvc2l0aW9uLCBsaW5lQm94UmVjdH0pOwotICAgICAgICB0aGlzLm1fbGluZVJlY3Qu Z3Jvd0J5KG5ldyBMYXlvdXRTaXplKHNpemUud2lkdGgoKSwgMCkpOworICAgICAgICB0aGlzLm1f bGluZVJlY3QuZ3Jvd0hvcml6b250YWxseSh3aWR0aCk7CiAgICAgfQogfQpkaWZmIC0tZ2l0IGEv VG9vbHMvTGF5b3V0UmVsb2FkZWQvTGF5b3V0VHJlZS9Cb3guanMgYi9Ub29scy9MYXlvdXRSZWxv YWRlZC9MYXlvdXRUcmVlL0JveC5qcwppbmRleCA3M2RlOGQ0MGE5ZmNhOWYwMDJiMWM0NDYwM2Fi OGRmMTgxMjBjYTVmLi5hYjNiZWE5ZmU2NzE0YzA0OTc0ZWQ3YTY3OWQ4ZWNkOWEyYzVhMjc5IDEw MDY0NAotLS0gYS9Ub29scy9MYXlvdXRSZWxvYWRlZC9MYXlvdXRUcmVlL0JveC5qcworKysgYi9U b29scy9MYXlvdXRSZWxvYWRlZC9MYXlvdXRUcmVlL0JveC5qcwpAQCAtMTI3LDYgKzEyNywxMCBA QCBMYXlvdXQuQm94ID0gY2xhc3MgQm94IHsKICAgICAgICAgcmV0dXJuIFV0aWxzLmlzQmxvY2tD b250YWluZXJFbGVtZW50KHRoaXMubm9kZSgpKTsKICAgICB9CiAKKyAgICBpc0lubGluZUJsb2Nr Qm94KCkgeworICAgICAgICByZXR1cm4gVXRpbHMuaXNJbmxpbmVCbG9ja0VsZW1lbnQodGhpcy5u b2RlKCkpOworICAgIH0KKwogICAgIGlzSW5saW5lTGV2ZWxCb3goKSB7CiAgICAgICAgIHJldHVy biBVdGlscy5pc0lubGluZUxldmVsRWxlbWVudCh0aGlzLm5vZGUoKSk7CiAgICAgfQpkaWZmIC0t Z2l0IGEvVG9vbHMvTGF5b3V0UmVsb2FkZWQvVXRpbHMuanMgYi9Ub29scy9MYXlvdXRSZWxvYWRl ZC9VdGlscy5qcwppbmRleCAyZjc2MDE5MDY0OGZjMWE1MDI3MGE2OGU0MTBmN2E1MWQ0MDFhMDdm Li41MTdkNzYwNzhmYTc0NGUwMDI0ZTQ5MzQ3NTFhNDZmY2M0MDk1OWQ0IDEwMDY0NAotLS0gYS9U b29scy9MYXlvdXRSZWxvYWRlZC9VdGlscy5qcworKysgYi9Ub29scy9MYXlvdXRSZWxvYWRlZC9V dGlscy5qcwpAQCAtMjA4LDYgKzIwOCwxMCBAQCBjbGFzcyBMYXlvdXRSZWN0IHsKICAgICAgICAg dGhpcy5tX3RvcExlZnQubW92ZUJ5KGRpc3RhbmNlKTsKICAgICB9CiAKKyAgICBncm93SG9yaXpv bnRhbGx5KGRpc3RhbmNlKSB7CisgICAgICAgIHRoaXMubV9zaXplLnNldFdpZHRoKHRoaXMubV9z aXplLndpZHRoKCkgKyBkaXN0YW5jZSk7CisgICAgfQorCiAgICAgbW92ZUhvcml6b250YWxseShk aXN0YW5jZSkgewogICAgICAgICB0aGlzLm1fdG9wTGVmdC5zaGlmdExlZnQoZGlzdGFuY2UpOwog ICAgIH0KQEAgLTQyMyw3ICs0MjcsNyBAQCBjbGFzcyBVdGlscyB7CiAgICAgfQogCiAgICAgc3Rh dGljIGlzQmxvY2tDb250YWluZXJFbGVtZW50KG5vZGUpIHsKLSAgICAgICAgaWYgKG5vZGUubm9k ZVR5cGUgIT0gTm9kZS5FTEVNRU5UX05PREUpCisgICAgICAgIGlmICghbm9kZSB8fCBub2RlLm5v ZGVUeXBlICE9IE5vZGUuRUxFTUVOVF9OT0RFKQogICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwog ICAgICAgICBsZXQgZGlzcGxheSA9IHdpbmRvdy5nZXRDb21wdXRlZFN0eWxlKG5vZGUpLmRpc3Bs YXk7CiAgICAgICAgIHJldHVybiAgZGlzcGxheSA9PSAiYmxvY2siIHx8IGRpc3BsYXkgPT0gImxp c3QtaXRlbSIgfHwgZGlzcGxheSA9PSAiaW5saW5lLWJsb2NrIiB8fCBkaXNwbGF5ID09ICJ0YWJs ZS1jZWxsIiB8fCBkaXNwbGF5ID09ICJ0YWJsZS1jYXB0aW9uIjsgLy9UT0RPICYmICFyZXBsYWNl ZCBlbGVtZW50CkBAIC00MzksNiArNDQzLDEzIEBAIGNsYXNzIFV0aWxzIHsKICAgICAgICAgcmV0 dXJuICBkaXNwbGF5ID09ICJ0YWJsZSIgfHwgZGlzcGxheSA9PSAiaW5saW5lLXRhYmxlIjsKICAg ICB9CiAKKyAgICBzdGF0aWMgaXNJbmxpbmVCbG9ja0VsZW1lbnQobm9kZSkgeworICAgICAgICBp ZiAoIW5vZGUgfHwgbm9kZS5ub2RlVHlwZSAhPSBOb2RlLkVMRU1FTlRfTk9ERSkKKyAgICAgICAg ICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgbGV0IGRpc3BsYXkgPSB3aW5kb3cuZ2V0Q29tcHV0 ZWRTdHlsZShub2RlKS5kaXNwbGF5OworICAgICAgICByZXR1cm4gIGRpc3BsYXkgPT0gImlubGlu ZS1ibG9jayI7CisgICAgfQorCiAgICAgc3RhdGljIGlzUmVsYXRpdmVseVBvc2l0aW9uZWQoYm94 KSB7CiAgICAgICAgIGlmIChib3guaXNBbm9ueW1vdXMoKSkKICAgICAgICAgICAgIHJldHVybiBm YWxzZTsKQEAgLTU4MCw3ICs1OTEsOCBAQCBjbGFzcyBVdGlscyB7CiAgICAgICAgICAgICBjb250 ZW50ICs9IGluZGVudGF0aW9uICsgIlJvb3RJbmxpbmVCb3ggYXQgKCIgKyBsaW5lUmVjdC5sZWZ0 KCkgKyAiLCIgKyBsaW5lUmVjdC50b3AoKSArICIpIHNpemUgIiArIFV0aWxzLnByZWNpc2lvblJv dW5kKGxpbmVSZWN0LndpZHRoKCksIDIpICsgIngiICsgbGluZVJlY3QuaGVpZ2h0KCkgKyAiXG4i OwogICAgICAgICAgICAgbGluZS5saW5lQm94ZXMoKS5mb3JFYWNoKGZ1bmN0aW9uKGxpbmVCb3gp IHsKICAgICAgICAgICAgICAgICBsZXQgaW5kZW50YXRpb24gPSAiICIucmVwZWF0KGxldmVsICsg MSk7Ci0gICAgICAgICAgICAgICAgY29udGVudCArPSBpbmRlbnRhdGlvbiArICJJbmxpbmVUZXh0 Qm94IGF0ICgiICsgVXRpbHMucHJlY2lzaW9uUm91bmQobGluZUJveC5saW5lQm94UmVjdC5sZWZ0 KCksIDIpICsgIiwiICsgVXRpbHMucHJlY2lzaW9uUm91bmQobGluZUJveC5saW5lQm94UmVjdC50 b3AoKSwgMikgKyAiKSBzaXplICIgKyBVdGlscy5wcmVjaXNpb25Sb3VuZChsaW5lQm94LmxpbmVC b3hSZWN0LndpZHRoKCksIDIpICsgIngiICsgbGluZUJveC5saW5lQm94UmVjdC5oZWlnaHQoKSAr ICJcbiI7CisgICAgICAgICAgICAgICAgbGV0IGlubGluZUJveE5hbWUgPSBsaW5lQm94LnN0YXJ0 UG9zaXRpb24gPT09IHVuZGVmaW5lZCA/ICJJbmxpbmVCb3giIDogIklubGluZVRleHRCb3giOwor ICAgICAgICAgICAgICAgIGNvbnRlbnQgKz0gaW5kZW50YXRpb24gKyAgaW5saW5lQm94TmFtZSAr ICIgYXQgKCIgKyBVdGlscy5wcmVjaXNpb25Sb3VuZChsaW5lQm94LmxpbmVCb3hSZWN0LmxlZnQo KSwgMikgKyAiLCIgKyBVdGlscy5wcmVjaXNpb25Sb3VuZChsaW5lQm94LmxpbmVCb3hSZWN0LnRv cCgpLCAyKSArICIpIHNpemUgIiArIFV0aWxzLnByZWNpc2lvblJvdW5kKGxpbmVCb3gubGluZUJv eFJlY3Qud2lkdGgoKSwgMikgKyAieCIgKyBsaW5lQm94LmxpbmVCb3hSZWN0LmhlaWdodCgpICsg IlxuIjsKICAgICAgICAgICAgIH0pOwogICAgICAgICB9KTsKICAgICAgICAgcmV0dXJuIGNvbnRl bnQ7CmRpZmYgLS1naXQgYS9Ub29scy9MYXlvdXRSZWxvYWRlZC90ZXN0L2luZGV4Lmh0bWwgYi9U b29scy9MYXlvdXRSZWxvYWRlZC90ZXN0L2luZGV4Lmh0bWwKaW5kZXggNWY2NGY2OWYwNTAyM2Jm NTFiYTBhYTEwZGIzNWM1YzNjYTkwNjYwOS4uYzc2ZDUzOWNlZDRlYjY1NGNmYjcyMmNlMzU5ZmRj YTVmNDEyNzViZSAxMDA2NDQKLS0tIGEvVG9vbHMvTGF5b3V0UmVsb2FkZWQvdGVzdC9pbmRleC5o dG1sCisrKyBiL1Rvb2xzL0xheW91dFJlbG9hZGVkL3Rlc3QvaW5kZXguaHRtbApAQCAtNzgsNyAr NzgsOCBAQCBsZXQgdGVzdEZpbGVzID0gWwogICAgICJpbmxpbmUtZmxvYXRpbmcxLmh0bWwiLAog ICAgICJpbmxpbmUtZm9ybWF0dGluZy1jb250ZXh0LWZsb2F0czEuaHRtbCIsCiAgICAgImlubGlu ZS1mb3JtYXR0aW5nLWNvbnRleHQtZmxvYXRzMi5odG1sIiwKLSAgICAiaW5saW5lLXdpdGgtcGFk ZGluZy1ib3JkZXItbWFyZ2luLW9mZnNldHMuaHRtbCIKKyAgICAiaW5saW5lLXdpdGgtcGFkZGlu Zy1ib3JkZXItbWFyZ2luLW9mZnNldHMuaHRtbCIsCisgICAgImlubGluZS1ibG9jay13aXRoLWZp eGVkLXdpZHRoLWhlaWdodC5odG1sIgogXTsKIAogbGV0IGRlYnVnVGhpcyA9IFtdOwpkaWZmIC0t Z2l0IGEvVG9vbHMvTGF5b3V0UmVsb2FkZWQvdGVzdC9pbmxpbmUtYmxvY2std2l0aC1maXhlZC13 aWR0aC1oZWlnaHQuaHRtbCBiL1Rvb2xzL0xheW91dFJlbG9hZGVkL3Rlc3QvaW5saW5lLWJsb2Nr LXdpdGgtZml4ZWQtd2lkdGgtaGVpZ2h0Lmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXgg MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uYjAwMDAxY2VkZjcyZTk5 NGZlMDBmNDNlNzNhNDI5OGNmZjUxNjZhOQotLS0gL2Rldi9udWxsCisrKyBiL1Rvb2xzL0xheW91 dFJlbG9hZGVkL3Rlc3QvaW5saW5lLWJsb2NrLXdpdGgtZml4ZWQtd2lkdGgtaGVpZ2h0Lmh0bWwK QEAgLTAsMCArMSw2IEBACis8IURPQ1RZUEUgaHRtbD4KKzxodG1sPgorPGJvZHk+Cis8ZGl2IHN0 eWxlPSJoZWlnaHQ6IDUwMHB4Ij48c3BhbiBzdHlsZT0iZGlzcGxheTogaW5saW5lLWJsb2NrOyB3 aWR0aDogMjAwcHg7IGhlaWdodDogMTAwcHg7Ij5mb29iYXI8L3NwYW4+PC9kaXY+Cis8L2JvZHk+ Cis8L2h0bWw+Cg==