246061 2022-10-04 19:56:03 -0700 [Outline] BorderPainter functions should not take RenderStyle 2022-10-12 15:29:55 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 20807 1 zalan zalan bfulgham koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1903317 0 zalan 2022-10-04 19:56:03 -0700 ssia 1903426 1 462811 zalan 2022-10-05 08:17:33 -0700 Created attachment 462811 Patch 1903817 2 ews-feeder 2022-10-06 11:21:18 -0700 Committed 255230@main (a5cee42b3ed7): <https://commits.webkit.org/255230@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 462811. 1903818 3 webkit-bug-importer 2022-10-06 11:22:19 -0700 <rdar://problem/100862251> 462811 2022-10-05 08:17:33 -0700 2022-10-06 11:21:19 -0700 Patch bug-246061-20221005081732.patch text/plain 17537 zalan RnJvbSA0MDU1NjNhMjMwNGFjOTFiZjc2Yzg0MTJlZmU4MjkyNmUwZjEyOGZiIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJ1anRhcyA8emFsYW5AYXBwbGUuY29tPgpEYXRlOiBX ZWQsIDUgT2N0IDIwMjIgMDg6MDQ6NDggLTA3MDAKU3ViamVjdDogW1BBVENIXSBbT3V0bGluZV0g Qm9yZGVyUGFpbnRlciBmdW5jdGlvbnMgc2hvdWxkIG5vdCB0YWtlIFJlbmRlclN0eWxlCiBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjQ2MDYxCgpSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KClRoaXMgaXMgaW4gcHJlcGFyYXRpb24gZm9yIHN1cHBvcnRpbmcgb3V0 bGluZSB3aXRoIGJvcmRlci1yYWRpdXMuCihUaGlzIHBhdGNoIGVuc3VyZXMgdGhhdCBCb3JkZXJQ YWludGVyIGZ1bmN0aW9ucyBkbyBub3QgdHJ5IHRvIGNvbnN1bHQgUmVuZGVyU3R5bGUgZm9yIGJv cmRlciByZWxhdGVkIHN0eWxlIGluZm9ybWF0aW9uLiBJdCBlbmFibGVzIHVzIHRvIHVzZSB0aGVz ZSBmdW5jdGlvbnMgZm9yIGJvdGggYm9yZGVyIGFuZCBvdXRsaW5lIHBhaW50aW5nLikKCiogU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0JvcmRlclBhaW50ZXIuY3BwOgooV2ViQ29yZTo6Qm9yZGVy UGFpbnRlcjo6cGFpbnRCb3JkZXIpOgooV2ViQ29yZTo6Qm9yZGVyUGFpbnRlcjo6cGFpbnRTaWRl cyk6CihXZWJDb3JlOjpCb3JkZXJQYWludGVyOjpwYWludFRyYW5zbHVjZW50Qm9yZGVyU2lkZXMp OgooV2ViQ29yZTo6Qm9yZGVyUGFpbnRlcjo6cGFpbnRCb3JkZXJTaWRlcyk6CihXZWJDb3JlOjpC b3JkZXJQYWludGVyOjpwYWludE9uZUJvcmRlclNpZGUpOgooV2ViQ29yZTo6Qm9yZGVyUGFpbnRl cjo6ZHJhd0JveFNpZGVGcm9tUGF0aCk6CiogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0JvcmRl clBhaW50ZXIuaDoKLS0tCiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvQm9yZGVyUGFpbnRlci5j cHAgfCA1NiArKysrKysrKysrKystLS0tLS0tLS0tCiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv Qm9yZGVyUGFpbnRlci5oICAgfCAxNSArKystLS0KIDIgZmlsZXMgY2hhbmdlZCwgMzggaW5zZXJ0 aW9ucygrKSwgMzMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL0JvcmRlclBhaW50ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0JvcmRl clBhaW50ZXIuY3BwCmluZGV4IDU1MzZlMTE3YjIxNS4uOGE1YjEwMjk1NjFlIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvQm9yZGVyUGFpbnRlci5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL0JvcmRlclBhaW50ZXIuY3BwCkBAIC0xNzIsMTIgKzE3MiwxMyBA QCB2b2lkIEJvcmRlclBhaW50ZXI6OnBhaW50Qm9yZGVyKGNvbnN0IExheW91dFJlY3QmIHJlY3Qs IGNvbnN0IFJlbmRlclN0eWxlJiBzdHlsZQogICAgICAgICBibGVlZEF2b2lkYW5jZSwKICAgICAg ICAgaW5jbHVkZUxvZ2ljYWxMZWZ0RWRnZSwKICAgICAgICAgaW5jbHVkZUxvZ2ljYWxSaWdodEVk Z2UsCi0gICAgICAgIGFwcGxpZWRDbGlwQWxyZWFkeQorICAgICAgICBhcHBsaWVkQ2xpcEFscmVh ZHksCisgICAgICAgIHN0eWxlLmlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkKICAgICB9OwotICAg IHBhaW50U2lkZXMoc2lkZXMsIHN0eWxlKTsKKyAgICBwYWludFNpZGVzKHNpZGVzKTsKIH0KIAot dm9pZCBCb3JkZXJQYWludGVyOjpwYWludFNpZGVzKGNvbnN0IFNpZGVzJiBzaWRlcywgY29uc3Qg UmVuZGVyU3R5bGUmIHN0eWxlKQordm9pZCBCb3JkZXJQYWludGVyOjpwYWludFNpZGVzKGNvbnN0 IFNpZGVzJiBzaWRlcykKIHsKICAgICBHcmFwaGljc0NvbnRleHQmIGdyYXBoaWNzQ29udGV4dCA9 IG1fcGFpbnRJbmZvLmNvbnRleHQoKTsKIApAQCAtMzI1LDkgKzMyNiw5IEBAIHZvaWQgQm9yZGVy UGFpbnRlcjo6cGFpbnRTaWRlcyhjb25zdCBTaWRlcyYgc2lkZXMsIGNvbnN0IFJlbmRlclN0eWxl JiBzdHlsZSkKICAgICBib29sIGFudGlhbGlhcyA9IHNob3VsZEFudGlhbGlhc0xpbmVzKGdyYXBo aWNzQ29udGV4dCkgfHwgbnVtRWRnZXNWaXNpYmxlID09IDE7CiAgICAgSW50UG9pbnQgaW5uZXJC b3JkZXJBZGp1c3RtZW50KHNpZGVzLmlubmVyQm9yZGVyLnJlY3QoKS54KCkgLSBzaWRlcy51bmFk anVzdGVkSW5uZXJCb3JkZXIucmVjdCgpLngoKSwgc2lkZXMuaW5uZXJCb3JkZXIucmVjdCgpLnko KSAtIHNpZGVzLnVuYWRqdXN0ZWRJbm5lckJvcmRlci5yZWN0KCkueSgpKTsKICAgICBpZiAoaGF2 ZUFscGhhQ29sb3IpCi0gICAgICAgIHBhaW50VHJhbnNsdWNlbnRCb3JkZXJTaWRlcyhzdHlsZSwg c2lkZXMub3V0ZXJCb3JkZXIsIHNpZGVzLnVuYWRqdXN0ZWRJbm5lckJvcmRlciwgaW5uZXJCb3Jk ZXJBZGp1c3RtZW50LCBzaWRlcy5lZGdlcywgZWRnZXNUb0RyYXcsIHNpZGVzLmJsZWVkQXZvaWRh bmNlLCBzaWRlcy5pbmNsdWRlTG9naWNhbExlZnRFZGdlLCBzaWRlcy5pbmNsdWRlTG9naWNhbFJp Z2h0RWRnZSwgYW50aWFsaWFzKTsKKyAgICAgICAgcGFpbnRUcmFuc2x1Y2VudEJvcmRlclNpZGVz KHNpZGVzLm91dGVyQm9yZGVyLCBzaWRlcy51bmFkanVzdGVkSW5uZXJCb3JkZXIsIGlubmVyQm9y ZGVyQWRqdXN0bWVudCwgc2lkZXMuZWRnZXMsIGVkZ2VzVG9EcmF3LCBzaWRlcy5yYWRpaSwgc2lk ZXMuYmxlZWRBdm9pZGFuY2UsIHNpZGVzLmluY2x1ZGVMb2dpY2FsTGVmdEVkZ2UsIHNpZGVzLmlu Y2x1ZGVMb2dpY2FsUmlnaHRFZGdlLCBhbnRpYWxpYXMsIHNpZGVzLmlzSG9yaXpvbnRhbCk7CiAg ICAgZWxzZQotICAgICAgICBwYWludEJvcmRlclNpZGVzKHN0eWxlLCBzaWRlcy5vdXRlckJvcmRl ciwgc2lkZXMudW5hZGp1c3RlZElubmVyQm9yZGVyLCBpbm5lckJvcmRlckFkanVzdG1lbnQsIHNp ZGVzLmVkZ2VzLCBlZGdlc1RvRHJhdywgc2lkZXMuYmxlZWRBdm9pZGFuY2UsIHNpZGVzLmluY2x1 ZGVMb2dpY2FsTGVmdEVkZ2UsIHNpZGVzLmluY2x1ZGVMb2dpY2FsUmlnaHRFZGdlLCBhbnRpYWxp YXMpOworICAgICAgICBwYWludEJvcmRlclNpZGVzKHNpZGVzLm91dGVyQm9yZGVyLCBzaWRlcy51 bmFkanVzdGVkSW5uZXJCb3JkZXIsIGlubmVyQm9yZGVyQWRqdXN0bWVudCwgc2lkZXMuZWRnZXMs IGVkZ2VzVG9EcmF3LCBzaWRlcy5yYWRpaSwgc2lkZXMuYmxlZWRBdm9pZGFuY2UsIHNpZGVzLmlu Y2x1ZGVMb2dpY2FsTGVmdEVkZ2UsIHNpZGVzLmluY2x1ZGVMb2dpY2FsUmlnaHRFZGdlLCBhbnRp YWxpYXMsIHNpZGVzLmlzSG9yaXpvbnRhbCk7CiB9CiAKIGJvb2wgQm9yZGVyUGFpbnRlcjo6cGFp bnROaW5lUGllY2VJbWFnZShjb25zdCBMYXlvdXRSZWN0JiByZWN0LCBjb25zdCBSZW5kZXJTdHls ZSYgc3R5bGUsIGNvbnN0IE5pbmVQaWVjZUltYWdlJiBuaW5lUGllY2VJbWFnZSwgQ29tcG9zaXRl T3BlcmF0b3Igb3ApCkBAIC0zNTksOCArMzYwLDggQEAgYm9vbCBCb3JkZXJQYWludGVyOjpwYWlu dE5pbmVQaWVjZUltYWdlKGNvbnN0IExheW91dFJlY3QmIHJlY3QsIGNvbnN0IFJlbmRlclN0eWwK ICAgICByZXR1cm4gdHJ1ZTsKIH0KIAotdm9pZCBCb3JkZXJQYWludGVyOjpwYWludFRyYW5zbHVj ZW50Qm9yZGVyU2lkZXMoY29uc3QgUmVuZGVyU3R5bGUmIHN0eWxlLCBjb25zdCBSb3VuZGVkUmVj dCYgb3V0ZXJCb3JkZXIsIGNvbnN0IFJvdW5kZWRSZWN0JiBpbm5lckJvcmRlciwgY29uc3QgSW50 UG9pbnQmIGlubmVyQm9yZGVyQWRqdXN0bWVudCwKLSAgICBjb25zdCBCb3JkZXJFZGdlcyYgZWRn ZXMsIEJveFNpZGVTZXQgZWRnZXNUb0RyYXcsIEJhY2tncm91bmRCbGVlZEF2b2lkYW5jZSBibGVl ZEF2b2lkYW5jZSwgYm9vbCBpbmNsdWRlTG9naWNhbExlZnRFZGdlLCBib29sIGluY2x1ZGVMb2dp Y2FsUmlnaHRFZGdlLCBib29sIGFudGlhbGlhcykKK3ZvaWQgQm9yZGVyUGFpbnRlcjo6cGFpbnRU cmFuc2x1Y2VudEJvcmRlclNpZGVzKGNvbnN0IFJvdW5kZWRSZWN0JiBvdXRlckJvcmRlciwgY29u c3QgUm91bmRlZFJlY3QmIGlubmVyQm9yZGVyLCBjb25zdCBJbnRQb2ludCYgaW5uZXJCb3JkZXJB ZGp1c3RtZW50LAorICAgIGNvbnN0IEJvcmRlckVkZ2VzJiBlZGdlcywgQm94U2lkZVNldCBlZGdl c1RvRHJhdywgc3RkOjpvcHRpb25hbDxCb3JkZXJEYXRhOjpSYWRpaT4gcmFkaWksIEJhY2tncm91 bmRCbGVlZEF2b2lkYW5jZSBibGVlZEF2b2lkYW5jZSwgYm9vbCBpbmNsdWRlTG9naWNhbExlZnRF ZGdlLCBib29sIGluY2x1ZGVMb2dpY2FsUmlnaHRFZGdlLCBib29sIGFudGlhbGlhcywgYm9vbCBp c0hvcml6b250YWwpCiB7CiAgICAgLy8gd2lsbEJlT3ZlcmRyYXduIGFzc3VtZXMgdGhhdCB3ZSBk cmF3IGluIG9yZGVyOiB0b3AsIGJvdHRvbSwgbGVmdCwgcmlnaHQuCiAgICAgLy8gVGhpcyBpcyBk aWZmZXJlbnQgZnJvbSBCb3hTaWRlIGVudW0gb3JkZXIuCkBAIC0zOTMsNyArMzk0LDcgQEAgdm9p ZCBCb3JkZXJQYWludGVyOjpwYWludFRyYW5zbHVjZW50Qm9yZGVyU2lkZXMoY29uc3QgUmVuZGVy U3R5bGUmIHN0eWxlLCBjb25zdAogICAgICAgICAgICAgY29tbW9uQ29sb3IgPSBjb21tb25Db2xv ci5vcGFxdWVDb2xvcigpOwogICAgICAgICB9CiAKLSAgICAgICAgcGFpbnRCb3JkZXJTaWRlcyhz dHlsZSwgb3V0ZXJCb3JkZXIsIGlubmVyQm9yZGVyLCBpbm5lckJvcmRlckFkanVzdG1lbnQsIGVk Z2VzLCBjb21tb25Db2xvckVkZ2VTZXQsIGJsZWVkQXZvaWRhbmNlLCBpbmNsdWRlTG9naWNhbExl ZnRFZGdlLCBpbmNsdWRlTG9naWNhbFJpZ2h0RWRnZSwgYW50aWFsaWFzLCAmY29tbW9uQ29sb3Ip OworICAgICAgICBwYWludEJvcmRlclNpZGVzKG91dGVyQm9yZGVyLCBpbm5lckJvcmRlciwgaW5u ZXJCb3JkZXJBZGp1c3RtZW50LCBlZGdlcywgY29tbW9uQ29sb3JFZGdlU2V0LCByYWRpaSwgYmxl ZWRBdm9pZGFuY2UsIGluY2x1ZGVMb2dpY2FsTGVmdEVkZ2UsIGluY2x1ZGVMb2dpY2FsUmlnaHRF ZGdlLCBhbnRpYWxpYXMsIGlzSG9yaXpvbnRhbCwgJmNvbW1vbkNvbG9yKTsKIAogICAgICAgICBp ZiAodXNlVHJhbnNwYXJlbmN5TGF5ZXIpCiAgICAgICAgICAgICBtX3BhaW50SW5mby5jb250ZXh0 KCkuZW5kVHJhbnNwYXJlbmN5TGF5ZXIoKTsKQEAgLTYxNiw5ICs2MTcsOSBAQCBzdGF0aWMgUm91 bmRlZFJlY3QgY2FsY3VsYXRlQWRqdXN0ZWRJbm5lckJvcmRlcihjb25zdCBSb3VuZGVkUmVjdCZp bm5lckJvcmRlciwgQgogICAgIHJldHVybiBSb3VuZGVkUmVjdChuZXdSZWN0LCBuZXdSYWRpaSk7 CiB9CiAKLXZvaWQgQm9yZGVyUGFpbnRlcjo6cGFpbnRCb3JkZXJTaWRlcyhjb25zdCBSZW5kZXJT dHlsZSYgc3R5bGUsIGNvbnN0IFJvdW5kZWRSZWN0JiBvdXRlckJvcmRlciwgY29uc3QgUm91bmRl ZFJlY3QmIGlubmVyQm9yZGVyLAotICAgIGNvbnN0IEludFBvaW50JiBpbm5lckJvcmRlckFkanVz dG1lbnQsIGNvbnN0IEJvcmRlckVkZ2VzJiBlZGdlcywgQm94U2lkZVNldCBlZGdlU2V0LCBCYWNr Z3JvdW5kQmxlZWRBdm9pZGFuY2UgYmxlZWRBdm9pZGFuY2UsCi0gICAgYm9vbCBpbmNsdWRlTG9n aWNhbExlZnRFZGdlLCBib29sIGluY2x1ZGVMb2dpY2FsUmlnaHRFZGdlLCBib29sIGFudGlhbGlh cywgY29uc3QgQ29sb3IqIG92ZXJyaWRlQ29sb3IpCit2b2lkIEJvcmRlclBhaW50ZXI6OnBhaW50 Qm9yZGVyU2lkZXMoY29uc3QgUm91bmRlZFJlY3QmIG91dGVyQm9yZGVyLCBjb25zdCBSb3VuZGVk UmVjdCYgaW5uZXJCb3JkZXIsCisgICAgY29uc3QgSW50UG9pbnQmIGlubmVyQm9yZGVyQWRqdXN0 bWVudCwgY29uc3QgQm9yZGVyRWRnZXMmIGVkZ2VzLCBCb3hTaWRlU2V0IGVkZ2VTZXQsIHN0ZDo6 b3B0aW9uYWw8Qm9yZGVyRGF0YTo6UmFkaWk+IHJhZGlpLCBCYWNrZ3JvdW5kQmxlZWRBdm9pZGFu Y2UgYmxlZWRBdm9pZGFuY2UsCisgICAgYm9vbCBpbmNsdWRlTG9naWNhbExlZnRFZGdlLCBib29s IGluY2x1ZGVMb2dpY2FsUmlnaHRFZGdlLCBib29sIGFudGlhbGlhcywgYm9vbCBpc0hvcml6b250 YWwsIGNvbnN0IENvbG9yKiBvdmVycmlkZUNvbG9yKQogewogICAgIGJvb2wgcmVuZGVyUmFkaWkg PSBvdXRlckJvcmRlci5pc1JvdW5kZWQoKTsKIApAQCAtNjY0LDcgKzY2NSw3IEBAIHZvaWQgQm9y ZGVyUGFpbnRlcjo6cGFpbnRCb3JkZXJTaWRlcyhjb25zdCBSZW5kZXJTdHlsZSYgc3R5bGUsIGNv bnN0IFJvdW5kZWRSZWN0CiAgICAgICAgIH0KIAogICAgICAgICBib29sIHVzZVBhdGggPSByZW5k ZXJSYWRpaSAmJiAoYm9yZGVyU3R5bGVIYXNJbm5lckRldGFpbChlZGdlLnN0eWxlKCkpIHx8IGJv cmRlcldpbGxBcmNJbm5lckVkZ2UoZmlyc3RSYWRpdXMsIHNlY29uZFJhZGl1cykpOwotICAgICAg ICBwYWludE9uZUJvcmRlclNpZGUoc3R5bGUsIG91dGVyQm9yZGVyLCBpbm5lckJvcmRlciwgc2lk ZVJlY3QsIHNpZGUsIGFkamFjZW50U2lkZTEsIGFkamFjZW50U2lkZTIsIGVkZ2VzLCB1c2VQYXRo ID8gJnJvdW5kZWRQYXRoIDogbnVsbHB0ciwgYmxlZWRBdm9pZGFuY2UsIGluY2x1ZGVMb2dpY2Fs TGVmdEVkZ2UsIGluY2x1ZGVMb2dpY2FsUmlnaHRFZGdlLCBhbnRpYWxpYXMsIG92ZXJyaWRlQ29s b3IpOworICAgICAgICBwYWludE9uZUJvcmRlclNpZGUob3V0ZXJCb3JkZXIsIGlubmVyQm9yZGVy LCBzaWRlUmVjdCwgc2lkZSwgYWRqYWNlbnRTaWRlMSwgYWRqYWNlbnRTaWRlMiwgZWRnZXMsIHJh ZGlpLCB1c2VQYXRoID8gJnJvdW5kZWRQYXRoIDogbnVsbHB0ciwgYmxlZWRBdm9pZGFuY2UsIGlu Y2x1ZGVMb2dpY2FsTGVmdEVkZ2UsIGluY2x1ZGVMb2dpY2FsUmlnaHRFZGdlLCBhbnRpYWxpYXMs IGlzSG9yaXpvbnRhbCwgb3ZlcnJpZGVDb2xvcik7CiAgICAgfTsKIAogICAgIHBhaW50T25lU2lk ZShCb3hTaWRlOjpUb3AsIEJveFNpZGU6OkxlZnQsIEJveFNpZGU6OlJpZ2h0KTsKQEAgLTY3Myw5 ICs2NzQsOSBAQCB2b2lkIEJvcmRlclBhaW50ZXI6OnBhaW50Qm9yZGVyU2lkZXMoY29uc3QgUmVu ZGVyU3R5bGUmIHN0eWxlLCBjb25zdCBSb3VuZGVkUmVjdAogICAgIHBhaW50T25lU2lkZShCb3hT aWRlOjpSaWdodCwgQm94U2lkZTo6VG9wLCBCb3hTaWRlOjpCb3R0b20pOwogfQogCi12b2lkIEJv cmRlclBhaW50ZXI6OnBhaW50T25lQm9yZGVyU2lkZShjb25zdCBSZW5kZXJTdHlsZSYgc3R5bGUs IGNvbnN0IFJvdW5kZWRSZWN0JiBvdXRlckJvcmRlciwgY29uc3QgUm91bmRlZFJlY3QmIGlubmVy Qm9yZGVyLAotICAgIGNvbnN0IExheW91dFJlY3QmIHNpZGVSZWN0LCBCb3hTaWRlIHNpZGUsIEJv eFNpZGUgYWRqYWNlbnRTaWRlMSwgQm94U2lkZSBhZGphY2VudFNpZGUyLCBjb25zdCBCb3JkZXJF ZGdlcyYgZWRnZXMsIGNvbnN0IFBhdGgqIHBhdGgsCi0gICAgQmFja2dyb3VuZEJsZWVkQXZvaWRh bmNlIGJsZWVkQXZvaWRhbmNlLCBib29sIGluY2x1ZGVMb2dpY2FsTGVmdEVkZ2UsIGJvb2wgaW5j bHVkZUxvZ2ljYWxSaWdodEVkZ2UsIGJvb2wgYW50aWFsaWFzLCBjb25zdCBDb2xvciogb3ZlcnJp ZGVDb2xvcikKK3ZvaWQgQm9yZGVyUGFpbnRlcjo6cGFpbnRPbmVCb3JkZXJTaWRlKGNvbnN0IFJv dW5kZWRSZWN0JiBvdXRlckJvcmRlciwgY29uc3QgUm91bmRlZFJlY3QmIGlubmVyQm9yZGVyLAor ICAgIGNvbnN0IExheW91dFJlY3QmIHNpZGVSZWN0LCBCb3hTaWRlIHNpZGUsIEJveFNpZGUgYWRq YWNlbnRTaWRlMSwgQm94U2lkZSBhZGphY2VudFNpZGUyLCBjb25zdCBCb3JkZXJFZGdlcyYgZWRn ZXMsIHN0ZDo6b3B0aW9uYWw8Qm9yZGVyRGF0YTo6UmFkaWk+IHJhZGlpLCBjb25zdCBQYXRoKiBw YXRoLAorICAgIEJhY2tncm91bmRCbGVlZEF2b2lkYW5jZSBibGVlZEF2b2lkYW5jZSwgYm9vbCBp bmNsdWRlTG9naWNhbExlZnRFZGdlLCBib29sIGluY2x1ZGVMb2dpY2FsUmlnaHRFZGdlLCBib29s IGFudGlhbGlhcywgYm9vbCBpc0hvcml6b250YWwsIGNvbnN0IENvbG9yKiBvdmVycmlkZUNvbG9y KQogewogICAgIGF1dG8mIGVkZ2VUb1JlbmRlciA9IGVkZ2VzLmF0KHNpZGUpOwogICAgIEFTU0VS VChlZGdlVG9SZW5kZXIud2lkdGhGb3JQYWludGluZygpKTsKQEAgLTcwMSw4ICs3MDIsOCBAQCB2 b2lkIEJvcmRlclBhaW50ZXI6OnBhaW50T25lQm9yZGVyU2lkZShjb25zdCBSZW5kZXJTdHlsZSYg c3R5bGUsIGNvbnN0IFJvdW5kZWRSZQogICAgICAgICAgICAgZ3JhcGhpY3NDb250ZXh0LmNsaXBP dXRSb3VuZGVkUmVjdChGbG9hdFJvdW5kZWRSZWN0KGNhbGN1bGF0ZUFkanVzdGVkSW5uZXJCb3Jk ZXIoaW5uZXJCb3JkZXIsIHNpZGUpKSk7CiAKICAgICAgICAgZmxvYXQgdGhpY2tuZXNzID0gc3Rk OjptYXgoc3RkOjptYXgoZWRnZVRvUmVuZGVyLndpZHRoRm9yUGFpbnRpbmcoKSwgYWRqYWNlbnRF ZGdlMS53aWR0aEZvclBhaW50aW5nKCkpLCBhZGphY2VudEVkZ2UyLndpZHRoRm9yUGFpbnRpbmco KSk7Ci0gICAgICAgIGRyYXdCb3hTaWRlRnJvbVBhdGgob3V0ZXJCb3JkZXIucmVjdCgpLCAqcGF0 aCwgZWRnZXMsIGVkZ2VUb1JlbmRlci53aWR0aEZvclBhaW50aW5nKCksIHRoaWNrbmVzcywgc2lk ZSwgc3R5bGUsCi0gICAgICAgICAgICBjb2xvclRvUGFpbnQsIGVkZ2VUb1JlbmRlci5zdHlsZSgp LCBibGVlZEF2b2lkYW5jZSwgaW5jbHVkZUxvZ2ljYWxMZWZ0RWRnZSwgaW5jbHVkZUxvZ2ljYWxS aWdodEVkZ2UpOworICAgICAgICBkcmF3Qm94U2lkZUZyb21QYXRoKG91dGVyQm9yZGVyLnJlY3Qo KSwgKnBhdGgsIGVkZ2VzLCByYWRpaSwgZWRnZVRvUmVuZGVyLndpZHRoRm9yUGFpbnRpbmcoKSwg dGhpY2tuZXNzLCBzaWRlLAorICAgICAgICAgICAgY29sb3JUb1BhaW50LCBlZGdlVG9SZW5kZXIu c3R5bGUoKSwgYmxlZWRBdm9pZGFuY2UsIGluY2x1ZGVMb2dpY2FsTGVmdEVkZ2UsIGluY2x1ZGVM b2dpY2FsUmlnaHRFZGdlLCBpc0hvcml6b250YWwpOwogICAgIH0gZWxzZSB7CiAgICAgICAgIGJv b2wgY2xpcEZvclN0eWxlID0gc3R5bGVSZXF1aXJlc0NsaXBQb2x5Z29uKGVkZ2VUb1JlbmRlci5z dHlsZSgpKSAmJiAobWl0cmVBZGphY2VudFNpZGUxIHx8IG1pdHJlQWRqYWNlbnRTaWRlMik7CiAg ICAgICAgIGJvb2wgY2xpcEFkamFjZW50U2lkZTEgPSBjb2xvck5lZWRzQW50aUFsaWFzQXRDb3Ju ZXIoc2lkZSwgYWRqYWNlbnRTaWRlMSwgZWRnZXMpICYmIG1pdHJlQWRqYWNlbnRTaWRlMTsKQEAg LTcyMyw4ICs3MjQsOCBAQCB2b2lkIEJvcmRlclBhaW50ZXI6OnBhaW50T25lQm9yZGVyU2lkZShj b25zdCBSZW5kZXJTdHlsZSYgc3R5bGUsIGNvbnN0IFJvdW5kZWRSZQogfQogCiB2b2lkIEJvcmRl clBhaW50ZXI6OmRyYXdCb3hTaWRlRnJvbVBhdGgoY29uc3QgTGF5b3V0UmVjdCYgYm9yZGVyUmVj dCwgY29uc3QgUGF0aCYgYm9yZGVyUGF0aCwgY29uc3QgQm9yZGVyRWRnZXMmIGVkZ2VzLAotICAg IGZsb2F0IHRoaWNrbmVzcywgZmxvYXQgZHJhd1RoaWNrbmVzcywgQm94U2lkZSBzaWRlLCBjb25z dCBSZW5kZXJTdHlsZSYgc3R5bGUsIENvbG9yIGNvbG9yLCBCb3JkZXJTdHlsZSBib3JkZXJTdHls ZSwgQmFja2dyb3VuZEJsZWVkQXZvaWRhbmNlIGJsZWVkQXZvaWRhbmNlLAotICAgIGJvb2wgaW5j bHVkZUxvZ2ljYWxMZWZ0RWRnZSwgYm9vbCBpbmNsdWRlTG9naWNhbFJpZ2h0RWRnZSkKKyAgICBz dGQ6Om9wdGlvbmFsPEJvcmRlckRhdGE6OlJhZGlpPiByYWRpaSwgZmxvYXQgdGhpY2tuZXNzLCBm bG9hdCBkcmF3VGhpY2tuZXNzLCBCb3hTaWRlIHNpZGUsIENvbG9yIGNvbG9yLCBCb3JkZXJTdHls ZSBib3JkZXJTdHlsZSwgQmFja2dyb3VuZEJsZWVkQXZvaWRhbmNlIGJsZWVkQXZvaWRhbmNlLAor ICAgIGJvb2wgaW5jbHVkZUxvZ2ljYWxMZWZ0RWRnZSwgYm9vbCBpbmNsdWRlTG9naWNhbFJpZ2h0 RWRnZSwgYm9vbCBpc0hvcml6b250YWwpCiB7CiAgICAgaWYgKHRoaWNrbmVzcyA8PSAwKQogICAg ICAgICByZXR1cm47CkBAIC03OTgsMTIgKzc5OSwxMyBAQCB2b2lkIEJvcmRlclBhaW50ZXI6OmRy YXdCb3hTaWRlRnJvbVBhdGgoY29uc3QgTGF5b3V0UmVjdCYgYm9yZGVyUmVjdCwgY29uc3QgUGF0 aAogICAgICAgICAvLyBEcmF3IGlubmVyIGJvcmRlciBsaW5lCiAgICAgICAgIHsKICAgICAgICAg ICAgIEdyYXBoaWNzQ29udGV4dFN0YXRlU2F2ZXIgc3RhdGVTYXZlcihncmFwaGljc0NvbnRleHQp OwotICAgICAgICAgICAgUm91bmRlZFJlY3QgaW5uZXJDbGlwID0gc3R5bGUuZ2V0Um91bmRlZElu bmVyQm9yZGVyRm9yKGJvcmRlclJlY3QsCisgICAgICAgICAgICBhdXRvIGlubmVyQ2xpcCA9IFJl bmRlclN0eWxlOjpnZXRSb3VuZGVkSW5uZXJCb3JkZXJGb3IoYm9yZGVyUmVjdCwKICAgICAgICAg ICAgICAgICBpbm5lckJvcmRlclRvcFdpZHRoLCBpbm5lckJvcmRlckJvdHRvbVdpZHRoLCBpbm5l ckJvcmRlckxlZnRXaWR0aCwgaW5uZXJCb3JkZXJSaWdodFdpZHRoLAorICAgICAgICAgICAgICAg IHJhZGlpLCBpc0hvcml6b250YWwsCiAgICAgICAgICAgICAgICAgaW5jbHVkZUxvZ2ljYWxMZWZ0 RWRnZSwgaW5jbHVkZUxvZ2ljYWxSaWdodEVkZ2UpOwogCiAgICAgICAgICAgICBncmFwaGljc0Nv bnRleHQuY2xpcFJvdW5kZWRSZWN0KEZsb2F0Um91bmRlZFJlY3QoaW5uZXJDbGlwKSk7Ci0gICAg ICAgICAgICBkcmF3Qm94U2lkZUZyb21QYXRoKGJvcmRlclJlY3QsIGJvcmRlclBhdGgsIGVkZ2Vz LCB0aGlja25lc3MsIGRyYXdUaGlja25lc3MsIHNpZGUsIHN0eWxlLCBjb2xvciwgQm9yZGVyU3R5 bGU6OlNvbGlkLCBibGVlZEF2b2lkYW5jZSwgaW5jbHVkZUxvZ2ljYWxMZWZ0RWRnZSwgaW5jbHVk ZUxvZ2ljYWxSaWdodEVkZ2UpOworICAgICAgICAgICAgZHJhd0JveFNpZGVGcm9tUGF0aChib3Jk ZXJSZWN0LCBib3JkZXJQYXRoLCBlZGdlcywgcmFkaWksIHRoaWNrbmVzcywgZHJhd1RoaWNrbmVz cywgc2lkZSwgY29sb3IsIEJvcmRlclN0eWxlOjpTb2xpZCwgYmxlZWRBdm9pZGFuY2UsIGluY2x1 ZGVMb2dpY2FsTGVmdEVkZ2UsIGluY2x1ZGVMb2dpY2FsUmlnaHRFZGdlLCBpc0hvcml6b250YWwp OwogICAgICAgICB9CiAKICAgICAgICAgLy8gRHJhdyBvdXRlciBib3JkZXIgbGluZQpAQCAtODE4 LDExICs4MjAsMTIgQEAgdm9pZCBCb3JkZXJQYWludGVyOjpkcmF3Qm94U2lkZUZyb21QYXRoKGNv bnN0IExheW91dFJlY3QmIGJvcmRlclJlY3QsIGNvbnN0IFBhdGgKICAgICAgICAgICAgICAgICAr K291dGVyQm9yZGVyUmlnaHRXaWR0aDsKICAgICAgICAgICAgIH0KIAotICAgICAgICAgICAgUm91 bmRlZFJlY3Qgb3V0ZXJDbGlwID0gc3R5bGUuZ2V0Um91bmRlZElubmVyQm9yZGVyRm9yKG91dGVy UmVjdCwKKyAgICAgICAgICAgIGF1dG8gb3V0ZXJDbGlwID0gUmVuZGVyU3R5bGU6OmdldFJvdW5k ZWRJbm5lckJvcmRlckZvcihvdXRlclJlY3QsCiAgICAgICAgICAgICAgICAgb3V0ZXJCb3JkZXJU b3BXaWR0aCwgb3V0ZXJCb3JkZXJCb3R0b21XaWR0aCwgb3V0ZXJCb3JkZXJMZWZ0V2lkdGgsIG91 dGVyQm9yZGVyUmlnaHRXaWR0aCwKKyAgICAgICAgICAgICAgICByYWRpaSwgaXNIb3Jpem9udGFs LAogICAgICAgICAgICAgICAgIGluY2x1ZGVMb2dpY2FsTGVmdEVkZ2UsIGluY2x1ZGVMb2dpY2Fs UmlnaHRFZGdlKTsKICAgICAgICAgICAgIGdyYXBoaWNzQ29udGV4dC5jbGlwT3V0Um91bmRlZFJl Y3QoRmxvYXRSb3VuZGVkUmVjdChvdXRlckNsaXApKTsKLSAgICAgICAgICAgIGRyYXdCb3hTaWRl RnJvbVBhdGgoYm9yZGVyUmVjdCwgYm9yZGVyUGF0aCwgZWRnZXMsIHRoaWNrbmVzcywgZHJhd1Ro aWNrbmVzcywgc2lkZSwgc3R5bGUsIGNvbG9yLCBCb3JkZXJTdHlsZTo6U29saWQsIGJsZWVkQXZv aWRhbmNlLCBpbmNsdWRlTG9naWNhbExlZnRFZGdlLCBpbmNsdWRlTG9naWNhbFJpZ2h0RWRnZSk7 CisgICAgICAgICAgICBkcmF3Qm94U2lkZUZyb21QYXRoKGJvcmRlclJlY3QsIGJvcmRlclBhdGgs IGVkZ2VzLCByYWRpaSwgIHRoaWNrbmVzcywgZHJhd1RoaWNrbmVzcywgc2lkZSwgY29sb3IsIEJv cmRlclN0eWxlOjpTb2xpZCwgYmxlZWRBdm9pZGFuY2UsIGluY2x1ZGVMb2dpY2FsTGVmdEVkZ2Us IGluY2x1ZGVMb2dpY2FsUmlnaHRFZGdlLCBpc0hvcml6b250YWwpOwogICAgICAgICB9CiAgICAg ICAgIHJldHVybjsKICAgICB9CkBAIC04NDAsNyArODQzLDcgQEAgdm9pZCBCb3JkZXJQYWludGVy OjpkcmF3Qm94U2lkZUZyb21QYXRoKGNvbnN0IExheW91dFJlY3QmIGJvcmRlclJlY3QsIGNvbnN0 IFBhdGgKICAgICAgICAgfQogCiAgICAgICAgIC8vIFBhaW50IGZ1bGwgYm9yZGVyCi0gICAgICAg IGRyYXdCb3hTaWRlRnJvbVBhdGgoYm9yZGVyUmVjdCwgYm9yZGVyUGF0aCwgZWRnZXMsIHRoaWNr bmVzcywgZHJhd1RoaWNrbmVzcywgc2lkZSwgc3R5bGUsIGNvbG9yLCBzMSwgYmxlZWRBdm9pZGFu Y2UsIGluY2x1ZGVMb2dpY2FsTGVmdEVkZ2UsIGluY2x1ZGVMb2dpY2FsUmlnaHRFZGdlKTsKKyAg ICAgICAgZHJhd0JveFNpZGVGcm9tUGF0aChib3JkZXJSZWN0LCBib3JkZXJQYXRoLCBlZGdlcywg cmFkaWksICB0aGlja25lc3MsIGRyYXdUaGlja25lc3MsIHNpZGUsIGNvbG9yLCBzMSwgYmxlZWRB dm9pZGFuY2UsIGluY2x1ZGVMb2dpY2FsTGVmdEVkZ2UsIGluY2x1ZGVMb2dpY2FsUmlnaHRFZGdl LCBpc0hvcml6b250YWwpOwogCiAgICAgICAgIC8vIFBhaW50IGlubmVyIG9ubHkKICAgICAgICAg R3JhcGhpY3NDb250ZXh0U3RhdGVTYXZlciBzdGF0ZVNhdmVyKGdyYXBoaWNzQ29udGV4dCk7CkBA IC04NDksMTIgKzg1MiwxMyBAQCB2b2lkIEJvcmRlclBhaW50ZXI6OmRyYXdCb3hTaWRlRnJvbVBh dGgoY29uc3QgTGF5b3V0UmVjdCYgYm9yZGVyUmVjdCwgY29uc3QgUGF0aAogICAgICAgICBMYXlv dXRVbml0IGxlZnRXaWR0aCB7IGVkZ2VzLmxlZnQoKS53aWR0aEZvclBhaW50aW5nKCkgLyAyIH07 CiAgICAgICAgIExheW91dFVuaXQgcmlnaHRXaWR0aCB7IGVkZ2VzLnJpZ2h0KCkud2lkdGhGb3JQ YWludGluZygpIC8gMiB9OwogCi0gICAgICAgIFJvdW5kZWRSZWN0IGNsaXBSZWN0ID0gc3R5bGUu Z2V0Um91bmRlZElubmVyQm9yZGVyRm9yKGJvcmRlclJlY3QsCisgICAgICAgIGF1dG8gY2xpcFJl Y3QgPSBSZW5kZXJTdHlsZTo6Z2V0Um91bmRlZElubmVyQm9yZGVyRm9yKGJvcmRlclJlY3QsCiAg ICAgICAgICAgICB0b3BXaWR0aCwgYm90dG9tV2lkdGgsIGxlZnRXaWR0aCwgcmlnaHRXaWR0aCwK KyAgICAgICAgICAgIHJhZGlpLCBpc0hvcml6b250YWwsCiAgICAgICAgICAgICBpbmNsdWRlTG9n aWNhbExlZnRFZGdlLCBpbmNsdWRlTG9naWNhbFJpZ2h0RWRnZSk7CiAKICAgICAgICAgZ3JhcGhp Y3NDb250ZXh0LmNsaXBSb3VuZGVkUmVjdChGbG9hdFJvdW5kZWRSZWN0KGNsaXBSZWN0KSk7Ci0g ICAgICAgIGRyYXdCb3hTaWRlRnJvbVBhdGgoYm9yZGVyUmVjdCwgYm9yZGVyUGF0aCwgZWRnZXMs IHRoaWNrbmVzcywgZHJhd1RoaWNrbmVzcywgc2lkZSwgc3R5bGUsIGNvbG9yLCBzMiwgYmxlZWRB dm9pZGFuY2UsIGluY2x1ZGVMb2dpY2FsTGVmdEVkZ2UsIGluY2x1ZGVMb2dpY2FsUmlnaHRFZGdl KTsKKyAgICAgICAgZHJhd0JveFNpZGVGcm9tUGF0aChib3JkZXJSZWN0LCBib3JkZXJQYXRoLCBl ZGdlcywgcmFkaWksICB0aGlja25lc3MsIGRyYXdUaGlja25lc3MsIHNpZGUsIGNvbG9yLCBzMiwg YmxlZWRBdm9pZGFuY2UsIGluY2x1ZGVMb2dpY2FsTGVmdEVkZ2UsIGluY2x1ZGVMb2dpY2FsUmln aHRFZGdlLCBpc0hvcml6b250YWwpOwogICAgICAgICByZXR1cm47CiAgICAgfQogICAgIGNhc2Ug Qm9yZGVyU3R5bGU6Okluc2V0OgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L0JvcmRlclBhaW50ZXIuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9Cb3JkZXJQYWludGVy LmgKaW5kZXggNmUzNGExYjc1MjY1Li45NjY5YTFmMWU2ZDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9Cb3JkZXJQYWludGVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL0JvcmRlclBhaW50ZXIuaApAQCAtNDQsOCArNDQsOSBAQCBwdWJsaWM6CiAgICAgICAg IGJvb2wgaW5jbHVkZUxvZ2ljYWxMZWZ0RWRnZSB7IHRydWUgfTsKICAgICAgICAgYm9vbCBpbmNs dWRlTG9naWNhbFJpZ2h0RWRnZSB7IHRydWUgfTsKICAgICAgICAgYm9vbCBhcHBsaWVkQ2xpcEFs cmVhZHkgeyBmYWxzZSB9OworICAgICAgICBib29sIGlzSG9yaXpvbnRhbCB7IHRydWUgfTsKICAg ICB9OwotICAgIHZvaWQgcGFpbnRTaWRlcyhjb25zdCBTaWRlcyYsIGNvbnN0IFJlbmRlclN0eWxl Jik7CisgICAgdm9pZCBwYWludFNpZGVzKGNvbnN0IFNpZGVzJik7CiAKICAgICBzdGF0aWMgdm9p ZCBkcmF3TGluZUZvckJveFNpZGUoR3JhcGhpY3NDb250ZXh0JiwgY29uc3QgRG9jdW1lbnQmLCBj b25zdCBGbG9hdFJlY3QmLCBCb3hTaWRlLCBDb2xvciwgQm9yZGVyU3R5bGUsIGZsb2F0IGFkamFj ZW50V2lkdGgxLCBmbG9hdCBhZGphY2VudFdpZHRoMiwgYm9vbCBhbnRpYWxpYXMgPSBmYWxzZSk7 CiAKQEAgLTU0LDEyICs1NSwxMiBAQCBwdWJsaWM6CiAgICAgc3RhdGljIENvbG9yIGNhbGN1bGF0 ZUJvcmRlclN0eWxlQ29sb3IoY29uc3QgQm9yZGVyU3R5bGUmLCBjb25zdCBCb3hTaWRlJiwgY29u c3QgQ29sb3ImKTsKIAogcHJpdmF0ZToKLSAgICB2b2lkIHBhaW50VHJhbnNsdWNlbnRCb3JkZXJT aWRlcyhjb25zdCBSZW5kZXJTdHlsZSYsIGNvbnN0IFJvdW5kZWRSZWN0JiBvdXRlckJvcmRlciwg Y29uc3QgUm91bmRlZFJlY3QmIGlubmVyQm9yZGVyLCBjb25zdCBJbnRQb2ludCYgaW5uZXJCb3Jk ZXJBZGp1c3RtZW50LAotICAgICAgICBjb25zdCBCb3JkZXJFZGdlcyYsIEJveFNpZGVTZXQgZWRn ZXNUb0RyYXcsIEJhY2tncm91bmRCbGVlZEF2b2lkYW5jZSwgYm9vbCBpbmNsdWRlTG9naWNhbExl ZnRFZGdlLCBib29sIGluY2x1ZGVMb2dpY2FsUmlnaHRFZGdlLCBib29sIGFudGlhbGlhcyk7Ci0g ICAgdm9pZCBwYWludEJvcmRlclNpZGVzKGNvbnN0IFJlbmRlclN0eWxlJiwgY29uc3QgUm91bmRl ZFJlY3QmIG91dGVyQm9yZGVyLCBjb25zdCBSb3VuZGVkUmVjdCYgaW5uZXJCb3JkZXIsIGNvbnN0 IEludFBvaW50JiBpbm5lckJvcmRlckFkanVzdG1lbnQsIGNvbnN0IEJvcmRlckVkZ2VzJiwgQm94 U2lkZVNldCBlZGdlU2V0LCBCYWNrZ3JvdW5kQmxlZWRBdm9pZGFuY2UsIGJvb2wgaW5jbHVkZUxv Z2ljYWxMZWZ0RWRnZSwgYm9vbCBpbmNsdWRlTG9naWNhbFJpZ2h0RWRnZSwgYm9vbCBhbnRpYWxp YXMsIGNvbnN0IENvbG9yKiBvdmVycmlkZUNvbG9yID0gbnVsbHB0cik7Ci0gICAgdm9pZCBwYWlu dE9uZUJvcmRlclNpZGUoY29uc3QgUmVuZGVyU3R5bGUmLCBjb25zdCBSb3VuZGVkUmVjdCYgb3V0 ZXJCb3JkZXIsIGNvbnN0IFJvdW5kZWRSZWN0JiBpbm5lckJvcmRlciwKLSAgICAgICAgY29uc3Qg TGF5b3V0UmVjdCYgc2lkZVJlY3QsIEJveFNpZGUsIEJveFNpZGUgYWRqYWNlbnRTaWRlMSwgQm94 U2lkZSBhZGphY2VudFNpZGUyLCBjb25zdCBCb3JkZXJFZGdlcyYsIGNvbnN0IFBhdGgqLCBCYWNr Z3JvdW5kQmxlZWRBdm9pZGFuY2UsIGJvb2wgaW5jbHVkZUxvZ2ljYWxMZWZ0RWRnZSwgYm9vbCBp bmNsdWRlTG9naWNhbFJpZ2h0RWRnZSwgYm9vbCBhbnRpYWxpYXMsIGNvbnN0IENvbG9yKiBvdmVy cmlkZUNvbG9yKTsKLSAgICB2b2lkIGRyYXdCb3hTaWRlRnJvbVBhdGgoY29uc3QgTGF5b3V0UmVj dCYgYm9yZGVyUmVjdCwgY29uc3QgUGF0aCYgYm9yZGVyUGF0aCwgY29uc3QgQm9yZGVyRWRnZXMm LCBmbG9hdCB0aGlja25lc3MsIGZsb2F0IGRyYXdUaGlja25lc3MsIEJveFNpZGUsIGNvbnN0IFJl bmRlclN0eWxlJiwgQ29sb3IsIEJvcmRlclN0eWxlLCBCYWNrZ3JvdW5kQmxlZWRBdm9pZGFuY2Us IGJvb2wgaW5jbHVkZUxvZ2ljYWxMZWZ0RWRnZSwgYm9vbCBpbmNsdWRlTG9naWNhbFJpZ2h0RWRn ZSk7CisgICAgdm9pZCBwYWludFRyYW5zbHVjZW50Qm9yZGVyU2lkZXMoY29uc3QgUm91bmRlZFJl Y3QmIG91dGVyQm9yZGVyLCBjb25zdCBSb3VuZGVkUmVjdCYgaW5uZXJCb3JkZXIsIGNvbnN0IElu dFBvaW50JiBpbm5lckJvcmRlckFkanVzdG1lbnQsCisgICAgICAgIGNvbnN0IEJvcmRlckVkZ2Vz JiwgQm94U2lkZVNldCBlZGdlc1RvRHJhdywgc3RkOjpvcHRpb25hbDxCb3JkZXJEYXRhOjpSYWRp aT4sIEJhY2tncm91bmRCbGVlZEF2b2lkYW5jZSwgYm9vbCBpbmNsdWRlTG9naWNhbExlZnRFZGdl LCBib29sIGluY2x1ZGVMb2dpY2FsUmlnaHRFZGdlLCBib29sIGFudGlhbGlhcywgYm9vbCBpc0hv cml6b250YWwpOworICAgIHZvaWQgcGFpbnRCb3JkZXJTaWRlcyhjb25zdCBSb3VuZGVkUmVjdCYg b3V0ZXJCb3JkZXIsIGNvbnN0IFJvdW5kZWRSZWN0JiBpbm5lckJvcmRlciwgY29uc3QgSW50UG9p bnQmIGlubmVyQm9yZGVyQWRqdXN0bWVudCwgY29uc3QgQm9yZGVyRWRnZXMmLCBCb3hTaWRlU2V0 IGVkZ2VTZXQsIHN0ZDo6b3B0aW9uYWw8Qm9yZGVyRGF0YTo6UmFkaWk+LCBCYWNrZ3JvdW5kQmxl ZWRBdm9pZGFuY2UsIGJvb2wgaW5jbHVkZUxvZ2ljYWxMZWZ0RWRnZSwgYm9vbCBpbmNsdWRlTG9n aWNhbFJpZ2h0RWRnZSwgYm9vbCBhbnRpYWxpYXMsIGJvb2wgaXNIb3Jpem9udGFsLCBjb25zdCBD b2xvciogb3ZlcnJpZGVDb2xvciA9IG51bGxwdHIpOworICAgIHZvaWQgcGFpbnRPbmVCb3JkZXJT aWRlKGNvbnN0IFJvdW5kZWRSZWN0JiBvdXRlckJvcmRlciwgY29uc3QgUm91bmRlZFJlY3QmIGlu bmVyQm9yZGVyLAorICAgICAgICBjb25zdCBMYXlvdXRSZWN0JiBzaWRlUmVjdCwgQm94U2lkZSwg Qm94U2lkZSBhZGphY2VudFNpZGUxLCBCb3hTaWRlIGFkamFjZW50U2lkZTIsIGNvbnN0IEJvcmRl ckVkZ2VzJiwgc3RkOjpvcHRpb25hbDxCb3JkZXJEYXRhOjpSYWRpaT4sIGNvbnN0IFBhdGgqLCBC YWNrZ3JvdW5kQmxlZWRBdm9pZGFuY2UsIGJvb2wgaW5jbHVkZUxvZ2ljYWxMZWZ0RWRnZSwgYm9v bCBpbmNsdWRlTG9naWNhbFJpZ2h0RWRnZSwgYm9vbCBhbnRpYWxpYXMsIGJvb2wgaXNIb3Jpem9u dGFsLCBjb25zdCBDb2xvciogb3ZlcnJpZGVDb2xvcik7CisgICAgdm9pZCBkcmF3Qm94U2lkZUZy b21QYXRoKGNvbnN0IExheW91dFJlY3QmIGJvcmRlclJlY3QsIGNvbnN0IFBhdGgmIGJvcmRlclBh dGgsIGNvbnN0IEJvcmRlckVkZ2VzJiwgc3RkOjpvcHRpb25hbDxCb3JkZXJEYXRhOjpSYWRpaT4s IGZsb2F0IHRoaWNrbmVzcywgZmxvYXQgZHJhd1RoaWNrbmVzcywgQm94U2lkZSwgQ29sb3IsIEJv cmRlclN0eWxlLCBCYWNrZ3JvdW5kQmxlZWRBdm9pZGFuY2UsIGJvb2wgaW5jbHVkZUxvZ2ljYWxM ZWZ0RWRnZSwgYm9vbCBpbmNsdWRlTG9naWNhbFJpZ2h0RWRnZSwgYm9vbCBpc0hvcml6b250YWwp OwogICAgIHZvaWQgY2xpcEJvcmRlclNpZGVQb2x5Z29uKGNvbnN0IFJvdW5kZWRSZWN0JiBvdXRl ckJvcmRlciwgY29uc3QgUm91bmRlZFJlY3QmIGlubmVyQm9yZGVyLCBCb3hTaWRlLCBib29sIGZp cnN0RWRnZU1hdGNoZXMsIGJvb2wgc2Vjb25kRWRnZU1hdGNoZXMpOwogCiAgICAgTGF5b3V0UmVj dCBib3JkZXJJbm5lclJlY3RBZGp1c3RlZEZvckJsZWVkQXZvaWRhbmNlKGNvbnN0IExheW91dFJl Y3QmLCBCYWNrZ3JvdW5kQmxlZWRBdm9pZGFuY2UpIGNvbnN0Owo=