184575 2018-04-12 20:04:02 -0700 [LayoutReloaded] Move root container ownership to layout state 2018-04-12 20:10:25 -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 1414283 0 zalan 2018-04-12 20:04:02 -0700 Now the root container is on the associated layout state. 1414284 1 337859 zalan 2018-04-12 20:05:42 -0700 Created attachment 337859 Patch 1414286 2 zalan 2018-04-12 20:09:09 -0700 Committed r230621: <https://trac.webkit.org/changeset/230621> 1414287 3 webkit-bug-importer 2018-04-12 20:10:25 -0700 <rdar://problem/39402858> 337859 2018-04-12 20:05:42 -0700 2018-04-12 20:05:42 -0700 Patch bug-184575-20180412200542.patch text/plain 12243 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjMwNTgwCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNjAxNWFkMjA3MzFlOTUxYzNkNmY5OGI0OWRkN2VkMzFj Y2RlNmE0ZS4uYjFiZTk4ZjAzODQ0MzI4YTIyZWI4ZmNmNWM2MjMzYzg5MDNhYzUwZCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2 IEBACisyMDE4LTA0LTEyICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAg ICAgW0xheW91dFJlbG9hZGVkXSBNb3ZlIHJvb3QgY29udGFpbmVyIG93bmVyc2hpcCB0byBsYXlv dXQgc3RhdGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTE4NDU3NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IE5vdyB0aGUgcm9vdCBjb250YWluZXIgaXMgb24gdGhlIGFzc29jaWF0ZWQgbGF5b3V0IHN0YXRl IChJQ0Igb25seSBhdCB0aGlzIHBvaW50IHRob3VnaCkuCisKKyAgICAgICAgKiBMYXlvdXRSZWxv YWRlZC9Gb3JtYXR0aW5nQ29udGV4dC9CbG9ja0Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29u dGV4dC5qczoKKyAgICAgICAgKEJsb2NrRm9ybWF0dGluZ0NvbnRleHQucHJvdG90eXBlLmxheW91 dCk6CisgICAgICAgICogTGF5b3V0UmVsb2FkZWQvRm9ybWF0dGluZ0NvbnRleHQvRm9ybWF0dGlu Z0NvbnRleHQuanM6CisgICAgICAgIChGb3JtYXR0aW5nQ29udGV4dC5wcm90b3R5cGUuX2xheW91 dE91dE9mRmxvd0Rlc2NlbmRhbnRzKToKKyAgICAgICAgKiBMYXlvdXRSZWxvYWRlZC9Gb3JtYXR0 aW5nQ29udGV4dC9JbmxpbmVGb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmpzOgor ICAgICAgICAoSW5saW5lRm9ybWF0dGluZ0NvbnRleHQucHJvdG90eXBlLl9oYW5kbGVJbmxpbmVC bG9ja0NvbnRhaW5lcik6CisgICAgICAgIChJbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5wcm90b3R5 cGUuX2hhbmRsZUZsb2F0aW5nQm94KToKKyAgICAgICAgKiBMYXlvdXRSZWxvYWRlZC9MYXlvdXQu anM6CisgICAgICAgIChsYXlvdXQpOgorICAgICAgICAqIExheW91dFJlbG9hZGVkL0xheW91dFN0 YXRlLmpzOgorICAgICAgICAoTGF5b3V0U3RhdGUpOgorICAgICAgICAoTGF5b3V0U3RhdGUucHJv dG90eXBlLmZvcm1hdHRpbmdDb250ZXh0KToKKyAgICAgICAgKExheW91dFN0YXRlLnByb3RvdHlw ZS5lc3RhYmxpc2hlZEZvcm1hdHRpbmdTdGF0ZSk6CisgICAgICAgIChMYXlvdXRTdGF0ZS5wcm90 b3R5cGUuZm9ybWF0dGluZ1N0YXRlRm9yQm94KToKKyAgICAgICAgKExheW91dFN0YXRlLnByb3Rv dHlwZS5uZWVkc0xheW91dCk6CisgICAgICAgIChMYXlvdXRTdGF0ZS5wcm90b3R5cGUuZGlzcGxh eUJveCk6CisgICAgICAgIChMYXlvdXRTdGF0ZS5wcm90b3R5cGUuX2Zvcm1hdHRpbmdDb250ZXh0 KToKKyAgICAgICAgKExheW91dFN0YXRlLnByb3RvdHlwZS5sYXlvdXQpOiBEZWxldGVkLgorICAg ICAgICAoTGF5b3V0U3RhdGUucHJvdG90eXBlLmZvcm1hdHRpbmdTdGF0ZXMpOiBEZWxldGVkLgor ICAgICAgICAoTGF5b3V0U3RhdGUucHJvdG90eXBlLmluaXRpYWxEaXNwbGF5Qm94KTogRGVsZXRl ZC4KKyAgICAgICAgKiBMYXlvdXRSZWxvYWRlZC9VdGlscy5qczoKKyAgICAgICAgKFV0aWxzLl9k dW1wQm94KToKKyAgICAgICAgKFV0aWxzLl9maW5kRGlzcGxheUJveCk6IERlbGV0ZWQuCisKIDIw MTgtMDQtMTIgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbTGF5 b3V0UmVsb2FkZWRdIE1pbm9yIGNsZWFudXAgaW4gTGF5b3V0U2F0ZQpkaWZmIC0tZ2l0IGEvVG9v bHMvTGF5b3V0UmVsb2FkZWQvRm9ybWF0dGluZ0NvbnRleHQvQmxvY2tGb3JtYXR0aW5nL0Jsb2Nr Rm9ybWF0dGluZ0NvbnRleHQuanMgYi9Ub29scy9MYXlvdXRSZWxvYWRlZC9Gb3JtYXR0aW5nQ29u dGV4dC9CbG9ja0Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5qcwppbmRleCBkMTIw MThhYzJjNjgwNGM0ODgzMmYwMTRlOGEwNTFmYjJhZjQ1YTdlLi4zOTNhNzUxNjAxYzk3NzRhMTFj ZWYyMTExOGFlOWFjYjM2MmI4ZWIxIDEwMDY0NAotLS0gYS9Ub29scy9MYXlvdXRSZWxvYWRlZC9G b3JtYXR0aW5nQ29udGV4dC9CbG9ja0Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5q cworKysgYi9Ub29scy9MYXlvdXRSZWxvYWRlZC9Gb3JtYXR0aW5nQ29udGV4dC9CbG9ja0Zvcm1h dHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5qcwpAQCAtNDcsNyArNDcsNyBAQCBjbGFzcyBC bG9ja0Zvcm1hdHRpbmdDb250ZXh0IGV4dGVuZHMgRm9ybWF0dGluZ0NvbnRleHQgewogICAgICAg ICAgICAgICAgIHRoaXMuY29tcHV0ZVdpZHRoKGxheW91dEJveCk7CiAgICAgICAgICAgICAgICAg dGhpcy5fY29tcHV0ZVN0YXRpY1Bvc2l0aW9uKGxheW91dEJveCk7CiAgICAgICAgICAgICAgICAg aWYgKGxheW91dEJveC5lc3RhYmxpc2hlc0Zvcm1hdHRpbmdDb250ZXh0KCkpIHsKLSAgICAgICAg ICAgICAgICAgICAgdGhpcy5sYXlvdXRTdGF0ZSgpLmxheW91dChsYXlvdXRCb3gpOworICAgICAg ICAgICAgICAgICAgICB0aGlzLmxheW91dFN0YXRlKCkuZm9ybWF0dGluZ0NvbnRleHQobGF5b3V0 Qm94KS5sYXlvdXQoKTsKICAgICAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICAg ICAgfQogICAgICAgICAgICAgICAgIGxldCBjaGlsZFRvTGF5b3V0ID0gdGhpcy5fZmlyc3RJbkZs b3dDaGlsZFdpdGhOZWVkc0xheW91dChsYXlvdXRCb3gpOwpkaWZmIC0tZ2l0IGEvVG9vbHMvTGF5 b3V0UmVsb2FkZWQvRm9ybWF0dGluZ0NvbnRleHQvRm9ybWF0dGluZ0NvbnRleHQuanMgYi9Ub29s cy9MYXlvdXRSZWxvYWRlZC9Gb3JtYXR0aW5nQ29udGV4dC9Gb3JtYXR0aW5nQ29udGV4dC5qcwpp bmRleCA2ZTIyNGRiNzc1MGEyNDAxZjdmMDEyZjU2YTU3N2Q4YTJjMjRkMzY4Li5mMjk0ZDdlNDEx M2ZiNTdhZWE3ZTY2YTQwOGVjOWNlOWI3MWE3YWUzIDEwMDY0NAotLS0gYS9Ub29scy9MYXlvdXRS ZWxvYWRlZC9Gb3JtYXR0aW5nQ29udGV4dC9Gb3JtYXR0aW5nQ29udGV4dC5qcworKysgYi9Ub29s cy9MYXlvdXRSZWxvYWRlZC9Gb3JtYXR0aW5nQ29udGV4dC9Gb3JtYXR0aW5nQ29udGV4dC5qcwpA QCAtMTczLDcgKzE3Myw3IEBAIGNsYXNzIEZvcm1hdHRpbmdDb250ZXh0IHsKICAgICAgICAgZm9y IChsZXQgb3V0T2ZGbG93Qm94IG9mIG91dE9mRmxvd0Rlc2NlbmRhbnRzKSB7CiAgICAgICAgICAg ICB0aGlzLl9hZGRUb0xheW91dFF1ZXVlKG91dE9mRmxvd0JveCk7CiAgICAgICAgICAgICB0aGlz Ll9jb21wdXRlT3V0T2ZGbG93V2lkdGgob3V0T2ZGbG93Qm94KTsKLSAgICAgICAgICAgIHRoaXMu bGF5b3V0U3RhdGUoKS5sYXlvdXQob3V0T2ZGbG93Qm94KTsKKyAgICAgICAgICAgIHRoaXMubGF5 b3V0U3RhdGUoKS5mb3JtYXR0aW5nQ29udGV4dChvdXRPZkZsb3dCb3gpLmxheW91dCgpOwogICAg ICAgICAgICAgdGhpcy5fY29tcHV0ZU91dE9mRmxvd0hlaWdodChvdXRPZkZsb3dCb3gpOwogICAg ICAgICAgICAgdGhpcy5fY29tcHV0ZU91dE9mRmxvd1Bvc2l0aW9uKG91dE9mRmxvd0JveCk7CiAg ICAgICAgICAgICB0aGlzLl9yZW1vdmVGcm9tTGF5b3V0UXVldWUob3V0T2ZGbG93Qm94KTsKZGlm ZiAtLWdpdCBhL1Rvb2xzL0xheW91dFJlbG9hZGVkL0Zvcm1hdHRpbmdDb250ZXh0L0lubGluZUZv cm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuanMgYi9Ub29scy9MYXlvdXRSZWxvYWRl ZC9Gb3JtYXR0aW5nQ29udGV4dC9JbmxpbmVGb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250 ZXh0LmpzCmluZGV4IGMyZDg1Y2IwMzJiYzE1M2E4YzViZWM5NGZjNjBiMzA1Y2JlMjUwMGEuLmZi NzA5MGUyYjUxODUyZTgwOTk2MjgyYzJiNmJlNjMxYWMyNDk1MzMgMTAwNjQ0Ci0tLSBhL1Rvb2xz L0xheW91dFJlbG9hZGVkL0Zvcm1hdHRpbmdDb250ZXh0L0lubGluZUZvcm1hdHRpbmcvSW5saW5l Rm9ybWF0dGluZ0NvbnRleHQuanMKKysrIGIvVG9vbHMvTGF5b3V0UmVsb2FkZWQvRm9ybWF0dGlu Z0NvbnRleHQvSW5saW5lRm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5qcwpAQCAt ODEsNyArODEsNyBAQCBjbGFzcyBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dCBleHRlbmRzIEZvcm1h dHRpbmdDb250ZXh0IHsKICAgICAgICAgLy8gVE9ETzogYXV0byB3aWR0aC9oZWlnaHQKICAgICAg ICAgdGhpcy5fYWRqdXN0TGluZUZvcklubGluZUNvbnRhaW5lclN0YXJ0KGlubGluZUJsb2NrQ29u dGFpbmVyKTsKICAgICAgICAgZGlzcGxheUJveC5zZXRXaWR0aChVdGlscy53aWR0aChpbmxpbmVC bG9ja0NvbnRhaW5lcikgKyBVdGlscy5jb21wdXRlZEhvcml6b250YWxCb3JkZXJBbmRQYWRkaW5n KGlubGluZUJsb2NrQ29udGFpbmVyLm5vZGUoKSkpOwotICAgICAgICB0aGlzLmxheW91dFN0YXRl KCkubGF5b3V0KGlubGluZUJsb2NrQ29udGFpbmVyKTsKKyAgICAgICAgdGhpcy5sYXlvdXRTdGF0 ZSgpLmZvcm1hdHRpbmdDb250ZXh0KGlubGluZUJsb2NrQ29udGFpbmVyKS5sYXlvdXQoKTsKICAg ICAgICAgZGlzcGxheUJveC5zZXRIZWlnaHQoVXRpbHMuaGVpZ2h0KGlubGluZUJsb2NrQ29udGFp bmVyKSArIFV0aWxzLmNvbXB1dGVkVmVydGljYWxCb3JkZXJBbmRQYWRkaW5nKGlubGluZUJsb2Nr Q29udGFpbmVyLm5vZGUoKSkpOwogICAgICAgICB0aGlzLl9hZGp1c3RMaW5lRm9ySW5saW5lQ29u dGFpbmVyRW5kKGlubGluZUJsb2NrQ29udGFpbmVyKTsKICAgICAgICAgdGhpcy5fbGluZSgpLmFk ZElubGluZUNvbnRhaW5lckJveChkaXNwbGF5Qm94LnNpemUoKSk7CkBAIC0xMjIsNyArMTIyLDcg QEAgY2xhc3MgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQgZXh0ZW5kcyBGb3JtYXR0aW5nQ29udGV4 dCB7CiAKICAgICBfaGFuZGxlRmxvYXRpbmdCb3goZmxvYXRpbmdCb3gpIHsKICAgICAgICAgdGhp cy5fY29tcHV0ZUZsb2F0aW5nV2lkdGgoZmxvYXRpbmdCb3gpOwotICAgICAgICB0aGlzLmxheW91 dFN0YXRlKCkubGF5b3V0KGZsb2F0aW5nQm94KTsKKyAgICAgICAgdGhpcy5sYXlvdXRTdGF0ZSgp LmZvcm1hdHRpbmdDb250ZXh0KGZsb2F0aW5nQm94KS5sYXlvdXQoKTsKICAgICAgICAgdGhpcy5f Y29tcHV0ZUZsb2F0aW5nSGVpZ2h0KGZsb2F0aW5nQm94KTsKICAgICAgICAgbGV0IGRpc3BsYXlC b3ggPSB0aGlzLmRpc3BsYXlCb3goZmxvYXRpbmdCb3gpOwogICAgICAgICAvLyBQb3NpdGlvbiB0 aGlzIGZsb2F0IHN0YXRpY2FsbHkgZmlyc3QsIHRoZSBmbG9hdGluZyBjb250ZXh0IHdpbGwgZmln dXJlIGl0IG91dCB0aGUgZmluYWwgcG9zaXRpb24uCmRpZmYgLS1naXQgYS9Ub29scy9MYXlvdXRS ZWxvYWRlZC9MYXlvdXQuanMgYi9Ub29scy9MYXlvdXRSZWxvYWRlZC9MYXlvdXQuanMKaW5kZXgg MzQzYTAyNDY0NWJiNzM4OGI1YjJlNmY4ODZiM2RiNjJkZTllMzkwOS4uNWQ5ZGYwOThhYzBmMDc5 ZjRkNjc3MDkwNzQ5ZGRlMzJjODRmOWM3NCAxMDA2NDQKLS0tIGEvVG9vbHMvTGF5b3V0UmVsb2Fk ZWQvTGF5b3V0LmpzCisrKyBiL1Rvb2xzL0xheW91dFJlbG9hZGVkL0xheW91dC5qcwpAQCAtMjgs NyArMjgsNyBAQCBmdW5jdGlvbiBsYXlvdXQod2luZG93LCB2aWV3cG9ydFNpemUpIHsKICAgICBs ZXQgaW5pdGlhbENvbnRhaW5pbmdCbG9jayA9IHRyZWVCdWlsZGVyLmNyZWF0ZVRyZWUod2luZG93 LmRvY3VtZW50LCB3aW5kb3cucmVuZGVyVHJlZVN0cnVjdHVyZSk7CiAgICAgbGV0IGRpc3BsYXlC b3ggPSBuZXcgRGlzcGxheS5Cb3goKTsKICAgICBkaXNwbGF5Qm94LnNldFNpemUodmlld3BvcnRT aXplKTsKLSAgICBsZXQgbGF5b3V0U3RhdGUgPSBuZXcgTGF5b3V0U3RhdGUoZGlzcGxheUJveCk7 Ci0gICAgbGF5b3V0U3RhdGUubGF5b3V0KGluaXRpYWxDb250YWluaW5nQmxvY2spOworICAgIGxl dCBsYXlvdXRTdGF0ZSA9IG5ldyBMYXlvdXRTdGF0ZShpbml0aWFsQ29udGFpbmluZ0Jsb2NrLCBk aXNwbGF5Qm94KTsKKyAgICBsYXlvdXRTdGF0ZS5mb3JtYXR0aW5nQ29udGV4dChpbml0aWFsQ29u dGFpbmluZ0Jsb2NrKS5sYXlvdXQoKTsKICAgICByZXR1cm4gVXRpbHMubGF5b3V0VHJlZUR1bXAo aW5pdGlhbENvbnRhaW5pbmdCbG9jaywgbGF5b3V0U3RhdGUpOwogfQpkaWZmIC0tZ2l0IGEvVG9v bHMvTGF5b3V0UmVsb2FkZWQvTGF5b3V0U3RhdGUuanMgYi9Ub29scy9MYXlvdXRSZWxvYWRlZC9M YXlvdXRTdGF0ZS5qcwppbmRleCAzNjVmNWY0OWQ4MTlhYWNhZTQ4MTA4YmJkNmZiZTU3YWRiYTE5 NTNlLi5kZWIzYjM3NTQ0OTcyMTNkM2U3NzY1ZWRhYzMwYTJhMWRjNmRmNDQwIDEwMDY0NAotLS0g YS9Ub29scy9MYXlvdXRSZWxvYWRlZC9MYXlvdXRTdGF0ZS5qcworKysgYi9Ub29scy9MYXlvdXRS ZWxvYWRlZC9MYXlvdXRTdGF0ZS5qcwpAQCAtMjQsMzcgKzI0LDMwIEBACiAgKi8KIAogY2xhc3Mg TGF5b3V0U3RhdGUgewotICAgIGNvbnN0cnVjdG9yKGluaXRpYWxEaXNwbGF5Qm94KSB7Ci0gICAg ICAgIHRoaXMubV9mb3JtYXR0aW5nU3RhdGVzID0gbmV3IE1hcCgpOwotICAgICAgICB0aGlzLm1f aW5pdGlhbERpc3BsYXlCb3ggPSBpbml0aWFsRGlzcGxheUJveDsKLSAgICB9Ci0KLSAgICBsYXlv dXQoZm9ybWF0dGluZ1Jvb3QpIHsKLSAgICAgICAgbGV0IGZvcm1hdHRpbmdTdGF0ZSA9IHRoaXMu X2NyZWF0ZUZvcm1hdHRpbmdTdGF0ZShmb3JtYXR0aW5nUm9vdCk7Ci0gICAgICAgIHRoaXMubV9m b3JtYXR0aW5nU3RhdGVzLnNldChmb3JtYXR0aW5nUm9vdCwgZm9ybWF0dGluZ1N0YXRlKTsKLSAg ICAgICAgdGhpcy5mb3JtYXR0aW5nQ29udGV4dChmb3JtYXR0aW5nU3RhdGUpLmxheW91dCgpOwot ICAgIH0KKyAgICBjb25zdHJ1Y3Rvcihyb290Q29udGFpbmVyLCByb290RGlzcGxheUJveCkgewor ICAgICAgICBBU1NFUlQocm9vdENvbnRhaW5lci5lc3RhYmxpc2hlc0Zvcm1hdHRpbmdDb250ZXh0 KCkpOworICAgICAgICB0aGlzLm1fcm9vdENvbnRhaW5lciA9IHJvb3RDb250YWluZXI7CisgICAg ICAgIHRoaXMubV9yb290RGlzcGxheUJveCA9IHJvb3REaXNwbGF5Qm94OwogCi0gICAgZm9ybWF0 dGluZ0NvbnRleHQoZm9ybWF0dGluZ1N0YXRlKSB7Ci0gICAgICAgIGlmIChmb3JtYXR0aW5nU3Rh dGUgaW5zdGFuY2VvZiBCbG9ja0Zvcm1hdHRpbmdTdGF0ZSkKLSAgICAgICAgICAgIHJldHVybiBu ZXcgQmxvY2tGb3JtYXR0aW5nQ29udGV4dChmb3JtYXR0aW5nU3RhdGUpOwotICAgICAgICBpZiAo Zm9ybWF0dGluZ1N0YXRlIGluc3RhbmNlb2YgSW5saW5lRm9ybWF0dGluZ1N0YXRlKQotICAgICAg ICAgICAgcmV0dXJuIG5ldyBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dChmb3JtYXR0aW5nU3RhdGUp OwotICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKLSAgICAgICAgcmV0dXJuIG51bGw7Cisg ICAgICAgIHRoaXMubV9mb3JtYXR0aW5nU3RhdGVzID0gbmV3IE1hcCgpOwogICAgIH0KIAotICAg IGZvcm1hdHRpbmdTdGF0ZXMoKSB7Ci0gICAgICAgIHJldHVybiB0aGlzLm1fZm9ybWF0dGluZ1N0 YXRlczsKKyAgICBmb3JtYXR0aW5nQ29udGV4dChmb3JtYXR0aW5nUm9vdCkgeworICAgICAgICBy ZXR1cm4gdGhpcy5fZm9ybWF0dGluZ0NvbnRleHQodGhpcy5lc3RhYmxpc2hlZEZvcm1hdHRpbmdT dGF0ZShmb3JtYXR0aW5nUm9vdCkpOwogICAgIH0KIAogICAgIGVzdGFibGlzaGVkRm9ybWF0dGlu Z1N0YXRlKGZvcm1hdHRpbmdSb290KSB7CiAgICAgICAgIEFTU0VSVChmb3JtYXR0aW5nUm9vdC5l c3RhYmxpc2hlc0Zvcm1hdHRpbmdDb250ZXh0KCkpOwotICAgICAgICByZXR1cm4gdGhpcy5tX2Zv cm1hdHRpbmdTdGF0ZXMuZ2V0KGZvcm1hdHRpbmdSb290KTsKKyAgICAgICAgbGV0IGZvcm1hdHRp bmdTdGF0ZSA9IHRoaXMubV9mb3JtYXR0aW5nU3RhdGVzLmdldChmb3JtYXR0aW5nUm9vdCk7Cisg ICAgICAgIGlmIChmb3JtYXR0aW5nU3RhdGUpCisgICAgICAgICAgICByZXR1cm4gZm9ybWF0dGlu Z1N0YXRlOworICAgICAgICBmb3JtYXR0aW5nU3RhdGUgPSB0aGlzLl9jcmVhdGVGb3JtYXR0aW5n U3RhdGUoZm9ybWF0dGluZ1Jvb3QpOworICAgICAgICB0aGlzLm1fZm9ybWF0dGluZ1N0YXRlcy5z ZXQoZm9ybWF0dGluZ1Jvb3QsIGZvcm1hdHRpbmdTdGF0ZSk7CisgICAgICAgIHJldHVybiBmb3Jt YXR0aW5nU3RhdGU7CiAgICAgfQogCiAgICAgZm9ybWF0dGluZ1N0YXRlRm9yQm94KGxheW91dEJv eCkgewotICAgICAgICBmb3IgKGxldCBmb3JtYXR0aW5nRW50cnkgb2YgdGhpcy5mb3JtYXR0aW5n U3RhdGVzKCkpIHsKKyAgICAgICAgZm9yIChsZXQgZm9ybWF0dGluZ0VudHJ5IG9mIHRoaXMubV9m b3JtYXR0aW5nU3RhdGVzKSB7CiAgICAgICAgICAgICBsZXQgZm9ybWF0dGluZ1Jvb3QgPSBmb3Jt YXR0aW5nRW50cnlbMF07CiAgICAgICAgICAgICBsZXQgZm9ybWF0dGluZ1N0YXRlID0gZm9ybWF0 dGluZ0VudHJ5WzFdOwogICAgICAgICAgICAgaWYgKEZvcm1hdHRpbmdDb250ZXh0LmlzSW5Gb3Jt YXR0aW5nQ29udGV4dChsYXlvdXRCb3gsIGZvcm1hdHRpbmdSb290KSkKQEAgLTczLDcgKzY2LDcg QEAgY2xhc3MgTGF5b3V0U3RhdGUgewogICAgIH0KIAogICAgIG5lZWRzTGF5b3V0KCkgewotICAg ICAgICBmb3IgKGxldCBmb3JtYXR0aW5nRW50cnkgb2YgdGhpcy5mb3JtYXR0aW5nU3RhdGVzKCkp IHsKKyAgICAgICAgZm9yIChsZXQgZm9ybWF0dGluZ0VudHJ5IG9mIHRoaXMubV9mb3JtYXR0aW5n U3RhdGVzKSB7CiAgICAgICAgICAgICBsZXQgZm9ybWF0dGluZ1N0YXRlID0gZm9ybWF0dGluZ0Vu dHJ5WzFdOwogICAgICAgICAgICAgaWYgKGZvcm1hdHRpbmdTdGF0ZS5sYXlvdXROZWVkZWQoKSkK ICAgICAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKQEAgLTgyLDE5ICs3NSwxNSBAQCBjbGFzcyBM YXlvdXRTdGF0ZSB7CiAgICAgfQogCiAgICAgZGlzcGxheUJveChsYXlvdXRCb3gpIHsKLSAgICAg ICAgZm9yIChsZXQgZm9ybWF0dGluZ0VudHJ5IG9mIHRoaXMuZm9ybWF0dGluZ1N0YXRlcygpKSB7 CisgICAgICAgIGZvciAobGV0IGZvcm1hdHRpbmdFbnRyeSBvZiB0aGlzLm1fZm9ybWF0dGluZ1N0 YXRlcykgewogICAgICAgICAgICAgbGV0IGZvcm1hdHRpbmdTdGF0ZSA9IGZvcm1hdHRpbmdFbnRy eVsxXTsKICAgICAgICAgICAgIGxldCBkaXNwbGF5Qm94ID0gZm9ybWF0dGluZ1N0YXRlLmRpc3Bs YXlCb3hlcygpLmdldChsYXlvdXRCb3gpOwogICAgICAgICAgICAgaWYgKGRpc3BsYXlCb3gpCiAg ICAgICAgICAgICAgICAgcmV0dXJuIGRpc3BsYXlCb3g7CiAgICAgICAgIH0KLSAgICAgICAgLy8g SXQgbXVzdCBiZSB0aGUgSUNCLgotICAgICAgICBBU1NFUlQoIWxheW91dEJveC5wYXJlbnQoKSk7 Ci0gICAgICAgIHJldHVybiB0aGlzLmluaXRpYWxEaXNwbGF5Qm94KCk7Ci0gICAgfQotCi0gICAg aW5pdGlhbERpc3BsYXlCb3goKSB7Ci0gICAgICAgIHJldHVybiB0aGlzLm1faW5pdGlhbERpc3Bs YXlCb3g7CisgICAgICAgIC8vIEl0IG11c3QgYmUgdGhlIHJvb3QgY29udGFpbmVyLgorICAgICAg ICBBU1NFUlQobGF5b3V0Qm94ID09IHRoaXMubV9yb290Q29udGFpbmVyKTsKKyAgICAgICAgcmV0 dXJuIHRoaXMubV9yb290RGlzcGxheUJveDsKICAgICB9CiAKICAgICBfY3JlYXRlRm9ybWF0dGlu Z1N0YXRlKGZvcm1hdHRpbmdSb290KSB7CkBAIC0xMDcsNCArOTYsMTIgQEAgY2xhc3MgTGF5b3V0 U3RhdGUgewogICAgICAgICByZXR1cm4gbnVsbDsKICAgICB9CiAKKyAgICBfZm9ybWF0dGluZ0Nv bnRleHQoZm9ybWF0dGluZ1N0YXRlKSB7CisgICAgICAgIGlmIChmb3JtYXR0aW5nU3RhdGUgaW5z dGFuY2VvZiBCbG9ja0Zvcm1hdHRpbmdTdGF0ZSkKKyAgICAgICAgICAgIHJldHVybiBuZXcgQmxv Y2tGb3JtYXR0aW5nQ29udGV4dChmb3JtYXR0aW5nU3RhdGUpOworICAgICAgICBpZiAoZm9ybWF0 dGluZ1N0YXRlIGluc3RhbmNlb2YgSW5saW5lRm9ybWF0dGluZ1N0YXRlKQorICAgICAgICAgICAg cmV0dXJuIG5ldyBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dChmb3JtYXR0aW5nU3RhdGUpOworICAg ICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKyAgICAgICAgcmV0dXJuIG51bGw7CisgICAgfQog fQpkaWZmIC0tZ2l0IGEvVG9vbHMvTGF5b3V0UmVsb2FkZWQvVXRpbHMuanMgYi9Ub29scy9MYXlv dXRSZWxvYWRlZC9VdGlscy5qcwppbmRleCAwMDY0NmJmMmIwODBhYzMzNzk4MDRlODI5YWM4NjU4 YWIzYzkyODhmLi4wZjZhOGI0YTUyNmIxMzczOTc5ZjcyNDM0NzUyMmY0ZmQ0NGE4NDkxIDEwMDY0 NAotLS0gYS9Ub29scy9MYXlvdXRSZWxvYWRlZC9VdGlscy5qcworKysgYi9Ub29scy9MYXlvdXRS ZWxvYWRlZC9VdGlscy5qcwpAQCAtNTUzLDE3ICs1NTMsNiBAQCBjbGFzcyBVdGlscyB7CiAgICAg ICAgIHJldHVybiB0aGlzLl9kdW1wQm94KGxheW91dFN0YXRlLCBpbml0aWFsQ29udGFpbmluZ0Js b2NrLCAxKSArIHRoaXMuX2R1bXBUcmVlKGxheW91dFN0YXRlLCBpbml0aWFsQ29udGFpbmluZ0Js b2NrLCAyKTsKICAgICB9CiAKLSAgICBzdGF0aWMgX2ZpbmREaXNwbGF5Qm94KGxheW91dFN0YXRl LCBib3gpIHsKLSAgICAgICAgZm9yIChsZXQgZm9ybWF0dGluZ0VudHJ5IG9mIGxheW91dFN0YXRl LmZvcm1hdHRpbmdTdGF0ZXMoKSkgewotICAgICAgICAgICAgbGV0IGZvcm1hdHRpbmdTdGF0ZSA9 IGZvcm1hdHRpbmdFbnRyeVsxXTsKLSAgICAgICAgICAgIGxldCBkaXNwbGF5Qm94ID0gZm9ybWF0 dGluZ1N0YXRlLmRpc3BsYXlCb3hlcygpLmdldChib3gpOwotICAgICAgICAgICAgaWYgKGRpc3Bs YXlCb3gpCi0gICAgICAgICAgICAgICAgcmV0dXJuIGRpc3BsYXlCb3g7Ci0gICAgICAgIH0KLSAg ICAgICAgQVNTRVJUKCFib3gucGFyZW50KCkpOwotICAgICAgICByZXR1cm4gbGF5b3V0U3RhdGUu aW5pdGlhbERpc3BsYXlCb3goKTsKLSAgICB9Ci0KICAgICBzdGF0aWMgX2R1bXBCb3gobGF5b3V0 U3RhdGUsIGJveCwgbGV2ZWwpIHsKICAgICAgICAgLy8gU2tpcCBhbm9ueW1vdXMgYm94ZXMgZm9y IG5vdyAtVGhpcyBpcyB0aGUgY2FzZSB3aGVyZSBXZWJLaXQgZG9lcyBub3QgZ2VuZXJhdGUgYW4g YW5vbiBpbmxpbmUgY29udGFpbmVyIGZvciB0ZXh0IGNvbnRlbnQgd2hlcmUgdGhlIHRleHQgaXMg YSBkaXJlY3QgY2hpbGQKICAgICAgICAgLy8gb2YgYSBibG9jayBjb250YWluZXIuCkBAIC01NzQs NyArNTYzLDcgQEAgY2xhc3MgVXRpbHMgewogICAgICAgICB9CiAgICAgICAgIGlmIChib3gubmFt ZSgpID09ICJSZW5kZXJJbmxpbmUiKSB7CiAgICAgICAgICAgICBpZiAoYm94LmlzSW5GbG93UG9z aXRpb25lZCgpKSB7Ci0gICAgICAgICAgICAgICAgbGV0IGRpc3BsYXlCb3ggPSBVdGlscy5fZmlu ZERpc3BsYXlCb3gobGF5b3V0U3RhdGUsIGJveCk7CisgICAgICAgICAgICAgICAgbGV0IGRpc3Bs YXlCb3ggPSBsYXlvdXRTdGF0ZS5kaXNwbGF5Qm94KGJveCk7CiAgICAgICAgICAgICAgICAgbGV0 IGJveFJlY3QgPSBkaXNwbGF5Qm94LnJlY3QoKTsKICAgICAgICAgICAgICAgICByZXR1cm4gaW5k ZW50YXRpb24gKyBib3gubm9kZSgpLnRhZ05hbWUgKyAiICIgKyBib3gubmFtZSgpICsgIiAgKCIg KyBVdGlscy5wcmVjaXNpb25Sb3VuZFdpdGhEZWNpbWFscyhib3hSZWN0LmxlZnQoKSkgKyAiLCAi ICsgVXRpbHMucHJlY2lzaW9uUm91bmRXaXRoRGVjaW1hbHMoYm94UmVjdC50b3AoKSkgKyAiKVxu IjsKICAgICAgICAgICAgIH0KQEAgLTU4Miw3ICs1NzEsNyBAQCBjbGFzcyBVdGlscyB7CiAgICAg ICAgIH0KICAgICAgICAgaWYgKGJveC5pc0Fub255bW91cygpKQogICAgICAgICAgICAgcmV0dXJu ICIiOwotICAgICAgICBsZXQgZGlzcGxheUJveCA9IFV0aWxzLl9maW5kRGlzcGxheUJveChsYXlv dXRTdGF0ZSwgYm94KTsKKyAgICAgICAgbGV0IGRpc3BsYXlCb3ggPSBsYXlvdXRTdGF0ZS5kaXNw bGF5Qm94KGJveCk7CiAgICAgICAgIGxldCBib3hSZWN0ID0gZGlzcGxheUJveC5yZWN0KCk7CiAg ICAgICAgIHJldHVybiBpbmRlbnRhdGlvbiArIChib3gubm9kZSgpLnRhZ05hbWUgPyAoYm94Lm5v ZGUoKS50YWdOYW1lICsgIiAiKSA6ICIiKSAgKyBib3gubmFtZSgpICsgIiBhdCAoIiArIGJveFJl Y3QubGVmdCgpICsgIiwiICsgYm94UmVjdC50b3AoKSArICIpIHNpemUgIiArIGJveFJlY3Qud2lk dGgoKSArICJ4IiArIGJveFJlY3QuaGVpZ2h0KCkgKyAiXG4iOwogICAgIH0K