84352 2012-04-19 10:31:15 -0700 Web Inspector: make ScriptNavigatorController use views only, rename to NavigatorOverlayController. 2012-04-20 04:58:43 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 pfeldman pfeldman apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 605671 0 pfeldman 2012-04-19 10:31:15 -0700 This change makes navigator controller use view interfaces only. Focus machinery has been refactored in order to make it happen: not all view ancestors can either override focus: or defaultFocusedElement: with latter being preferred way. 605675 1 137920 pfeldman 2012-04-19 10:34:16 -0700 Created attachment 137920 Patch 606507 2 pfeldman 2012-04-20 04:58:43 -0700 Committed r114740: <http://trac.webkit.org/changeset/114740> 137920 2012-04-19 10:34:16 -0700 2012-04-20 04:46:43 -0700 Patch bug-84352-20120419213414.patch text/plain 25181 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogMTE0NjQxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzg2N2UxOTE4MWZiMDIz Zjk5ZTk3MDhmNzljNjBjMjM5MDg5NDE0Yi4uOWYzM2Q5OWY2NTIwMTE0ZjMyYTk3NzNlNmI2ODFi MTI3NzZmNjU0MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDU0IEBACisyMDEyLTA0LTE5ICBQYXZl bCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IG1ha2UgU2NyaXB0TmF2aWdhdG9yQ29udHJvbGxlciB1c2Ugdmlld3Mgb25seSwgcmVuYW1l IHRvIE5hdmlnYXRvck92ZXJsYXlDb250cm9sbGVyLgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODQzNTIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIGNoYW5nZSBtYWtlcyBuYXZpZ2F0b3IgY29udHJv bGxlciB1c2UgdmlldyBpbnRlcmZhY2VzIG9ubHkuIEZvY3VzIG1hY2hpbmVyeSBoYXMgYmVlbiBy ZWZhY3RvcmVkIGluIG9yZGVyCisgICAgICAgIHRvIG1ha2UgaXQgcG9zc2libGU6IG5vdyBhbGwg dmlldyBhbmNlc3RvcnMgY2FuIGVpdGhlciBvdmVycmlkZSAiZm9jdXMiIG9yICJkZWZhdWx0Rm9j dXNlZEVsZW1lbnQiIG1ldGhvZAorICAgICAgICB3aXRoIGxhdHRlciBtZXRob2QgYmVpbmcgcHJl ZmVycmVkLgorCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9FbGVtZW50c1BhbmVsLmpz OgorICAgICAgICAoV2ViSW5zcGVjdG9yLkVsZW1lbnRzUGFuZWwucHJvdG90eXBlLmRlZmF1bHRG b2N1c2VkRWxlbWVudCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9FeHRlbnNpb25Q YW5lbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5FeHRlbnNpb25QYW5lbC5wcm90b3R5cGUu ZGVmYXVsdEZvY3VzZWRFbGVtZW50KToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1Bh bmVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlBhbmVsLnByb3RvdHlwZS53YXNTaG93bik6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuUGFuZWwucHJvdG90eXBlLmRlZmF1bHRGb2N1c2VkRWxl bWVudCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzTmF2aWdhdG9yLmpz OgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNjcmlwdHNOYXZpZ2F0b3IpOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLk5hdmlnYXRvck92ZXJsYXlDb250cm9sbGVyLnByb3RvdHlwZS5faGlkZVBpbm5l ZE5hdmlnYXRvcik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTmF2aWdhdG9yT3ZlcmxheUNvbnRy b2xsZXIucHJvdG90eXBlLnNldCBfcGluTmF2aWdhdG9yKToKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5OYXZpZ2F0b3JPdmVybGF5Q29udHJvbGxlci5wcm90b3R5cGUuc2V0IHNob3dOYXZpZ2F0b3JP dmVybGF5KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5OYXZpZ2F0b3JPdmVybGF5Q29udHJvbGxl ci5wcm90b3R5cGUuaGlkZU5hdmlnYXRvck92ZXJsYXkpOgorICAgICAgICAoV2ViSW5zcGVjdG9y Lk5hdmlnYXRvck92ZXJsYXlDb250cm9sbGVyLnByb3RvdHlwZS5fbmF2aWdhdG9yT3ZlcmxheVdh c1Nob3duKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qczoK KyAgICAgICAgKFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlLmRlZmF1bHRGb2N1 c2VkRWxlbWVudCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9TaWRlYmFyT3Zlcmxh eS5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TaWRlYmFyT3ZlcmxheS5wcm90b3R5cGUuc2hv dyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2lkZWJhck92ZXJsYXkucHJvdG90eXBlLmhpZGUp OgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvU291cmNlRnJhbWUuanM6CisgICAgICAg IChXZWJJbnNwZWN0b3IuU291cmNlRnJhbWUucHJvdG90eXBlLmRlZmF1bHRGb2N1c2VkRWxlbWVu dCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9TdHlsZXNQYW5lbC5qczoKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5TdHlsZXNQYW5lbCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250 LWVuZC9UYWJiZWRFZGl0b3JDb250YWluZXIuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGFi YmVkRWRpdG9yQ29udGFpbmVyLnByb3RvdHlwZS5nZXQgdmlldyk6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuVGFiYmVkRWRpdG9yQ29udGFpbmVyLnByb3RvdHlwZS5nZXQgdmlzaWJsZVZpZXcpOgor ICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvVGFiYmVkUGFuZS5qczoKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5UYWJiZWRQYW5lKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UYWJiZWRQYW5l LnByb3RvdHlwZS5kZWZhdWx0Rm9jdXNlZEVsZW1lbnQpOgorICAgICAgICAqIGluc3BlY3Rvci9m cm9udC1lbmQvVGV4dFZpZXdlci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UZXh0Vmlld2Vy LnByb3RvdHlwZS5kZWZhdWx0Rm9jdXNlZEVsZW1lbnQpOgorICAgICAgICAoV2ViSW5zcGVjdG9y LlRleHRFZGl0b3JNYWluUGFuZWwucHJvdG90eXBlLmRlZmF1bHRGb2N1c2VkRWxlbWVudCk6Cisg ICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZVBhbmVsLmpzOgorICAgICAgICAo V2ViSW5zcGVjdG9yLlRpbWVsaW5lUGFuZWwucHJvdG90eXBlLmRlZmF1bHRGb2N1c2VkRWxlbWVu dCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9WaWV3LmpzOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLlZpZXcucHJvdG90eXBlLl9jb2xsZWN0Vmlld0hpZXJhcmNoeSk6CisgICAgICAg IChXZWJJbnNwZWN0b3IuVmlldy5wcm90b3R5cGUuZGVmYXVsdEZvY3VzZWRFbGVtZW50KToKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5WaWV3LnByb3RvdHlwZS5zZXREZWZhdWx0Rm9jdXNlZEVsZW1l bnQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlZpZXcucHJvdG90eXBlLmZvY3VzKToKKwogMjAx Mi0wNC0xOSAgTWFyayBQaWxncmltICA8cGlsZ3JpbUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAg W0Nocm9taXVtXSBDYWxsIG1pbWVSZWdpc3RyeSBkaXJlY3RseQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9FbGVtZW50c1BhbmVsLmpzIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9FbGVtZW50c1BhbmVsLmpzCmluZGV4IDU4YTE1YTdl M2QwOTVmNWJlMmRjZWU2YWJlZTAzNmNjNmJiOGQ4NmUuLjFhMzY2OTc0YjI2ZjExNjZiYWFiMjI5 YjA0MTk4NTYxNTMyMTFkNGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvRWxlbWVudHNQYW5lbC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL0VsZW1lbnRzUGFuZWwuanMKQEAgLTExNSw3ICsxMTUsNyBAQCBXZWJJbnNwZWN0 b3IuRWxlbWVudHNQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHJldHVybiBbdGhpcy5jcnVt YnNFbGVtZW50XTsKICAgICB9LAogCi0gICAgZ2V0IGRlZmF1bHRGb2N1c2VkRWxlbWVudCgpCisg ICAgZGVmYXVsdEZvY3VzZWRFbGVtZW50OiBmdW5jdGlvbigpCiAgICAgewogICAgICAgICByZXR1 cm4gdGhpcy50cmVlT3V0bGluZS5lbGVtZW50OwogICAgIH0sCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0V4dGVuc2lvblBhbmVsLmpzIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9FeHRlbnNpb25QYW5lbC5qcwppbmRleCAwZGZkOTNm YjhkZmY2ZTY0YTdjZmRkZWY0NDY4ZTNjNWIzOWU1YTkwLi45NDVjODY1MjZjYzQ5Mjc0ZjU2ODgz MjRjMzhlZGM1ZjI0NWRhZmQwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL0V4dGVuc2lvblBhbmVsLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvRXh0ZW5zaW9uUGFuZWwuanMKQEAgLTEyNiw3ICsxMjYsNyBAQCBXZWJJbnNw ZWN0b3IuRXh0ZW5zaW9uUGFuZWwucHJvdG90eXBlID0gewogICAgICAgICByZXR1cm4gdGhpcy5f dG9vbGJhckl0ZW1MYWJlbDsKICAgICB9LAogCi0gICAgZ2V0IGRlZmF1bHRGb2N1c2VkRWxlbWVu dCgpCisgICAgZGVmYXVsdEZvY3VzZWRFbGVtZW50OiBmdW5jdGlvbigpCiAgICAgewogICAgICAg ICByZXR1cm4gdGhpcy5zaWRlYmFyVHJlZUVsZW1lbnQgfHwgdGhpcy5lbGVtZW50OwogICAgIH0s CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1BhbmVsLmpz IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9QYW5lbC5qcwppbmRleCBhOWZk ZjBhNGRjZDYwZmMwZTA5OWViNzVlNTNlNzE2MjZhZTY4NzZlLi41NjZmMTA1ZjU1YzQyODdiNTY3 NDdhNDc4NTAxODc3MWI1MmQ1NzdiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL1BhbmVsLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvUGFuZWwuanMKQEAgLTc5LDcgKzc5LDcgQEAgV2ViSW5zcGVjdG9yLlBhbmVsLnByb3Rv dHlwZSA9IHsKICAgICAgICAgaWYgKCJfdG9vbGJhckl0ZW0iIGluIHRoaXMpCiAgICAgICAgICAg ICB0aGlzLl90b29sYmFySXRlbS5hZGRTdHlsZUNsYXNzKCJ0b2dnbGVkLW9uIik7CiAKLSAgICAg ICAgV2ViSW5zcGVjdG9yLnNldEN1cnJlbnRGb2N1c0VsZW1lbnQodGhpcy5kZWZhdWx0Rm9jdXNl ZEVsZW1lbnQpOworICAgICAgICB0aGlzLmZvY3VzKCk7CiAgICAgfSwKIAogICAgIHdpbGxIaWRl OiBmdW5jdGlvbigpCkBAIC05Niw3ICs5Niw3IEBAIFdlYkluc3BlY3Rvci5QYW5lbC5wcm90b3R5 cGUgPSB7CiAgICAgICAgIHRoaXMuc2VhcmNoQ2FuY2VsZWQoKTsKICAgICB9LAogCi0gICAgZ2V0 IGRlZmF1bHRGb2N1c2VkRWxlbWVudCgpCisgICAgZGVmYXVsdEZvY3VzZWRFbGVtZW50OiBmdW5j dGlvbigpCiAgICAgewogICAgICAgICByZXR1cm4gdGhpcy5zaWRlYmFyVHJlZUVsZW1lbnQgfHwg dGhpcy5lbGVtZW50OwogICAgIH0sCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL1NjcmlwdHNOYXZpZ2F0b3IuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL1NjcmlwdHNOYXZpZ2F0b3IuanMKaW5kZXggMzQ5YjY0MWMzZTU2ZWYxNWJl OGQ1NmU0YzQ1ODNkODBhMGMyYzg1NC4uNmU4YTQ4MWNjNmQxNzBhODhjYjljMDcyMjRlODU4ODFh NTY3OTQ5NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9T Y3JpcHRzTmF2aWdhdG9yLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvU2NyaXB0c05hdmlnYXRvci5qcwpAQCAtMzksOSArMzksNiBAQCBXZWJJbnNwZWN0b3IuU2Ny aXB0c05hdmlnYXRvciA9IGZ1bmN0aW9uKCkKIAogICAgIHRoaXMuX3RhYmJlZFBhbmUuZWxlbWVu dC5pZCA9ICJzY3JpcHRzLW5hdmlnYXRvci10YWJiZWQtcGFuZSI7CiAgICAgCi0gICAgdGhpcy5f dGFiYmVkUGFuZS5lbGVtZW50LnRhYkluZGV4ID0gMDsKLSAgICB0aGlzLl90YWJiZWRQYW5lLmVs ZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigiZm9jdXMiLCB0aGlzLmZvY3VzLmJpbmQodGhpcyksIGZh bHNlKTsKLSAgCiAgICAgdGhpcy5fdHJlZVNlYXJjaEJveCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1l bnQoImRpdiIpOwogICAgIHRoaXMuX3RyZWVTZWFyY2hCb3guaWQgPSAic2NyaXB0cy1uYXZpZ2F0 b3ItdHJlZS1zZWFyY2gtYm94IjsKICAgICB0aGlzLl90YWJiZWRQYW5lLmVsZW1lbnQuYXBwZW5k Q2hpbGQodGhpcy5fdHJlZVNlYXJjaEJveCk7CkBAIC01OCw2ICs1NSw3IEBAIFdlYkluc3BlY3Rv ci5TY3JpcHRzTmF2aWdhdG9yID0gZnVuY3Rpb24oKQogICAgIHNjcmlwdHNWaWV3LmVsZW1lbnQu YWRkU3R5bGVDbGFzcygiZmlsbCIpOwogICAgIHNjcmlwdHNWaWV3LmVsZW1lbnQuYWRkU3R5bGVD bGFzcygibmF2aWdhdG9yLWNvbnRhaW5lciIpOwogICAgIHNjcmlwdHNWaWV3LmVsZW1lbnQuYXBw ZW5kQ2hpbGQoc2NyaXB0c091dGxpbmVFbGVtZW50KTsKKyAgICBzY3JpcHRzVmlldy5zZXREZWZh dWx0Rm9jdXNlZEVsZW1lbnQodGhpcy5fc2NyaXB0c1RyZWUuZWxlbWVudCk7CiAKICAgICB0aGlz Ll90YWJiZWRQYW5lLmFwcGVuZFRhYihXZWJJbnNwZWN0b3IuU2NyaXB0c05hdmlnYXRvci5TY3Jp cHRzVGFiLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlNjcmlwdHMiKSwgc2NyaXB0c1ZpZXcpOwog ICAgIHRoaXMuX3RhYmJlZFBhbmUuc2VsZWN0VGFiKFdlYkluc3BlY3Rvci5TY3JpcHRzTmF2aWdh dG9yLlNjcmlwdHNUYWIpOwpAQCAtNzQsNiArNzIsNyBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0c05h dmlnYXRvciA9IGZ1bmN0aW9uKCkKICAgICBjb250ZW50U2NyaXB0c1ZpZXcuZWxlbWVudC5hZGRT dHlsZUNsYXNzKCJmaWxsIik7CiAgICAgY29udGVudFNjcmlwdHNWaWV3LmVsZW1lbnQuYWRkU3R5 bGVDbGFzcygibmF2aWdhdG9yLWNvbnRhaW5lciIpOwogICAgIGNvbnRlbnRTY3JpcHRzVmlldy5l bGVtZW50LmFwcGVuZENoaWxkKGNvbnRlbnRTY3JpcHRzT3V0bGluZUVsZW1lbnQpOworICAgIGNv bnRlbnRTY3JpcHRzVmlldy5zZXREZWZhdWx0Rm9jdXNlZEVsZW1lbnQodGhpcy5fY29udGVudFNj cmlwdHNUcmVlLmVsZW1lbnQpOwogCiAgICAgdGhpcy5fdGFiYmVkUGFuZS5hcHBlbmRUYWIoV2Vi SW5zcGVjdG9yLlNjcmlwdHNOYXZpZ2F0b3IuQ29udGVudFNjcmlwdHNUYWIsIFdlYkluc3BlY3Rv ci5VSVN0cmluZygiQ29udGVudCBzY3JpcHRzIiksIGNvbnRlbnRTY3JpcHRzVmlldyk7CiAKQEAg LTk3LDE0ICs5Niw2IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRzTmF2aWdhdG9yLlNuaXBwZXRzVGFi ID0gInNuaXBwZXRzIjsKIAogV2ViSW5zcGVjdG9yLlNjcmlwdHNOYXZpZ2F0b3IucHJvdG90eXBl ID0gewogICAgIC8qKgotICAgICAqIEB0eXBlIHtFbGVtZW50fQotICAgICAqLwotICAgIGdldCBk ZWZhdWx0Rm9jdXNlZEVsZW1lbnQoKQotICAgIHsKLSAgICAgICAgcmV0dXJuIHRoaXMuX3Njcmlw dHNUcmVlLmVsZW1lbnQ7Ci0gICAgfSwKLQotICAgIC8qKgogICAgICAqIEB0eXBlIHtXZWJJbnNw ZWN0b3IuVmlld30KICAgICAgKi8KICAgICBnZXQgdmlldygpCkBAIC0xMTMsMzIgKzEwNCw2IEBA IFdlYkluc3BlY3Rvci5TY3JpcHRzTmF2aWdhdG9yLnByb3RvdHlwZSA9IHsKICAgICB9LAogCiAg ICAgLyoqCi0gICAgICogQHR5cGUge0VsZW1lbnR9Ci0gICAgICovCi0gICAgZ2V0IGVsZW1lbnQo KQotICAgIHsKLSAgICAgICAgcmV0dXJuIHRoaXMuX3RhYmJlZFBhbmUuZWxlbWVudDsKLSAgICB9 LAotCi0gICAgLyoqCi0gICAgICogQHBhcmFtIHtFbGVtZW50fSBlbGVtZW50Ci0gICAgICovCi0g ICAgc2hvdzogZnVuY3Rpb24oZWxlbWVudCkKLSAgICB7Ci0gICAgICAgIHRoaXMuX3RhYmJlZFBh bmUuc2hvdyhlbGVtZW50KTsKLSAgICB9LAotCi0gICAgZm9jdXM6IGZ1bmN0aW9uKCkKLSAgICB7 Ci0gICAgICAgIGlmICh0aGlzLl90YWJiZWRQYW5lLnNlbGVjdGVkVGFiSWQgPT09IFdlYkluc3Bl Y3Rvci5TY3JpcHRzTmF2aWdhdG9yLlNjcmlwdHNUYWIpCi0gICAgICAgICAgICBXZWJJbnNwZWN0 b3Iuc2V0Q3VycmVudEZvY3VzRWxlbWVudCh0aGlzLl9zY3JpcHRzVHJlZS5lbGVtZW50KTsKLSAg ICAgICAgZWxzZSBpZiAodGhpcy5fdGFiYmVkUGFuZS5zZWxlY3RlZFRhYklkID09PSBXZWJJbnNw ZWN0b3IuU2NyaXB0c05hdmlnYXRvci5Db250ZW50U2NyaXB0c1RhYikKLSAgICAgICAgICAgIFdl Ykluc3BlY3Rvci5zZXRDdXJyZW50Rm9jdXNFbGVtZW50KHRoaXMuX2NvbnRlbnRTY3JpcHRzVHJl ZS5lbGVtZW50KTsKLSAgICAgICAgZWxzZQotICAgICAgICAgICAgV2ViSW5zcGVjdG9yLnNldEN1 cnJlbnRGb2N1c0VsZW1lbnQodGhpcy5fc25pcHBldHNUcmVlLmVsZW1lbnQpOwotICAgIH0sCi0K LSAgICAvKioKICAgICAgKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGV9IHVpU291 cmNlQ29kZQogICAgICAqLwogICAgIGFkZFVJU291cmNlQ29kZTogZnVuY3Rpb24odWlTb3VyY2VD b2RlKQpAQCAtNzc4LDM3ICs3NDMsMzcgQEAgV2ViSW5zcGVjdG9yLk5hdmlnYXRvclNjcmlwdFRy ZWVFbGVtZW50LnByb3RvdHlwZS5fX3Byb3RvX18gPSBXZWJJbnNwZWN0b3IuQmFzZU4KIC8qKgog ICogQGNvbnN0cnVjdG9yCiAgKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5QYW5lbH0gcGFuZWwKLSAq IEBwYXJhbSB7V2ViSW5zcGVjdG9yLlNwbGl0Vmlld30gZWRpdG9yVmlldwotICogQHBhcmFtIHtX ZWJJbnNwZWN0b3IuU2NyaXB0c05hdmlnYXRvcn0gbmF2aWdhdG9yCi0gKiBAcGFyYW0ge1dlYklu c3BlY3Rvci5UYWJiZWRFZGl0b3JDb250YWluZXJ9IGVkaXRvckNvbnRhaW5lcgorICogQHBhcmFt IHtXZWJJbnNwZWN0b3IuU3BsaXRWaWV3fSBwYXJlbnRTcGxpdFZpZXcKKyAqIEBwYXJhbSB7V2Vi SW5zcGVjdG9yLlZpZXd9IG5hdmlnYXRvclZpZXcKKyAqIEBwYXJhbSB7V2ViSW5zcGVjdG9yLlZp ZXd9IGVkaXRvclZpZXcKICAqLwotV2ViSW5zcGVjdG9yLlNjcmlwdHNOYXZpZ2F0b3JDb250cm9s bGVyID0gZnVuY3Rpb24ocGFuZWwsIGVkaXRvclZpZXcsIG5hdmlnYXRvciwgZWRpdG9yQ29udGFp bmVyKQorV2ViSW5zcGVjdG9yLk5hdmlnYXRvck92ZXJsYXlDb250cm9sbGVyID0gZnVuY3Rpb24o cGFuZWwsIHBhcmVudFNwbGl0VmlldywgbmF2aWdhdG9yVmlldywgZWRpdG9yVmlldykKIHsKICAg ICB0aGlzLl9wYW5lbCA9IHBhbmVsOworICAgIHRoaXMuX3BhcmVudFNwbGl0VmlldyA9IHBhcmVu dFNwbGl0VmlldzsKKyAgICB0aGlzLl9uYXZpZ2F0b3JWaWV3ID0gbmF2aWdhdG9yVmlldzsKICAg ICB0aGlzLl9lZGl0b3JWaWV3ID0gZWRpdG9yVmlldzsKLSAgICB0aGlzLl9uYXZpZ2F0b3IgPSBu YXZpZ2F0b3I7Ci0gICAgdGhpcy5fZWRpdG9yQ29udGFpbmVyID0gZWRpdG9yQ29udGFpbmVyOwog CiAgICAgdGhpcy5fbmF2aWdhdG9yU2lkZWJhclJlc2l6ZVdpZGdldEVsZW1lbnQgPSBkb2N1bWVu dC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKICAgICB0aGlzLl9uYXZpZ2F0b3JTaWRlYmFyUmVzaXpl V2lkZ2V0RWxlbWVudC5hZGRTdHlsZUNsYXNzKCJzY3JpcHRzLW5hdmlnYXRvci1yZXNpemVyLXdp ZGdldCIpOwotICAgIHRoaXMuX2VkaXRvclZpZXcuaW5zdGFsbFJlc2l6ZXIodGhpcy5fbmF2aWdh dG9yU2lkZWJhclJlc2l6ZVdpZGdldEVsZW1lbnQpOwotICAgIHRoaXMuX25hdmlnYXRvci52aWV3 LmVsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5fbmF2aWdhdG9yU2lkZWJhclJlc2l6ZVdpZGdldEVs ZW1lbnQpOworICAgIHRoaXMuX3BhcmVudFNwbGl0Vmlldy5pbnN0YWxsUmVzaXplcih0aGlzLl9u YXZpZ2F0b3JTaWRlYmFyUmVzaXplV2lkZ2V0RWxlbWVudCk7CisgICAgdGhpcy5fbmF2aWdhdG9y Vmlldy5lbGVtZW50LmFwcGVuZENoaWxkKHRoaXMuX25hdmlnYXRvclNpZGViYXJSZXNpemVXaWRn ZXRFbGVtZW50KTsKIAogICAgIHRoaXMuX25hdmlnYXRvclNob3dIaWRlQnV0dG9uID0gdGhpcy5f Y3JlYXRlTmF2aWdhdG9yQ29udHJvbEJ1dHRvbihXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlNob3cg bmF2aWdhdG9yIiksICJzY3JpcHRzLW5hdmlnYXRvci1zaG93LWhpZGUtYnV0dG9uIiwgdGhpcy5f dG9nZ2xlTmF2aWdhdG9yLmJpbmQodGhpcykpOwogICAgIHRoaXMuX25hdmlnYXRvclNob3dIaWRl QnV0dG9uLmFkZFN0eWxlQ2xhc3MoInRvZ2dsZWQtb24iKTsKICAgICB0aGlzLl9uYXZpZ2F0b3JT aG93SGlkZUJ1dHRvbi50aXRsZSA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiSGlkZSBzY3JpcHRz IG5hdmlnYXRvciIpOwotICAgIHRoaXMuX2VkaXRvclZpZXcuZWxlbWVudC5hcHBlbmRDaGlsZCh0 aGlzLl9uYXZpZ2F0b3JTaG93SGlkZUJ1dHRvbik7CisgICAgdGhpcy5fcGFyZW50U3BsaXRWaWV3 LmVsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5fbmF2aWdhdG9yU2hvd0hpZGVCdXR0b24pOwogCiAg ICAgdGhpcy5fbmF2aWdhdG9yUGluQnV0dG9uID0gdGhpcy5fY3JlYXRlTmF2aWdhdG9yQ29udHJv bEJ1dHRvbihXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlBpbiBuYXZpZ2F0b3IiKSwgInNjcmlwdHMt bmF2aWdhdG9yLXBpbi1idXR0b24iLCB0aGlzLl9waW5OYXZpZ2F0b3IuYmluZCh0aGlzKSk7CiAg ICAgdGhpcy5fbmF2aWdhdG9yUGluQnV0dG9uLmFkZFN0eWxlQ2xhc3MoImhpZGRlbiIpOwotICAg IHRoaXMuX25hdmlnYXRvci52aWV3LmVsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5fbmF2aWdhdG9y UGluQnV0dG9uKTsKKyAgICB0aGlzLl9uYXZpZ2F0b3JWaWV3LmVsZW1lbnQuYXBwZW5kQ2hpbGQo dGhpcy5fbmF2aWdhdG9yUGluQnV0dG9uKTsKIAogICAgIFdlYkluc3BlY3Rvci5zZXR0aW5ncy5u YXZpZ2F0b3JIaWRkZW4gPSBXZWJJbnNwZWN0b3Iuc2V0dGluZ3MuY3JlYXRlU2V0dGluZygibmF2 aWdhdG9ySGlkZGVuIiwgdHJ1ZSk7CiAgICAgaWYgKFdlYkluc3BlY3Rvci5zZXR0aW5ncy5uYXZp Z2F0b3JIaWRkZW4uZ2V0KCkpCiAgICAgICAgIHRoaXMuX3RvZ2dsZU5hdmlnYXRvcigpOwogfQog Ci1XZWJJbnNwZWN0b3IuU2NyaXB0c05hdmlnYXRvckNvbnRyb2xsZXIucHJvdG90eXBlID0gewor V2ViSW5zcGVjdG9yLk5hdmlnYXRvck92ZXJsYXlDb250cm9sbGVyLnByb3RvdHlwZSA9IHsKICAg ICB3YXNTaG93bjogZnVuY3Rpb24oKQogICAgIHsKICAgICAgICAgd2luZG93LnNldFRpbWVvdXQo dGhpcy5fbWF5YmVTaG93TmF2aWdhdG9yT3ZlcmxheS5iaW5kKHRoaXMpLCAwKTsKQEAgLTg1MSwx MyArODE2LDE0IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRzTmF2aWdhdG9yQ29udHJvbGxlci5wcm90 b3R5cGUgPSB7CiAgICAgICAgIHRoaXMuX25hdmlnYXRvckhpZGRlbiA9IHRydWU7CiAgICAgICAg IHRoaXMuX25hdmlnYXRvclNob3dIaWRlQnV0dG9uLnJlbW92ZVN0eWxlQ2xhc3MoInRvZ2dsZWQt b24iKTsKICAgICAgICAgdGhpcy5fbmF2aWdhdG9yU2hvd0hpZGVCdXR0b24udGl0bGUgPSBXZWJJ bnNwZWN0b3IuVUlTdHJpbmcoIlNob3cgc2NyaXB0cyBuYXZpZ2F0b3IiKTsKLSAgICAgICAgdGhp cy5fZWRpdG9yQ29udGFpbmVyLmVsZW1lbnQuYWRkU3R5bGVDbGFzcygibmF2aWdhdG9yLWhpZGRl biIpOworICAgICAgICB0aGlzLl9lZGl0b3JWaWV3LmVsZW1lbnQuYWRkU3R5bGVDbGFzcygibmF2 aWdhdG9yLWhpZGRlbiIpOwogICAgICAgICB0aGlzLl9uYXZpZ2F0b3JTaWRlYmFyUmVzaXplV2lk Z2V0RWxlbWVudC5hZGRTdHlsZUNsYXNzKCJoaWRkZW4iKTsKIAogICAgICAgICB0aGlzLl9uYXZp Z2F0b3JQaW5CdXR0b24ucmVtb3ZlU3R5bGVDbGFzcygiaGlkZGVuIik7CiAKLSAgICAgICAgdGhp cy5fZWRpdG9yVmlldy5oaWRlU2lkZWJhckVsZW1lbnQoKTsKLSAgICAgICAgdGhpcy5fbmF2aWdh dG9yLnZpZXcuZGV0YWNoKCk7CisgICAgICAgIHRoaXMuX3BhcmVudFNwbGl0Vmlldy5oaWRlU2lk ZWJhckVsZW1lbnQoKTsKKyAgICAgICAgdGhpcy5fbmF2aWdhdG9yVmlldy5kZXRhY2goKTsKKyAg ICAgICAgdGhpcy5fZWRpdG9yVmlldy5mb2N1cygpOwogICAgICAgICBXZWJJbnNwZWN0b3Iuc2V0 dGluZ3MubmF2aWdhdG9ySGlkZGVuLnNldCh0cnVlKTsKICAgICB9LAogCkBAIC04NzAsMTIgKzgz NiwxMiBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0c05hdmlnYXRvckNvbnRyb2xsZXIucHJvdG90eXBl ID0gewogICAgICAgICB0aGlzLl9uYXZpZ2F0b3JTaG93SGlkZUJ1dHRvbi5hZGRTdHlsZUNsYXNz KCJ0b2dnbGVkLW9uIik7CiAgICAgICAgIHRoaXMuX25hdmlnYXRvclNob3dIaWRlQnV0dG9uLnRp dGxlID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJIaWRlIHNjcmlwdHMgbmF2aWdhdG9yIik7CiAK LSAgICAgICAgdGhpcy5fZWRpdG9yQ29udGFpbmVyLmVsZW1lbnQucmVtb3ZlU3R5bGVDbGFzcygi bmF2aWdhdG9yLWhpZGRlbiIpOworICAgICAgICB0aGlzLl9lZGl0b3JWaWV3LmVsZW1lbnQucmVt b3ZlU3R5bGVDbGFzcygibmF2aWdhdG9yLWhpZGRlbiIpOwogICAgICAgICB0aGlzLl9uYXZpZ2F0 b3JTaWRlYmFyUmVzaXplV2lkZ2V0RWxlbWVudC5yZW1vdmVTdHlsZUNsYXNzKCJoaWRkZW4iKTsK IAotICAgICAgICB0aGlzLl9lZGl0b3JWaWV3LnNob3dTaWRlYmFyRWxlbWVudCgpOwotICAgICAg ICB0aGlzLl9uYXZpZ2F0b3Iuc2hvdyh0aGlzLl9lZGl0b3JWaWV3LnNpZGViYXJFbGVtZW50KTsK LSAgICAgICAgdGhpcy5fbmF2aWdhdG9yLmZvY3VzKCk7CisgICAgICAgIHRoaXMuX3BhcmVudFNw bGl0Vmlldy5zaG93U2lkZWJhckVsZW1lbnQoKTsKKyAgICAgICAgdGhpcy5fbmF2aWdhdG9yVmll dy5zaG93KHRoaXMuX3BhcmVudFNwbGl0Vmlldy5zaWRlYmFyRWxlbWVudCk7CisgICAgICAgIHRo aXMuX25hdmlnYXRvclZpZXcuZm9jdXMoKTsKICAgICAgICAgV2ViSW5zcGVjdG9yLnNldHRpbmdz Lm5hdmlnYXRvckhpZGRlbi5zZXQoZmFsc2UpOwogICAgIH0sCiAKQEAgLTg4NSw3ICs4NTEsNyBA QCBXZWJJbnNwZWN0b3IuU2NyaXB0c05hdmlnYXRvckNvbnRyb2xsZXIucHJvdG90eXBlID0gewog ICAgICAgICAgICAgcmV0dXJuOwogCiAgICAgICAgIHRoaXMuX25hdmlnYXRvck92ZXJsYXlTaG93 biA9IHRydWU7Ci0gICAgICAgIHRoaXMuX3NpZGViYXJPdmVybGF5ID0gbmV3IFdlYkluc3BlY3Rv ci5TaWRlYmFyT3ZlcmxheSh0aGlzLl9uYXZpZ2F0b3IudmlldywgInNjcmlwdHNQYW5lbE5hdmln YXRvck92ZXJsYXlXaWR0aCIsIFByZWZlcmVuY2VzLm1pblNjcmlwdHNTaWRlYmFyV2lkdGgpOwor ICAgICAgICB0aGlzLl9zaWRlYmFyT3ZlcmxheSA9IG5ldyBXZWJJbnNwZWN0b3IuU2lkZWJhck92 ZXJsYXkodGhpcy5fbmF2aWdhdG9yVmlldywgInNjcmlwdHNQYW5lbE5hdmlnYXRvck92ZXJsYXlX aWR0aCIsIFByZWZlcmVuY2VzLm1pblNjcmlwdHNTaWRlYmFyV2lkdGgpOwogICAgICAgICB0aGlz Ll9zaWRlYmFyT3ZlcmxheS5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5TaWRlYmFyT3Zl cmxheS5FdmVudFR5cGVzLldhc1Nob3duLCB0aGlzLl9uYXZpZ2F0b3JPdmVybGF5V2FzU2hvd24s IHRoaXMpOwogICAgICAgICB0aGlzLl9zaWRlYmFyT3ZlcmxheS5hZGRFdmVudExpc3RlbmVyKFdl Ykluc3BlY3Rvci5TaWRlYmFyT3ZlcmxheS5FdmVudFR5cGVzLldpbGxIaWRlLCB0aGlzLl9uYXZp Z2F0b3JPdmVybGF5V2lsbEhpZGUsIHRoaXMpOwogCkBAIC04OTMsNyArODU5LDcgQEAgV2ViSW5z cGVjdG9yLlNjcmlwdHNOYXZpZ2F0b3JDb250cm9sbGVyLnByb3RvdHlwZSA9IHsKICAgICAgICAg bmF2aWdhdG9yT3ZlcmxheVJlc2l6ZVdpZGdldEVsZW1lbnQuYWRkU3R5bGVDbGFzcygic2NyaXB0 cy1uYXZpZ2F0b3ItcmVzaXplci13aWRnZXQiKTsKICAgICAgICAgdGhpcy5fc2lkZWJhck92ZXJs YXkucmVzaXplcldpZGdldEVsZW1lbnQgPSBuYXZpZ2F0b3JPdmVybGF5UmVzaXplV2lkZ2V0RWxl bWVudDsKIAotICAgICAgICB0aGlzLl9zaWRlYmFyT3ZlcmxheS5zaG93KHRoaXMuX2VkaXRvclZp ZXcuZWxlbWVudCk7CisgICAgICAgIHRoaXMuX3NpZGViYXJPdmVybGF5LnNob3codGhpcy5fcGFy ZW50U3BsaXRWaWV3LmVsZW1lbnQpOwogICAgIH0sCiAKICAgICBoaWRlTmF2aWdhdG9yT3Zlcmxh eTogZnVuY3Rpb24oKQpAQCAtOTAyLDE2ICs4NjgsMTUgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNO YXZpZ2F0b3JDb250cm9sbGVyLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHJldHVybjsKIAog ICAgICAgICB0aGlzLl9zaWRlYmFyT3ZlcmxheS5oaWRlKCk7Ci0gICAgICAgIGlmICh0aGlzLl9l ZGl0b3JDb250YWluZXIudmlzaWJsZVZpZXcpCi0gICAgICAgICAgICB0aGlzLl9lZGl0b3JDb250 YWluZXIudmlzaWJsZVZpZXcuZm9jdXMoKTsKKyAgICAgICAgdGhpcy5fZWRpdG9yVmlldy5mb2N1 cygpOwogICAgIH0sCiAKICAgICBfbmF2aWdhdG9yT3ZlcmxheVdhc1Nob3duOiBmdW5jdGlvbihl dmVudCkKICAgICB7Ci0gICAgICAgIHRoaXMuX25hdmlnYXRvci52aWV3LmVsZW1lbnQuYXBwZW5k Q2hpbGQodGhpcy5fbmF2aWdhdG9yU2hvd0hpZGVCdXR0b24pOworICAgICAgICB0aGlzLl9uYXZp Z2F0b3JWaWV3LmVsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5fbmF2aWdhdG9yU2hvd0hpZGVCdXR0 b24pOwogICAgICAgICB0aGlzLl9uYXZpZ2F0b3JTaG93SGlkZUJ1dHRvbi5hZGRTdHlsZUNsYXNz KCJ0b2dnbGVkLW9uIik7CiAgICAgICAgIHRoaXMuX25hdmlnYXRvclNob3dIaWRlQnV0dG9uLnRp dGxlID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJIaWRlIG5hdmlnYXRvciIpOwotICAgICAgICB0 aGlzLl9uYXZpZ2F0b3IuZm9jdXMoKTsKKyAgICAgICAgdGhpcy5fbmF2aWdhdG9yVmlldy5mb2N1 cygpOwogICAgICAgICB0aGlzLl9wYW5lbC5yZWdpc3RlclNob3J0Y3V0KFdlYkluc3BlY3Rvci5L ZXlib2FyZFNob3J0Y3V0LktleXMuRXNjLmNvZGUsIHRoaXMuX2VzY0Rvd25XaGlsZU5hdmlnYXRv ck92ZXJsYXlPcGVuLmJpbmQodGhpcykpOwogICAgIH0sCiAKQEAgLTkxOSw3ICs4ODQsNyBAQCBX ZWJJbnNwZWN0b3IuU2NyaXB0c05hdmlnYXRvckNvbnRyb2xsZXIucHJvdG90eXBlID0gewogICAg IHsKICAgICAgICAgZGVsZXRlIHRoaXMuX25hdmlnYXRvck92ZXJsYXlTaG93bjsKICAgICAgICAg V2ViSW5zcGVjdG9yLnNldHRpbmdzLm5hdmlnYXRvcldhc09uY2VIaWRkZW4uc2V0KHRydWUpOwot ICAgICAgICB0aGlzLl9lZGl0b3JWaWV3LmVsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5fbmF2aWdh dG9yU2hvd0hpZGVCdXR0b24pOworICAgICAgICB0aGlzLl9wYXJlbnRTcGxpdFZpZXcuZWxlbWVu dC5hcHBlbmRDaGlsZCh0aGlzLl9uYXZpZ2F0b3JTaG93SGlkZUJ1dHRvbik7CiAgICAgICAgIHRo aXMuX25hdmlnYXRvclNob3dIaWRlQnV0dG9uLnJlbW92ZVN0eWxlQ2xhc3MoInRvZ2dsZWQtb24i KTsKICAgICAgICAgdGhpcy5fbmF2aWdhdG9yU2hvd0hpZGVCdXR0b24udGl0bGUgPSBXZWJJbnNw ZWN0b3IuVUlTdHJpbmcoIlNob3cgbmF2aWdhdG9yIik7CiAgICAgICAgIHRoaXMuX3BhbmVsLnVu cmVnaXN0ZXJTaG9ydGN1dChXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5LZXlzLkVzYy5j b2RlKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2Ny aXB0c1BhbmVsLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRz UGFuZWwuanMKaW5kZXggNDc3NWZlYmY4YWI4MmU5ODk3NjVmZWVhNWZjYmRkZjk2MDgwZjRjYi4u Y2RhMjFkZjJjNjYxM2E3Zjg1MmRiZDAyYzY1ZmJkOTYwNmRiY2Q1YiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanMKKysrIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanMKQEAgLTcyLDEz ICs3MiwxMyBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsID0gZnVuY3Rpb24ocHJlc2VudGF0 aW9uTW9kZWwpCiAgICAgdGhpcy5lZGl0b3JWaWV3LnNob3codGhpcy5zcGxpdFZpZXcubWFpbkVs ZW1lbnQpOwogCiAgICAgdGhpcy5fbmF2aWdhdG9yID0gbmV3IFdlYkluc3BlY3Rvci5TY3JpcHRz TmF2aWdhdG9yKCk7Ci0gICAgdGhpcy5fbmF2aWdhdG9yLnNob3codGhpcy5lZGl0b3JWaWV3LnNp ZGViYXJFbGVtZW50KTsKKyAgICB0aGlzLl9uYXZpZ2F0b3Iudmlldy5zaG93KHRoaXMuZWRpdG9y Vmlldy5zaWRlYmFyRWxlbWVudCk7CiAKICAgICB0aGlzLl9lZGl0b3JDb250YWluZXIgPSBuZXcg V2ViSW5zcGVjdG9yLlRhYmJlZEVkaXRvckNvbnRhaW5lcih0aGlzLCAicHJldmlvdXNseVZpZXdl ZEZpbGVzIik7CiAgICAgdGhpcy5fZWRpdG9yQ29udGFpbmVyLnNob3codGhpcy5lZGl0b3JWaWV3 Lm1haW5FbGVtZW50KTsKICAgICBXZWJJbnNwZWN0b3IuT3BlblJlc291cmNlRGlhbG9nLmluc3Rh bGwodGhpcywgdGhpcy5fcHJlc2VudGF0aW9uTW9kZWwsIHRoaXMuZWRpdG9yVmlldy5tYWluRWxl bWVudCk7CiAKLSAgICB0aGlzLl9uYXZpZ2F0b3JDb250cm9sbGVyID0gbmV3IFdlYkluc3BlY3Rv ci5TY3JpcHRzTmF2aWdhdG9yQ29udHJvbGxlcih0aGlzLCB0aGlzLmVkaXRvclZpZXcsIHRoaXMu X25hdmlnYXRvciwgdGhpcy5fZWRpdG9yQ29udGFpbmVyKTsKKyAgICB0aGlzLl9uYXZpZ2F0b3JD b250cm9sbGVyID0gbmV3IFdlYkluc3BlY3Rvci5OYXZpZ2F0b3JPdmVybGF5Q29udHJvbGxlcih0 aGlzLCB0aGlzLmVkaXRvclZpZXcsIHRoaXMuX25hdmlnYXRvci52aWV3LCB0aGlzLl9lZGl0b3JD b250YWluZXIudmlldyk7CiAKICAgICB0aGlzLl9uYXZpZ2F0b3IuYWRkRXZlbnRMaXN0ZW5lcihX ZWJJbnNwZWN0b3IuU2NyaXB0c05hdmlnYXRvci5FdmVudHMuU2NyaXB0U2VsZWN0ZWQsIHRoaXMu X3NjcmlwdFNlbGVjdGVkLCB0aGlzKTsKICAgICB0aGlzLl9lZGl0b3JDb250YWluZXIuYWRkRXZl bnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuVGFiYmVkRWRpdG9yQ29udGFpbmVyLkV2ZW50cy5FZGl0 b3JTZWxlY3RlZCwgdGhpcy5fZWRpdG9yU2VsZWN0ZWQsIHRoaXMpOwpAQCAtMTkzLDkgKzE5Myw5 IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlID0gewogICAgICAgICByZXR1 cm4gW3RoaXMuZW5hYmxlVG9nZ2xlQnV0dG9uLmVsZW1lbnQsIHRoaXMuX3BhdXNlT25FeGNlcHRp b25CdXR0b24uZWxlbWVudCwgdGhpcy5fdG9nZ2xlRm9ybWF0U291cmNlQnV0dG9uLmVsZW1lbnQs IHRoaXMuX3NjcmlwdFZpZXdTdGF0dXNCYXJJdGVtc0NvbnRhaW5lcl07CiAgICAgfSwKIAotICAg IGdldCBkZWZhdWx0Rm9jdXNlZEVsZW1lbnQoKQorICAgIGRlZmF1bHRGb2N1c2VkRWxlbWVudDog ZnVuY3Rpb24oKQogICAgIHsKLSAgICAgICAgcmV0dXJuIHRoaXMuX25hdmlnYXRvci5kZWZhdWx0 Rm9jdXNlZEVsZW1lbnQ7CisgICAgICAgIHJldHVybiB0aGlzLl9uYXZpZ2F0b3Iudmlldy5kZWZh dWx0Rm9jdXNlZEVsZW1lbnQoKTsKICAgICB9LAogCiAgICAgZ2V0IHBhdXNlZCgpCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NpZGViYXJPdmVybGF5Lmpz IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TaWRlYmFyT3ZlcmxheS5qcwpp bmRleCAyNDY3ODhlZDI5YjQwNzZjZWVlOWRjNDM4MzFkZWIwNjhjZTAyODVjLi4zY2Q1OGEzYWMx NzdkOTdlNjY3OTgwMGZkODAxNDY5Y2RlM2M1ZWY3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NpZGViYXJPdmVybGF5LmpzCisrKyBiL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2lkZWJhck92ZXJsYXkuanMKQEAgLTc0LDggKzc0LDgg QEAgV2ViSW5zcGVjdG9yLlNpZGViYXJPdmVybGF5LnByb3RvdHlwZSA9IHsKICAgICAgICAgICAg IHRoaXMuZWxlbWVudC5hcHBlbmRDaGlsZCh0aGlzLl9yZXNpemVyV2lkZ2V0RWxlbWVudCk7CiAg ICAgICAgIHRoaXMucG9zaXRpb24ocmVsYXRpdmVUb0VsZW1lbnQpOwogICAgICAgICB0aGlzLl9i b3VuZENvbnRhaW5pbmdFbGVtZW50Rm9jdXNlZCA9IHRoaXMuX2NvbnRhaW5pbmdFbGVtZW50Rm9j dXNlZC5iaW5kKHRoaXMpOwotICAgICAgICByZWxhdGl2ZVRvRWxlbWVudC5hZGRFdmVudExpc3Rl bmVyKCJET01Gb2N1c0luIiwgdGhpcy5fYm91bmRDb250YWluaW5nRWxlbWVudEZvY3VzZWQsIGZh bHNlKTsKLSAgICAgICAgCisgICAgICAgIHJlbGF0aXZlVG9FbGVtZW50LmFkZEV2ZW50TGlzdGVu ZXIoIm1vdXNlZG93biIsIHRoaXMuX2JvdW5kQ29udGFpbmluZ0VsZW1lbnRGb2N1c2VkLCBmYWxz ZSk7CisKICAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9y LlNpZGViYXJPdmVybGF5LkV2ZW50VHlwZXMuV2FzU2hvd24sIG51bGwpOwogICAgIH0sCiAKQEAg LTExMyw3ICsxMTMsNyBAQCBXZWJJbnNwZWN0b3IuU2lkZWJhck92ZXJsYXkucHJvdG90eXBlID0g ewogICAgICAgICB0aGlzLmVsZW1lbnQucmVtb3ZlQ2hpbGQodGhpcy5fcmVzaXplckVsZW1lbnQp OwogICAgICAgICBpZiAodGhpcy5fcmVzaXplcldpZGdldEVsZW1lbnQpCiAgICAgICAgICAgICB0 aGlzLmVsZW1lbnQucmVtb3ZlQ2hpbGQodGhpcy5fcmVzaXplcldpZGdldEVsZW1lbnQpOwotICAg ICAgICBlbGVtZW50LnJlbW92ZUV2ZW50TGlzdGVuZXIoIkRPTUZvY3VzSW4iLCB0aGlzLl9ib3Vu ZENvbnRhaW5pbmdFbGVtZW50Rm9jdXNlZCwgZmFsc2UpOworICAgICAgICBlbGVtZW50LnJlbW92 ZUV2ZW50TGlzdGVuZXIoIm1vdXNlZG93biIsIHRoaXMuX2JvdW5kQ29udGFpbmluZ0VsZW1lbnRG b2N1c2VkLCBmYWxzZSk7CiAgICAgfSwKICAgICAKICAgICAvKioKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU291cmNlRnJhbWUuanMgYi9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJjZUZyYW1lLmpzCmluZGV4IDE4Zjc3MDc1M2I1 MzM2MTI4ZWE4YmRjYTFjYWU0MWZmNzIyNzA5ZTguLjY3ZTM1ZTdiY2M4NTkyMTE3ZDFkMTE2MTg5 ZmMxMzhlZWE2MWU5OGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvU291cmNlRnJhbWUuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9Tb3VyY2VGcmFtZS5qcwpAQCAtOTAsOSArOTAsOSBAQCBXZWJJbnNwZWN0b3IuU291cmNl RnJhbWUucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLl9jbGVhckxpbmVUb1JldmVhbCgpOwog ICAgIH0sCiAKLSAgICBmb2N1czogZnVuY3Rpb24oKQorICAgIGRlZmF1bHRGb2N1c2VkRWxlbWVu dDogZnVuY3Rpb24oKQogICAgIHsKLSAgICAgICAgdGhpcy5fdGV4dFZpZXdlci5mb2N1cygpOwor ICAgICAgICByZXR1cm4gdGhpcy5fdGV4dFZpZXdlci5kZWZhdWx0Rm9jdXNlZEVsZW1lbnQoKTsK ICAgICB9LAogCiAgICAgZ2V0IGxvYWRlZCgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL1N0eWxlc1BhbmVsLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9TdHlsZXNQYW5lbC5qcwppbmRleCA0NzViZjY5Njk3Zjc0M2I1NmU0NmYx ZTdjM2I5M2IyNmUyOWU3NzdiLi5hODg3Y2VmZWQzMDUzYWNlMWVjNzI3ODk0MjhkYzFmYjlkMjMy NzE3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1N0eWxl c1BhbmVsLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU3R5bGVz UGFuZWwuanMKQEAgLTQ5LDEzICs0OSwxMyBAQCBXZWJJbnNwZWN0b3IuU3R5bGVzUGFuZWwgPSBm dW5jdGlvbigpCiAKICAgICB0aGlzLl9uYXZpZ2F0b3IgPSBuZXcgV2ViSW5zcGVjdG9yLlNjcmlw dHNOYXZpZ2F0b3IoKTsKICAgICB0aGlzLl9uYXZpZ2F0b3JWaWV3ID0gdGhpcy5fbmF2aWdhdG9y LnZpZXc7Ci0gICAgdGhpcy5fbmF2aWdhdG9yLnNob3codGhpcy5fbWFpblZpZXcuc2lkZWJhckVs ZW1lbnQpOworICAgIHRoaXMuX25hdmlnYXRvci52aWV3LnNob3codGhpcy5fbWFpblZpZXcuc2lk ZWJhckVsZW1lbnQpOwogICAgIHRoaXMuX25hdmlnYXRvci5hZGRFdmVudExpc3RlbmVyKFdlYklu c3BlY3Rvci5TY3JpcHRzTmF2aWdhdG9yLkV2ZW50cy5TY3JpcHRTZWxlY3RlZCwgdGhpcy5fc2Ny aXB0U2VsZWN0ZWQsIHRoaXMpOwogCiAgICAgdGhpcy5fZWRpdG9yQ29udGFpbmVyID0gbmV3IFdl Ykluc3BlY3Rvci5UYWJiZWRFZGl0b3JDb250YWluZXIodGhpcywgInByZXZpb3VzbHlWaWV3ZWRD U1NGaWxlcyIpOwogICAgIHRoaXMuX2VkaXRvckNvbnRhaW5lci5zaG93KHRoaXMuX21haW5WaWV3 Lm1haW5FbGVtZW50KTsKIAotICAgIHRoaXMuX25hdmlnYXRvckNvbnRyb2xsZXIgPSBuZXcgV2Vi SW5zcGVjdG9yLlNjcmlwdHNOYXZpZ2F0b3JDb250cm9sbGVyKHRoaXMsIHRoaXMuX21haW5WaWV3 LCB0aGlzLl9uYXZpZ2F0b3IsIHRoaXMuX2VkaXRvckNvbnRhaW5lcik7CisgICAgdGhpcy5fbmF2 aWdhdG9yQ29udHJvbGxlciA9IG5ldyBXZWJJbnNwZWN0b3IuTmF2aWdhdG9yT3ZlcmxheUNvbnRy b2xsZXIodGhpcywgdGhpcy5fbWFpblZpZXcsIHRoaXMuX25hdmlnYXRvci52aWV3LCB0aGlzLl9l ZGl0b3JDb250YWluZXIudmlldyk7CiAKICAgICB0aGlzLl9zb3VyY2VGcmFtZXNGb3JSZXNvdXJj ZSA9IG5ldyBNYXAoKTsKICAgICB0aGlzLl91cmxUb1Jlc291cmNlID0ge307CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RhYmJlZEVkaXRvckNvbnRhaW5l ci5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGFiYmVkRWRpdG9yQ29u dGFpbmVyLmpzCmluZGV4IDM2OTY1N2FhMzRlZTY5ZGY1OTM0ZGY2YjVmOWZmNjhkNTg4NDcxM2Qu LmNiOTM1NzZkNzQzNjk4MjU3MDlkY2U4MDZkNmIxMTYwYWIwNjJjNzMgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGFiYmVkRWRpdG9yQ29udGFpbmVyLmpz CisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGFiYmVkRWRpdG9yQ29u dGFpbmVyLmpzCkBAIC03NiwxOSArNzYsMTkgQEAgV2ViSW5zcGVjdG9yLlRhYmJlZEVkaXRvckNv bnRhaW5lci5tYXhpbWFsUHJldmlvdXNseVZpZXdlZEZpbGVzQ291bnQgPSAzMDsKIAogV2ViSW5z cGVjdG9yLlRhYmJlZEVkaXRvckNvbnRhaW5lci5wcm90b3R5cGUgPSB7CiAgICAgLyoqCi0gICAg ICogQHR5cGUge1dlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZX0KKyAgICAgKiBAdHlwZSB7V2ViSW5z cGVjdG9yLlZpZXd9CiAgICAgICovCi0gICAgZ2V0IHZpc2libGVWaWV3KCkKKyAgICBnZXQgdmll dygpCiAgICAgewotICAgICAgICByZXR1cm4gdGhpcy5fdGFiYmVkUGFuZS52aXNpYmxlVmlldzsK KyAgICAgICAgcmV0dXJuIHRoaXMuX3RhYmJlZFBhbmU7CiAgICAgfSwKIAogICAgIC8qKgotICAg ICAqIEB0eXBlIHtFbGVtZW50fQorICAgICAqIEB0eXBlIHtXZWJJbnNwZWN0b3IuU291cmNlRnJh bWV9CiAgICAgICovCi0gICAgZ2V0IGVsZW1lbnQoKQorICAgIGdldCB2aXNpYmxlVmlldygpCiAg ICAgewotICAgICAgICByZXR1cm4gdGhpcy5fdGFiYmVkUGFuZS5lbGVtZW50OworICAgICAgICBy ZXR1cm4gdGhpcy5fdGFiYmVkUGFuZS52aXNpYmxlVmlldzsKICAgICB9LAogCiAgICAgLyoqCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RhYmJlZFBhbmUu anMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RhYmJlZFBhbmUuanMKaW5k ZXggMDk1Y2E0N2M0NTJmY2RiYzgwODU4YjAzODRjMDIyNDFjNGNkZWQyNC4uNDk1MjI5NjQyMWFk MWE4MWVmNjE2YWNmMGIyOThlMGM0NzA5YzNiNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9UYWJiZWRQYW5lLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvVGFiYmVkUGFuZS5qcwpAQCAtNDQsNiArNDQsNyBAQCBXZWJJbnNw ZWN0b3IuVGFiYmVkUGFuZSA9IGZ1bmN0aW9uKCkKICAgICB0aGlzLl90YWJzID0gW107CiAgICAg dGhpcy5fdGFic0hpc3RvcnkgPSBbXTsKICAgICB0aGlzLl90YWJzQnlJZCA9IHt9OworICAgIHRo aXMuZWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJjbGljayIsIHRoaXMuZm9jdXMuYmluZCh0aGlz KSwgZmFsc2UpOwogCiAgICAgdGhpcy5fZHJvcERvd25CdXR0b24gPSB0aGlzLl9jcmVhdGVEcm9w RG93bkJ1dHRvbigpOwogfQpAQCAtODYsMTQgKzg3LDkgQEAgV2ViSW5zcGVjdG9yLlRhYmJlZFBh bmUucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLl9jbG9zZWFibGVUYWJzID0gY2xvc2VhYmxl VGFiczsKICAgICB9LAogCi0gICAgZm9jdXM6IGZ1bmN0aW9uKCkKKyAgICBkZWZhdWx0Rm9jdXNl ZEVsZW1lbnQ6IGZ1bmN0aW9uKCkKICAgICB7Ci0gICAgICAgIGlmICghdGhpcy52aXNpYmxlVmll dykKLSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgaWYgKHR5cGVvZih0aGlzLnZpc2libGVW aWV3LmZvY3VzKSA9PT0gImZ1bmN0aW9uIikKLSAgICAgICAgICAgIHRoaXMudmlzaWJsZVZpZXcu Zm9jdXMoKTsKLSAgICAgICAgZWxzZQotICAgICAgICAgICAgdGhpcy52aXNpYmxlVmlldy5lbGVt ZW50LmZvY3VzKCk7CisgICAgICAgIHJldHVybiB0aGlzLnZpc2libGVWaWV3ID8gdGhpcy52aXNp YmxlVmlldy5kZWZhdWx0Rm9jdXNlZEVsZW1lbnQoKSA6IG51bGw7CiAgICAgfSwKIAogICAgIC8q KgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UZXh0Vmll d2VyLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UZXh0Vmlld2VyLmpz CmluZGV4IDBlNmM1MDQyNWEyNzNhNjlmNWRiNGE2NjliODg2MDQ0ZjAxMzAzMjMuLmU0YjEyNTYy ZWFiZWVhYmZlNDRhNTYyNDkxZTBmZDZmMzZhNjk1NmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGV4dFZpZXdlci5qcworKysgYi9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RleHRWaWV3ZXIuanMKQEAgLTk4LDkgKzk4LDkgQEAgV2Vi SW5zcGVjdG9yLlRleHRWaWV3ZXIucHJvdG90eXBlID0gewogICAgICAgICByZXR1cm4gdGhpcy5f dGV4dE1vZGVsOwogICAgIH0sCiAKLSAgICBmb2N1czogZnVuY3Rpb24oKQorICAgIGRlZmF1bHRG b2N1c2VkRWxlbWVudDogZnVuY3Rpb24oKQogICAgIHsKLSAgICAgICAgdGhpcy5fbWFpblBhbmVs LmZvY3VzKCk7CisgICAgICAgIHJldHVybiB0aGlzLl9tYWluUGFuZWwuZGVmYXVsdEZvY3VzZWRF bGVtZW50KCk7CiAgICAgfSwKIAogICAgIHJldmVhbExpbmU6IGZ1bmN0aW9uKGxpbmVOdW1iZXIp CkBAIC05NTksMTIgKzk1OSwxMSBAQCBXZWJJbnNwZWN0b3IuVGV4dEVkaXRvck1haW5QYW5lbC5w cm90b3R5cGUgPSB7CiAgICAgICAgICAgICB0aGlzLl9jb250YWluZXIuZm9jdXMoKTsKICAgICB9 LAogCi0gICAgZm9jdXM6IGZ1bmN0aW9uKCkKKyAgICBkZWZhdWx0Rm9jdXNlZEVsZW1lbnQ6IGZ1 bmN0aW9uKCkKICAgICB7CiAgICAgICAgIGlmICh0aGlzLl9yZWFkT25seSkKLSAgICAgICAgICAg IHRoaXMuZWxlbWVudC5mb2N1cygpOwotICAgICAgICBlbHNlCi0gICAgICAgICAgICB0aGlzLl9j b250YWluZXIuZm9jdXMoKTsKKyAgICAgICAgICAgIHJldHVybiB0aGlzLmVsZW1lbnQ7CisgICAg ICAgIHJldHVybiB0aGlzLl9jb250YWluZXI7CiAgICAgfSwKIAogICAgIF91cGRhdGVTZWxlY3Rp b25PblN0YXJ0RWRpdGluZzogZnVuY3Rpb24oKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZVBhbmVsLmpzIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZVBhbmVsLmpzCmluZGV4IGZiNzA3ZjY5ODJiZTA4YzJl NGU4Yzg1MDBhMDFkYmJiZmJiZTQ2YjQuLjI5OGY1ZmEyY2NhNjMwMzIzMDgyNjhmNGI2NDVmYTg0 OWE4YzBlZDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv VGltZWxpbmVQYW5lbC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L1RpbWVsaW5lUGFuZWwuanMKQEAgLTE5Myw3ICsxOTMsNyBAQCBXZWJJbnNwZWN0b3IuVGltZWxp bmVQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHJldHVybiBzdGF0dXNCYXJJdGVtczsKICAg ICB9LAogCi0gICAgZ2V0IGRlZmF1bHRGb2N1c2VkRWxlbWVudCgpCisgICAgZGVmYXVsdEZvY3Vz ZWRFbGVtZW50OiBmdW5jdGlvbigpCiAgICAgewogICAgICAgICByZXR1cm4gdGhpcy5lbGVtZW50 OwogICAgIH0sCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L1ZpZXcuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1ZpZXcuanMKaW5k ZXggNDY4ZWUzZTNmMTc4NTI4Y2JlZTA1Nzc0N2RlOGMwNDBjZWE3NzA5ZS4uOTFjYjI4N2MwZDU3 MjI1NjAyMzdiYzJhOWFlMDFjMWFlM2NhOWZlMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9WaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvVmlldy5qcwpAQCAtMzMzLDYgKzMzMywzMSBAQCBXZWJJbnNwZWN0b3IuVmll dy5wcm90b3R5cGUgPSB7CiAKICAgICAgICAgaWYgKHRoaXMuX2NoaWxkcmVuLmxlbmd0aCkKICAg ICAgICAgICAgIGxpbmVzLnB1c2gocHJlZml4ICsgIn0iKTsKKyAgICB9LAorCisgICAgLyoqCisg ICAgICogQHJldHVybiB7RWxlbWVudH0KKyAgICAgKi8KKyAgICBkZWZhdWx0Rm9jdXNlZEVsZW1l bnQ6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIHJldHVybiB0aGlzLl9kZWZhdWx0Rm9jdXNl ZEVsZW1lbnQgfHwgdGhpcy5lbGVtZW50OworICAgIH0sCisKKyAgICAvKioKKyAgICAgKiBAcGFy YW0ge0VsZW1lbnR9IGVsZW1lbnQKKyAgICAgKi8KKyAgICBzZXREZWZhdWx0Rm9jdXNlZEVsZW1l bnQ6IGZ1bmN0aW9uKGVsZW1lbnQpCisgICAgeworICAgICAgICB0aGlzLl9kZWZhdWx0Rm9jdXNl ZEVsZW1lbnQgPSBlbGVtZW50OworICAgIH0sCisKKyAgICBmb2N1czogZnVuY3Rpb24oKQorICAg IHsKKyAgICAgICAgdmFyIGVsZW1lbnQgPSB0aGlzLmRlZmF1bHRGb2N1c2VkRWxlbWVudCgpOwor ICAgICAgICBpZiAoIWVsZW1lbnQgfHwgZWxlbWVudC5pc0FuY2VzdG9yKGRvY3VtZW50LmFjdGl2 ZUVsZW1lbnQpKQorICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAgIFdlYkluc3BlY3Rvci5z ZXRDdXJyZW50Rm9jdXNFbGVtZW50KGVsZW1lbnQpOwogICAgIH0KIH0KIAo=