193381 2019-01-12 08:11:44 -0800 [LFC] Move formatting context creation from FormattingState to LayoutState 2019-01-12 08:58:32 -0800 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 1493978 0 zalan 2019-01-12 08:11:44 -0800 ssia 1493979 1 358991 zalan 2019-01-12 08:43:15 -0800 Created attachment 358991 Patch 1493980 2 zalan 2019-01-12 08:57:03 -0800 Committed r239900: <https://trac.webkit.org/changeset/239900> 1493981 3 webkit-bug-importer 2019-01-12 08:58:32 -0800 <rdar://problem/47232935> 358991 2019-01-12 08:43:15 -0800 2019-01-12 08:50:15 -0800 Patch bug-193381-20190112084302.patch text/plain 15362 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjM5ODk5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjU2YzM0ZmUyMjE3M2Rj YzBmOWM1MGE5YmMzZTQyMWY4NWRjMDdmNS4uMDU2NWE4OGI3NmJlMWQ2NGU1YjNkM2U5NjcwNGVm NTc3ZTQzZWFhMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM4IEBACisyMDE5LTAxLTEyICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ10gTW92ZSBmb3JtYXR0 aW5nIGNvbnRleHQgY3JlYXRpb24gZnJvbSBGb3JtYXR0aW5nU3RhdGUgdG8gTGF5b3V0U3RhdGUK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5MzM4MQor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGxheW91dFN0 YXRlKCkuY3JlYXRlRm9ybWF0dGluZ1N0YXRlRm9yRm9ybWF0dGluZ1Jvb3RJZk5lZWRlZChyb290 KS5jcmVhdGVGb3JtYXR0aW5nQ29udGV4dChyb290KSBpcyBub3Qgb25seSBtb3V0aGZ1bAorICAg ICAgICBidXQgYWxzbyBmZWVscyB1bmludHVpdGl2ZS4gVXNlIGxheW91dFN0YXRlKCkuY3JlYXRl Rm9ybWF0dGluZ0NvbnRleHQocm9vdCkgaW5zdGVhZC4KKworICAgICAgICAqIGxheW91dC9Gb3Jt YXR0aW5nQ29udGV4dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkZvcm1hdHRpbmdD b250ZXh0OjpGb3JtYXR0aW5nQ29udGV4dCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkZv cm1hdHRpbmdDb250ZXh0Ojp+Rm9ybWF0dGluZ0NvbnRleHQpOgorICAgICAgICAoV2ViQ29yZTo6 TGF5b3V0OjpGb3JtYXR0aW5nQ29udGV4dDo6bGF5b3V0T3V0T2ZGbG93RGVzY2VuZGFudHMgY29u c3QpOgorICAgICAgICAqIGxheW91dC9Gb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkxheW91dDo6Rm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjpzaHJp bmtUb0ZpdFdpZHRoKToKKyAgICAgICAgKiBsYXlvdXQvRm9ybWF0dGluZ1N0YXRlLmg6CisgICAg ICAgICogbGF5b3V0L0xheW91dFN0YXRlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6 TGF5b3V0U3RhdGU6OmxheW91dEZvcm1hdHRpbmdDb250ZXh0U3VidHJlZSk6CisgICAgICAgIChX ZWJDb3JlOjpMYXlvdXQ6OkxheW91dFN0YXRlOjpjcmVhdGVGb3JtYXR0aW5nQ29udGV4dCk6Cisg ICAgICAgICogbGF5b3V0L0xheW91dFN0YXRlLmg6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6 OkxheW91dFN0YXRlOjpkZXJlZ2lzdGVyRm9ybWF0dGluZ0NvbnRleHQpOgorICAgICAgICAoV2Vi Q29yZTo6TGF5b3V0OjpMYXlvdXRTdGF0ZTo6cmVnaXN0ZXJGb3JtYXR0aW5nQ29udGV4dCk6Cisg ICAgICAgICogbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0LmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6QmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6bGF5 b3V0Rm9ybWF0dGluZ0NvbnRleHRSb290IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91 dDo6QmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6aW5zdHJpbnNpY1dpZHRoQ29uc3RyYWludHMgY29u c3QpOgorICAgICAgICAqIGxheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nU3Rh dGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpCbG9ja0Zvcm1hdHRpbmdTdGF0ZTo6 Y3JlYXRlRm9ybWF0dGluZ0NvbnRleHQpOiBEZWxldGVkLgorICAgICAgICAqIGxheW91dC9ibG9j a2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nU3RhdGUuaDoKKyAgICAgICAgKiBsYXlvdXQvaW5s aW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHA6CisgICAgICAgIChXZWJD b3JlOjpMYXlvdXQ6OklubGluZUZvcm1hdHRpbmdDb250ZXh0OjpsYXlvdXRGb3JtYXR0aW5nQ29u dGV4dFJvb3QgY29uc3QpOgorICAgICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGlu ZUZvcm1hdHRpbmdTdGF0ZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUZv cm1hdHRpbmdTdGF0ZTo6Y3JlYXRlRm9ybWF0dGluZ0NvbnRleHQpOiBEZWxldGVkLgorICAgICAg ICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdTdGF0ZS5oOgorCiAy MDE5LTAxLTEyICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW0xG Q11bQkZDXVtNYXJnaW5Db2xsYXBzaW5nXSBNb3ZlIGVzdGltYXRlZE1hcmdpbkJlZm9yZSBmbGFn IGZyb20gc3RhdGUvZGlzcGxheSBib3ggdG8gQmxvY2tGb3JtYXR0aW5nQ29udGV4dApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0LmNwcCBiL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5nQ29udGV4dC5jcHAKaW5kZXggYTc2N2U5M2U5NWY3 MGU3M2NhODM4NDg0YWJkYzhhNThjMGZlNGViZi4uZDVhODNlZDE1ZDFiNTc2ZDI2MDI3ODJjMDg4 NmJhN2E4NDMxZjU3NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRp bmdDb250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvRm9ybWF0dGluZ0NvbnRl eHQuY3BwCkBAIC00NywxMCArNDcsMTYgQEAgRm9ybWF0dGluZ0NvbnRleHQ6OkZvcm1hdHRpbmdD b250ZXh0KGNvbnN0IEJveCYgZm9ybWF0dGluZ0NvbnRleHRSb290LCBGb3JtYXR0aW4KICAgICA6 IG1fcm9vdChtYWtlV2Vha1B0cihmb3JtYXR0aW5nQ29udGV4dFJvb3QpKQogICAgICwgbV9mb3Jt YXR0aW5nU3RhdGUoZm9ybWF0dGluZ1N0YXRlKQogeworI2lmbmRlZiBOREVCVUcKKyAgICBsYXlv dXRTdGF0ZSgpLnJlZ2lzdGVyRm9ybWF0dGluZ0NvbnRleHQoKnRoaXMpOworI2VuZGlmCiB9CiAK IEZvcm1hdHRpbmdDb250ZXh0Ojp+Rm9ybWF0dGluZ0NvbnRleHQoKQogeworI2lmbmRlZiBOREVC VUcKKyAgICBsYXlvdXRTdGF0ZSgpLmRlcmVnaXN0ZXJGb3JtYXR0aW5nQ29udGV4dCgqdGhpcyk7 CisjZW5kaWYKIH0KIAogRm9ybWF0dGluZ1N0YXRlJiBGb3JtYXR0aW5nQ29udGV4dDo6Zm9ybWF0 dGluZ1N0YXRlKCkgY29uc3QKQEAgLTE1NCw3ICsxNjAsNyBAQCB2b2lkIEZvcm1hdHRpbmdDb250 ZXh0OjpsYXlvdXRPdXRPZkZsb3dEZXNjZW5kYW50cyhjb25zdCBCb3gmIGxheW91dEJveCkgY29u c3QKICAgICAgICAgY29tcHV0ZUJvcmRlckFuZFBhZGRpbmcobGF5b3V0Qm94KTsKICAgICAgICAg Y29tcHV0ZU91dE9mRmxvd0hvcml6b250YWxHZW9tZXRyeShsYXlvdXRCb3gpOwogCi0gICAgICAg IGxheW91dFN0YXRlLmNyZWF0ZUZvcm1hdHRpbmdTdGF0ZUZvckZvcm1hdHRpbmdSb290SWZOZWVk ZWQobGF5b3V0Qm94KS5jcmVhdGVGb3JtYXR0aW5nQ29udGV4dChsYXlvdXRCb3gpLT5sYXlvdXQo KTsKKyAgICAgICAgbGF5b3V0U3RhdGUuY3JlYXRlRm9ybWF0dGluZ0NvbnRleHQobGF5b3V0Qm94 KS0+bGF5b3V0KCk7CiAKICAgICAgICAgY29tcHV0ZU91dE9mRmxvd1ZlcnRpY2FsR2VvbWV0cnko bGF5b3V0Qm94KTsKICAgICAgICAgbGF5b3V0T3V0T2ZGbG93RGVzY2VuZGFudHMobGF5b3V0Qm94 KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5nQ29udGV4dEdl b21ldHJ5LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5nQ29udGV4dEdlb21l dHJ5LmNwcAppbmRleCA3NWU3YjdlZTY5YzY1OGUwMWZlNGQ5NmI2OGQ0MjBlNjMzNjRhYTZkLi5k ZWFiYjg3YjI3ODUxY2VjZGJhYzgzNjA0ODA5YmM2MDU5ODUwZmMyIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwCkBAIC0yMzgs OCArMjM4LDcgQEAgTGF5b3V0VW5pdCBGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OnNocmlu a1RvRml0V2lkdGgoTGF5b3V0U3RhdGUmIGxheW91dFN0YXQKIAogICAgIC8vIFRoZW4gdGhlIHNo cmluay10by1maXQgd2lkdGggaXM6IG1pbihtYXgocHJlZmVycmVkIG1pbmltdW0gd2lkdGgsIGF2 YWlsYWJsZSB3aWR0aCksIHByZWZlcnJlZCB3aWR0aCkuCiAgICAgYXV0byBhdmFpbGFibGVXaWR0 aCA9IGxheW91dFN0YXRlLmRpc3BsYXlCb3hGb3JMYXlvdXRCb3goKmZvcm1hdHRpbmdSb290LmNv bnRhaW5pbmdCbG9jaygpKS53aWR0aCgpOwotICAgIGF1dG8mIGZvcm1hdHRpbmdTdGF0ZSA9IGxh eW91dFN0YXRlLmNyZWF0ZUZvcm1hdHRpbmdTdGF0ZUZvckZvcm1hdHRpbmdSb290SWZOZWVkZWQo Zm9ybWF0dGluZ1Jvb3QpOwotICAgIGF1dG8gaW5zdHJpbnNpY1dpZHRoQ29uc3RyYWludHMgPSBm b3JtYXR0aW5nU3RhdGUuY3JlYXRlRm9ybWF0dGluZ0NvbnRleHQoZm9ybWF0dGluZ1Jvb3QpLT5p bnN0cmluc2ljV2lkdGhDb25zdHJhaW50cygpOworICAgIGF1dG8gaW5zdHJpbnNpY1dpZHRoQ29u c3RyYWludHMgPSBsYXlvdXRTdGF0ZS5jcmVhdGVGb3JtYXR0aW5nQ29udGV4dChmb3JtYXR0aW5n Um9vdCktPmluc3RyaW5zaWNXaWR0aENvbnN0cmFpbnRzKCk7CiAgICAgcmV0dXJuIHN0ZDo6bWlu KHN0ZDo6bWF4KGluc3RyaW5zaWNXaWR0aENvbnN0cmFpbnRzLm1pbmltdW0sIGF2YWlsYWJsZVdp ZHRoKSwgaW5zdHJpbnNpY1dpZHRoQ29uc3RyYWludHMubWF4aW11bSk7CiB9CiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5nU3RhdGUuaCBiL1NvdXJjZS9XZWJD b3JlL2xheW91dC9Gb3JtYXR0aW5nU3RhdGUuaAppbmRleCA0YTgzOTc2OWYxYWExNjQxZDY3ODBk MmNiYjQ3YWY0ZjE5ZWMyNTBmLi4wYzM0YzcwYTIyMjYyYjk3ODdjNGI1MmI0OTlmOTllMmM1ZTcw NDA2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvRm9ybWF0dGluZ1N0YXRlLmgK KysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdTdGF0ZS5oCkBAIC00Niw4ICs0 Niw2IEBAIGNsYXNzIEZvcm1hdHRpbmdTdGF0ZSB7CiBwdWJsaWM6CiAgICAgdmlydHVhbCB+Rm9y bWF0dGluZ1N0YXRlKCk7CiAKLSAgICB2aXJ0dWFsIHN0ZDo6dW5pcXVlX3B0cjxGb3JtYXR0aW5n Q29udGV4dD4gY3JlYXRlRm9ybWF0dGluZ0NvbnRleHQoY29uc3QgQm94JiBmb3JtYXR0aW5nQ29u dGV4dFJvb3QpID0gMDsKLQogICAgIEZsb2F0aW5nU3RhdGUmIGZsb2F0aW5nU3RhdGUoKSBjb25z dCB7IHJldHVybiBtX2Zsb2F0aW5nU3RhdGU7IH0KIAogICAgIHZvaWQgbWFya05lZWRzTGF5b3V0 KGNvbnN0IEJveCYsIFN0eWxlRGlmZik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvTGF5b3V0U3RhdGUuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L0xheW91dFN0YXRlLmNw cAppbmRleCBmYjY0NGU3MmZmNTE3ODI5MjFkMzlmNTJmMjc5MzBiM2UzMTI0M2ViLi5iNDc2NWQy ODhmYTk3MWM3YjdjMTI0Y2ZlNzcxYmU1MmE1MmY1MDk3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvTGF5b3V0U3RhdGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9M YXlvdXRTdGF0ZS5jcHAKQEAgLTc2LDggKzc2LDcgQEAgdm9pZCBMYXlvdXRTdGF0ZTo6dXBkYXRl TGF5b3V0KCkKIHZvaWQgTGF5b3V0U3RhdGU6OmxheW91dEZvcm1hdHRpbmdDb250ZXh0U3VidHJl ZShjb25zdCBCb3gmIGxheW91dFJvb3QpCiB7CiAgICAgUkVMRUFTRV9BU1NFUlQobGF5b3V0Um9v dC5lc3RhYmxpc2hlc0Zvcm1hdHRpbmdDb250ZXh0KCkpOwotICAgIGF1dG8mIGZvcm1hdHRpbmdT dGF0ZSA9IGNyZWF0ZUZvcm1hdHRpbmdTdGF0ZUZvckZvcm1hdHRpbmdSb290SWZOZWVkZWQobGF5 b3V0Um9vdCk7Ci0gICAgYXV0byBmb3JtYXR0aW5nQ29udGV4dCA9IGZvcm1hdHRpbmdTdGF0ZS5j cmVhdGVGb3JtYXR0aW5nQ29udGV4dChsYXlvdXRSb290KTsKKyAgICBhdXRvIGZvcm1hdHRpbmdD b250ZXh0ID0gY3JlYXRlRm9ybWF0dGluZ0NvbnRleHQobGF5b3V0Um9vdCk7CiAgICAgZm9ybWF0 dGluZ0NvbnRleHQtPmxheW91dCgpOwogICAgIGZvcm1hdHRpbmdDb250ZXh0LT5sYXlvdXRPdXRP ZkZsb3dEZXNjZW5kYW50cyhsYXlvdXRSb290KTsKIH0KQEAgLTE1MSw2ICsxNTAsMjAgQEAgRm9y bWF0dGluZ1N0YXRlJiBMYXlvdXRTdGF0ZTo6Y3JlYXRlRm9ybWF0dGluZ1N0YXRlRm9yRm9ybWF0 dGluZ1Jvb3RJZk5lZWRlZChjb24KICAgICBDUkFTSCgpOwogfQogCitzdGQ6OnVuaXF1ZV9wdHI8 Rm9ybWF0dGluZ0NvbnRleHQ+IExheW91dFN0YXRlOjpjcmVhdGVGb3JtYXR0aW5nQ29udGV4dChj b25zdCBCb3gmIGZvcm1hdHRpbmdDb250ZXh0Um9vdCkKK3sKKyAgICBBU1NFUlQoZm9ybWF0dGlu Z0NvbnRleHRSb290LmVzdGFibGlzaGVzRm9ybWF0dGluZ0NvbnRleHQoKSk7CisgICAgaWYgKGZv cm1hdHRpbmdDb250ZXh0Um9vdC5lc3RhYmxpc2hlc0lubGluZUZvcm1hdHRpbmdDb250ZXh0KCkp CisgICAgICAgIHJldHVybiBzdGQ6Om1ha2VfdW5pcXVlPElubGluZUZvcm1hdHRpbmdDb250ZXh0 Pihmb3JtYXR0aW5nQ29udGV4dFJvb3QsIGNyZWF0ZUZvcm1hdHRpbmdTdGF0ZUZvckZvcm1hdHRp bmdSb290SWZOZWVkZWQoZm9ybWF0dGluZ0NvbnRleHRSb290KSk7CisKKyAgICBpZiAoZm9ybWF0 dGluZ0NvbnRleHRSb290LmVzdGFibGlzaGVzQmxvY2tGb3JtYXR0aW5nQ29udGV4dCgpKSB7Cisg ICAgICAgIEFTU0VSVChmb3JtYXR0aW5nQ29udGV4dFJvb3QuZXN0YWJsaXNoZXNCbG9ja0Zvcm1h dHRpbmdDb250ZXh0T25seSgpKTsKKyAgICAgICAgcmV0dXJuIHN0ZDo6bWFrZV91bmlxdWU8Qmxv Y2tGb3JtYXR0aW5nQ29udGV4dD4oZm9ybWF0dGluZ0NvbnRleHRSb290LCBjcmVhdGVGb3JtYXR0 aW5nU3RhdGVGb3JGb3JtYXR0aW5nUm9vdElmTmVlZGVkKGZvcm1hdHRpbmdDb250ZXh0Um9vdCkp OworICAgIH0KKworICAgIENSQVNIKCk7Cit9CisKIH0KIH0KIApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvbGF5b3V0L0xheW91dFN0YXRlLmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvTGF5 b3V0U3RhdGUuaAppbmRleCAyODQ0NmNmOWFkZDNlNzk4Njk4NjFjOWNjNzljNjk4NWJjZDlmN2Fl Li4yNjE1OTIxNGYwMDdkY2UxZDM2ZmNkYTZhNDhjZjA5Nzk0OTkwZmIyIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvTGF5b3V0U3RhdGUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvTGF5b3V0U3RhdGUuaApAQCAtNDcsNiArNDcsNyBAQCBuYW1lc3BhY2UgTGF5b3V0IHsK IGVudW0gY2xhc3MgU3R5bGVEaWZmOwogY2xhc3MgQm94OwogY2xhc3MgQ29udGFpbmVyOworY2xh c3MgRm9ybWF0dGluZ0NvbnRleHQ7CiBjbGFzcyBGb3JtYXR0aW5nU3RhdGU7CiAKIC8vIExheW91 dFN0YXRlIGlzIHRoZSBlbnRyeSBwb2ludCBmb3IgbGF5b3V0LiBJdCB0YWtlcyB0aGUgaW5pdGlh bCBjb250YWluaW5nIGJsb2NrIHdoaWNoIGFjdHMgYXMgdGhlIHJvb3Qgb2YgdGhlIGxheW91dCBj b250ZXh0LgpAQCAtNzgsNiArNzksMTIgQEAgcHVibGljOgogICAgIGJvb2wgaGFzRm9ybWF0dGlu Z1N0YXRlKGNvbnN0IEJveCYgZm9ybWF0dGluZ1Jvb3QpIGNvbnN0IHsgcmV0dXJuIG1fZm9ybWF0 dGluZ1N0YXRlcy5jb250YWlucygmZm9ybWF0dGluZ1Jvb3QpOyB9CiAgICAgRm9ybWF0dGluZ1N0 YXRlJiBjcmVhdGVGb3JtYXR0aW5nU3RhdGVGb3JGb3JtYXR0aW5nUm9vdElmTmVlZGVkKGNvbnN0 IEJveCYgZm9ybWF0dGluZ1Jvb3QpOwogCisgICAgc3RkOjp1bmlxdWVfcHRyPEZvcm1hdHRpbmdD b250ZXh0PiBjcmVhdGVGb3JtYXR0aW5nQ29udGV4dChjb25zdCBCb3gmIGZvcm1hdHRpbmdDb250 ZXh0Um9vdCk7CisjaWZuZGVmIE5ERUJVRworICAgIHZvaWQgcmVnaXN0ZXJGb3JtYXR0aW5nQ29u dGV4dChjb25zdCBGb3JtYXR0aW5nQ29udGV4dCYpOworICAgIHZvaWQgZGVyZWdpc3RlckZvcm1h dHRpbmdDb250ZXh0KGNvbnN0IEZvcm1hdHRpbmdDb250ZXh0JiBmb3JtYXR0aW5nQ29udGV4dCkg eyBtX2Zvcm1hdHRpbmdDb250ZXh0TGlzdC5yZW1vdmUoJmZvcm1hdHRpbmdDb250ZXh0KTsgfQor I2VuZGlmCisKICAgICBEaXNwbGF5OjpCb3gmIGRpc3BsYXlCb3hGb3JMYXlvdXRCb3goY29uc3Qg Qm94JiBsYXlvdXRCb3gpIGNvbnN0OwogICAgIGJvb2wgaGFzRGlzcGxheUJveChjb25zdCBCb3gm IGxheW91dEJveCkgY29uc3QgeyByZXR1cm4gbV9sYXlvdXRUb0Rpc3BsYXlCb3guY29udGFpbnMo JmxheW91dEJveCk7IH0KIApAQCAtOTIsMTAgKzk5LDIyIEBAIHByaXZhdGU6CiAgICAgV2Vha1B0 cjxjb25zdCBDb250YWluZXI+IG1faW5pdGlhbENvbnRhaW5pbmdCbG9jazsKICAgICBIYXNoU2V0 PGNvbnN0IENvbnRhaW5lcio+IG1fZm9ybWF0dGluZ0NvbnRleHRSb290TGlzdEZvckxheW91dDsK ICAgICBIYXNoTWFwPGNvbnN0IEJveCosIHN0ZDo6dW5pcXVlX3B0cjxGb3JtYXR0aW5nU3RhdGU+ PiBtX2Zvcm1hdHRpbmdTdGF0ZXM7CisjaWZuZGVmIE5ERUJVRworICAgIEhhc2hTZXQ8Y29uc3Qg Rm9ybWF0dGluZ0NvbnRleHQqPiBtX2Zvcm1hdHRpbmdDb250ZXh0TGlzdDsKKyNlbmRpZgogICAg IG11dGFibGUgSGFzaE1hcDxjb25zdCBCb3gqLCBzdGQ6OnVuaXF1ZV9wdHI8RGlzcGxheTo6Qm94 Pj4gbV9sYXlvdXRUb0Rpc3BsYXlCb3g7CiAgICAgYm9vbCBtX2luUXVpcmtzTW9kZSB7IGZhbHNl IH07CiB9OwogCisjaWZuZGVmIE5ERUJVRworaW5saW5lIHZvaWQgTGF5b3V0U3RhdGU6OnJlZ2lz dGVyRm9ybWF0dGluZ0NvbnRleHQoY29uc3QgRm9ybWF0dGluZ0NvbnRleHQmIGZvcm1hdHRpbmdD b250ZXh0KQoreworICAgIC8vIE11bHRpcGxlIGZvcm1hdHRpbmcgY29udGV4dHMgb2YgdGhlIHNh bWUgcm9vdCB3aXRoaW4gYSBsYXlvdXQgZnJhbWUgaW5kaWNhdGVzIGRlZmVjdGl2ZSBsYXlvdXQg bG9naWMuCisgICAgQVNTRVJUKCFtX2Zvcm1hdHRpbmdDb250ZXh0TGlzdC5jb250YWlucygmZm9y bWF0dGluZ0NvbnRleHQpKTsKKyAgICBtX2Zvcm1hdHRpbmdDb250ZXh0TGlzdC5hZGQoJmZvcm1h dHRpbmdDb250ZXh0KTsKK30KKyNlbmRpZgorCiB9CiB9CiAjZW5kaWYKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4 dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0 dGluZ0NvbnRleHQuY3BwCmluZGV4IDE1YWMzZDViNzYzMmIyNDQ4YmM1ZTNkODlhMjliNDNjMGJi NGEwZTIuLjJmYWY3NWU0YjE0YjQzZDhjZmY4NjNiNzdjN2U4YzA1ZGY0NTA4M2YgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5n Q29udGV4dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9C bG9ja0Zvcm1hdHRpbmdDb250ZXh0LmNwcApAQCAtMTM0LDcgKzEzNCw3IEBAIHZvaWQgQmxvY2tG b3JtYXR0aW5nQ29udGV4dDo6bGF5b3V0Rm9ybWF0dGluZ0NvbnRleHRSb290KEZsb2F0aW5nQ29u dGV4dCYgZmxvYXRpCiAKICAgICBwcmVjb21wdXRlVmVydGljYWxQb3NpdGlvbkZvckZvcm1hdHRp bmdSb290SWZOZWVkZWQobGF5b3V0Qm94KTsKICAgICAvLyBTd2ljaCBvdmVyIHRvIHRoZSBuZXcg Zm9ybWF0dGluZyBjb250ZXh0ICh0aGUgb25lIHRoYXQgdGhlIHJvb3QgY3JlYXRlcykuCi0gICAg YXV0byBmb3JtYXR0aW5nQ29udGV4dCA9IGxheW91dFN0YXRlKCkuY3JlYXRlRm9ybWF0dGluZ1N0 YXRlRm9yRm9ybWF0dGluZ1Jvb3RJZk5lZWRlZChsYXlvdXRCb3gpLmNyZWF0ZUZvcm1hdHRpbmdD b250ZXh0KGxheW91dEJveCk7CisgICAgYXV0byBmb3JtYXR0aW5nQ29udGV4dCA9IGxheW91dFN0 YXRlKCkuY3JlYXRlRm9ybWF0dGluZ0NvbnRleHQobGF5b3V0Qm94KTsKICAgICBmb3JtYXR0aW5n Q29udGV4dC0+bGF5b3V0KCk7CiAKICAgICAvLyBDb21lIGJhY2sgYW5kIGZpbmFsaXplIHRoZSBy b290J3MgZ2VvbWV0cnkuCkBAIC00MzYsNyArNDM2LDcgQEAgRm9ybWF0dGluZ0NvbnRleHQ6Oklu c3RyaW5zaWNXaWR0aENvbnN0cmFpbnRzIEJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6Omluc3RyaW5z aWMKICAgICAgICAgICAgICAgICBpZiAoIUdlb21ldHJ5OjppbnN0cmluc2ljV2lkdGhDb25zdHJh aW50c05lZWRDaGlsZHJlbldpZHRoKGNoaWxkQm94KSkKICAgICAgICAgICAgICAgICAgICAgaW5z dHJpbnNpY1dpZHRoQ29uc3RyYWludHMgPSBHZW9tZXRyeTo6aW5zdHJpbnNpY1dpZHRoQ29uc3Ry YWludHMobGF5b3V0U3RhdGUsIGNoaWxkQm94KTsKICAgICAgICAgICAgICAgICBlbHNlIGlmIChj aGlsZEJveC5lc3RhYmxpc2hlc0Zvcm1hdHRpbmdDb250ZXh0KCkpCi0gICAgICAgICAgICAgICAg ICAgIGluc3RyaW5zaWNXaWR0aENvbnN0cmFpbnRzID0gbGF5b3V0U3RhdGUuY3JlYXRlRm9ybWF0 dGluZ1N0YXRlRm9yRm9ybWF0dGluZ1Jvb3RJZk5lZWRlZChjaGlsZEJveCkuY3JlYXRlRm9ybWF0 dGluZ0NvbnRleHQoY2hpbGRCb3gpLT5pbnN0cmluc2ljV2lkdGhDb25zdHJhaW50cygpOworICAg ICAgICAgICAgICAgICAgICBpbnN0cmluc2ljV2lkdGhDb25zdHJhaW50cyA9IGxheW91dFN0YXRl LmNyZWF0ZUZvcm1hdHRpbmdDb250ZXh0KGNoaWxkQm94KS0+aW5zdHJpbnNpY1dpZHRoQ29uc3Ry YWludHMoKTsKICAgICAgICAgICAgICAgICBmb3JtYXR0aW5nU3RhdGUuc2V0SW5zdHJpbnNpY1dp ZHRoQ29uc3RyYWludHMoY2hpbGRCb3gsIGluc3RyaW5zaWNXaWR0aENvbnN0cmFpbnRzKTsKIAog ICAgICAgICAgICAgICAgIHF1ZXVlLnJlbW92ZUxhc3QoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nU3RhdGUuY3BwIGIv U291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdTdGF0 ZS5jcHAKaW5kZXggNDFhYzk5N2Q2MTM0NzAwYWQyMWE5N2Q1ZWJiMGM4ODU0NjhiMmUyMy4uMzVk ODA1OGI3ODdjMTVlMmIwMDhjMTIzMzdiMDA2NjFmZDYxMTg2MSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdTdGF0ZS5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRp bmdTdGF0ZS5jcHAKQEAgLTQ2LDEyICs0Niw2IEBAIEJsb2NrRm9ybWF0dGluZ1N0YXRlOjp+Qmxv Y2tGb3JtYXR0aW5nU3RhdGUoKQogewogfQogCi1zdGQ6OnVuaXF1ZV9wdHI8Rm9ybWF0dGluZ0Nv bnRleHQ+IEJsb2NrRm9ybWF0dGluZ1N0YXRlOjpjcmVhdGVGb3JtYXR0aW5nQ29udGV4dChjb25z dCBCb3gmIGZvcm1hdHRpbmdDb250ZXh0Um9vdCkKLXsKLSAgICBBU1NFUlQoZm9ybWF0dGluZ0Nv bnRleHRSb290LmVzdGFibGlzaGVzQmxvY2tGb3JtYXR0aW5nQ29udGV4dCgpKTsKLSAgICByZXR1 cm4gc3RkOjptYWtlX3VuaXF1ZTxCbG9ja0Zvcm1hdHRpbmdDb250ZXh0Pihmb3JtYXR0aW5nQ29u dGV4dFJvb3QsICp0aGlzKTsKLX0KLQogfQogfQogI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ1N0YXRlLmggYi9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ1N0YXRl LmgKaW5kZXggYjI4ZWY2OTVmMTQ4YzNmOTFhZmFiZDgzOGM5OGI3Nzc2ZGY0MzZhYy4uNzg1MzZh ZDc1YTY0ZjIwNjlkNDVkMzU0MDdhMTlmZjRlYjAzZDhjYiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdTdGF0ZS5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nU3Rh dGUuaApAQCAtNDEsOCArNDEsNiBAQCBwdWJsaWM6CiAgICAgQmxvY2tGb3JtYXR0aW5nU3RhdGUo UmVmPEZsb2F0aW5nU3RhdGU+JiYsIExheW91dFN0YXRlJik7CiAgICAgdmlydHVhbCB+QmxvY2tG b3JtYXR0aW5nU3RhdGUoKTsKIAotICAgIHN0ZDo6dW5pcXVlX3B0cjxGb3JtYXR0aW5nQ29udGV4 dD4gY3JlYXRlRm9ybWF0dGluZ0NvbnRleHQoY29uc3QgQm94JiBmb3JtYXR0aW5nQ29udGV4dFJv b3QpIG92ZXJyaWRlOwotCiAgICAgdm9pZCBzZXRQb3NpdGl2ZUFuZE5lZ2F0aXZlVmVydGljYWxN YXJnaW4oY29uc3QgQm94JiBsYXlvdXRCb3gsIFBvc2l0aXZlQW5kTmVnYXRpdmVWZXJ0aWNhbE1h cmdpbiB2ZXJ0aWNhbE1hcmdpbikgeyBtX3Bvc2l0aXZlQW5kTmVnYXRpdmVWZXJ0aWNhbE1hcmdp bi5zZXQoJmxheW91dEJveCwgdmVydGljYWxNYXJnaW4pOyB9CiAgICAgYm9vbCBoYXNQb3NpdGl2 ZUFuZE5lZ2F0aXZlVmVydGljYWxNYXJnaW4oY29uc3QgQm94JiBsYXlvdXRCb3gpIGNvbnN0IHsg cmV0dXJuIG1fcG9zaXRpdmVBbmROZWdhdGl2ZVZlcnRpY2FsTWFyZ2luLmNvbnRhaW5zKCZsYXlv dXRCb3gpOyB9CiAgICAgUG9zaXRpdmVBbmROZWdhdGl2ZVZlcnRpY2FsTWFyZ2luIHBvc2l0aXZl QW5kTmVnYXRpdmVWZXJ0aWNhbE1hcmdpbihjb25zdCBCb3gmIGxheW91dEJveCkgY29uc3QgeyBy ZXR1cm4gbV9wb3NpdGl2ZUFuZE5lZ2F0aXZlVmVydGljYWxNYXJnaW4uZ2V0KCZsYXlvdXRCb3gp OyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9J bmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5l Zm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHAKaW5kZXggZTdlNzJiNzlhYWU4 NWQ0MWQ5YjEwY2M1ODVlYzAyOWNhZGYyYjJkYy4uNDA4ZDc4NzZjMzMyYTNiYTAwYTBjZDRhMGRm MzlmNGUxZWRlZGY4YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZv cm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmNwcApAQCAt Mzc1LDcgKzM3NSw3IEBAIHZvaWQgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OmxheW91dEZvcm1h dHRpbmdDb250ZXh0Um9vdChjb25zdCBCb3gmIHJvb3QpIGNvbnN0CiAgICAgY29tcHV0ZUJvcmRl ckFuZFBhZGRpbmcocm9vdCk7CiAgICAgY29tcHV0ZVdpZHRoQW5kTWFyZ2luKHJvb3QpOwogICAg IC8vIFN3aWNoIG92ZXIgdG8gdGhlIG5ldyBmb3JtYXR0aW5nIGNvbnRleHQgKHRoZSBvbmUgdGhh dCB0aGUgcm9vdCBjcmVhdGVzKS4KLSAgICBhdXRvIGZvcm1hdHRpbmdDb250ZXh0ID0gbGF5b3V0 U3RhdGUoKS5jcmVhdGVGb3JtYXR0aW5nU3RhdGVGb3JGb3JtYXR0aW5nUm9vdElmTmVlZGVkKHJv b3QpLmNyZWF0ZUZvcm1hdHRpbmdDb250ZXh0KHJvb3QpOworICAgIGF1dG8gZm9ybWF0dGluZ0Nv bnRleHQgPSBsYXlvdXRTdGF0ZSgpLmNyZWF0ZUZvcm1hdHRpbmdDb250ZXh0KHJvb3QpOwogICAg IGZvcm1hdHRpbmdDb250ZXh0LT5sYXlvdXQoKTsKICAgICAvLyBDb21lIGJhY2sgYW5kIGZpbmFs aXplIHRoZSByb290J3MgaGVpZ2h0IGFuZCBtYXJnaW4uCiAgICAgY29tcHV0ZUhlaWdodEFuZE1h cmdpbihyb290KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3Jt YXR0aW5nL0lubGluZUZvcm1hdHRpbmdTdGF0ZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv aW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nU3RhdGUuY3BwCmluZGV4IGJhZTE1ODg4 YjQ5OWQ5Yzg3MmM2ZmU2Y2I3MTI2M2FkZjIyMTJjYmIuLjg3YjZjOTVjMTU0NWQ2NDVjZGJkNGIw NTQ2YWVjMTg2Y2YzY2NmNWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxp bmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdTdGF0ZS5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ1N0YXRlLmNwcApAQCAt NDQsMTIgKzQ0LDYgQEAgSW5saW5lRm9ybWF0dGluZ1N0YXRlOjp+SW5saW5lRm9ybWF0dGluZ1N0 YXRlKCkKIHsKIH0KIAotc3RkOjp1bmlxdWVfcHRyPEZvcm1hdHRpbmdDb250ZXh0PiBJbmxpbmVG b3JtYXR0aW5nU3RhdGU6OmNyZWF0ZUZvcm1hdHRpbmdDb250ZXh0KGNvbnN0IEJveCYgZm9ybWF0 dGluZ0NvbnRleHRSb290KQotewotICAgIEFTU0VSVChmb3JtYXR0aW5nQ29udGV4dFJvb3QuZXN0 YWJsaXNoZXNJbmxpbmVGb3JtYXR0aW5nQ29udGV4dCgpKTsKLSAgICByZXR1cm4gc3RkOjptYWtl X3VuaXF1ZTxJbmxpbmVGb3JtYXR0aW5nQ29udGV4dD4oZm9ybWF0dGluZ0NvbnRleHRSb290LCAq dGhpcyk7Ci19Ci0KIH0KIH0KICNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ1N0YXRlLmggYi9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nU3RhdGUuaAppbmRl eCBhNDg3MmViNjI0OWZkZTIwMTlmNzEyYzczOWVlMDk3NGRiZWNjOThiLi42NjJhODNjM2ViYzUx YmE3YjBlM2M0ZWFjY2Y1MTg0NGU5ZWQ2NTljIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nU3RhdGUuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nU3RhdGUu aApAQCAtNDMsOCArNDMsNiBAQCBwdWJsaWM6CiAgICAgSW5saW5lRm9ybWF0dGluZ1N0YXRlKFJl ZjxGbG9hdGluZ1N0YXRlPiYmLCBMYXlvdXRTdGF0ZSYpOwogICAgIHZpcnR1YWwgfklubGluZUZv cm1hdHRpbmdTdGF0ZSgpOwogCi0gICAgc3RkOjp1bmlxdWVfcHRyPEZvcm1hdHRpbmdDb250ZXh0 PiBjcmVhdGVGb3JtYXR0aW5nQ29udGV4dChjb25zdCBCb3gmIGZvcm1hdHRpbmdDb250ZXh0Um9v dCkgb3ZlcnJpZGU7Ci0KICAgICBJbmxpbmVDb250ZW50JiBpbmxpbmVDb250ZW50KCkgeyByZXR1 cm4gbV9pbmxpbmVDb250ZW50OyB9CiAgICAgSW5saW5lSXRlbSogbGFzdElubGluZUl0ZW0oKSBj b25zdCB7IHJldHVybiBtX2lubGluZUNvbnRlbnQuaXNFbXB0eSgpID8gbnVsbHB0ciA6IG1faW5s aW5lQ29udGVudC5sYXN0KCkuZ2V0KCk7IH0KIAo=