191099 2018-10-30 19:28:24 -0700 [LFC] FormattingContext class should take FormattingState& 2018-10-31 06:51:27 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1473576 0 zalan 2018-10-30 19:28:24 -0700 FormattingContext is a short lived stack object and it uses the FormattingState to preserve state. 1473583 1 353457 zalan 2018-10-30 19:31:52 -0700 Created attachment 353457 Patch 1473692 2 zalan 2018-10-31 06:50:13 -0700 Committed r237633: <https://trac.webkit.org/changeset/237633> 1473693 3 webkit-bug-importer 2018-10-31 06:51:27 -0700 <rdar://problem/45698978> 353457 2018-10-30 19:31:52 -0700 2018-10-31 05:50:33 -0700 Patch Patch.txt text/plain 14273 zalan ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBjMjdmZmNkYjJmMi4uMTY5ZThmZjZkOTYgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSw0MSBAQAorMjAxOC0xMC0zMCAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgor CisgICAgICAgIFtMRkNdIEZvcm1hdHRpbmdDb250ZXh0IGNsYXNzIHNob3VsZCB0YWtlIEZvcm1h dHRpbmdTdGF0ZSYKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTE5MTA5OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIFRoaXMgaXMgaW4gcHJlcGFyYXRpb24gZm9yIG5vdCBwYXNzaW5nIExheW91dFN0YXRlJiBp bnRvIGV2ZXJ5IGxheW91dCBmdW5jdGlvbnMuCisgICAgICAgIEZvcm1hdHRpbmdDb250ZXh0IGhh cyBGb3JtYXR0aW5nU3RhdGUgbm93IGFuZCBMYXlvdXRTdGF0ZSBjYW4gYmUgYWNxdWlyZWQgdGhy b3VnaCBGb3JtYXR0aW5nU3RhdGUuCisgICAgICAgIExheW91dFN0YXRlIDwtIEZvcm1hdHRpbmdT dGF0ZSA8LSBGb3JtYXR0aW5nQ29udGV4dCAKKworICAgICAgICAqIGxheW91dC9Gb3JtYXR0aW5n Q29udGV4dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkZvcm1hdHRpbmdDb250ZXh0 OjpGb3JtYXR0aW5nQ29udGV4dCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkZvcm1hdHRp bmdDb250ZXh0Ojpmb3JtYXR0aW5nU3RhdGUgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TGF5 b3V0OjpGb3JtYXR0aW5nQ29udGV4dDo6bGF5b3V0U3RhdGUgY29uc3QpOgorICAgICAgICAqIGxh eW91dC9Gb3JtYXR0aW5nQ29udGV4dC5oOgorICAgICAgICAqIGxheW91dC9Gb3JtYXR0aW5nU3Rh dGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpGb3JtYXR0aW5nU3RhdGU6OkZvcm1h dHRpbmdTdGF0ZSk6CisgICAgICAgICogbGF5b3V0L0Zvcm1hdHRpbmdTdGF0ZS5oOgorICAgICAg ICAoV2ViQ29yZTo6TGF5b3V0OjpGb3JtYXR0aW5nU3RhdGU6OmxheW91dFN0YXRlIGNvbnN0KToK KyAgICAgICAgKiBsYXlvdXQvTGF5b3V0Rm9ybWF0dGluZ1N0YXRlLmg6CisgICAgICAgICogbGF5 b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0LmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OkxheW91dDo6QmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6QmxvY2tGb3JtYXR0aW5n Q29udGV4dCk6CisgICAgICAgICogbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRp bmdDb250ZXh0Lmg6CisgICAgICAgICogbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1h dHRpbmdTdGF0ZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkJsb2NrRm9ybWF0dGlu Z1N0YXRlOjpCbG9ja0Zvcm1hdHRpbmdTdGF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6 OkJsb2NrRm9ybWF0dGluZ1N0YXRlOjpmb3JtYXR0aW5nQ29udGV4dCk6CisgICAgICAgIChXZWJD b3JlOjpMYXlvdXQ6OkJsb2NrRm9ybWF0dGluZ1N0YXRlOjpmb3JtYXR0aW5nQ29udGV4dCBjb25z dCk6IERlbGV0ZWQuCisgICAgICAgICogbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1h dHRpbmdTdGF0ZS5oOgorICAgICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZv cm1hdHRpbmdDb250ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lRm9y bWF0dGluZ0NvbnRleHQ6OklubGluZUZvcm1hdHRpbmdDb250ZXh0KToKKyAgICAgICAgKiBsYXlv dXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5oOgorICAgICAgICAq IGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdTdGF0ZS5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUZvcm1hdHRpbmdTdGF0ZTo6SW5saW5lRm9ybWF0 dGluZ1N0YXRlKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lRm9ybWF0dGluZ1N0 YXRlOjpmb3JtYXR0aW5nQ29udGV4dCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGlu ZUZvcm1hdHRpbmdTdGF0ZTo6Zm9ybWF0dGluZ0NvbnRleHQgY29uc3QpOiBEZWxldGVkLgorICAg ICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdTdGF0ZS5oOgor CiAyMDE4LTEwLTMwICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAg W0xGQ10gVGhlICpGb3JtYXR0aW5nU3RhdGUgY2xhc3Mgc2hvdWxkIHByb3ZpZGUgdGhlICpGb3Jt YXR0aW5nQ29udGV4dC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9Gb3JtYXR0 aW5nQ29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvRm9ybWF0dGluZ0NvbnRleHQu Y3BwCmluZGV4IGFjMTY1MmYxZjllLi4yOWY4MzJkNWRjMiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvRm9ybWF0dGluZ0NvbnRleHQuY3BwCkBAIC00Myw4ICs0Myw5IEBAIG5hbWVzcGFjZSBM YXlvdXQgewogCiBXVEZfTUFLRV9JU09fQUxMT0NBVEVEX0lNUEwoRm9ybWF0dGluZ0NvbnRleHQp OwogCi1Gb3JtYXR0aW5nQ29udGV4dDo6Rm9ybWF0dGluZ0NvbnRleHQoY29uc3QgQm94JiBmb3Jt YXR0aW5nQ29udGV4dFJvb3QpCitGb3JtYXR0aW5nQ29udGV4dDo6Rm9ybWF0dGluZ0NvbnRleHQo Y29uc3QgQm94JiBmb3JtYXR0aW5nQ29udGV4dFJvb3QsIEZvcm1hdHRpbmdTdGF0ZSYgZm9ybWF0 dGluZ1N0YXRlKQogICAgIDogbV9yb290KG1ha2VXZWFrUHRyKGZvcm1hdHRpbmdDb250ZXh0Um9v dCkpCisgICAgLCBtX2Zvcm1hdHRpbmdTdGF0ZShmb3JtYXR0aW5nU3RhdGUpCiB7CiB9CiAKQEAg LTUyLDYgKzUzLDE2IEBAIEZvcm1hdHRpbmdDb250ZXh0Ojp+Rm9ybWF0dGluZ0NvbnRleHQoKQog ewogfQogCitGb3JtYXR0aW5nU3RhdGUmIEZvcm1hdHRpbmdDb250ZXh0Ojpmb3JtYXR0aW5nU3Rh dGUoKSBjb25zdAoreworICAgIHJldHVybiBtX2Zvcm1hdHRpbmdTdGF0ZTsKK30KKworTGF5b3V0 U3RhdGUmIEZvcm1hdHRpbmdDb250ZXh0OjpsYXlvdXRTdGF0ZSgpIGNvbnN0Cit7CisgICAgcmV0 dXJuIG1fZm9ybWF0dGluZ1N0YXRlLmxheW91dFN0YXRlKCk7Cit9CisKIHZvaWQgRm9ybWF0dGlu Z0NvbnRleHQ6OmNvbXB1dGVPdXRPZkZsb3dIb3Jpem9udGFsR2VvbWV0cnkoTGF5b3V0U3RhdGUm IGxheW91dFN0YXRlLCBjb25zdCBCb3gmIGxheW91dEJveCkgY29uc3QKIHsKICAgICBhdXRvIGNv bXB1dGUgPSBbJl0oc3RkOjpvcHRpb25hbDxMYXlvdXRVbml0PiB1c2VkV2lkdGgpIHsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5nQ29udGV4dC5oIGIvU291cmNl L1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0LmgKaW5kZXggNDE5NWM5MzdlZGQuLjQ5 ZDg5MjY3OGZmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvRm9ybWF0dGluZ0Nv bnRleHQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvRm9ybWF0dGluZ0NvbnRleHQuaApA QCAtMjgsNyArMjgsNiBAQAogI2lmIEVOQUJMRShMQVlPVVRfRk9STUFUVElOR19DT05URVhUKQog CiAjaW5jbHVkZSAiRGlzcGxheUJveC5oIgotI2luY2x1ZGUgIkZsb2F0aW5nU3RhdGUuaCIKICNp bmNsdWRlIDx3dGYvSXNvTWFsbG9jLmg+CiAjaW5jbHVkZSA8d3RmL1dlYWtQdHIuaD4KIApAQCAt NDcsNyArNDYsNyBAQCBjbGFzcyBMYXlvdXRTdGF0ZTsKIGNsYXNzIEZvcm1hdHRpbmdDb250ZXh0 IHsKICAgICBXVEZfTUFLRV9JU09fQUxMT0NBVEVEKEZvcm1hdHRpbmdDb250ZXh0KTsKIHB1Ymxp YzoKLSAgICBGb3JtYXR0aW5nQ29udGV4dChjb25zdCBCb3gmIGZvcm1hdHRpbmdDb250ZXh0Um9v dCk7CisgICAgRm9ybWF0dGluZ0NvbnRleHQoY29uc3QgQm94JiBmb3JtYXR0aW5nQ29udGV4dFJv b3QsIEZvcm1hdHRpbmdTdGF0ZSYpOwogICAgIHZpcnR1YWwgfkZvcm1hdHRpbmdDb250ZXh0KCk7 CiAKICAgICB2aXJ0dWFsIHZvaWQgbGF5b3V0KExheW91dFN0YXRlJiwgRm9ybWF0dGluZ1N0YXRl JikgY29uc3QgPSAwOwpAQCAtNjYsNiArNjUsOCBAQCBwdWJsaWM6CiBwcm90ZWN0ZWQ6CiAgICAg dXNpbmcgTGF5b3V0UXVldWUgPSBWZWN0b3I8Y29uc3QgQm94Kj47CiAKKyAgICBGb3JtYXR0aW5n U3RhdGUmIGZvcm1hdHRpbmdTdGF0ZSgpIGNvbnN0OworICAgIExheW91dFN0YXRlJiBsYXlvdXRT dGF0ZSgpIGNvbnN0OwogICAgIGNvbnN0IEJveCYgcm9vdCgpIGNvbnN0IHsgcmV0dXJuICptX3Jv b3Q7IH0KIAogICAgIHZpcnR1YWwgdm9pZCBjb21wdXRlU3RhdGljUG9zaXRpb24oY29uc3QgTGF5 b3V0U3RhdGUmLCBjb25zdCBCb3gmKSBjb25zdCA9IDA7CkBAIC0xMjYsNiArMTI3LDcgQEAgcHJp dmF0ZToKICAgICB2b2lkIGNvbXB1dGVPdXRPZkZsb3dIb3Jpem9udGFsR2VvbWV0cnkoTGF5b3V0 U3RhdGUmLCBjb25zdCBCb3gmKSBjb25zdDsKIAogICAgIFdlYWtQdHI8Y29uc3QgQm94PiBtX3Jv b3Q7CisgICAgRm9ybWF0dGluZ1N0YXRlJiBtX2Zvcm1hdHRpbmdTdGF0ZTsKIH07CiAKIH0KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5nU3RhdGUuY3BwIGIvU291 cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdTdGF0ZS5jcHAKaW5kZXggMGNkMGFjYmU3ODAu LjIxNzgxNjU3ZGI2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvRm9ybWF0dGlu Z1N0YXRlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvRm9ybWF0dGluZ1N0YXRlLmNw cApAQCAtMzUsNyArMzUsNyBAQCBuYW1lc3BhY2UgTGF5b3V0IHsKIAogV1RGX01BS0VfSVNPX0FM TE9DQVRFRF9JTVBMKEZvcm1hdHRpbmdTdGF0ZSk7CiAKLUZvcm1hdHRpbmdTdGF0ZTo6Rm9ybWF0 dGluZ1N0YXRlKFJlZjxGbG9hdGluZ1N0YXRlPiYmIGZsb2F0aW5nU3RhdGUsIFR5cGUgdHlwZSwg Y29uc3QgTGF5b3V0U3RhdGUmIGxheW91dFN0YXRlKQorRm9ybWF0dGluZ1N0YXRlOjpGb3JtYXR0 aW5nU3RhdGUoUmVmPEZsb2F0aW5nU3RhdGU+JiYgZmxvYXRpbmdTdGF0ZSwgVHlwZSB0eXBlLCBM YXlvdXRTdGF0ZSYgbGF5b3V0U3RhdGUpCiAgICAgOiBtX2xheW91dFN0YXRlKGxheW91dFN0YXRl KQogICAgICwgbV9mbG9hdGluZ1N0YXRlKFdURk1vdmUoZmxvYXRpbmdTdGF0ZSkpCiAgICAgLCBt X3R5cGUodHlwZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5n U3RhdGUuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5nU3RhdGUuaAppbmRleCAx MDczZjdmYjM1ZC4uOTAyODNlMGUxNmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9Gb3JtYXR0aW5nU3RhdGUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvRm9ybWF0dGlu Z1N0YXRlLmgKQEAgLTQ2LDcgKzQ2LDcgQEAgY2xhc3MgRm9ybWF0dGluZ1N0YXRlIHsKIHB1Ymxp YzoKICAgICB2aXJ0dWFsIH5Gb3JtYXR0aW5nU3RhdGUoKTsKIAotICAgIHZpcnR1YWwgc3RkOjp1 bmlxdWVfcHRyPEZvcm1hdHRpbmdDb250ZXh0PmZvcm1hdHRpbmdDb250ZXh0KGNvbnN0IEJveCYg Zm9ybWF0dGluZ0NvbnRleHRSb290KSBjb25zdCA9IDA7CisgICAgdmlydHVhbCBzdGQ6OnVuaXF1 ZV9wdHI8Rm9ybWF0dGluZ0NvbnRleHQ+Zm9ybWF0dGluZ0NvbnRleHQoY29uc3QgQm94JiBmb3Jt YXR0aW5nQ29udGV4dFJvb3QpID0gMDsKIAogICAgIEZsb2F0aW5nU3RhdGUmIGZsb2F0aW5nU3Rh dGUoKSBjb25zdCB7IHJldHVybiBtX2Zsb2F0aW5nU3RhdGU7IH0KIApAQCAtNjAsMTMgKzYwLDE0 IEBAIHB1YmxpYzoKICAgICBib29sIGlzQmxvY2tGb3JtYXR0aW5nU3RhdGUoKSBjb25zdCB7IHJl dHVybiBtX3R5cGUgPT0gVHlwZTo6QmxvY2s7IH0KICAgICBib29sIGlzSW5saW5lRm9ybWF0dGlu Z1N0YXRlKCkgY29uc3QgeyByZXR1cm4gbV90eXBlID09IFR5cGU6OklubGluZTsgfQogCisgICAg TGF5b3V0U3RhdGUmIGxheW91dFN0YXRlKCkgY29uc3QgeyByZXR1cm4gbV9sYXlvdXRTdGF0ZTsg fQorCiBwcm90ZWN0ZWQ6CiAgICAgZW51bSBjbGFzcyBUeXBlIHsgQmxvY2ssIElubGluZSB9Owot ICAgIEZvcm1hdHRpbmdTdGF0ZShSZWY8RmxvYXRpbmdTdGF0ZT4mJiwgVHlwZSwgY29uc3QgTGF5 b3V0U3RhdGUmKTsKLQotICAgIGNvbnN0IExheW91dFN0YXRlJiBtX2xheW91dFN0YXRlOworICAg IEZvcm1hdHRpbmdTdGF0ZShSZWY8RmxvYXRpbmdTdGF0ZT4mJiwgVHlwZSwgTGF5b3V0U3RhdGUm KTsKIAogcHJpdmF0ZToKKyAgICBMYXlvdXRTdGF0ZSYgbV9sYXlvdXRTdGF0ZTsKICAgICBSZWY8 RmxvYXRpbmdTdGF0ZT4gbV9mbG9hdGluZ1N0YXRlOwogICAgIEhhc2hNYXA8Y29uc3QgQm94Kiwg Rm9ybWF0dGluZ0NvbnRleHQ6Okluc3RyaW5zaWNXaWR0aENvbnN0cmFpbnRzPiBtX2luc3RyaW5z aWNXaWR0aENvbnN0cmFpbnRzOwogICAgIFR5cGUgbV90eXBlOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvbGF5b3V0L0xheW91dEZvcm1hdHRpbmdTdGF0ZS5oIGIvU291cmNlL1dlYkNvcmUv bGF5b3V0L0xheW91dEZvcm1hdHRpbmdTdGF0ZS5oCmluZGV4IGQ0M2I4ODk1MjQxLi5lMjAzZTY3 MmZkOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L0xheW91dEZvcm1hdHRpbmdT dGF0ZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9MYXlvdXRGb3JtYXR0aW5nU3RhdGUu aApAQCAtMjcsNyArMjcsNiBAQAogCiAjaWYgRU5BQkxFKExBWU9VVF9GT1JNQVRUSU5HX0NPTlRF WFQpCiAKLSNpbmNsdWRlICJGb3JtYXR0aW5nQ29udGV4dC5oIgogI2luY2x1ZGUgPHd0Zi9IYXNo TWFwLmg+CiAjaW5jbHVkZSA8d3RmL0hhc2hTZXQuaD4KICNpbmNsdWRlIDx3dGYvSXNvTWFsbG9j Lmg+CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Js b2NrRm9ybWF0dGluZ0NvbnRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9y bWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0LmNwcAppbmRleCA1YWU2YjY4NzRiOS4uOGNj MWVkZTNmYzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRp bmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0LmNwcApAQCAtNDQsOCArNDQs OCBAQCBuYW1lc3BhY2UgTGF5b3V0IHsKIAogV1RGX01BS0VfSVNPX0FMTE9DQVRFRF9JTVBMKEJs b2NrRm9ybWF0dGluZ0NvbnRleHQpOwogCi1CbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpCbG9ja0Zv cm1hdHRpbmdDb250ZXh0KGNvbnN0IEJveCYgZm9ybWF0dGluZ0NvbnRleHRSb290KQotICAgIDog Rm9ybWF0dGluZ0NvbnRleHQoZm9ybWF0dGluZ0NvbnRleHRSb290KQorQmxvY2tGb3JtYXR0aW5n Q29udGV4dDo6QmxvY2tGb3JtYXR0aW5nQ29udGV4dChjb25zdCBCb3gmIGZvcm1hdHRpbmdDb250 ZXh0Um9vdCwgRm9ybWF0dGluZ1N0YXRlJiBmb3JtYXR0aW5nU3RhdGUpCisgICAgOiBGb3JtYXR0 aW5nQ29udGV4dChmb3JtYXR0aW5nQ29udGV4dFJvb3QsIGZvcm1hdHRpbmdTdGF0ZSkKIHsKIH0K IApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9j a0Zvcm1hdHRpbmdDb250ZXh0LmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0 aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuaAppbmRleCA5YmQzNWVjMTZiYy4uOGMwNDI2YTlj MjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxv Y2tGb3JtYXR0aW5nQ29udGV4dC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zv cm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5oCkBAIC00NSw3ICs0NSw3IEBAIGNsYXNz IEZsb2F0aW5nQ29udGV4dDsKIGNsYXNzIEJsb2NrRm9ybWF0dGluZ0NvbnRleHQgOiBwdWJsaWMg Rm9ybWF0dGluZ0NvbnRleHQgewogICAgIFdURl9NQUtFX0lTT19BTExPQ0FURUQoQmxvY2tGb3Jt YXR0aW5nQ29udGV4dCk7CiBwdWJsaWM6Ci0gICAgQmxvY2tGb3JtYXR0aW5nQ29udGV4dChjb25z dCBCb3gmIGZvcm1hdHRpbmdDb250ZXh0Um9vdCk7CisgICAgQmxvY2tGb3JtYXR0aW5nQ29udGV4 dChjb25zdCBCb3gmIGZvcm1hdHRpbmdDb250ZXh0Um9vdCwgRm9ybWF0dGluZ1N0YXRlJiBmb3Jt YXR0aW5nU3RhdGUpOwogCiAgICAgdm9pZCBsYXlvdXQoTGF5b3V0U3RhdGUmLCBGb3JtYXR0aW5n U3RhdGUmKSBjb25zdCBvdmVycmlkZTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdTdGF0ZS5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ1N0YXRlLmNwcAppbmRl eCAzM2YzZTE5MGY1Yi4uZDM4NjE2MjhhNzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nU3RhdGUuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nU3RhdGUuY3Bw CkBAIC0zNyw3ICszNyw3IEBAIG5hbWVzcGFjZSBMYXlvdXQgewogCiBXVEZfTUFLRV9JU09fQUxM T0NBVEVEX0lNUEwoQmxvY2tGb3JtYXR0aW5nU3RhdGUpOwogCi1CbG9ja0Zvcm1hdHRpbmdTdGF0 ZTo6QmxvY2tGb3JtYXR0aW5nU3RhdGUoUmVmPEZsb2F0aW5nU3RhdGU+JiYgZmxvYXRpbmdTdGF0 ZSwgY29uc3QgTGF5b3V0U3RhdGUmIGxheW91dFN0YXRlKQorQmxvY2tGb3JtYXR0aW5nU3RhdGU6 OkJsb2NrRm9ybWF0dGluZ1N0YXRlKFJlZjxGbG9hdGluZ1N0YXRlPiYmIGZsb2F0aW5nU3RhdGUs IExheW91dFN0YXRlJiBsYXlvdXRTdGF0ZSkKICAgICA6IEZvcm1hdHRpbmdTdGF0ZShXVEZNb3Zl KGZsb2F0aW5nU3RhdGUpLCBUeXBlOjpCbG9jaywgbGF5b3V0U3RhdGUpCiB7CiB9CkBAIC00Niwx MCArNDYsMTAgQEAgQmxvY2tGb3JtYXR0aW5nU3RhdGU6On5CbG9ja0Zvcm1hdHRpbmdTdGF0ZSgp CiB7CiB9CiAKLXN0ZDo6dW5pcXVlX3B0cjxGb3JtYXR0aW5nQ29udGV4dD4gQmxvY2tGb3JtYXR0 aW5nU3RhdGU6OmZvcm1hdHRpbmdDb250ZXh0KGNvbnN0IEJveCYgZm9ybWF0dGluZ0NvbnRleHRS b290KSBjb25zdAorc3RkOjp1bmlxdWVfcHRyPEZvcm1hdHRpbmdDb250ZXh0PiBCbG9ja0Zvcm1h dHRpbmdTdGF0ZTo6Zm9ybWF0dGluZ0NvbnRleHQoY29uc3QgQm94JiBmb3JtYXR0aW5nQ29udGV4 dFJvb3QpCiB7CiAJQVNTRVJUKGZvcm1hdHRpbmdDb250ZXh0Um9vdC5lc3RhYmxpc2hlc0Jsb2Nr Rm9ybWF0dGluZ0NvbnRleHQoKSk7Ci0gICAgcmV0dXJuIHN0ZDo6bWFrZV91bmlxdWU8QmxvY2tG b3JtYXR0aW5nQ29udGV4dD4oZm9ybWF0dGluZ0NvbnRleHRSb290KTsKKyAgICByZXR1cm4gc3Rk OjptYWtlX3VuaXF1ZTxCbG9ja0Zvcm1hdHRpbmdDb250ZXh0Pihmb3JtYXR0aW5nQ29udGV4dFJv b3QsICp0aGlzKTsKIH0KIAogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Js b2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdTdGF0ZS5oIGIvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdTdGF0ZS5oCmluZGV4IGQ3NTE3YTI3 NTY0Li5jNGU3ZDIzODRhZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2Nr Zm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdTdGF0ZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nU3RhdGUuaApAQCAtMzgsMTAgKzM4 LDEwIEBAIG5hbWVzcGFjZSBMYXlvdXQgewogY2xhc3MgQmxvY2tGb3JtYXR0aW5nU3RhdGUgOiBw dWJsaWMgRm9ybWF0dGluZ1N0YXRlIHsKICAgICBXVEZfTUFLRV9JU09fQUxMT0NBVEVEKEJsb2Nr Rm9ybWF0dGluZ1N0YXRlKTsKIHB1YmxpYzoKLSAgICBCbG9ja0Zvcm1hdHRpbmdTdGF0ZShSZWY8 RmxvYXRpbmdTdGF0ZT4mJiwgY29uc3QgTGF5b3V0U3RhdGUmKTsKKyAgICBCbG9ja0Zvcm1hdHRp bmdTdGF0ZShSZWY8RmxvYXRpbmdTdGF0ZT4mJiwgTGF5b3V0U3RhdGUmKTsKICAgICB2aXJ0dWFs IH5CbG9ja0Zvcm1hdHRpbmdTdGF0ZSgpOwogCi0Jc3RkOjp1bmlxdWVfcHRyPEZvcm1hdHRpbmdD b250ZXh0PiBmb3JtYXR0aW5nQ29udGV4dChjb25zdCBCb3gmIGZvcm1hdHRpbmdDb250ZXh0Um9v dCkgY29uc3Qgb3ZlcnJpZGU7CisJc3RkOjp1bmlxdWVfcHRyPEZvcm1hdHRpbmdDb250ZXh0PiBm b3JtYXR0aW5nQ29udGV4dChjb25zdCBCb3gmIGZvcm1hdHRpbmdDb250ZXh0Um9vdCkgb3ZlcnJp ZGU7CiB9OwogCiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9y bWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHAKaW5kZXggYjI5 MjVlOGM4MjcuLjdiYzBlZWRhNTFjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv aW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQu Y3BwCkBAIC00Niw4ICs0Niw4IEBAIG5hbWVzcGFjZSBMYXlvdXQgewogCiBXVEZfTUFLRV9JU09f QUxMT0NBVEVEX0lNUEwoSW5saW5lRm9ybWF0dGluZ0NvbnRleHQpOwogCi1JbmxpbmVGb3JtYXR0 aW5nQ29udGV4dDo6SW5saW5lRm9ybWF0dGluZ0NvbnRleHQoY29uc3QgQm94JiBmb3JtYXR0aW5n Q29udGV4dFJvb3QpCi0gICAgOiBGb3JtYXR0aW5nQ29udGV4dChmb3JtYXR0aW5nQ29udGV4dFJv b3QpCitJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6SW5saW5lRm9ybWF0dGluZ0NvbnRleHQoY29u c3QgQm94JiBmb3JtYXR0aW5nQ29udGV4dFJvb3QsIEZvcm1hdHRpbmdTdGF0ZSYgZm9ybWF0dGlu Z1N0YXRlKQorICAgIDogRm9ybWF0dGluZ0NvbnRleHQoZm9ybWF0dGluZ0NvbnRleHRSb290LCBm b3JtYXR0aW5nU3RhdGUpCiB7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmggYi9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5oCmlu ZGV4IDQyOTczNGZiOWUxLi4xODRkZDI0YzE4MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv bGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuaAorKysgYi9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29u dGV4dC5oCkBAIC00Myw3ICs0Myw3IEBAIGNsYXNzIElubGluZVJ1blByb3ZpZGVyOwogY2xhc3Mg SW5saW5lRm9ybWF0dGluZ0NvbnRleHQgOiBwdWJsaWMgRm9ybWF0dGluZ0NvbnRleHQgewogICAg IFdURl9NQUtFX0lTT19BTExPQ0FURUQoSW5saW5lRm9ybWF0dGluZ0NvbnRleHQpOwogcHVibGlj OgotICAgIElubGluZUZvcm1hdHRpbmdDb250ZXh0KGNvbnN0IEJveCYgZm9ybWF0dGluZ0NvbnRl eHRSb290KTsKKyAgICBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dChjb25zdCBCb3gmIGZvcm1hdHRp bmdDb250ZXh0Um9vdCwgRm9ybWF0dGluZ1N0YXRlJik7CiAKICAgICB2b2lkIGxheW91dChMYXlv dXRTdGF0ZSYsIEZvcm1hdHRpbmdTdGF0ZSYpIGNvbnN0IG92ZXJyaWRlOwogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5n U3RhdGUuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5l Rm9ybWF0dGluZ1N0YXRlLmNwcAppbmRleCBlNzM2MWI2NGM2Mi4uMmEzZjgwMDk3NjQgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1h dHRpbmdTdGF0ZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRp bmcvSW5saW5lRm9ybWF0dGluZ1N0YXRlLmNwcApAQCAtMzUsNyArMzUsNyBAQCBuYW1lc3BhY2Ug TGF5b3V0IHsKIAogV1RGX01BS0VfSVNPX0FMTE9DQVRFRF9JTVBMKElubGluZUZvcm1hdHRpbmdT dGF0ZSk7CiAKLUlubGluZUZvcm1hdHRpbmdTdGF0ZTo6SW5saW5lRm9ybWF0dGluZ1N0YXRlKFJl ZjxGbG9hdGluZ1N0YXRlPiYmIGZsb2F0aW5nU3RhdGUsIGNvbnN0IExheW91dFN0YXRlJiBsYXlv dXRTdGF0ZSkKK0lubGluZUZvcm1hdHRpbmdTdGF0ZTo6SW5saW5lRm9ybWF0dGluZ1N0YXRlKFJl ZjxGbG9hdGluZ1N0YXRlPiYmIGZsb2F0aW5nU3RhdGUsIExheW91dFN0YXRlJiBsYXlvdXRTdGF0 ZSkKICAgICA6IEZvcm1hdHRpbmdTdGF0ZShXVEZNb3ZlKGZsb2F0aW5nU3RhdGUpLCBUeXBlOjpJ bmxpbmUsIGxheW91dFN0YXRlKQogewogfQpAQCAtNDQsMTAgKzQ0LDEwIEBAIElubGluZUZvcm1h dHRpbmdTdGF0ZTo6fklubGluZUZvcm1hdHRpbmdTdGF0ZSgpCiB7CiB9CiAKLXN0ZDo6dW5pcXVl X3B0cjxGb3JtYXR0aW5nQ29udGV4dD4gSW5saW5lRm9ybWF0dGluZ1N0YXRlOjpmb3JtYXR0aW5n Q29udGV4dChjb25zdCBCb3gmIGZvcm1hdHRpbmdDb250ZXh0Um9vdCkgY29uc3QKK3N0ZDo6dW5p cXVlX3B0cjxGb3JtYXR0aW5nQ29udGV4dD4gSW5saW5lRm9ybWF0dGluZ1N0YXRlOjpmb3JtYXR0 aW5nQ29udGV4dChjb25zdCBCb3gmIGZvcm1hdHRpbmdDb250ZXh0Um9vdCkKIHsKIAlBU1NFUlQo Zm9ybWF0dGluZ0NvbnRleHRSb290LmVzdGFibGlzaGVzSW5saW5lRm9ybWF0dGluZ0NvbnRleHQo KSk7Ci0gICAgcmV0dXJuIHN0ZDo6bWFrZV91bmlxdWU8SW5saW5lRm9ybWF0dGluZ0NvbnRleHQ+ KGZvcm1hdHRpbmdDb250ZXh0Um9vdCk7CisgICAgcmV0dXJuIHN0ZDo6bWFrZV91bmlxdWU8SW5s aW5lRm9ybWF0dGluZ0NvbnRleHQ+KGZvcm1hdHRpbmdDb250ZXh0Um9vdCwgKnRoaXMpOwogfQog CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9J bmxpbmVGb3JtYXR0aW5nU3RhdGUuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3Jt YXR0aW5nL0lubGluZUZvcm1hdHRpbmdTdGF0ZS5oCmluZGV4IDJiNmE3OTUxYjY2Li5mY2M5OGI5 MzFhMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcv SW5saW5lRm9ybWF0dGluZ1N0YXRlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGlu ZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ1N0YXRlLmgKQEAgLTM5LDEwICszOSwxMCBAQCBu YW1lc3BhY2UgTGF5b3V0IHsKIGNsYXNzIElubGluZUZvcm1hdHRpbmdTdGF0ZSA6IHB1YmxpYyBG b3JtYXR0aW5nU3RhdGUgewogICAgIFdURl9NQUtFX0lTT19BTExPQ0FURUQoSW5saW5lRm9ybWF0 dGluZ1N0YXRlKTsKIHB1YmxpYzoKLSAgICBJbmxpbmVGb3JtYXR0aW5nU3RhdGUoUmVmPEZsb2F0 aW5nU3RhdGU+JiYsIGNvbnN0IExheW91dFN0YXRlJik7CisgICAgSW5saW5lRm9ybWF0dGluZ1N0 YXRlKFJlZjxGbG9hdGluZ1N0YXRlPiYmLCBMYXlvdXRTdGF0ZSYpOwogICAgIHZpcnR1YWwgfklu bGluZUZvcm1hdHRpbmdTdGF0ZSgpOwogCi0Jc3RkOjp1bmlxdWVfcHRyPEZvcm1hdHRpbmdDb250 ZXh0PiBmb3JtYXR0aW5nQ29udGV4dChjb25zdCBCb3gmIGZvcm1hdHRpbmdDb250ZXh0Um9vdCkg Y29uc3Qgb3ZlcnJpZGU7CisJc3RkOjp1bmlxdWVfcHRyPEZvcm1hdHRpbmdDb250ZXh0PiBmb3Jt YXR0aW5nQ29udGV4dChjb25zdCBCb3gmIGZvcm1hdHRpbmdDb250ZXh0Um9vdCkgb3ZlcnJpZGU7 CiAKICAgICBJbmxpbmVDb250ZW50JiBpbmxpbmVDb250ZW50KCkgeyByZXR1cm4gbV9pbmxpbmVD b250ZW50OyB9CiAgICAgLy8gVGVtcAo=