183777 2018-03-20 08:02:15 -0700 [LayoutReloaded] Introduce FormattingState (Block/Inline/etc) 2018-03-20 08:13:18 -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 1407657 0 zalan 2018-03-20 08:02:15 -0700 This is in preparation for moving out states from the formatting contexts. They should not hold any states. 1407658 1 336121 zalan 2018-03-20 08:05:36 -0700 Created attachment 336121 Patch 1407662 2 zalan 2018-03-20 08:12:38 -0700 Committed r229746: <https://trac.webkit.org/changeset/229746> 1407663 3 webkit-bug-importer 2018-03-20 08:13:18 -0700 <rdar://problem/38663872> 336121 2018-03-20 08:05:36 -0700 2018-03-20 08:05:36 -0700 Patch bug-183777-20180320080535.patch text/plain 14391 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjI5NzM5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZWFhYzI3MzA1MzZhMjY5ODE2MTlhMzU1NDVlNmVhZGI2 YjZmMmIyNS4uMTU1MmMwMGFkNGZmZjAzZjhiYzlhNjg1YzM2MmIwNzc0MmUzNWFlYSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM4 IEBACisyMDE4LTAzLTIwICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAg ICAgW0xheW91dFJlbG9hZGVkXSBJbnRyb2R1Y2UgRm9ybWF0dGluZ1N0YXRlIChCbG9jay9Jbmxp bmUvZXRjKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTgzNzc3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg VGhpcyBpcyBpbiBwcmVwYXJhdGlvbiBmb3IgbW92aW5nIG91dCBzdGF0ZXMgZnJvbSB0aGUgZm9y bWF0dGluZyBjb250ZXh0cy4KKworICAgICAgICAqIExheW91dFJlbG9hZGVkL0Zvcm1hdHRpbmdD b250ZXh0L0Jsb2NrRm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0LmpzOgorICAgICAg ICAoQmxvY2tGb3JtYXR0aW5nQ29udGV4dCk6CisgICAgICAgICogTGF5b3V0UmVsb2FkZWQvRm9y bWF0dGluZ0NvbnRleHQvRm9ybWF0dGluZ0NvbnRleHQuanM6CisgICAgICAgIChGb3JtYXR0aW5n Q29udGV4dCk6CisgICAgICAgIChGb3JtYXR0aW5nQ29udGV4dC5wcm90b3R5cGUubGF5b3V0U3Rh dGUpOgorICAgICAgICAoRm9ybWF0dGluZ0NvbnRleHQucHJvdG90eXBlLmxheW91dENvbnRleHQp OgorICAgICAgICAoRm9ybWF0dGluZ0NvbnRleHQucHJvdG90eXBlLmxheW91dCk6CisgICAgICAg ICogTGF5b3V0UmVsb2FkZWQvRm9ybWF0dGluZ0NvbnRleHQvSW5saW5lRm9ybWF0dGluZy9Jbmxp bmVGb3JtYXR0aW5nQ29udGV4dC5qczoKKyAgICAgICAgKElubGluZUZvcm1hdHRpbmdDb250ZXh0 KToKKyAgICAgICAgKiBMYXlvdXRSZWxvYWRlZC9Gb3JtYXR0aW5nU3RhdGUvQmxvY2tGb3JtYXR0 aW5nU3RhdGUuanM6IENvcGllZCBmcm9tIFRvb2xzL0xheW91dFJlbG9hZGVkL0xheW91dENvbnRl eHQuanMuCisgICAgICAgIChCbG9ja0Zvcm1hdHRpbmdTdGF0ZSk6CisgICAgICAgICogTGF5b3V0 UmVsb2FkZWQvRm9ybWF0dGluZ1N0YXRlL0Zvcm1hdHRpbmdTdGF0ZS5qczogQ29waWVkIGZyb20g VG9vbHMvTGF5b3V0UmVsb2FkZWQvTGF5b3V0Q29udGV4dC5qcy4KKyAgICAgICAgKEZvcm1hdHRp bmdTdGF0ZSk6CisgICAgICAgIChGb3JtYXR0aW5nU3RhdGUucHJvdG90eXBlLmZvcm1hdHRpbmdD b250ZXh0KToKKyAgICAgICAgKEZvcm1hdHRpbmdTdGF0ZS5wcm90b3R5cGUubGF5b3V0Q29udGV4 dCk6CisgICAgICAgIChGb3JtYXR0aW5nU3RhdGUucHJvdG90eXBlLl9zZXRGb3JtYXR0aW5nQ29u dGV4dCk6CisgICAgICAgICogTGF5b3V0UmVsb2FkZWQvRm9ybWF0dGluZ1N0YXRlL0lubGluZUZv cm1hdHRpbmdTdGF0ZS5qczogQ29waWVkIGZyb20gVG9vbHMvTGF5b3V0UmVsb2FkZWQvTGF5b3V0 Q29udGV4dC5qcy4KKyAgICAgICAgKElubGluZUZvcm1hdHRpbmdTdGF0ZSk6CisgICAgICAgICog TGF5b3V0UmVsb2FkZWQvTGF5b3V0Q29udGV4dC5qczoKKyAgICAgICAgKExheW91dENvbnRleHQp OgorICAgICAgICAoTGF5b3V0Q29udGV4dC5wcm90b3R5cGUubGF5b3V0KToKKyAgICAgICAgKExh eW91dENvbnRleHQucHJvdG90eXBlLl9jcmVhdGVGb3JtYXR0aW5nU3RhdGUpOgorICAgICAgICAo TGF5b3V0Q29udGV4dC5wcm90b3R5cGUuX2NyZWF0ZUZvcm1hdHRpbmdDb250ZXh0KTogRGVsZXRl ZC4KKyAgICAgICAgKiBMYXlvdXRSZWxvYWRlZC9MYXlvdXRSZWxvYWRlZC54Y3dvcmtzcGFjZS9j b250ZW50cy54Y3dvcmtzcGFjZWRhdGE6CisgICAgICAgICogTGF5b3V0UmVsb2FkZWQvdGVzdC9p bmRleC5odG1sOgorCiAyMDE4LTAzLTE5ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+ CiAKICAgICAgICAgW0xheW91dFJlbG9hZGVkXSBMYXlvdXQuQm94IHNob3VsZCBub3QgY3JlYXRl IHRoZSBmb3JtYXR0aW5nIGNvbnRleHQuCmRpZmYgLS1naXQgYS9Ub29scy9MYXlvdXRSZWxvYWRl ZC9Gb3JtYXR0aW5nQ29udGV4dC9CbG9ja0Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4 dC5qcyBiL1Rvb2xzL0xheW91dFJlbG9hZGVkL0Zvcm1hdHRpbmdDb250ZXh0L0Jsb2NrRm9ybWF0 dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0LmpzCmluZGV4IGQ4ZWEyZjBiZWE1M2QyYmM2YmYx MDIwMzM2Yzg0NGIyODZmYzIyNGYuLjEwMDQzYjc2MjZlYTI3ZGM2NGFlZDAxMTE4ZjIzMTc0NmQ0 Njg3ZjEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0xheW91dFJlbG9hZGVkL0Zvcm1hdHRpbmdDb250ZXh0 L0Jsb2NrRm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0LmpzCisrKyBiL1Rvb2xzL0xh eW91dFJlbG9hZGVkL0Zvcm1hdHRpbmdDb250ZXh0L0Jsb2NrRm9ybWF0dGluZy9CbG9ja0Zvcm1h dHRpbmdDb250ZXh0LmpzCkBAIC0yMyw4ICsyMyw4IEBACiAgKiBPRiBUSElTIFNPRlRXQVJFLCBF VkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgogICovCiBj bGFzcyBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0IGV4dGVuZHMgRm9ybWF0dGluZ0NvbnRleHQgewot ICAgIGNvbnN0cnVjdG9yKHJvb3QsIGxheW91dENvbnRleHQpIHsKLSAgICAgICAgc3VwZXIocm9v dCwgbGF5b3V0Q29udGV4dCk7CisgICAgY29uc3RydWN0b3Iocm9vdCwgbGF5b3V0U3RhdGUpIHsK KyAgICAgICAgc3VwZXIocm9vdCwgbGF5b3V0U3RhdGUpOwogICAgICAgICAvLyBOZXcgYmxvY2sg Zm9ybWF0dGluZyBjb250ZXh0IGFsd2F5cyBlc3RhYmxpc2hlcyBhIG5ldyBmbG9hdGluZyBjb250 ZXh0LgogICAgICAgICB0aGlzLm1fZmxvYXRpbmdDb250ZXh0ID0gbmV3IEZsb2F0aW5nQ29udGV4 dCh0aGlzKTsKICAgICB9CmRpZmYgLS1naXQgYS9Ub29scy9MYXlvdXRSZWxvYWRlZC9Gb3JtYXR0 aW5nQ29udGV4dC9Gb3JtYXR0aW5nQ29udGV4dC5qcyBiL1Rvb2xzL0xheW91dFJlbG9hZGVkL0Zv cm1hdHRpbmdDb250ZXh0L0Zvcm1hdHRpbmdDb250ZXh0LmpzCmluZGV4IGI5MWQxMGEyNmJhM2Yw NTI0ZjYwZGEzZTAyMzM3MWUyYWU0NWExMDMuLjU4MjEzNGMzOTZiZTJhYmZmODBiMjRhOWY2ZGZj Mjk4OTBkZjIyMjAgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0xheW91dFJlbG9hZGVkL0Zvcm1hdHRpbmdD b250ZXh0L0Zvcm1hdHRpbmdDb250ZXh0LmpzCisrKyBiL1Rvb2xzL0xheW91dFJlbG9hZGVkL0Zv cm1hdHRpbmdDb250ZXh0L0Zvcm1hdHRpbmdDb250ZXh0LmpzCkBAIC0yNCw5ICsyNCw5IEBACiAg Ki8KIAogY2xhc3MgRm9ybWF0dGluZ0NvbnRleHQgewotICAgIGNvbnN0cnVjdG9yKHJvb3RDb250 YWluZXIsIGxheW91dENvbnRleHQpIHsKKyAgICBjb25zdHJ1Y3Rvcihyb290Q29udGFpbmVyLCBs YXlvdXRTdGF0ZSkgewogICAgICAgICB0aGlzLm1fcm9vdENvbnRhaW5lciA9IHJvb3RDb250YWlu ZXI7Ci0gICAgICAgIHRoaXMubV9sYXlvdXRDb250ZXh0ID0gbGF5b3V0Q29udGV4dDsKKyAgICAg ICAgdGhpcy5tX2xheW91dFN0YXRlID0gbGF5b3V0U3RhdGU7CiAgICAgICAgIHRoaXMubV9mbG9h dGluZ0NvbnRleHQgPSBudWxsOwogICAgICAgICB0aGlzLm1fZGlzcGxheVRvTGF5b3V0ID0gbmV3 IE1hcCgpOwogICAgICAgICB0aGlzLm1fbGF5b3V0VG9EaXNwbGF5ID0gbmV3IE1hcCgpOwpAQCAt MzcsMTUgKzM3LDIwIEBAIGNsYXNzIEZvcm1hdHRpbmdDb250ZXh0IHsKICAgICAgICAgcmV0dXJu IHRoaXMubV9yb290Q29udGFpbmVyOwogICAgIH0KIAorICAgIGxheW91dFN0YXRlKCkgeworICAg ICAgICByZXR1cm4gdGhpcy5tX2xheW91dFN0YXRlOworICAgIH0KKwogICAgIGxheW91dENvbnRl eHQoKSB7Ci0gICAgICAgIHJldHVybiB0aGlzLm1fbGF5b3V0Q29udGV4dDsKKyAgICAgICAgcmV0 dXJuIHRoaXMubGF5b3V0U3RhdGUoKS5sYXlvdXRDb250ZXh0KCk7CiAgICAgfQogCiAgICAgZmxv YXRpbmdDb250ZXh0KCkgewogICAgICAgICByZXR1cm4gdGhpcy5tX2Zsb2F0aW5nQ29udGV4dDsK ICAgICB9CiAKLSAgICBsYXlvdXQobGF5b3V0Q29udGV4dCkgeworICAgIGxheW91dCgpIHsKKyAg ICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CiAgICAgfQogCiAgICAgY29tcHV0ZVdpZHRoKGxh eW91dEJveCkgewpkaWZmIC0tZ2l0IGEvVG9vbHMvTGF5b3V0UmVsb2FkZWQvRm9ybWF0dGluZ0Nv bnRleHQvSW5saW5lRm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5qcyBiL1Rvb2xz L0xheW91dFJlbG9hZGVkL0Zvcm1hdHRpbmdDb250ZXh0L0lubGluZUZvcm1hdHRpbmcvSW5saW5l Rm9ybWF0dGluZ0NvbnRleHQuanMKaW5kZXggMWI5OTFlZTdjMmM3NWVjZTc3Mzk0OTFkYjQxNTQ3 ZTFmZGZlNmI4Yi4uNzE5MWZjMzRjNDBhZmU0NmJmNzIxMjllYTIyNWNlNWI1MzBlZGNjMSAxMDA2 NDQKLS0tIGEvVG9vbHMvTGF5b3V0UmVsb2FkZWQvRm9ybWF0dGluZ0NvbnRleHQvSW5saW5lRm9y bWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5qcworKysgYi9Ub29scy9MYXlvdXRSZWxv YWRlZC9Gb3JtYXR0aW5nQ29udGV4dC9JbmxpbmVGb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdD b250ZXh0LmpzCkBAIC0yNCw4ICsyNCw4IEBACiAgKi8KIAogY2xhc3MgSW5saW5lRm9ybWF0dGlu Z0NvbnRleHQgZXh0ZW5kcyBGb3JtYXR0aW5nQ29udGV4dCB7Ci0gICAgY29uc3RydWN0b3Iocm9v dCwgbGF5b3V0Q29udGV4dCkgewotICAgICAgICBzdXBlcihyb290LCBsYXlvdXRDb250ZXh0KTsK KyAgICBjb25zdHJ1Y3Rvcihyb290LCBsYXlvdXRTdGF0ZSkgeworICAgICAgICBzdXBlcihyb290 LCBsYXlvdXRTdGF0ZSk7CiAgICAgICAgIC8vIElmIHRoZSBibG9jayBjb250YWluZXIgYm94IHRo YXQgaW5pdGlhdGVzIHRoaXMgaW5saW5lIGZvcm1hdHRpbmcgY29udGV4IGFsc28gZXN0YWJsaXNo ZXMgYSBibG9jayBjb250ZXh0LCBjcmVhdGUgYSBuZXcgZmxvYXQgZm9yIHVzLgogICAgICAgICBB U1NFUlQocm9vdC5pc0Jsb2NrQ29udGFpbmVyQm94KCkpOwogICAgICAgICBpZiAocm9vdC5lc3Rh Ymxpc2hlc0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQoKSkKZGlmZiAtLWdpdCBhL1Rvb2xzL0xheW91 dFJlbG9hZGVkL0Zvcm1hdHRpbmdTdGF0ZS9CbG9ja0Zvcm1hdHRpbmdTdGF0ZS5qcyBiL1Rvb2xz L0xheW91dFJlbG9hZGVkL0Zvcm1hdHRpbmdTdGF0ZS9CbG9ja0Zvcm1hdHRpbmdTdGF0ZS5qcwpu ZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwLi41NGU4MTNmNGJkOGQzYTE3NTVmZjU4Nzc4NjU0MzViZWE2MjE3MDgyCi0tLSAv ZGV2L251bGwKKysrIGIvVG9vbHMvTGF5b3V0UmVsb2FkZWQvRm9ybWF0dGluZ1N0YXRlL0Jsb2Nr Rm9ybWF0dGluZ1N0YXRlLmpzCkBAIC0wLDAgKzEsMzEgQEAKKy8qCisgKiBDb3B5cmlnaHQgKEMp IDIwMTggQXBwbGUgSW5jLiBBbGwgUmlnaHRzIFJlc2VydmVkLgorICoKKyAqIFJlZGlzdHJpYnV0 aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAor ICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2lu ZyBjb25kaXRpb25zCisgKiBhcmUgbWV0OgorICogMS4gUmVkaXN0cmlidXRpb25zIG9mIHNvdXJj ZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhp cyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KKyAqIDIu IFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUg Y29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUg Zm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCisgKiAgICBkb2N1bWVudGF0aW9uIGFuZC9vciBv dGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9uLgorICoKKyAqIFRI SVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgQVBQTEUgSU5DLiBgYEFTIElTJycgQU5EIEFOWQor ICogRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVCBMSU1J VEVEIFRPLCBUSEUKKyAqIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5E IEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUgorICogUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gIElO IE5PIEVWRU5UIFNIQUxMIEFQUExFIElOQy4gT1IKKyAqIENPTlRSSUJVVE9SUyBCRSBMSUFCTEUg Rk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFMLCBTUEVDSUFMLAorICogRVhFTVBM QVJZLCBPUiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVE IFRPLAorICogUFJPQ1VSRU1FTlQgT0YgU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9T UyBPRiBVU0UsIERBVEEsIE9SCisgKiBQUk9GSVRTOyBPUiBCVVNJTkVTUyBJTlRFUlJVUFRJT04p IEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkgVEhFT1JZCisgKiBPRiBMSUFCSUxJVFksIFdIRVRI RVIgSU4gQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQKKyAqIChJTkNMVURJTkcg TkVHTElHRU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVT RQorICogT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElU WSBPRiBTVUNIIERBTUFHRS4KKyAqLworCitjbGFzcyBCbG9ja0Zvcm1hdHRpbmdTdGF0ZSBleHRl bmRzIEZvcm1hdHRpbmdTdGF0ZSB7CisgICAgY29uc3RydWN0b3IoZm9ybWF0dGluZ1Jvb3QsIGxh eW91dENvbnRleHQpIHsKKyAgICAgICAgc3VwZXIobGF5b3V0Q29udGV4dCk7CisgICAgICAgIHRo aXMuX3NldEZvcm1hdHRpbmdDb250ZXh0KG5ldyBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0KGZvcm1h dHRpbmdSb290LCB0aGlzKSk7CisgICAgfQorfQpkaWZmIC0tZ2l0IGEvVG9vbHMvTGF5b3V0UmVs b2FkZWQvRm9ybWF0dGluZ1N0YXRlL0Zvcm1hdHRpbmdTdGF0ZS5qcyBiL1Rvb2xzL0xheW91dFJl bG9hZGVkL0Zvcm1hdHRpbmdTdGF0ZS9Gb3JtYXR0aW5nU3RhdGUuanMKbmV3IGZpbGUgbW9kZSAx MDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uYjk3 NjY2ZmIxZWI3ZmQ5OTczZTE3NjdhNGZiZDhmZGE1YjBiYzc0NwotLS0gL2Rldi9udWxsCisrKyBi L1Rvb2xzL0xheW91dFJlbG9hZGVkL0Zvcm1hdHRpbmdTdGF0ZS9Gb3JtYXR0aW5nU3RhdGUuanMK QEAgLTAsMCArMSw0MyBAQAorLyoKKyAqIENvcHlyaWdodCAoQykgMjAxOCBBcHBsZSBJbmMuIEFs bCBSaWdodHMgUmVzZXJ2ZWQuCisgKgorICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3Vy Y2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CisgKiBtb2RpZmljYXRpb24sIGFy ZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKKyAqIGFy ZSBtZXQ6CisgKiAxLiBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4g dGhlIGFib3ZlIGNvcHlyaWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9u cyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgorICogMi4gUmVkaXN0cmlidXRpb25zIGlu IGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5v dGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1l ciBpbiB0aGUKKyAqICAgIGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92 aWRlZCB3aXRoIHRoZSBkaXN0cmlidXRpb24uCisgKgorICogVEhJUyBTT0ZUV0FSRSBJUyBQUk9W SURFRCBCWSBBUFBMRSBJTkMuIGBgQVMgSVMnJyBBTkQgQU5ZCisgKiBFWFBSRVNTIE9SIElNUExJ RUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIFRIRQorICogSU1Q TElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1IgQSBQQVJU SUNVTEFSCisgKiBQVVJQT1NFIEFSRSBESVNDTEFJTUVELiAgSU4gTk8gRVZFTlQgU0hBTEwgQVBQ TEUgSU5DLiBPUgorICogQ09OVFJJQlVUT1JTIEJFIExJQUJMRSBGT1IgQU5ZIERJUkVDVCwgSU5E SVJFQ1QsIElOQ0lERU5UQUwsIFNQRUNJQUwsCisgKiBFWEVNUExBUlksIE9SIENPTlNFUVVFTlRJ QUwgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sCisgKiBQUk9DVVJFTUVO VCBPRiBTVUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwgREFUQSwgT1IK KyAqIFBST0ZJVFM7IE9SIEJVU0lORVNTIElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5E IE9OIEFOWSBUSEVPUlkKKyAqIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTiBDT05UUkFDVCwgU1RS SUNUIExJQUJJTElUWSwgT1IgVE9SVAorICogKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVS V0lTRSkgQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFCisgKiBPRiBUSElTIFNPRlRX QVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgor ICovCisKK2NsYXNzIEZvcm1hdHRpbmdTdGF0ZSB7CisgICAgY29uc3RydWN0b3IobGF5b3V0Q29u dGV4dCkgeworICAgICAgICB0aGlzLm1fbGF5b3V0Q29udGV4dCA9IGxheW91dENvbnRleHQ7Cisg ICAgICAgIHRoaXMubV9mb3JtYXR0aW5nQ29udGV4dCA9IG51bGw7CisgICAgfQorCisgICAgZm9y bWF0dGluZ0NvbnRleHQoKSB7CisgICAgICAgIHJldHVybiB0aGlzLm1fZm9ybWF0dGluZ0NvbnRl eHQ7CisgICAgfQorCisgICAgbGF5b3V0Q29udGV4dCgpIHsKKyAgICAgICAgcmV0dXJuIHRoaXMu bV9sYXlvdXRDb250ZXh0OworICAgIH0KKworICAgIF9zZXRGb3JtYXR0aW5nQ29udGV4dChmb3Jt YXR0aW5nQ29udGV4dCkgeworICAgICAgICB0aGlzLm1fZm9ybWF0dGluZ0NvbnRleHQgPSBmb3Jt YXR0aW5nQ29udGV4dDsKKyAgICB9Cit9CmRpZmYgLS1naXQgYS9Ub29scy9MYXlvdXRSZWxvYWRl ZC9Gb3JtYXR0aW5nU3RhdGUvSW5saW5lRm9ybWF0dGluZ1N0YXRlLmpzIGIvVG9vbHMvTGF5b3V0 UmVsb2FkZWQvRm9ybWF0dGluZ1N0YXRlL0lubGluZUZvcm1hdHRpbmdTdGF0ZS5qcwpuZXcgZmls ZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwLi5lNjdhOWI5NGNhMTliNDNmNjNhZGQ5NmYwNWY2ZmM5MjU0ZjRiNDgwCi0tLSAvZGV2L251 bGwKKysrIGIvVG9vbHMvTGF5b3V0UmVsb2FkZWQvRm9ybWF0dGluZ1N0YXRlL0lubGluZUZvcm1h dHRpbmdTdGF0ZS5qcwpAQCAtMCwwICsxLDMxIEBACisvKgorICogQ29weXJpZ2h0IChDKSAyMDE4 IEFwcGxlIEluYy4gQWxsIFJpZ2h0cyBSZXNlcnZlZC4KKyAqCisgKiBSZWRpc3RyaWJ1dGlvbiBh bmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKKyAqIG1v ZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29u ZGl0aW9ucworICogYXJlIG1ldDoKKyAqIDEuIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29k ZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlz dCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCisgKiAyLiBSZWRp c3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlIGNvcHly aWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxv d2luZyBkaXNjbGFpbWVyIGluIHRoZQorICogICAgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIg bWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4KKyAqCisgKiBUSElTIFNP RlRXQVJFIElTIFBST1ZJREVEIEJZIEFQUExFIElOQy4gYGBBUyBJUycnIEFORCBBTlkKKyAqIEVY UFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBU TywgVEhFCisgKiBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRO RVNTIEZPUiBBIFBBUlRJQ1VMQVIKKyAqIFBVUlBPU0UgQVJFIERJU0NMQUlNRUQuICBJTiBOTyBF VkVOVCBTSEFMTCBBUFBMRSBJTkMuIE9SCisgKiBDT05UUklCVVRPUlMgQkUgTElBQkxFIEZPUiBB TlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwgU1BFQ0lBTCwKKyAqIEVYRU1QTEFSWSwg T1IgQ09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywK KyAqIFBST0NVUkVNRU5UIE9GIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7IExPU1MgT0Yg VVNFLCBEQVRBLCBPUgorICogUFJPRklUUzsgT1IgQlVTSU5FU1MgSU5URVJSVVBUSU9OKSBIT1dF VkVSIENBVVNFRCBBTkQgT04gQU5ZIFRIRU9SWQorICogT0YgTElBQklMSVRZLCBXSEVUSEVSIElO IENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUCisgKiAoSU5DTFVESU5HIE5FR0xJ R0VOQ0UgT1IgT1RIRVJXSVNFKSBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UKKyAq IE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0Yg U1VDSCBEQU1BR0UuCisgKi8KKworY2xhc3MgSW5saW5lRm9ybWF0dGluZ1N0YXRlIGV4dGVuZHMg Rm9ybWF0dGluZ1N0YXRlIHsKKyAgICBjb25zdHJ1Y3Rvcihmb3JtYXR0aW5nUm9vdCwgbGF5b3V0 Q29udGV4dCkgeworICAgICAgICBzdXBlcihsYXlvdXRDb250ZXh0KTsKKyAgICAgICAgdGhpcy5f c2V0Rm9ybWF0dGluZ0NvbnRleHQobmV3IElubGluZUZvcm1hdHRpbmdDb250ZXh0KGZvcm1hdHRp bmdSb290LCB0aGlzKSk7CisgICAgfQorfQpkaWZmIC0tZ2l0IGEvVG9vbHMvTGF5b3V0UmVsb2Fk ZWQvTGF5b3V0Q29udGV4dC5qcyBiL1Rvb2xzL0xheW91dFJlbG9hZGVkL0xheW91dENvbnRleHQu anMKaW5kZXggYTdjZTg1ZWE4ZmY3ZTlmNWQ4ZTNhMjEyOWFlMTVkNmMwYTBiMmYyNy4uYjk4OWE4 YWQzYjcwOWM1YmNlNjZlY2UwZWZmZmIxMzMxMDJjMmM2OCAxMDA2NDQKLS0tIGEvVG9vbHMvTGF5 b3V0UmVsb2FkZWQvTGF5b3V0Q29udGV4dC5qcworKysgYi9Ub29scy9MYXlvdXRSZWxvYWRlZC9M YXlvdXRDb250ZXh0LmpzCkBAIC0yNSwxOSArMjUsMjEgQEAKIAogY2xhc3MgTGF5b3V0Q29udGV4 dCB7CiAgICAgY29uc3RydWN0b3IoKSB7CisgICAgICAgIHRoaXMubV9sYXlvdXRTdGF0ZXMgPSBu ZXcgTWFwKCk7CiAgICAgfQogCiAgICAgbGF5b3V0KGZvcm1hdHRpbmdSb290KSB7Ci0gICAgICAg IGxldCBmb3JtYXR0aW5nQ29udGV4dCA9IHRoaXMuX2NyZWF0ZUZvcm1hdHRpbmdDb250ZXh0KGZv cm1hdHRpbmdSb290KTsKLSAgICAgICAgZm9ybWF0dGluZ0NvbnRleHQubGF5b3V0KCk7CisgICAg ICAgIGxldCBmb3JtYXR0aW5nU3RhdGUgPSB0aGlzLl9jcmVhdGVGb3JtYXR0aW5nU3RhdGUoZm9y bWF0dGluZ1Jvb3QpOworICAgICAgICB0aGlzLm1fbGF5b3V0U3RhdGVzLnNldChmb3JtYXR0aW5n Um9vdCwgZm9ybWF0dGluZ1N0YXRlKTsKKyAgICAgICAgZm9ybWF0dGluZ1N0YXRlLmZvcm1hdHRp bmdDb250ZXh0KCkubGF5b3V0KCk7CiAgICAgfQogCi0gICAgX2NyZWF0ZUZvcm1hdHRpbmdDb250 ZXh0KGZvcm1hdHRpbmdSb290KSB7CisgICAgX2NyZWF0ZUZvcm1hdHRpbmdTdGF0ZShmb3JtYXR0 aW5nUm9vdCkgewogICAgICAgICBBU1NFUlQoZm9ybWF0dGluZ1Jvb3QuZXN0YWJsaXNoZXNGb3Jt YXR0aW5nQ29udGV4dCgpKTsKICAgICAgICAgaWYgKGZvcm1hdHRpbmdSb290LmVzdGFibGlzaGVz QmxvY2tGb3JtYXR0aW5nQ29udGV4dCgpKQotICAgICAgICAgICAgcmV0dXJuIG5ldyBCbG9ja0Zv cm1hdHRpbmdDb250ZXh0KGZvcm1hdHRpbmdSb290LCB0aGlzKTsKKyAgICAgICAgICAgIHJldHVy biBuZXcgQmxvY2tGb3JtYXR0aW5nU3RhdGUoZm9ybWF0dGluZ1Jvb3QsIHRoaXMpOwogICAgICAg ICBpZiAoZm9ybWF0dGluZ1Jvb3QuZXN0YWJsaXNoZXNJbmxpbmVGb3JtYXR0aW5nQ29udGV4dCgp KQotICAgICAgICAgICAgcmV0dXJuIG5ldyBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dChmb3JtYXR0 aW5nUm9vdCwgdGhpcyk7CisgICAgICAgICAgICByZXR1cm4gbmV3IElubGluZUZvcm1hdHRpbmdT dGF0ZShmb3JtYXR0aW5nUm9vdCwgdGhpcyk7CiAgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgp OwogICAgICAgICByZXR1cm4gbnVsbDsKICAgICB9CmRpZmYgLS1naXQgYS9Ub29scy9MYXlvdXRS ZWxvYWRlZC9MYXlvdXRSZWxvYWRlZC54Y3dvcmtzcGFjZS9jb250ZW50cy54Y3dvcmtzcGFjZWRh dGEgYi9Ub29scy9MYXlvdXRSZWxvYWRlZC9MYXlvdXRSZWxvYWRlZC54Y3dvcmtzcGFjZS9jb250 ZW50cy54Y3dvcmtzcGFjZWRhdGEKaW5kZXggNjc4M2ZiYjgyOGU5ZWNlOGY4MmRiNmNiZWZjZWVl MTUzMmE2ZTA2Yi4uNzhmYjFmZWYyZmM0ZGU1ZGRjYWE0ZDZkM2FmMDllYmQ3ZTQwMGU5ZiAxMDA2 NDQKLS0tIGEvVG9vbHMvTGF5b3V0UmVsb2FkZWQvTGF5b3V0UmVsb2FkZWQueGN3b3Jrc3BhY2Uv Y29udGVudHMueGN3b3Jrc3BhY2VkYXRhCisrKyBiL1Rvb2xzL0xheW91dFJlbG9hZGVkL0xheW91 dFJlbG9hZGVkLnhjd29ya3NwYWNlL2NvbnRlbnRzLnhjd29ya3NwYWNlZGF0YQpAQCAtNSwxMyAr NSwxMCBAQAogICAgICAgbG9jYXRpb24gPSAiZ3JvdXA6RGlzcGxheVRyZWUiPgogICAgPC9GaWxl UmVmPgogICAgPEZpbGVSZWYKLSAgICAgIGxvY2F0aW9uID0gImdyb3VwOnRlc3QiPgotICAgPC9G aWxlUmVmPgotICAgPEZpbGVSZWYKLSAgICAgIGxvY2F0aW9uID0gImdyb3VwOm1pc2MiPgorICAg ICAgbG9jYXRpb24gPSAiZ3JvdXA6Rm9ybWF0dGluZ0NvbnRleHQiPgogICAgPC9GaWxlUmVmPgog ICAgPEZpbGVSZWYKLSAgICAgIGxvY2F0aW9uID0gImdyb3VwOkZvcm1hdHRpbmdDb250ZXh0Ij4K KyAgICAgIGxvY2F0aW9uID0gImdyb3VwOkZvcm1hdHRpbmdTdGF0ZSI+CiAgICA8L0ZpbGVSZWY+ CiAgICA8RmlsZVJlZgogICAgICAgbG9jYXRpb24gPSAiZ3JvdXA6TGF5b3V0VHJlZSI+CkBAIC0z MSw0ICsyOCwxMCBAQAogICAgPEZpbGVSZWYKICAgICAgIGxvY2F0aW9uID0gImdyb3VwOlRyZWVC dWlsZGVyLmpzIj4KICAgIDwvRmlsZVJlZj4KKyAgIDxGaWxlUmVmCisgICAgICBsb2NhdGlvbiA9 ICJncm91cDp0ZXN0Ij4KKyAgIDwvRmlsZVJlZj4KKyAgIDxGaWxlUmVmCisgICAgICBsb2NhdGlv biA9ICJncm91cDptaXNjIj4KKyAgIDwvRmlsZVJlZj4KIDwvV29ya3NwYWNlPgpkaWZmIC0tZ2l0 IGEvVG9vbHMvTGF5b3V0UmVsb2FkZWQvdGVzdC9pbmRleC5odG1sIGIvVG9vbHMvTGF5b3V0UmVs b2FkZWQvdGVzdC9pbmRleC5odG1sCmluZGV4IGEyYzkxYTFjNjcwYzEzYTU1NTczODBhNWMzMGZk NWJjNWYzNWZmOTQuLmExYWM4MTQ4NzBjYTBjZDBjNzUzZDkxODkyZTRiMzA3OWMxOTAxMjAgMTAw NjQ0Ci0tLSBhL1Rvb2xzL0xheW91dFJlbG9hZGVkL3Rlc3QvaW5kZXguaHRtbAorKysgYi9Ub29s cy9MYXlvdXRSZWxvYWRlZC90ZXN0L2luZGV4Lmh0bWwKQEAgLTg1LDYgKzg1LDkgQEAgYWRkSlMo Ii4uL0xheW91dFRyZWUvSW5pdGlhbEJsb2NrQ29udGFpbmVyLmpzIik7CiBhZGRKUygiLi4vTGF5 b3V0VHJlZS9JbmxpbmVCb3guanMiKTsKIGFkZEpTKCIuLi9MYXlvdXRUcmVlL1RleHQuanMiKTsK IGFkZEpTKCIuLi9EaXNwbGF5VHJlZS9Cb3guanMiKTsKK2FkZEpTKCIuLi9Gb3JtYXR0aW5nU3Rh dGUvRm9ybWF0dGluZ1N0YXRlLmpzIik7CithZGRKUygiLi4vRm9ybWF0dGluZ1N0YXRlL0Jsb2Nr Rm9ybWF0dGluZ1N0YXRlLmpzIik7CithZGRKUygiLi4vRm9ybWF0dGluZ1N0YXRlL0lubGluZUZv cm1hdHRpbmdTdGF0ZS5qcyIpOwogYWRkSlMoIi4uL0Zvcm1hdHRpbmdDb250ZXh0L0Zvcm1hdHRp bmdDb250ZXh0LmpzIik7CiBhZGRKUygiLi4vRm9ybWF0dGluZ0NvbnRleHQvRmxvYXRpbmdDb250 ZXh0LmpzIik7CiBhZGRKUygiLi4vRm9ybWF0dGluZ0NvbnRleHQvQmxvY2tGb3JtYXR0aW5nL0Js b2NrRm9ybWF0dGluZ0NvbnRleHQuanMiKTsK