179207 2017-11-02 15:51:12 -0700 Web Inspector: move top-level namespace functions in ImageUtilities to static class 2017-11-15 12:20:41 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 177032 1 hi hi bburg commit-queue inspector-bugzilla-changes webkit-bug-importer oldest_to_newest 1367599 0 hi 2017-11-02 15:51:12 -0700 In order to prevent "polluting" the WI namespace, we should introduce a static class that holds all ImageUtilities functions. 1367830 1 325866 hi 2017-11-02 23:37:32 -0700 Created attachment 325866 Patch 1368138 2 325866 bburg 2017-11-03 14:02:54 -0700 Comment on attachment 325866 Patch r=me, thanks Devin! 1368162 3 325866 commit-queue 2017-11-03 14:43:36 -0700 Comment on attachment 325866 Patch Clearing flags on attachment: 325866 Committed r224433: <https://trac.webkit.org/changeset/224433> 1368163 4 commit-queue 2017-11-03 14:43:37 -0700 All reviewed patches have been landed. Closing bug. 1372124 5 webkit-bug-importer 2017-11-15 12:20:41 -0800 <rdar://problem/35567354> 325866 2017-11-02 23:37:32 -0700 2017-11-03 14:43:36 -0700 Patch bug-179207-20171102233730.patch text/plain 28074 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGY4MjBmMDM1MGRjYzIwZTJjZWQzNGYwNTY5NzQx YzEyYTlkZTY4YWEuLmZlODkxZWZkYWQ2MGZkMWYwNDYzNTQ2MTNmMDMyZTAyODVlMjEyNmYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDYwIEBACiAyMDE3LTExLTAyICBEZXZp biBSb3Vzc28gIDx3ZWJraXRAZGV2aW5yb3Vzc28uY29tPgogCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IG1vdmUgdG9wLWxldmVsIG5hbWVzcGFjZSBmdW5jdGlvbnMgaW4gSW1hZ2VVdGlsaXRpZXMg dG8gc3RhdGljIGNsYXNzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xNzkyMDcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICAqIC5lc2xpbnRyYzoKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL0Jhc2UvSW1hZ2VV dGlsaXRpZXMuanM6CisgICAgICAgIChXSS5JbWFnZVV0aWxpdGllcy51c2VTVkdTeW1ib2wpOgor ICAgICAgICAoV0kuSW1hZ2VVdGlsaXRpZXMuc2NyYXRjaENhbnZhc0NvbnRleHQyRCk6CisgICAg ICAgIChXSS5JbWFnZVV0aWxpdGllcy5pbWFnZUZyb21JbWFnZURhdGEpOgorICAgICAgICAoV0ku SW1hZ2VVdGlsaXRpZXMuaW1hZ2VGcm9tQ2FudmFzR3JhZGllbnQpOgorICAgICAgICAoV0kuSW1h Z2VVdGlsaXRpZXMpOgorICAgICAgICAodXNlU1ZHU3ltYm9sKTogRGVsZXRlZC4KKyAgICAgICAg KFdJLnNjcmF0Y2hDYW52YXNDb250ZXh0MkQpOiBEZWxldGVkLgorICAgICAgICAoV0kuaW1hZ2VG cm9tSW1hZ2VEYXRhKTogRGVsZXRlZC4KKyAgICAgICAgKFdJLmltYWdlRnJvbUNhbnZhc0dyYWRp ZW50KTogRGVsZXRlZC4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvTW9kZWxzL1JlY29yZGlu Zy5qczoKKyAgICAgICAgKFdJLlJlY29yZGluZy5wcm90b3R5cGUuYXN5bmMgc3dpenpsZSk6Cisg ICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9CdXR0b25OYXZpZ2F0aW9uSXRlbS5qczoKKyAg ICAgICAgKFdJLkJ1dHRvbk5hdmlnYXRpb25JdGVtLnByb3RvdHlwZS5zZXQgaW1hZ2UpOgorICAg ICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvQ2FsbEZyYW1lVHJlZUVsZW1lbnQuanM6CisgICAg ICAgIChXSS5DYWxsRnJhbWVUcmVlRWxlbWVudC5wcm90b3R5cGUuX3VwZGF0ZVN0YXR1cyk6Cisg ICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9ET01Ob2RlRGV0YWlsc1NpZGViYXJQYW5lbC5q czoKKyAgICAgICAgKFdJLkRPTU5vZGVEZXRhaWxzU2lkZWJhclBhbmVsLnByb3RvdHlwZS5pbml0 aWFsTGF5b3V0KToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0RPTVRyZWVFbGVtZW50 LmpzOgorICAgICAgICAoV0kuRE9NVHJlZUVsZW1lbnQucHJvdG90eXBlLl91cGRhdGVCcmVha3Bv aW50U3RhdHVzKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL011bHRpcGxlU2NvcGVC YXJJdGVtLmpzOgorICAgICAgICAoV0kuTXVsdGlwbGVTY29wZUJhckl0ZW0pOgorICAgICAgICAq IFVzZXJJbnRlcmZhY2UvVmlld3MvUmVjb3JkaW5nQWN0aW9uVHJlZUVsZW1lbnQuanM6CisgICAg ICAgIChXSS5SZWNvcmRpbmdBY3Rpb25UcmVlRWxlbWVudC5fZ2VuZXJhdGVET00pOgorICAgICAg ICAoV0kuUmVjb3JkaW5nQWN0aW9uVHJlZUVsZW1lbnQucHJvdG90eXBlLl9oYW5kbGVIYXNWaXNp YmxlRWZmZWN0Q2hhbmdlZCk6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9SZWNvcmRp bmdTdGF0ZURldGFpbHNTaWRlYmFyUGFuZWwuanM6CisgICAgICAgIChXSS5SZWNvcmRpbmdTdGF0 ZURldGFpbHNTaWRlYmFyUGFuZWwucHJvdG90eXBlLl9nZW5lcmF0ZURldGFpbHNDYW52YXMyRCk6 CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9SZXNvdXJjZU1ldHJpY3NDb250ZW50Vmll dy5qczoKKyAgICAgICAgKFdJLlJlc291cmNlTWV0cmljc0NvbnRlbnRWaWV3LnByb3RvdHlwZS5f cmVmcmVzaFJlc291cmNlU2l6ZVNlY3Rpb24pOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmll d3MvU2NvcGVSYWRpb0J1dHRvbk5hdmlnYXRpb25JdGVtLmpzOgorICAgICAgICAoV0kuU2NvcGVS YWRpb0J1dHRvbk5hdmlnYXRpb25JdGVtKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdz L1RocmVhZFRyZWVFbGVtZW50LmpzOgorICAgICAgICAoV0kuVGhyZWFkVHJlZUVsZW1lbnQucHJv dG90eXBlLl91cGRhdGVTdGF0dXMpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvVGlt ZWxpbmVUcmVlRWxlbWVudC5qczoKKyAgICAgICAgKFdJLlRpbWVsaW5lVHJlZUVsZW1lbnQucHJv dG90eXBlLl9zaG93Q2xvc2VCdXR0b24pOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3Mv VmlzdWFsU3R5bGVDb21tYVNlcGFyYXRlZEtleXdvcmRFZGl0b3IuanM6CisgICAgICAgIChXSS5W aXN1YWxTdHlsZUNvbW1hU2VwYXJhdGVkS2V5d29yZEVkaXRvcik6CisgICAgICAgICogVXNlcklu dGVyZmFjZS9WaWV3cy9WaXN1YWxTdHlsZUtleXdvcmRJY29uTGlzdC5qczoKKyAgICAgICAgKFdJ LlZpc3VhbFN0eWxlS2V5d29yZEljb25MaXN0KToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1Zp ZXdzL1Zpc3VhbFN0eWxlUHJvcGVydHlFZGl0b3JMaW5rLmpzOgorICAgICAgICAoV0kuVmlzdWFs U3R5bGVQcm9wZXJ0eUVkaXRvckxpbmspOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3Mv VmlzdWFsU3R5bGVTZWxlY3RvclNlY3Rpb24uanM6CisgICAgICAgIChXSS5WaXN1YWxTdHlsZVNl bGVjdG9yU2VjdGlvbik6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9XZWJTb2NrZXRE YXRhR3JpZE5vZGUuanM6CisgICAgICAgIChXSS5XZWJTb2NrZXREYXRhR3JpZE5vZGUucHJvdG90 eXBlLmNyZWF0ZUNlbGxDb250ZW50KToKKworMjAxNy0xMS0wMiAgRGV2aW4gUm91c3NvICA8d2Vi a2l0QGRldmlucm91c3NvLmNvbT4KKwogICAgICAgICBXZWIgSW5zcGVjdG9yOiBDYW52YXMgVGFi OiBzaG93IHN1cHBvcnRlZCBHTCBleHRlbnNpb25zIGZvciBzZWxlY3RlZCBjYW52YXMKICAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3OTA3MAogICAgICAg ICA8cmRhcjovL3Byb2JsZW0vMzUyNzgyNzY+CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvLmVzbGludHJjIGIvU291cmNlL1dlYkluc3BlY3RvclVJLy5lc2xpbnRyYwppbmRleCA3 NGY3MWUwYjA1YjI3ZjVkNTRiM2I0MjYxZjJhNzVkYjcwNTNiMjVlLi4yMWI3M2Y1MWEwNzg0NzQz NzM4MGMyMTBmZmNiMWRjZGJjODUyNjQ1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvLmVzbGludHJjCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS8uZXNsaW50cmMKQEAgLTEy OCwxMSArMTI4LDYgQEAKICAgICAgICAgLy8gRE9NIFV0aWxpdGllcwogICAgICAgICAiY3JlYXRl U1ZHRWxlbWVudCI6IHRydWUsCiAKLSAgICAgICAgLy8gSW1hZ2UgVXRpbGl0aWVzCi0gICAgICAg ICJwbGF0Zm9ybUltYWdlUGF0aCI6IHRydWUsCi0gICAgICAgICJ1c2VTVkdTeW1ib2wiOiB0cnVl LAotICAgICAgICAid3JhcHBlZFNWR0RvY3VtZW50IjogdHJ1ZSwKLQogICAgICAgICAvLyBVUkwg VXRpbGl0aWVzCiAgICAgICAgICJhYnNvbHV0ZVVSTCI6IHRydWUsCiAgICAgICAgICJkZWNvZGVC YXNlNjRUb0Jsb2IiOiB0cnVlLApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvQmFzZS9JbWFnZVV0aWxpdGllcy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL0Jhc2UvSW1hZ2VVdGlsaXRpZXMuanMKaW5kZXggNDQxY2IxMzEwYTE4 MmQ1YzQ0MjQ3M2M1NmY0NTE2ZTFjYWQxNjc0My4uYzdiMDY3MTI5NGM3NTFmZmI2YWU1MmJkODAx Njc0YmUxMTMwMWU0MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvQmFzZS9JbWFnZVV0aWxpdGllcy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9CYXNlL0ltYWdlVXRpbGl0aWVzLmpzCkBAIC0xLDUgKzEsNiBAQAogLyoK ICAqIENvcHlyaWdodCAoQykgMjAxMywgMjAxNSBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2 ZWQuCisgKiBDb3B5cmlnaHQgKEMpIDIwMTcgRGV2aW4gUm91c3NvIDx3ZWJraXRAZGV2aW5yb3Vz c28uY29tPi4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQg dXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICAqIG1vZGlm aWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0 aW9ucwpAQCAtMjMsODAgKzI0LDgxIEBACiAgKiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1B R0UuCiAgKi8KIAotZnVuY3Rpb24gdXNlU1ZHU3ltYm9sKHVybCwgY2xhc3NOYW1lLCB0aXRsZSkK LXsKLSAgICBjb25zdCBzdmdOYW1lc3BhY2UgPSAiaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmci OwotICAgIGNvbnN0IHhsaW5rTmFtZXNwYWNlID0gImh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxp bmsiOworV0kuSW1hZ2VVdGlsaXRpZXMgPSBjbGFzcyBJbWFnZVV0aWxpdGllcyB7CisgICAgc3Rh dGljIHVzZVNWR1N5bWJvbCh1cmwsIGNsYXNzTmFtZSwgdGl0bGUpCisgICAgeworICAgICAgICBj b25zdCBzdmdOYW1lc3BhY2UgPSAiaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciOworICAgICAg ICBjb25zdCB4bGlua05hbWVzcGFjZSA9ICJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIjsK IAotICAgIGxldCBzdmdFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudE5TKHN2Z05hbWVz cGFjZSwgInN2ZyIpOwotICAgIHN2Z0VsZW1lbnQuc3R5bGUud2lkdGggPSAiMTAwJSI7Ci0gICAg c3ZnRWxlbWVudC5zdHlsZS5oZWlnaHQgPSAiMTAwJSI7CisgICAgICAgIGxldCBzdmdFbGVtZW50 ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudE5TKHN2Z05hbWVzcGFjZSwgInN2ZyIpOworICAgICAg ICBzdmdFbGVtZW50LnN0eWxlLndpZHRoID0gIjEwMCUiOworICAgICAgICBzdmdFbGVtZW50LnN0 eWxlLmhlaWdodCA9ICIxMDAlIjsKIAotICAgIC8vIFVSTCBtdXN0IGNvbnRhaW4gYSBmcmFnbWVu dCByZWZlcmVuY2UgdG8gYSBncmFwaGljYWwgZWxlbWVudCwgbGlrZSBhIHN5bWJvbC4gSWYgbm9u ZSBpcyBnaXZlbgotICAgIC8vIGFwcGVuZCAjcm9vdCB3aGljaCBhbGwgb2Ygb3VyIFNWR3MgaGF2 ZSBvbiB0aGUgdG9wIGxldmVsIDxzdmc+IGVsZW1lbnQuCi0gICAgaWYgKCF1cmwuaW5jbHVkZXMo IiMiKSkKLSAgICAgICAgdXJsICs9ICIjcm9vdCI7CisgICAgICAgIC8vIFVSTCBtdXN0IGNvbnRh aW4gYSBmcmFnbWVudCByZWZlcmVuY2UgdG8gYSBncmFwaGljYWwgZWxlbWVudCwgbGlrZSBhIHN5 bWJvbC4gSWYgbm9uZSBpcyBnaXZlbgorICAgICAgICAvLyBhcHBlbmQgI3Jvb3Qgd2hpY2ggYWxs IG9mIG91ciBTVkdzIGhhdmUgb24gdGhlIHRvcCBsZXZlbCA8c3ZnPiBlbGVtZW50LgorICAgICAg ICBpZiAoIXVybC5pbmNsdWRlcygiIyIpKQorICAgICAgICAgICAgdXJsICs9ICIjcm9vdCI7CiAK LSAgICBsZXQgdXNlRWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnROUyhzdmdOYW1lc3Bh Y2UsICJ1c2UiKTsKLSAgICB1c2VFbGVtZW50LnNldEF0dHJpYnV0ZU5TKHhsaW5rTmFtZXNwYWNl LCAieGxpbms6aHJlZiIsIHVybCk7Ci0gICAgc3ZnRWxlbWVudC5hcHBlbmRDaGlsZCh1c2VFbGVt ZW50KTsKKyAgICAgICAgbGV0IHVzZUVsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50TlMo c3ZnTmFtZXNwYWNlLCAidXNlIik7CisgICAgICAgIHVzZUVsZW1lbnQuc2V0QXR0cmlidXRlTlMo eGxpbmtOYW1lc3BhY2UsICJ4bGluazpocmVmIiwgdXJsKTsKKyAgICAgICAgc3ZnRWxlbWVudC5h cHBlbmRDaGlsZCh1c2VFbGVtZW50KTsKIAotICAgIGxldCB3cmFwcGVyID0gZG9jdW1lbnQuY3Jl YXRlRWxlbWVudCgiZGl2Iik7Ci0gICAgd3JhcHBlci5hcHBlbmRDaGlsZChzdmdFbGVtZW50KTsK KyAgICAgICAgbGV0IHdyYXBwZXIgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKKyAg ICAgICAgd3JhcHBlci5hcHBlbmRDaGlsZChzdmdFbGVtZW50KTsKIAotICAgIGlmIChjbGFzc05h bWUpCi0gICAgICAgIHdyYXBwZXIuY2xhc3NOYW1lID0gY2xhc3NOYW1lOwotICAgIGlmICh0aXRs ZSkKLSAgICAgICAgd3JhcHBlci50aXRsZSA9IHRpdGxlOworICAgICAgICBpZiAoY2xhc3NOYW1l KQorICAgICAgICAgICAgd3JhcHBlci5jbGFzc05hbWUgPSBjbGFzc05hbWU7CisgICAgICAgIGlm ICh0aXRsZSkKKyAgICAgICAgICAgIHdyYXBwZXIudGl0bGUgPSB0aXRsZTsKIAotICAgIHJldHVy biB3cmFwcGVyOwotfQorICAgICAgICByZXR1cm4gd3JhcHBlcjsKKyAgICB9CiAKLShmdW5jdGlv bigpIHsKLSAgICBsZXQgY2FudmFzID0gbnVsbDsKLSAgICBsZXQgY29udGV4dCA9IG51bGw7Cisg ICAgc3RhdGljIHNjcmF0Y2hDYW52YXNDb250ZXh0MkQoY2FsbGJhY2spCisgICAgeworICAgICAg ICBpZiAoIVdJLkltYWdlVXRpbGl0aWVzLl9zY3JhdGNoQ29udGV4dDJEKQorICAgICAgICAgICAg V0kuSW1hZ2VVdGlsaXRpZXMuX3NjcmF0Y2hDb250ZXh0MkQgPSBkb2N1bWVudC5jcmVhdGVFbGVt ZW50KCJjYW52YXMiKS5nZXRDb250ZXh0KCIyZCIpOwogCi0gICAgV0kuc2NyYXRjaENhbnZhc0Nv bnRleHQyRCA9IGZ1bmN0aW9uKGNhbGxiYWNrKSB7Ci0gICAgICAgIGlmICghY2FudmFzKQotICAg ICAgICAgICAgY2FudmFzID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiY2FudmFzIik7CisgICAg ICAgIGxldCBjb250ZXh0ID0gV0kuSW1hZ2VVdGlsaXRpZXMuX3NjcmF0Y2hDb250ZXh0MkQ7CiAK LSAgICAgICAgaWYgKCFjb250ZXh0KQotICAgICAgICAgICAgY29udGV4dCA9IGNhbnZhcy5nZXRD b250ZXh0KCIyZCIpOwotCi0gICAgICAgIGNvbnRleHQuY2xlYXJSZWN0KDAsIDAsIGNhbnZhcy53 aWR0aCwgY2FudmFzLmhlaWdodCk7CisgICAgICAgIGNvbnRleHQuY2xlYXJSZWN0KDAsIDAsIGNv bnRleHQuY2FudmFzLndpZHRoLCBjb250ZXh0LmNhbnZhcy5oZWlnaHQpOwogICAgICAgICBjb250 ZXh0LnNhdmUoKTsKICAgICAgICAgY2FsbGJhY2soY29udGV4dCk7CiAgICAgICAgIGNvbnRleHQu cmVzdG9yZSgpOwotICAgIH07Ci19KSgpOwotCi1XSS5pbWFnZUZyb21JbWFnZURhdGEgPSBmdW5j dGlvbihkYXRhKSB7Ci0gICAgY29uc29sZS5hc3NlcnQoZGF0YSBpbnN0YW5jZW9mIEltYWdlRGF0 YSk7Ci0KLSAgICBsZXQgaW1hZ2UgPSBudWxsOwotICAgIFdJLnNjcmF0Y2hDYW52YXNDb250ZXh0 MkQoKGNvbnRleHQpID0+IHsKLSAgICAgICAgY29udGV4dC5jYW52YXMud2lkdGggPSBkYXRhLndp ZHRoOwotICAgICAgICBjb250ZXh0LmNhbnZhcy5oZWlnaHQgPSBkYXRhLmhlaWdodDsKLSAgICAg ICAgY29udGV4dC5wdXRJbWFnZURhdGEoZGF0YSwgMCwgMCk7Ci0KLSAgICAgICAgaW1hZ2UgPSBu ZXcgSW1hZ2U7Ci0gICAgICAgIGltYWdlLnNyYyA9IGNvbnRleHQuY2FudmFzLnRvRGF0YVVSTCgp OwotICAgIH0pOwotICAgIHJldHVybiBpbWFnZTsKKyAgICB9CisKKyAgICBzdGF0aWMgaW1hZ2VG cm9tSW1hZ2VEYXRhKGRhdGEpCisgICAgeworICAgICAgICBjb25zb2xlLmFzc2VydChkYXRhIGlu c3RhbmNlb2YgSW1hZ2VEYXRhKTsKKworICAgICAgICBsZXQgaW1hZ2UgPSBudWxsOworICAgICAg ICBXSS5JbWFnZVV0aWxpdGllcy5zY3JhdGNoQ2FudmFzQ29udGV4dDJEKChjb250ZXh0KSA9PiB7 CisgICAgICAgICAgICBjb250ZXh0LmNhbnZhcy53aWR0aCA9IGRhdGEud2lkdGg7CisgICAgICAg ICAgICBjb250ZXh0LmNhbnZhcy5oZWlnaHQgPSBkYXRhLmhlaWdodDsKKyAgICAgICAgICAgIGNv bnRleHQucHV0SW1hZ2VEYXRhKGRhdGEsIDAsIDApOworCisgICAgICAgICAgICBpbWFnZSA9IG5l dyBJbWFnZTsKKyAgICAgICAgICAgIGltYWdlLnNyYyA9IGNvbnRleHQuY2FudmFzLnRvRGF0YVVS TCgpOworICAgICAgICB9KTsKKyAgICAgICAgcmV0dXJuIGltYWdlOworICAgIH0KKworICAgIHN0 YXRpYyBpbWFnZUZyb21DYW52YXNHcmFkaWVudChncmFkaWVudCwgd2lkdGgsIGhlaWdodCkKKyAg ICB7CisgICAgICAgIGNvbnNvbGUuYXNzZXJ0KGdyYWRpZW50IGluc3RhbmNlb2YgQ2FudmFzR3Jh ZGllbnQpOworCisgICAgICAgIGxldCBpbWFnZSA9IG51bGw7CisgICAgICAgIFdJLkltYWdlVXRp bGl0aWVzLnNjcmF0Y2hDYW52YXNDb250ZXh0MkQoKGNvbnRleHQpID0+IHsKKyAgICAgICAgICAg IGNvbnRleHQuY2FudmFzLndpZHRoID0gd2lkdGg7CisgICAgICAgICAgICBjb250ZXh0LmNhbnZh cy5oZWlnaHQgPSBoZWlnaHQ7CisgICAgICAgICAgICBjb250ZXh0LmZpbGxTdHlsZSA9IGdyYWRp ZW50OworICAgICAgICAgICAgY29udGV4dC5maWxsUmVjdCgwLCAwLCB3aWR0aCwgaGVpZ2h0KTsK KworICAgICAgICAgICAgaW1hZ2UgPSBuZXcgSW1hZ2U7CisgICAgICAgICAgICBpbWFnZS5zcmMg PSBjb250ZXh0LmNhbnZhcy50b0RhdGFVUkwoKTsKKyAgICAgICAgfSk7CisgICAgICAgIHJldHVy biBpbWFnZTsKKyAgICB9CiB9OwogCi1XSS5pbWFnZUZyb21DYW52YXNHcmFkaWVudCA9IGZ1bmN0 aW9uKGdyYWRpZW50LCB3aWR0aCwgaGVpZ2h0KSB7Ci0gICAgY29uc29sZS5hc3NlcnQoZ3JhZGll bnQgaW5zdGFuY2VvZiBDYW52YXNHcmFkaWVudCk7Ci0KLSAgICBsZXQgaW1hZ2UgPSBudWxsOwot ICAgIFdJLnNjcmF0Y2hDYW52YXNDb250ZXh0MkQoKGNvbnRleHQpID0+IHsKLSAgICAgICAgY29u dGV4dC5jYW52YXMud2lkdGggPSB3aWR0aDsKLSAgICAgICAgY29udGV4dC5jYW52YXMuaGVpZ2h0 ID0gaGVpZ2h0OwotICAgICAgICBjb250ZXh0LmZpbGxTdHlsZSA9IGdyYWRpZW50OwotICAgICAg ICBjb250ZXh0LmZpbGxSZWN0KDAsIDAsIHdpZHRoLCBoZWlnaHQpOwotCi0gICAgICAgIGltYWdl ID0gbmV3IEltYWdlOwotICAgICAgICBpbWFnZS5zcmMgPSBjb250ZXh0LmNhbnZhcy50b0RhdGFV UkwoKTsKLSAgICB9KTsKLSAgICByZXR1cm4gaW1hZ2U7Ci19OworV0kuSW1hZ2VVdGlsaXRpZXMu X3NjcmF0Y2hDb250ZXh0MkQgPSBudWxsOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL1JlY29yZGluZy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9SZWNvcmRpbmcuanMKaW5kZXggYzc3NDkwYjkyMDhj MDUzODQ2NmZmMzIyYjY3MjU5ZGE1ZDE5ZDRmZC4uMDA4MmM2ZGI4NDI3Y2MxMTdjNTRiZGFkZDU0 MTg5NjhlYzRjMzNmZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvTW9kZWxzL1JlY29yZGluZy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9Nb2RlbHMvUmVjb3JkaW5nLmpzCkBAIC0yNjksNyArMjY5LDcgQEAgV0kuUmVj b3JkaW5nID0gY2xhc3MgUmVjb3JkaW5nCiAgICAgICAgICAgICAgICAgY2FzZSBXSS5SZWNvcmRp bmcuU3dpenpsZS5DYW52YXNHcmFkaWVudDoKICAgICAgICAgICAgICAgICAgICAgdmFyIGdyYWRp ZW50VHlwZSA9IGF3YWl0IHRoaXMuc3dpenpsZShkYXRhWzBdLCBXSS5SZWNvcmRpbmcuU3dpenps ZS5TdHJpbmcpOwogCi0gICAgICAgICAgICAgICAgICAgIFdJLnNjcmF0Y2hDYW52YXNDb250ZXh0 MkQoKGNvbnRleHQpID0+IHsKKyAgICAgICAgICAgICAgICAgICAgV0kuSW1hZ2VVdGlsaXRpZXMu c2NyYXRjaENhbnZhc0NvbnRleHQyRCgoY29udGV4dCkgPT4gewogICAgICAgICAgICAgICAgICAg ICAgICAgdGhpcy5fc3dpenpsZVtpbmRleF1bdHlwZV0gPSBncmFkaWVudFR5cGUgPT09ICJyYWRp YWwtZ3JhZGllbnQiID8gY29udGV4dC5jcmVhdGVSYWRpYWxHcmFkaWVudCguLi5kYXRhWzFdKSA6 IGNvbnRleHQuY3JlYXRlTGluZWFyR3JhZGllbnQoLi4uZGF0YVsxXSk7CiAgICAgICAgICAgICAg ICAgICAgIH0pOwogCkBAIC0yODUsNyArMjg1LDcgQEAgV0kuUmVjb3JkaW5nID0gY2xhc3MgUmVj b3JkaW5nCiAgICAgICAgICAgICAgICAgICAgICAgICB0aGlzLnN3aXp6bGUoZGF0YVsxXSwgV0ku UmVjb3JkaW5nLlN3aXp6bGUuU3RyaW5nKSwKICAgICAgICAgICAgICAgICAgICAgXSk7CiAKLSAg ICAgICAgICAgICAgICAgICAgV0kuc2NyYXRjaENhbnZhc0NvbnRleHQyRCgoY29udGV4dCkgPT4g eworICAgICAgICAgICAgICAgICAgICBXSS5JbWFnZVV0aWxpdGllcy5zY3JhdGNoQ2FudmFzQ29u dGV4dDJEKChjb250ZXh0KSA9PiB7CiAgICAgICAgICAgICAgICAgICAgICAgICB0aGlzLl9zd2l6 emxlW2luZGV4XVt0eXBlXSA9IGNvbnRleHQuY3JlYXRlUGF0dGVybihpbWFnZSwgcmVwZWF0KTsK ICAgICAgICAgICAgICAgICAgICAgICAgIHRoaXMuX3N3aXp6bGVbaW5kZXhdW3R5cGVdLl9faW1h Z2UgPSBpbWFnZTsKICAgICAgICAgICAgICAgICAgICAgfSk7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9CdXR0b25OYXZpZ2F0aW9uSXRlbS5q cyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0J1dHRvbk5hdmln YXRpb25JdGVtLmpzCmluZGV4IDI1Nzc5YmMwMDJhMzExM2E5M2Y5ZWNlZWY2NDRkZTAyMTdhMDlm MGIuLjM1ZWM3OWE1Y2IxMWI4OTdiYTJlNTZmODNiZGZjNWI1NWI1YTNmM2EgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0J1dHRvbk5hdmlnYXRp b25JdGVtLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L0J1dHRvbk5hdmlnYXRpb25JdGVtLmpzCkBAIC05Niw3ICs5Niw3IEBAIFdJLkJ1dHRvbk5hdmln YXRpb25JdGVtID0gY2xhc3MgQnV0dG9uTmF2aWdhdGlvbkl0ZW0gZXh0ZW5kcyBXSS5OYXZpZ2F0 aW9uSXRlbQogCiAgICAgICAgIHRoaXMuX2ltYWdlID0gbmV3SW1hZ2U7CiAKLSAgICAgICAgdGhp cy5fZ2x5cGhFbGVtZW50ID0gdXNlU1ZHU3ltYm9sKHRoaXMuX2ltYWdlLCAiZ2x5cGgiKTsKKyAg ICAgICAgdGhpcy5fZ2x5cGhFbGVtZW50ID0gV0kuSW1hZ2VVdGlsaXRpZXMudXNlU1ZHU3ltYm9s KHRoaXMuX2ltYWdlLCAiZ2x5cGgiKTsKICAgICAgICAgdGhpcy5fZ2x5cGhFbGVtZW50LnN0eWxl LndpZHRoID0gdGhpcy5faW1hZ2VXaWR0aCArICJweCI7CiAgICAgICAgIHRoaXMuX2dseXBoRWxl bWVudC5zdHlsZS5oZWlnaHQgPSB0aGlzLl9pbWFnZUhlaWdodCArICJweCI7CiAgICAgICAgIHRo aXMuX2VsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5fZ2x5cGhFbGVtZW50KTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NhbGxGcmFtZVRyZWVF bGVtZW50LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ2Fs bEZyYW1lVHJlZUVsZW1lbnQuanMKaW5kZXggMzFmZjY5YzJjZWRjYjc4NzZjMTcxNDVmOTcxNmMz Yzg1NGRlYjIxNS4uMmJhNDJiZWUxYjYxODE5Nzg2MTUzMGVjMWQwNDRlMmY5Y2ViMTJmOSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ2FsbEZy YW1lVHJlZUVsZW1lbnQuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvQ2FsbEZyYW1lVHJlZUVsZW1lbnQuanMKQEAgLTEwMiw3ICsxMDIsNyBAQCBXSS5D YWxsRnJhbWVUcmVlRWxlbWVudCA9IGNsYXNzIENhbGxGcmFtZVRyZWVFbGVtZW50IGV4dGVuZHMg V0kuR2VuZXJhbFRyZWVFbGVtZQogICAgICAgICB9CiAKICAgICAgICAgaWYgKCF0aGlzLl9zdGF0 dXNJbWFnZUVsZW1lbnQpCi0gICAgICAgICAgICB0aGlzLl9zdGF0dXNJbWFnZUVsZW1lbnQgPSB1 c2VTVkdTeW1ib2woIkltYWdlcy9BY3RpdmVDYWxsRnJhbWUuc3ZnIiwgInN0YXR1cy1pbWFnZSIp OworICAgICAgICAgICAgdGhpcy5fc3RhdHVzSW1hZ2VFbGVtZW50ID0gV0kuSW1hZ2VVdGlsaXRp ZXMudXNlU1ZHU3ltYm9sKCJJbWFnZXMvQWN0aXZlQ2FsbEZyYW1lLnN2ZyIsICJzdGF0dXMtaW1h Z2UiKTsKICAgICAgICAgdGhpcy5zdGF0dXMgPSB0aGlzLl9zdGF0dXNJbWFnZUVsZW1lbnQ7CiAg ICAgfQogfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL0RPTU5vZGVEZXRhaWxzU2lkZWJhclBhbmVsLmpzIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRE9NTm9kZURldGFpbHNTaWRlYmFyUGFuZWwuanMKaW5k ZXggOWE4MTkwZWVjYTAzYWE0MzExNmE1OTM2ZWU5NzVhM2U3ZDQxMjcwMS4uZGZjMmM1YzRiZDZm ZjRjMTMwMTA2YWQ5ZDQ4ZWI1ODQ5ZTUyODg5ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRE9NTm9kZURldGFpbHNTaWRlYmFyUGFuZWwuanMK KysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRE9NTm9kZURl dGFpbHNTaWRlYmFyUGFuZWwuanMKQEAgLTc0LDcgKzc0LDcgQEAgV0kuRE9NTm9kZURldGFpbHNT aWRlYmFyUGFuZWwgPSBjbGFzcyBET01Ob2RlRGV0YWlsc1NpZGViYXJQYW5lbCBleHRlbmRzIFdJ LkRPTUQKICAgICAgICAgdmFyIHByb3BlcnRpZXNHcm91cCA9IG5ldyBXSS5EZXRhaWxzU2VjdGlv bkdyb3VwKFt0aGlzLl9wcm9wZXJ0aWVzUm93XSk7CiAgICAgICAgIHZhciBwcm9wZXJ0aWVzU2Vj dGlvbiA9IG5ldyBXSS5EZXRhaWxzU2VjdGlvbigiZG9tLW5vZGUtcHJvcGVydGllcyIsIFdJLlVJ U3RyaW5nKCJQcm9wZXJ0aWVzIiksIFtwcm9wZXJ0aWVzR3JvdXBdKTsKIAotICAgICAgICBsZXQg ZXZlbnRMaXN0ZW5lcnNGaWx0ZXJFbGVtZW50ID0gdXNlU1ZHU3ltYm9sKCJJbWFnZXMvRmlsdGVy RmllbGRHbHlwaC5zdmciLCAiZmlsdGVyIiwgV0kuVUlTdHJpbmcoIkdyb3VwaW5nIE1ldGhvZCIp KTsKKyAgICAgICAgbGV0IGV2ZW50TGlzdGVuZXJzRmlsdGVyRWxlbWVudCA9IFdJLkltYWdlVXRp bGl0aWVzLnVzZVNWR1N5bWJvbCgiSW1hZ2VzL0ZpbHRlckZpZWxkR2x5cGguc3ZnIiwgImZpbHRl ciIsIFdJLlVJU3RyaW5nKCJHcm91cGluZyBNZXRob2QiKSk7CiAKICAgICAgICAgbGV0IGV2ZW50 TGlzdGVuZXJzR3JvdXBNZXRob2RTZWxlY3RFbGVtZW50ID0gZXZlbnRMaXN0ZW5lcnNGaWx0ZXJF bGVtZW50LmFwcGVuZENoaWxkKGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoInNlbGVjdCIpKTsKICAg ICAgICAgZXZlbnRMaXN0ZW5lcnNHcm91cE1ldGhvZFNlbGVjdEVsZW1lbnQuYWRkRXZlbnRMaXN0 ZW5lcigiY2hhbmdlIiwgKGV2ZW50KSA9PiB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9ET01UcmVlRWxlbWVudC5qcyBiL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RPTVRyZWVFbGVtZW50LmpzCmluZGV4IGMx NjBjYzM2ZDUzODMzYWQ1ZTAxZmNhN2Y3ZWI1ZTlhZWZhZjc4YTkuLmRlMjBlNGNlMzk4ZDg3YTdj ODc3MmMyZjdhNzJjM2ZjM2Q0MjA3ZDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RPTVRyZWVFbGVtZW50LmpzCisrKyBiL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RPTVRyZWVFbGVtZW50LmpzCkBAIC0xNzAy LDcgKzE3MDIsNyBAQCBXSS5ET01UcmVlRWxlbWVudCA9IGNsYXNzIERPTVRyZWVFbGVtZW50IGV4 dGVuZHMgV0kuVHJlZUVsZW1lbnQKICAgICAgICAgfQogCiAgICAgICAgIGlmICghdGhpcy5fc3Rh dHVzSW1hZ2VFbGVtZW50KSB7Ci0gICAgICAgICAgICB0aGlzLl9zdGF0dXNJbWFnZUVsZW1lbnQg PSB1c2VTVkdTeW1ib2woIkltYWdlcy9ET01CcmVha3BvaW50LnN2ZyIsICJzdGF0dXMtaW1hZ2Ui KTsKKyAgICAgICAgICAgIHRoaXMuX3N0YXR1c0ltYWdlRWxlbWVudCA9IFdJLkltYWdlVXRpbGl0 aWVzLnVzZVNWR1N5bWJvbCgiSW1hZ2VzL0RPTUJyZWFrcG9pbnQuc3ZnIiwgInN0YXR1cy1pbWFn ZSIpOwogICAgICAgICAgICAgdGhpcy5fc3RhdHVzSW1hZ2VFbGVtZW50LmNsYXNzTGlzdC5hZGQo ImJyZWFrcG9pbnQiKTsKICAgICAgICAgICAgIHRoaXMuX3N0YXR1c0ltYWdlRWxlbWVudC5hZGRF dmVudExpc3RlbmVyKCJjbGljayIsIHRoaXMuX3N0YXR1c0ltYWdlQ2xpY2tlZC5iaW5kKHRoaXMp KTsKICAgICAgICAgICAgIHRoaXMuX3N0YXR1c0ltYWdlRWxlbWVudC5hZGRFdmVudExpc3RlbmVy KCJjb250ZXh0bWVudSIsIHRoaXMuX3N0YXR1c0ltYWdlQ29udGV4dG1lbnUuYmluZCh0aGlzKSk7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9N dWx0aXBsZVNjb3BlQmFySXRlbS5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL011bHRpcGxlU2NvcGVCYXJJdGVtLmpzCmluZGV4IDhkYTViNDQ5MzM4YTI0YWIx ZWE3NDhmMGMyYTAyZmI3YThlYjlmODYuLjZhYWMyNDNhOGU2YWUyMjNiYzViNTM4YWVlYmI3MzE5 NTAyNTdiMWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL011bHRpcGxlU2NvcGVCYXJJdGVtLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL011bHRpcGxlU2NvcGVCYXJJdGVtLmpzCkBAIC00MCw3ICs0 MCw3IEBAIFdJLk11bHRpcGxlU2NvcGVCYXJJdGVtID0gY2xhc3MgTXVsdGlwbGVTY29wZUJhckl0 ZW0gZXh0ZW5kcyBXSS5PYmplY3QKICAgICAgICAgdGhpcy5fc2VsZWN0RWxlbWVudC5hZGRFdmVu dExpc3RlbmVyKCJjaGFuZ2UiLCB0aGlzLl9zZWxlY3RFbGVtZW50U2VsZWN0aW9uQ2hhbmdlZC5i aW5kKHRoaXMpKTsKICAgICAgICAgdGhpcy5fZWxlbWVudC5hcHBlbmRDaGlsZCh0aGlzLl9zZWxl Y3RFbGVtZW50KTsKIAotICAgICAgICB0aGlzLl9lbGVtZW50LmFwcGVuZENoaWxkKHVzZVNWR1N5 bWJvbCgiSW1hZ2VzL1VwRG93bkFycm93cy5zdmciLCAiYXJyb3dzIikpOworICAgICAgICB0aGlz Ll9lbGVtZW50LmFwcGVuZENoaWxkKFdJLkltYWdlVXRpbGl0aWVzLnVzZVNWR1N5bWJvbCgiSW1h Z2VzL1VwRG93bkFycm93cy5zdmciLCAiYXJyb3dzIikpOwogCiAgICAgICAgIHRoaXMuc2NvcGVC YXJJdGVtcyA9IHNjb3BlQmFySXRlbXM7CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUmVjb3JkaW5nQWN0aW9uVHJlZUVsZW1lbnQu anMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9SZWNvcmRpbmdB Y3Rpb25UcmVlRWxlbWVudC5qcwppbmRleCBkYjAwOTRjZjQzNzRhMmQ2YWQ0NDRmYzk0ZTcyMTA2 ZWNjNWFmNWM2Li5mMjk5MjRhNzJiODNlYzZjNWQ1Mzk4ZTU1NGViMGM4YTg2NjNmYzEyIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9SZWNvcmRp bmdBY3Rpb25UcmVlRWxlbWVudC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9SZWNvcmRpbmdBY3Rpb25UcmVlRWxlbWVudC5qcwpAQCAtMTUyLDkgKzE1 Miw5IEBAIFdJLlJlY29yZGluZ0FjdGlvblRyZWVFbGVtZW50ID0gY2xhc3MgUmVjb3JkaW5nQWN0 aW9uVHJlZUVsZW1lbnQgZXh0ZW5kcyBXSS5HZW5lCiAgICAgICAgICAgICBsZXQgaW1hZ2UgPSBp bWFnZVBhcmFtZXRlcnNbMF07CiAKICAgICAgICAgICAgIGlmIChpc0ltYWdlRGF0YSkKLSAgICAg ICAgICAgICAgICBpbWFnZSA9IFdJLmltYWdlRnJvbUltYWdlRGF0YShpbWFnZSk7CisgICAgICAg ICAgICAgICAgaW1hZ2UgPSBXSS5JbWFnZVV0aWxpdGllcy5pbWFnZUZyb21JbWFnZURhdGEoaW1h Z2UpOwogICAgICAgICAgICAgZWxzZSBpZiAoaXNDYW52YXNHcmFkaWVudCkKLSAgICAgICAgICAg ICAgICBpbWFnZSA9IFdJLmltYWdlRnJvbUNhbnZhc0dyYWRpZW50KGltYWdlLCAxMDAsIDEwMCk7 CisgICAgICAgICAgICAgICAgaW1hZ2UgPSBXSS5JbWFnZVV0aWxpdGllcy5pbWFnZUZyb21DYW52 YXNHcmFkaWVudChpbWFnZSwgMTAwLCAxMDApOwogICAgICAgICAgICAgZWxzZSBpZiAoaXNDYW52 YXNQYXR0ZXJuKQogICAgICAgICAgICAgICAgIGltYWdlID0gaW1hZ2UuX19pbWFnZTsKIApAQCAt NDMzLDcgKzQzMyw3IEBAIFdJLlJlY29yZGluZ0FjdGlvblRyZWVFbGVtZW50ID0gY2xhc3MgUmVj b3JkaW5nQWN0aW9uVHJlZUVsZW1lbnQgZXh0ZW5kcyBXSS5HZW5lCiAgICAgewogICAgICAgICB0 aGlzLmFkZENsYXNzTmFtZSgibm8tdmlzaWJsZS1lZmZlY3QiKTsKIAotICAgICAgICB0aGlzLnN0 YXR1cyA9IHVzZVNWR1N5bWJvbCgiSW1hZ2VzL1dhcm5pbmcuc3ZnIiwgIndhcm5pbmciKTsKKyAg ICAgICAgdGhpcy5zdGF0dXMgPSBXSS5JbWFnZVV0aWxpdGllcy51c2VTVkdTeW1ib2woIkltYWdl cy9XYXJuaW5nLnN2ZyIsICJ3YXJuaW5nIik7CiAgICAgICAgIHRoaXMuc3RhdHVzLnRpdGxlID0g V0kuVUlTdHJpbmcoIlRoaXMgYWN0aW9uIGNhdXNlcyBubyB2aXN1YWwgY2hhbmdlIik7CiAgICAg fQogfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL1JlY29yZGluZ1N0YXRlRGV0YWlsc1NpZGViYXJQYW5lbC5qcyBiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1JlY29yZGluZ1N0YXRlRGV0YWlsc1NpZGViYXJQ YW5lbC5qcwppbmRleCBiZWRkYTNjMmRhYWIwYjlmMjdmYWFiZGQ3OWQyN2U0NWI0ZTllMDQ1Li5k YWJkNjMwZDQyNjM3MGI2NWE5ZjBhODc5NTk1ODg2YTI0YmEyMzZmIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9SZWNvcmRpbmdTdGF0ZURldGFp bHNTaWRlYmFyUGFuZWwuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvUmVjb3JkaW5nU3RhdGVEZXRhaWxzU2lkZWJhclBhbmVsLmpzCkBAIC0xNDcsNyAr MTQ3LDcgQEAgV0kuUmVjb3JkaW5nU3RhdGVEZXRhaWxzU2lkZWJhclBhbmVsID0gY2xhc3MgUmVj b3JkaW5nU3RhdGVEZXRhaWxzU2lkZWJhclBhbmVsIGUKICAgICAgICAgICAgICAgICAgICAgbGV0 IGltYWdlID0gbnVsbDsKICAgICAgICAgICAgICAgICAgICAgaWYgKGlzR3JhZGllbnQpIHsKICAg ICAgICAgICAgICAgICAgICAgICAgIHRleHRFbGVtZW50LnRleHRDb250ZW50ID0gV0kudW5sb2Nh bGl6ZWRTdHJpbmcoIkNhbnZhc0dyYWRpZW50Iik7Ci0gICAgICAgICAgICAgICAgICAgICAgICBp bWFnZSA9IFdJLmltYWdlRnJvbUNhbnZhc0dyYWRpZW50KHZhbHVlLCAxMDAsIDEwMCk7CisgICAg ICAgICAgICAgICAgICAgICAgICBpbWFnZSA9IFdJLkltYWdlVXRpbGl0aWVzLmltYWdlRnJvbUNh bnZhc0dyYWRpZW50KHZhbHVlLCAxMDAsIDEwMCk7CiAgICAgICAgICAgICAgICAgICAgIH0gZWxz ZSBpZiAoaXNQYXR0ZXJuKSB7CiAgICAgICAgICAgICAgICAgICAgICAgICB0ZXh0RWxlbWVudC50 ZXh0Q29udGVudCA9IFdJLnVubG9jYWxpemVkU3RyaW5nKCJDYW52YXNQYXR0ZXJuIik7CiAgICAg ICAgICAgICAgICAgICAgICAgICBpbWFnZSA9IHZhbHVlLl9faW1hZ2U7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9SZXNvdXJjZU1ldHJpY3ND b250ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L1Jlc291cmNlTWV0cmljc0NvbnRlbnRWaWV3LmpzCmluZGV4IGZiNjg0ZmM3NTIzYmQ2OTAwMDgz ZDVjODBmMzEzZjQxNDY2YjBmMDYuLmE4MzFiMzc4NDU4ZDIyNzI5MzE4OWNiMjMzODA1MTJlYzE2 MmI5YTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL1Jlc291cmNlTWV0cmljc0NvbnRlbnRWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Jlc291cmNlTWV0cmljc0NvbnRlbnRWaWV3LmpzCkBA IC0yNjksNyArMjY5LDcgQEAgV0kuUmVzb3VyY2VNZXRyaWNzQ29udGVudFZpZXcgPSBjbGFzcyBS ZXNvdXJjZU1ldHJpY3NDb250ZW50VmlldyBleHRlbmRzIFdJLkNvbnQKIAogICAgICAgICBjb25z dCBtaW5pbXVtU2l6ZUJlZm9yZVdhcm5pbmcgPSAxMDI0OwogICAgICAgICBpZiAoY29tcHJlc3Np b25SYXRlIDw9IDEgJiYgZW5jb2RlZFNpemUgPj0gbWluaW11bVNpemVCZWZvcmVXYXJuaW5nICYm IFdJLnNob3VsZFRyZWF0TUlNRVR5cGVBc1RleHQodGhpcy5fcmVzb3VyY2UubWltZVR5cGUpKQot ICAgICAgICAgICAgdGhpcy5fY29tcHJlc3Npb25FbGVtZW50LmFwcGVuZENoaWxkKHVzZVNWR1N5 bWJvbCgiSW1hZ2VzL1dhcm5pbmcuc3ZnIiwgIndhcm5pbmciLCBXSS5VSVN0cmluZygiVGhpcyB0 ZXh0IHJlc291cmNlIGNvdWxkIGJlbmVmaXQgZnJvbSBjb21wcmVzc2lvbiIpKSk7CisgICAgICAg ICAgICB0aGlzLl9jb21wcmVzc2lvbkVsZW1lbnQuYXBwZW5kQ2hpbGQoV0kuSW1hZ2VVdGlsaXRp ZXMudXNlU1ZHU3ltYm9sKCJJbWFnZXMvV2FybmluZy5zdmciLCAid2FybmluZyIsIFdJLlVJU3Ry aW5nKCJUaGlzIHRleHQgcmVzb3VyY2UgY291bGQgYmVuZWZpdCBmcm9tIGNvbXByZXNzaW9uIikp KTsKICAgICB9CiAKICAgICBfcmVmcmVzaFRpbWluZ1NlY3Rpb24oKQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2NvcGVSYWRpb0J1dHRvbk5h dmlnYXRpb25JdGVtLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvU2NvcGVSYWRpb0J1dHRvbk5hdmlnYXRpb25JdGVtLmpzCmluZGV4IGE1NGQ1ZDRhNzZmZTA5 Zjg3ZWUyMWNhODRiMTA4ZjQ1ZGVlZjkxODMuLjNlYWJmMTM4YjNhNTkwNTIxZTVjNGQzMDgxNWNm MDYzMWYwY2Y0ZWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL1Njb3BlUmFkaW9CdXR0b25OYXZpZ2F0aW9uSXRlbS5qcworKysgYi9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TY29wZVJhZGlvQnV0dG9uTmF2aWdh dGlvbkl0ZW0uanMKQEAgLTQ4LDcgKzQ4LDcgQEAgV0kuU2NvcGVSYWRpb0J1dHRvbk5hdmlnYXRp b25JdGVtID0gY2xhc3MgU2NvcGVSYWRpb0J1dHRvbk5hdmlnYXRpb25JdGVtIGV4dGVuZHMKICAg ICAgICAgdGhpcy5fc2NvcGVJdGVtU2VsZWN0LmFkZEV2ZW50TGlzdGVuZXIoImNoYW5nZSIsIHRo aXMuX2hhbmRsZUl0ZW1DaGFuZ2VkLmJpbmQodGhpcykpOwogICAgICAgICB0aGlzLl9lbGVtZW50 LmFwcGVuZENoaWxkKHRoaXMuX3Njb3BlSXRlbVNlbGVjdCk7CiAKLSAgICAgICAgdGhpcy5fZWxl bWVudC5hcHBlbmRDaGlsZCh1c2VTVkdTeW1ib2woIkltYWdlcy9VcERvd25BcnJvd3Muc3ZnIiwg ImFycm93cyIpKTsKKyAgICAgICAgdGhpcy5fZWxlbWVudC5hcHBlbmRDaGlsZChXSS5JbWFnZVV0 aWxpdGllcy51c2VTVkdTeW1ib2woIkltYWdlcy9VcERvd25BcnJvd3Muc3ZnIiwgImFycm93cyIp KTsKICAgICB9CiAKICAgICAvLyBQdWJsaWMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RocmVhZFRyZWVFbGVtZW50LmpzIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGhyZWFkVHJlZUVsZW1lbnQuanMKaW5k ZXggODEyMDFiNTk5NGYyODQ5ZjU2M2E3YmM2ZGNiODRjMDk3OTg5MmQ0OS4uZTgxZTk3ZWQ3NGI2 NmQ0NDg2YWYyMWNjNWYzZjc2ZGM1ZWU4ODQzYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGhyZWFkVHJlZUVsZW1lbnQuanMKKysrIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGhyZWFkVHJlZUVsZW1lbnQu anMKQEAgLTE0MCw3ICsxNDAsNyBAQCBXSS5UaHJlYWRUcmVlRWxlbWVudCA9IGNsYXNzIFRocmVh ZFRyZWVFbGVtZW50IGV4dGVuZHMgV0kuR2VuZXJhbFRyZWVFbGVtZW50CiAKICAgICAgICAgaWYg KCF0aGlzLl9zdGF0dXNCdXR0b24pIHsKICAgICAgICAgICAgIGxldCB0b29sdGlwID0gV0kuVUlT dHJpbmcoIlJlc3VtZSBUaHJlYWQiKTsKLSAgICAgICAgICAgIHRoaXMuX3N0YXR1c0J1dHRvbiA9 IG5ldyBXSS5UcmVlRWxlbWVudFN0YXR1c0J1dHRvbih1c2VTVkdTeW1ib2woIkltYWdlcy9SZXN1 bWUuc3ZnIiwgInJlc3VtZSIsIHRvb2x0aXApKTsKKyAgICAgICAgICAgIHRoaXMuX3N0YXR1c0J1 dHRvbiA9IG5ldyBXSS5UcmVlRWxlbWVudFN0YXR1c0J1dHRvbihXSS5JbWFnZVV0aWxpdGllcy51 c2VTVkdTeW1ib2woIkltYWdlcy9SZXN1bWUuc3ZnIiwgInJlc3VtZSIsIHRvb2x0aXApKTsKICAg ICAgICAgICAgIHRoaXMuX3N0YXR1c0J1dHRvbi5hZGRFdmVudExpc3RlbmVyKFdJLlRyZWVFbGVt ZW50U3RhdHVzQnV0dG9uLkV2ZW50LkNsaWNrZWQsICgpID0+IHsgV0kuZGVidWdnZXJNYW5hZ2Vy LmNvbnRpbnVlVW50aWxOZXh0UnVuTG9vcCh0aGlzLl90YXJnZXQpOyB9KTsKICAgICAgICAgICAg IHRoaXMuX3N0YXR1c0J1dHRvbi5lbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoIm1vdXNlZG93biIs IChldmVudCkgPT4gewogICAgICAgICAgICAgICAgIC8vIFByZXZlbnQgdHJlZSBlbGVtZW50IGZy b20gYmVpbmcgc2VsZWN0ZWQuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVRyZWVFbGVtZW50LmpzIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVUcmVlRWxlbWVudC5qcwppbmRleCBi NzU0OGVjZjMzZWU4MDA5ODgyYWY5MjM5NWY2NGU1Zjc0MGI0ZjI0Li41ZGIwMjczMDQxZjI3NmQ0 MTRlNDUwOWZhMTAwYjMxMWM2ZTU3ZjcyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVRyZWVFbGVtZW50LmpzCisrKyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lVHJlZUVsZW1lbnQu anMKQEAgLTc0LDcgKzc0LDcgQEAgV0kuVGltZWxpbmVUcmVlRWxlbWVudCA9IGNsYXNzIFRpbWVs aW5lVHJlZUVsZW1lbnQgZXh0ZW5kcyBXSS5HZW5lcmFsVHJlZUVsZW1lbnQKICAgICBfc2hvd0Ns b3NlQnV0dG9uKCkKICAgICB7CiAgICAgICAgIGxldCB0b29sdGlwID0gV0kuVUlTdHJpbmcoIkNs b3NlICVzIHRpbWVsaW5lIHZpZXciKS5mb3JtYXQodGhpcy5tYWluVGl0bGUpOwotICAgICAgICBs ZXQgYnV0dG9uID0gbmV3IFdJLlRyZWVFbGVtZW50U3RhdHVzQnV0dG9uKHVzZVNWR1N5bWJvbCgi SW1hZ2VzL0Nsb3NlTGFyZ2Uuc3ZnIiwgImNsb3NlLWJ1dHRvbiIsIHRvb2x0aXApKTsKKyAgICAg ICAgbGV0IGJ1dHRvbiA9IG5ldyBXSS5UcmVlRWxlbWVudFN0YXR1c0J1dHRvbihXSS5JbWFnZVV0 aWxpdGllcy51c2VTVkdTeW1ib2woIkltYWdlcy9DbG9zZUxhcmdlLnN2ZyIsICJjbG9zZS1idXR0 b24iLCB0b29sdGlwKSk7CiAgICAgICAgIGJ1dHRvbi5hZGRFdmVudExpc3RlbmVyKFdJLlRyZWVF bGVtZW50U3RhdHVzQnV0dG9uLkV2ZW50LkNsaWNrZWQsICgpID0+IHsgdGhpcy5kZXNlbGVjdCgp OyB9KTsKIAogICAgICAgICB0aGlzLnN0YXR1cyA9IGJ1dHRvbi5lbGVtZW50OwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVmlzdWFsU3R5bGVD b21tYVNlcGFyYXRlZEtleXdvcmRFZGl0b3IuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9WaXN1YWxTdHlsZUNvbW1hU2VwYXJhdGVkS2V5d29yZEVkaXRvci5q cwppbmRleCAyMmI4ZjFhNTJhNjRmZTI2YjI1NjJiMDRjMzMxYjNiZjFhMjc3YTdlLi5jNmU0Mzcy YjJiYjA1NmZjOGVlNzllZTIxZDg2OTViMWYxNmI4YmY4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9WaXN1YWxTdHlsZUNvbW1hU2VwYXJhdGVk S2V5d29yZEVkaXRvci5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9WaXN1YWxTdHlsZUNvbW1hU2VwYXJhdGVkS2V5d29yZEVkaXRvci5qcwpAQCAtNDQs MTEgKzQ0LDExIEBAIFdJLlZpc3VhbFN0eWxlQ29tbWFTZXBhcmF0ZWRLZXl3b3JkRWRpdG9yID0g Y2xhc3MgVmlzdWFsU3R5bGVDb21tYVNlcGFyYXRlZEtleXdvCiAgICAgICAgIGNvbnRyb2xDb250 YWluZXIuY2xhc3NMaXN0LmFkZCgidmlzdWFsLXN0eWxlLWNvbW1hLXNlcGFyYXRlZC1rZXl3b3Jk LWNvbnRyb2xzIik7CiAgICAgICAgIHRoaXMuY29udGVudEVsZW1lbnQuYXBwZW5kQ2hpbGQoY29u dHJvbENvbnRhaW5lcik7CiAKLSAgICAgICAgbGV0IGFkZEdseXBoRWxlbWVudCA9IHVzZVNWR1N5 bWJvbCgiSW1hZ2VzL1BsdXMxMy5zdmciLCAidmlzdWFsLXN0eWxlLWFkZC1jb21tYS1zZXBhcmF0 ZWQta2V5d29yZCIpOworICAgICAgICBsZXQgYWRkR2x5cGhFbGVtZW50ID0gV0kuSW1hZ2VVdGls aXRpZXMudXNlU1ZHU3ltYm9sKCJJbWFnZXMvUGx1czEzLnN2ZyIsICJ2aXN1YWwtc3R5bGUtYWRk LWNvbW1hLXNlcGFyYXRlZC1rZXl3b3JkIik7CiAgICAgICAgIGFkZEdseXBoRWxlbWVudC5hZGRF dmVudExpc3RlbmVyKCJjbGljayIsIHRoaXMuX2FkZEVtcHR5Q29tbWFTZXBhcmF0ZWRLZXl3b3Jk LmJpbmQodGhpcykpOwogICAgICAgICBjb250cm9sQ29udGFpbmVyLmFwcGVuZENoaWxkKGFkZEds eXBoRWxlbWVudCk7CiAKLSAgICAgICAgbGV0IHJlbW92ZUdseXBoRWxlbWVudCA9IHVzZVNWR1N5 bWJvbCgiSW1hZ2VzL01pbnVzLnN2ZyIsICJ2aXN1YWwtc3R5bGUtcmVtb3ZlLWNvbW1hLXNlcGFy YXRlZC1rZXl3b3JkIiwgV0kuVUlTdHJpbmcoIlJlbW92ZSBzZWxlY3RlZCBpdGVtIikpOworICAg ICAgICBsZXQgcmVtb3ZlR2x5cGhFbGVtZW50ID0gV0kuSW1hZ2VVdGlsaXRpZXMudXNlU1ZHU3lt Ym9sKCJJbWFnZXMvTWludXMuc3ZnIiwgInZpc3VhbC1zdHlsZS1yZW1vdmUtY29tbWEtc2VwYXJh dGVkLWtleXdvcmQiLCBXSS5VSVN0cmluZygiUmVtb3ZlIHNlbGVjdGVkIGl0ZW0iKSk7CiAgICAg ICAgIHJlbW92ZUdseXBoRWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJjbGljayIsIHRoaXMuX3Jl bW92ZVNlbGVjdGVkQ29tbWFTZXBhcmF0ZWRLZXl3b3JkLmJpbmQodGhpcykpOwogICAgICAgICBj b250cm9sQ29udGFpbmVyLmFwcGVuZENoaWxkKHJlbW92ZUdseXBoRWxlbWVudCk7CiAgICAgfQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVmlz dWFsU3R5bGVLZXl3b3JkSWNvbkxpc3QuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9WaXN1YWxTdHlsZUtleXdvcmRJY29uTGlzdC5qcwppbmRleCBmMjM0NGQ3 Yzg1ZTdmMWVlMGU4YjdlZmJiZmQ4ZDI3MWU2OGU1MmE5Li5mMDMwMzk5YjBjNjM0OTU3ZTc2MTBj NzU3MmI5OWE5ZTllYTI2YTJjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9WaXN1YWxTdHlsZUtleXdvcmRJY29uTGlzdC5qcworKysgYi9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9WaXN1YWxTdHlsZUtleXdvcmRJ Y29uTGlzdC5qcwpAQCAtNDYsNyArNDYsNyBAQCBXSS5WaXN1YWxTdHlsZUtleXdvcmRJY29uTGlz dCA9IGNsYXNzIFZpc3VhbFN0eWxlS2V5d29yZEljb25MaXN0IGV4dGVuZHMgV0kuVmlzdQogICAg ICAgICAgICAgaWNvbkJ1dHRvbkVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigiY2xpY2siLCB0aGlz Ll9oYW5kbGVLZXl3b3JkQ2hhbmdlZC5iaW5kKHRoaXMpKTsKIAogICAgICAgICAgICAgbGV0IGlt YWdlTmFtZSA9ICh2YWx1ZSA9PT0gIm5vbmUiIHx8IHZhbHVlID09PSAiaW5pdGlhbCIpID8gIlZp c3VhbFN0eWxlTm9uZSIgOiBwcmV0dHlQcm9wZXJ0eVJlZmVyZW5jZU5hbWUgKyB0aXRsZS5yZXBs YWNlKC9ccy9nLCAiIik7Ci0gICAgICAgICAgICBpY29uQnV0dG9uRWxlbWVudC5hcHBlbmRDaGls ZCh1c2VTVkdTeW1ib2woIkltYWdlcy8iICsgaW1hZ2VOYW1lICsgIi5zdmciKSk7CisgICAgICAg ICAgICBpY29uQnV0dG9uRWxlbWVudC5hcHBlbmRDaGlsZChXSS5JbWFnZVV0aWxpdGllcy51c2VT VkdTeW1ib2woIkltYWdlcy8iICsgaW1hZ2VOYW1lICsgIi5zdmciKSk7CiAKICAgICAgICAgICAg IHJldHVybiBpY29uQnV0dG9uRWxlbWVudDsKICAgICAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVmlzdWFsU3R5bGVQcm9wZXJ0eUVk aXRvckxpbmsuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9W aXN1YWxTdHlsZVByb3BlcnR5RWRpdG9yTGluay5qcwppbmRleCA2YmFmYzVmMWQ0YzZjMzIxNGJm ZWZkYWU2OTMwMWE0ODk3ZDhiMzkwLi5hYzdlZGRiN2YyMjcyMjhmMmZhNzllMzE0NDdkMGU2Y2Fi NGM0MWZiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9WaXN1YWxTdHlsZVByb3BlcnR5RWRpdG9yTGluay5qcworKysgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9WaXN1YWxTdHlsZVByb3BlcnR5RWRpdG9yTGlu ay5qcwpAQCAtNTAsMTAgKzUwLDEwIEBAIFdJLlZpc3VhbFN0eWxlUHJvcGVydHlFZGl0b3JMaW5r ID0gY2xhc3MgVmlzdWFsU3R5bGVQcm9wZXJ0eUVkaXRvckxpbmsgZXh0ZW5kcyBXCiAgICAgICAg IHRoaXMuX2ljb25FbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoIm1vdXNlb3V0IiwgdGhpcy5faWNv bk1vdXNlb3V0LmJpbmQodGhpcykpOwogICAgICAgICB0aGlzLl9pY29uRWxlbWVudC5hZGRFdmVu dExpc3RlbmVyKCJjbGljayIsIHRoaXMuX2ljb25DbGlja2VkLmJpbmQodGhpcykpOwogCi0gICAg ICAgIHRoaXMuX3VubGlua2VkSWNvbiA9IHVzZVNWR1N5bWJvbCgiSW1hZ2VzL1Zpc3VhbFN0eWxl UHJvcGVydHlVbmxpbmtlZC5zdmciLCAidW5saW5rZWQtaWNvbiIpOworICAgICAgICB0aGlzLl91 bmxpbmtlZEljb24gPSBXSS5JbWFnZVV0aWxpdGllcy51c2VTVkdTeW1ib2woIkltYWdlcy9WaXN1 YWxTdHlsZVByb3BlcnR5VW5saW5rZWQuc3ZnIiwgInVubGlua2VkLWljb24iKTsKICAgICAgICAg dGhpcy5faWNvbkVsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5fdW5saW5rZWRJY29uKTsKIAotICAg ICAgICB0aGlzLl9saW5rZWRJY29uID0gdXNlU1ZHU3ltYm9sKCJJbWFnZXMvVmlzdWFsU3R5bGVQ cm9wZXJ0eUxpbmtlZC5zdmciLCAibGlua2VkLWljb24iKTsKKyAgICAgICAgdGhpcy5fbGlua2Vk SWNvbiA9IFdJLkltYWdlVXRpbGl0aWVzLnVzZVNWR1N5bWJvbCgiSW1hZ2VzL1Zpc3VhbFN0eWxl UHJvcGVydHlMaW5rZWQuc3ZnIiwgImxpbmtlZC1pY29uIik7CiAgICAgICAgIHRoaXMuX2xpbmtl ZEljb24uaGlkZGVuID0gdHJ1ZTsKICAgICAgICAgdGhpcy5faWNvbkVsZW1lbnQuYXBwZW5kQ2hp bGQodGhpcy5fbGlua2VkSWNvbik7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Zpc3VhbFN0eWxlU2VsZWN0b3JTZWN0aW9uLmpzIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVmlzdWFsU3R5bGVTZWxlY3Rv clNlY3Rpb24uanMKaW5kZXggMzIyYjMxNjA0ZjVkMjk1Zjg4MmYwZjJkNDZlNzRjNmNmMWQ3NTA4 Mi4uYTIyMmQ2N2Y2NmEwM2Y4NGEzYTAxZWY4Y2FmZWE0ODZlZTY4ZDdjNyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVmlzdWFsU3R5bGVTZWxl Y3RvclNlY3Rpb24uanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvVmlzdWFsU3R5bGVTZWxlY3RvclNlY3Rpb24uanMKQEAgLTU5LDcgKzU5LDcgQEAgV0ku VmlzdWFsU3R5bGVTZWxlY3RvclNlY3Rpb24gPSBjbGFzcyBWaXN1YWxTdHlsZVNlbGVjdG9yU2Vj dGlvbiBleHRlbmRzIFdJLkRldGEKIAogICAgICAgICB0aGlzLl9uZXdJbnNwZWN0b3JSdWxlU2Vs ZWN0b3IgPSBudWxsOwogCi0gICAgICAgIGxldCBhZGRHbHlwaEVsZW1lbnQgPSB1c2VTVkdTeW1i b2woIkltYWdlcy9QbHVzMTMuc3ZnIiwgInZpc3VhbC1zdHlsZS1zZWxlY3Rvci1zZWN0aW9uLWFk ZC1ydWxlIiwgV0kuVUlTdHJpbmcoIkFkZCBuZXcgcnVsZSIpKTsKKyAgICAgICAgbGV0IGFkZEds eXBoRWxlbWVudCA9IFdJLkltYWdlVXRpbGl0aWVzLnVzZVNWR1N5bWJvbCgiSW1hZ2VzL1BsdXMx My5zdmciLCAidmlzdWFsLXN0eWxlLXNlbGVjdG9yLXNlY3Rpb24tYWRkLXJ1bGUiLCBXSS5VSVN0 cmluZygiQWRkIG5ldyBydWxlIikpOwogICAgICAgICBhZGRHbHlwaEVsZW1lbnQuYWRkRXZlbnRM aXN0ZW5lcigiY2xpY2siLCB0aGlzLl9hZGROZXdSdWxlQ2xpY2suYmluZCh0aGlzKSk7CiAgICAg ICAgIGFkZEdseXBoRWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJjb250ZXh0bWVudSIsIHRoaXMu X2FkZE5ld1J1bGVDb250ZXh0TWVudS5iaW5kKHRoaXMpKTsKICAgICAgICAgY29udHJvbEVsZW1l bnQuYXBwZW5kQ2hpbGQoYWRkR2x5cGhFbGVtZW50KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1dlYlNvY2tldERhdGFHcmlkTm9kZS5qcyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1dlYlNvY2tldERhdGFH cmlkTm9kZS5qcwppbmRleCA1MDJlNjAxYWEyNmIzN2EwMDE1M2RkNzVmNGMxZDYwNjA3NDdkOWUy Li4xYTQwNjZlZTJhYjY0YzlmYWU0MzY5ZWE1N2JkZTQzYTg4M2Y4ZDYyIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9XZWJTb2NrZXREYXRhR3Jp ZE5vZGUuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv V2ViU29ja2V0RGF0YUdyaWROb2RlLmpzCkBAIC0zMiw3ICszMiw3IEBAIFdJLldlYlNvY2tldERh dGFHcmlkTm9kZSA9IGNsYXNzIFdlYlNvY2tldERhdGFHcmlkTm9kZSBleHRlbmRzIFdJLkRhdGFH cmlkTm9kZQogICAgICAgICBpZiAoY29sdW1uSWRlbnRpZmllciA9PT0gImRhdGEiKSB7CiAgICAg ICAgICAgICBsZXQgZnJhZ21lbnQgPSBkb2N1bWVudC5jcmVhdGVEb2N1bWVudEZyYWdtZW50KCk7 CiAgICAgICAgICAgICBpZiAodGhpcy5fZGF0YS5pc091dGdvaW5nKSB7Ci0gICAgICAgICAgICAg ICAgbGV0IGljb25FbGVtZW50ID0gdXNlU1ZHU3ltYm9sKCJJbWFnZXMvQXJyb3dVcC5zdmciLCAi aWNvbiIsIFdJLlVJU3RyaW5nKCJPdXRnb2luZyBtZXNzYWdlIikpOworICAgICAgICAgICAgICAg IGxldCBpY29uRWxlbWVudCA9IFdJLkltYWdlVXRpbGl0aWVzLnVzZVNWR1N5bWJvbCgiSW1hZ2Vz L0Fycm93VXAuc3ZnIiwgImljb24iLCBXSS5VSVN0cmluZygiT3V0Z29pbmcgbWVzc2FnZSIpKTsK ICAgICAgICAgICAgICAgICBmcmFnbWVudC5hcHBlbmRDaGlsZChpY29uRWxlbWVudCk7CiAgICAg ICAgICAgICB9CiAgICAgICAgICAgICBmcmFnbWVudC5hcHBlbmRDaGlsZChkb2N1bWVudC5jcmVh dGVUZXh0Tm9kZSh0aGlzLl9kYXRhLmRhdGEpKTsK