179483 2017-11-09 08:53:33 -0800 [LayoutState cleanup] Remove renderer data members from state maintainers. 2017-11-09 10:50:09 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham commit-queue darin koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1369883 0 zalan 2017-11-09 08:53:33 -0800 Although layout is not supposed to mutate the tree, it's safer not to have them as data members. 1369884 1 webkit-bug-importer 2017-11-09 08:55:46 -0800 <rdar://problem/35442548> 1369886 2 326452 zalan 2017-11-09 08:58:26 -0800 Created attachment 326452 Patch 1369910 3 326452 darin 2017-11-09 09:25:57 -0800 Comment on attachment 326452 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=326452&action=review > Source/WebCore/rendering/LayoutState.h:165 > + LayoutContext* m_layoutContext { nullptr }; I would have just called this "m_acontext" since the class is all about layout and has layout in its name. > Source/WebCore/rendering/LayoutState.h:185 > + LayoutContext& m_layoutContext; Ditto. 1369929 4 zalan 2017-11-09 10:03:25 -0800 (In reply to Darin Adler from comment #3) > Comment on attachment 326452 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=326452&action=review > > > Source/WebCore/rendering/LayoutState.h:165 > > + LayoutContext* m_layoutContext { nullptr }; > > I would have just called this "m_acontext" since the class is all about > layout and has layout in its name. Indeed. 1369945 5 326465 zalan 2017-11-09 10:27:34 -0800 Created attachment 326465 Patch 1369960 6 326465 commit-queue 2017-11-09 10:50:07 -0800 Comment on attachment 326465 Patch Clearing flags on attachment: 326465 Committed r224637: <https://trac.webkit.org/changeset/224637> 1369961 7 commit-queue 2017-11-09 10:50:09 -0800 All reviewed patches have been landed. Closing bug. 326452 2017-11-09 08:58:26 -0800 2017-11-09 10:27:33 -0800 Patch bug-179483-20171109085825.patch text/plain 6613 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjI0NjI2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGE3NmZlODFhYjVhODcx M2RkNDhjMWRjY2EyYzY1YmVhZTNhZDkzZS4uNzE4MzdlZDRkNWZlYWIzYzNkNjFkNmQ0ZmNhNzdm OTc1M2NjZGE3NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDE3LTExLTA5ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xheW91dFN0YXRlIGNsZWFu dXBdIFJlbW92ZSByZW5kZXJlciBkYXRhIG1lbWJlcnMgZnJvbSBzdGF0ZSBtYWludGFpbmVycy4K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3OTQ4Mwor ICAgICAgICA8cmRhcjovL3Byb2JsZW0vMzU0NDI1NDg+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWx0aG91Z2ggbGF5b3V0IGlzIG5vdCBzdXBwb3Nl ZCB0byBtdXRhdGUgdGhlIHRyZWUgYW55bW9yZSwgaXQncyBzYWZlciB0byB1c2UgTGF5b3V0Q29u dGV4dCBpbnN0ZWFkLgorCisgICAgICAgIE5vIGNoYW5nZSBpbiBmdW5jdGlvbmFsaXR5LgorCisg ICAgICAgICogcGFnZS9MYXlvdXRDb250ZXh0LmNwcDoKKyAgICAgICAgKiBwYWdlL0xheW91dENv bnRleHQuaDoKKyAgICAgICAgKiByZW5kZXJpbmcvTGF5b3V0U3RhdGUuY3BwOgorICAgICAgICAo V2ViQ29yZTo6U3VidHJlZUxheW91dFN0YXRlTWFpbnRhaW5lcjo6U3VidHJlZUxheW91dFN0YXRl TWFpbnRhaW5lcik6CisgICAgICAgIChXZWJDb3JlOjpTdWJ0cmVlTGF5b3V0U3RhdGVNYWludGFp bmVyOjp+U3VidHJlZUxheW91dFN0YXRlTWFpbnRhaW5lcik6CisgICAgICAgIChXZWJDb3JlOjpQ YWdpbmF0ZWRMYXlvdXRTdGF0ZU1haW50YWluZXI6OlBhZ2luYXRlZExheW91dFN0YXRlTWFpbnRh aW5lcik6CisgICAgICAgIChXZWJDb3JlOjpQYWdpbmF0ZWRMYXlvdXRTdGF0ZU1haW50YWluZXI6 On5QYWdpbmF0ZWRMYXlvdXRTdGF0ZU1haW50YWluZXIpOgorICAgICAgICAqIHJlbmRlcmluZy9M YXlvdXRTdGF0ZS5oOgorCiAyMDE3LTExLTA5ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5j b20+CiAKICAgICAgICAgW0xheW91dFN0YXRlIGNsZWFudXBdIEFkZCBwYWdpbmF0aW9uIHBhcmFt ZXRlciB0byBzdWJ0cmVlIExheW91dFN0YXRlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w YWdlL0xheW91dENvbnRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9MYXlvdXRDb250ZXh0 LmNwcAppbmRleCA0MGNlMGFhNzhkNWU4NTc2NzVmMzJlODVkMjUyNjQwNDUyNmU3NWU4Li4wY2Nl MjkxZjJjZjVhZjhiOTk5ZTIyOTlmZjUzNzBjNDA4MmUyNDNkIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wYWdlL0xheW91dENvbnRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv TGF5b3V0Q29udGV4dC5jcHAKQEAgLTU3MywxMSArNTczLDYgQEAgYm9vbCBMYXlvdXRDb250ZXh0 OjpwdXNoTGF5b3V0U3RhdGVGb3JQYWdpbmF0aW9uSWZOZWVkZWQoUmVuZGVyQmxvY2tGbG93JiBs YXlvdXQKICAgICByZXR1cm4gdHJ1ZTsKIH0KICAgICAKLXZvaWQgTGF5b3V0Q29udGV4dDo6cG9w TGF5b3V0U3RhdGUoUmVuZGVyT2JqZWN0JikKLXsKLSAgICByZXR1cm4gcG9wTGF5b3V0U3RhdGUo KTsKLX0KLSAgICAKIGJvb2wgTGF5b3V0Q29udGV4dDo6cHVzaExheW91dFN0YXRlKFJlbmRlckJv eCYgcmVuZGVyZXIsIGNvbnN0IExheW91dFNpemUmIG9mZnNldCwgTGF5b3V0VW5pdCBwYWdlSGVp Z2h0LCBib29sIHBhZ2VIZWlnaHRDaGFuZ2VkKQogewogICAgIC8vIFdlIHB1c2ggTGF5b3V0U3Rh dGUgZXZlbiBpZiBsYXlvdXRTdGF0ZSBpcyBkaXNhYmxlZCBiZWNhdXNlIGl0IHN0b3JlcyBsYXlv dXREZWx0YSB0b28uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0xheW91dENvbnRl eHQuaCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvTGF5b3V0Q29udGV4dC5oCmluZGV4IDc4Y2NkMGQ0 Y2IxNWM4N2Q0MTBlN2U5YWUxZmJhZTFjZmUzM2Y2NmMuLjcwMzQ0MjIyYzQ5Njg1MDI1MjFjZmNl ZTdiMzljOWQ3ZGU5NDQwZTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvTGF5b3V0 Q29udGV4dC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvTGF5b3V0Q29udGV4dC5oCkBAIC05 MiwxMCArOTIsNiBAQCBwdWJsaWM6CiAKICAgICB2b2lkIGZsdXNoQXN5bmNocm9ub3VzVGFza3Mo KTsKIAotICAgIC8vIFN1YnRyZWUgcHVzaC9wb3AKLSAgICB2b2lkIHB1c2hMYXlvdXRTdGF0ZShS ZW5kZXJFbGVtZW50Jik7Ci0gICAgYm9vbCBwdXNoTGF5b3V0U3RhdGVGb3JQYWdpbmF0aW9uSWZO ZWVkZWQoUmVuZGVyQmxvY2tGbG93Jik7Ci0gICAgdm9pZCBwb3BMYXlvdXRTdGF0ZShSZW5kZXJP YmplY3QmKTsKICAgICBMYXlvdXRTdGF0ZSogbGF5b3V0U3RhdGUoKSBjb25zdDsKICAgICAvLyBS ZXR1cm5zIHRydWUgaWYgbGF5b3V0U3RhdGUgc2hvdWxkIGJlIHVzZWQgZm9yIGl0cyBjYWNoZWQg b2Zmc2V0IGFuZCBjbGlwLgogICAgIGJvb2wgaXNQYWludE9mZnNldENhY2hlRW5hYmxlZCgpIGNv bnN0IHsgcmV0dXJuICFtX3BhaW50T2Zmc2V0Q2FjaGVEaXNhYmxlQ291bnQgJiYgbGF5b3V0U3Rh dGUoKTsgfQpAQCAtMTE3LDYgKzExMyw3IEBAIHByaXZhdGU6CiAgICAgZnJpZW5kIGNsYXNzIExh eW91dFN0YXRlTWFpbnRhaW5lcjsKICAgICBmcmllbmQgY2xhc3MgTGF5b3V0U3RhdGVEaXNhYmxl cjsKICAgICBmcmllbmQgY2xhc3MgU3VidHJlZUxheW91dFN0YXRlTWFpbnRhaW5lcjsKKyAgICBm cmllbmQgY2xhc3MgUGFnaW5hdGVkTGF5b3V0U3RhdGVNYWludGFpbmVyOwogCiAgICAgYm9vbCBj YW5QZXJmb3JtTGF5b3V0KCkgY29uc3Q7CiAgICAgYm9vbCBsYXlvdXREaXNhbGxvd2VkKCkgY29u c3QgeyByZXR1cm4gbV9sYXlvdXREaXNhbGxvd2VkQ291bnQ7IH0KQEAgLTEzOCw2ICsxMzUsOSBA QCBwcml2YXRlOgogICAgIHZvaWQgc3RhcnRMYXlvdXRBdE1haW5GcmFtZVZpZXdJZk5lZWRlZCgp OwogCiAgICAgLy8gVGhlc2UgZnVuY3Rpb25zIG1heSBvbmx5IGJlIGFjY2Vzc2VkIGJ5IExheW91 dFN0YXRlTWFpbnRhaW5lci4KKyAgICAvLyBTdWJ0cmVlIHB1c2gvcG9wCisgICAgdm9pZCBwdXNo TGF5b3V0U3RhdGUoUmVuZGVyRWxlbWVudCYpOworICAgIGJvb2wgcHVzaExheW91dFN0YXRlRm9y UGFnaW5hdGlvbklmTmVlZGVkKFJlbmRlckJsb2NrRmxvdyYpOwogICAgIGJvb2wgcHVzaExheW91 dFN0YXRlKFJlbmRlckJveCYgcmVuZGVyZXIsIGNvbnN0IExheW91dFNpemUmIG9mZnNldCwgTGF5 b3V0VW5pdCBwYWdlSGVpZ2h0ID0gMCwgYm9vbCBwYWdlSGVpZ2h0Q2hhbmdlZCA9IGZhbHNlKTsK ICAgICB2b2lkIHBvcExheW91dFN0YXRlKCk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9MYXlvdXRTdGF0ZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvTGF5 b3V0U3RhdGUuY3BwCmluZGV4IGQ0MzA2MjY4MTViMGYxOTdhZjFlMDJjZTBiZmQwY2Y1ZDgyYmZj MzUuLjhlZWU1ZWI0MGMwNTFmMTQ2ZTRjMTg3Yjc0ZTZiNTI1MDY0YWY2ZmMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9MYXlvdXRTdGF0ZS5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL0xheW91dFN0YXRlLmNwcApAQCAtMzM3LDEzICszMzcsMTIgQEAgc3Rh dGljIGJvb2wgc2hvdWxkRGlzYWJsZVBhaW50T2Zmc2V0Q2FjaGVGb3JTdWJ0cmVlKFJlbmRlckVs ZW1lbnQmIHN1YnRyZWVMYXlvdXQKIH0KIAogU3VidHJlZUxheW91dFN0YXRlTWFpbnRhaW5lcjo6 U3VidHJlZUxheW91dFN0YXRlTWFpbnRhaW5lcihSZW5kZXJFbGVtZW50KiBzdWJ0cmVlTGF5b3V0 Um9vdCkKLSAgICA6IG1fc3VidHJlZUxheW91dFJvb3Qoc3VidHJlZUxheW91dFJvb3QpCiB7Ci0g ICAgaWYgKG1fc3VidHJlZUxheW91dFJvb3QpIHsKLSAgICAgICAgYXV0byYgbGF5b3V0Q29udGV4 dCA9IG1fc3VidHJlZUxheW91dFJvb3QtPnZpZXcoKS5mcmFtZVZpZXcoKS5sYXlvdXRDb250ZXh0 KCk7Ci0gICAgICAgIGxheW91dENvbnRleHQucHVzaExheW91dFN0YXRlKCptX3N1YnRyZWVMYXlv dXRSb290KTsKLSAgICAgICAgaWYgKHNob3VsZERpc2FibGVQYWludE9mZnNldENhY2hlRm9yU3Vi dHJlZSgqbV9zdWJ0cmVlTGF5b3V0Um9vdCkpIHsKLSAgICAgICAgICAgIGxheW91dENvbnRleHQu ZGlzYWJsZVBhaW50T2Zmc2V0Q2FjaGUoKTsKKyAgICBpZiAoc3VidHJlZUxheW91dFJvb3QpIHsK KyAgICAgICAgbV9sYXlvdXRDb250ZXh0ID0gJnN1YnRyZWVMYXlvdXRSb290LT52aWV3KCkuZnJh bWVWaWV3KCkubGF5b3V0Q29udGV4dCgpOworICAgICAgICBtX2xheW91dENvbnRleHQtPnB1c2hM YXlvdXRTdGF0ZSgqc3VidHJlZUxheW91dFJvb3QpOworICAgICAgICBpZiAoc2hvdWxkRGlzYWJs ZVBhaW50T2Zmc2V0Q2FjaGVGb3JTdWJ0cmVlKCpzdWJ0cmVlTGF5b3V0Um9vdCkpIHsKKyAgICAg ICAgICAgIG1fbGF5b3V0Q29udGV4dC0+ZGlzYWJsZVBhaW50T2Zmc2V0Q2FjaGUoKTsKICAgICAg ICAgICAgIG1fZGlkRGlzYWJsZVBhaW50T2Zmc2V0Q2FjaGUgPSB0cnVlOwogICAgICAgICB9CiAg ICAgfQpAQCAtMzUxLDI0ICszNTAsMjMgQEAgU3VidHJlZUxheW91dFN0YXRlTWFpbnRhaW5lcjo6 U3VidHJlZUxheW91dFN0YXRlTWFpbnRhaW5lcihSZW5kZXJFbGVtZW50KiBzdWJ0cmUKIAogU3Vi dHJlZUxheW91dFN0YXRlTWFpbnRhaW5lcjo6flN1YnRyZWVMYXlvdXRTdGF0ZU1haW50YWluZXIo KQogewotICAgIGlmIChtX3N1YnRyZWVMYXlvdXRSb290KSB7Ci0gICAgICAgIGF1dG8mIGxheW91 dENvbnRleHQgPSBtX3N1YnRyZWVMYXlvdXRSb290LT52aWV3KCkuZnJhbWVWaWV3KCkubGF5b3V0 Q29udGV4dCgpOwotICAgICAgICBsYXlvdXRDb250ZXh0LnBvcExheW91dFN0YXRlKCptX3N1YnRy ZWVMYXlvdXRSb290KTsKKyAgICBpZiAobV9sYXlvdXRDb250ZXh0KSB7CisgICAgICAgIG1fbGF5 b3V0Q29udGV4dC0+cG9wTGF5b3V0U3RhdGUoKTsKICAgICAgICAgaWYgKG1fZGlkRGlzYWJsZVBh aW50T2Zmc2V0Q2FjaGUpCi0gICAgICAgICAgICBsYXlvdXRDb250ZXh0LmVuYWJsZVBhaW50T2Zm c2V0Q2FjaGUoKTsKKyAgICAgICAgICAgIG1fbGF5b3V0Q29udGV4dC0+ZW5hYmxlUGFpbnRPZmZz ZXRDYWNoZSgpOwogICAgIH0KIH0KIAogUGFnaW5hdGVkTGF5b3V0U3RhdGVNYWludGFpbmVyOjpQ YWdpbmF0ZWRMYXlvdXRTdGF0ZU1haW50YWluZXIoUmVuZGVyQmxvY2tGbG93JiBmbG93KQotICAg IDogbV9mbG93KGZsb3cpCi0gICAgLCBtX3B1c2hlZChmbG93LnZpZXcoKS5mcmFtZVZpZXcoKS5s YXlvdXRDb250ZXh0KCkucHVzaExheW91dFN0YXRlRm9yUGFnaW5hdGlvbklmTmVlZGVkKGZsb3cp KQorICAgIDogbV9sYXlvdXRDb250ZXh0KGZsb3cudmlldygpLmZyYW1lVmlldygpLmxheW91dENv bnRleHQoKSkKKyAgICAsIG1fcHVzaGVkKG1fbGF5b3V0Q29udGV4dC5wdXNoTGF5b3V0U3RhdGVG b3JQYWdpbmF0aW9uSWZOZWVkZWQoZmxvdykpCiB7CiB9CiAKIFBhZ2luYXRlZExheW91dFN0YXRl TWFpbnRhaW5lcjo6flBhZ2luYXRlZExheW91dFN0YXRlTWFpbnRhaW5lcigpCiB7CiAgICAgaWYg KG1fcHVzaGVkKQotICAgICAgICBtX2Zsb3cudmlldygpLmZyYW1lVmlldygpLmxheW91dENvbnRl eHQoKS5wb3BMYXlvdXRTdGF0ZShtX2Zsb3cpOworICAgICAgICBtX2xheW91dENvbnRleHQucG9w TGF5b3V0U3RhdGUoKTsKIH0KIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0xheW91dFN0YXRlLmggYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvTGF5b3V0U3RhdGUuaAppbmRleCA2YzJmODRmZTEzNzJjNTNlMDU2MTY4Y2NlYWQ2 NWNjY2Y4ZDNjZGRmLi45YjY5MTUyMzYxZGQ5MjAzODg5ZTU4ODAyYzAxZTM0MzFkYjNmMjllIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvTGF5b3V0U3RhdGUuaAorKysgYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvTGF5b3V0U3RhdGUuaApAQCAtMTYyLDcgKzE2Miw3IEBA IHB1YmxpYzoKICAgICB+U3VidHJlZUxheW91dFN0YXRlTWFpbnRhaW5lcigpOwogCiBwcml2YXRl OgotICAgIFJlbmRlckVsZW1lbnQqIG1fc3VidHJlZUxheW91dFJvb3QgeyBudWxscHRyIH07Cisg ICAgTGF5b3V0Q29udGV4dCogbV9sYXlvdXRDb250ZXh0IHsgbnVsbHB0ciB9OwogICAgIGJvb2wg bV9kaWREaXNhYmxlUGFpbnRPZmZzZXRDYWNoZSB7IGZhbHNlIH07CiB9OwogCkBAIC0xODIsNyAr MTgyLDcgQEAgcHVibGljOgogICAgIH5QYWdpbmF0ZWRMYXlvdXRTdGF0ZU1haW50YWluZXIoKTsK IAogcHJpdmF0ZToKLSAgICBSZW5kZXJCbG9ja0Zsb3cmIG1fZmxvdzsKKyAgICBMYXlvdXRDb250 ZXh0JiBtX2xheW91dENvbnRleHQ7CiAgICAgYm9vbCBtX3B1c2hlZCB7IGZhbHNlIH07CiB9Owog Cg== 326465 2017-11-09 10:27:34 -0800 2017-11-09 10:50:07 -0800 Patch bug-179483-20171109102733.patch text/plain 9258 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjI0NjI2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGE3NmZlODFhYjVhODcx M2RkNDhjMWRjY2EyYzY1YmVhZTNhZDkzZS4uNzU3YzdhYzhhZjNiYzI3NmY3NzliNmU2NTcxNjVm MWU2ZDdjZjI0OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDE3LTExLTA5ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xheW91dFN0YXRlIGNsZWFu dXBdIFJlbW92ZSByZW5kZXJlciBkYXRhIG1lbWJlcnMgZnJvbSBzdGF0ZSBtYWludGFpbmVycy4K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3OTQ4Mwor ICAgICAgICA8cmRhcjovL3Byb2JsZW0vMzU0NDI1NDg+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg RGFyaW4gQWRsZXIuCisKKyAgICAgICAgQWx0aG91Z2ggbGF5b3V0IGlzIG5vdCBzdXBwb3NlZCB0 byBtdXRhdGUgdGhlIHRyZWUgYW55bW9yZSwgaXQncyBzYWZlciB0byB1c2UgTGF5b3V0Q29udGV4 dCBpbnN0ZWFkLgorCisgICAgICAgIE5vIGNoYW5nZSBpbiBmdW5jdGlvbmFsaXR5LgorCisgICAg ICAgICogcGFnZS9MYXlvdXRDb250ZXh0LmNwcDoKKyAgICAgICAgKiBwYWdlL0xheW91dENvbnRl eHQuaDoKKyAgICAgICAgKiByZW5kZXJpbmcvTGF5b3V0U3RhdGUuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6U3VidHJlZUxheW91dFN0YXRlTWFpbnRhaW5lcjo6U3VidHJlZUxheW91dFN0YXRlTWFp bnRhaW5lcik6CisgICAgICAgIChXZWJDb3JlOjpTdWJ0cmVlTGF5b3V0U3RhdGVNYWludGFpbmVy Ojp+U3VidHJlZUxheW91dFN0YXRlTWFpbnRhaW5lcik6CisgICAgICAgIChXZWJDb3JlOjpQYWdp bmF0ZWRMYXlvdXRTdGF0ZU1haW50YWluZXI6OlBhZ2luYXRlZExheW91dFN0YXRlTWFpbnRhaW5l cik6CisgICAgICAgIChXZWJDb3JlOjpQYWdpbmF0ZWRMYXlvdXRTdGF0ZU1haW50YWluZXI6On5Q YWdpbmF0ZWRMYXlvdXRTdGF0ZU1haW50YWluZXIpOgorICAgICAgICAqIHJlbmRlcmluZy9MYXlv dXRTdGF0ZS5oOgorCiAyMDE3LTExLTA5ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+ CiAKICAgICAgICAgW0xheW91dFN0YXRlIGNsZWFudXBdIEFkZCBwYWdpbmF0aW9uIHBhcmFtZXRl ciB0byBzdWJ0cmVlIExheW91dFN0YXRlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdl L0xheW91dENvbnRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9MYXlvdXRDb250ZXh0LmNw cAppbmRleCA0MGNlMGFhNzhkNWU4NTc2NzVmMzJlODVkMjUyNjQwNDUyNmU3NWU4Li4wY2NlMjkx ZjJjZjVhZjhiOTk5ZTIyOTlmZjUzNzBjNDA4MmUyNDNkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wYWdlL0xheW91dENvbnRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvTGF5 b3V0Q29udGV4dC5jcHAKQEAgLTU3MywxMSArNTczLDYgQEAgYm9vbCBMYXlvdXRDb250ZXh0Ojpw dXNoTGF5b3V0U3RhdGVGb3JQYWdpbmF0aW9uSWZOZWVkZWQoUmVuZGVyQmxvY2tGbG93JiBsYXlv dXQKICAgICByZXR1cm4gdHJ1ZTsKIH0KICAgICAKLXZvaWQgTGF5b3V0Q29udGV4dDo6cG9wTGF5 b3V0U3RhdGUoUmVuZGVyT2JqZWN0JikKLXsKLSAgICByZXR1cm4gcG9wTGF5b3V0U3RhdGUoKTsK LX0KLSAgICAKIGJvb2wgTGF5b3V0Q29udGV4dDo6cHVzaExheW91dFN0YXRlKFJlbmRlckJveCYg cmVuZGVyZXIsIGNvbnN0IExheW91dFNpemUmIG9mZnNldCwgTGF5b3V0VW5pdCBwYWdlSGVpZ2h0 LCBib29sIHBhZ2VIZWlnaHRDaGFuZ2VkKQogewogICAgIC8vIFdlIHB1c2ggTGF5b3V0U3RhdGUg ZXZlbiBpZiBsYXlvdXRTdGF0ZSBpcyBkaXNhYmxlZCBiZWNhdXNlIGl0IHN0b3JlcyBsYXlvdXRE ZWx0YSB0b28uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0xheW91dENvbnRleHQu aCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvTGF5b3V0Q29udGV4dC5oCmluZGV4IDc4Y2NkMGQ0Y2Ix NWM4N2Q0MTBlN2U5YWUxZmJhZTFjZmUzM2Y2NmMuLjcwMzQ0MjIyYzQ5Njg1MDI1MjFjZmNlZTdi MzljOWQ3ZGU5NDQwZTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvTGF5b3V0Q29u dGV4dC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvTGF5b3V0Q29udGV4dC5oCkBAIC05Miwx MCArOTIsNiBAQCBwdWJsaWM6CiAKICAgICB2b2lkIGZsdXNoQXN5bmNocm9ub3VzVGFza3MoKTsK IAotICAgIC8vIFN1YnRyZWUgcHVzaC9wb3AKLSAgICB2b2lkIHB1c2hMYXlvdXRTdGF0ZShSZW5k ZXJFbGVtZW50Jik7Ci0gICAgYm9vbCBwdXNoTGF5b3V0U3RhdGVGb3JQYWdpbmF0aW9uSWZOZWVk ZWQoUmVuZGVyQmxvY2tGbG93Jik7Ci0gICAgdm9pZCBwb3BMYXlvdXRTdGF0ZShSZW5kZXJPYmpl Y3QmKTsKICAgICBMYXlvdXRTdGF0ZSogbGF5b3V0U3RhdGUoKSBjb25zdDsKICAgICAvLyBSZXR1 cm5zIHRydWUgaWYgbGF5b3V0U3RhdGUgc2hvdWxkIGJlIHVzZWQgZm9yIGl0cyBjYWNoZWQgb2Zm c2V0IGFuZCBjbGlwLgogICAgIGJvb2wgaXNQYWludE9mZnNldENhY2hlRW5hYmxlZCgpIGNvbnN0 IHsgcmV0dXJuICFtX3BhaW50T2Zmc2V0Q2FjaGVEaXNhYmxlQ291bnQgJiYgbGF5b3V0U3RhdGUo KTsgfQpAQCAtMTE3LDYgKzExMyw3IEBAIHByaXZhdGU6CiAgICAgZnJpZW5kIGNsYXNzIExheW91 dFN0YXRlTWFpbnRhaW5lcjsKICAgICBmcmllbmQgY2xhc3MgTGF5b3V0U3RhdGVEaXNhYmxlcjsK ICAgICBmcmllbmQgY2xhc3MgU3VidHJlZUxheW91dFN0YXRlTWFpbnRhaW5lcjsKKyAgICBmcmll bmQgY2xhc3MgUGFnaW5hdGVkTGF5b3V0U3RhdGVNYWludGFpbmVyOwogCiAgICAgYm9vbCBjYW5Q ZXJmb3JtTGF5b3V0KCkgY29uc3Q7CiAgICAgYm9vbCBsYXlvdXREaXNhbGxvd2VkKCkgY29uc3Qg eyByZXR1cm4gbV9sYXlvdXREaXNhbGxvd2VkQ291bnQ7IH0KQEAgLTEzOCw2ICsxMzUsOSBAQCBw cml2YXRlOgogICAgIHZvaWQgc3RhcnRMYXlvdXRBdE1haW5GcmFtZVZpZXdJZk5lZWRlZCgpOwog CiAgICAgLy8gVGhlc2UgZnVuY3Rpb25zIG1heSBvbmx5IGJlIGFjY2Vzc2VkIGJ5IExheW91dFN0 YXRlTWFpbnRhaW5lci4KKyAgICAvLyBTdWJ0cmVlIHB1c2gvcG9wCisgICAgdm9pZCBwdXNoTGF5 b3V0U3RhdGUoUmVuZGVyRWxlbWVudCYpOworICAgIGJvb2wgcHVzaExheW91dFN0YXRlRm9yUGFn aW5hdGlvbklmTmVlZGVkKFJlbmRlckJsb2NrRmxvdyYpOwogICAgIGJvb2wgcHVzaExheW91dFN0 YXRlKFJlbmRlckJveCYgcmVuZGVyZXIsIGNvbnN0IExheW91dFNpemUmIG9mZnNldCwgTGF5b3V0 VW5pdCBwYWdlSGVpZ2h0ID0gMCwgYm9vbCBwYWdlSGVpZ2h0Q2hhbmdlZCA9IGZhbHNlKTsKICAg ICB2b2lkIHBvcExheW91dFN0YXRlKCk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9MYXlvdXRTdGF0ZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvTGF5b3V0 U3RhdGUuY3BwCmluZGV4IGQ0MzA2MjY4MTViMGYxOTdhZjFlMDJjZTBiZmQwY2Y1ZDgyYmZjMzUu LjRhYzgwNTQ0MDc5NGZjMzJiYzY3MDgyNzMxMTQzZmQ1ZDdhNTE1ZGUgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9MYXlvdXRTdGF0ZS5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL0xheW91dFN0YXRlLmNwcApAQCAtMjcyLDE0ICsyNzIsMTQgQEAgYm9vbCBM YXlvdXRTdGF0ZTo6bGF5b3V0RGVsdGFNYXRjaGVzKExheW91dFNpemUgZGVsdGEpIGNvbnN0CiAj ZW5kaWYKIAogTGF5b3V0U3RhdGVNYWludGFpbmVyOjpMYXlvdXRTdGF0ZU1haW50YWluZXIoUmVu ZGVyQm94JiByb290LCBMYXlvdXRTaXplIG9mZnNldCwgYm9vbCBkaXNhYmxlUGFpbnRPZmZzZXRD YWNoZSwgTGF5b3V0VW5pdCBwYWdlSGVpZ2h0LCBib29sIHBhZ2VIZWlnaHRDaGFuZ2VkKQotICAg IDogbV9sYXlvdXRDb250ZXh0KHJvb3QudmlldygpLmZyYW1lVmlldygpLmxheW91dENvbnRleHQo KSkKKyAgICA6IG1fY29udGV4dChyb290LnZpZXcoKS5mcmFtZVZpZXcoKS5sYXlvdXRDb250ZXh0 KCkpCiAgICAgLCBtX3BhaW50T2Zmc2V0Q2FjaGVJc0Rpc2FibGVkKGRpc2FibGVQYWludE9mZnNl dENhY2hlKQogewogICAgIHB1c2gocm9vdCwgb2Zmc2V0LCBwYWdlSGVpZ2h0LCBwYWdlSGVpZ2h0 Q2hhbmdlZCk7CiB9CiAKLUxheW91dFN0YXRlTWFpbnRhaW5lcjo6TGF5b3V0U3RhdGVNYWludGFp bmVyKExheW91dENvbnRleHQmIGxheW91dENvbnRleHQpCi0gICAgOiBtX2xheW91dENvbnRleHQo bGF5b3V0Q29udGV4dCkKK0xheW91dFN0YXRlTWFpbnRhaW5lcjo6TGF5b3V0U3RhdGVNYWludGFp bmVyKExheW91dENvbnRleHQmIGNvbnRleHQpCisgICAgOiBtX2NvbnRleHQoY29udGV4dCkKIHsK IH0KIApAQCAtMjk2LDExICsyOTYsMTEgQEAgdm9pZCBMYXlvdXRTdGF0ZU1haW50YWluZXI6OnB1 c2goUmVuZGVyQm94JiByb290LCBMYXlvdXRTaXplIG9mZnNldCwgTGF5b3V0VW5pdAogICAgIEFT U0VSVCghbV9kaWRDYWxsUHVzaCk7CiAgICAgbV9kaWRDYWxsUHVzaCA9IHRydWU7CiAgICAgLy8g V2UgcHVzaCBzdGF0ZSBldmVuIGlmIGRpc2FibGVkLCBiZWNhdXNlIHdlIHN0aWxsIG5lZWQgdG8g c3RvcmUgbGF5b3V0RGVsdGEKLSAgICBtX2RpZFB1c2hMYXlvdXRTdGF0ZSA9IG1fbGF5b3V0Q29u dGV4dC5wdXNoTGF5b3V0U3RhdGUocm9vdCwgb2Zmc2V0LCBwYWdlSGVpZ2h0LCBwYWdlSGVpZ2h0 Q2hhbmdlZCk7CisgICAgbV9kaWRQdXNoTGF5b3V0U3RhdGUgPSBtX2NvbnRleHQucHVzaExheW91 dFN0YXRlKHJvb3QsIG9mZnNldCwgcGFnZUhlaWdodCwgcGFnZUhlaWdodENoYW5nZWQpOwogICAg IGlmICghbV9kaWRQdXNoTGF5b3V0U3RhdGUpCiAgICAgICAgIHJldHVybjsKICAgICBpZiAobV9w YWludE9mZnNldENhY2hlSXNEaXNhYmxlZCkKLSAgICAgICAgbV9sYXlvdXRDb250ZXh0LmRpc2Fi bGVQYWludE9mZnNldENhY2hlKCk7CisgICAgICAgIG1fY29udGV4dC5kaXNhYmxlUGFpbnRPZmZz ZXRDYWNoZSgpOwogfQogCiB2b2lkIExheW91dFN0YXRlTWFpbnRhaW5lcjo6cG9wKCkKQEAgLTMx MSwyMCArMzExLDIwIEBAIHZvaWQgTGF5b3V0U3RhdGVNYWludGFpbmVyOjpwb3AoKQogICAgICAg ICByZXR1cm47CiAgICAgaWYgKCFtX2RpZFB1c2hMYXlvdXRTdGF0ZSkKICAgICAgICAgcmV0dXJu OwotICAgIG1fbGF5b3V0Q29udGV4dC5wb3BMYXlvdXRTdGF0ZSgpOworICAgIG1fY29udGV4dC5w b3BMYXlvdXRTdGF0ZSgpOwogICAgIGlmIChtX3BhaW50T2Zmc2V0Q2FjaGVJc0Rpc2FibGVkKQot ICAgICAgICBtX2xheW91dENvbnRleHQuZW5hYmxlUGFpbnRPZmZzZXRDYWNoZSgpOworICAgICAg ICBtX2NvbnRleHQuZW5hYmxlUGFpbnRPZmZzZXRDYWNoZSgpOwogfQogCi1MYXlvdXRTdGF0ZURp c2FibGVyOjpMYXlvdXRTdGF0ZURpc2FibGVyKExheW91dENvbnRleHQmIGxheW91dENvbnRleHQp Ci0gICAgOiBtX2xheW91dENvbnRleHQobGF5b3V0Q29udGV4dCkKK0xheW91dFN0YXRlRGlzYWJs ZXI6OkxheW91dFN0YXRlRGlzYWJsZXIoTGF5b3V0Q29udGV4dCYgY29udGV4dCkKKyAgICA6IG1f Y29udGV4dChjb250ZXh0KQogewotICAgIG1fbGF5b3V0Q29udGV4dC5kaXNhYmxlUGFpbnRPZmZz ZXRDYWNoZSgpOworICAgIG1fY29udGV4dC5kaXNhYmxlUGFpbnRPZmZzZXRDYWNoZSgpOwogfQog CiBMYXlvdXRTdGF0ZURpc2FibGVyOjp+TGF5b3V0U3RhdGVEaXNhYmxlcigpCiB7Ci0gICAgbV9s YXlvdXRDb250ZXh0LmVuYWJsZVBhaW50T2Zmc2V0Q2FjaGUoKTsKKyAgICBtX2NvbnRleHQuZW5h YmxlUGFpbnRPZmZzZXRDYWNoZSgpOwogfQogCiBzdGF0aWMgYm9vbCBzaG91bGREaXNhYmxlUGFp bnRPZmZzZXRDYWNoZUZvclN1YnRyZWUoUmVuZGVyRWxlbWVudCYgc3VidHJlZUxheW91dFJvb3Qp CkBAIC0zMzcsMTMgKzMzNywxMiBAQCBzdGF0aWMgYm9vbCBzaG91bGREaXNhYmxlUGFpbnRPZmZz ZXRDYWNoZUZvclN1YnRyZWUoUmVuZGVyRWxlbWVudCYgc3VidHJlZUxheW91dAogfQogCiBTdWJ0 cmVlTGF5b3V0U3RhdGVNYWludGFpbmVyOjpTdWJ0cmVlTGF5b3V0U3RhdGVNYWludGFpbmVyKFJl bmRlckVsZW1lbnQqIHN1YnRyZWVMYXlvdXRSb290KQotICAgIDogbV9zdWJ0cmVlTGF5b3V0Um9v dChzdWJ0cmVlTGF5b3V0Um9vdCkKIHsKLSAgICBpZiAobV9zdWJ0cmVlTGF5b3V0Um9vdCkgewot ICAgICAgICBhdXRvJiBsYXlvdXRDb250ZXh0ID0gbV9zdWJ0cmVlTGF5b3V0Um9vdC0+dmlldygp LmZyYW1lVmlldygpLmxheW91dENvbnRleHQoKTsKLSAgICAgICAgbGF5b3V0Q29udGV4dC5wdXNo TGF5b3V0U3RhdGUoKm1fc3VidHJlZUxheW91dFJvb3QpOwotICAgICAgICBpZiAoc2hvdWxkRGlz YWJsZVBhaW50T2Zmc2V0Q2FjaGVGb3JTdWJ0cmVlKCptX3N1YnRyZWVMYXlvdXRSb290KSkgewot ICAgICAgICAgICAgbGF5b3V0Q29udGV4dC5kaXNhYmxlUGFpbnRPZmZzZXRDYWNoZSgpOworICAg IGlmIChzdWJ0cmVlTGF5b3V0Um9vdCkgeworICAgICAgICBtX2NvbnRleHQgPSAmc3VidHJlZUxh eW91dFJvb3QtPnZpZXcoKS5mcmFtZVZpZXcoKS5sYXlvdXRDb250ZXh0KCk7CisgICAgICAgIG1f Y29udGV4dC0+cHVzaExheW91dFN0YXRlKCpzdWJ0cmVlTGF5b3V0Um9vdCk7CisgICAgICAgIGlm IChzaG91bGREaXNhYmxlUGFpbnRPZmZzZXRDYWNoZUZvclN1YnRyZWUoKnN1YnRyZWVMYXlvdXRS b290KSkgeworICAgICAgICAgICAgbV9jb250ZXh0LT5kaXNhYmxlUGFpbnRPZmZzZXRDYWNoZSgp OwogICAgICAgICAgICAgbV9kaWREaXNhYmxlUGFpbnRPZmZzZXRDYWNoZSA9IHRydWU7CiAgICAg ICAgIH0KICAgICB9CkBAIC0zNTEsMjQgKzM1MCwyMyBAQCBTdWJ0cmVlTGF5b3V0U3RhdGVNYWlu dGFpbmVyOjpTdWJ0cmVlTGF5b3V0U3RhdGVNYWludGFpbmVyKFJlbmRlckVsZW1lbnQqIHN1YnRy ZQogCiBTdWJ0cmVlTGF5b3V0U3RhdGVNYWludGFpbmVyOjp+U3VidHJlZUxheW91dFN0YXRlTWFp bnRhaW5lcigpCiB7Ci0gICAgaWYgKG1fc3VidHJlZUxheW91dFJvb3QpIHsKLSAgICAgICAgYXV0 byYgbGF5b3V0Q29udGV4dCA9IG1fc3VidHJlZUxheW91dFJvb3QtPnZpZXcoKS5mcmFtZVZpZXco KS5sYXlvdXRDb250ZXh0KCk7Ci0gICAgICAgIGxheW91dENvbnRleHQucG9wTGF5b3V0U3RhdGUo Km1fc3VidHJlZUxheW91dFJvb3QpOworICAgIGlmIChtX2NvbnRleHQpIHsKKyAgICAgICAgbV9j b250ZXh0LT5wb3BMYXlvdXRTdGF0ZSgpOwogICAgICAgICBpZiAobV9kaWREaXNhYmxlUGFpbnRP ZmZzZXRDYWNoZSkKLSAgICAgICAgICAgIGxheW91dENvbnRleHQuZW5hYmxlUGFpbnRPZmZzZXRD YWNoZSgpOworICAgICAgICAgICAgbV9jb250ZXh0LT5lbmFibGVQYWludE9mZnNldENhY2hlKCk7 CiAgICAgfQogfQogCiBQYWdpbmF0ZWRMYXlvdXRTdGF0ZU1haW50YWluZXI6OlBhZ2luYXRlZExh eW91dFN0YXRlTWFpbnRhaW5lcihSZW5kZXJCbG9ja0Zsb3cmIGZsb3cpCi0gICAgOiBtX2Zsb3co ZmxvdykKLSAgICAsIG1fcHVzaGVkKGZsb3cudmlldygpLmZyYW1lVmlldygpLmxheW91dENvbnRl eHQoKS5wdXNoTGF5b3V0U3RhdGVGb3JQYWdpbmF0aW9uSWZOZWVkZWQoZmxvdykpCisgICAgOiBt X2NvbnRleHQoZmxvdy52aWV3KCkuZnJhbWVWaWV3KCkubGF5b3V0Q29udGV4dCgpKQorICAgICwg bV9wdXNoZWQobV9jb250ZXh0LnB1c2hMYXlvdXRTdGF0ZUZvclBhZ2luYXRpb25JZk5lZWRlZChm bG93KSkKIHsKIH0KIAogUGFnaW5hdGVkTGF5b3V0U3RhdGVNYWludGFpbmVyOjp+UGFnaW5hdGVk TGF5b3V0U3RhdGVNYWludGFpbmVyKCkKIHsKICAgICBpZiAobV9wdXNoZWQpCi0gICAgICAgIG1f Zmxvdy52aWV3KCkuZnJhbWVWaWV3KCkubGF5b3V0Q29udGV4dCgpLnBvcExheW91dFN0YXRlKG1f Zmxvdyk7CisgICAgICAgIG1fY29udGV4dC5wb3BMYXlvdXRTdGF0ZSgpOwogfQogCiB9IC8vIG5h bWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvTGF5 b3V0U3RhdGUuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9MYXlvdXRTdGF0ZS5oCmluZGV4 IDZjMmY4NGZlMTM3MmM1M2UwNTYxNjhjY2VhZDY1Y2NjZjhkM2NkZGYuLmMzODE5YWQ1NGJlNDc4 NDY3MDdkMWMxYzBhYjY5YzU3ODdjY2VlNjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9MYXlvdXRTdGF0ZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9MYXlv dXRTdGF0ZS5oCkBAIC0xNDksNyArMTQ5LDcgQEAgcHVibGljOgogICAgIGJvb2wgZGlkUHVzaCgp IGNvbnN0IHsgcmV0dXJuIG1fZGlkQ2FsbFB1c2g7IH0KIAogcHJpdmF0ZToKLSAgICBMYXlvdXRD b250ZXh0JiBtX2xheW91dENvbnRleHQ7CisgICAgTGF5b3V0Q29udGV4dCYgbV9jb250ZXh0Owog ICAgIGJvb2wgbV9wYWludE9mZnNldENhY2hlSXNEaXNhYmxlZCB7IGZhbHNlIH07CiAgICAgYm9v bCBtX2RpZENhbGxQdXNoIHsgZmFsc2UgfTsKICAgICBib29sIG1fZGlkQ2FsbFBvcCB7IGZhbHNl IH07CkBAIC0xNjIsNyArMTYyLDcgQEAgcHVibGljOgogICAgIH5TdWJ0cmVlTGF5b3V0U3RhdGVN YWludGFpbmVyKCk7CiAKIHByaXZhdGU6Ci0gICAgUmVuZGVyRWxlbWVudCogbV9zdWJ0cmVlTGF5 b3V0Um9vdCB7IG51bGxwdHIgfTsKKyAgICBMYXlvdXRDb250ZXh0KiBtX2NvbnRleHQgeyBudWxs cHRyIH07CiAgICAgYm9vbCBtX2RpZERpc2FibGVQYWludE9mZnNldENhY2hlIHsgZmFsc2UgfTsK IH07CiAKQEAgLTE3Myw3ICsxNzMsNyBAQCBwdWJsaWM6CiAgICAgfkxheW91dFN0YXRlRGlzYWJs ZXIoKTsKIAogcHJpdmF0ZToKLSAgICBMYXlvdXRDb250ZXh0JiBtX2xheW91dENvbnRleHQ7Cisg ICAgTGF5b3V0Q29udGV4dCYgbV9jb250ZXh0OwogfTsKIAogY2xhc3MgUGFnaW5hdGVkTGF5b3V0 U3RhdGVNYWludGFpbmVyIHsKQEAgLTE4Miw3ICsxODIsNyBAQCBwdWJsaWM6CiAgICAgflBhZ2lu YXRlZExheW91dFN0YXRlTWFpbnRhaW5lcigpOwogCiBwcml2YXRlOgotICAgIFJlbmRlckJsb2Nr RmxvdyYgbV9mbG93OworICAgIExheW91dENvbnRleHQmIG1fY29udGV4dDsKICAgICBib29sIG1f cHVzaGVkIHsgZmFsc2UgfTsKIH07CiAK