191089 2018-10-30 15:49:58 -0700 [LFC] The *FormattingState class should provide the *FormattingContext. 2018-10-31 06:44:23 -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 1473458 0 zalan 2018-10-30 15:49:58 -0700 and not LayoutState 1473482 1 353428 zalan 2018-10-30 16:26:02 -0700 Created attachment 353428 Patch 1473690 2 zalan 2018-10-31 06:43:10 -0700 Committed r237632: <https://trac.webkit.org/changeset/237632> 1473691 3 webkit-bug-importer 2018-10-31 06:44:23 -0700 <rdar://problem/45698902> 353428 2018-10-30 16:26:02 -0700 2018-10-31 05:50:01 -0700 Patch Patch.txt text/plain 11259 zalan ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAzNTViNmI3MjZiYy4uYzI3ZmZjZGIyZjIgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzMSBAQAorMjAxOC0xMC0zMCAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgor CisgICAgICAgIFtMRkNdIFRoZSAqRm9ybWF0dGluZ1N0YXRlIGNsYXNzIHNob3VsZCBwcm92aWRl IHRoZSAqRm9ybWF0dGluZ0NvbnRleHQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xOTEwODkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBCbG9ja0Zvcm1hdHRpbmdTdGF0ZSBwcm92aWRlcyB0aGUgQmxvY2tG b3JtYXR0aW5nQ29udGV4dCBvYmplY3QsIHdoaWxlIElubGluZUZvcm1hdHRpbmdTdGF0ZSBwcm92 aWRlcyB0aGUgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuCisKKyAgICAgICAgKiBsYXlvdXQvRm9y bWF0dGluZ0NvbnRleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpGb3JtYXR0aW5n Q29udGV4dDo6bGF5b3V0T3V0T2ZGbG93RGVzY2VuZGFudHMgY29uc3QpOgorICAgICAgICAqIGxh eW91dC9Gb3JtYXR0aW5nU3RhdGUuaDoKKyAgICAgICAgKiBsYXlvdXQvTGF5b3V0Rm9ybWF0dGlu Z1N0YXRlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGF5b3V0U3RhdGU6OmxheW91 dEZvcm1hdHRpbmdDb250ZXh0U3VidHJlZSk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6Okxh eW91dFN0YXRlOjpmb3JtYXR0aW5nQ29udGV4dCBjb25zdCk6IERlbGV0ZWQuCisgICAgICAgICog bGF5b3V0L0xheW91dEZvcm1hdHRpbmdTdGF0ZS5oOgorICAgICAgICAqIGxheW91dC9ibG9ja2Zv cm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpM YXlvdXQ6OkJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6OmxheW91dEZvcm1hdHRpbmdDb250ZXh0Um9v dCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkJsb2NrRm9ybWF0dGluZ0NvbnRl eHQ6Omluc3RyaW5zaWNXaWR0aENvbnN0cmFpbnRzIGNvbnN0KToKKyAgICAgICAgKiBsYXlvdXQv YmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ1N0YXRlLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkxheW91dDo6QmxvY2tGb3JtYXR0aW5nU3RhdGU6OmZvcm1hdHRpbmdDb250ZXh0IGNvbnN0 KToKKyAgICAgICAgKiBsYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ1N0YXRl Lmg6CisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0Nv bnRleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVGb3JtYXR0aW5nQ29u dGV4dDo6bGF5b3V0Rm9ybWF0dGluZ0NvbnRleHRSb290IGNvbnN0KToKKyAgICAgICAgKiBsYXlv dXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nU3RhdGUuY3BwOgorICAgICAgICAo V2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVGb3JtYXR0aW5nU3RhdGU6OmZvcm1hdHRpbmdDb250ZXh0 IGNvbnN0KToKKyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0 aW5nU3RhdGUuaDoKKwogMjAxOC0xMC0zMCAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29t PgogCiAgICAgICAgIFtMRkNdIFJlbmFtZSBMYXlvdXRDb250ZXh0IHRvIExheW91dFN0YXRlCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvRm9ybWF0dGluZ0NvbnRleHQuY3BwIGIv U291cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0LmNwcAppbmRleCAzZjAxZTA1 Zjg2Mi4uYWMxNjUyZjFmOWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9Gb3Jt YXR0aW5nQ29udGV4dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdD b250ZXh0LmNwcApAQCAtMjksNiArMjksNyBAQAogI2lmIEVOQUJMRShMQVlPVVRfRk9STUFUVElO R19DT05URVhUKQogCiAjaW5jbHVkZSAiRGlzcGxheUJveC5oIgorI2luY2x1ZGUgIkZvcm1hdHRp bmdTdGF0ZS5oIgogI2luY2x1ZGUgIkxheW91dEJveC5oIgogI2luY2x1ZGUgIkxheW91dENvbnRh aW5lci5oIgogI2luY2x1ZGUgIkxheW91dERlc2NlbmRhbnRJdGVyYXRvci5oIgpAQCAtMTQ3LDEz ICsxNDgsMTIgQEAgdm9pZCBGb3JtYXR0aW5nQ29udGV4dDo6bGF5b3V0T3V0T2ZGbG93RGVzY2Vu ZGFudHMoTGF5b3V0U3RhdGUmIGxheW91dFN0YXRlLCBjb24KICAgICAgICAgYXV0byYgbGF5b3V0 Qm94ID0gKm91dE9mRmxvd0JveDsKIAogICAgICAgICBBU1NFUlQobGF5b3V0Qm94LmVzdGFibGlz aGVzRm9ybWF0dGluZ0NvbnRleHQoKSk7Ci0gICAgICAgIGF1dG8gZm9ybWF0dGluZ0NvbnRleHQg PSBsYXlvdXRTdGF0ZS5mb3JtYXR0aW5nQ29udGV4dChsYXlvdXRCb3gpOwogCiAgICAgICAgIGNv bXB1dGVCb3JkZXJBbmRQYWRkaW5nKGxheW91dFN0YXRlLCBsYXlvdXRCb3gpOwogICAgICAgICBj b21wdXRlT3V0T2ZGbG93SG9yaXpvbnRhbEdlb21ldHJ5KGxheW91dFN0YXRlLCBsYXlvdXRCb3gp OwogCiAgICAgICAgIGF1dG8mIGZvcm1hdHRpbmdTdGF0ZSA9IGxheW91dFN0YXRlLmNyZWF0ZUZv cm1hdHRpbmdTdGF0ZUZvckZvcm1hdHRpbmdSb290SWZOZWVkZWQobGF5b3V0Qm94KTsKLSAgICAg ICAgZm9ybWF0dGluZ0NvbnRleHQtPmxheW91dChsYXlvdXRTdGF0ZSwgZm9ybWF0dGluZ1N0YXRl KTsKKyAgICAgICAgZm9ybWF0dGluZ1N0YXRlLmZvcm1hdHRpbmdDb250ZXh0KGxheW91dEJveCkt PmxheW91dChsYXlvdXRTdGF0ZSwgZm9ybWF0dGluZ1N0YXRlKTsKIAogICAgICAgICBjb21wdXRl T3V0T2ZGbG93VmVydGljYWxHZW9tZXRyeShsYXlvdXRTdGF0ZSwgbGF5b3V0Qm94KTsKICAgICAg ICAgbGF5b3V0T3V0T2ZGbG93RGVzY2VuZGFudHMobGF5b3V0U3RhdGUsIGxheW91dEJveCk7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvRm9ybWF0dGluZ1N0YXRlLmggYi9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvRm9ybWF0dGluZ1N0YXRlLmgKaW5kZXggMGEzOTcyMzJkYTIuLjEw NzNmN2ZiMzVkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvRm9ybWF0dGluZ1N0 YXRlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdTdGF0ZS5oCkBAIC00 Niw2ICs0Niw4IEBAIGNsYXNzIEZvcm1hdHRpbmdTdGF0ZSB7CiBwdWJsaWM6CiAgICAgdmlydHVh bCB+Rm9ybWF0dGluZ1N0YXRlKCk7CiAKKyAgICB2aXJ0dWFsIHN0ZDo6dW5pcXVlX3B0cjxGb3Jt YXR0aW5nQ29udGV4dD5mb3JtYXR0aW5nQ29udGV4dChjb25zdCBCb3gmIGZvcm1hdHRpbmdDb250 ZXh0Um9vdCkgY29uc3QgPSAwOworCiAgICAgRmxvYXRpbmdTdGF0ZSYgZmxvYXRpbmdTdGF0ZSgp IGNvbnN0IHsgcmV0dXJuIG1fZmxvYXRpbmdTdGF0ZTsgfQogCiAgICAgdm9pZCBtYXJrTmVlZHNM YXlvdXQoY29uc3QgQm94JiwgU3R5bGVEaWZmKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9MYXlvdXRGb3JtYXR0aW5nU3RhdGUuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0 L0xheW91dEZvcm1hdHRpbmdTdGF0ZS5jcHAKaW5kZXggNWZhMDE4NjIzOGEuLmQ3Y2E0OGExMTlk IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvTGF5b3V0Rm9ybWF0dGluZ1N0YXRl LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvTGF5b3V0Rm9ybWF0dGluZ1N0YXRlLmNw cApAQCAtODEsOCArODEsOCBAQCB2b2lkIExheW91dFN0YXRlOjp1cGRhdGVMYXlvdXQoKQogdm9p ZCBMYXlvdXRTdGF0ZTo6bGF5b3V0Rm9ybWF0dGluZ0NvbnRleHRTdWJ0cmVlKGNvbnN0IEJveCYg bGF5b3V0Um9vdCkKIHsKICAgICBSRUxFQVNFX0FTU0VSVChsYXlvdXRSb290LmVzdGFibGlzaGVz Rm9ybWF0dGluZ0NvbnRleHQoKSk7Ci0gICAgYXV0byBmb3JtYXR0aW5nQ29udGV4dCA9IHRoaXMt PmZvcm1hdHRpbmdDb250ZXh0KGxheW91dFJvb3QpOwogICAgIGF1dG8mIGZvcm1hdHRpbmdTdGF0 ZSA9IGNyZWF0ZUZvcm1hdHRpbmdTdGF0ZUZvckZvcm1hdHRpbmdSb290SWZOZWVkZWQobGF5b3V0 Um9vdCk7CisgICAgYXV0byBmb3JtYXR0aW5nQ29udGV4dCA9IGZvcm1hdHRpbmdTdGF0ZS5mb3Jt YXR0aW5nQ29udGV4dChsYXlvdXRSb290KTsKICAgICBmb3JtYXR0aW5nQ29udGV4dC0+bGF5b3V0 KCp0aGlzLCBmb3JtYXR0aW5nU3RhdGUpOwogICAgIGZvcm1hdHRpbmdDb250ZXh0LT5sYXlvdXRP dXRPZkZsb3dEZXNjZW5kYW50cygqdGhpcywgbGF5b3V0Um9vdCk7CiB9CkBAIC0xNTYsMTggKzE1 Niw2IEBAIEZvcm1hdHRpbmdTdGF0ZSYgTGF5b3V0U3RhdGU6OmNyZWF0ZUZvcm1hdHRpbmdTdGF0 ZUZvckZvcm1hdHRpbmdSb290SWZOZWVkZWQoY29uCiAgICAgQ1JBU0goKTsKIH0KIAotc3RkOjp1 bmlxdWVfcHRyPEZvcm1hdHRpbmdDb250ZXh0PiBMYXlvdXRTdGF0ZTo6Zm9ybWF0dGluZ0NvbnRl eHQoY29uc3QgQm94JiBmb3JtYXR0aW5nQ29udGV4dFJvb3QpIGNvbnN0Ci17Ci0gICAgaWYgKGZv cm1hdHRpbmdDb250ZXh0Um9vdC5lc3RhYmxpc2hlc0lubGluZUZvcm1hdHRpbmdDb250ZXh0KCkp Ci0gICAgICAgIHJldHVybiBzdGQ6Om1ha2VfdW5pcXVlPElubGluZUZvcm1hdHRpbmdDb250ZXh0 Pihmb3JtYXR0aW5nQ29udGV4dFJvb3QpOwotCi0gICAgaWYgKGZvcm1hdHRpbmdDb250ZXh0Um9v dC5lc3RhYmxpc2hlc0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQoKSkKLSAgICAgICAgcmV0dXJuIHN0 ZDo6bWFrZV91bmlxdWU8QmxvY2tGb3JtYXR0aW5nQ29udGV4dD4oZm9ybWF0dGluZ0NvbnRleHRS b290KTsKLQotICAgIEFTU0VSVF9OT1RfSU1QTEVNRU5URURfWUVUKCk7Ci0gICAgcmV0dXJuIG51 bGxwdHI7Ci19Ci0KIH0KIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L0xh eW91dEZvcm1hdHRpbmdTdGF0ZS5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L0xheW91dEZvcm1h dHRpbmdTdGF0ZS5oCmluZGV4IDQ2NzRiNjE4Yzk5Li5kNDNiODg5NTI0MSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvbGF5b3V0L0xheW91dEZvcm1hdHRpbmdTdGF0ZS5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9MYXlvdXRGb3JtYXR0aW5nU3RhdGUuaApAQCAtNzUsOCArNzUsNiBA QCBwdWJsaWM6CiAgICAgdm9pZCBtYXJrTmVlZHNVcGRhdGUoY29uc3QgQm94JiwgT3B0aW9uU2V0 PFVwZGF0ZVR5cGU+KTsKICAgICBib29sIG5lZWRzVXBkYXRlKGNvbnN0IEJveCYpIGNvbnN0Owog Ci0gICAgc3RkOjp1bmlxdWVfcHRyPEZvcm1hdHRpbmdDb250ZXh0PiBmb3JtYXR0aW5nQ29udGV4 dChjb25zdCBCb3gmIGZvcm1hdHRpbmdDb250ZXh0Um9vdCkgY29uc3Q7Ci0KICAgICBGb3JtYXR0 aW5nU3RhdGUmIGZvcm1hdHRpbmdTdGF0ZUZvckJveChjb25zdCBCb3gmKSBjb25zdDsKICAgICBG b3JtYXR0aW5nU3RhdGUmIGVzdGFibGlzaGVkRm9ybWF0dGluZ1N0YXRlKGNvbnN0IEJveCYgZm9y bWF0dGluZ1Jvb3QpIGNvbnN0OwogICAgIEZvcm1hdHRpbmdTdGF0ZSYgY3JlYXRlRm9ybWF0dGlu Z1N0YXRlRm9yRm9ybWF0dGluZ1Jvb3RJZk5lZWRlZChjb25zdCBCb3gmIGZvcm1hdHRpbmdSb290 KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxv Y2tGb3JtYXR0aW5nQ29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3Jt YXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuY3BwCmluZGV4IDdlYzI0NjdhYWUwLi41YWU2 YjY4NzRiOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGlu Zy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv YmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuY3BwCkBAIC0xMzQsOCArMTM0 LDggQEAgdm9pZCBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpsYXlvdXRGb3JtYXR0aW5nQ29udGV4 dFJvb3QoTGF5b3V0U3RhdGUmIGxheW91dFN0YXQKIAogICAgIHByZWNvbXB1dGVWZXJ0aWNhbFBv c2l0aW9uRm9yRm9ybWF0dGluZ1Jvb3RJZk5lZWRlZChsYXlvdXRTdGF0ZSwgbGF5b3V0Qm94KTsK ICAgICAvLyBTd2ljaCBvdmVyIHRvIHRoZSBuZXcgZm9ybWF0dGluZyBjb250ZXh0ICh0aGUgb25l IHRoYXQgdGhlIHJvb3QgY3JlYXRlcykuCi0gICAgYXV0byBmb3JtYXR0aW5nQ29udGV4dCA9IGxh eW91dFN0YXRlLmZvcm1hdHRpbmdDb250ZXh0KGxheW91dEJveCk7CiAgICAgYXV0byYgZm9ybWF0 dGluZ1N0YXRlID0gbGF5b3V0U3RhdGUuY3JlYXRlRm9ybWF0dGluZ1N0YXRlRm9yRm9ybWF0dGlu Z1Jvb3RJZk5lZWRlZChsYXlvdXRCb3gpOworICAgIGF1dG8gZm9ybWF0dGluZ0NvbnRleHQgPSBm b3JtYXR0aW5nU3RhdGUuZm9ybWF0dGluZ0NvbnRleHQobGF5b3V0Qm94KTsKICAgICBmb3JtYXR0 aW5nQ29udGV4dC0+bGF5b3V0KGxheW91dFN0YXRlLCBmb3JtYXR0aW5nU3RhdGUpOwogCiAgICAg Ly8gQ29tZSBiYWNrIGFuZCBmaW5hbGl6ZSB0aGUgcm9vdCdzIGdlb21ldHJ5LgpAQCAtMzgzLDcg KzM4Myw3IEBAIEZvcm1hdHRpbmdDb250ZXh0OjpJbnN0cmluc2ljV2lkdGhDb25zdHJhaW50cyBC bG9ja0Zvcm1hdHRpbmdDb250ZXh0OjppbnN0cmluc2ljCiAgICAgICAgICAgICAgICAgaW5zdHJp bnNpY1dpZHRoQ29uc3RyYWludHMgPSBHZW9tZXRyeTo6aW5zdHJpbnNpY1dpZHRoQ29uc3RyYWlu dHMobGF5b3V0U3RhdGUsIGNoaWxkQm94KTsKICAgICAgICAgICAgIC8vIElzIGl0IGEgZm9ybWF0 dGluZyBjb250ZXh0IHJvb3Q/CiAgICAgICAgICAgICBpZiAoIWluc3RyaW5zaWNXaWR0aENvbnN0 cmFpbnRzICYmIGNoaWxkQm94LmVzdGFibGlzaGVzRm9ybWF0dGluZ0NvbnRleHQoKSkKLSAgICAg ICAgICAgICAgICBpbnN0cmluc2ljV2lkdGhDb25zdHJhaW50cyA9IGxheW91dFN0YXRlLmZvcm1h dHRpbmdDb250ZXh0KGNoaWxkQm94KS0+aW5zdHJpbnNpY1dpZHRoQ29uc3RyYWludHMobGF5b3V0 U3RhdGUsIGNoaWxkQm94KTsKKyAgICAgICAgICAgICAgICBpbnN0cmluc2ljV2lkdGhDb25zdHJh aW50cyA9IGZvcm1hdHRpbmdTdGF0ZUZvckNoaWxkcmVuLmZvcm1hdHRpbmdDb250ZXh0KGNoaWxk Qm94KS0+aW5zdHJpbnNpY1dpZHRoQ29uc3RyYWludHMobGF5b3V0U3RhdGUsIGNoaWxkQm94KTsK ICAgICAgICAgICAgIC8vIEdvIHRvIHRoZSBuZXh0IHNpYmxpbmcgKGFuZCBza2lwIHRoZSBkZXNj ZW5kYW50cykgaWYgdGhpcyBib3gncyBtaW4vbWF4IHdpZHRoIGlzIGNvbXB1dGVkLgogICAgICAg ICAgICAgaWYgKGluc3RyaW5zaWNXaWR0aENvbnN0cmFpbnRzKSB7CiAgICAgICAgICAgICAgICAg Zm9ybWF0dGluZ1N0YXRlRm9yQ2hpbGRyZW4uc2V0SW5zdHJpbnNpY1dpZHRoQ29uc3RyYWludHMo Y2hpbGRCb3gsICppbnN0cmluc2ljV2lkdGhDb25zdHJhaW50cyk7IApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdTdGF0ZS5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGlu Z1N0YXRlLmNwcAppbmRleCAwZDI0OTFlYzY0Ni4uMzNmM2UxOTBmNWIgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nU3RhdGUu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3Jt YXR0aW5nU3RhdGUuY3BwCkBAIC00Niw2ICs0NiwxMiBAQCBCbG9ja0Zvcm1hdHRpbmdTdGF0ZTo6 fkJsb2NrRm9ybWF0dGluZ1N0YXRlKCkKIHsKIH0KIAorc3RkOjp1bmlxdWVfcHRyPEZvcm1hdHRp bmdDb250ZXh0PiBCbG9ja0Zvcm1hdHRpbmdTdGF0ZTo6Zm9ybWF0dGluZ0NvbnRleHQoY29uc3Qg Qm94JiBmb3JtYXR0aW5nQ29udGV4dFJvb3QpIGNvbnN0Cit7CisJQVNTRVJUKGZvcm1hdHRpbmdD b250ZXh0Um9vdC5lc3RhYmxpc2hlc0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQoKSk7CisgICAgcmV0 dXJuIHN0ZDo6bWFrZV91bmlxdWU8QmxvY2tGb3JtYXR0aW5nQ29udGV4dD4oZm9ybWF0dGluZ0Nv bnRleHRSb290KTsKK30KKwogfQogfQogI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ1N0YXRlLmggYi9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ1N0YXRlLmgKaW5k ZXggYjQ2YjhjOWE4NTMuLmQ3NTE3YTI3NTY0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ1N0YXRlLmgKKysrIGIvU291cmNl L1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdTdGF0ZS5oCkBA IC00MCw2ICs0MCw4IEBAIGNsYXNzIEJsb2NrRm9ybWF0dGluZ1N0YXRlIDogcHVibGljIEZvcm1h dHRpbmdTdGF0ZSB7CiBwdWJsaWM6CiAgICAgQmxvY2tGb3JtYXR0aW5nU3RhdGUoUmVmPEZsb2F0 aW5nU3RhdGU+JiYsIGNvbnN0IExheW91dFN0YXRlJik7CiAgICAgdmlydHVhbCB+QmxvY2tGb3Jt YXR0aW5nU3RhdGUoKTsKKworCXN0ZDo6dW5pcXVlX3B0cjxGb3JtYXR0aW5nQ29udGV4dD4gZm9y bWF0dGluZ0NvbnRleHQoY29uc3QgQm94JiBmb3JtYXR0aW5nQ29udGV4dFJvb3QpIGNvbnN0IG92 ZXJyaWRlOwogfTsKIAogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGlu ZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUv bGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwCmluZGV4 IDVhODYyMjAyZmU3Li5iMjkyNWU4YzgyNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250 ZXh0LmNwcApAQCAtMjQxLDcgKzI0MSw4IEBAIHZvaWQgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6 OmxheW91dEZvcm1hdHRpbmdDb250ZXh0Um9vdChMYXlvdXRTdGF0ZSYgbGF5b3V0U3RhCiAgICAg Y29tcHV0ZVdpZHRoQW5kTWFyZ2luKCk7CiAKICAgICAvLyBTd2ljaCBvdmVyIHRvIHRoZSBuZXcg Zm9ybWF0dGluZyBjb250ZXh0ICh0aGUgb25lIHRoYXQgdGhlIHJvb3QgY3JlYXRlcykuCi0gICAg bGF5b3V0U3RhdGUuZm9ybWF0dGluZ0NvbnRleHQobGF5b3V0Qm94KS0+bGF5b3V0KGxheW91dFN0 YXRlLCBsYXlvdXRTdGF0ZS5jcmVhdGVGb3JtYXR0aW5nU3RhdGVGb3JGb3JtYXR0aW5nUm9vdElm TmVlZGVkKGxheW91dEJveCkpOworICAgIGF1dG8mIGZvcm1hdHRpbmdTdGF0ZSA9IGxheW91dFN0 YXRlLmNyZWF0ZUZvcm1hdHRpbmdTdGF0ZUZvckZvcm1hdHRpbmdSb290SWZOZWVkZWQobGF5b3V0 Qm94KTsKKyAgICBmb3JtYXR0aW5nU3RhdGUuZm9ybWF0dGluZ0NvbnRleHQobGF5b3V0Qm94KS0+ bGF5b3V0KGxheW91dFN0YXRlLCBmb3JtYXR0aW5nU3RhdGUpOwogCiAgICAgLy8gQ29tZSBiYWNr IGFuZCBmaW5hbGl6ZSB0aGUgcm9vdCdzIGhlaWdodCBhbmQgbWFyZ2luLgogICAgIGNvbXB1dGVI ZWlnaHRBbmRNYXJnaW4oKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxp bmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdTdGF0ZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nU3RhdGUuY3BwCmluZGV4IDk4 NGJjNmMyNWRhLi5lNzM2MWI2NGM2MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ1N0YXRlLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nU3RhdGUuY3Bw CkBAIC00NCw2ICs0NCwxMiBAQCBJbmxpbmVGb3JtYXR0aW5nU3RhdGU6On5JbmxpbmVGb3JtYXR0 aW5nU3RhdGUoKQogewogfQogCitzdGQ6OnVuaXF1ZV9wdHI8Rm9ybWF0dGluZ0NvbnRleHQ+IElu bGluZUZvcm1hdHRpbmdTdGF0ZTo6Zm9ybWF0dGluZ0NvbnRleHQoY29uc3QgQm94JiBmb3JtYXR0 aW5nQ29udGV4dFJvb3QpIGNvbnN0Cit7CisJQVNTRVJUKGZvcm1hdHRpbmdDb250ZXh0Um9vdC5l c3RhYmxpc2hlc0lubGluZUZvcm1hdHRpbmdDb250ZXh0KCkpOworICAgIHJldHVybiBzdGQ6Om1h a2VfdW5pcXVlPElubGluZUZvcm1hdHRpbmdDb250ZXh0Pihmb3JtYXR0aW5nQ29udGV4dFJvb3Qp OworfQorCiB9CiB9CiAjZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9p bmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdTdGF0ZS5oIGIvU291cmNlL1dlYkNvcmUv bGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ1N0YXRlLmgKaW5kZXggY2Zk ZjQwNjRkOTkuLjJiNmE3OTUxYjY2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv aW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nU3RhdGUuaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nU3RhdGUuaApAQCAt NDIsNiArNDIsOCBAQCBwdWJsaWM6CiAgICAgSW5saW5lRm9ybWF0dGluZ1N0YXRlKFJlZjxGbG9h dGluZ1N0YXRlPiYmLCBjb25zdCBMYXlvdXRTdGF0ZSYpOwogICAgIHZpcnR1YWwgfklubGluZUZv cm1hdHRpbmdTdGF0ZSgpOwogCisJc3RkOjp1bmlxdWVfcHRyPEZvcm1hdHRpbmdDb250ZXh0PiBm b3JtYXR0aW5nQ29udGV4dChjb25zdCBCb3gmIGZvcm1hdHRpbmdDb250ZXh0Um9vdCkgY29uc3Qg b3ZlcnJpZGU7CisKICAgICBJbmxpbmVDb250ZW50JiBpbmxpbmVDb250ZW50KCkgeyByZXR1cm4g bV9pbmxpbmVDb250ZW50OyB9CiAgICAgLy8gVGVtcAogICAgIElubGluZVJ1bnMmIGlubGluZVJ1 bnMoKSB7IHJldHVybiBtX2lubGluZVJ1bnM7IH0K