184546 2018-04-12 10:24:30 -0700 [LayoutReloaded] Minor cleanup in LayoutSate 2018-04-12 10:28: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 1414067 0 zalan 2018-04-12 10:24:30 -0700 moving methods around 1414069 1 337806 zalan 2018-04-12 10:25:30 -0700 Created attachment 337806 Patch 1414070 2 zalan 2018-04-12 10:27:04 -0700 Committed r230580: <https://trac.webkit.org/changeset/230580> 1414071 3 webkit-bug-importer 2018-04-12 10:28:19 -0700 <rdar://problem/39385405> 337806 2018-04-12 10:25:30 -0700 2018-04-12 10:25:30 -0700 Patch bug-184546-20180412102529.patch text/plain 11147 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjMwNTczCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYmUzMDcxYTE4MjA1M2ZkYTFkMTY2MjJjMzFmYjBkYzgw ODJlZWE2Mi4uZTllM2JjNjA4Y2YzZTc0NmQ5MzM3ZGU1NjgyYmU5ZWI0ZWIwYWJiMSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMx IEBACisyMDE4LTA0LTEyICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAg ICAgW0xheW91dFJlbG9hZGVkXSBNaW5vciBjbGVhbnVwIGluIExheW91dFNhdGUKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4NDU0NgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogTGF5b3V0UmVsb2FkZWQv Rm9ybWF0dGluZ0NvbnRleHQvRm9ybWF0dGluZ0NvbnRleHQuanM6CisgICAgICAgIChGb3JtYXR0 aW5nQ29udGV4dC5pc0luRm9ybWF0dGluZ0NvbnRleHQpOgorICAgICAgICAqIExheW91dFJlbG9h ZGVkL0Zvcm1hdHRpbmdTdGF0ZS9Gb3JtYXR0aW5nU3RhdGUuanM6CisgICAgICAgIChGb3JtYXR0 aW5nU3RhdGUucHJvdG90eXBlLmRpc3BsYXlCb3hlcyk6CisgICAgICAgIChGb3JtYXR0aW5nU3Rh dGUucHJvdG90eXBlLmRpc3BsYXlCb3gpOgorICAgICAgICAoRm9ybWF0dGluZ1N0YXRlLnByb3Rv dHlwZS5fbWFya1N1YlRyZWVOZWVkc0xheW91dCk6CisgICAgICAgIChGb3JtYXR0aW5nU3RhdGUp OgorICAgICAgICAoRm9ybWF0dGluZ1N0YXRlLnByb3RvdHlwZS5kaXNwbGF5Qm94TWFwKTogRGVs ZXRlZC4KKyAgICAgICAgKiBMYXlvdXRSZWxvYWRlZC9MYXlvdXRTdGF0ZS5qczoKKyAgICAgICAg KExheW91dFN0YXRlLnByb3RvdHlwZS5mb3JtYXR0aW5nU3RhdGVGb3JCb3gpOgorICAgICAgICAo TGF5b3V0U3RhdGUucHJvdG90eXBlLm5lZWRzTGF5b3V0KToKKyAgICAgICAgKExheW91dFN0YXRl LnByb3RvdHlwZS5kaXNwbGF5Qm94KToKKyAgICAgICAgKExheW91dFN0YXRlLnByb3RvdHlwZS5f Y3JlYXRlRm9ybWF0dGluZ1N0YXRlKToKKyAgICAgICAgKExheW91dFN0YXRlKToKKyAgICAgICAg KiBMYXlvdXRSZWxvYWRlZC9MYXlvdXRUcmVlL0JveC5qczoKKyAgICAgICAgKExheW91dC5Cb3gu cHJvdG90eXBlLmlzRm9ybWF0dGluZ0NvbnRleHREZXNjZW5kYW50KTogRGVsZXRlZC4KKyAgICAg ICAgKiBMYXlvdXRSZWxvYWRlZC9MYXlvdXRUcmVlL0NvbnRhaW5lci5qczoKKyAgICAgICAgKExh eW91dC5Db250YWluZXIucHJvdG90eXBlLmlzQ29udGFpbmluZ0Jsb2NrRGVzY2VuZGFudCk6IERl bGV0ZWQuCisgICAgICAgICogTGF5b3V0UmVsb2FkZWQvVXRpbHMuanM6CisgICAgICAgIChVdGls cy5fZmluZERpc3BsYXlCb3gpOgorCiAyMDE4LTA0LTEyICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBh cHBsZS5jb20+CiAKICAgICAgICAgW0xheW91dFJlbG9hZGVkXSBJbnRyb2R1Y2UgbmVlZHNMYXlv dXQgdG8gSW5saW5lRm9ybWF0dGluZ0NvbnRleHQKZGlmZiAtLWdpdCBhL1Rvb2xzL0xheW91dFJl bG9hZGVkL0Zvcm1hdHRpbmdDb250ZXh0L0Zvcm1hdHRpbmdDb250ZXh0LmpzIGIvVG9vbHMvTGF5 b3V0UmVsb2FkZWQvRm9ybWF0dGluZ0NvbnRleHQvRm9ybWF0dGluZ0NvbnRleHQuanMKaW5kZXgg Y2ExY2U0YjgwODJmZDZhNzFhMTcyMTVhN2Y4YWE5N2QzMTQxMmJkNS4uNmUyMjRkYjc3NTBhMjQw MWY3ZjAxMmY1NmE1NzdkOGEyYzI0ZDM2OCAxMDA2NDQKLS0tIGEvVG9vbHMvTGF5b3V0UmVsb2Fk ZWQvRm9ybWF0dGluZ0NvbnRleHQvRm9ybWF0dGluZ0NvbnRleHQuanMKKysrIGIvVG9vbHMvTGF5 b3V0UmVsb2FkZWQvRm9ybWF0dGluZ0NvbnRleHQvRm9ybWF0dGluZ0NvbnRleHQuanMKQEAgLTcy LDYgKzcyLDE4IEBAIGNsYXNzIEZvcm1hdHRpbmdDb250ZXh0IHsKICAgICAgICAgcmV0dXJuIFV0 aWxzLmNvbXB1dGVkTWFyZ2luUmlnaHQobGF5b3V0Qm94Lm5vZGUoKSk7CiAgICAgfQogCisgICAg c3RhdGljIGlzSW5Gb3JtYXR0aW5nQ29udGV4dChsYXlvdXRCb3gsIGZvcm1hdHRpbmdDb250ZXh0 Um9vdCkgeworICAgICAgICBBU1NFUlQoZm9ybWF0dGluZ0NvbnRleHRSb290LmVzdGFibGlzaGVz Rm9ybWF0dGluZ0NvbnRleHQoKSk7CisgICAgICAgIC8vIElmIHdlIGhpdCB0aGUgInRoaXMiIHdo aWxlIGNsaW1iaW5nIHVwIG9uIHRoZSBjb250YWluaW5nIGJsb2NrIGNoYWluIGFuZCB3ZSBkb24n dCBwYXNzIGEgZm9ybWF0dGluZyBjb250ZXh0IHJvb3QgLT4gYm94IGlzIHBhcnQgb2YgdGhpcyBi b3gncyBmb3JtYXR0aW5nIGNvbnRleHQuCisgICAgICAgIGZvciAobGV0IGNvbnRhaW5pbmdCbG9j ayA9IGxheW91dEJveC5jb250YWluaW5nQmxvY2soKTsgY29udGFpbmluZ0Jsb2NrOyBjb250YWlu aW5nQmxvY2sgPSBjb250YWluaW5nQmxvY2suY29udGFpbmluZ0Jsb2NrKCkpIHsKKyAgICAgICAg ICAgIGlmIChjb250YWluaW5nQmxvY2sgPT0gZm9ybWF0dGluZ0NvbnRleHRSb290KQorICAgICAg ICAgICAgICAgIHJldHVybiB0cnVlOworICAgICAgICAgICAgaWYgKGNvbnRhaW5pbmdCbG9jay5l c3RhYmxpc2hlc0Zvcm1hdHRpbmdDb250ZXh0KCkpCisgICAgICAgICAgICAgICAgcmV0dXJuIGZh bHNlOworICAgICAgICB9CisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICB9CisKICAgICBfZGVz Y2VuZGFudE5lZWRzTGF5b3V0KCkgewogICAgICAgICByZXR1cm4gdGhpcy5tX2xheW91dFN0YWNr Lmxlbmd0aDsKICAgICB9CmRpZmYgLS1naXQgYS9Ub29scy9MYXlvdXRSZWxvYWRlZC9Gb3JtYXR0 aW5nU3RhdGUvRm9ybWF0dGluZ1N0YXRlLmpzIGIvVG9vbHMvTGF5b3V0UmVsb2FkZWQvRm9ybWF0 dGluZ1N0YXRlL0Zvcm1hdHRpbmdTdGF0ZS5qcwppbmRleCA0MDZmMmVkODNlZmE2OWZiYjgwMTY0 ZWViNmI3ZGMyMjNiZGVjZWU4Li41MjAwNjI1ZDI2ZDliOWExNmZhNTIyZTU5NTFhZGY3ZWNhNDY1 ZjE1IDEwMDY0NAotLS0gYS9Ub29scy9MYXlvdXRSZWxvYWRlZC9Gb3JtYXR0aW5nU3RhdGUvRm9y bWF0dGluZ1N0YXRlLmpzCisrKyBiL1Rvb2xzL0xheW91dFJlbG9hZGVkL0Zvcm1hdHRpbmdTdGF0 ZS9Gb3JtYXR0aW5nU3RhdGUuanMKQEAgLTYyLDcgKzYyLDcgQEAgY2xhc3MgRm9ybWF0dGluZ1N0 YXRlIHsKICAgICAgICAgcmV0dXJuIGRpc3BsYXlCb3g7CiAgICAgfQogCi0gICAgZGlzcGxheUJv eE1hcCgpIHsKKyAgICBkaXNwbGF5Qm94ZXMoKSB7CiAgICAgICAgIHJldHVybiB0aGlzLm1fZGlz cGxheVRvTGF5b3V0OwogICAgIH0KIApAQCAtNzEsMjIgKzcxLDEyIEBAIGNsYXNzIEZvcm1hdHRp bmdTdGF0ZSB7CiAgICAgICAgIC8vIDEuIE5vcm1hbGx5IHdlIG9ubHkgbmVlZCB0byBhY2Nlc3Mg Ym94ZXMgd2l0aGluIHRoZSBzYW1lIGZvcm1hdHRpbmcgY29udGV4dAogICAgICAgICAvLyAyLiBJ biBzb21lIGNhc2VzIHdlIG5lZWQgc2l6ZSBpbmZvcm1hdGlvbiBhYm91dCB0aGUgcm9vdCBjb250 YWluZXIgLXdoaWNoIGlzIGluIHRoZSBwYXJlbnQgZm9ybWF0dGluZyBjb250ZXh0CiAgICAgICAg IC8vIDMuIEluIGlubGluZSBmb3JtYXR0aW5nIHdpdGggcGFyZW50IGZsb2F0aW5nIHN0YXRlLCB3 ZSBuZWVkIGRpc3BsYXkgYm94ZXMgZnJvbSB0aGUgcGFyZW50IGZvcm1hdHRpbmcgY29udGV4dAot ICAgICAgICAvLyAzLiBJbiByYXJlIGNhc2VzIChzdGF0aWNhbGx5IHBvc2l0aW9uZWQgb3V0LW9m LWZsb3cgYm94KSwgd2UgbmVlZCBwb3NpdGlvbiBpbmZvcm1hdGlvbiBvbiBzaWJsaW5nIGZvcm1h dHRpbmcgY29udGV4dAorICAgICAgICAvLyA0LiBJbiByYXJlIGNhc2VzIChzdGF0aWNhbGx5IHBv c2l0aW9uZWQgb3V0LW9mLWZsb3cgYm94KSwgd2UgbmVlZCBwb3NpdGlvbiBpbmZvcm1hdGlvbiBv biBzaWJsaW5nIGZvcm1hdHRpbmcgY29udGV4dAogICAgICAgICAvLyBidXQgaW4gYWxsIGNhc2Vz IGl0IG5lZWRzIHRvIGJlIGEgZGVzY2VuZGFudCBvZiB0aGUgcm9vdCBjb250YWluZXIgKG9yIHRo ZSBjb250YWluZXIgaXRzZWxmKQotICAgICAgICAvLyBBU1NFUlQobGF5b3V0Qm94ID09IHRoaXMu Zm9ybWF0dGluZ1Jvb3QoKSB8fCBsYXlvdXRCb3guaXNEZXNjZW5kYW50T2YodGhpcy5mb3JtYXR0 aW5nUm9vdCgpKSk7CiAgICAgICAgIGxldCBkaXNwbGF5Qm94ID0gdGhpcy5tX2Rpc3BsYXlUb0xh eW91dC5nZXQobGF5b3V0Qm94KTsKICAgICAgICAgaWYgKGRpc3BsYXlCb3gpCiAgICAgICAgICAg ICByZXR1cm4gZGlzcGxheUJveDsKLQotICAgICAgICBsZXQgZm9ybWF0dGluZ1N0YXRlcyA9IHRo aXMubGF5b3V0U3RhdGUoKS5mb3JtYXR0aW5nU3RhdGVzKCk7Ci0gICAgICAgIGZvciAobGV0IGZv cm1hdHRpbmdTdGF0ZSBvZiBmb3JtYXR0aW5nU3RhdGVzKSB7Ci0gICAgICAgICAgICBsZXQgZGlz cGxheUJveCA9IGZvcm1hdHRpbmdTdGF0ZVsxXS5kaXNwbGF5Qm94TWFwKCkuZ2V0KGxheW91dEJv eCk7Ci0gICAgICAgICAgICBpZiAoZGlzcGxheUJveCkKLSAgICAgICAgICAgICAgICByZXR1cm4g ZGlzcGxheUJveDsKLSAgICAgICAgfQotICAgICAgICAvLyBJdCBtdXN0IGJlIHRoZSBJQ0IuCi0g ICAgICAgIEFTU0VSVCghbGF5b3V0Qm94LnBhcmVudCgpKTsKLSAgICAgICAgcmV0dXJuIHRoaXMu bGF5b3V0U3RhdGUoKS5pbml0aWFsRGlzcGxheUJveCgpOworICAgICAgICByZXR1cm4gdGhpcy5s YXlvdXRTdGF0ZSgpLmRpc3BsYXlCb3gobGF5b3V0Qm94KTsKICAgICB9CiAKICAgICBtYXJrTmVl ZHNMYXlvdXQobGF5b3V0Qm94KSB7CkBAIC0xMTAsNyArMTAwLDcgQEAgY2xhc3MgRm9ybWF0dGlu Z1N0YXRlIHsKICAgICAgICAgaWYgKCFzdWJUcmVlUm9vdCkKICAgICAgICAgICAgIHJldHVybjsK ICAgICAgICAgLy8gT25seSBtYXJrIGNoaWxkcmVuIHRoYXQgYWN0dWFsbHkgYmVsb25nIHRvIHRo aXMgZm9ybWF0dGluZyBjb250ZXh0L3N0YXRlLgotICAgICAgICBpZiAodGhpcy5mb3JtYXR0aW5n Um9vdCgpLmlzRm9ybWF0dGluZ0NvbnRleHREZXNjZW5kYW50KHN1YlRyZWVSb290KSkKKyAgICAg ICAgaWYgKEZvcm1hdHRpbmdDb250ZXh0LmlzSW5Gb3JtYXR0aW5nQ29udGV4dChzdWJUcmVlUm9v dCwgdGhpcy5mb3JtYXR0aW5nUm9vdCgpKSkKICAgICAgICAgICAgIHRoaXMubWFya05lZWRzTGF5 b3V0KHN1YlRyZWVSb290KTsKICAgICAgICAgaWYgKCFzdWJUcmVlUm9vdC5pc0NvbnRhaW5lcigp IHx8ICFzdWJUcmVlUm9vdC5oYXNDaGlsZCgpKQogICAgICAgICAgICAgcmV0dXJuOwpkaWZmIC0t Z2l0IGEvVG9vbHMvTGF5b3V0UmVsb2FkZWQvTGF5b3V0U3RhdGUuanMgYi9Ub29scy9MYXlvdXRS ZWxvYWRlZC9MYXlvdXRTdGF0ZS5qcwppbmRleCA1MzNkN2M5NDA0NGM1NzUwOTQxNzAyNDBiYWNk ZmQ4NDg2YzBmNDQ5Li4zNjVmNWY0OWQ4MTlhYWNhZTQ4MTA4YmJkNmZiZTU3YWRiYTE5NTNlIDEw MDY0NAotLS0gYS9Ub29scy9MYXlvdXRSZWxvYWRlZC9MYXlvdXRTdGF0ZS5qcworKysgYi9Ub29s cy9MYXlvdXRSZWxvYWRlZC9MYXlvdXRTdGF0ZS5qcwpAQCAtMzUsMTYgKzM1LDYgQEAgY2xhc3Mg TGF5b3V0U3RhdGUgewogICAgICAgICB0aGlzLmZvcm1hdHRpbmdDb250ZXh0KGZvcm1hdHRpbmdT dGF0ZSkubGF5b3V0KCk7CiAgICAgfQogCi0gICAgX2NyZWF0ZUZvcm1hdHRpbmdTdGF0ZShmb3Jt YXR0aW5nUm9vdCkgewotICAgICAgICBBU1NFUlQoZm9ybWF0dGluZ1Jvb3QuZXN0YWJsaXNoZXNG b3JtYXR0aW5nQ29udGV4dCgpKTsKLSAgICAgICAgaWYgKGZvcm1hdHRpbmdSb290LmVzdGFibGlz aGVzSW5saW5lRm9ybWF0dGluZ0NvbnRleHQoKSkKLSAgICAgICAgICAgIHJldHVybiBuZXcgSW5s aW5lRm9ybWF0dGluZ1N0YXRlKGZvcm1hdHRpbmdSb290LCB0aGlzKTsKLSAgICAgICAgaWYgKGZv cm1hdHRpbmdSb290LmVzdGFibGlzaGVzQmxvY2tGb3JtYXR0aW5nQ29udGV4dCgpKQotICAgICAg ICAgICAgcmV0dXJuIG5ldyBCbG9ja0Zvcm1hdHRpbmdTdGF0ZShmb3JtYXR0aW5nUm9vdCwgdGhp cyk7Ci0gICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwotICAgICAgICByZXR1cm4gbnVsbDsK LSAgICB9Ci0KICAgICBmb3JtYXR0aW5nQ29udGV4dChmb3JtYXR0aW5nU3RhdGUpIHsKICAgICAg ICAgaWYgKGZvcm1hdHRpbmdTdGF0ZSBpbnN0YW5jZW9mIEJsb2NrRm9ybWF0dGluZ1N0YXRlKQog ICAgICAgICAgICAgcmV0dXJuIG5ldyBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0KGZvcm1hdHRpbmdT dGF0ZSk7CkBAIC02NCw5ICs1NCwxMSBAQCBjbGFzcyBMYXlvdXRTdGF0ZSB7CiAgICAgfQogCiAg ICAgZm9ybWF0dGluZ1N0YXRlRm9yQm94KGxheW91dEJveCkgewotICAgICAgICBmb3IgKGxldCBm b3JtYXR0aW5nU3RhdGUgb2YgdGhpcy5mb3JtYXR0aW5nU3RhdGVzKCkpIHsKLSAgICAgICAgICAg IGlmIChmb3JtYXR0aW5nU3RhdGVbMF0uaXNGb3JtYXR0aW5nQ29udGV4dERlc2NlbmRhbnQobGF5 b3V0Qm94KSkKLSAgICAgICAgICAgICAgICByZXR1cm4gZm9ybWF0dGluZ1N0YXRlWzFdOworICAg ICAgICBmb3IgKGxldCBmb3JtYXR0aW5nRW50cnkgb2YgdGhpcy5mb3JtYXR0aW5nU3RhdGVzKCkp IHsKKyAgICAgICAgICAgIGxldCBmb3JtYXR0aW5nUm9vdCA9IGZvcm1hdHRpbmdFbnRyeVswXTsK KyAgICAgICAgICAgIGxldCBmb3JtYXR0aW5nU3RhdGUgPSBmb3JtYXR0aW5nRW50cnlbMV07Cisg ICAgICAgICAgICBpZiAoRm9ybWF0dGluZ0NvbnRleHQuaXNJbkZvcm1hdHRpbmdDb250ZXh0KGxh eW91dEJveCwgZm9ybWF0dGluZ1Jvb3QpKQorICAgICAgICAgICAgICAgIHJldHVybiBmb3JtYXR0 aW5nU3RhdGU7CiAgICAgICAgIH0KICAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CiAgICAg ICAgIHJldHVybiBudWxsOwpAQCAtODEsMTQgKzczLDM4IEBAIGNsYXNzIExheW91dFN0YXRlIHsK ICAgICB9CiAKICAgICBuZWVkc0xheW91dCgpIHsKLSAgICAgICAgZm9yIChsZXQgZm9ybWF0dGlu Z1N0YXRlIG9mIHRoaXMuZm9ybWF0dGluZ1N0YXRlcygpKSB7Ci0gICAgICAgICAgICBpZiAoZm9y bWF0dGluZ1N0YXRlWzFdLmxheW91dE5lZWRlZCgpKQorICAgICAgICBmb3IgKGxldCBmb3JtYXR0 aW5nRW50cnkgb2YgdGhpcy5mb3JtYXR0aW5nU3RhdGVzKCkpIHsKKyAgICAgICAgICAgIGxldCBm b3JtYXR0aW5nU3RhdGUgPSBmb3JtYXR0aW5nRW50cnlbMV07CisgICAgICAgICAgICBpZiAoZm9y bWF0dGluZ1N0YXRlLmxheW91dE5lZWRlZCgpKQogICAgICAgICAgICAgICAgIHJldHVybiB0cnVl OwogICAgICAgICB9CiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICB9CiAKKyAgICBkaXNwbGF5 Qm94KGxheW91dEJveCkgeworICAgICAgICBmb3IgKGxldCBmb3JtYXR0aW5nRW50cnkgb2YgdGhp cy5mb3JtYXR0aW5nU3RhdGVzKCkpIHsKKyAgICAgICAgICAgIGxldCBmb3JtYXR0aW5nU3RhdGUg PSBmb3JtYXR0aW5nRW50cnlbMV07CisgICAgICAgICAgICBsZXQgZGlzcGxheUJveCA9IGZvcm1h dHRpbmdTdGF0ZS5kaXNwbGF5Qm94ZXMoKS5nZXQobGF5b3V0Qm94KTsKKyAgICAgICAgICAgIGlm IChkaXNwbGF5Qm94KQorICAgICAgICAgICAgICAgIHJldHVybiBkaXNwbGF5Qm94OworICAgICAg ICB9CisgICAgICAgIC8vIEl0IG11c3QgYmUgdGhlIElDQi4KKyAgICAgICAgQVNTRVJUKCFsYXlv dXRCb3gucGFyZW50KCkpOworICAgICAgICByZXR1cm4gdGhpcy5pbml0aWFsRGlzcGxheUJveCgp OworICAgIH0KKwogICAgIGluaXRpYWxEaXNwbGF5Qm94KCkgewogICAgICAgICByZXR1cm4gdGhp cy5tX2luaXRpYWxEaXNwbGF5Qm94OwogICAgIH0KKworICAgIF9jcmVhdGVGb3JtYXR0aW5nU3Rh dGUoZm9ybWF0dGluZ1Jvb3QpIHsKKyAgICAgICAgQVNTRVJUKGZvcm1hdHRpbmdSb290LmVzdGFi bGlzaGVzRm9ybWF0dGluZ0NvbnRleHQoKSk7CisgICAgICAgIGlmIChmb3JtYXR0aW5nUm9vdC5l c3RhYmxpc2hlc0lubGluZUZvcm1hdHRpbmdDb250ZXh0KCkpCisgICAgICAgICAgICByZXR1cm4g bmV3IElubGluZUZvcm1hdHRpbmdTdGF0ZShmb3JtYXR0aW5nUm9vdCwgdGhpcyk7CisgICAgICAg IGlmIChmb3JtYXR0aW5nUm9vdC5lc3RhYmxpc2hlc0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQoKSkK KyAgICAgICAgICAgIHJldHVybiBuZXcgQmxvY2tGb3JtYXR0aW5nU3RhdGUoZm9ybWF0dGluZ1Jv b3QsIHRoaXMpOworICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKyAgICAgICAgcmV0dXJu IG51bGw7CisgICAgfQorCiB9CmRpZmYgLS1naXQgYS9Ub29scy9MYXlvdXRSZWxvYWRlZC9MYXlv dXRUcmVlL0JveC5qcyBiL1Rvb2xzL0xheW91dFJlbG9hZGVkL0xheW91dFRyZWUvQm94LmpzCmlu ZGV4IGYyMDg3ZDQ1YTZlMWFmMDM5NTA1YTA5ZTk3MTY5NWFiMzU4MDM3YjAuLmRjNGViY2UyMGI1 YTFlZjM4YzM4N2FmNGMxYTkwYWJiOTVkMzk5YjAgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0xheW91dFJl bG9hZGVkL0xheW91dFRyZWUvQm94LmpzCisrKyBiL1Rvb2xzL0xheW91dFJlbG9hZGVkL0xheW91 dFRyZWUvQm94LmpzCkBAIC0xNjUsMTggKzE2NSw2IEBAIExheW91dC5Cb3ggPSBjbGFzcyBCb3gg ewogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgfQogCi0gICAgaXNGb3JtYXR0aW5nQ29udGV4 dERlc2NlbmRhbnQobGF5b3V0Qm94KSB7Ci0gICAgICAgIEFTU0VSVCh0aGlzLmVzdGFibGlzaGVz Rm9ybWF0dGluZ0NvbnRleHQoKSk7Ci0gICAgICAgIC8vIElmIHdlIGhpdCB0aGUgInRoaXMiIHdo aWxlIGNsaW1iaW5nIHVwIG9uIHRoZSBjb250YWluaW5nIGJsb2NrIGNoYWluIGFuZCB3ZSBkb24n dCBwYXNzIGEgZm9ybWF0dGluZyBjb250ZXh0IHJvb3QgLT4gYm94IGlzIHBhcnQgb2YgdGhpcyBi b3gncyBmb3JtYXR0aW5nIGNvbnRleHQuCi0gICAgICAgIGZvciAobGV0IGNvbnRhaW5pbmdCbG9j ayA9IGxheW91dEJveC5jb250YWluaW5nQmxvY2soKTsgY29udGFpbmluZ0Jsb2NrOyBjb250YWlu aW5nQmxvY2sgPSBjb250YWluaW5nQmxvY2suY29udGFpbmluZ0Jsb2NrKCkpIHsKLSAgICAgICAg ICAgIGlmIChjb250YWluaW5nQmxvY2sgPT0gdGhpcykKLSAgICAgICAgICAgICAgICByZXR1cm4g dHJ1ZTsKLSAgICAgICAgICAgIGlmIChjb250YWluaW5nQmxvY2suZXN0YWJsaXNoZXNGb3JtYXR0 aW5nQ29udGV4dCgpKQotICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKLSAgICAgICAgfQot ICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgfQotCiAgICAgaXNQb3NpdGlvbmVkKCkgewogICAg ICAgICByZXR1cm4gdGhpcy5pc091dE9mRmxvd1Bvc2l0aW9uZWQoKSB8fCB0aGlzLmlzUmVsYXRp dmVseVBvc2l0aW9uZWQoKTsKICAgICB9CmRpZmYgLS1naXQgYS9Ub29scy9MYXlvdXRSZWxvYWRl ZC9MYXlvdXRUcmVlL0NvbnRhaW5lci5qcyBiL1Rvb2xzL0xheW91dFJlbG9hZGVkL0xheW91dFRy ZWUvQ29udGFpbmVyLmpzCmluZGV4IGQxNjQ4MDIwNzY0ZTQ0YzVmNDdlMjEwNTcwZGFhYjI5MzJh OGExZTEuLjAxYmY3M2RkNzE5OWEzNzQwODk5ZTYxYzJiNjBkNDJiMzQ4NTlhNjAgMTAwNjQ0Ci0t LSBhL1Rvb2xzL0xheW91dFJlbG9hZGVkL0xheW91dFRyZWUvQ29udGFpbmVyLmpzCisrKyBiL1Rv b2xzL0xheW91dFJlbG9hZGVkL0xheW91dFRyZWUvQ29udGFpbmVyLmpzCkBAIC04NSwxOCArODUs NiBAQCBMYXlvdXQuQ29udGFpbmVyID0gY2xhc3MgQ29udGFpbmVyIGV4dGVuZHMgTGF5b3V0LkJv eCB7CiAgICAgICAgIHJldHVybiAhIXRoaXMuZmlyc3RJbkZsb3dPckZsb2F0Q2hpbGQoKTsKICAg ICB9CiAKLSAgICBpc0NvbnRhaW5pbmdCbG9ja0Rlc2NlbmRhbnQobGF5b3V0Qm94KSB7Ci0gICAg ICAgIEFTU0VSVChsYXlvdXRCb3gpOwotICAgICAgICAvLyBJZiB3ZSBoaXQgdGhlICJ0aGlzIiB3 aGlsZSBjbGltYmluZyB1cCBvbiB0aGUgY29udGFpbmluZyBibG9jayBjaGFpbiAtPiBib3ggaXMg cGFydCBvZiB0aGlzIGJveCdzIGNvbnRhaW5pbmcgYmxvY2sgc3VidHJlZS4KLSAgICAgICAgbGV0 IGNvbnRhaW5pbmdCbG9jayA9IGxheW91dEJveC5jb250YWluaW5nQmxvY2soKTsKLSAgICAgICAg d2hpbGUgKGNvbnRhaW5pbmdCbG9jaykgewotICAgICAgICAgICAgaWYgKGNvbnRhaW5pbmdCbG9j ayA9PSB0aGlzKQotICAgICAgICAgICAgICAgIHJldHVybiB0cnVlOwotICAgICAgICAgICAgY29u dGFpbmluZ0Jsb2NrID0gY29udGFpbmluZ0Jsb2NrLmNvbnRhaW5pbmdCbG9jaygpOwotICAgICAg ICB9Ci0gICAgICAgIHJldHVybiBmYWxzZTsKLSAgICB9Ci0KICAgICBvdXRPZkZsb3dEZXNjZW5k YW50cygpIHsKICAgICAgICAgaWYgKCF0aGlzLmlzUG9zaXRpb25lZCgpKQogICAgICAgICAgICAg cmV0dXJuIG5ldyBBcnJheSgpOwpkaWZmIC0tZ2l0IGEvVG9vbHMvTGF5b3V0UmVsb2FkZWQvVXRp bHMuanMgYi9Ub29scy9MYXlvdXRSZWxvYWRlZC9VdGlscy5qcwppbmRleCBlNjA4OGEyZjY3ZGM5 OTliZDAxZGNlZDRmY2VhNDIwMmUwMzgxZTk1Li4wMDY0NmJmMmIwODBhYzMzNzk4MDRlODI5YWM4 NjU4YWIzYzkyODhmIDEwMDY0NAotLS0gYS9Ub29scy9MYXlvdXRSZWxvYWRlZC9VdGlscy5qcwor KysgYi9Ub29scy9MYXlvdXRSZWxvYWRlZC9VdGlscy5qcwpAQCAtNTU0LDggKzU1NCw5IEBAIGNs YXNzIFV0aWxzIHsKICAgICB9CiAKICAgICBzdGF0aWMgX2ZpbmREaXNwbGF5Qm94KGxheW91dFN0 YXRlLCBib3gpIHsKLSAgICAgICAgZm9yIChsZXQgZm9ybWF0dGluZ1N0YXRlIG9mIGxheW91dFN0 YXRlLmZvcm1hdHRpbmdTdGF0ZXMoKSkgewotICAgICAgICAgICAgbGV0IGRpc3BsYXlCb3ggPSBm b3JtYXR0aW5nU3RhdGVbMV0uZGlzcGxheUJveE1hcCgpLmdldChib3gpOworICAgICAgICBmb3Ig KGxldCBmb3JtYXR0aW5nRW50cnkgb2YgbGF5b3V0U3RhdGUuZm9ybWF0dGluZ1N0YXRlcygpKSB7 CisgICAgICAgICAgICBsZXQgZm9ybWF0dGluZ1N0YXRlID0gZm9ybWF0dGluZ0VudHJ5WzFdOwor ICAgICAgICAgICAgbGV0IGRpc3BsYXlCb3ggPSBmb3JtYXR0aW5nU3RhdGUuZGlzcGxheUJveGVz KCkuZ2V0KGJveCk7CiAgICAgICAgICAgICBpZiAoZGlzcGxheUJveCkKICAgICAgICAgICAgICAg ICByZXR1cm4gZGlzcGxheUJveDsKICAgICAgICAgfQo=