223572 2021-03-22 05:05:34 -0700 Move shader info log functionality from ExtensionsGL to GraphicsContextGL 2022-08-11 00:03:01 -0700 1 1 1 Unclassified WebKit WebGL WebKit Local Build Unspecified Unspecified RESOLVED CONFIGURATION CHANGED InRadar P2 Normal --- 221664 1 kkinnunen kkinnunen dino kbr kkinnunen webkit-bug-importer oldest_to_newest 1742197 0 kkinnunen 2021-03-22 05:05:34 -0700 Move shader info log functionality from ExtensionsGL to GraphicsContextGL ExtensionsGL never fulfilled its purpose. Currently it is equivalent to corresponding GraphicsContextGL instance. This just complicates the implementation. 1742198 1 423872 kkinnunen 2021-03-22 05:17:13 -0700 Created attachment 423872 Patch 1742533 2 423872 kbr 2021-03-22 16:07:26 -0700 Comment on attachment 423872 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=423872&action=review One comment about the renaming of this entry point, but r+ once it builds and passes tests. > Source/WebCore/ChangeLog:13 > + WebGL logic, not ANGLE-specific extensions. Not sure I agree with this especially as it will relate to moving more extensions into GraphicsContextGL. glGetTranslatedShaderSourceANGLE is defined in the GL_ANGLE_translated_shader_source extension and it's useful to track where these extension entry points are defined. Also, this is used by the WEBGL_debug_shaders extension (and maybe WebKit's DevTools?) so strictly speaking isn't part of the core WebGL implementation. However, I defer to your judgment on the organization. 1744710 3 webkit-bug-importer 2021-03-29 09:13:55 -0700 <rdar://problem/75956803> 1890509 4 kkinnunen 2022-08-11 00:03:01 -0700 ExtensionsGL was removed in other commit, closing. 423872 2021-03-22 05:17:13 -0700 2021-03-22 16:07:26 -0700 Patch bug-223572-20210322141711.patch text/plain 16656 kkinnunen U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0NzUwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjZmNjQwNDUyOWFmNjdm NTVjN2U0NTZhNjJjN2E3ZmMyZjRmZGY5Yy4uNzkzNGExMTlmMjdhYzQwYzhkZDE2ZTNiZjE5Mjlj ZDY3Y2Q2YTA3YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDIxLTAzLTIyICBLaW1t byBLaW5udW5lbiAgPGtraW5udW5lbkBhcHBsZS5jb20+CisKKyAgICAgICAgTW92ZSBzaGFkZXIg aW5mbyBsb2cgZnVuY3Rpb25hbGl0eSBmcm9tIEV4dGVuc2lvbnNHTCB0byBHcmFwaGljc0NvbnRl eHRHTAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIz NTcyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTW92 ZSBFeHRlbnNpb25zR0w6OmdldFRyYW5zbGF0ZWRTaGFkZXJTb3VyY2VBTkdMRSB0bworICAgICAg ICBHcmFwaGljc0NvbnRleHRHTDo6Z2V0VHJhbnNsYXRlZFNoYWRlclNvdXJjZS4KKyAgICAgICAg RXh0ZW5zaW9uc0dMIGlzIGJlaW5nIHJlbW92ZWQgYXMgaXQgaXMgcmVkdW5kYW50LiBUaGUgZXh0 ZW5zaW9uIG9iamVjdAorICAgICAgICBpcyB0aGUgc2FtZSBvYmplY3QgYXMgdGhlIGNvbnRleHQg b2JqZWN0IGFuZCBub3QgdXNlZnVsLgorICAgICAgICBJdCBpcyBub3QgdXNlZnVsIHRvIHN1ZmZp eCBmdW5jdGlvbnMgd2l0aCBBTkdMRSBzdWZmaXggYXMgdGhleSBhcmUgcmVxdWlyZWQKKyAgICAg ICAgV2ViR0wgbG9naWMsIG5vdCBBTkdMRS1zcGVjaWZpYyBleHRlbnNpb25zLgorCisgICAgICAg ICogaHRtbC9jYW52YXMvV2ViR0xEZWJ1Z1NoYWRlcnMuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 V2ViR0xEZWJ1Z1NoYWRlcnM6OmdldFRyYW5zbGF0ZWRTaGFkZXJTb3VyY2UpOgorICAgICAgICAq IHBsYXRmb3JtL2dyYXBoaWNzL0V4dGVuc2lvbnNHTC5oOgorICAgICAgICAqIHBsYXRmb3JtL2dy YXBoaWNzL0dyYXBoaWNzQ29udGV4dEdMLmg6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mv YW5nbGUvRXh0ZW5zaW9uc0dMQU5HTEUuY3BwOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNz L2FuZ2xlL0V4dGVuc2lvbnNHTEFOR0xFLmg6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mv YW5nbGUvR3JhcGhpY3NDb250ZXh0R0xBTkdMRS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpHcmFw aGljc0NvbnRleHRHTE9wZW5HTDo6Z2V0VHJhbnNsYXRlZFNoYWRlclNvdXJjZSk6CisgICAgICAg ICogcGxhdGZvcm0vZ3JhcGhpY3Mvb3BlbmdsL0V4dGVuc2lvbnNHTE9wZW5HTENvbW1vbi5oOgor ICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL29wZW5nbC9HcmFwaGljc0NvbnRleHRHTE9wZW5H TC5oOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL29wZW5nbC9HcmFwaGljc0NvbnRleHRH TE9wZW5HTENvbW1vbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0NvbnRleHRHTE9w ZW5HTDo6Z2V0VHJhbnNsYXRlZFNoYWRlclNvdXJjZSk6CisKIDIwMjEtMDMtMjIgIEtpbW1vIEtp bm51bmVuICA8a2tpbm51bmVuQGFwcGxlLmNvbT4KIAogICAgICAgICBNb3ZlIGluc3RhbmNlZCBk cmF3aW5nIGZ1bmN0aW9uYWxpdHkgZnJvbSBFeHRlbnNpb25zR0wgdG8gR3JhcGhpY3NDb250ZXh0 R0wKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9D aGFuZ2VMb2cKaW5kZXggZWI1NDJkNmI0YTdhZmQyNzkwZDE3NWFkNDI4ZjVkYjg1ZDg3MWZhMC4u NGZlZGZiYmEwODE3MzNlYTA3ZGE1NmQwNTg2NDY4ZWUzOTg5ZTE5MiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyNCBAQAorMjAyMS0wMy0yMiAgS2ltbW8gS2lubnVuZW4gIDxra2lubnVuZW5AYXBwbGUu Y29tPgorCisgICAgICAgIE1vdmUgc2hhZGVyIGluZm8gbG9nIGZ1bmN0aW9uYWxpdHkgZnJvbSBF eHRlbnNpb25zR0wgdG8gR3JhcGhpY3NDb250ZXh0R0wKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMzU3MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIE1vdmUgRXh0ZW5zaW9uc0dMOjpnZXRUcmFuc2xhdGVk U2hhZGVyU291cmNlQU5HTEUgdG8KKyAgICAgICAgR3JhcGhpY3NDb250ZXh0R0w6OmdldFRyYW5z bGF0ZWRTaGFkZXJTb3VyY2UuCisgICAgICAgIEV4dGVuc2lvbnNHTCBpcyBiZWluZyByZW1vdmVk IGFzIGl0IGlzIHJlZHVuZGFudC4gVGhlIGV4dGVuc2lvbiBvYmplY3QKKyAgICAgICAgaXMgdGhl IHNhbWUgb2JqZWN0IGFzIHRoZSBjb250ZXh0IG9iamVjdCBhbmQgbm90IHVzZWZ1bC4KKyAgICAg ICAgSXQgaXMgbm90IHVzZWZ1bCB0byBzdWZmaXggZnVuY3Rpb25zIHdpdGggQU5HTEUgc3VmZml4 IGFzIHRoZXkgYXJlIHJlcXVpcmVkCisgICAgICAgIFdlYkdMIGxvZ2ljLCBub3QgQU5HTEUtc3Bl Y2lmaWMgZXh0ZW5zaW9ucy4KKworICAgICAgICAqIEdQVVByb2Nlc3MvZ3JhcGhpY3MvUmVtb3Rl R3JhcGhpY3NDb250ZXh0R0wubWVzc2FnZXMuaW46CisgICAgICAgICogR1BVUHJvY2Vzcy9ncmFw aGljcy9SZW1vdGVHcmFwaGljc0NvbnRleHRHTEZ1bmN0aW9uc0dlbmVyYXRlZC5oOgorICAgICAg ICAoZ2V0VHJhbnNsYXRlZFNoYWRlclNvdXJjZSk6CisgICAgICAgICogV2ViUHJvY2Vzcy9HUFUv Z3JhcGhpY3MvUmVtb3RlR3JhcGhpY3NDb250ZXh0R0xQcm94eS5oOgorICAgICAgICAqIFdlYlBy b2Nlc3MvR1BVL2dyYXBoaWNzL1JlbW90ZUdyYXBoaWNzQ29udGV4dEdMUHJveHlGdW5jdGlvbnNH ZW5lcmF0ZWQuY3BwOgorICAgICAgICAoV2ViS2l0OjpSZW1vdGVHcmFwaGljc0NvbnRleHRHTFBy b3h5OjpnZXRUcmFuc2xhdGVkU2hhZGVyU291cmNlKToKKwogMjAyMS0wMy0yMiAgS2ltbW8gS2lu bnVuZW4gIDxra2lubnVuZW5AYXBwbGUuY29tPgogCiAgICAgICAgIE1vdmUgaW5zdGFuY2VkIGRy YXdpbmcgZnVuY3Rpb25hbGl0eSBmcm9tIEV4dGVuc2lvbnNHTCB0byBHcmFwaGljc0NvbnRleHRH TApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvV2ViR0xEZWJ1Z1NoYWRl cnMuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvV2ViR0xEZWJ1Z1NoYWRlcnMuY3Bw CmluZGV4IDZiMDQ5NTRhNGE1MjljZTg4MmYyYTY0YmIzZDg2N2ZhODRjMzhjZjAuLjQ5OTBmYzRh ZWJlMTUzMmI0ZDhmZDdhZTJmMmIyZTE1YTZiNjM1NzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2h0bWwvY2FudmFzL1dlYkdMRGVidWdTaGFkZXJzLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9odG1sL2NhbnZhcy9XZWJHTERlYnVnU2hhZGVycy5jcHAKQEAgLTU3LDcgKzU3LDcgQEAgU3Ry aW5nIFdlYkdMRGVidWdTaGFkZXJzOjpnZXRUcmFuc2xhdGVkU2hhZGVyU291cmNlKFdlYkdMU2hh ZGVyJiBzaGFkZXIpCiAgICAgICAgIHJldHVybiBTdHJpbmcoKTsKICAgICBpZiAoIW1fY29udGV4 dC0+dmFsaWRhdGVXZWJHTE9iamVjdCgiZ2V0VHJhbnNsYXRlZFNoYWRlclNvdXJjZSIsICZzaGFk ZXIpKQogICAgICAgICByZXR1cm4gZW1wdHlTdHJpbmcoKTsKLSAgICByZXR1cm4gbV9jb250ZXh0 LT5ncmFwaGljc0NvbnRleHRHTCgpLT5nZXRFeHRlbnNpb25zKCkuZ2V0VHJhbnNsYXRlZFNoYWRl clNvdXJjZUFOR0xFKHNoYWRlci5vYmplY3QoKSk7CisgICAgcmV0dXJuIG1fY29udGV4dC0+Z3Jh cGhpY3NDb250ZXh0R0woKS0+Z2V0VHJhbnNsYXRlZFNoYWRlclNvdXJjZShzaGFkZXIub2JqZWN0 KCkpOwogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9FeHRlbnNpb25zR0wuaCBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL0V4dGVuc2lvbnNHTC5oCmluZGV4IDU2MDc2MzA4YzU4YTBiZDQ1OTM5 YjBhN2JjNWU2MjRkNTY0ZWI1MTAuLmYxMjJkZTliYzY3YTdiMmZlMzM2NDVhMjQ0ODJiZWFlMzQw NDllNGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0V4dGVu c2lvbnNHTC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0V4dGVuc2lv bnNHTC5oCkBAIC0yODEsOSArMjgxLDYgQEAgcHVibGljOgogICAgIC8vIGV4dGVybmFsbHkuCiAg ICAgdmlydHVhbCBHQ0dMaW50IGdldEdyYXBoaWNzUmVzZXRTdGF0dXNBUkIoKSA9IDA7CiAKLSAg ICAvLyBHTF9BTkdMRV90cmFuc2xhdGVkX3NoYWRlcl9zb3VyY2UKLSAgICB2aXJ0dWFsIFN0cmlu ZyBnZXRUcmFuc2xhdGVkU2hhZGVyU291cmNlQU5HTEUoUGxhdGZvcm1HTE9iamVjdCkgPSAwOwot CiAgICAgLy8gR0xfQVJCX2RyYXdfYnVmZmVycyAvIEdMX0VYVF9kcmF3X2J1ZmZlcnMKICAgICB2 aXJ0dWFsIHZvaWQgZHJhd0J1ZmZlcnNFWFQoR0NHTFNwYW48Y29uc3QgR0NHTGVudW0+IGJ1ZnMp ID0gMDsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3Jh cGhpY3NDb250ZXh0R0wuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBo aWNzQ29udGV4dEdMLmgKaW5kZXggMzk3ZWMyOTVhNWYzYjU0ZjQ1ZTY0NDJiYmFkM2E1ZDgxMzRj ODljYi4uODgxYjc5ZGU3OGVmN2Y2MmZiZDA0MWI0NWI4NzY4Y2UyODk5ZTY0NyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250ZXh0R0wuaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHRHTC5o CkBAIC0xMjM0LDYgKzEyMzQsOCBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIG11bHRpRHJh d0VsZW1lbnRzQU5HTEUoR0NHTGVudW0gbW9kZSwgR0NHTFNwYW48Y29uc3QgR0NHTHNpemVpPiBj b3VudHMsIEdDR0xlbnVtIHR5cGUsIEdDR0xTcGFuPGNvbnN0IEdDR0xpbnQ+IG9mZnNldHMsIEdD R0xzaXplaSBkcmF3Y291bnQpID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgbXVsdGlEcmF3RWxlbWVu dHNJbnN0YW5jZWRBTkdMRShHQ0dMZW51bSBtb2RlLCBHQ0dMU3Bhbjxjb25zdCBHQ0dMc2l6ZWk+ IGNvdW50cywgR0NHTGVudW0gdHlwZSwgR0NHTFNwYW48Y29uc3QgR0NHTGludD4gb2Zmc2V0cywg R0NHTFNwYW48Y29uc3QgR0NHTHNpemVpPiBpbnN0YW5jZUNvdW50cywgR0NHTHNpemVpIGRyYXdj b3VudCkgPSAwOwogCisgICAgdmlydHVhbCBTdHJpbmcgZ2V0VHJhbnNsYXRlZFNoYWRlclNvdXJj ZShQbGF0Zm9ybUdMT2JqZWN0KSA9IDA7CisKICAgICAvLyA9PT09PT09PT09IE90aGVyIGZ1bmN0 aW9ucy4KICAgICBHQ0dMZmxvYXQgZ2V0RmxvYXQoR0NHTGVudW0gcG5hbWUpOwogICAgIEdDR0xi b29sZWFuIGdldEJvb2xlYW4oR0NHTGVudW0gcG5hbWUpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYW5nbGUvRXh0ZW5zaW9uc0dMQU5HTEUuY3BwIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYW5nbGUvRXh0ZW5zaW9uc0dMQU5HTEUuY3Bw CmluZGV4IDc4OWZlNmI1MDY4NGI4NmU2ZjBmYjVlZTFhYzM5ODk5NTU3OTExYzYuLjFjYjgzZmYx NTkzZmI3ZmY1Y2RmMjJmMjA1MjYyOTFjM2ZjOTgxZTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2FuZ2xlL0V4dGVuc2lvbnNHTEFOR0xFLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hbmdsZS9FeHRlbnNpb25zR0xBTkdMRS5j cHAKQEAgLTc3LDI1ICs3Nyw2IEBAIEdMaW50IEV4dGVuc2lvbnNHTEFOR0xFOjpnZXRHcmFwaGlj c1Jlc2V0U3RhdHVzQVJCKCkKICAgICByZXR1cm4gR3JhcGhpY3NDb250ZXh0R0w6Ok5PX0VSUk9S OwogfQogCi1TdHJpbmcgRXh0ZW5zaW9uc0dMQU5HTEU6OmdldFRyYW5zbGF0ZWRTaGFkZXJTb3Vy Y2VBTkdMRShQbGF0Zm9ybUdMT2JqZWN0IHNoYWRlcikKLXsKLSAgICBpZiAoIW1fY29udGV4dC0+ bWFrZUNvbnRleHRDdXJyZW50KCkpCi0gICAgICAgIHJldHVybiBTdHJpbmcoKTsKLQotICAgIGlu dCBzb3VyY2VMZW5ndGggPSBtX2NvbnRleHQtPmdldFNoYWRlcmkoc2hhZGVyLCBHTF9UUkFOU0xB VEVEX1NIQURFUl9TT1VSQ0VfTEVOR1RIX0FOR0xFKTsKLQotICAgIGlmICghc291cmNlTGVuZ3Ro KQotICAgICAgICByZXR1cm4gZW1wdHlTdHJpbmcoKTsKLSAgICBWZWN0b3I8R0xjaGFyPiBuYW1l KHNvdXJjZUxlbmd0aCk7IC8vIEdMX1RSQU5TTEFURURfU0hBREVSX1NPVVJDRV9MRU5HVEhfQU5H TEUgaW5jbHVkZXMgbnVsbCB0ZXJtaW5hdGlvbi4KLSAgICBHQ0dMaW50IHJldHVybmVkTGVuZ3Ro ID0gMDsKLSAgICBnbDo6R2V0VHJhbnNsYXRlZFNoYWRlclNvdXJjZUFOR0xFKHNoYWRlciwgc291 cmNlTGVuZ3RoLCAmcmV0dXJuZWRMZW5ndGgsIG5hbWUuZGF0YSgpKTsKLSAgICBpZiAoIXJldHVy bmVkTGVuZ3RoKQotICAgICAgICByZXR1cm4gZW1wdHlTdHJpbmcoKTsKLSAgICAvLyByZXR1cm5l ZExlbmd0aCBkb2VzIG5vdCBpbmNsdWRlIHRoZSBudWxsIHRlcm1pbmF0b3IuCi0gICAgQVNTRVJU KHJldHVybmVkTGVuZ3RoID09IHNvdXJjZUxlbmd0aCAtIDEpOwotICAgIHJldHVybiBTdHJpbmco bmFtZS5kYXRhKCksIHJldHVybmVkTGVuZ3RoKTsKLX0KLQogdm9pZCBFeHRlbnNpb25zR0xBTkdM RTo6aW5pdGlhbGl6ZUF2YWlsYWJsZUV4dGVuc2lvbnMoKQogewogICAgIFN0cmluZyBleHRlbnNp b25zU3RyaW5nID0gZ2V0RXh0ZW5zaW9ucygpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvYW5nbGUvRXh0ZW5zaW9uc0dMQU5HTEUuaCBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2FuZ2xlL0V4dGVuc2lvbnNHTEFOR0xFLmgKaW5kZXggZWNi OWY2YzA5MzRjNjM2ZDZjYzE1NTY0ZTg1ZDZiZjVkODM0YTI4Yi4uODYxNWM2NDY2YTEzOWIyOGUy NjA2YmJjMmZlMzkwOTlhMzA0ZjUzNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvYW5nbGUvRXh0ZW5zaW9uc0dMQU5HTEUuaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9hbmdsZS9FeHRlbnNpb25zR0xBTkdMRS5oCkBAIC00OSw4ICs0 OSw2IEBAIHB1YmxpYzoKIAogICAgIHZvaWQgZHJhd0J1ZmZlcnNFWFQoR0NHTFNwYW48Y29uc3Qg R0NHTGVudW0+KSBvdmVycmlkZTsKIAotICAgIFN0cmluZyBnZXRUcmFuc2xhdGVkU2hhZGVyU291 cmNlQU5HTEUoUGxhdGZvcm1HTE9iamVjdCkgb3ZlcnJpZGU7Ci0KICAgICAvLyBPbmx5IGZvciBu b24tV2ViR0wgMi4wIGNvbnRleHRzLgogICAgIEdDR0xlbnVtIGFkanVzdFdlYkdMMVRleHR1cmVJ bnRlcm5hbEZvcm1hdChHQ0dMZW51bSBpbnRlcm5hbGZvcm1hdCwgR0NHTGVudW0gZm9ybWF0LCBH Q0dMZW51bSB0eXBlKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvYW5nbGUvR3JhcGhpY3NDb250ZXh0R0xBTkdMRS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9hbmdsZS9HcmFwaGljc0NvbnRleHRHTEFOR0xFLmNwcAppbmRleCBi Nzc2YjRlYzAzOTY4YWI3MzE1NzE1NzExMTNlMGM2Y2MwODljYTBkLi44NTgzNThiODJlMWY2YzMy MGNkZjE0ZWI0MTFiOTg1MzJlNzliYWUyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9hbmdsZS9HcmFwaGljc0NvbnRleHRHTEFOR0xFLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hbmdsZS9HcmFwaGljc0NvbnRleHRHTEFOR0xF LmNwcApAQCAtMjgzNiw2ICsyODM2LDI0IEBAIHZvaWQgR3JhcGhpY3NDb250ZXh0R0xPcGVuR0w6 Om11bHRpRHJhd0VsZW1lbnRzSW5zdGFuY2VkQU5HTEUoR0NHTGVudW0gbW9kZSwgR0NHCiAgICAg Z2w6Ok11bHRpRHJhd0VsZW1lbnRzSW5zdGFuY2VkQU5HTEUobW9kZSwgY291bnRzLmRhdGEsIHR5 cGUsIHBvaW50ZXJzLmRhdGEoKSwgaW5zdGFuY2VDb3VudHMuZGF0YSwgZHJhd2NvdW50KTsKIH0K IAorU3RyaW5nIEdyYXBoaWNzQ29udGV4dEdMT3BlbkdMOjpnZXRUcmFuc2xhdGVkU2hhZGVyU291 cmNlKFBsYXRmb3JtR0xPYmplY3Qgc2hhZGVyKQoreworICAgIGlmICghbWFrZUNvbnRleHRDdXJy ZW50KCkpCisgICAgICAgIHJldHVybiBTdHJpbmcoKTsKKyAgICBHTGludCBzb3VyY2VMZW5ndGgg PSAwOworICAgIGdsOjpHZXRTaGFkZXJpdlJvYnVzdEFOR0xFKHNoYWRlciwgR0xfVFJBTlNMQVRF RF9TSEFERVJfU09VUkNFX0xFTkdUSF9BTkdMRSwgMSwgbnVsbHB0ciwgJnNvdXJjZUxlbmd0aCk7 CisgICAgaWYgKCFzb3VyY2VMZW5ndGgpCisgICAgICAgIHJldHVybiBlbXB0eVN0cmluZygpOwor ICAgIFZlY3RvcjxHTGNoYXI+IG5hbWUoc291cmNlTGVuZ3RoKTsgLy8gR0xfVFJBTlNMQVRFRF9T SEFERVJfU09VUkNFX0xFTkdUSF9BTkdMRSBpbmNsdWRlcyBudWxsIHRlcm1pbmF0aW9uLgorICAg IEdMaW50IHJldHVybmVkTGVuZ3RoID0gMDsKKyAgICBnbDo6R2V0VHJhbnNsYXRlZFNoYWRlclNv dXJjZUFOR0xFKHNoYWRlciwgc291cmNlTGVuZ3RoLCAmcmV0dXJuZWRMZW5ndGgsIG5hbWUuZGF0 YSgpKTsKKyAgICBpZiAoIXJldHVybmVkTGVuZ3RoKQorICAgICAgICByZXR1cm4gZW1wdHlTdHJp bmcoKTsKKyAgICAvLyByZXR1cm5lZExlbmd0aCBkb2VzIG5vdCBpbmNsdWRlIHRoZSBudWxsIHRl cm1pbmF0b3IuCisgICAgQVNTRVJUKHJldHVybmVkTGVuZ3RoID09IHNvdXJjZUxlbmd0aCAtIDEp OworICAgIHJldHVybiBTdHJpbmcobmFtZS5kYXRhKCksIHJldHVybmVkTGVuZ3RoKTsKK30KKwog I2lmIEVOQUJMRShWSURFTykgJiYgVVNFKEFWRk9VTkRBVElPTikKIEdyYXBoaWNzQ29udGV4dEdM Q1YqIEdyYXBoaWNzQ29udGV4dEdMT3BlbkdMOjphc0NWKCkKIHsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL29wZW5nbC9FeHRlbnNpb25zR0xPcGVuR0xDb21t b24uaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL29wZW5nbC9FeHRlbnNpb25z R0xPcGVuR0xDb21tb24uaAppbmRleCBiNTFlNjJmZWU5ODlmZmUyMDBlOWM1YThlNThhNTVkOTcx YmU0ZDk5Li43YTRmNDU2NmY0MDQ5NjllZjdkODczODcyZThlNDBlZmMyZTllYTZhIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9vcGVuZ2wvRXh0ZW5zaW9uc0dM T3BlbkdMQ29tbW9uLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvb3Bl bmdsL0V4dGVuc2lvbnNHTE9wZW5HTENvbW1vbi5oCkBAIC01NCw3ICs1NCw3IEBAIHB1YmxpYzoK IAogICAgIHZvaWQgZHJhd0J1ZmZlcnNFWFQoR0NHTFNwYW48Y29uc3QgR0NHTGVudW0+KSBvdmVy cmlkZSA9IDA7CiAKLSAgICBTdHJpbmcgZ2V0VHJhbnNsYXRlZFNoYWRlclNvdXJjZUFOR0xFKFBs YXRmb3JtR0xPYmplY3QpIG92ZXJyaWRlOworICAgIFN0cmluZyBnZXRUcmFuc2xhdGVkU2hhZGVy U291cmNlQU5HTEUoUGxhdGZvcm1HTE9iamVjdCk7CiAKICAgICAvLyBFWFQgUm9idXN0bmVzcyAt IHVzZXMgZ2V0R3JhcGhpY3NSZXNldFN0YXR1c0FSQigpCiAgICAgdm9pZCByZWFkblBpeGVsc0VY VChpbnQgeCwgaW50IHksIEdDR0xzaXplaSB3aWR0aCwgR0NHTHNpemVpIGhlaWdodCwgR0NHTGVu dW0gZm9ybWF0LCBHQ0dMZW51bSB0eXBlLCBHQ0dMc2l6ZWkgYnVmU2l6ZSwgdm9pZCAqZGF0YSkg b3ZlcnJpZGU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9v cGVuZ2wvR3JhcGhpY3NDb250ZXh0R0xPcGVuR0wuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL29wZW5nbC9HcmFwaGljc0NvbnRleHRHTE9wZW5HTC5oCmluZGV4IDVlMzMwNzc4 OWY5MGRiMWE2ZTI3MWU0YjMyYzQzZDExMTg0YWM2MzkuLjhlOTU4Y2ZkNzI2ZjY1YWE3MTBmYWNl ZmZlYTBkMGNiOGYwNjA3OTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL29wZW5nbC9HcmFwaGljc0NvbnRleHRHTE9wZW5HTC5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL29wZW5nbC9HcmFwaGljc0NvbnRleHRHTE9wZW5HTC5oCkBA IC00NDUsNiArNDQ1LDggQEAgcHVibGljOgogICAgIHZvaWQgbXVsdGlEcmF3RWxlbWVudHNBTkdM RShHQ0dMZW51bSBtb2RlLCBHQ0dMU3Bhbjxjb25zdCBHQ0dMc2l6ZWk+IGNvdW50cywgR0NHTGVu dW0gdHlwZSwgR0NHTFNwYW48Y29uc3QgR0NHTGludD4gb2Zmc2V0cywgR0NHTHNpemVpIGRyYXdj b3VudCkgb3ZlcnJpZGU7CiAgICAgdm9pZCBtdWx0aURyYXdFbGVtZW50c0luc3RhbmNlZEFOR0xF KEdDR0xlbnVtIG1vZGUsIEdDR0xTcGFuPGNvbnN0IEdDR0xzaXplaT4gY291bnRzLCBHQ0dMZW51 bSB0eXBlLCBHQ0dMU3Bhbjxjb25zdCBHQ0dMaW50PiBvZmZzZXRzLCBHQ0dMU3Bhbjxjb25zdCBH Q0dMc2l6ZWk+IGluc3RhbmNlQ291bnRzLCBHQ0dMc2l6ZWkgZHJhd2NvdW50KSBvdmVycmlkZTsK IAorICAgIFN0cmluZyBnZXRUcmFuc2xhdGVkU2hhZGVyU291cmNlKFBsYXRmb3JtR0xPYmplY3Qp IG92ZXJyaWRlOworCiAgICAgLy8gSGVscGVyIG1ldGhvZHMuCiAgICAgdm9pZCBtYXJrQ29udGV4 dENoYW5nZWQoKSBmaW5hbDsKICAgICB2b2lkIG1hcmtMYXllckNvbXBvc2l0ZWQoKSBmaW5hbDsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL29wZW5nbC9HcmFw aGljc0NvbnRleHRHTE9wZW5HTENvbW1vbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9vcGVuZ2wvR3JhcGhpY3NDb250ZXh0R0xPcGVuR0xDb21tb24uY3BwCmluZGV4IGE3 NmFjOGI1NzQ3NzAxNGYwOGNmMjhjNGMwOTEyZjQ4YThhODVhYzQuLmVmMjExODNjOTg4ZDlmYzg1 N2IyZWM0MWQ1MjQ1ZGI4YjBiNDAzNzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL29wZW5nbC9HcmFwaGljc0NvbnRleHRHTE9wZW5HTENvbW1vbi5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvb3BlbmdsL0dyYXBoaWNzQ29udGV4 dEdMT3BlbkdMQ29tbW9uLmNwcApAQCAtMjg3NCw2ICsyODc0LDExIEBAIHZvaWQgR3JhcGhpY3ND b250ZXh0R0xPcGVuR0w6Om11bHRpRHJhd0VsZW1lbnRzSW5zdGFuY2VkQU5HTEUoR0NHTGVudW0s IEdDR0xTcGFuCiAgICAgc3ludGhlc2l6ZUdMRXJyb3IoR3JhcGhpY3NDb250ZXh0R0w6OklOVkFM SURfT1BFUkFUSU9OKTsKIH0KIAorU3RyaW5nIEdyYXBoaWNzQ29udGV4dEdMT3BlbkdMOjpnZXRU cmFuc2xhdGVkU2hhZGVyU291cmNlKFBsYXRmb3JtR0xPYmplY3Qgb2JqZWN0KQoreworICAgIHJl dHVybiBnZXRFeHRlbnNpb25zKCkuZ2V0VHJhbnNsYXRlZFNoYWRlclNvdXJjZUFOR0xFKG9iamVj dCk7Cit9CisKIH0KIAogI2VuZGlmIC8vIEVOQUJMRShXRUJHTCkgJiYgIVVTRShBTkdMRSkKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvR1BVUHJvY2Vzcy9ncmFwaGljcy9SZW1vdGVHcmFwaGlj c0NvbnRleHRHTC5tZXNzYWdlcy5pbiBiL1NvdXJjZS9XZWJLaXQvR1BVUHJvY2Vzcy9ncmFwaGlj cy9SZW1vdGVHcmFwaGljc0NvbnRleHRHTC5tZXNzYWdlcy5pbgppbmRleCA3NWEwMzRjNjZlYjQ3 Zjk4M2Y1ZGMxNTI0MTM5ZDExMzkwZmQwMDkwLi42MzE1NjI5OTYzZGQxNjRkOGIyYTExZDBkOGQw NTVmNWVmNTEwMjFkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0dQVVByb2Nlc3MvZ3JhcGhp Y3MvUmVtb3RlR3JhcGhpY3NDb250ZXh0R0wubWVzc2FnZXMuaW4KKysrIGIvU291cmNlL1dlYktp dC9HUFVQcm9jZXNzL2dyYXBoaWNzL1JlbW90ZUdyYXBoaWNzQ29udGV4dEdMLm1lc3NhZ2VzLmlu CkBAIC0yNzcsNyArMjc3LDcgQEAgbWVzc2FnZXMgLT4gUmVtb3RlR3JhcGhpY3NDb250ZXh0R0wg Tm90UmVmQ291bnRlZCBTdHJlYW0gewogICAgIHZvaWQgVW5pZm9ybUJsb2NrQmluZGluZyh1aW50 MzJfdCBwcm9ncmFtLCB1aW50MzJfdCB1bmlmb3JtQmxvY2tJbmRleCwgdWludDMyX3QgdW5pZm9y bUJsb2NrQmluZGluZykKICAgICB2b2lkIEdldEFjdGl2ZVVuaWZvcm1CbG9ja2l2KHVpbnQzMl90 IHByb2dyYW0sIHVpbnQzMl90IHVuaWZvcm1CbG9ja0luZGV4LCB1aW50MzJfdCBwbmFtZSwgdWlu dDY0X3QgcGFyYW1zU2l6ZSkgLT4gKElQQzo6QXJyYXlSZWZlcmVuY2U8aW50MzJfdD4gcGFyYW1z KSBTeW5jaHJvbm91cwogICAgIHZvaWQgR2V0R3JhcGhpY3NSZXNldFN0YXR1c0FSQigpIC0+IChp bnQzMl90IHJldHVyblZhbHVlKSBTeW5jaHJvbm91cwotICAgIHZvaWQgR2V0VHJhbnNsYXRlZFNo YWRlclNvdXJjZUFOR0xFKHVpbnQzMl90IGFyZzApIC0+IChTdHJpbmcgcmV0dXJuVmFsdWUpIFN5 bmNocm9ub3VzCisgICAgdm9pZCBHZXRUcmFuc2xhdGVkU2hhZGVyU291cmNlKHVpbnQzMl90IGFy ZzApIC0+IChTdHJpbmcgcmV0dXJuVmFsdWUpIFN5bmNocm9ub3VzCiAgICAgdm9pZCBEcmF3QnVm ZmVyc0VYVChJUEM6OkFycmF5UmVmZXJlbmNlPHVpbnQzMl90PiBidWZzKQogICAgIHZvaWQgR2V0 SW50ZXJuYWxmb3JtYXRpdih1aW50MzJfdCB0YXJnZXQsIHVpbnQzMl90IGludGVybmFsZm9ybWF0 LCB1aW50MzJfdCBwbmFtZSwgdWludDY0X3QgcGFyYW1zU2l6ZSkgLT4gKElQQzo6QXJyYXlSZWZl cmVuY2U8aW50MzJfdD4gcGFyYW1zKSBTeW5jaHJvbm91cwogICAgIHZvaWQgTXVsdGlEcmF3QXJy YXlzQU5HTEUodWludDMyX3QgbW9kZSwgSVBDOjpBcnJheVJlZmVyZW5jZTxpbnQzMl90PiBmaXJz dHMsIElQQzo6QXJyYXlSZWZlcmVuY2U8aW50MzJfdD4gY291bnRzLCBpbnQzMl90IGRyYXdjb3Vu dCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvR1BVUHJvY2Vzcy9ncmFwaGljcy9SZW1vdGVH cmFwaGljc0NvbnRleHRHTEZ1bmN0aW9uc0dlbmVyYXRlZC5oIGIvU291cmNlL1dlYktpdC9HUFVQ cm9jZXNzL2dyYXBoaWNzL1JlbW90ZUdyYXBoaWNzQ29udGV4dEdMRnVuY3Rpb25zR2VuZXJhdGVk LmgKaW5kZXggYmM1NTE2NzgwY2EwMGY1ZWViYzdlNGRhMmQyOWI3MDg4M2VhZDE4NS4uMTBhMjYz NTgyMTJkNDQzYjg3NzExOTU3Y2Q0YTNhYjFkNTk5MjRhZSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9HUFVQcm9jZXNzL2dyYXBoaWNzL1JlbW90ZUdyYXBoaWNzQ29udGV4dEdMRnVuY3Rpb25z R2VuZXJhdGVkLmgKKysrIGIvU291cmNlL1dlYktpdC9HUFVQcm9jZXNzL2dyYXBoaWNzL1JlbW90 ZUdyYXBoaWNzQ29udGV4dEdMRnVuY3Rpb25zR2VuZXJhdGVkLmgKQEAgLTExMDQsMTAgKzExMDQs MTAgQEAKICAgICAgICAgcmV0dXJuVmFsdWUgPSBtX2NvbnRleHQtPmdldEV4dGVuc2lvbnMoKS5n ZXRHcmFwaGljc1Jlc2V0U3RhdHVzQVJCKCk7CiAgICAgICAgIGNvbXBsZXRpb25IYW5kbGVyKHJl dHVyblZhbHVlKTsKICAgICB9Ci0gICAgdm9pZCBnZXRUcmFuc2xhdGVkU2hhZGVyU291cmNlQU5H TEUodWludDMyX3QgYXJnMCwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChTdHJpbmcmJik+JiYgY29t cGxldGlvbkhhbmRsZXIpCisgICAgdm9pZCBnZXRUcmFuc2xhdGVkU2hhZGVyU291cmNlKHVpbnQz Ml90IGFyZzAsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoU3RyaW5nJiYpPiYmIGNvbXBsZXRpb25I YW5kbGVyKQogICAgIHsKICAgICAgICAgU3RyaW5nIHJldHVyblZhbHVlID0geyB9OwotICAgICAg ICByZXR1cm5WYWx1ZSA9IG1fY29udGV4dC0+Z2V0RXh0ZW5zaW9ucygpLmdldFRyYW5zbGF0ZWRT aGFkZXJTb3VyY2VBTkdMRShhcmcwKTsKKyAgICAgICAgcmV0dXJuVmFsdWUgPSBtX2NvbnRleHQt PmdldFRyYW5zbGF0ZWRTaGFkZXJTb3VyY2UoYXJnMCk7CiAgICAgICAgIGNvbXBsZXRpb25IYW5k bGVyKFdURk1vdmUocmV0dXJuVmFsdWUpKTsKICAgICB9CiAgICAgdm9pZCBkcmF3QnVmZmVyc0VY VChJUEM6OkFycmF5UmVmZXJlbmNlPHVpbnQzMl90PiYmIGJ1ZnMpCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L1dlYlByb2Nlc3MvR1BVL2dyYXBoaWNzL1JlbW90ZUdyYXBoaWNzQ29udGV4dEdM UHJveHkuaCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUvZ3JhcGhpY3MvUmVtb3RlR3Jh cGhpY3NDb250ZXh0R0xQcm94eS5oCmluZGV4IDEyZTg5OWJiZWZlZjZkNDFiNzRjM2E3YWMyYjcx MmVjMzFmOGRkMzcuLjRlOGI3NThkYjlhMWRhZTI2MzIxNTA0ODA5YmVlN2Y3OWE2ZmY0ZDEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUvZ3JhcGhpY3MvUmVtb3RlR3Jh cGhpY3NDb250ZXh0R0xQcm94eS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUv Z3JhcGhpY3MvUmVtb3RlR3JhcGhpY3NDb250ZXh0R0xQcm94eS5oCkBAIC0zMDgsNyArMzA4LDcg QEAgcHVibGljOgogICAgIHZvaWQgdW5pZm9ybUJsb2NrQmluZGluZyhQbGF0Zm9ybUdMT2JqZWN0 IHByb2dyYW0sIEdDR0x1aW50IHVuaWZvcm1CbG9ja0luZGV4LCBHQ0dMdWludCB1bmlmb3JtQmxv Y2tCaW5kaW5nKSBmaW5hbDsKICAgICB2b2lkIGdldEFjdGl2ZVVuaWZvcm1CbG9ja2l2KEdDR0x1 aW50IHByb2dyYW0sIEdDR0x1aW50IHVuaWZvcm1CbG9ja0luZGV4LCBHQ0dMZW51bSBwbmFtZSwg R0NHTFNwYW48R0NHTGludD4gcGFyYW1zKSBmaW5hbDsKICAgICBHQ0dMaW50IGdldEdyYXBoaWNz UmVzZXRTdGF0dXNBUkIoKSBmaW5hbDsKLSAgICBTdHJpbmcgZ2V0VHJhbnNsYXRlZFNoYWRlclNv dXJjZUFOR0xFKFBsYXRmb3JtR0xPYmplY3QgYXJnMCkgZmluYWw7CisgICAgU3RyaW5nIGdldFRy YW5zbGF0ZWRTaGFkZXJTb3VyY2UoUGxhdGZvcm1HTE9iamVjdCBhcmcwKSBmaW5hbDsKICAgICB2 b2lkIGRyYXdCdWZmZXJzRVhUKEdDR0xTcGFuPGNvbnN0IEdDR0xlbnVtPiBidWZzKSBmaW5hbDsK ICAgICB2b2lkIGdldEludGVybmFsZm9ybWF0aXYoR0NHTGVudW0gdGFyZ2V0LCBHQ0dMZW51bSBp bnRlcm5hbGZvcm1hdCwgR0NHTGVudW0gcG5hbWUsIEdDR0xTcGFuPEdDR0xpbnQ+IHBhcmFtcykg ZmluYWw7CiAgICAgdm9pZCBtdWx0aURyYXdBcnJheXNBTkdMRShHQ0dMZW51bSBtb2RlLCBHQ0dM U3Bhbjxjb25zdCBHQ0dMaW50PiBmaXJzdHMsIEdDR0xTcGFuPGNvbnN0IEdDR0xzaXplaT4gY291 bnRzLCBHQ0dMc2l6ZWkgZHJhd2NvdW50KSBmaW5hbDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvV2ViUHJvY2Vzcy9HUFUvZ3JhcGhpY3MvUmVtb3RlR3JhcGhpY3NDb250ZXh0R0xQcm94eUZ1 bmN0aW9uc0dlbmVyYXRlZC5jcHAgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvR1BVL2dyYXBo aWNzL1JlbW90ZUdyYXBoaWNzQ29udGV4dEdMUHJveHlGdW5jdGlvbnNHZW5lcmF0ZWQuY3BwCmlu ZGV4IDRkYTJkNjQwYTEzY2FmMDhmZjFmM2E1MDk5M2JiNDE3Nzk0NWI5OWEuLmVmM2Q2ZGM2MDI4 NzYyNzI0YTdhMmU0ZjYwZjZiMjdmMDRhNGY1ZjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv V2ViUHJvY2Vzcy9HUFUvZ3JhcGhpY3MvUmVtb3RlR3JhcGhpY3NDb250ZXh0R0xQcm94eUZ1bmN0 aW9uc0dlbmVyYXRlZC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0dQVS9ncmFw aGljcy9SZW1vdGVHcmFwaGljc0NvbnRleHRHTFByb3h5RnVuY3Rpb25zR2VuZXJhdGVkLmNwcApA QCAtMjI5OCwxMSArMjI5OCwxMSBAQCBHQ0dMaW50IFJlbW90ZUdyYXBoaWNzQ29udGV4dEdMUHJv eHk6OmdldEdyYXBoaWNzUmVzZXRTdGF0dXNBUkIoKQogICAgIHJldHVybiByZXR1cm5WYWx1ZTsK IH0KIAotU3RyaW5nIFJlbW90ZUdyYXBoaWNzQ29udGV4dEdMUHJveHk6OmdldFRyYW5zbGF0ZWRT aGFkZXJTb3VyY2VBTkdMRShQbGF0Zm9ybUdMT2JqZWN0IGFyZzApCitTdHJpbmcgUmVtb3RlR3Jh cGhpY3NDb250ZXh0R0xQcm94eTo6Z2V0VHJhbnNsYXRlZFNoYWRlclNvdXJjZShQbGF0Zm9ybUdM T2JqZWN0IGFyZzApCiB7CiAgICAgU3RyaW5nIHJldHVyblZhbHVlID0geyB9OwogICAgIGlmICgh aXNDb250ZXh0TG9zdCgpKSB7Ci0gICAgICAgIGF1dG8gc2VuZFJlc3VsdCA9IHNlbmRTeW5jKE1l c3NhZ2VzOjpSZW1vdGVHcmFwaGljc0NvbnRleHRHTDo6R2V0VHJhbnNsYXRlZFNoYWRlclNvdXJj ZUFOR0xFKGFyZzApLCBNZXNzYWdlczo6UmVtb3RlR3JhcGhpY3NDb250ZXh0R0w6OkdldFRyYW5z bGF0ZWRTaGFkZXJTb3VyY2VBTkdMRTo6UmVwbHkocmV0dXJuVmFsdWUpKTsKKyAgICAgICAgYXV0 byBzZW5kUmVzdWx0ID0gc2VuZFN5bmMoTWVzc2FnZXM6OlJlbW90ZUdyYXBoaWNzQ29udGV4dEdM OjpHZXRUcmFuc2xhdGVkU2hhZGVyU291cmNlKGFyZzApLCBNZXNzYWdlczo6UmVtb3RlR3JhcGhp Y3NDb250ZXh0R0w6OkdldFRyYW5zbGF0ZWRTaGFkZXJTb3VyY2U6OlJlcGx5KHJldHVyblZhbHVl KSk7CiAgICAgICAgIGlmICghc2VuZFJlc3VsdCkKICAgICAgICAgICAgIG1hcmtDb250ZXh0TG9z dCgpOwogICAgIH0K