176009 2017-08-26 16:57:53 -0700 Web Inspector: send data for WebGL objects during a recording instead of a placeholder string 2018-09-26 23:22:54 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All ASSIGNED InRadar P2 Normal --- 174483 173807 1 hi hi bburg inspector-bugzilla-changes webkit-bug-importer oldest_to_newest 1342679 0 hi 2017-08-26 16:57:53 -0700 The data for buffers and textures can be regenerated, or at least previewed, to assist in debugging WebGL canvases in the WebInspector frontend. We should send the actual data for these objects instead of placeholder strings (e.g. "WebGLBuffer", "WebGLTexture", etc.). 1344563 1 webkit-bug-importer 2017-09-01 13:47:38 -0700 <rdar://problem/34214702> 1463902 2 350951 hi 2018-09-26 23:22:54 -0700 Created attachment 350951 [Patch] WIP 350951 2018-09-26 23:22:54 -0700 2018-09-26 23:22:54 -0700 [Patch] WIP 176009.diff text/plain 17187 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvcHJvdG9jb2wvUmVj b3JkaW5nLmpzb24gYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3Byb3RvY29sL1Jl Y29yZGluZy5qc29uCmluZGV4IDA0MzJmODExNGY1Li4wMzhmMTY5MzExNyAxMDA2NDQKLS0tIGEv U291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9wcm90b2NvbC9SZWNvcmRpbmcuanNvbgor KysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3Byb3RvY29sL1JlY29yZGluZy5q c29uCkBAIC0xNSw3ICsxNSw4IEBACiAgICAgICAgICAgICAicHJvcGVydGllcyI6IFsKICAgICAg ICAgICAgICAgICB7ICJuYW1lIjogImF0dHJpYnV0ZXMiLCAidHlwZSI6ICJvYmplY3QiLCAib3B0 aW9uYWwiOiB0cnVlLCAiZGVzY3JpcHRpb24iOiAiS2V5LXZhbHVlIG1hcCBmb3IgZWFjaCBhdHRy aWJ1dGUgb2YgdGhlIHN0YXRlLiIgfSwKICAgICAgICAgICAgICAgICB7ICJuYW1lIjogInBhcmFt ZXRlcnMiLCAidHlwZSI6ICJhcnJheSIsICJpdGVtcyI6IHsgInR5cGUiOiAiYW55IiB9LCAib3B0 aW9uYWwiOiB0cnVlLCAiZGVzY3JpcHRpb24iOiAiQXJyYXkgb2YgdmFsdWVzIHRoYXQgd2VyZSB1 c2VkIHRvIGNvbnN0cnVjdCB0aGUgcmVjb3JkZWQgb2JqZWN0LiIgfSwKLSAgICAgICAgICAgICAg ICB7ICJuYW1lIjogImNvbnRlbnQiLCAidHlwZSI6ICJzdHJpbmciLCAib3B0aW9uYWwiOiB0cnVl LCAiZGVzY3JpcHRpb24iOiAiQ3VycmVudCBjb250ZW50IGF0IHRoZSBzdGFydCBvZiB0aGUgcmVj b3JkaW5nLiIgfQorICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAiY29udGVudCIsICJ0eXBlIjog InN0cmluZyIsICJvcHRpb25hbCI6IHRydWUsICJkZXNjcmlwdGlvbiI6ICJDdXJyZW50IGNvbnRl bnQgYXQgdGhlIHN0YXJ0IG9mIHRoZSByZWNvcmRpbmcuIiB9LAorICAgICAgICAgICAgICAgIHsg Im5hbWUiOiAib2JqZWN0cyIsICJ0eXBlIjogIm9iamVjdCIsICJvcHRpb25hbCI6IHRydWUsICJk ZXNjcmlwdGlvbiI6ICJNYXAgb2Ygb2JqZWN0cyB0aGF0IGFyZSB1c2VkIHRvIHJlY29uc3RydWN0 IGFuY2lsbGFyeSBvYmplY3RzIHVzZWQgaW4gdGhlIHJlY29yZGluZy4iIH0KICAgICAgICAgICAg IF0KICAgICAgICAgfSwKICAgICAgICAgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmlu ZGluZ3MvanMvQ2FsbFRyYWNlclR5cGVzLmggYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9D YWxsVHJhY2VyVHlwZXMuaAppbmRleCA1OThmMzQ0OGU0Ny4uN2M2NWU5NzQxZTEgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0NhbGxUcmFjZXJUeXBlcy5oCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0NhbGxUcmFjZXJUeXBlcy5oCkBAIC0zMyw2ICszMyw3 IEBACiAjaW5jbHVkZSAiSFRNTENhbnZhc0VsZW1lbnQuaCIKICNpbmNsdWRlICJIVE1MSW1hZ2VF bGVtZW50LmgiCiAjaW5jbHVkZSAiSFRNTFZpZGVvRWxlbWVudC5oIgorI2luY2x1ZGUgIkltYWdl LmgiCiAjaW5jbHVkZSAiSW1hZ2VCaXRtYXAuaCIKICNpbmNsdWRlICJJbWFnZURhdGEuaCIKICNp bmNsdWRlICJQYXRoMkQuaCIKQEAgLTEwNSw0ICsxMDYsOCBAQCB0eXBlZGVmIFZhcmlhbnQ8CiAg ICAgYm9vbAogPiBSZWNvcmRDYW52YXNBY3Rpb25WYXJpYW50OwogCit0eXBlZGVmIFZhcmlhbnQ8 CisgICAgU3RyaW5nCis+IENhcHR1cmVDYW52YXNPYmplY3RWYXJpYW50OworCiB9IC8vIG5hbWVz cGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL2NhbnZhcy9XZWJH TFJlbmRlcmluZ0NvbnRleHRCYXNlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL1dl YkdMUmVuZGVyaW5nQ29udGV4dEJhc2UuY3BwCmluZGV4IDg4Mjg1OGM2ZGMzLi5iNWE3ZGFiNjAw MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvV2ViR0xSZW5kZXJpbmdD b250ZXh0QmFzZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvV2ViR0xSZW5k ZXJpbmdDb250ZXh0QmFzZS5jcHAKQEAgLTM2OTYsNiArMzY5NiwyMCBAQCB2b2lkIFdlYkdMUmVu ZGVyaW5nQ29udGV4dEJhc2U6OnRleEltYWdlMkRCYXNlKEdDM0RlbnVtIHRhcmdldCwgR0MzRGlu dCBsZXZlbCwgRwogICAgIH0gZWxzZSB7CiAgICAgICAgIEFTU0VSVCh2YWxpZGF0ZVNldHRhYmxl VGV4SW50ZXJuYWxGb3JtYXQoInRleEltYWdlMkQiLCBpbnRlcm5hbEZvcm1hdCkpOwogICAgICAg ICBtX2NvbnRleHQtPm1vdmVFcnJvcnNUb1N5bnRoZXRpY0Vycm9yTGlzdCgpOworCisgICAgICAg IGlmIChVTkxJS0VMWShJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246Omhhc0Zyb250ZW5kcygpKSkg eworICAgICAgICAgICAgaWYgKGF1dG8gdGV4dHVyZSA9IHZhbGlkYXRlVGV4dHVyZUJpbmRpbmco InRleEltYWdlMkQiLCB0YXJnZXQsIHRydWUpKSB7CisgICAgICAgICAgICAgICAgSW50U2l6ZSBz aXplKHdpZHRoLCBoZWlnaHQpOworCisgICAgICAgICAgICAgICAgYXV0byBwaXhlbEFycmF5ID0g VWludDhDbGFtcGVkQXJyYXk6OmNyZWF0ZShzdGF0aWNfY2FzdDxjb25zdCB1aW50OF90Kj4ocGl4 ZWxzKSwgd2lkdGggKiBoZWlnaHQgKiA0KTsKKworICAgICAgICAgICAgICAgIGF1dG8gaW1hZ2VC dWZmZXIgPSBJbWFnZUJ1ZmZlcjo6Y3JlYXRlKHNpemUsIFJlbmRlcmluZ01vZGU6OlVuYWNjZWxl cmF0ZWQpOworICAgICAgICAgICAgICAgIGltYWdlQnVmZmVyLT5wdXRCeXRlQXJyYXkoKnBpeGVs QXJyYXksIEFscGhhUHJlbXVsdGlwbGljYXRpb246OlVucHJlbXVsdGlwbGllZCwgc2l6ZSwgSW50 UmVjdChJbnRQb2ludCgpLCBzaXplKSwgSW50UG9pbnQoKSk7CisKKyAgICAgICAgICAgICAgICBJ bnNwZWN0b3JJbnN0cnVtZW50YXRpb246OmNhcHR1cmVDYW52YXNPYmplY3QoKnRoaXMsIG1ha2VT dHJpbmcoInRleHR1cmU6Il9zLCBTdHJpbmc6Om51bWJlcih0ZXh0dXJlLT5vYmplY3QoKSkpLCBp bWFnZUJ1ZmZlci0+dG9EYXRhVVJMKCJpbWFnZS9wbmciKSk7CisgICAgICAgICAgICB9CisgICAg ICAgIH0KKwogICAgICAgICBtX2NvbnRleHQtPnRleEltYWdlMkQodGFyZ2V0LCBsZXZlbCwgaW50 ZXJuYWxGb3JtYXQsIHdpZHRoLCBoZWlnaHQsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBib3JkZXIsIGZvcm1hdCwgdHlwZSwgcGl4ZWxzKTsKICAgICAgICAgaWYgKG1fY29udGV4dC0+ bW92ZUVycm9yc1RvU3ludGhldGljRXJyb3JMaXN0KCkpIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDYW52YXMuY3BwIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL0luc3BlY3RvckNhbnZhcy5jcHAKaW5kZXggN2VjNTc1MTY2NzIuLjkwOGNmYjQ1MDY1 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ2FudmFzLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ2FudmFzLmNwcApAQCAt NDE4LDYgKzQxOCwxMyBAQCBpbnQgSW5zcGVjdG9yQ2FudmFzOjppbmRleEZvckRhdGEoRHVwbGlj YXRlRGF0YVZhcmlhbnQgZGF0YSkKICAgICByZXR1cm4gc3RhdGljX2Nhc3Q8aW50PihpbmRleCk7 CiB9CiAKK3ZvaWQgSW5zcGVjdG9yQ2FudmFzOjpjYXB0dXJlT2JqZWN0KGNvbnN0IFN0cmluZyYg aWRlbnRpZmllciwgQ2FwdHVyZUNhbnZhc09iamVjdFZhcmlhbnQgb2JqZWN0KQoreworICAgIG1f Y2FwdHVyZWRPYmplY3REYXRhLnNldChpZGVudGlmaWVyLCBXVEY6OnN3aXRjaE9uKG9iamVjdCwK KyAgICAgICAgWyZdIChjb25zdCBTdHJpbmcmIHZhbHVlKSB7IHJldHVybiB2YWx1ZTsgfQorICAg ICkpOworfQorCiBzdGF0aWMgUmVmPEpTT046OkFycmF5T2Y8ZG91YmxlPj4gYnVpbGRBcnJheUZv ckFmZmluZVRyYW5zZm9ybShjb25zdCBBZmZpbmVUcmFuc2Zvcm0mIGFmZmluZVRyYW5zZm9ybSkK IHsKICAgICBhdXRvIGFycmF5ID0gSlNPTjo6QXJyYXlPZjxkb3VibGU+OjpjcmVhdGUoKTsKQEAg LTUyNSw2ICs1MzIsMTMgQEAgUmVmPEluc3BlY3Rvcjo6UHJvdG9jb2w6OlJlY29yZGluZzo6SW5p dGlhbFN0YXRlPiBJbnNwZWN0b3JDYW52YXM6OmJ1aWxkSW5pdGlhbFMKIAogICAgIGluaXRpYWxT dGF0ZS0+c2V0Q29udGVudChnZXRDYW52YXNDb250ZW50QXNEYXRhVVJMKCkpOwogCisgICAgaWYg KCFtX2NhcHR1cmVkT2JqZWN0RGF0YS5pc0VtcHR5KCkpIHsKKyAgICAgICAgYXV0byBvYmplY3Rz ID0gSlNPTjo6T2JqZWN0OjpjcmVhdGUoKTsKKyAgICAgICAgZm9yIChhdXRvJiBlbnRyeSA6IG1f Y2FwdHVyZWRPYmplY3REYXRhKQorICAgICAgICAgICAgb2JqZWN0cy0+c2V0U3RyaW5nKGVudHJ5 LmtleSwgZW50cnkudmFsdWUpOworICAgICAgICBpbml0aWFsU3RhdGUtPnNldE9iamVjdHMoV1RG TW92ZShvYmplY3RzKSk7CisgICAgfQorCiAgICAgcmV0dXJuIGluaXRpYWxTdGF0ZTsKIH0KIApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNhbnZhcy5oIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNhbnZhcy5oCmluZGV4IGUxMDJkNWE4 ZGVhLi5iNjIzYTJiNjFhMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0lu c3BlY3RvckNhbnZhcy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JD YW52YXMuaApAQCAtMjksNiArMjksNyBAQAogI2luY2x1ZGUgPEphdmFTY3JpcHRDb3JlL0luc3Bl Y3RvclByb3RvY29sT2JqZWN0cy5oPgogI2luY2x1ZGUgPEphdmFTY3JpcHRDb3JlL1NjcmlwdENh bGxGcmFtZS5oPgogI2luY2x1ZGUgPHd0Zi9WYXJpYW50Lmg+CisjaW5jbHVkZSA8d3RmL0hhc2hN YXAuaD4KICNpbmNsdWRlIDx3dGYvVmVjdG9yLmg+CiAjaW5jbHVkZSA8d3RmL3RleHQvV1RGU3Ry aW5nLmg+CiAKQEAgLTU3LDYgKzU4LDcgQEAgcHVibGljOgogICAgIGJvb2wgaGFzUmVjb3JkaW5n RGF0YSgpIGNvbnN0OwogICAgIGJvb2wgY3VycmVudEZyYW1lSGFzRGF0YSgpIGNvbnN0OwogICAg IHZvaWQgcmVjb3JkQWN0aW9uKGNvbnN0IFN0cmluZyYsIFZlY3RvcjxSZWNvcmRDYW52YXNBY3Rp b25WYXJpYW50PiYmID0geyB9KTsKKyAgICB2b2lkIGNhcHR1cmVPYmplY3QoY29uc3QgU3RyaW5n JiwgQ2FwdHVyZUNhbnZhc09iamVjdFZhcmlhbnQpOwogCiAgICAgUmVmUHRyPEluc3BlY3Rvcjo6 UHJvdG9jb2w6OlJlY29yZGluZzo6SW5pdGlhbFN0YXRlPiYmIHJlbGVhc2VJbml0aWFsU3RhdGUo KTsKICAgICBSZWZQdHI8SlNPTjo6QXJyYXlPZjxJbnNwZWN0b3I6OlByb3RvY29sOjpSZWNvcmRp bmc6OkZyYW1lPj4mJiByZWxlYXNlRnJhbWVzKCk7CkBAIC0xMTIsNiArMTE0LDcgQEAgcHJpdmF0 ZToKICAgICBSZWZQdHI8SlNPTjo6QXJyYXlPZjxKU09OOjpWYWx1ZT4+IG1fYWN0aW9uTmVlZGlu Z1NuYXBzaG90OwogICAgIFJlZlB0cjxKU09OOjpBcnJheU9mPEpTT046OlZhbHVlPj4gbV9zZXJp YWxpemVkRHVwbGljYXRlRGF0YTsKICAgICBWZWN0b3I8RHVwbGljYXRlRGF0YVZhcmlhbnQ+IG1f aW5kZXhlZER1cGxpY2F0ZURhdGE7CisgICAgSGFzaE1hcDxTdHJpbmcsIFN0cmluZz4gbV9jYXB0 dXJlZE9iamVjdERhdGE7CiAKICAgICBTdHJpbmcgbV9yZWNvcmRpbmdOYW1lOwogICAgIE1vbm90 b25pY1RpbWUgbV9jdXJyZW50RnJhbWVTdGFydFRpbWUgeyBNb25vdG9uaWNUaW1lOjpuYW4oKSB9 OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvckluc3RydW1l bnRhdGlvbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9ySW5zdHJ1bWVu dGF0aW9uLmNwcAppbmRleCA3ZjdmMTI2ZTA0Ny4uNDhmZTBiMzZlYmYgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JJbnN0cnVtZW50YXRpb24uY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JJbnN0cnVtZW50YXRpb24uY3BwCkBA IC05NjEsNiArOTYxLDEyIEBAIHZvaWQgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpyZWNvcmRD YW52YXNBY3Rpb25JbXBsKEluc3RydW1lbnRpbmdBZ2VudHMmIGluc3RyCiAgICAgICAgIGNhbnZh c0FnZW50LT5yZWNvcmRDYW52YXNBY3Rpb24oY2FudmFzUmVuZGVyaW5nQ29udGV4dCwgbmFtZSwg V1RGTW92ZShwYXJhbWV0ZXJzKSk7CiB9CiAKK3ZvaWQgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9u OjpjYXB0dXJlQ2FudmFzT2JqZWN0SW1wbChJbnN0cnVtZW50aW5nQWdlbnRzJiBpbnN0cnVtZW50 aW5nQWdlbnRzLCBDYW52YXNSZW5kZXJpbmdDb250ZXh0JiBjYW52YXNSZW5kZXJpbmdDb250ZXh0 LCBjb25zdCBTdHJpbmcmIGlkZW50aWZpZXIsIENhcHR1cmVDYW52YXNPYmplY3RWYXJpYW50IG9i amVjdCkKK3sKKyAgICBpZiAoYXV0byogY2FudmFzQWdlbnQgPSBpbnN0cnVtZW50aW5nQWdlbnRz Lmluc3BlY3RvckNhbnZhc0FnZW50KCkpCisgICAgICAgIGNhbnZhc0FnZW50LT5jYXB0dXJlQ2Fu dmFzT2JqZWN0KGNhbnZhc1JlbmRlcmluZ0NvbnRleHQsIGlkZW50aWZpZXIsIG9iamVjdCk7Cit9 CisKIHZvaWQgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpkaWRGaW5pc2hSZWNvcmRpbmdDYW52 YXNGcmFtZUltcGwoSW5zdHJ1bWVudGluZ0FnZW50cyYgaW5zdHJ1bWVudGluZ0FnZW50cywgQ2Fu dmFzUmVuZGVyaW5nQ29udGV4dCYgY29udGV4dCwgYm9vbCBmb3JjZURpc3BhdGNoKQogewogICAg IGlmIChJbnNwZWN0b3JDYW52YXNBZ2VudCogY2FudmFzQWdlbnQgPSBpbnN0cnVtZW50aW5nQWdl bnRzLmluc3BlY3RvckNhbnZhc0FnZW50KCkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uLmggYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uLmgKaW5kZXggZGRlMjEyMmNjZWQuLjkwNjRj OTFiMTdkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9ySW5z dHJ1bWVudGF0aW9uLmgKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvcklu c3RydW1lbnRhdGlvbi5oCkBAIC0yNTYsNiArMjU2LDcgQEAgcHVibGljOgogICAgIHN0YXRpYyB2 b2lkIGRpZENyZWF0ZUNhbnZhc1JlbmRlcmluZ0NvbnRleHQoQ2FudmFzUmVuZGVyaW5nQ29udGV4 dCYpOwogICAgIHN0YXRpYyB2b2lkIGRpZENoYW5nZUNhbnZhc01lbW9yeShDYW52YXNSZW5kZXJp bmdDb250ZXh0Jik7CiAgICAgc3RhdGljIHZvaWQgcmVjb3JkQ2FudmFzQWN0aW9uKENhbnZhc1Jl bmRlcmluZ0NvbnRleHQmLCBjb25zdCBTdHJpbmcmLCBWZWN0b3I8UmVjb3JkQ2FudmFzQWN0aW9u VmFyaWFudD4mJiA9IHsgfSk7CisgICAgc3RhdGljIHZvaWQgY2FwdHVyZUNhbnZhc09iamVjdChD YW52YXNSZW5kZXJpbmdDb250ZXh0JiwgY29uc3QgU3RyaW5nJiwgQ2FwdHVyZUNhbnZhc09iamVj dFZhcmlhbnQpOwogICAgIHN0YXRpYyB2b2lkIGRpZEZpbmlzaFJlY29yZGluZ0NhbnZhc0ZyYW1l KENhbnZhc1JlbmRlcmluZ0NvbnRleHQmLCBib29sIGZvcmNlRGlzcGF0Y2ggPSBmYWxzZSk7CiAj aWYgRU5BQkxFKFdFQkdMKQogICAgIHN0YXRpYyB2b2lkIGRpZEVuYWJsZUV4dGVuc2lvbihXZWJH TFJlbmRlcmluZ0NvbnRleHRCYXNlJiwgY29uc3QgU3RyaW5nJik7CkBAIC00MjcsNiArNDI4LDcg QEAgcHJpdmF0ZToKICAgICBzdGF0aWMgdm9pZCBkaWRDcmVhdGVDYW52YXNSZW5kZXJpbmdDb250 ZXh0SW1wbChJbnN0cnVtZW50aW5nQWdlbnRzJiwgQ2FudmFzUmVuZGVyaW5nQ29udGV4dCYpOwog ICAgIHN0YXRpYyB2b2lkIGRpZENoYW5nZUNhbnZhc01lbW9yeUltcGwoSW5zdHJ1bWVudGluZ0Fn ZW50cyYsIENhbnZhc1JlbmRlcmluZ0NvbnRleHQmKTsKICAgICBzdGF0aWMgdm9pZCByZWNvcmRD YW52YXNBY3Rpb25JbXBsKEluc3RydW1lbnRpbmdBZ2VudHMmLCBDYW52YXNSZW5kZXJpbmdDb250 ZXh0JiwgY29uc3QgU3RyaW5nJiwgVmVjdG9yPFJlY29yZENhbnZhc0FjdGlvblZhcmlhbnQ+JiYg PSB7IH0pOworICAgIHN0YXRpYyB2b2lkIGNhcHR1cmVDYW52YXNPYmplY3RJbXBsKEluc3RydW1l bnRpbmdBZ2VudHMmLCBDYW52YXNSZW5kZXJpbmdDb250ZXh0JiwgY29uc3QgU3RyaW5nJiwgQ2Fw dHVyZUNhbnZhc09iamVjdFZhcmlhbnQpOwogICAgIHN0YXRpYyB2b2lkIGRpZEZpbmlzaFJlY29y ZGluZ0NhbnZhc0ZyYW1lSW1wbChJbnN0cnVtZW50aW5nQWdlbnRzJiwgQ2FudmFzUmVuZGVyaW5n Q29udGV4dCYsIGJvb2wgZm9yY2VEaXNwYXRjaCA9IGZhbHNlKTsKICNpZiBFTkFCTEUoV0VCR0wp CiAgICAgc3RhdGljIHZvaWQgZGlkRW5hYmxlRXh0ZW5zaW9uSW1wbChJbnN0cnVtZW50aW5nQWdl bnRzJiwgV2ViR0xSZW5kZXJpbmdDb250ZXh0QmFzZSYsIGNvbnN0IFN0cmluZyYpOwpAQCAtMTIy Niw2ICsxMjI4LDEzIEBAIGlubGluZSB2b2lkIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6cmVj b3JkQ2FudmFzQWN0aW9uKENhbnZhc1JlbmRlcmluZ0NvbnRleHQmCiAgICAgICAgIHJlY29yZENh bnZhc0FjdGlvbkltcGwoKmluc3RydW1lbnRpbmdBZ2VudHMsIGNvbnRleHQsIG5hbWUsIFdURk1v dmUocGFyYW1ldGVycykpOwogfQogCitpbmxpbmUgdm9pZCBJbnNwZWN0b3JJbnN0cnVtZW50YXRp b246OmNhcHR1cmVDYW52YXNPYmplY3QoQ2FudmFzUmVuZGVyaW5nQ29udGV4dCYgY29udGV4dCwg Y29uc3QgU3RyaW5nJiBpZGVudGlmaWVyLCBDYXB0dXJlQ2FudmFzT2JqZWN0VmFyaWFudCBvYmpl Y3QpCit7CisgICAgRkFTVF9SRVRVUk5fSUZfTk9fRlJPTlRFTkRTKHZvaWQoKSk7CisgICAgaWYg KGF1dG8qIGluc3RydW1lbnRpbmdBZ2VudHMgPSBpbnN0cnVtZW50aW5nQWdlbnRzRm9yQ29udGV4 dChjb250ZXh0LmNhbnZhc0Jhc2UoKS5zY3JpcHRFeGVjdXRpb25Db250ZXh0KCkpKQorICAgICAg ICBjYXB0dXJlQ2FudmFzT2JqZWN0SW1wbCgqaW5zdHJ1bWVudGluZ0FnZW50cywgY29udGV4dCwg aWRlbnRpZmllciwgb2JqZWN0KTsKK30KKwogaW5saW5lIHZvaWQgSW5zcGVjdG9ySW5zdHJ1bWVu dGF0aW9uOjpkaWRGaW5pc2hSZWNvcmRpbmdDYW52YXNGcmFtZShDYW52YXNSZW5kZXJpbmdDb250 ZXh0JiBjb250ZXh0LCBib29sIGZvcmNlRGlzcGF0Y2gpCiB7CiAgICAgRkFTVF9SRVRVUk5fSUZf Tk9fRlJPTlRFTkRTKHZvaWQoKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvYWdlbnRzL0luc3BlY3RvckNhbnZhc0FnZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9hZ2VudHMvSW5zcGVjdG9yQ2FudmFzQWdlbnQuY3BwCmluZGV4IDE1NDZkNTA4NzFlLi45 ZTQzNDRjZmI2YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2FnZW50cy9J bnNwZWN0b3JDYW52YXNBZ2VudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Fn ZW50cy9JbnNwZWN0b3JDYW52YXNBZ2VudC5jcHAKQEAgLTQ3MCw2ICs0NzAsMTYgQEAgdm9pZCBJ bnNwZWN0b3JDYW52YXNBZ2VudDo6cmVjb3JkQ2FudmFzQWN0aW9uKENhbnZhc1JlbmRlcmluZ0Nv bnRleHQmIGNhbnZhc1JlbmQKICAgICAgICAgZGlkRmluaXNoUmVjb3JkaW5nQ2FudmFzRnJhbWUo aW5zcGVjdG9yQ2FudmFzLT5jb250ZXh0KCksIHRydWUpOwogfQogCit2b2lkIEluc3BlY3RvckNh bnZhc0FnZW50OjpjYXB0dXJlQ2FudmFzT2JqZWN0KENhbnZhc1JlbmRlcmluZ0NvbnRleHQmIGNh bnZhc1JlbmRlcmluZ0NvbnRleHQsIGNvbnN0IFN0cmluZyYgaWRlbnRpZmllciwgQ2FwdHVyZUNh bnZhc09iamVjdFZhcmlhbnQgb2JqZWN0KQoreworICAgIGF1dG8qIGluc3BlY3RvckNhbnZhcyA9 IGZpbmRJbnNwZWN0b3JDYW52YXMoY2FudmFzUmVuZGVyaW5nQ29udGV4dCk7CisgICAgQVNTRVJU KGluc3BlY3RvckNhbnZhcyk7CisgICAgaWYgKCFpbnNwZWN0b3JDYW52YXMpCisgICAgICAgIHJl dHVybjsKKworICAgIGluc3BlY3RvckNhbnZhcy0+Y2FwdHVyZU9iamVjdChpZGVudGlmaWVyLCBv YmplY3QpOworfQorCiB2b2lkIEluc3BlY3RvckNhbnZhc0FnZW50OjpjYW52YXNEZXN0cm95ZWQo Q2FudmFzQmFzZSYgY2FudmFzQmFzZSkKIHsKICAgICBhdXRvKiBjb250ZXh0ID0gY2FudmFzQmFz ZS5yZW5kZXJpbmdDb250ZXh0KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvYWdlbnRzL0luc3BlY3RvckNhbnZhc0FnZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvYWdlbnRzL0luc3BlY3RvckNhbnZhc0FnZW50LmgKaW5kZXggNTQ3ZjBhMjUyMzAuLmNiN2E1 MzRhZDUwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvYWdlbnRzL0luc3Bl Y3RvckNhbnZhc0FnZW50LmgKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2FnZW50cy9J bnNwZWN0b3JDYW52YXNBZ2VudC5oCkBAIC04Nyw2ICs4Nyw3IEBAIHB1YmxpYzoKICAgICB2b2lk IHdpbGxEZXN0cm95Q2FudmFzUmVuZGVyaW5nQ29udGV4dChDYW52YXNSZW5kZXJpbmdDb250ZXh0 Jik7CiAgICAgdm9pZCBkaWRDaGFuZ2VDYW52YXNNZW1vcnkoQ2FudmFzUmVuZGVyaW5nQ29udGV4 dCYpOwogICAgIHZvaWQgcmVjb3JkQ2FudmFzQWN0aW9uKENhbnZhc1JlbmRlcmluZ0NvbnRleHQm LCBjb25zdCBTdHJpbmcmLCBWZWN0b3I8UmVjb3JkQ2FudmFzQWN0aW9uVmFyaWFudD4mJiA9IHsg fSk7CisgICAgdm9pZCBjYXB0dXJlQ2FudmFzT2JqZWN0KENhbnZhc1JlbmRlcmluZ0NvbnRleHQm LCBjb25zdCBTdHJpbmcmLCBDYXB0dXJlQ2FudmFzT2JqZWN0VmFyaWFudCk7CiAgICAgdm9pZCBk aWRGaW5pc2hSZWNvcmRpbmdDYW52YXNGcmFtZShDYW52YXNSZW5kZXJpbmdDb250ZXh0JiwgYm9v bCBmb3JjZURpc3BhdGNoID0gZmFsc2UpOwogICAgIHZvaWQgY29uc29sZVN0YXJ0UmVjb3JkaW5n Q2FudmFzKENhbnZhc1JlbmRlcmluZ0NvbnRleHQmLCBKU0M6OkV4ZWNTdGF0ZSYsIEpTQzo6SlNP YmplY3QqIG9wdGlvbnMpOwogI2lmIEVOQUJMRShXRUJHTCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Mb2NhbGl6YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRT dHJpbmdzLmpzCmluZGV4IGYzYjRmYzFlMzM4Li4wNmE1NzUwMTAzMCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkluc3BlY3RvclVJL0xvY2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5n cy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvTG9jYWxpemF0aW9ucy9lbi5scHJvai9s b2NhbGl6ZWRTdHJpbmdzLmpzCkBAIC04MzksNiArODM5LDcgQEAgbG9jYWxpemVkU3RyaW5nc1si VGFiIHdpZHRoOiJdID0gIlRhYiB3aWR0aDoiOwogbG9jYWxpemVkU3RyaW5nc1siVGFicyJdID0g IlRhYnMiOwogbG9jYWxpemVkU3RyaW5nc1siVGFnIl0gPSAiVGFnIjsKIGxvY2FsaXplZFN0cmlu Z3NbIlRha2Ugc25hcHNob3QiXSA9ICJUYWtlIHNuYXBzaG90IjsKK2xvY2FsaXplZFN0cmluZ3Nb IlRhcmdldCJdID0gIlRhcmdldCI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJUZW1wbGF0ZSBDb250ZW50 Il0gPSAiVGVtcGxhdGUgQ29udGVudCI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJUZXh0Il0gPSAiVGV4 dCI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJUZXh0IEZyYW1lIl0gPSAiVGV4dCBGcmFtZSI7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvUmVjb3Jk aW5nLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL1JlY29y ZGluZy5qcwppbmRleCA2NjI5MzkwYjQ0NC4uNjU4NmYzMTFkZGMgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9SZWNvcmRpbmcuanMKKysrIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL1JlY29yZGluZy5qcwpA QCAtMzYsNyArMzYsNyBAQCBXSS5SZWNvcmRpbmcgPSBjbGFzcyBSZWNvcmRpbmcgZXh0ZW5kcyBX SS5PYmplY3QKICAgICAgICAgdGhpcy5fZGF0YSA9IGRhdGE7CiAgICAgICAgIHRoaXMuX2Rpc3Bs YXlOYW1lID0gV0kuVUlTdHJpbmcoIlJlY29yZGluZyIpOwogCi0gICAgICAgIHRoaXMuX3N3aXp6 bGUgPSBbXTsKKyAgICAgICAgdGhpcy5fc3dpenpsZSA9IHt9OwogICAgICAgICB0aGlzLl9hY3Rp b25zID0gW25ldyBXSS5SZWNvcmRpbmdJbml0aWFsU3RhdGVBY3Rpb25dLmNvbmNhdCguLi50aGlz Ll9mcmFtZXMubWFwKChmcmFtZSkgPT4gZnJhbWUuYWN0aW9ucykpOwogICAgICAgICB0aGlzLl92 aXN1YWxBY3Rpb25JbmRleGVzID0gW107CiAgICAgICAgIHRoaXMuX3NvdXJjZSA9IG51bGw7CkBA IC03Nyw2ICs3Nyw4IEBAIFdJLlJlY29yZGluZyA9IGNsYXNzIFJlY29yZGluZyBleHRlbmRzIFdJ Lk9iamVjdAogICAgICAgICAgICAgcGF5bG9hZC5pbml0aWFsU3RhdGUucGFyYW1ldGVycyA9IFtd OwogICAgICAgICBpZiAodHlwZW9mIHBheWxvYWQuaW5pdGlhbFN0YXRlLmNvbnRlbnQgIT09ICJz dHJpbmciKQogICAgICAgICAgICAgcGF5bG9hZC5pbml0aWFsU3RhdGUuY29udGVudCA9ICIiOwor ICAgICAgICBpZiAodHlwZW9mIHBheWxvYWQuaW5pdGlhbFN0YXRlLm9iamVjdHMgIT09ICJvYmpl Y3QiIHx8IHBheWxvYWQuaW5pdGlhbFN0YXRlLm9iamVjdHMgPT09IG51bGwpCisgICAgICAgICAg ICBwYXlsb2FkLmluaXRpYWxTdGF0ZS5vYmplY3RzID0ge307CiAKICAgICAgICAgaWYgKCFBcnJh eS5pc0FycmF5KHBheWxvYWQuZnJhbWVzKSkKICAgICAgICAgICAgIHBheWxvYWQuZnJhbWVzID0g W107CkBAIC0zNDEsNiArMzQzLDggQEAgV0kuUmVjb3JkaW5nID0gY2xhc3MgUmVjb3JkaW5nIGV4 dGVuZHMgV0kuT2JqZWN0CiAgICAgICAgICAgICBpbml0aWFsU3RhdGUucGFyYW1ldGVycyA9IHRo aXMuX2luaXRpYWxTdGF0ZS5wYXJhbWV0ZXJzOwogICAgICAgICBpZiAodGhpcy5faW5pdGlhbFN0 YXRlLmNvbnRlbnQgJiYgdGhpcy5faW5pdGlhbFN0YXRlLmNvbnRlbnQubGVuZ3RoKQogICAgICAg ICAgICAgaW5pdGlhbFN0YXRlLmNvbnRlbnQgPSB0aGlzLl9pbml0aWFsU3RhdGUuY29udGVudDsK KyAgICAgICAgaWYgKCFpc0VtcHR5T2JqZWN0KHRoaXMuX2luaXRpYWxTdGF0ZS5vYmplY3RzKSkK KyAgICAgICAgICAgIGluaXRpYWxTdGF0ZS5vYmplY3RzID0gdGhpcy5faW5pdGlhbFN0YXRlLm9i amVjdHM7CiAKICAgICAgICAgcmV0dXJuIHsKICAgICAgICAgICAgIHZlcnNpb246IHRoaXMuX3Zl cnNpb24sCkBAIC00NjYsNiArNDcwLDcgQEAgV0kuUmVjb3JkaW5nID0gY2xhc3MgUmVjb3JkaW5n IGV4dGVuZHMgV0kuT2JqZWN0CiAgICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAK KyAgICAgICAgdGhpcy5fc3dpenpsZSA9IG51bGw7CiAgICAgICAgIHRoaXMuX3Byb2Nlc3NDb250 ZXh0ID0gbnVsbDsKICAgICAgICAgdGhpcy5fcHJvY2Vzc2luZyA9IGZhbHNlOwogICAgIH0KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1JlY29y ZGluZ1N0YXRlRGV0YWlsc1NpZGViYXJQYW5lbC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL1JlY29yZGluZ1N0YXRlRGV0YWlsc1NpZGViYXJQYW5lbC5qcwpp bmRleCAzN2JjYmNhNjhjNC4uZjQ5ZWViYTc5YzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1JlY29yZGluZ1N0YXRlRGV0YWlsc1NpZGViYXJQ YW5lbC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9S ZWNvcmRpbmdTdGF0ZURldGFpbHNTaWRlYmFyUGFuZWwuanMKQEAgLTQyLDcgKzQyLDcgQEAgV0ku UmVjb3JkaW5nU3RhdGVEZXRhaWxzU2lkZWJhclBhbmVsID0gY2xhc3MgUmVjb3JkaW5nU3RhdGVE ZXRhaWxzU2lkZWJhclBhbmVsIGUKICAgICAgICAgaWYgKCEob2JqZWN0cyBpbnN0YW5jZW9mIEFy cmF5KSkKICAgICAgICAgICAgIG9iamVjdHMgPSBbb2JqZWN0c107CiAKLSAgICAgICAgdGhpcy5y ZWNvcmRpbmcgPSBvYmplY3RzLmZpbmQoKG9iamVjdCkgPT4gb2JqZWN0IGluc3RhbmNlb2YgV0ku UmVjb3JkaW5nICYmIG9iamVjdC50eXBlID09PSBXSS5SZWNvcmRpbmcuVHlwZS5DYW52YXMyRCk7 CisgICAgICAgIHRoaXMucmVjb3JkaW5nID0gb2JqZWN0cy5maW5kKChvYmplY3QpID0+IG9iamVj dCBpbnN0YW5jZW9mIFdJLlJlY29yZGluZyAmJiAob2JqZWN0LnR5cGUgPT09IFdJLlJlY29yZGlu Zy5UeXBlLkNhbnZhczJEIHx8IG9iamVjdC50eXBlID09PSBXSS5SZWNvcmRpbmcuVHlwZS5DYW52 YXNXZWJHTCkpOwogICAgICAgICB0aGlzLmFjdGlvbiA9IG9iamVjdHMuZmluZCgob2JqZWN0KSA9 PiBvYmplY3QgaW5zdGFuY2VvZiBXSS5SZWNvcmRpbmdBY3Rpb24pOwogCiAgICAgICAgIHJldHVy biB0aGlzLl9yZWNvcmRpbmcgJiYgdGhpcy5fYWN0aW9uOwpAQCAtNjgsMjYgKzY4LDI1IEBAIFdJ LlJlY29yZGluZ1N0YXRlRGV0YWlsc1NpZGViYXJQYW5lbCA9IGNsYXNzIFJlY29yZGluZ1N0YXRl RGV0YWlsc1NpZGViYXJQYW5lbCBlCiAKICAgICAgICAgdGhpcy5fYWN0aW9uID0gYWN0aW9uOwog Ci0gICAgICAgIGlmICh0aGlzLl9hY3Rpb24gJiYgdGhpcy5fcmVjb3JkaW5nLnR5cGUgPT09IFdJ LlJlY29yZGluZy5UeXBlLkNhbnZhczJEKQotICAgICAgICAgICAgdGhpcy5fZ2VuZXJhdGVEZXRh aWxzQ2FudmFzMkQodGhpcy5fYWN0aW9uKTsKLQotICAgICAgICB0aGlzLnVwZGF0ZUxheW91dElm TmVlZGVkKCk7CisgICAgICAgIGlmICh0aGlzLl9yZWNvcmRpbmcudHlwZSA9PT0gV0kuUmVjb3Jk aW5nLlR5cGUuQ2FudmFzMkQpIHsKKyAgICAgICAgICAgIGlmICh0aGlzLl9hY3Rpb24pCisgICAg ICAgICAgICAgICAgdGhpcy5fZ2VuZXJhdGVEZXRhaWxzQ2FudmFzMkQodGhpcy5fYWN0aW9uKTsK KyAgICAgICAgfSBlbHNlIGlmICh0aGlzLl9yZWNvcmRpbmcudHlwZSA9PT0gV0kuUmVjb3JkaW5n LlR5cGUuQ2FudmFzV2ViR0wpCisgICAgICAgICAgICB0aGlzLl9nZW5lcmF0ZURldGFpbHNDYW52 YXNXZWJHTCgpOwogICAgIH0KIAogICAgIC8vIFByaXZhdGUKIAogICAgIF9nZW5lcmF0ZURldGFp bHNDYW52YXMyRChhY3Rpb24pCiAgICAgewotICAgICAgICBpZiAoIXRoaXMuX2RhdGFHcmlkKSB7 Ci0gICAgICAgICAgICB0aGlzLl9kYXRhR3JpZCA9IG5ldyBXSS5EYXRhR3JpZCh7Ci0gICAgICAg ICAgICAgICAgbmFtZToge3RpdGxlOiBXSS5VSVN0cmluZygiTmFtZSIpfSwKLSAgICAgICAgICAg ICAgICB2YWx1ZToge3RpdGxlOiBXSS5VSVN0cmluZygiVmFsdWUiKX0sCi0gICAgICAgICAgICB9 KTsKLSAgICAgICAgfQotICAgICAgICBpZiAoIXRoaXMuX2RhdGFHcmlkLnBhcmVudFZpZXcpCi0g ICAgICAgICAgICB0aGlzLmNvbnRlbnRWaWV3LmFkZFN1YnZpZXcodGhpcy5fZGF0YUdyaWQpOwor ICAgICAgICB0aGlzLmNvbnRlbnRWaWV3LnJlbW92ZUFsbFN1YnZpZXdzKCk7CiAKLSAgICAgICAg dGhpcy5fZGF0YUdyaWQucmVtb3ZlQ2hpbGRyZW4oKTsKKyAgICAgICAgdGhpcy5fZGF0YUdyaWQg PSBuZXcgV0kuRGF0YUdyaWQoeworICAgICAgICAgICAgbmFtZToge3RpdGxlOiBXSS5VSVN0cmlu ZygiTmFtZSIpfSwKKyAgICAgICAgICAgIHZhbHVlOiB7dGl0bGU6IFdJLlVJU3RyaW5nKCJWYWx1 ZSIpfSwKKyAgICAgICAgfSk7CisKKyAgICAgICAgdGhpcy5jb250ZW50Vmlldy5hZGRTdWJ2aWV3 KHRoaXMuX2RhdGFHcmlkKTsKIAogICAgICAgICBjb25zb2xlLmFzc2VydChhY3Rpb24uc3RhdGUp OwogICAgICAgICBpZiAoIWFjdGlvbi5zdGF0ZSkKQEAgLTE1Nyw1ICsxNTYsMzUgQEAgV0kuUmVj b3JkaW5nU3RhdGVEZXRhaWxzU2lkZWJhclBhbmVsID0gY2xhc3MgUmVjb3JkaW5nU3RhdGVEZXRh aWxzU2lkZWJhclBhbmVsIGUKICAgICAgICAgICAgIGNvbnN0IGhhc0NoaWxkcmVuID0gZmFsc2U7 CiAgICAgICAgICAgICB0aGlzLl9kYXRhR3JpZC5hcHBlbmRDaGlsZChuZXcgV0kuRGF0YUdyaWRO b2RlKHtuYW1lLCB2YWx1ZX0sIGhhc0NoaWxkcmVuLCBjbGFzc05hbWVzKSk7CiAgICAgICAgIH0K KworICAgICAgICB0aGlzLnVwZGF0ZUxheW91dElmTmVlZGVkKCk7CisgICAgfQorCisgICAgX2dl bmVyYXRlRGV0YWlsc0NhbnZhc1dlYkdMKCkKKyAgICB7CisgICAgICAgIHRoaXMuY29udGVudFZp ZXcucmVtb3ZlQWxsU3Vidmlld3MoKTsKKworICAgICAgICB0aGlzLl9kYXRhR3JpZCA9IG5ldyBX SS5EYXRhR3JpZCh7CisgICAgICAgICAgICB0YXJnZXQ6IHt0aXRsZTogV0kuVUlTdHJpbmcoIlRh cmdldCIpfSwKKyAgICAgICAgICAgIHZhbHVlOiB7dGl0bGU6IFdJLlVJU3RyaW5nKCJWYWx1ZSIp fSwKKyAgICAgICAgfSk7CisKKyAgICAgICAgdGhpcy5jb250ZW50Vmlldy5hZGRTdWJ2aWV3KHRo aXMuX2RhdGFHcmlkKTsKKworICAgICAgICBmb3IgKGxldCBbaWRlbnRpZmllciwgZGF0YV0gb2Yg T2JqZWN0LmVudHJpZXModGhpcy5fcmVjb3JkaW5nLmluaXRpYWxTdGF0ZS5vYmplY3RzKSkgewor ICAgICAgICAgICAgbGV0IHZhbHVlID0gbnVsbDsKKyAgICAgICAgICAgIGlmIChpZGVudGlmaWVy LnN0YXJ0c1dpdGgoInRleHR1cmU6IikpIHsKKyAgICAgICAgICAgICAgICBsZXQgaW1hZ2UgPSBu ZXcgSW1hZ2U7CisgICAgICAgICAgICAgICAgaW1hZ2Uuc3JjID0gZGF0YTsKKworICAgICAgICAg ICAgICAgIGxldCBzd2F0Y2ggPSBuZXcgV0kuSW5saW5lU3dhdGNoKFdJLklubGluZVN3YXRjaC5U eXBlLkltYWdlLCBpbWFnZSk7CisgICAgICAgICAgICAgICAgdmFsdWUgPSBzd2F0Y2guZWxlbWVu dDsKKyAgICAgICAgICAgIH0KKworICAgICAgICAgICAgaWYgKHZhbHVlKQorICAgICAgICAgICAg ICAgIHRoaXMuX2RhdGFHcmlkLmFwcGVuZENoaWxkKG5ldyBXSS5EYXRhR3JpZE5vZGUoe3Rhcmdl dDogaWRlbnRpZmllciwgdmFsdWV9KSk7CisgICAgICAgIH0KKworICAgICAgICB0aGlzLnVwZGF0 ZUxheW91dElmTmVlZGVkKCk7CiAgICAgfQogfTsK