184621 2018-04-13 20:12:09 -0700 [LayoutReloaded] Add simple implementation for FormattingState::markNeedsLayout() 2018-04-13 20:23: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 1414595 0 zalan 2018-04-13 20:12:09 -0700 ssia 1414598 1 337953 zalan 2018-04-13 20:15:05 -0700 Created attachment 337953 Patch 1414599 2 zalan 2018-04-13 20:22:05 -0700 Committed r230655: <https://trac.webkit.org/changeset/230655> 1414600 3 webkit-bug-importer 2018-04-13 20:23:18 -0700 <rdar://problem/39431713> 337953 2018-04-13 20:15:05 -0700 2018-04-13 20:15:05 -0700 Patch bug-184621-20180413201504.patch text/plain 10495 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjMwNjQyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNjgwNzRkNzBmNzYwMTk5ZTVkZjA2NmFhMTQyYmU4YWZh MDNmNzFkNi4uNmIwYzg5NWI3YTNkNmFjNDYxOTE2Y2E3ZDFlMjg0Yjg1ZWNkNjg2YSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2 IEBACisyMDE4LTA0LTEzICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAg ICAgW0xheW91dFJlbG9hZGVkXSBBZGQgc2ltcGxlIGltcGxlbWVudGF0aW9uIGZvciBGb3JtYXR0 aW5nU3RhdGU6Om1hcmtOZWVkc0xheW91dCgpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xODQ2MjEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBUaGlzIGlzIGp1c3QgYSBzaW1wbGUsIG1hcmsgYW5jZXN0b3Jz IGRpcnR5IGltcGxlbWVudGF0aW9uLgorCisgICAgICAgICogTGF5b3V0UmVsb2FkZWQvRm9ybWF0 dGluZ1N0YXRlL0Zvcm1hdHRpbmdTdGF0ZS5qczoKKyAgICAgICAgKEZvcm1hdHRpbmdTdGF0ZS5w cm90b3R5cGUubWFya05lZWRzTGF5b3V0KToKKyAgICAgICAgKiBMYXlvdXRSZWxvYWRlZC9MYXlv dXRTdGF0ZS5qczoKKyAgICAgICAgKExheW91dFN0YXRlLnByb3RvdHlwZS5tYXJrTmVlZHNMYXlv dXQpOgorICAgICAgICAoTGF5b3V0U3RhdGUucHJvdG90eXBlLnNldE5lZWRzTGF5b3V0QnlJZCk6 IERlbGV0ZWQuCisgICAgICAgIChMYXlvdXRTdGF0ZS5wcm90b3R5cGUuc2V0TmVlZHNMYXlvdXQp OiBEZWxldGVkLgorICAgICAgICAqIExheW91dFJlbG9hZGVkL1RyZWVCdWlsZGVyLmpzOgorICAg ICAgICAoVHJlZUJ1aWxkZXIucHJvdG90eXBlLl9jcmVhdGVBbmRBdHRhY2hCb3gpOgorICAgICAg ICAoVHJlZUJ1aWxkZXIucHJvdG90eXBlLl9maW5kQm94KTogRGVsZXRlZC4KKyAgICAgICAgKiBM YXlvdXRSZWxvYWRlZC9VdGlscy5qczoKKyAgICAgICAgKFV0aWxzLmxheW91dEJveEJ5SWQpOgor ICAgICAgICAqIExheW91dFJlbG9hZGVkL3Rlc3QvaW5kZXguaHRtbDoKKyAgICAgICAgKiBMYXlv dXRSZWxvYWRlZC90ZXN0L3NpbXBsZS1pbmNyZW1lbnRhbC1sYXlvdXQtd2l0aC1zdGF0aWMtY29u dGVudC5odG1sOgorCiAyMDE4LTA0LTEzICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+ CiAKICAgICAgICAgUmViYXNlbGluZSBMYXlvdXRSZWxvYWRlZCBwYXRjaCBmaWxlIChjb2xsZWN0 UmVuZGVyZXJzV2l0aE5lZWRzTGF5b3V0KS4KZGlmZiAtLWdpdCBhL1Rvb2xzL0xheW91dFJlbG9h ZGVkL0Zvcm1hdHRpbmdTdGF0ZS9Gb3JtYXR0aW5nU3RhdGUuanMgYi9Ub29scy9MYXlvdXRSZWxv YWRlZC9Gb3JtYXR0aW5nU3RhdGUvRm9ybWF0dGluZ1N0YXRlLmpzCmluZGV4IDUyMDA2MjVkMjZk OWI5YTE2ZmE1MjJlNTk1MWFkZjdlY2E0NjVmMTUuLmIzOTY3OThlNzE1YmJhMDgzYWYzYWRlOWIy MGEzNTViZTdjMGRhMjIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0xheW91dFJlbG9hZGVkL0Zvcm1hdHRp bmdTdGF0ZS9Gb3JtYXR0aW5nU3RhdGUuanMKKysrIGIvVG9vbHMvTGF5b3V0UmVsb2FkZWQvRm9y bWF0dGluZ1N0YXRlL0Zvcm1hdHRpbmdTdGF0ZS5qcwpAQCAtODAsNyArODAsMTkgQEAgY2xhc3Mg Rm9ybWF0dGluZ1N0YXRlIHsKICAgICB9CiAKICAgICBtYXJrTmVlZHNMYXlvdXQobGF5b3V0Qm94 KSB7CisgICAgICAgIC8vIE5ldmVyIG1hcmsgdGhlIGZvcm1hdHRpbmcgcm9vdCBkaXJ0eS4gSXQg YmVsb25ncyB0byB0aGUgcGFyZW50IGZvcm1hdHRpbmcgY29udGV4dCAob3Igbm9uZSBpZiBJQ0Ip LgorICAgICAgICBBU1NFUlQobGF5b3V0Qm94ICE9IHRoaXMuZm9ybWF0dGluZ1Jvb3QoKSk7CiAg ICAgICAgIHRoaXMubV9uZWVkc0xheW91dEJveExpc3Quc2V0KGxheW91dEJveCk7CisgICAgICAg IC8vIEZJWE1FOiBMZXQncyBqdXN0IG1hcmsgYWxsIHRoZSBhbmNlc3RvcnMgZGlydHkgaW4gdGhp cyBmb3JtYXR0aW5nIHNjb3BlLgorICAgICAgICBsZXQgY29udGFpbmluZ0Jsb2NrID0gbGF5b3V0 Qm94LmNvbnRhaW5pbmdCbG9jaygpOworICAgICAgICBpZiAoIWNvbnRhaW5pbmdCbG9jayB8fCBj b250YWluaW5nQmxvY2sgPT0gdGhpcy5mb3JtYXR0aW5nUm9vdCgpKQorICAgICAgICAgICAgcmV0 dXJuOworICAgICAgICBpZiAoIUZvcm1hdHRpbmdDb250ZXh0LmlzSW5Gb3JtYXR0aW5nQ29udGV4 dChjb250YWluaW5nQmxvY2ssIHRoaXMuZm9ybWF0dGluZ1Jvb3QoKSkpCisgICAgICAgICAgICBy ZXR1cm47CisgICAgICAgIGlmICh0aGlzLm5lZWRzTGF5b3V0KGNvbnRhaW5pbmdCbG9jaykpCisg ICAgICAgICAgICByZXR1cm47CisKKyAgICAgICAgdGhpcy5tYXJrTmVlZHNMYXlvdXQoY29udGFp bmluZ0Jsb2NrKTsKICAgICB9CiAKICAgICBjbGVhck5lZWRzTGF5b3V0KGxheW91dEJveCkgewpk aWZmIC0tZ2l0IGEvVG9vbHMvTGF5b3V0UmVsb2FkZWQvTGF5b3V0U3RhdGUuanMgYi9Ub29scy9M YXlvdXRSZWxvYWRlZC9MYXlvdXRTdGF0ZS5qcwppbmRleCA5YTIwZTk3NGY5OWU1NDE3ODg2Y2Zm OTFmM2MyODQ0YmNiZTU0MmVlLi41MWU5NTI0YmZiODlmMWY4ZTY2MWVmYmI1NDdjMmY0NGM0NWNm ODk1IDEwMDY0NAotLS0gYS9Ub29scy9MYXlvdXRSZWxvYWRlZC9MYXlvdXRTdGF0ZS5qcworKysg Yi9Ub29scy9MYXlvdXRSZWxvYWRlZC9MYXlvdXRTdGF0ZS5qcwpAQCAtNjEsMTYgKzYxLDEyIEBA IGNsYXNzIExheW91dFN0YXRlIHsKICAgICAgICAgcmV0dXJuIG51bGw7CiAgICAgfQogCi0gICAg Ly8gVGhpcyBpcyBmb3IgdGVzdGluZyBvbmx5LgotICAgIHNldE5lZWRzTGF5b3V0QnlJZChsYXlv dXRCb3hJZCkgewotICAgIH0KLQotICAgIHNldE5lZWRzTGF5b3V0KGxheW91dEJveCkgeworICAg IG1hcmtOZWVkc0xheW91dChsYXlvdXRCb3gpIHsKICAgICAgICAgbGV0IGZvcm1hdHRpbmdTdGF0 ZSA9IHRoaXMuZm9ybWF0dGluZ1N0YXRlRm9yQm94KGxheW91dEJveCk7CiAgICAgICAgIC8vIE5l d2x5IGNyZWF0ZWQgZm9ybWF0dGluZyBzdGF0ZSB3aWxsIG9idmlvdXNseSBtYXJrIGFsbCB0aGUg Ym94ZXMgZGlydHkuCiAgICAgICAgIGlmICghZm9ybWF0dGluZ1N0YXRlKQogICAgICAgICAgICAg cmV0dXJuOwotICAgICAgICBmb3JtYXR0aW5nU3RhdGUuc2V0TmVlZHNMYXlvdXQobGF5b3V0Qm94 KTsKKyAgICAgICAgZm9ybWF0dGluZ1N0YXRlLm1hcmtOZWVkc0xheW91dChsYXlvdXRCb3gpOwog ICAgIH0KIAogICAgIG5lZWRzTGF5b3V0KCkgewpkaWZmIC0tZ2l0IGEvVG9vbHMvTGF5b3V0UmVs b2FkZWQvVHJlZUJ1aWxkZXIuanMgYi9Ub29scy9MYXlvdXRSZWxvYWRlZC9UcmVlQnVpbGRlci5q cwppbmRleCA1MDQ0ZmE4ZWQxMzUzMDVjZTIyN2U1NmM5N2E2NWE3Y2Y0OGQ1YTU2Li5kMTljMjZh MzRjN2Q5MTI5NTU1MmM4NjgxYjM0ODIwNjRlZmMzNTk4IDEwMDY0NAotLS0gYS9Ub29scy9MYXlv dXRSZWxvYWRlZC9UcmVlQnVpbGRlci5qcworKysgYi9Ub29scy9MYXlvdXRSZWxvYWRlZC9UcmVl QnVpbGRlci5qcwpAQCAtNjQsNyArNjQsNyBAQCBjbGFzcyBUcmVlQnVpbGRlciB7CiAgICAgICAg IGlmIChib3gpCiAgICAgICAgICAgICBib3guc2V0UmVuZGVyZXJOYW1lKG5hbWUpOwogCi0gICAg ICAgIGxldCBwYXJlbnRCb3ggPSB0aGlzLl9maW5kQm94KGluaXRpYWxCbG9ja0NvbnRhaW5lciwg cGFyZW50SWQpOworICAgICAgICBsZXQgcGFyZW50Qm94ID0gVXRpbHMubGF5b3V0Qm94QnlJZChw YXJlbnRJZCwgaW5pdGlhbEJsb2NrQ29udGFpbmVyKTsKICAgICAgICAgLy8gV2ViS2l0IGRvZXMg bm90IGNvbnN0cnVjdCBhbm9ueW1vdXMgaW5saW5lIGNvbnRhaW5lciBmb3IgdGV4dCBpZiB0aGUg dGV4dAogICAgICAgICAvLyBpcyBhIGRpcmVjdCBjaGlsZCBvZiBhIGJsb2NrIGNvbnRhaW5lci4K ICAgICAgICAgaWYgKHRleHQpIHsKQEAgLTkwLDIxICs5MCw2IEBAIGNsYXNzIFRyZWVCdWlsZGVy IHsKICAgICAgICAgcGFyZW50LnNldExhc3RDaGlsZChjaGlsZCk7CiAgICAgfQogCi0gICAgX2Zp bmRCb3gocm9vdCwgYm94SWQpIHsKLSAgICAgICAgaWYgKHJvb3QuaWQoKSA9PSBib3hJZCkKLSAg ICAgICAgICAgIHJldHVybiByb290OwotICAgICAgICAvLyBTdXBlciBpbmVmZmljaWVudCBidXQg dGhpcyBpcyBhbGwgdGVtcG9yYXJ5IGFueXdheS4KLSAgICAgICAgZm9yIChsZXQgYm94ID0gcm9v dC5maXJzdENoaWxkKCk7IGJveDsgYm94ID0gYm94Lm5leHRTaWJsaW5nKCkpIHsKLSAgICAgICAg ICAgIGlmIChib3guaWQoKSA9PSBib3hJZCkKLSAgICAgICAgICAgICAgICByZXR1cm4gYm94Owot ICAgICAgICAgICAgaWYgKGJveC5pc0NvbnRhaW5lcigpICYmIGJveC5oYXNDaGlsZCgpKSB7Ci0g ICAgICAgICAgICAgICAgbGV0IGNhbmRpZGF0ZSA9IHRoaXMuX2ZpbmRCb3goYm94LCBib3hJZCk7 Ci0gICAgICAgICAgICAgICAgaWYgKGNhbmRpZGF0ZSkKLSAgICAgICAgICAgICAgICAgICAgcmV0 dXJuIGNhbmRpZGF0ZTsKLSAgICAgICAgICAgIH0KLSAgICAgICAgfQotICAgIH0KLQogICAgIF9m aW5kTm9kZShub2RlLCBib3hJZCkgewogICAgICAgICAvLyBTdXBlciBpbmVmZmljaWVudCBidXQg dGhpcyBpcyBhbGwgdGVtcG9yYXJ5IGFueXdheS4KICAgICAgICAgZm9yIChsZXQgY3VycmVudE5v ZGUgPSBub2RlLmZpcnN0Q2hpbGQ7IGN1cnJlbnROb2RlOyBjdXJyZW50Tm9kZSA9IGN1cnJlbnRO b2RlLm5leHRTaWJsaW5nKSB7CmRpZmYgLS1naXQgYS9Ub29scy9MYXlvdXRSZWxvYWRlZC9VdGls cy5qcyBiL1Rvb2xzL0xheW91dFJlbG9hZGVkL1V0aWxzLmpzCmluZGV4IDg4YWJmYjQ3YTVlMGVi OGNjYjNkODcxNDc5NThhMjM1MTY3NjYzMDcuLmZlYzA5MTA4MDAzNjUwNjBiYjE3M2NhZDUxMDc3 M2I3ZmM0NmM4YWIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0xheW91dFJlbG9hZGVkL1V0aWxzLmpzCisr KyBiL1Rvb2xzL0xheW91dFJlbG9hZGVkL1V0aWxzLmpzCkBAIC01NDgsNiArNTQ4LDIxIEBAIGNs YXNzIFV0aWxzIHsKICAgICAgICAgcmV0dXJuIHRleHRCb3gudGV4dCgpLm5vZGUoKS50ZXh0SGVp Z2h0KCk7CiAgICAgfQogCisgICAgc3RhdGljIGxheW91dEJveEJ5SWQobGF5b3V0Qm94SWQsIGJv eCkgeworICAgICAgICBpZiAoYm94LmlkKCkgPT0gbGF5b3V0Qm94SWQpCisgICAgICAgICAgICBy ZXR1cm4gYm94OworICAgICAgICBpZiAoIWJveC5pc0NvbnRhaW5lcigpKQorICAgICAgICAgICAg cmV0dXJuIG51bGw7CisgICAgICAgIC8vIFN1cGVyIGluZWZmaWNpZW50IGJ1dCB0aGlzIGlzIGFs bCB0ZW1wb3JhcnkgYW55d2F5LgorICAgICAgICBmb3IgKGxldCBjaGlsZCA9IGJveC5maXJzdENo aWxkKCk7IGNoaWxkOyBjaGlsZCA9IGNoaWxkLm5leHRTaWJsaW5nKCkpIHsKKyAgICAgICAgICAg IGlmIChjaGlsZC5pZCgpID09IGxheW91dEJveElkKQorICAgICAgICAgICAgICAgIHJldHVybiBj aGlsZDsKKyAgICAgICAgICAgIGxldCBmb3VuZEl0ID0gVXRpbHMubGF5b3V0Qm94QnlJZChsYXlv dXRCb3hJZCwgY2hpbGQpOworICAgICAgICAgICAgaWYgKGZvdW5kSXQpCisgICAgICAgICAgICAg ICAgcmV0dXJuIGZvdW5kSXQ7CisgICAgICAgIH0KKyAgICAgICAgcmV0dXJuIG51bGw7CisgICAg fQogICAgIC8vICJSZW5kZXJWaWV3IGF0ICgwLDApIHNpemUgMTMxN3gzNjZcbiBIVE1MIFJlbmRl ckJsb2NrIGF0ICgwLDApIHNpemUgMTMxN3gxMTZcbiAgQk9EWSBSZW5kZXJCb2R5IGF0ICg4LDgp IHNpemUgMTMwMXgxMDBcbiAgIERJViBSZW5kZXJCbG9jayBhdCAoMCwwKSBzaXplIDEwMHgxMDBc biI7CiAgICAgc3RhdGljIGxheW91dFRyZWVEdW1wKGxheW91dFN0YXRlKSB7CiAgICAgICAgIHJl dHVybiB0aGlzLl9kdW1wQm94KGxheW91dFN0YXRlLCBsYXlvdXRTdGF0ZS5yb290Q29udGFpbmVy KCksIDEpICsgdGhpcy5fZHVtcFRyZWUobGF5b3V0U3RhdGUsIGxheW91dFN0YXRlLnJvb3RDb250 YWluZXIoKSwgMik7CmRpZmYgLS1naXQgYS9Ub29scy9MYXlvdXRSZWxvYWRlZC90ZXN0L2luZGV4 Lmh0bWwgYi9Ub29scy9MYXlvdXRSZWxvYWRlZC90ZXN0L2luZGV4Lmh0bWwKaW5kZXggNmQ0NzE3 NzQzODNmYmUyYTY0MDA3MTgwODY0Mjc2Nzg0MGZjMmQ5Ni4uYzY2M2U1ZmRkYTZlNjU0MDAwNWVh NjE0NjZkNGExNjgwNjA1OGMzNSAxMDA2NDQKLS0tIGEvVG9vbHMvTGF5b3V0UmVsb2FkZWQvdGVz dC9pbmRleC5odG1sCisrKyBiL1Rvb2xzL0xheW91dFJlbG9hZGVkL3Rlc3QvaW5kZXguaHRtbApA QCAtMTIxLDE1ICsxMjEsMTIgQEAgbGV0IGZhaWxlZFRlc3RzID0gbmV3IEFycmF5KCk7CiAKIGxl dCBpc1J1bm5pbmdBc3luY1Rlc3QgPSBmYWxzZTsKIGxldCB0ZXN0czsKK2xldCB0ZXN0c1Bhc3Nl ZCA9IDA7CiBsZXQgY3VycmVudFRlc3RJbmRleCA9IDA7CiBsZXQgc3ViVGVzdHMgPSAwOworbGV0 IHN1YlRlc3RQYXNzZWQgPSB0cnVlOwogbGV0IGxheW91dFN0YXRlID0gbnVsbDsKIAotZnVuY3Rp b24gY29sbGVjdFJlbmRlcmVyc1dpdGhOZWVkc0xheW91dCgpIHsKLSAgICAvLyBUT0RPOiBpbXBs ZW1lbnQgaXQgaW4gV2ViS2l0LgotICAgIHJldHVybiBudWxsOwotfQotCiBmdW5jdGlvbiBydW5B bmRWZXJpZnlMYXlvdXQod2luZG93KSB7CiAgICAgbGF5b3V0U3RhdGUgPSBydW5MYXlvdXQod2lu ZG93LCBsYXlvdXRTdGF0ZSk7CiAgICAgcmV0dXJuIHZlcmlmeUxheW91dCh3aW5kb3cuc2ltcGxp ZmllZFJlbmRlclRyZWUpOwpAQCAtMTQyLDIyICsxMzksMjkgQEAgY2xhc3MgVGVzdFJ1bm5lciB7 CiAKICAgICBub3RpZnlEb25lKCkgewogICAgICAgICBsZXQgdGVzdEZyYW1lID0gZG9jdW1lbnQu Z2V0RWxlbWVudEJ5SWQoInRlc3RGcmFtZSIpOwotICAgICAgICBsZXQgcGFzc2VkID0gcnVuQW5k VmVyaWZ5TGF5b3V0KHRlc3RGcmFtZS5jb250ZW50V2luZG93KTsKLSAgICAgICAgZmluaXNoQW5k TW92ZVRvTmV4dFRlc3QocGFzc2VkKTsKKyAgICAgICAgQVNTRVJUKHN1YlRlc3RzKTsKKyAgICAg ICAgZmluaXNoQW5kTW92ZVRvTmV4dFRlc3Qoc3ViVGVzdFBhc3NlZCk7CiAgICAgfQogCiAgICAg Zm9yY2VMYXlvdXQoKSB7CiAgICAgICAgIGxldCB0ZXN0RnJhbWUgPSBkb2N1bWVudC5nZXRFbGVt ZW50QnlJZCgidGVzdEZyYW1lIik7Ci0gICAgICAgIGxldCBuZWVkc0xheW91dFJlbmRlcmVycyA9 IGNvbGxlY3RSZW5kZXJlcnNXaXRoTmVlZHNMYXlvdXQoKTsgLy90ZXN0RnJhbWUuY29udGVudFdp bmRvdy5jb2xsZWN0UmVuZGVyZXJzV2l0aE5lZWRzTGF5b3V0KCk7CisgICAgICAgIGxldCBuZWVk c0xheW91dFJlbmRlcmVycyA9IHRlc3RGcmFtZS5jb250ZW50V2luZG93LmNvbGxlY3RSZW5kZXJl cnNXaXRoTmVlZHNMYXlvdXQoKTsKICAgICAgICAgdGVzdEZyYW1lLmNvbnRlbnRXaW5kb3cuZG9j dW1lbnQuYm9keS5vZmZzZXRXaWR0aDsKICAgICAgICAgaWYgKGxheW91dFN0YXRlKSB7Ci0gICAg ICAgICAgICBmb3IgKGxldCByZW5kZXJlcklkIG9mIG5lZWRzTGF5b3V0UmVuZGVyZXJzKQotICAg ICAgICAgICAgICAgIGxheW91dFN0YXRlLnNldE5lZWRzTGF5b3V0QnlJZChyZW5kZXJlcklkKTsK KyAgICAgICAgICAgIC8vIEZpbmRpbmcgYm94IGJ5IGlkIHdvbid0IHdvcmsgdW5sZXNzIHRoaXMg aXMgSUNCJ3MgbGF5b3V0IHN0YXRlLgorICAgICAgICAgICAgQVNTRVJUKCFsYXlvdXRTdGF0ZS5y b290Q29udGFpbmVyKCkucGFyZW50KCkpOworICAgICAgICAgICAgZm9yIChsZXQgcmVuZGVyZXJJ ZCBvZiBuZWVkc0xheW91dFJlbmRlcmVycykgeworICAgICAgICAgICAgICAgIGxldCBsYXlvdXRC b3ggPSBVdGlscy5sYXlvdXRCb3hCeUlkKHJlbmRlcmVySWQsIGxheW91dFN0YXRlLnJvb3RDb250 YWluZXIoKSk7CisgICAgICAgICAgICAgICAgbGF5b3V0U3RhdGUubWFya05lZWRzTGF5b3V0KGxh eW91dEJveCk7CisgICAgICAgICAgICB9CiAgICAgICAgIH0KICAgICAgICAgbGV0IHBhc3NlZCA9 IHJ1bkFuZFZlcmlmeUxheW91dCh0ZXN0RnJhbWUuY29udGVudFdpbmRvdyk7CiAgICAgICAgICsr c3ViVGVzdHM7Ci0gICAgICAgIGlmICghcGFzc2VkICYmIGZhaWxlZFRlc3RzLmluZGV4T2YoY3Vy cmVudFRlc3RJbmRleCkgPT0gLTEpCi0gICAgICAgICAgICBmYWlsZWRUZXN0cy5wdXNoKGN1cnJl bnRUZXN0SW5kZXgpOworICAgICAgICBpZiAoIXBhc3NlZCkgeworICAgICAgICAgICAgc3ViVGVz dFBhc3NlZCA9IGZhbHNlOworICAgICAgICAgICAgaWYgKGZhaWxlZFRlc3RzLmluZGV4T2YoY3Vy cmVudFRlc3RJbmRleCkgPT0gLTEpCisgICAgICAgICAgICAgICAgZmFpbGVkVGVzdHMucHVzaChj dXJyZW50VGVzdEluZGV4KTsKKyAgICAgICAgfQogICAgICAgICBwcmludEludGVybWVkaWF0ZVJl c3VsdCgpOwogICAgIH0KIApAQCAtMTc2LDggKzE4MCw4IEBAIGZ1bmN0aW9uIHByaW50RmluYWxS ZXN1bHQoKSB7CiB9CiAKIGZ1bmN0aW9uIHByaW50SW50ZXJtZWRpYXRlUmVzdWx0KCkgewotICAg IGxldCByZXN1bHRDb250ZW50ID0gIlRlc3RpbmcuLi4iICsgY3VycmVudFRlc3RJbmRleCArIChz dWJUZXN0cyA+IDAgPyAiKCIgKyBzdWJUZXN0cyArICIpIiA6ICIiKSArICIgb3V0IG9mICIgKyB0 ZXN0cy5sZW5ndGg7Ci0gICAgcmVzdWx0Q29udGVudCArPSAiPGJyPjxicj5QYXNzZWQ6ICIgKyAo Y3VycmVudFRlc3RJbmRleCAtIGZhaWxlZFRlc3RzLmxlbmd0aCkgKyAiPGJyPkZhaWxlZDogIiAr IGZhaWxlZFRlc3RzLmxlbmd0aDsKKyAgICBsZXQgcmVzdWx0Q29udGVudCA9ICJUZXN0aW5nLi4u IiArIChjdXJyZW50VGVzdEluZGV4ICsgMSkgKyAoc3ViVGVzdHMgPiAwID8gIigiICsgc3ViVGVz dHMgKyAiKSIgOiAiIikgKyAiIG91dCBvZiAiICsgdGVzdHMubGVuZ3RoOworICAgIHJlc3VsdENv bnRlbnQgKz0gIjxicj48YnI+UGFzc2VkOiAiICsgdGVzdHNQYXNzZWQgKyAiPGJyPkZhaWxlZDog IiArIGZhaWxlZFRlc3RzLmxlbmd0aDsKICAgICBpZiAoZmFpbGVkVGVzdHMubGVuZ3RoID4gMCkg ewogICAgICAgICByZXN1bHRDb250ZW50ICs9ICI8YnI+PGJyPkZhaWxlZCBjYXNlczoiCiAgICAg ICAgIGZhaWxlZFRlc3RzLmZvckVhY2goZnVuY3Rpb24oaXRlbSkgewpAQCAtMTk0LDcgKzE5OCw5 IEBAIGZ1bmN0aW9uIGZpbmlzaEFuZE1vdmVUb05leHRUZXN0KHBhc3NlZCkgewogICAgIGxheW91 dFN0YXRlID0gbnVsbDsKICAgICBzdWJUZXN0cyA9IDA7CiAgICAgaXNSdW5uaW5nQXN5bmNUZXN0 ID0gZmFsc2U7Ci0gICAgaWYgKCFwYXNzZWQpCisgICAgaWYgKHBhc3NlZCkKKyAgICAgICAgKyt0 ZXN0c1Bhc3NlZDsKKyAgICBlbHNlIGlmIChmYWlsZWRUZXN0cy5pbmRleE9mKGN1cnJlbnRUZXN0 SW5kZXgpID09IC0xKQogICAgICAgICBmYWlsZWRUZXN0cy5wdXNoKGN1cnJlbnRUZXN0SW5kZXgp OwogICAgIHNldFRpbWVvdXQoZnVuY3Rpb24oKSB7CiAgICAgICAgIGlmIChjdXJyZW50VGVzdElu ZGV4IDwgdGVzdHMubGVuZ3RoIC0gMSkgewpkaWZmIC0tZ2l0IGEvVG9vbHMvTGF5b3V0UmVsb2Fk ZWQvdGVzdC9zaW1wbGUtaW5jcmVtZW50YWwtbGF5b3V0LXdpdGgtc3RhdGljLWNvbnRlbnQuaHRt bCBiL1Rvb2xzL0xheW91dFJlbG9hZGVkL3Rlc3Qvc2ltcGxlLWluY3JlbWVudGFsLWxheW91dC13 aXRoLXN0YXRpYy1jb250ZW50Lmh0bWwKaW5kZXggYWFjOGRkOTdkMmNkZjViN2Q1MDlkYmYwMGIx NWIxNjgyM2Y0MjRkNy4uZjM2MDIwODBhNTU2NzhmMWUxNWJlZjI4YzE2ZmU4OTI3YmVlYTNmMCAx MDA2NDQKLS0tIGEvVG9vbHMvTGF5b3V0UmVsb2FkZWQvdGVzdC9zaW1wbGUtaW5jcmVtZW50YWwt bGF5b3V0LXdpdGgtc3RhdGljLWNvbnRlbnQuaHRtbAorKysgYi9Ub29scy9MYXlvdXRSZWxvYWRl ZC90ZXN0L3NpbXBsZS1pbmNyZW1lbnRhbC1sYXlvdXQtd2l0aC1zdGF0aWMtY29udGVudC5odG1s CkBAIC0xLDE2ICsxLDIxIEBACiA8IURPQ1RZUEUgaHRtbD4KIDxodG1sPgogPGJvZHk+Ci08ZGl2 IHN0eWxlPSJ3aWR0aDogMTAwcHg7IGhlaWdodDogMTAwcHg7IGJvcmRlcjogMXB4IHNvbGlkIGdy ZWVuIj48L2Rpdj4KKzxkaXYgaWQ9Zm9vYmFyIHN0eWxlPSJ3aWR0aDogMTAwcHg7IGhlaWdodDog MTAwcHg7Ij48L2Rpdj4KIDxzY3JpcHQ+CitsZXQgZm9vYmFyV2lkdGggPSAyMDA7CiB0ZXN0UnVu bmVyLndhaXRVbnRpbERvbmUoKTsKK3Rlc3RSdW5uZXIuZm9yY2VMYXlvdXQoKTsKKwogc2V0SW50 ZXJ2YWwoZnVuY3Rpb24oKSB7CisgICAgZm9vYmFyLnN0eWxlLndpZHRoID0gZm9vYmFyV2lkdGgg KyAicHgiOwogICAgIHRlc3RSdW5uZXIuZm9yY2VMYXlvdXQoKTsKKyAgICBmb29iYXJXaWR0aCAr PSA1MDsKIH0sIDEwKTsKIAogc2V0VGltZW91dChmdW5jdGlvbigpIHsKICAgICB0ZXN0UnVubmVy Lm5vdGlmeURvbmUoKTsKLX0sIDEwMCk7Cit9LCA1MDApOwogPC9zY3JpcHQ+CiA8L2JvZHk+CiA8 L2h0bWw+Cg==