63007 2011-06-20 13:17:51 -0700 Web Inspector: Show "no content" message in network panel when resource does not have content available. 2011-06-23 08:56:24 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 vsevik webkit-unassigned apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy webkit.review.bot yurys oldest_to_newest 423900 0 vsevik 2011-06-20 13:17:51 -0700 Show "no content" message in network panel when resource does not have content available. 423909 1 97850 vsevik 2011-06-20 13:23:19 -0700 Created attachment 97850 Patch 424355 2 97850 yurys 2011-06-21 02:28:35 -0700 Comment on attachment 97850 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=97850&action=review The change looks good except the code duplication in _ensureInnerViewShown > Source/WebCore/inspector/front-end/ResourceResponseView.js:34 > + Remove extra line. > Source/WebCore/inspector/front-end/ResourceResponseView.js:56 > + _ensureInnerViewShown: function() This method is very similar to ResourcePreviewView.prototype._ensureInnerViewShown above could you factor out common code into a new method/class and use it from both places? 424397 3 97969 vsevik 2011-06-21 05:26:44 -0700 Created attachment 97969 Patch with fixes 426214 4 97969 webkit.review.bot 2011-06-23 08:56:19 -0700 Comment on attachment 97969 Patch with fixes Clearing flags on attachment: 97969 Committed r89577: <http://trac.webkit.org/changeset/89577> 426215 5 webkit.review.bot 2011-06-23 08:56:24 -0700 All reviewed patches have been landed. Closing bug. 97850 2011-06-20 13:23:19 -0700 2011-06-21 05:26:29 -0700 Patch bug-63007-20110621002317.patch text/plain 24927 vsevik U3VidmVyc2lvbiBSZXZpc2lvbjogODkxODQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBjMGZmNzM4NTVhY2UwOTI5 MDFiNzZjMjU5N2QyZTljZWQ3ZDU3N2MwLi4xN2QwNzkyYTE3Y2IyOGIzNDZmNGNhZjQzNWViYzc1 ZDlkODFhNWFmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDkgQEAKKzIwMTEtMDYtMjAgIFZzZXZv bG9kIFZsYXNvdiAgPHZzZXZpa0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogU2hvdyAibm8gY29udGVu dCIgbWVzc2FnZSBpbiBuZXR3b3JrIHBhbmVsIHdoZW4gcmVzb3VyY2UgZG9lcyBub3QgaGF2ZSBj b250ZW50IGF2YWlsYWJsZS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTYzMDA3CisKKyAgICAgICAgKiBFbmdsaXNoLmxwcm9qL2xvY2FsaXplZFN0cmlu Z3MuanM6CisgICAgICAgICogV2ViQ29yZS5neXBpOgorICAgICAgICAqIFdlYkNvcmUudmNwcm9q L1dlYkNvcmUudmNwcm9qOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvQXBwbGljYXRp b25DYWNoZUl0ZW1zVmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5BcHBsaWNhdGlvbkNh Y2hlSXRlbXNWaWV3KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5BcHBsaWNhdGlvbkNhY2hlSXRl bXNWaWV3LnByb3RvdHlwZS5fdXBkYXRlQ2FsbGJhY2spOgorICAgICAgICAqIGluc3BlY3Rvci9m cm9udC1lbmQvQ29va2llSXRlbXNWaWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNvb2tp ZUl0ZW1zVmlldyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ29va2llSXRlbXNWaWV3LnByb3Rv dHlwZS5fdXBkYXRlV2l0aENvb2tpZXMpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQv RGF0YWJhc2VUYWJsZVZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGF0YWJhc2VUYWJs ZVZpZXcucHJvdG90eXBlLl9xdWVyeUZpbmlzaGVkKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJv bnQtZW5kL0VtcHR5Vmlldy5qczogQWRkZWQuCisgICAgICAgIChXZWJJbnNwZWN0b3IuRW1wdHlW aWV3KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5FbXB0eVZpZXcucHJvdG90eXBlLnNob3cpOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLkVtcHR5Vmlldy5wcm90b3R5cGUuc2V0IHRleHQpOgorICAg ICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya0l0ZW1WaWV3LmpzOgorICAgICAgICAo V2ViSW5zcGVjdG9yLk5ldHdvcmtJdGVtVmlldyk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250 LWVuZC9SZXNvdXJjZUNvb2tpZXNWaWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291 cmNlQ29va2llc1ZpZXcucHJvdG90eXBlLnNob3cpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9u dC1lbmQvUmVzb3VyY2VQcmV2aWV3Vmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNv dXJjZVByZXZpZXdWaWV3KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZVByZXZpZXdW aWV3LnByb3RvdHlwZS5fZW5zdXJlSW5uZXJWaWV3U2hvd24uY2FsbGJhY2spOgorICAgICAgICAo V2ViSW5zcGVjdG9yLlJlc291cmNlUHJldmlld1ZpZXcucHJvdG90eXBlLl9lbnN1cmVJbm5lclZp ZXdTaG93bik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2VQcmV2aWV3Vmlldy5wcm90 b3R5cGUuX2NyZWF0ZUlubmVyVmlldyk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9S ZXNvdXJjZVJlc3BvbnNlVmlldy5qczogQWRkZWQuCisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVz b3VyY2VSZXNwb25zZVZpZXcpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlUmVzcG9u c2VWaWV3LnByb3RvdHlwZS5oYXNDb250ZW50KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNv dXJjZVJlc3BvbnNlVmlldy5wcm90b3R5cGUuZ2V0IHNvdXJjZVZpZXcpOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLlJlc291cmNlUmVzcG9uc2VWaWV3LnByb3RvdHlwZS5zaG93KToKKyAgICAgICAg KFdlYkluc3BlY3Rvci5SZXNvdXJjZVJlc3BvbnNlVmlldy5wcm90b3R5cGUuX2Vuc3VyZUlubmVy Vmlld1Nob3duLmNhbGxiYWNrKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZVJlc3Bv bnNlVmlldy5wcm90b3R5cGUuX2Vuc3VyZUlubmVyVmlld1Nob3duKToKKyAgICAgICAgKiBpbnNw ZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlVGltaW5nVmlldy5qczoKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5SZXNvdXJjZVRpbWluZ1ZpZXcucHJvdG90eXBlLnNob3cpOgorICAgICAgICAqIGluc3Bl Y3Rvci9mcm9udC1lbmQvUmVzb3VyY2VzUGFuZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu U3RvcmFnZUNhdGVnb3J5Vmlldyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU3RvcmFnZUNhdGVn b3J5Vmlldy5wcm90b3R5cGUuc2V0VGV4dCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVu ZC9XZWJLaXQucXJjOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmh0 bWw6CisKIDIwMTEtMDYtMTcgIEp1bGllbiBDaGFmZnJhaXggIDxqY2hhZmZyYWl4QHdlYmtpdC5v cmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9FbmdsaXNoLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMgYi9Tb3VyY2UvV2Vi Q29yZS9FbmdsaXNoLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMKaW5kZXggMGQxMzYzMmFhOTdh NzM2ZjU0YmU0MjA0NjE3MDQ3YjVjYWY5ZmNiMy4uMmZiMGQ4ZWRlZDExZGQzOTA3NzU5MjExOWYy ZGY5YmIxMzNhN2RjZCAxMDA2NDQKR0lUIGJpbmFyeSBwYXRjaApkZWx0YSAxMjYKemNtZXh6aEl6 I1c8Xyh0QE9wYyQ9RjxKTWw5QiU8YjVrbzNOOEFCJEpFVDVjXnN5dW8yZTZHcHkzb3ZDUUMmd3lp CmxPcFhRMDBgKk5VSFdnd3xWTXRec1ZNcypRZyhlUXNRLTZ3TV5VVmRiVD4lPTxFR2hzMQoKZGVs dGEgMTgKYWNtWjIrZiUoZkI8Xyh0QE9nX0p1WkZCRlUqeyVSJlVKNVMmCgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvV2ViQ29yZS5neXBpIGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5neXBp CmluZGV4IGNjYmYyNzE1ODgwMDhmYWJkNGFiZmI4YjFhOTI3MGI0MjU1OTU1ZDMuLjcxZDk4OTgz MWYxYjkwYzYwM2FmYWU0MDNkOWRiNmQ1ZGNkYmMwZGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL1dlYkNvcmUuZ3lwaQorKysgYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmd5cGkKQEAgLTYy MjQsNiArNjIyNCw3IEBACiAgICAgICAgICAgICAnaW5zcGVjdG9yL2Zyb250LWVuZC9EcmF3ZXIu anMnLAogICAgICAgICAgICAgJ2luc3BlY3Rvci9mcm9udC1lbmQvRWxlbWVudHNQYW5lbC5qcycs CiAgICAgICAgICAgICAnaW5zcGVjdG9yL2Zyb250LWVuZC9FbGVtZW50c1RyZWVPdXRsaW5lLmpz JywKKyAgICAgICAgICAgICdpbnNwZWN0b3IvZnJvbnQtZW5kL0VtcHR5Vmlldy5qcycsCiAgICAg ICAgICAgICAnaW5zcGVjdG9yL2Zyb250LWVuZC9FdmVudExpc3RlbmVyc1NpZGViYXJQYW5lLmpz JywKICAgICAgICAgICAgICdpbnNwZWN0b3IvZnJvbnQtZW5kL0V4dGVuc2lvbkFQSS5qcycsCiAg ICAgICAgICAgICAnaW5zcGVjdG9yL2Zyb250LWVuZC9FeHRlbnNpb25BdWRpdENhdGVnb3J5Lmpz JywKQEAgLTYyNzAsNiArNjI3MSw3IEBACiAgICAgICAgICAgICAnaW5zcGVjdG9yL2Zyb250LWVu ZC9SZXNvdXJjZUhlYWRlcnNWaWV3LmpzJywKICAgICAgICAgICAgICdpbnNwZWN0b3IvZnJvbnQt ZW5kL1Jlc291cmNlSlNPTlZpZXcuanMnLAogICAgICAgICAgICAgJ2luc3BlY3Rvci9mcm9udC1l bmQvUmVzb3VyY2VIVE1MVmlldy5qcycsCisgICAgICAgICAgICAnaW5zcGVjdG9yL2Zyb250LWVu ZC9SZXNvdXJjZVJlc3BvbnNlVmlldy5qcycsCiAgICAgICAgICAgICAnaW5zcGVjdG9yL2Zyb250 LWVuZC9SZXNvdXJjZVRpbWluZ1ZpZXcuanMnLAogICAgICAgICAgICAgJ2luc3BlY3Rvci9mcm9u dC1lbmQvUmVzb3VyY2VUcmVlTW9kZWwuanMnLAogICAgICAgICAgICAgJ2luc3BlY3Rvci9mcm9u dC1lbmQvUmVzb3VyY2VWaWV3LmpzJywKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1dlYkNv cmUudmNwcm9qL1dlYkNvcmUudmNwcm9qIGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS52Y3Byb2ov V2ViQ29yZS52Y3Byb2oKaW5kZXggMWRkN2MzYTViMTBhMzJhODZiZjJjZGU3NGE1Mzk4NzMyNjgx ZDUwYS4uMzhhZmZkMzU3MWMzY2NlZGEzMWVmOTcwZjMyMjY4NDljNTRhOGVkYyAxMDA3NTUKLS0t IGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS52Y3Byb2ovV2ViQ29yZS52Y3Byb2oKKysrIGIvU291 cmNlL1dlYkNvcmUvV2ViQ29yZS52Y3Byb2ovV2ViQ29yZS52Y3Byb2oKQEAgLTY3OTYxLDYgKzY3 OTYxLDEwIEBACiAJCQkJCT4KIAkJCQk8L0ZpbGU+CiAJCQkJPEZpbGUKKwkJCQkJUmVsYXRpdmVQ YXRoPSIuLlxpbnNwZWN0b3JcZnJvbnQtZW5kXEVtcHR5Vmlldy5qcyIKKwkJCQkJPgorCQkJCTwv RmlsZT4KKwkJCQk8RmlsZQogCQkJCQlSZWxhdGl2ZVBhdGg9Ii4uXGluc3BlY3Rvclxmcm9udC1l bmRcRXZlbnRMaXN0ZW5lcnNTaWRlYmFyUGFuZS5qcyIKIAkJCQkJPgogCQkJCTwvRmlsZT4KQEAg LTY4MTkzLDYgKzY4MTk3LDEwIEBACiAJCQkJCT4KIAkJCQk8L0ZpbGU+CiAJCQkJPEZpbGUKKwkJ CQkJUmVsYXRpdmVQYXRoPSIuLlxpbnNwZWN0b3JcZnJvbnQtZW5kXFJlc291cmNlUmVzcG9uc2VW aWV3LmpzIgorCQkJCQk+CisJCQkJPC9GaWxlPgorCQkJCTxGaWxlCiAJCQkJCVJlbGF0aXZlUGF0 aD0iLi5caW5zcGVjdG9yXGZyb250LWVuZFxSZXNvdXJjZVRpbWluZ1ZpZXcuanMiCiAJCQkJCT4K IAkJCQk8L0ZpbGU+CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL0FwcGxpY2F0aW9uQ2FjaGVJdGVtc1ZpZXcuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL0FwcGxpY2F0aW9uQ2FjaGVJdGVtc1ZpZXcuanMKaW5kZXggNmUwMTdjMDNj Y2M0MjVhYjcyYTI0Y2M1YTdkMTFlZmFjYWUwODRjZC4uOWQxYjZhNDJiNGE5ZTE5YzM2NjM2MTU0 ZGUwOWZiNjM0ZTAxMzFmMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9BcHBsaWNhdGlvbkNhY2hlSXRlbXNWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvQXBwbGljYXRpb25DYWNoZUl0ZW1zVmlldy5qcwpAQCAtNjEs MTAgKzYxLDggQEAgV2ViSW5zcGVjdG9yLkFwcGxpY2F0aW9uQ2FjaGVJdGVtc1ZpZXcgPSBmdW5j dGlvbih0cmVlRWxlbWVudCwgYXBwY2FjaGVEb21haW4pCiAgICAgdGhpcy5fdHJlZUVsZW1lbnQg PSB0cmVlRWxlbWVudDsKICAgICB0aGlzLl9hcHBjYWNoZURvbWFpbiA9IGFwcGNhY2hlRG9tYWlu OwogCi0gICAgdGhpcy5fZW1wdHlNc2dFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgi ZGl2Iik7Ci0gICAgdGhpcy5fZW1wdHlNc2dFbGVtZW50LmNsYXNzTmFtZSA9ICJzdG9yYWdlLWVt cHR5LXZpZXciOwotICAgIHRoaXMuX2VtcHR5TXNnRWxlbWVudC50ZXh0Q29udGVudCA9IFdlYklu c3BlY3Rvci5VSVN0cmluZygiTm8gQXBwbGljYXRpb24gQ2FjaGUgaW5mb3JtYXRpb24gYXZhaWxh YmxlLiIpOwotICAgIHRoaXMuZWxlbWVudC5hcHBlbmRDaGlsZCh0aGlzLl9lbXB0eU1zZ0VsZW1l bnQpOworICAgIHRoaXMuX2VtcHR5VmlldyA9IG5ldyBXZWJJbnNwZWN0b3IuRW1wdHlWaWV3KFdl Ykluc3BlY3Rvci5VSVN0cmluZygiTm8gQXBwbGljYXRpb24gQ2FjaGUgaW5mb3JtYXRpb24gYXZh aWxhYmxlLiIpKTsKKyAgICB0aGlzLl9lbXB0eVZpZXcuc2hvdyh0aGlzLmVsZW1lbnQpOwogCiAg ICAgdGhpcy51cGRhdGVTdGF0dXMoYXBwbGljYXRpb25DYWNoZS5VTkNBQ0hFRCk7CiAKQEAgLTE2 NCw3ICsxNjIsNyBAQCBXZWJJbnNwZWN0b3IuQXBwbGljYXRpb25DYWNoZUl0ZW1zVmlldy5wcm90 b3R5cGUgPSB7CiAgICAgICAgIHZhciBsYXN0UGF0aENvbXBvbmVudCA9IGFwcGxpY2F0aW9uQ2Fj aGVzLmxhc3RQYXRoQ29tcG9uZW50OwogCiAgICAgICAgIGlmICghdGhpcy5fbWFuaWZlc3QpIHsK LSAgICAgICAgICAgIHRoaXMuX2VtcHR5TXNnRWxlbWVudC5yZW1vdmVTdHlsZUNsYXNzKCJoaWRk ZW4iKTsKKyAgICAgICAgICAgIHRoaXMuX2VtcHR5Vmlldy5zaG93KHRoaXMuZWxlbWVudCk7CiAg ICAgICAgICAgICB0aGlzLmRlbGV0ZUJ1dHRvbi52aXNpYmxlID0gZmFsc2U7CiAgICAgICAgICAg ICBpZiAodGhpcy5fZGF0YUdyaWQpCiAgICAgICAgICAgICAgICAgdGhpcy5fZGF0YUdyaWQuZWxl bWVudC5hZGRTdHlsZUNsYXNzKCJoaWRkZW4iKTsKQEAgLTE3Nyw3ICsxNzUsNyBAQCBXZWJJbnNw ZWN0b3IuQXBwbGljYXRpb25DYWNoZUl0ZW1zVmlldy5wcm90b3R5cGUgPSB7CiAgICAgICAgIHRo aXMuX3BvcHVsYXRlRGF0YUdyaWQoKTsKICAgICAgICAgdGhpcy5fZGF0YUdyaWQuYXV0b1NpemVD b2x1bW5zKDIwLCA4MCk7CiAgICAgICAgIHRoaXMuX2RhdGFHcmlkLmVsZW1lbnQucmVtb3ZlU3R5 bGVDbGFzcygiaGlkZGVuIik7Ci0gICAgICAgIHRoaXMuX2VtcHR5TXNnRWxlbWVudC5hZGRTdHls ZUNsYXNzKCJoaWRkZW4iKTsKKyAgICAgICAgdGhpcy5fZW1wdHlWaWV3LmhpZGUoKTsKICAgICAg ICAgdGhpcy5kZWxldGVCdXR0b24udmlzaWJsZSA9IHRydWU7CiAKICAgICAgICAgdmFyIHRvdGFs U2l6ZVN0cmluZyA9IE51bWJlci5ieXRlc1RvU3RyaW5nKHRoaXMuX3NpemUpOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db29raWVJdGVtc1ZpZXcuanMg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0Nvb2tpZUl0ZW1zVmlldy5qcwpp bmRleCA2YmYzMzI2ZjY4NzVkYjFjYmJiNGVkY2M3ZGY0MmQ2ZGFjNDNmYjljLi5kNmU2MmRkN2Yw Y2YzYTU4Y2Y0NDMxYzI2NGRiMTY2N2VlNTI0YjAyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0Nvb2tpZUl0ZW1zVmlldy5qcworKysgYi9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0Nvb2tpZUl0ZW1zVmlldy5qcwpAQCAtNDMsMTAgKzQz LDggQEAgV2ViSW5zcGVjdG9yLkNvb2tpZUl0ZW1zVmlldyA9IGZ1bmN0aW9uKHRyZWVFbGVtZW50 LCBjb29raWVEb21haW4pCiAgICAgdGhpcy5fdHJlZUVsZW1lbnQgPSB0cmVlRWxlbWVudDsKICAg ICB0aGlzLl9jb29raWVEb21haW4gPSBjb29raWVEb21haW47CiAKLSAgICB0aGlzLl9lbXB0eU1z Z0VsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKLSAgICB0aGlzLl9lbXB0 eU1zZ0VsZW1lbnQuY2xhc3NOYW1lID0gInN0b3JhZ2UtZW1wdHktdmlldyI7Ci0gICAgdGhpcy5f ZW1wdHlNc2dFbGVtZW50LnRleHRDb250ZW50ID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJUaGlz IHNpdGUgaGFzIG5vIGNvb2tpZXMuIik7Ci0gICAgdGhpcy5lbGVtZW50LmFwcGVuZENoaWxkKHRo aXMuX2VtcHR5TXNnRWxlbWVudCk7CisgICAgdGhpcy5fZW1wdHlWaWV3ID0gbmV3IFdlYkluc3Bl Y3Rvci5FbXB0eVZpZXcoV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJUaGlzIHNpdGUgaGFzIG5vIGNv b2tpZXMuIikpOworICAgIHRoaXMuX2VtcHR5Vmlldy5zaG93KHRoaXMuZWxlbWVudCk7CiB9CiAK IFdlYkluc3BlY3Rvci5Db29raWVJdGVtc1ZpZXcucHJvdG90eXBlID0gewpAQCAtODQsNyArODIs NyBAQCBXZWJJbnNwZWN0b3IuQ29va2llSXRlbXNWaWV3LnByb3RvdHlwZSA9IHsKIAogICAgICAg ICBpZiAoIXRoaXMuX2Nvb2tpZXMubGVuZ3RoKSB7CiAgICAgICAgICAgICAvLyBOb3RoaW5nIHRv IHNob3cuCi0gICAgICAgICAgICB0aGlzLl9lbXB0eU1zZ0VsZW1lbnQucmVtb3ZlU3R5bGVDbGFz cygiaGlkZGVuIik7CisgICAgICAgICAgICB0aGlzLl9lbXB0eVZpZXcuc2hvdyh0aGlzLmVsZW1l bnQpOwogICAgICAgICAgICAgdGhpcy5fZGVsZXRlQnV0dG9uLnZpc2libGUgPSBmYWxzZTsKICAg ICAgICAgICAgIGlmICh0aGlzLl9jb29raWVzVGFibGUpCiAgICAgICAgICAgICAgICAgdGhpcy5f Y29va2llc1RhYmxlLmVsZW1lbnQuYWRkU3R5bGVDbGFzcygiaGlkZGVuIik7CkBAIC05OCw3ICs5 Niw3IEBAIFdlYkluc3BlY3Rvci5Db29raWVJdGVtc1ZpZXcucHJvdG90eXBlID0gewogCiAgICAg ICAgIHRoaXMuX2Nvb2tpZXNUYWJsZS5zZXRDb29raWVzKHRoaXMuX2Nvb2tpZXMpOwogICAgICAg ICB0aGlzLl9jb29raWVzVGFibGUuZWxlbWVudC5yZW1vdmVTdHlsZUNsYXNzKCJoaWRkZW4iKTsK LSAgICAgICAgdGhpcy5fZW1wdHlNc2dFbGVtZW50LmFkZFN0eWxlQ2xhc3MoImhpZGRlbiIpOwor ICAgICAgICB0aGlzLl9lbXB0eVZpZXcuaGlkZSgpOwogICAgICAgICBpZiAoaXNBZHZhbmNlZCkg ewogICAgICAgICAgICAgdGhpcy5fdHJlZUVsZW1lbnQuc3VidGl0bGUgPSBTdHJpbmcuc3ByaW50 ZihXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIiVkIGNvb2tpZXMgKCVzKSIpLCB0aGlzLl9jb29raWVz Lmxlbmd0aCwKICAgICAgICAgICAgICAgICBOdW1iZXIuYnl0ZXNUb1N0cmluZyh0aGlzLl90b3Rh bFNpemUpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv RGF0YWJhc2VUYWJsZVZpZXcuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L0RhdGFiYXNlVGFibGVWaWV3LmpzCmluZGV4IDFhODg2ZmY2NjMwNzMzNjIyOWViNDNjOTBjMzIy OGVlMjJiYmJhNjIuLjg0M2MxMWEyOGVlYzdhMTAwMjYxYmIyMmVjYjdiOWU5OWYwY2Q0NTEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGF0YWJhc2VUYWJs ZVZpZXcuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EYXRhYmFz ZVRhYmxlVmlldy5qcwpAQCAtNjAsMTAgKzYwLDggQEAgV2ViSW5zcGVjdG9yLkRhdGFiYXNlVGFi bGVWaWV3LnByb3RvdHlwZSA9IHsKIAogICAgICAgICB2YXIgZGF0YUdyaWQgPSBXZWJJbnNwZWN0 b3IucGFuZWxzLnJlc291cmNlcy5kYXRhR3JpZEZvclJlc3VsdChjb2x1bW5OYW1lcywgdmFsdWVz KTsKICAgICAgICAgaWYgKCFkYXRhR3JpZCkgewotICAgICAgICAgICAgdmFyIGVtcHR5TXNnRWxl bWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOwotICAgICAgICAgICAgZW1wdHlN c2dFbGVtZW50LmNsYXNzTmFtZSA9ICJzdG9yYWdlLWVtcHR5LXZpZXciOwotICAgICAgICAgICAg ZW1wdHlNc2dFbGVtZW50LnRleHRDb250ZW50ID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJUaGUg 4oCcJXPigJ1cbnRhYmxlIGlzIGVtcHR5LiIsIHRoaXMudGFibGVOYW1lKTsKLSAgICAgICAgICAg IHRoaXMuZWxlbWVudC5hcHBlbmRDaGlsZChlbXB0eU1zZ0VsZW1lbnQpOworICAgICAgICAgICAg dGhpcy5fZW1wdHlWaWV3ID0gbmV3IFdlYkluc3BlY3Rvci5FbXB0eVZpZXcoV2ViSW5zcGVjdG9y LlVJU3RyaW5nKCJUaGUg4oCcJXPigJ1cbnRhYmxlIGlzIGVtcHR5LiIsIHRoaXMudGFibGVOYW1l KSk7CisgICAgICAgICAgICB0aGlzLl9lbXB0eVZpZXcuc2hvdyh0aGlzLmVsZW1lbnQpOwogICAg ICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvRW1wdHlWaWV3LmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9FbXB0eVZpZXcuanMKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uNDQxZGRjNDBkOGFiOWNkNWQw ZGM5OGUwZGZmZmJkNmYzNDI1OGM0YwotLS0gL2Rldi9udWxsCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvRW1wdHlWaWV3LmpzCkBAIC0wLDAgKzEsNTQgQEAKKy8qCisg KiBDb3B5cmlnaHQgKEMpIDIwMTEgR29vZ2xlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAq CisgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3 aXRoIG9yIHdpdGhvdXQKKyAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0 aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucyBhcmUKKyAqIG1ldDoKKyAqCisgKiAgICAgKiBS ZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHly aWdodAorICogbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2lu ZyBkaXNjbGFpbWVyLgorICogICAgICogUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11 c3QgcmVwcm9kdWNlIHRoZSBhYm92ZQorICogY29weXJpZ2h0IG5vdGljZSwgdGhpcyBsaXN0IG9m IGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lcgorICogaW4gdGhlIGRvY3Vt ZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZQorICogZGlz dHJpYnV0aW9uLgorICogICAgICogTmVpdGhlciB0aGUgbmFtZSBvZiBHb29nbGUgSW5jLiBub3Ig dGhlIG5hbWVzIG9mIGl0cworICogY29udHJpYnV0b3JzIG1heSBiZSB1c2VkIHRvIGVuZG9yc2Ug b3IgcHJvbW90ZSBwcm9kdWN0cyBkZXJpdmVkIGZyb20KKyAqIHRoaXMgc29mdHdhcmUgd2l0aG91 dCBzcGVjaWZpYyBwcmlvciB3cml0dGVuIHBlcm1pc3Npb24uCisgKgorICogVEhJUyBTT0ZUV0FS RSBJUyBQUk9WSURFRCBCWSBUSEUgQ09QWVJJR0hUIEhPTERFUlMgQU5EIENPTlRSSUJVVE9SUwor ICogIkFTIElTIiBBTkQgQU5ZIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJ TkcsIEJVVCBOT1QKKyAqIExJTUlURUQgVE8sIFRIRSBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVS Q0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZPUgorICogQSBQQVJUSUNVTEFSIFBVUlBPU0UgQVJF IERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIFRIRSBDT1BZUklHSFQKKyAqIE9XTkVSIE9S IENPTlRSSUJVVE9SUyBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVO VEFMLAorICogU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElO Q0xVRElORywgQlVUIE5PVAorICogTElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YgU1VCU1RJVFVU RSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsCisgKiBEQVRBLCBPUiBQUk9GSVRTOyBP UiBCVVNJTkVTUyBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkKKyAqIFRI RU9SWSBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4gQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFks IE9SIFRPUlQKKyAqIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJTkcg SU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRQorICogT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBB RFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KKyAqLworCitXZWJJbnNw ZWN0b3IuRW1wdHlWaWV3ID0gZnVuY3Rpb24odGV4dCkKK3sKKyAgICBXZWJJbnNwZWN0b3IuVmll dy5jYWxsKHRoaXMpOworICAgIHRoaXMuX3RleHQgPSB0ZXh0OworfQorCitXZWJJbnNwZWN0b3Iu RW1wdHlWaWV3LnByb3RvdHlwZSA9IHsKKyAgICBzaG93OiBmdW5jdGlvbihwYXJlbnRFbGVtZW50 KQorICAgIHsKKyAgICAgICAgV2ViSW5zcGVjdG9yLlZpZXcucHJvdG90eXBlLnNob3cuY2FsbCh0 aGlzLCBwYXJlbnRFbGVtZW50KTsKKworICAgICAgICB0aGlzLmVsZW1lbnQuY2xhc3NOYW1lID0g InN0b3JhZ2UtZW1wdHktdmlldyI7CisgICAgICAgIHRoaXMuZWxlbWVudC50ZXh0Q29udGVudCA9 IHRoaXMuX3RleHQ7CisgICAgfSwKKyAgICAKKyAgICBzZXQgdGV4dCh0ZXh0KQorICAgIHsKKyAg ICAgICAgdGhpcy5fdGV4dCA9IHRleHQ7CisgICAgICAgIGlmICh0aGlzLnZpc2libGUpCisgICAg ICAgICAgICB0aGlzLmVsZW1lbnQudGV4dENvbnRlbnQgPSB0aGlzLl90ZXh0OworICAgIH0sCit9 CisKK1dlYkluc3BlY3Rvci5FbXB0eVZpZXcucHJvdG90eXBlLl9fcHJvdG9fXyA9IFdlYkluc3Bl Y3Rvci5WaWV3LnByb3RvdHlwZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvTmV0d29ya0l0ZW1WaWV3LmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9OZXR3b3JrSXRlbVZpZXcuanMKaW5kZXggYzI5ZGZlYTdiMjNkM2M0MTZjZDk0 MGMxMzA2MjFjZmUzOWMxMjIxYi4uMzE4NmQxNjMyNGM1ZDhlZTNmMWEyNWNjMDE1NzVkYmZiMDg4 YTllOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3 b3JrSXRlbVZpZXcuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9O ZXR3b3JrSXRlbVZpZXcuanMKQEAgLTM4LDcgKzM4LDcgQEAgV2ViSW5zcGVjdG9yLk5ldHdvcmtJ dGVtVmlldyA9IGZ1bmN0aW9uKHJlc291cmNlKQogICAgIHZhciBoZWFkZXJzVmlldyA9IG5ldyBX ZWJJbnNwZWN0b3IuUmVzb3VyY2VIZWFkZXJzVmlldyhyZXNvdXJjZSk7CiAgICAgdGhpcy5fdGFi YmVkUGFuZS5hcHBlbmRUYWIoImhlYWRlcnMiLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkhlYWRl cnMiKSwgaGVhZGVyc1ZpZXcpOwogCi0gICAgdmFyIHJlc3BvbnNlVmlldyA9IG5ldyBXZWJJbnNw ZWN0b3IuUmVzb3VyY2VTb3VyY2VGcmFtZShyZXNvdXJjZSk7CisgICAgdmFyIHJlc3BvbnNlVmll dyA9IG5ldyBXZWJJbnNwZWN0b3IuUmVzb3VyY2VSZXNwb25zZVZpZXcocmVzb3VyY2UpOwogICAg IHZhciBwcmV2aWV3VmlldyA9IG5ldyBXZWJJbnNwZWN0b3IuUmVzb3VyY2VQcmV2aWV3Vmlldyhy ZXNvdXJjZSwgcmVzcG9uc2VWaWV3KTsKIAogICAgIHRoaXMuX3RhYmJlZFBhbmUuYXBwZW5kVGFi KCJwcmV2aWV3IiwgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJQcmV2aWV3IiksIHByZXZpZXdWaWV3 KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3Vy Y2VDb29raWVzVmlldy5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVz b3VyY2VDb29raWVzVmlldy5qcwppbmRleCBjMTI2YTkzOTYyZTUwOTgwZjE1NWExOTUwMjY2NWFk YWQxMTFlMzY2Li5hNTBiZWE0NmMwNjkwOTkyMTI0MmNjYTkyZTkwMWFhOTFmMTk5MTFiIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlQ29va2ll c1ZpZXcuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJj ZUNvb2tpZXNWaWV3LmpzCkBAIC00MywxMSArNDMsOSBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VD b29raWVzVmlldy5wcm90b3R5cGUgPSB7CiAgICAgc2hvdzogZnVuY3Rpb24ocGFyZW50RWxlbWVu dCkKICAgICB7CiAgICAgICAgIGlmICghdGhpcy5fZ290Q29va2llcykgewotICAgICAgICAgICAg aWYgKCF0aGlzLl9lbXB0eU1zZ0VsZW1lbnQpIHsKLSAgICAgICAgICAgICAgICB0aGlzLl9lbXB0 eU1zZ0VsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKLSAgICAgICAgICAg ICAgICB0aGlzLl9lbXB0eU1zZ0VsZW1lbnQuY2xhc3NOYW1lID0gInN0b3JhZ2UtZW1wdHktdmll dyI7Ci0gICAgICAgICAgICAgICAgdGhpcy5fZW1wdHlNc2dFbGVtZW50LnRleHRDb250ZW50ID0g V2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJUaGlzIHJlcXVlc3QgaGFzIG5vIGNvb2tpZXMuIik7Ci0g ICAgICAgICAgICAgICAgdGhpcy5lbGVtZW50LmFwcGVuZENoaWxkKHRoaXMuX2VtcHR5TXNnRWxl bWVudCk7CisgICAgICAgICAgICBpZiAoIXRoaXMuX2VtcHR5VmlldykgeworICAgICAgICAgICAg ICAgIHRoaXMuX2VtcHR5VmlldyA9IG5ldyBXZWJJbnNwZWN0b3IuRW1wdHlWaWV3KFdlYkluc3Bl Y3Rvci5VSVN0cmluZygiVGhpcyByZXF1ZXN0IGhhcyBubyBjb29raWVzLiIpKTsKKyAgICAgICAg ICAgICAgICB0aGlzLl9lbXB0eVZpZXcuc2hvdyh0aGlzLmVsZW1lbnQpOwogICAgICAgICAgICAg fQogICAgICAgICAgICAgV2ViSW5zcGVjdG9yLlZpZXcucHJvdG90eXBlLnNob3cuY2FsbCh0aGlz LCBwYXJlbnRFbGVtZW50KTsKICAgICAgICAgICAgIHJldHVybjsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VQcmV2aWV3Vmlldy5qcyBiL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VQcmV2aWV3Vmlldy5qcwpp bmRleCBhMDUxOTA5Y2YxYzNhMTAxOTcyYTJiMGFmOTdiZTdmYTgwMzE5MWY4Li5iZjA3ODY1MjE5 Y2VlY2U5ZDI2OTg4NGFlYzRkNzBhOGJjZTc4NTA0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlUHJldmlld1ZpZXcuanMKKysrIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZVByZXZpZXdWaWV3LmpzCkBAIC0y OCwxMCArMjgsMTAgQEAKICAqIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBU SEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCiAgKi8KIAotV2ViSW5zcGVjdG9yLlJlc291 cmNlUHJldmlld1ZpZXcgPSBmdW5jdGlvbihyZXNvdXJjZSwgc291cmNlVmlldykKK1dlYkluc3Bl Y3Rvci5SZXNvdXJjZVByZXZpZXdWaWV3ID0gZnVuY3Rpb24ocmVzb3VyY2UsIHJlc3BvbnNlVmll dykKIHsKICAgICBXZWJJbnNwZWN0b3IuUmVzb3VyY2VWaWV3LmNhbGwodGhpcywgcmVzb3VyY2Up OwotICAgIHRoaXMuX3NvdXJjZVZpZXcgPSBzb3VyY2VWaWV3OworICAgIHRoaXMuX3Jlc3BvbnNl VmlldyA9IHJlc3BvbnNlVmlldzsKIH0KIAogV2ViSW5zcGVjdG9yLlJlc291cmNlUHJldmlld1Zp ZXcucHJvdG90eXBlID0gewpAQCAtNTQsOCArNTQsMjEgQEAgV2ViSW5zcGVjdG9yLlJlc291cmNl UHJldmlld1ZpZXcucHJvdG90eXBlID0gewogCiAgICAgICAgIGZ1bmN0aW9uIGNhbGxiYWNrKCkK ICAgICAgICAgewotICAgICAgICAgICAgdGhpcy5fY3JlYXRlSW5uZXJWaWV3KGNhbGxiYWNrKS5z aG93KHRoaXMuZWxlbWVudCk7CiAgICAgICAgICAgICB0aGlzLl9pbm5lclZpZXdTaG93UmVxdWVz dGVkID0gZmFsc2U7CisKKyAgICAgICAgICAgIGlmICghdGhpcy5yZXNvdXJjZS5jb250ZW50KSB7 CisgICAgICAgICAgICAgICAgaWYgKCF0aGlzLl9lbXB0eVZpZXcpIHsKKyAgICAgICAgICAgICAg ICAgICAgdGhpcy5fZW1wdHlWaWV3ID0gbmV3IFdlYkluc3BlY3Rvci5FbXB0eVZpZXcoV2ViSW5z cGVjdG9yLlVJU3RyaW5nKCJUaGlzIHJlcXVlc3QgaGFzIG5vIHByZXZpZXcgYXZhaWxhYmxlLiIp KTsKKyAgICAgICAgICAgICAgICAgICAgdGhpcy5fZW1wdHlWaWV3LnNob3codGhpcy5lbGVtZW50 KTsKKyAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAg ICAgIGlmICh0aGlzLl9lbXB0eVZpZXcpIHsKKyAgICAgICAgICAgICAgICAgICAgdGhpcy5fZW1w dHlWaWV3LmRldGFjaCgpOworICAgICAgICAgICAgICAgICAgICBkZWxldGUgdGhpcy5fZW1wdHlW aWV3OworICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICB2YXIgdmlldyA9IHRoaXMu X2NyZWF0ZUlubmVyVmlldyhjYWxsYmFjayk7CisgICAgICAgICAgICAgICAgdmlldy5zaG93KHRo aXMuZWxlbWVudCk7CisgICAgICAgICAgICB9CiAgICAgICAgIH0KIAogICAgICAgICB0aGlzLnJl c291cmNlLnJlcXVlc3RDb250ZW50KGNhbGxiYWNrLmJpbmQodGhpcykpOwpAQCAtNzIsOCArODUs OCBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VQcmV2aWV3Vmlldy5wcm90b3R5cGUgPSB7CiAgICAg ICAgICAgICAgICAgcmV0dXJuIG5ldyBXZWJJbnNwZWN0b3IuUmVzb3VyY2VKU09OVmlldyh0aGlz LnJlc291cmNlLCBwYXJzZWRKU09OKTsKICAgICAgICAgfQogCi0gICAgICAgIGlmIChXZWJJbnNw ZWN0b3IuUmVzb3VyY2VWaWV3Lmhhc1RleHRDb250ZW50KHRoaXMucmVzb3VyY2UpKQotICAgICAg ICAgICAgcmV0dXJuIHRoaXMuX3NvdXJjZVZpZXc7CisgICAgICAgIGlmICh0aGlzLl9yZXNwb25z ZVZpZXcuc291cmNlVmlldykKKyAgICAgICAgICAgIHJldHVybiB0aGlzLl9yZXNwb25zZVZpZXcu c291cmNlVmlldzsKIAogICAgICAgICByZXR1cm4gV2ViSW5zcGVjdG9yLlJlc291cmNlVmlldy5u b25Tb3VyY2VWaWV3Rm9yUmVzb3VyY2UodGhpcy5yZXNvdXJjZSk7CiAgICAgfSwKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VSZXNwb25zZVZp ZXcuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlUmVzcG9u c2VWaWV3LmpzCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAuLjA1ZmQ2NTdhZTUzYjhmY2YwMDg2ZThmMmNlZjgyMjM3MmY1 YjJmOWUKLS0tIC9kZXYvbnVsbAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL1Jlc291cmNlUmVzcG9uc2VWaWV3LmpzCkBAIC0wLDAgKzEsODMgQEAKKy8qCisgKiBDb3B5 cmlnaHQgKEMpIDIwMTEgR29vZ2xlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqCisgKiBS ZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9y IHdpdGhvdXQKKyAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRo ZSBmb2xsb3dpbmcgY29uZGl0aW9ucyBhcmUKKyAqIG1ldDoKKyAqCisgKiAgICAgKiBSZWRpc3Ry aWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAor ICogbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNj bGFpbWVyLgorICogICAgICogUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVw cm9kdWNlIHRoZSBhYm92ZQorICogY29weXJpZ2h0IG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRp dGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lcgorICogaW4gdGhlIGRvY3VtZW50YXRp b24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZQorICogZGlzdHJpYnV0 aW9uLgorICogICAgICogTmVpdGhlciB0aGUgbmFtZSBvZiBHb29nbGUgSW5jLiBub3IgdGhlIG5h bWVzIG9mIGl0cworICogY29udHJpYnV0b3JzIG1heSBiZSB1c2VkIHRvIGVuZG9yc2Ugb3IgcHJv bW90ZSBwcm9kdWN0cyBkZXJpdmVkIGZyb20KKyAqIHRoaXMgc29mdHdhcmUgd2l0aG91dCBzcGVj aWZpYyBwcmlvciB3cml0dGVuIHBlcm1pc3Npb24uCisgKgorICogVEhJUyBTT0ZUV0FSRSBJUyBQ Uk9WSURFRCBCWSBUSEUgQ09QWVJJR0hUIEhPTERFUlMgQU5EIENPTlRSSUJVVE9SUworICogIkFT IElTIiBBTkQgQU5ZIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJV VCBOT1QKKyAqIExJTUlURUQgVE8sIFRIRSBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRB QklMSVRZIEFORCBGSVRORVNTIEZPUgorICogQSBQQVJUSUNVTEFSIFBVUlBPU0UgQVJFIERJU0NM QUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIFRIRSBDT1BZUklHSFQKKyAqIE9XTkVSIE9SIENPTlRS SUJVVE9SUyBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFMLAor ICogU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElO RywgQlVUIE5PVAorICogTElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YgU1VCU1RJVFVURSBHT09E UyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsCisgKiBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJ TkVTUyBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkKKyAqIFRIRU9SWSBP RiBMSUFCSUxJVFksIFdIRVRIRVIgSU4gQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRP UlQKKyAqIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJTkcgSU4gQU5Z IFdBWSBPVVQgT0YgVEhFIFVTRQorICogT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VE IE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KKyAqLworCitXZWJJbnNwZWN0b3Iu UmVzb3VyY2VSZXNwb25zZVZpZXcgPSBmdW5jdGlvbihyZXNvdXJjZSkKK3sKKyAgICBXZWJJbnNw ZWN0b3IuUmVzb3VyY2VWaWV3LmNhbGwodGhpcywgcmVzb3VyY2UpOworICAgIAorfQorCitXZWJJ bnNwZWN0b3IuUmVzb3VyY2VSZXNwb25zZVZpZXcucHJvdG90eXBlID0geworICAgIGhhc0NvbnRl bnQ6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIHJldHVybiB0cnVlOworICAgIH0sCisKKyAg ICBnZXQgc291cmNlVmlldygpCisgICAgeworICAgICAgICBpZiAoIXRoaXMuX3NvdXJjZVZpZXcg JiYgV2ViSW5zcGVjdG9yLlJlc291cmNlVmlldy5oYXNUZXh0Q29udGVudCh0aGlzLnJlc291cmNl KSkKKyAgICAgICAgICAgIHRoaXMuX3NvdXJjZVZpZXcgPSBuZXcgV2ViSW5zcGVjdG9yLlJlc291 cmNlU291cmNlRnJhbWUodGhpcy5yZXNvdXJjZSk7CisgICAgICAgIHJldHVybiB0aGlzLl9zb3Vy Y2VWaWV3OworICAgIH0sCisKKyAgICBzaG93OiBmdW5jdGlvbihwYXJlbnRFbGVtZW50KQorICAg IHsKKyAgICAgICAgV2ViSW5zcGVjdG9yLlJlc291cmNlVmlldy5wcm90b3R5cGUuc2hvdy5jYWxs KHRoaXMsIHBhcmVudEVsZW1lbnQpOworICAgICAgICB0aGlzLl9lbnN1cmVJbm5lclZpZXdTaG93 bigpOworICAgIH0sCisKKyAgICBfZW5zdXJlSW5uZXJWaWV3U2hvd246IGZ1bmN0aW9uKCkKKyAg ICB7CisgICAgICAgIGlmICh0aGlzLl9pbm5lclZpZXdTaG93UmVxdWVzdGVkKQorICAgICAgICAg ICAgcmV0dXJuOworICAgICAgICB0aGlzLl9pbm5lclZpZXdTaG93UmVxdWVzdGVkID0gdHJ1ZTsK KworICAgICAgICBmdW5jdGlvbiBjYWxsYmFjaygpCisgICAgICAgIHsKKyAgICAgICAgICAgIHRo aXMuX2lubmVyVmlld1Nob3dSZXF1ZXN0ZWQgPSBmYWxzZTsKKyAgICAgICAgICAgIGlmICghdGhp cy5yZXNvdXJjZS5jb250ZW50IHx8ICF0aGlzLnNvdXJjZVZpZXcpIHsKKyAgICAgICAgICAgICAg ICBpZiAoIXRoaXMuX2VtcHR5VmlldykgeworICAgICAgICAgICAgICAgICAgICB0aGlzLl9lbXB0 eVZpZXcgPSBuZXcgV2ViSW5zcGVjdG9yLkVtcHR5VmlldyhXZWJJbnNwZWN0b3IuVUlTdHJpbmco IlRoaXMgcmVxdWVzdCBoYXMgbm8gcmVzcG9uc2UgZGF0YSBhdmFpbGFibGUuIikpOworICAgICAg ICAgICAgICAgICAgICB0aGlzLl9lbXB0eVZpZXcuc2hvdyh0aGlzLmVsZW1lbnQpOworICAgICAg ICAgICAgICAgIH0KKyAgICAgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICAgICAgaWYgKHRo aXMuX2VtcHR5VmlldykgeworICAgICAgICAgICAgICAgICAgICB0aGlzLl9lbXB0eVZpZXcuZGV0 YWNoKCk7CisgICAgICAgICAgICAgICAgICAgIGRlbGV0ZSB0aGlzLl9lbXB0eVZpZXc7CisgICAg ICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgIHRoaXMuc291cmNlVmlldy5zaG93KHRoaXMu ZWxlbWVudCk7CisgICAgICAgICAgICB9CisgICAgICAgIH0KKworICAgICAgICB0aGlzLnJlc291 cmNlLnJlcXVlc3RDb250ZW50KGNhbGxiYWNrLmJpbmQodGhpcykpOworICAgIH0sCit9CisKK1dl Ykluc3BlY3Rvci5SZXNvdXJjZVJlc3BvbnNlVmlldy5wcm90b3R5cGUuX19wcm90b19fID0gV2Vi SW5zcGVjdG9yLlJlc291cmNlVmlldy5wcm90b3R5cGU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlVGltaW5nVmlldy5qcyBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VUaW1pbmdWaWV3LmpzCmluZGV4IDA0 ZjIyZjg0MGRiNWM2MWYyZTFjNzZhMTg0ODgxMmJlNGJlMGU1MjUuLmY4NWM1ODMxMDJkMzJhNjMw MjI3ODUxOTZkMDc3OWViOWJkOGQ0MzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvUmVzb3VyY2VUaW1pbmdWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VUaW1pbmdWaWV3LmpzCkBAIC00MiwxOCArNDIs MTggQEAgV2ViSW5zcGVjdG9yLlJlc291cmNlVGltaW5nVmlldy5wcm90b3R5cGUgPSB7CiAgICAg c2hvdzogZnVuY3Rpb24ocGFyZW50RWxlbWVudCkKICAgICB7CiAgICAgICAgIGlmICghdGhpcy5f cmVzb3VyY2UudGltaW5nKSB7Ci0gICAgICAgICAgICBpZiAoIXRoaXMuX2VtcHR5TXNnRWxlbWVu dCkgewotICAgICAgICAgICAgICAgIHRoaXMuX2VtcHR5TXNnRWxlbWVudCA9IGRvY3VtZW50LmNy ZWF0ZUVsZW1lbnQoImRpdiIpOwotICAgICAgICAgICAgICAgIHRoaXMuX2VtcHR5TXNnRWxlbWVu dC5jbGFzc05hbWUgPSAic3RvcmFnZS1lbXB0eS12aWV3IjsKLSAgICAgICAgICAgICAgICB0aGlz Ll9lbXB0eU1zZ0VsZW1lbnQudGV4dENvbnRlbnQgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlRo aXMgcmVxdWVzdCBoYXMgbm8gZGV0YWlsZWQgdGltaW5nIGluZm8uIik7Ci0gICAgICAgICAgICAg ICAgdGhpcy5lbGVtZW50LmFwcGVuZENoaWxkKHRoaXMuX2VtcHR5TXNnRWxlbWVudCk7CisgICAg ICAgICAgICBpZiAoIXRoaXMuX2VtcHR5VmlldykgeworICAgICAgICAgICAgICAgIHRoaXMuX2Vt cHR5VmlldyA9IG5ldyBXZWJJbnNwZWN0b3IuRW1wdHlWaWV3KFdlYkluc3BlY3Rvci5VSVN0cmlu ZygiVGhpcyByZXF1ZXN0IGhhcyBubyBkZXRhaWxlZCB0aW1pbmcgaW5mby4iKSk7CisgICAgICAg ICAgICAgICAgdGhpcy5fZW1wdHlWaWV3LnNob3codGhpcy5lbGVtZW50KTsKICAgICAgICAgICAg IH0KICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5WaWV3LnByb3RvdHlwZS5zaG93LmNhbGwodGhp cywgcGFyZW50RWxlbWVudCk7CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KIAotICAg ICAgICBpZiAodGhpcy5fZW1wdHlNc2dFbGVtZW50KQotICAgICAgICAgICAgdGhpcy5fZW1wdHlN c2dFbGVtZW50LnBhcmVudEVsZW1lbnQucmVtb3ZlQ2hpbGQodGhpcy5fZW1wdHlNc2dFbGVtZW50 KTsKKyAgICAgICAgaWYgKHRoaXMuX2VtcHR5VmlldykgeworICAgICAgICAgICAgdGhpcy5fZW1w dHlWaWV3LmRldGFjaCgpOworICAgICAgICAgICAgZGVsZXRlIHRoaXMuX2VtcHR5VmlldzsKKyAg ICAgICAgfQogCiAgICAgICAgIHRoaXMuX3JlZnJlc2goKTsKICAgICAgICAgV2ViSW5zcGVjdG9y LlZpZXcucHJvdG90eXBlLnNob3cuY2FsbCh0aGlzLCBwYXJlbnRFbGVtZW50KTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VzUGFuZWwuanMg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlc1BhbmVsLmpzCmlu ZGV4IDhhZGM5ZDllOWRiOTQ2NTM5Y2JiZjBiODE1NmVlMTM4YzkwOTYwOTIuLjlhYTkyNzRiMzk0 M2JhMjViMTU1YjdkZWE1MjYwZDJjZjEwNTMxMmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VzUGFuZWwuanMKKysrIGIvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZXNQYW5lbC5qcwpAQCAtMTYxMSwxNyArMTYx MSwxNSBAQCBXZWJJbnNwZWN0b3IuU3RvcmFnZUNhdGVnb3J5VmlldyA9IGZ1bmN0aW9uKCkKICAg ICBXZWJJbnNwZWN0b3IuVmlldy5jYWxsKHRoaXMpOwogCiAgICAgdGhpcy5lbGVtZW50LmFkZFN0 eWxlQ2xhc3MoInN0b3JhZ2UtdmlldyIpOwotCi0gICAgdGhpcy5fZW1wdHlNc2dFbGVtZW50ID0g ZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7Ci0gICAgdGhpcy5fZW1wdHlNc2dFbGVtZW50 LmNsYXNzTmFtZSA9ICJzdG9yYWdlLWVtcHR5LXZpZXciOwotICAgIHRoaXMuZWxlbWVudC5hcHBl bmRDaGlsZCh0aGlzLl9lbXB0eU1zZ0VsZW1lbnQpOworICAgIHRoaXMuX2VtcHR5VmlldyA9IG5l dyBXZWJJbnNwZWN0b3IuRW1wdHlWaWV3KCk7CisgICAgdGhpcy5fZW1wdHlWaWV3LnNob3codGhp cy5lbGVtZW50KTsKIH0KIAogV2ViSW5zcGVjdG9yLlN0b3JhZ2VDYXRlZ29yeVZpZXcucHJvdG90 eXBlID0gewogICAgIHNldFRleHQ6IGZ1bmN0aW9uKHRleHQpCiAgICAgewotICAgICAgICB0aGlz Ll9lbXB0eU1zZ0VsZW1lbnQudGV4dENvbnRlbnQgPSB0ZXh0OwotICAgIH0KKyAgICAgICAgdGhp cy5fZW1wdHlWaWV3LnRleHQgPSB0ZXh0OyAgICAKKyAgICB9ICAgICAgICAKIH0KIAogV2ViSW5z cGVjdG9yLlN0b3JhZ2VDYXRlZ29yeVZpZXcucHJvdG90eXBlLl9fcHJvdG9fXyA9IFdlYkluc3Bl Y3Rvci5WaWV3LnByb3RvdHlwZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvV2ViS2l0LnFyYyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvV2ViS2l0LnFyYwppbmRleCA5ODE2ZGMwMzVhMGE1OTZlOWE4OTBlODdmZDYyZjBiMDQxMTQ0 NDQwLi40OTE3ZGQ2ODg1OGRiMjczNjlkMGI3OTllNGZiYWFkODUxYjg3NTRlIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1dlYktpdC5xcmMKKysrIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9XZWJLaXQucXJjCkBAIC00MCw2ICs0MCw3 IEBACiAgICAgPGZpbGU+RHJhd2VyLmpzPC9maWxlPgogICAgIDxmaWxlPkVsZW1lbnRzUGFuZWwu anM8L2ZpbGU+CiAgICAgPGZpbGU+RWxlbWVudHNUcmVlT3V0bGluZS5qczwvZmlsZT4KKyAgICA8 ZmlsZT5FbXB0eVZpZXcuanM8L2ZpbGU+CiAgICAgPGZpbGU+RXZlbnRMaXN0ZW5lcnNTaWRlYmFy UGFuZS5qczwvZmlsZT4KICAgICA8ZmlsZT5FeHRlbnNpb25BUEkuanM8L2ZpbGU+CiAgICAgPGZp bGU+RXh0ZW5zaW9uQXVkaXRDYXRlZ29yeS5qczwvZmlsZT4KQEAgLTg2LDYgKzg3LDcgQEAKICAg ICA8ZmlsZT5SZXNvdXJjZUpTT05WaWV3LmpzPC9maWxlPgogICAgIDxmaWxlPlJlc291cmNlSFRN TFZpZXcuanM8L2ZpbGU+CiAgICAgPGZpbGU+UmVzb3VyY2VIZWFkZXJzVmlldy5qczwvZmlsZT4K KyAgICA8ZmlsZT5SZXNvdXJjZVJlc3BvbnNlVmlldy5qczwvZmlsZT4KICAgICA8ZmlsZT5SZXNv dXJjZVRpbWluZ1ZpZXcuanM8L2ZpbGU+CiAgICAgPGZpbGU+UmVzb3VyY2VUcmVlTW9kZWwuanM8 L2ZpbGU+CiAgICAgPGZpbGU+UmVzb3VyY2VWaWV3LmpzPC9maWxlPgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuaHRtbCBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmh0bWwKaW5kZXggZDdlYmFlMTQx MTllOTE1NTdkMmM2ZjY4ZDZjOWE3NDU3YjU0ZDhlMC4uMzhjNDI5OTA1MTNlY2M2NTNkMmU4MzMy NzM1ZDM2ODJjYzg0NTUwZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9pbnNwZWN0b3IuaHRtbAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL2luc3BlY3Rvci5odG1sCkBAIC0xMjAsMTEgKzEyMCwxMyBAQCBUSElTIFNPRlRXQVJF LCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgogICAg IDxzY3JpcHQgdHlwZT0idGV4dC9qYXZhc2NyaXB0IiBzcmM9IkF1ZGl0UnVsZXMuanMiPjwvc2Ny aXB0PgogICAgIDxzY3JpcHQgdHlwZT0idGV4dC9qYXZhc2NyaXB0IiBzcmM9IkF1ZGl0Q2F0ZWdv cmllcy5qcyI+PC9zY3JpcHQ+CiAgICAgPHNjcmlwdCB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQiIHNy Yz0iQXVkaXRGb3JtYXR0ZXJzLmpzIj48L3NjcmlwdD4KKyAgICA8c2NyaXB0IHR5cGU9InRleHQv amF2YXNjcmlwdCIgc3JjPSJFbXB0eVZpZXcuanMiPjwvc2NyaXB0PgogICAgIDxzY3JpcHQgdHlw ZT0idGV4dC9qYXZhc2NyaXB0IiBzcmM9IlJlc291cmNlSGVhZGVyc1ZpZXcuanMiPjwvc2NyaXB0 PgogICAgIDxzY3JpcHQgdHlwZT0idGV4dC9qYXZhc2NyaXB0IiBzcmM9IlJlc291cmNlQ29va2ll c1ZpZXcuanMiPjwvc2NyaXB0PgogICAgIDxzY3JpcHQgdHlwZT0idGV4dC9qYXZhc2NyaXB0IiBz cmM9IlJlc291cmNlVGltaW5nVmlldy5qcyI+PC9zY3JpcHQ+CiAgICAgPHNjcmlwdCB0eXBlPSJ0 ZXh0L2phdmFzY3JpcHQiIHNyYz0iUmVzb3VyY2VKU09OVmlldy5qcyI+PC9zY3JpcHQ+CiAgICAg PHNjcmlwdCB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQiIHNyYz0iUmVzb3VyY2VIVE1MVmlldy5qcyI+ PC9zY3JpcHQ+CisgICAgPHNjcmlwdCB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQiIHNyYz0iUmVzb3Vy Y2VSZXNwb25zZVZpZXcuanMiPjwvc2NyaXB0PgogICAgIDxzY3JpcHQgdHlwZT0idGV4dC9qYXZh c2NyaXB0IiBzcmM9IlJlc291cmNlUHJldmlld1ZpZXcuanMiPjwvc2NyaXB0PgogICAgIDxzY3Jp cHQgdHlwZT0idGV4dC9qYXZhc2NyaXB0IiBzcmM9Ik5ldHdvcmtJdGVtVmlldy5qcyI+PC9zY3Jp cHQ+CiAgICAgPHNjcmlwdCB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQiIHNyYz0iU2NyaXB0Rm9ybWF0 dGVyLmpzIj48L3NjcmlwdD4K 97969 2011-06-21 05:26:44 -0700 2011-06-23 08:56:19 -0700 Patch with fixes bug-63007-20110621162642.patch text/plain 26899 vsevik U3VidmVyc2lvbiBSZXZpc2lvbjogODkzNDYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBlYWE4Nzc5Yzg2YmY2NTdj MTk4M2FhNWFhM2NiNGViZGY3YWMxZWM1Li4yMzc1YWVmNmVkMjc4OWFkMGViMzBiMDBjMzllY2Fm NWJjYzU1MjJkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNTIgQEAKKzIwMTEtMDYtMjEgIFZzZXZv bG9kIFZsYXNvdiAgPHZzZXZpa0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogU2hvdyAibm8gY29udGVu dCIgbWVzc2FnZSBpbiBuZXR3b3JrIHBhbmVsIHdoZW4gcmVzb3VyY2UgZG9lcyBub3QgaGF2ZSBj b250ZW50IGF2YWlsYWJsZS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTYzMDA3CisKKyAgICAgICAgKiBFbmdsaXNoLmxwcm9qL2xvY2FsaXplZFN0cmlu Z3MuanM6CisgICAgICAgICogV2ViQ29yZS5neXBpOgorICAgICAgICAqIFdlYkNvcmUudmNwcm9q L1dlYkNvcmUudmNwcm9qOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvQXBwbGljYXRp b25DYWNoZUl0ZW1zVmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5BcHBsaWNhdGlvbkNh Y2hlSXRlbXNWaWV3KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5BcHBsaWNhdGlvbkNhY2hlSXRl bXNWaWV3LnByb3RvdHlwZS5fdXBkYXRlQ2FsbGJhY2spOgorICAgICAgICAqIGluc3BlY3Rvci9m cm9udC1lbmQvQ29va2llSXRlbXNWaWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNvb2tp ZUl0ZW1zVmlldyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ29va2llSXRlbXNWaWV3LnByb3Rv dHlwZS5fdXBkYXRlV2l0aENvb2tpZXMpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQv RGF0YWJhc2VUYWJsZVZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGF0YWJhc2VUYWJs ZVZpZXcucHJvdG90eXBlLl9xdWVyeUZpbmlzaGVkKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJv bnQtZW5kL0VtcHR5Vmlldy5qczogQWRkZWQuCisgICAgICAgIChXZWJJbnNwZWN0b3IuRW1wdHlW aWV3KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5FbXB0eVZpZXcucHJvdG90eXBlLnNob3cpOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLkVtcHR5Vmlldy5wcm90b3R5cGUuc2V0IHRleHQpOgorICAg ICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya0l0ZW1WaWV3LmpzOgorICAgICAgICAo V2ViSW5zcGVjdG9yLk5ldHdvcmtJdGVtVmlldyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVz b3VyY2VDb250ZW50Vmlldyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2VDb250ZW50 Vmlldy5wcm90b3R5cGUuaGFzQ29udGVudCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3Vy Y2VDb250ZW50Vmlldy5wcm90b3R5cGUuZ2V0IHNvdXJjZVZpZXcpOgorICAgICAgICAoV2ViSW5z cGVjdG9yLlJlc291cmNlQ29udGVudFZpZXcucHJvdG90eXBlLnNob3cpOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLlJlc291cmNlQ29udGVudFZpZXcucHJvdG90eXBlLl9lbnN1cmVJbm5lclZpZXdT aG93bi5jYWxsYmFjayk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2VDb250ZW50Vmll dy5wcm90b3R5cGUuX2Vuc3VyZUlubmVyVmlld1Nob3duKToKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5SZXNvdXJjZUNvbnRlbnRWaWV3LnByb3RvdHlwZS5jb250ZW50TG9hZGVkKToKKyAgICAgICAg KiBpbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlQ29va2llc1ZpZXcuanM6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuUmVzb3VyY2VDb29raWVzVmlldy5wcm90b3R5cGUuc2hvdyk6CisgICAgICAg ICogaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZVByZXZpZXdWaWV3LmpzOgorICAgICAgICAo V2ViSW5zcGVjdG9yLlJlc291cmNlUHJldmlld1ZpZXcpOgorICAgICAgICAoV2ViSW5zcGVjdG9y LlJlc291cmNlUHJldmlld1ZpZXcucHJvdG90eXBlLmNvbnRlbnRMb2FkZWQpOgorICAgICAgICAo V2ViSW5zcGVjdG9yLlJlc291cmNlUHJldmlld1ZpZXcucHJvdG90eXBlLl9jcmVhdGVJbm5lclZp ZXcpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VSZXNwb25zZVZpZXcu anM6IEFkZGVkLgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlUmVzcG9uc2VWaWV3KToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZVJlc3BvbnNlVmlldy5wcm90b3R5cGUuZ2V0 IHNvdXJjZVZpZXcpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlUmVzcG9uc2VWaWV3 LnByb3RvdHlwZS5jb250ZW50TG9hZGVkKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5k L1Jlc291cmNlVGltaW5nVmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZVRp bWluZ1ZpZXcucHJvdG90eXBlLnNob3cpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQv UmVzb3VyY2VzUGFuZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU3RvcmFnZUNhdGVnb3J5 Vmlldyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU3RvcmFnZUNhdGVnb3J5Vmlldy5wcm90b3R5 cGUuc2V0VGV4dCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9XZWJLaXQucXJjOgor ICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmh0bWw6CisKIDIwMTEtMDYt MTcgIFBhdmVsIFBvZGl2aWxvdiAgPHBvZGl2aWxvdkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAg UmV2aWV3ZWQgYnkgUGF2ZWwgRmVsZG1hbi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0Vu Z2xpc2gubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcyBiL1NvdXJjZS9XZWJDb3JlL0VuZ2xpc2gu bHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcwppbmRleCAwZDEzNjMyYWE5N2E3MzZmNTRiZTQyMDQ2 MTcwNDdiNWNhZjlmY2IzLi4yZmIwZDhlZGVkMTFkZDM5MDc3NTkyMTE5ZjJkZjliYjEzM2E3ZGNk IDEwMDY0NApHSVQgYmluYXJ5IHBhdGNoCmRlbHRhIDEyNgp6Y21leHpoSXojVzxfKHRAT3BjJD1G PEpNbDlCJTxiNWtvM044QUIkSkVUNWNec3l1bzJlNkdweTNvdkNRQyZ3eWkKbE9wWFEwMGAqTlVI V2d3fFZNdF5zVk1zKlFnKGVRc1EtNndNXlVWZGJUPiU9PEVHaHMxCgpkZWx0YSAxOAphY21aMitm JShmQjxfKHRAT2dfSnVaRkJGVSp7JVImVUo1UyYKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9XZWJDb3JlLmd5cGkgYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmd5cGkKaW5kZXggYWVmZTdj NjkwODZmN2YwMmVkOGVjOTFhMmE1ZTZmMDViYTY0ZWU0ZC4uNGZlZWRlZmNlZmVjMTZjMWYxODIw NTdmOWJkOTVmOGJjOTE2Y2IwZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5n eXBpCisrKyBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZ3lwaQpAQCAtNjI1NCw2ICs2MjU0LDcg QEAKICAgICAgICAgICAgICdpbnNwZWN0b3IvZnJvbnQtZW5kL0RyYXdlci5qcycsCiAgICAgICAg ICAgICAnaW5zcGVjdG9yL2Zyb250LWVuZC9FbGVtZW50c1BhbmVsLmpzJywKICAgICAgICAgICAg ICdpbnNwZWN0b3IvZnJvbnQtZW5kL0VsZW1lbnRzVHJlZU91dGxpbmUuanMnLAorICAgICAgICAg ICAgJ2luc3BlY3Rvci9mcm9udC1lbmQvRW1wdHlWaWV3LmpzJywKICAgICAgICAgICAgICdpbnNw ZWN0b3IvZnJvbnQtZW5kL0V2ZW50TGlzdGVuZXJzU2lkZWJhclBhbmUuanMnLAogICAgICAgICAg ICAgJ2luc3BlY3Rvci9mcm9udC1lbmQvRXh0ZW5zaW9uQVBJLmpzJywKICAgICAgICAgICAgICdp bnNwZWN0b3IvZnJvbnQtZW5kL0V4dGVuc2lvbkF1ZGl0Q2F0ZWdvcnkuanMnLApAQCAtNjMwMCw2 ICs2MzAxLDcgQEAKICAgICAgICAgICAgICdpbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlSGVh ZGVyc1ZpZXcuanMnLAogICAgICAgICAgICAgJ2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VK U09OVmlldy5qcycsCiAgICAgICAgICAgICAnaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZUhU TUxWaWV3LmpzJywKKyAgICAgICAgICAgICdpbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlUmVz cG9uc2VWaWV3LmpzJywKICAgICAgICAgICAgICdpbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNl VGltaW5nVmlldy5qcycsCiAgICAgICAgICAgICAnaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJj ZVRyZWVNb2RlbC5qcycsCiAgICAgICAgICAgICAnaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJj ZVZpZXcuanMnLApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS52Y3Byb2ovV2Vi Q29yZS52Y3Byb2ogYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnZjcHJvai9XZWJDb3JlLnZjcHJv agppbmRleCBjNjIwMWRmYzJjYWJkNDE3NjYzZDMxNzYyNmM4ODgzZmQxNWY1MWIxLi4zMGMzM2I1 MTc5NDJlN2YzN2ZlM2Y1YWU3OTBmMTU0MjgzYzMzZmE4IDEwMDc1NQotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9XZWJDb3JlLnZjcHJvai9XZWJDb3JlLnZjcHJvagorKysgYi9Tb3VyY2UvV2ViQ29yZS9X ZWJDb3JlLnZjcHJvai9XZWJDb3JlLnZjcHJvagpAQCAtNjc5NjksNiArNjc5NjksMTAgQEAKIAkJ CQkJPgogCQkJCTwvRmlsZT4KIAkJCQk8RmlsZQorCQkJCQlSZWxhdGl2ZVBhdGg9Ii4uXGluc3Bl Y3Rvclxmcm9udC1lbmRcRW1wdHlWaWV3LmpzIgorCQkJCQk+CisJCQkJPC9GaWxlPgorCQkJCTxG aWxlCiAJCQkJCVJlbGF0aXZlUGF0aD0iLi5caW5zcGVjdG9yXGZyb250LWVuZFxFdmVudExpc3Rl bmVyc1NpZGViYXJQYW5lLmpzIgogCQkJCQk+CiAJCQkJPC9GaWxlPgpAQCAtNjgyMDEsNiArNjgy MDUsMTAgQEAKIAkJCQkJPgogCQkJCTwvRmlsZT4KIAkJCQk8RmlsZQorCQkJCQlSZWxhdGl2ZVBh dGg9Ii4uXGluc3BlY3Rvclxmcm9udC1lbmRcUmVzb3VyY2VSZXNwb25zZVZpZXcuanMiCisJCQkJ CT4KKwkJCQk8L0ZpbGU+CisJCQkJPEZpbGUKIAkJCQkJUmVsYXRpdmVQYXRoPSIuLlxpbnNwZWN0 b3JcZnJvbnQtZW5kXFJlc291cmNlVGltaW5nVmlldy5qcyIKIAkJCQkJPgogCQkJCTwvRmlsZT4K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQXBwbGljYXRp b25DYWNoZUl0ZW1zVmlldy5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv QXBwbGljYXRpb25DYWNoZUl0ZW1zVmlldy5qcwppbmRleCA2ZTAxN2MwM2NjYzQyNWFiNzJhMjRj YzVhN2QxMWVmYWNhZTA4NGNkLi45ZDFiNmE0MmI0YTllMTljMzY2MzYxNTRkZTA5ZmI2MzRlMDEz MWYwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0FwcGxp Y2F0aW9uQ2FjaGVJdGVtc1ZpZXcuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9BcHBsaWNhdGlvbkNhY2hlSXRlbXNWaWV3LmpzCkBAIC02MSwxMCArNjEsOCBAQCBX ZWJJbnNwZWN0b3IuQXBwbGljYXRpb25DYWNoZUl0ZW1zVmlldyA9IGZ1bmN0aW9uKHRyZWVFbGVt ZW50LCBhcHBjYWNoZURvbWFpbikKICAgICB0aGlzLl90cmVlRWxlbWVudCA9IHRyZWVFbGVtZW50 OwogICAgIHRoaXMuX2FwcGNhY2hlRG9tYWluID0gYXBwY2FjaGVEb21haW47CiAKLSAgICB0aGlz Ll9lbXB0eU1zZ0VsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKLSAgICB0 aGlzLl9lbXB0eU1zZ0VsZW1lbnQuY2xhc3NOYW1lID0gInN0b3JhZ2UtZW1wdHktdmlldyI7Ci0g ICAgdGhpcy5fZW1wdHlNc2dFbGVtZW50LnRleHRDb250ZW50ID0gV2ViSW5zcGVjdG9yLlVJU3Ry aW5nKCJObyBBcHBsaWNhdGlvbiBDYWNoZSBpbmZvcm1hdGlvbiBhdmFpbGFibGUuIik7Ci0gICAg dGhpcy5lbGVtZW50LmFwcGVuZENoaWxkKHRoaXMuX2VtcHR5TXNnRWxlbWVudCk7CisgICAgdGhp cy5fZW1wdHlWaWV3ID0gbmV3IFdlYkluc3BlY3Rvci5FbXB0eVZpZXcoV2ViSW5zcGVjdG9yLlVJ U3RyaW5nKCJObyBBcHBsaWNhdGlvbiBDYWNoZSBpbmZvcm1hdGlvbiBhdmFpbGFibGUuIikpOwor ICAgIHRoaXMuX2VtcHR5Vmlldy5zaG93KHRoaXMuZWxlbWVudCk7CiAKICAgICB0aGlzLnVwZGF0 ZVN0YXR1cyhhcHBsaWNhdGlvbkNhY2hlLlVOQ0FDSEVEKTsKIApAQCAtMTY0LDcgKzE2Miw3IEBA IFdlYkluc3BlY3Rvci5BcHBsaWNhdGlvbkNhY2hlSXRlbXNWaWV3LnByb3RvdHlwZSA9IHsKICAg ICAgICAgdmFyIGxhc3RQYXRoQ29tcG9uZW50ID0gYXBwbGljYXRpb25DYWNoZXMubGFzdFBhdGhD b21wb25lbnQ7CiAKICAgICAgICAgaWYgKCF0aGlzLl9tYW5pZmVzdCkgewotICAgICAgICAgICAg dGhpcy5fZW1wdHlNc2dFbGVtZW50LnJlbW92ZVN0eWxlQ2xhc3MoImhpZGRlbiIpOworICAgICAg ICAgICAgdGhpcy5fZW1wdHlWaWV3LnNob3codGhpcy5lbGVtZW50KTsKICAgICAgICAgICAgIHRo aXMuZGVsZXRlQnV0dG9uLnZpc2libGUgPSBmYWxzZTsKICAgICAgICAgICAgIGlmICh0aGlzLl9k YXRhR3JpZCkKICAgICAgICAgICAgICAgICB0aGlzLl9kYXRhR3JpZC5lbGVtZW50LmFkZFN0eWxl Q2xhc3MoImhpZGRlbiIpOwpAQCAtMTc3LDcgKzE3NSw3IEBAIFdlYkluc3BlY3Rvci5BcHBsaWNh dGlvbkNhY2hlSXRlbXNWaWV3LnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy5fcG9wdWxhdGVE YXRhR3JpZCgpOwogICAgICAgICB0aGlzLl9kYXRhR3JpZC5hdXRvU2l6ZUNvbHVtbnMoMjAsIDgw KTsKICAgICAgICAgdGhpcy5fZGF0YUdyaWQuZWxlbWVudC5yZW1vdmVTdHlsZUNsYXNzKCJoaWRk ZW4iKTsKLSAgICAgICAgdGhpcy5fZW1wdHlNc2dFbGVtZW50LmFkZFN0eWxlQ2xhc3MoImhpZGRl biIpOworICAgICAgICB0aGlzLl9lbXB0eVZpZXcuaGlkZSgpOwogICAgICAgICB0aGlzLmRlbGV0 ZUJ1dHRvbi52aXNpYmxlID0gdHJ1ZTsKIAogICAgICAgICB2YXIgdG90YWxTaXplU3RyaW5nID0g TnVtYmVyLmJ5dGVzVG9TdHJpbmcodGhpcy5fc2l6ZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0Nvb2tpZUl0ZW1zVmlldy5qcyBiL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29va2llSXRlbXNWaWV3LmpzCmluZGV4IDZiZjMzMjZm Njg3NWRiMWNiYmI0ZWRjYzdkZjQyZDZkYWM0M2ZiOWMuLmQ2ZTYyZGQ3ZjBjZjNhNThjZjQ0MzFj MjY0ZGIxNjY3ZWU1MjRiMDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvQ29va2llSXRlbXNWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvQ29va2llSXRlbXNWaWV3LmpzCkBAIC00MywxMCArNDMsOCBAQCBXZWJJbnNw ZWN0b3IuQ29va2llSXRlbXNWaWV3ID0gZnVuY3Rpb24odHJlZUVsZW1lbnQsIGNvb2tpZURvbWFp bikKICAgICB0aGlzLl90cmVlRWxlbWVudCA9IHRyZWVFbGVtZW50OwogICAgIHRoaXMuX2Nvb2tp ZURvbWFpbiA9IGNvb2tpZURvbWFpbjsKIAotICAgIHRoaXMuX2VtcHR5TXNnRWxlbWVudCA9IGRv Y3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOwotICAgIHRoaXMuX2VtcHR5TXNnRWxlbWVudC5j bGFzc05hbWUgPSAic3RvcmFnZS1lbXB0eS12aWV3IjsKLSAgICB0aGlzLl9lbXB0eU1zZ0VsZW1l bnQudGV4dENvbnRlbnQgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlRoaXMgc2l0ZSBoYXMgbm8g Y29va2llcy4iKTsKLSAgICB0aGlzLmVsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5fZW1wdHlNc2dF bGVtZW50KTsKKyAgICB0aGlzLl9lbXB0eVZpZXcgPSBuZXcgV2ViSW5zcGVjdG9yLkVtcHR5Vmll dyhXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlRoaXMgc2l0ZSBoYXMgbm8gY29va2llcy4iKSk7Cisg ICAgdGhpcy5fZW1wdHlWaWV3LnNob3codGhpcy5lbGVtZW50KTsKIH0KIAogV2ViSW5zcGVjdG9y LkNvb2tpZUl0ZW1zVmlldy5wcm90b3R5cGUgPSB7CkBAIC04NCw3ICs4Miw3IEBAIFdlYkluc3Bl Y3Rvci5Db29raWVJdGVtc1ZpZXcucHJvdG90eXBlID0gewogCiAgICAgICAgIGlmICghdGhpcy5f Y29va2llcy5sZW5ndGgpIHsKICAgICAgICAgICAgIC8vIE5vdGhpbmcgdG8gc2hvdy4KLSAgICAg ICAgICAgIHRoaXMuX2VtcHR5TXNnRWxlbWVudC5yZW1vdmVTdHlsZUNsYXNzKCJoaWRkZW4iKTsK KyAgICAgICAgICAgIHRoaXMuX2VtcHR5Vmlldy5zaG93KHRoaXMuZWxlbWVudCk7CiAgICAgICAg ICAgICB0aGlzLl9kZWxldGVCdXR0b24udmlzaWJsZSA9IGZhbHNlOwogICAgICAgICAgICAgaWYg KHRoaXMuX2Nvb2tpZXNUYWJsZSkKICAgICAgICAgICAgICAgICB0aGlzLl9jb29raWVzVGFibGUu ZWxlbWVudC5hZGRTdHlsZUNsYXNzKCJoaWRkZW4iKTsKQEAgLTk4LDcgKzk2LDcgQEAgV2ViSW5z cGVjdG9yLkNvb2tpZUl0ZW1zVmlldy5wcm90b3R5cGUgPSB7CiAKICAgICAgICAgdGhpcy5fY29v a2llc1RhYmxlLnNldENvb2tpZXModGhpcy5fY29va2llcyk7CiAgICAgICAgIHRoaXMuX2Nvb2tp ZXNUYWJsZS5lbGVtZW50LnJlbW92ZVN0eWxlQ2xhc3MoImhpZGRlbiIpOwotICAgICAgICB0aGlz Ll9lbXB0eU1zZ0VsZW1lbnQuYWRkU3R5bGVDbGFzcygiaGlkZGVuIik7CisgICAgICAgIHRoaXMu X2VtcHR5Vmlldy5oaWRlKCk7CiAgICAgICAgIGlmIChpc0FkdmFuY2VkKSB7CiAgICAgICAgICAg ICB0aGlzLl90cmVlRWxlbWVudC5zdWJ0aXRsZSA9IFN0cmluZy5zcHJpbnRmKFdlYkluc3BlY3Rv ci5VSVN0cmluZygiJWQgY29va2llcyAoJXMpIiksIHRoaXMuX2Nvb2tpZXMubGVuZ3RoLAogICAg ICAgICAgICAgICAgIE51bWJlci5ieXRlc1RvU3RyaW5nKHRoaXMuX3RvdGFsU2l6ZSkpOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EYXRhYmFzZVRhYmxl Vmlldy5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGF0YWJhc2VUYWJs ZVZpZXcuanMKaW5kZXggMWE4ODZmZjY2MzA3MzM2MjI5ZWI0M2M5MGMzMjI4ZWUyMmJiYmE2Mi4u ODQzYzExYTI4ZWVjN2ExMDAyNjFiYjIyZWNiN2I5ZTk5ZjBjZDQ1MSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EYXRhYmFzZVRhYmxlVmlldy5qcworKysg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RhdGFiYXNlVGFibGVWaWV3Lmpz CkBAIC02MCwxMCArNjAsOCBAQCBXZWJJbnNwZWN0b3IuRGF0YWJhc2VUYWJsZVZpZXcucHJvdG90 eXBlID0gewogCiAgICAgICAgIHZhciBkYXRhR3JpZCA9IFdlYkluc3BlY3Rvci5wYW5lbHMucmVz b3VyY2VzLmRhdGFHcmlkRm9yUmVzdWx0KGNvbHVtbk5hbWVzLCB2YWx1ZXMpOwogICAgICAgICBp ZiAoIWRhdGFHcmlkKSB7Ci0gICAgICAgICAgICB2YXIgZW1wdHlNc2dFbGVtZW50ID0gZG9jdW1l bnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7Ci0gICAgICAgICAgICBlbXB0eU1zZ0VsZW1lbnQuY2xh c3NOYW1lID0gInN0b3JhZ2UtZW1wdHktdmlldyI7Ci0gICAgICAgICAgICBlbXB0eU1zZ0VsZW1l bnQudGV4dENvbnRlbnQgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlRoZSDigJwlc+KAnVxudGFi bGUgaXMgZW1wdHkuIiwgdGhpcy50YWJsZU5hbWUpOwotICAgICAgICAgICAgdGhpcy5lbGVtZW50 LmFwcGVuZENoaWxkKGVtcHR5TXNnRWxlbWVudCk7CisgICAgICAgICAgICB0aGlzLl9lbXB0eVZp ZXcgPSBuZXcgV2ViSW5zcGVjdG9yLkVtcHR5VmlldyhXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlRo ZSDigJwlc+KAnVxudGFibGUgaXMgZW1wdHkuIiwgdGhpcy50YWJsZU5hbWUpKTsKKyAgICAgICAg ICAgIHRoaXMuX2VtcHR5Vmlldy5zaG93KHRoaXMuZWxlbWVudCk7CiAgICAgICAgICAgICByZXR1 cm47CiAgICAgICAgIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9FbXB0eVZpZXcuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L0VtcHR5Vmlldy5qcwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi40NDFkZGM0MGQ4YWI5Y2Q1ZDBkYzk4ZTBkZmZmYmQ2 ZjM0MjU4YzRjCi0tLSAvZGV2L251bGwKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9FbXB0eVZpZXcuanMKQEAgLTAsMCArMSw1NCBAQAorLyoKKyAqIENvcHlyaWdodCAo QykgMjAxMSBHb29nbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICoKKyAqIFJlZGlzdHJp YnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91 dAorICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxv d2luZyBjb25kaXRpb25zIGFyZQorICogbWV0OgorICoKKyAqICAgICAqIFJlZGlzdHJpYnV0aW9u cyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiBub3Rp Y2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIu CisgKiAgICAgKiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2Ug dGhlIGFib3ZlCisgKiBjb3B5cmlnaHQgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBh bmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyCisgKiBpbiB0aGUgZG9jdW1lbnRhdGlvbiBhbmQv b3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlCisgKiBkaXN0cmlidXRpb24uCisg KiAgICAgKiBOZWl0aGVyIHRoZSBuYW1lIG9mIEdvb2dsZSBJbmMuIG5vciB0aGUgbmFtZXMgb2Yg aXRzCisgKiBjb250cmlidXRvcnMgbWF5IGJlIHVzZWQgdG8gZW5kb3JzZSBvciBwcm9tb3RlIHBy b2R1Y3RzIGRlcml2ZWQgZnJvbQorICogdGhpcyBzb2Z0d2FyZSB3aXRob3V0IHNwZWNpZmljIHBy aW9yIHdyaXR0ZW4gcGVybWlzc2lvbi4KKyAqCisgKiBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVE IEJZIFRIRSBDT1BZUklHSFQgSE9MREVSUyBBTkQgQ09OVFJJQlVUT1JTCisgKiAiQVMgSVMiIEFO RCBBTlkgRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVAor ICogTElNSVRFRCBUTywgVEhFIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkg QU5EIEZJVE5FU1MgRk9SCisgKiBBIFBBUlRJQ1VMQVIgUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4g SU4gTk8gRVZFTlQgU0hBTEwgVEhFIENPUFlSSUdIVAorICogT1dORVIgT1IgQ09OVFJJQlVUT1JT IEJFIExJQUJMRSBGT1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsCisgKiBTUEVD SUFMLCBFWEVNUExBUlksIE9SIENPTlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQg Tk9UCisgKiBMSU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBPRiBTVUJTVElUVVRFIEdPT0RTIE9SIFNF UlZJQ0VTOyBMT1NTIE9GIFVTRSwKKyAqIERBVEEsIE9SIFBST0ZJVFM7IE9SIEJVU0lORVNTIElO VEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFOWQorICogVEhFT1JZIE9GIExJQUJJ TElUWSwgV0hFVEhFUiBJTiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVAorICog KElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkgQVJJU0lORyBJTiBBTlkgV0FZIE9V VCBPRiBUSEUgVVNFCisgKiBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhF IFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgorICovCisKK1dlYkluc3BlY3Rvci5FbXB0eVZp ZXcgPSBmdW5jdGlvbih0ZXh0KQoreworICAgIFdlYkluc3BlY3Rvci5WaWV3LmNhbGwodGhpcyk7 CisgICAgdGhpcy5fdGV4dCA9IHRleHQ7Cit9CisKK1dlYkluc3BlY3Rvci5FbXB0eVZpZXcucHJv dG90eXBlID0geworICAgIHNob3c6IGZ1bmN0aW9uKHBhcmVudEVsZW1lbnQpCisgICAgeworICAg ICAgICBXZWJJbnNwZWN0b3IuVmlldy5wcm90b3R5cGUuc2hvdy5jYWxsKHRoaXMsIHBhcmVudEVs ZW1lbnQpOworCisgICAgICAgIHRoaXMuZWxlbWVudC5jbGFzc05hbWUgPSAic3RvcmFnZS1lbXB0 eS12aWV3IjsKKyAgICAgICAgdGhpcy5lbGVtZW50LnRleHRDb250ZW50ID0gdGhpcy5fdGV4dDsK KyAgICB9LAorICAgIAorICAgIHNldCB0ZXh0KHRleHQpCisgICAgeworICAgICAgICB0aGlzLl90 ZXh0ID0gdGV4dDsKKyAgICAgICAgaWYgKHRoaXMudmlzaWJsZSkKKyAgICAgICAgICAgIHRoaXMu ZWxlbWVudC50ZXh0Q29udGVudCA9IHRoaXMuX3RleHQ7CisgICAgfSwKK30KKworV2ViSW5zcGVj dG9yLkVtcHR5Vmlldy5wcm90b3R5cGUuX19wcm90b19fID0gV2ViSW5zcGVjdG9yLlZpZXcucHJv dG90eXBlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9O ZXR3b3JrSXRlbVZpZXcuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05l dHdvcmtJdGVtVmlldy5qcwppbmRleCBjMjlkZmVhN2IyM2QzYzQxNmNkOTQwYzEzMDYyMWNmZTM5 YzEyMjFiLi44ODBjZjYwNWI5NDBmMDBmMDgyMGM5OTY4MGNlNWY4ZjQ3M2Q3OGQ2IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtJdGVtVmlldy5q cworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtJdGVtVmll dy5qcwpAQCAtMzgsNyArMzgsNyBAQCBXZWJJbnNwZWN0b3IuTmV0d29ya0l0ZW1WaWV3ID0gZnVu Y3Rpb24ocmVzb3VyY2UpCiAgICAgdmFyIGhlYWRlcnNWaWV3ID0gbmV3IFdlYkluc3BlY3Rvci5S ZXNvdXJjZUhlYWRlcnNWaWV3KHJlc291cmNlKTsKICAgICB0aGlzLl90YWJiZWRQYW5lLmFwcGVu ZFRhYigiaGVhZGVycyIsIFdlYkluc3BlY3Rvci5VSVN0cmluZygiSGVhZGVycyIpLCBoZWFkZXJz Vmlldyk7CiAKLSAgICB2YXIgcmVzcG9uc2VWaWV3ID0gbmV3IFdlYkluc3BlY3Rvci5SZXNvdXJj ZVNvdXJjZUZyYW1lKHJlc291cmNlKTsKKyAgICB2YXIgcmVzcG9uc2VWaWV3ID0gbmV3IFdlYklu c3BlY3Rvci5SZXNvdXJjZVJlc3BvbnNlVmlldyhyZXNvdXJjZSk7CiAgICAgdmFyIHByZXZpZXdW aWV3ID0gbmV3IFdlYkluc3BlY3Rvci5SZXNvdXJjZVByZXZpZXdWaWV3KHJlc291cmNlLCByZXNw b25zZVZpZXcpOwogCiAgICAgdGhpcy5fdGFiYmVkUGFuZS5hcHBlbmRUYWIoInByZXZpZXciLCBX ZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlByZXZpZXciKSwgcHJldmlld1ZpZXcpOwpAQCAtOTksMyAr OTksNTAgQEAgV2ViSW5zcGVjdG9yLk5ldHdvcmtJdGVtVmlldy5wcm90b3R5cGUgPSB7CiB9CiAK IFdlYkluc3BlY3Rvci5OZXR3b3JrSXRlbVZpZXcucHJvdG90eXBlLl9fcHJvdG9fXyA9IFdlYklu c3BlY3Rvci5WaWV3LnByb3RvdHlwZTsKKworV2ViSW5zcGVjdG9yLlJlc291cmNlQ29udGVudFZp ZXcgPSBmdW5jdGlvbihyZXNvdXJjZSkKK3sKKyAgICBXZWJJbnNwZWN0b3IuUmVzb3VyY2VWaWV3 LmNhbGwodGhpcywgcmVzb3VyY2UpOworfQorCitXZWJJbnNwZWN0b3IuUmVzb3VyY2VDb250ZW50 Vmlldy5wcm90b3R5cGUgPSB7CisgICAgaGFzQ29udGVudDogZnVuY3Rpb24oKQorICAgIHsKKyAg ICAgICAgcmV0dXJuIHRydWU7CisgICAgfSwKKworICAgIGdldCBzb3VyY2VWaWV3KCkKKyAgICB7 CisgICAgICAgIGlmICghdGhpcy5fc291cmNlVmlldyAmJiBXZWJJbnNwZWN0b3IuUmVzb3VyY2VW aWV3Lmhhc1RleHRDb250ZW50KHRoaXMucmVzb3VyY2UpKQorICAgICAgICAgICAgdGhpcy5fc291 cmNlVmlldyA9IG5ldyBXZWJJbnNwZWN0b3IuUmVzb3VyY2VTb3VyY2VGcmFtZSh0aGlzLnJlc291 cmNlKTsKKyAgICAgICAgcmV0dXJuIHRoaXMuX3NvdXJjZVZpZXc7CisgICAgfSwKKworICAgIHNo b3c6IGZ1bmN0aW9uKHBhcmVudEVsZW1lbnQpCisgICAgeworICAgICAgICBXZWJJbnNwZWN0b3Iu UmVzb3VyY2VWaWV3LnByb3RvdHlwZS5zaG93LmNhbGwodGhpcywgcGFyZW50RWxlbWVudCk7Cisg ICAgICAgIHRoaXMuX2Vuc3VyZUlubmVyVmlld1Nob3duKCk7CisgICAgfSwKKworICAgIF9lbnN1 cmVJbm5lclZpZXdTaG93bjogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgaWYgKHRoaXMuX2lu bmVyVmlld1Nob3dSZXF1ZXN0ZWQpCisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIHRoaXMu X2lubmVyVmlld1Nob3dSZXF1ZXN0ZWQgPSB0cnVlOworCisgICAgICAgIGZ1bmN0aW9uIGNhbGxi YWNrKCkKKyAgICAgICAgeworICAgICAgICAgICAgdGhpcy5faW5uZXJWaWV3U2hvd1JlcXVlc3Rl ZCA9IGZhbHNlOworICAgICAgICAgICAgdGhpcy5jb250ZW50TG9hZGVkKCk7CisgICAgICAgIH0K KworICAgICAgICB0aGlzLnJlc291cmNlLnJlcXVlc3RDb250ZW50KGNhbGxiYWNrLmJpbmQodGhp cykpOworICAgIH0sCisKKyAgICBjb250ZW50TG9hZGVkOiBmdW5jdGlvbigpCisgICAgeworICAg ICAgICAvLyBTaG91bGQgYmUgaW1wbGVtZW50ZWQgYnkgc3ViY2xhc3Nlcy4KKyAgICB9Cit9CisK K1dlYkluc3BlY3Rvci5SZXNvdXJjZUNvbnRlbnRWaWV3LnByb3RvdHlwZS5fX3Byb3RvX18gPSBX ZWJJbnNwZWN0b3IuUmVzb3VyY2VWaWV3LnByb3RvdHlwZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VDb29raWVzVmlldy5qcyBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VDb29raWVzVmlldy5qcwppbmRl eCBjMTI2YTkzOTYyZTUwOTgwZjE1NWExOTUwMjY2NWFkYWQxMTFlMzY2Li5hNTBiZWE0NmMwNjkw OTkyMTI0MmNjYTkyZTkwMWFhOTFmMTk5MTFiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlQ29va2llc1ZpZXcuanMKKysrIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZUNvb2tpZXNWaWV3LmpzCkBAIC00Mywx MSArNDMsOSBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VDb29raWVzVmlldy5wcm90b3R5cGUgPSB7 CiAgICAgc2hvdzogZnVuY3Rpb24ocGFyZW50RWxlbWVudCkKICAgICB7CiAgICAgICAgIGlmICgh dGhpcy5fZ290Q29va2llcykgewotICAgICAgICAgICAgaWYgKCF0aGlzLl9lbXB0eU1zZ0VsZW1l bnQpIHsKLSAgICAgICAgICAgICAgICB0aGlzLl9lbXB0eU1zZ0VsZW1lbnQgPSBkb2N1bWVudC5j cmVhdGVFbGVtZW50KCJkaXYiKTsKLSAgICAgICAgICAgICAgICB0aGlzLl9lbXB0eU1zZ0VsZW1l bnQuY2xhc3NOYW1lID0gInN0b3JhZ2UtZW1wdHktdmlldyI7Ci0gICAgICAgICAgICAgICAgdGhp cy5fZW1wdHlNc2dFbGVtZW50LnRleHRDb250ZW50ID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJU aGlzIHJlcXVlc3QgaGFzIG5vIGNvb2tpZXMuIik7Ci0gICAgICAgICAgICAgICAgdGhpcy5lbGVt ZW50LmFwcGVuZENoaWxkKHRoaXMuX2VtcHR5TXNnRWxlbWVudCk7CisgICAgICAgICAgICBpZiAo IXRoaXMuX2VtcHR5VmlldykgeworICAgICAgICAgICAgICAgIHRoaXMuX2VtcHR5VmlldyA9IG5l dyBXZWJJbnNwZWN0b3IuRW1wdHlWaWV3KFdlYkluc3BlY3Rvci5VSVN0cmluZygiVGhpcyByZXF1 ZXN0IGhhcyBubyBjb29raWVzLiIpKTsKKyAgICAgICAgICAgICAgICB0aGlzLl9lbXB0eVZpZXcu c2hvdyh0aGlzLmVsZW1lbnQpOwogICAgICAgICAgICAgfQogICAgICAgICAgICAgV2ViSW5zcGVj dG9yLlZpZXcucHJvdG90eXBlLnNob3cuY2FsbCh0aGlzLCBwYXJlbnRFbGVtZW50KTsKICAgICAg ICAgICAgIHJldHVybjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvUmVzb3VyY2VQcmV2aWV3Vmlldy5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvUmVzb3VyY2VQcmV2aWV3Vmlldy5qcwppbmRleCBhMDUxOTA5Y2YxYzNhMTAxOTcy YTJiMGFmOTdiZTdmYTgwMzE5MWY4Li5lODJjYzY4NDQwMDc5YzFlOWFiYWU2NWNkNjE2ZGJlZDZj Nzk4MDA4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jl c291cmNlUHJldmlld1ZpZXcuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9SZXNvdXJjZVByZXZpZXdWaWV3LmpzCkBAIC0yOCw0MCArMjgsMzEgQEAKICAqIE9GIFRI SVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBE QU1BR0UuCiAgKi8KIAotV2ViSW5zcGVjdG9yLlJlc291cmNlUHJldmlld1ZpZXcgPSBmdW5jdGlv bihyZXNvdXJjZSwgc291cmNlVmlldykKK1dlYkluc3BlY3Rvci5SZXNvdXJjZVByZXZpZXdWaWV3 ID0gZnVuY3Rpb24ocmVzb3VyY2UsIHJlc3BvbnNlVmlldykKIHsKLSAgICBXZWJJbnNwZWN0b3Iu UmVzb3VyY2VWaWV3LmNhbGwodGhpcywgcmVzb3VyY2UpOwotICAgIHRoaXMuX3NvdXJjZVZpZXcg PSBzb3VyY2VWaWV3OworICAgIFdlYkluc3BlY3Rvci5SZXNvdXJjZUNvbnRlbnRWaWV3LmNhbGwo dGhpcywgcmVzb3VyY2UpOworICAgIHRoaXMuX3Jlc3BvbnNlVmlldyA9IHJlc3BvbnNlVmlldzsK IH0KIAogV2ViSW5zcGVjdG9yLlJlc291cmNlUHJldmlld1ZpZXcucHJvdG90eXBlID0gewotICAg IGhhc0NvbnRlbnQ6IGZ1bmN0aW9uKCkKKyAgICBjb250ZW50TG9hZGVkOiBmdW5jdGlvbigpCiAg ICAgewotICAgICAgICByZXR1cm4gdHJ1ZTsKLSAgICB9LAotCi0gICAgc2hvdzogZnVuY3Rpb24o cGFyZW50RWxlbWVudCkKLSAgICB7Ci0gICAgICAgIFdlYkluc3BlY3Rvci5SZXNvdXJjZVZpZXcu cHJvdG90eXBlLnNob3cuY2FsbCh0aGlzLCBwYXJlbnRFbGVtZW50KTsKLSAgICAgICAgdGhpcy5f ZW5zdXJlSW5uZXJWaWV3U2hvd24oKTsKLSAgICB9LAotCi0gICAgX2Vuc3VyZUlubmVyVmlld1No b3duOiBmdW5jdGlvbigpCi0gICAgewotICAgICAgICBpZiAodGhpcy5faW5uZXJWaWV3U2hvd1Jl cXVlc3RlZCkKLSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgdGhpcy5faW5uZXJWaWV3U2hv d1JlcXVlc3RlZCA9IHRydWU7Ci0KLSAgICAgICAgZnVuY3Rpb24gY2FsbGJhY2soKQotICAgICAg ICB7Ci0gICAgICAgICAgICB0aGlzLl9jcmVhdGVJbm5lclZpZXcoY2FsbGJhY2spLnNob3codGhp cy5lbGVtZW50KTsKLSAgICAgICAgICAgIHRoaXMuX2lubmVyVmlld1Nob3dSZXF1ZXN0ZWQgPSBm YWxzZTsKKyAgICAgICAgaWYgKCF0aGlzLnJlc291cmNlLmNvbnRlbnQpIHsKKyAgICAgICAgICAg IGlmICghdGhpcy5fZW1wdHlWaWV3KSB7CisgICAgICAgICAgICAgICAgdGhpcy5fZW1wdHlWaWV3 ID0gbmV3IFdlYkluc3BlY3Rvci5FbXB0eVZpZXcoV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJUaGlz IHJlcXVlc3QgaGFzIG5vIHByZXZpZXcgYXZhaWxhYmxlLiIpKTsKKyAgICAgICAgICAgICAgICB0 aGlzLl9lbXB0eVZpZXcuc2hvdyh0aGlzLmVsZW1lbnQpOworICAgICAgICAgICAgfQorICAgICAg ICB9IGVsc2UgeworICAgICAgICAgICAgaWYgKHRoaXMuX2VtcHR5VmlldykgeworICAgICAgICAg ICAgICAgIHRoaXMuX2VtcHR5Vmlldy5kZXRhY2goKTsKKyAgICAgICAgICAgICAgICBkZWxldGUg dGhpcy5fZW1wdHlWaWV3OworICAgICAgICAgICAgfQorICAgICAgICAgICAgdmFyIHZpZXcgPSB0 aGlzLl9jcmVhdGVJbm5lclZpZXcoKTsKKyAgICAgICAgICAgIHZpZXcuc2hvdyh0aGlzLmVsZW1l bnQpOwogICAgICAgICB9Ci0KLSAgICAgICAgdGhpcy5yZXNvdXJjZS5yZXF1ZXN0Q29udGVudChj YWxsYmFjay5iaW5kKHRoaXMpKTsKICAgICB9LAogCi0gICAgX2NyZWF0ZUlubmVyVmlldzogZnVu Y3Rpb24oY2FsbGJhY2spCisgICAgX2NyZWF0ZUlubmVyVmlldzogZnVuY3Rpb24oKQogICAgIHsK ICAgICAgICAgaWYgKHRoaXMucmVzb3VyY2UuaGFzRXJyb3JTdGF0dXNDb2RlKCkgJiYgdGhpcy5y ZXNvdXJjZS5jb250ZW50KQogICAgICAgICAgICAgcmV0dXJuIG5ldyBXZWJJbnNwZWN0b3IuUmVz b3VyY2VIVE1MVmlldyh0aGlzLnJlc291cmNlKTsKQEAgLTcyLDEzICs2MywxMSBAQCBXZWJJbnNw ZWN0b3IuUmVzb3VyY2VQcmV2aWV3Vmlldy5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICAgICAg cmV0dXJuIG5ldyBXZWJJbnNwZWN0b3IuUmVzb3VyY2VKU09OVmlldyh0aGlzLnJlc291cmNlLCBw YXJzZWRKU09OKTsKICAgICAgICAgfQogCi0gICAgICAgIGlmIChXZWJJbnNwZWN0b3IuUmVzb3Vy Y2VWaWV3Lmhhc1RleHRDb250ZW50KHRoaXMucmVzb3VyY2UpKQotICAgICAgICAgICAgcmV0dXJu IHRoaXMuX3NvdXJjZVZpZXc7CisgICAgICAgIGlmICh0aGlzLl9yZXNwb25zZVZpZXcuc291cmNl VmlldykKKyAgICAgICAgICAgIHJldHVybiB0aGlzLl9yZXNwb25zZVZpZXcuc291cmNlVmlldzsK IAogICAgICAgICByZXR1cm4gV2ViSW5zcGVjdG9yLlJlc291cmNlVmlldy5ub25Tb3VyY2VWaWV3 Rm9yUmVzb3VyY2UodGhpcy5yZXNvdXJjZSk7Ci0gICAgfSwKLSAgICAKLSAgICAKKyAgICB9CiB9 CiAKLVdlYkluc3BlY3Rvci5SZXNvdXJjZVByZXZpZXdWaWV3LnByb3RvdHlwZS5fX3Byb3RvX18g PSBXZWJJbnNwZWN0b3IuUmVzb3VyY2VWaWV3LnByb3RvdHlwZTsKK1dlYkluc3BlY3Rvci5SZXNv dXJjZVByZXZpZXdWaWV3LnByb3RvdHlwZS5fX3Byb3RvX18gPSBXZWJJbnNwZWN0b3IuUmVzb3Vy Y2VDb250ZW50Vmlldy5wcm90b3R5cGU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlUmVzcG9uc2VWaWV3LmpzIGIvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZVJlc3BvbnNlVmlldy5qcwpuZXcgZmlsZSBtb2Rl IDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5j ZmVlOGJkNjllYzgxMWE1NTg2ZTc5YWVhYTVhZjlhZmIxOGM2ZjFjCi0tLSAvZGV2L251bGwKKysr IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZVJlc3BvbnNlVmll dy5qcwpAQCAtMCwwICsxLDYxIEBACisvKgorICogQ29weXJpZ2h0IChDKSAyMDExIEdvb2dsZSBJ bmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKgorICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBp biBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CisgKiBtb2RpZmljYXRp b24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMg YXJlCisgKiBtZXQ6CisgKgorICogICAgICogUmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2Rl IG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqIG5vdGljZSwgdGhpcyBsaXN0IG9m IGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KKyAqICAgICAqIFJlZGlz dHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUKKyAqIGNv cHlyaWdodCBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5n IGRpc2NsYWltZXIKKyAqIGluIHRoZSBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlh bHMgcHJvdmlkZWQgd2l0aCB0aGUKKyAqIGRpc3RyaWJ1dGlvbi4KKyAqICAgICAqIE5laXRoZXIg dGhlIG5hbWUgb2YgR29vZ2xlIEluYy4gbm9yIHRoZSBuYW1lcyBvZiBpdHMKKyAqIGNvbnRyaWJ1 dG9ycyBtYXkgYmUgdXNlZCB0byBlbmRvcnNlIG9yIHByb21vdGUgcHJvZHVjdHMgZGVyaXZlZCBm cm9tCisgKiB0aGlzIHNvZnR3YXJlIHdpdGhvdXQgc3BlY2lmaWMgcHJpb3Igd3JpdHRlbiBwZXJt aXNzaW9uLgorICoKKyAqIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgVEhFIENPUFlSSUdI VCBIT0xERVJTIEFORCBDT05UUklCVVRPUlMKKyAqICJBUyBJUyIgQU5EIEFOWSBFWFBSRVNTIE9S IElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9UCisgKiBMSU1JVEVEIFRPLCBU SEUgSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1IK KyAqIEEgUEFSVElDVUxBUiBQVVJQT1NFIEFSRSBESVNDTEFJTUVELiBJTiBOTyBFVkVOVCBTSEFM TCBUSEUgQ09QWVJJR0hUCisgKiBPV05FUiBPUiBDT05UUklCVVRPUlMgQkUgTElBQkxFIEZPUiBB TlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwKKyAqIFNQRUNJQUwsIEVYRU1QTEFSWSwg T1IgQ09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1QKKyAqIExJTUlURUQg VE8sIFBST0NVUkVNRU5UIE9GIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7IExPU1MgT0Yg VVNFLAorICogREFUQSwgT1IgUFJPRklUUzsgT1IgQlVTSU5FU1MgSU5URVJSVVBUSU9OKSBIT1dF VkVSIENBVVNFRCBBTkQgT04gQU5ZCisgKiBUSEVPUlkgT0YgTElBQklMSVRZLCBXSEVUSEVSIElO IENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUCisgKiAoSU5DTFVESU5HIE5FR0xJ R0VOQ0UgT1IgT1RIRVJXSVNFKSBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UKKyAq IE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0Yg U1VDSCBEQU1BR0UuCisgKi8KKworV2ViSW5zcGVjdG9yLlJlc291cmNlUmVzcG9uc2VWaWV3ID0g ZnVuY3Rpb24ocmVzb3VyY2UpCit7CisgICAgV2ViSW5zcGVjdG9yLlJlc291cmNlQ29udGVudFZp ZXcuY2FsbCh0aGlzLCByZXNvdXJjZSk7Cit9CisKK1dlYkluc3BlY3Rvci5SZXNvdXJjZVJlc3Bv bnNlVmlldy5wcm90b3R5cGUgPSB7CisgICAgZ2V0IHNvdXJjZVZpZXcoKQorICAgIHsKKyAgICAg ICAgaWYgKCF0aGlzLl9zb3VyY2VWaWV3ICYmIFdlYkluc3BlY3Rvci5SZXNvdXJjZVZpZXcuaGFz VGV4dENvbnRlbnQodGhpcy5yZXNvdXJjZSkpCisgICAgICAgICAgICB0aGlzLl9zb3VyY2VWaWV3 ID0gbmV3IFdlYkluc3BlY3Rvci5SZXNvdXJjZVNvdXJjZUZyYW1lKHRoaXMucmVzb3VyY2UpOwor ICAgICAgICByZXR1cm4gdGhpcy5fc291cmNlVmlldzsKKyAgICB9LAorCisgICAgY29udGVudExv YWRlZDogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgaWYgKCF0aGlzLnJlc291cmNlLmNvbnRl bnQgfHwgIXRoaXMuc291cmNlVmlldykgeworICAgICAgICAgICAgaWYgKCF0aGlzLl9lbXB0eVZp ZXcpIHsKKyAgICAgICAgICAgICAgICB0aGlzLl9lbXB0eVZpZXcgPSBuZXcgV2ViSW5zcGVjdG9y LkVtcHR5VmlldyhXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlRoaXMgcmVxdWVzdCBoYXMgbm8gcmVz cG9uc2UgZGF0YSBhdmFpbGFibGUuIikpOworICAgICAgICAgICAgICAgIHRoaXMuX2VtcHR5Vmll dy5zaG93KHRoaXMuZWxlbWVudCk7CisgICAgICAgICAgICB9CisgICAgICAgIH0gZWxzZSB7Cisg ICAgICAgICAgICBpZiAodGhpcy5fZW1wdHlWaWV3KSB7CisgICAgICAgICAgICAgICAgdGhpcy5f ZW1wdHlWaWV3LmRldGFjaCgpOworICAgICAgICAgICAgICAgIGRlbGV0ZSB0aGlzLl9lbXB0eVZp ZXc7CisgICAgICAgICAgICB9CisgICAgICAgICAgICB0aGlzLnNvdXJjZVZpZXcuc2hvdyh0aGlz LmVsZW1lbnQpOworICAgICAgICB9CisgICAgfQorfQorCitXZWJJbnNwZWN0b3IuUmVzb3VyY2VS ZXNwb25zZVZpZXcucHJvdG90eXBlLl9fcHJvdG9fXyA9IFdlYkluc3BlY3Rvci5SZXNvdXJjZUNv bnRlbnRWaWV3LnByb3RvdHlwZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvUmVzb3VyY2VUaW1pbmdWaWV3LmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9SZXNvdXJjZVRpbWluZ1ZpZXcuanMKaW5kZXggMDRmMjJmODQwZGI1YzYx ZjJlMWM3NmExODQ4ODEyYmU0YmUwZTUyNS4uZjg1YzU4MzEwMmQzMmE2MzAyMjc4NTE5NmQwNzc5 ZWI5YmQ4ZDQzOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9SZXNvdXJjZVRpbWluZ1ZpZXcuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9SZXNvdXJjZVRpbWluZ1ZpZXcuanMKQEAgLTQyLDE4ICs0MiwxOCBAQCBXZWJJbnNw ZWN0b3IuUmVzb3VyY2VUaW1pbmdWaWV3LnByb3RvdHlwZSA9IHsKICAgICBzaG93OiBmdW5jdGlv bihwYXJlbnRFbGVtZW50KQogICAgIHsKICAgICAgICAgaWYgKCF0aGlzLl9yZXNvdXJjZS50aW1p bmcpIHsKLSAgICAgICAgICAgIGlmICghdGhpcy5fZW1wdHlNc2dFbGVtZW50KSB7Ci0gICAgICAg ICAgICAgICAgdGhpcy5fZW1wdHlNc2dFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgi ZGl2Iik7Ci0gICAgICAgICAgICAgICAgdGhpcy5fZW1wdHlNc2dFbGVtZW50LmNsYXNzTmFtZSA9 ICJzdG9yYWdlLWVtcHR5LXZpZXciOwotICAgICAgICAgICAgICAgIHRoaXMuX2VtcHR5TXNnRWxl bWVudC50ZXh0Q29udGVudCA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiVGhpcyByZXF1ZXN0IGhh cyBubyBkZXRhaWxlZCB0aW1pbmcgaW5mby4iKTsKLSAgICAgICAgICAgICAgICB0aGlzLmVsZW1l bnQuYXBwZW5kQ2hpbGQodGhpcy5fZW1wdHlNc2dFbGVtZW50KTsKKyAgICAgICAgICAgIGlmICgh dGhpcy5fZW1wdHlWaWV3KSB7CisgICAgICAgICAgICAgICAgdGhpcy5fZW1wdHlWaWV3ID0gbmV3 IFdlYkluc3BlY3Rvci5FbXB0eVZpZXcoV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJUaGlzIHJlcXVl c3QgaGFzIG5vIGRldGFpbGVkIHRpbWluZyBpbmZvLiIpKTsKKyAgICAgICAgICAgICAgICB0aGlz Ll9lbXB0eVZpZXcuc2hvdyh0aGlzLmVsZW1lbnQpOwogICAgICAgICAgICAgfQogICAgICAgICAg ICAgV2ViSW5zcGVjdG9yLlZpZXcucHJvdG90eXBlLnNob3cuY2FsbCh0aGlzLCBwYXJlbnRFbGVt ZW50KTsKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQogCi0gICAgICAgIGlmICh0aGlz Ll9lbXB0eU1zZ0VsZW1lbnQpCi0gICAgICAgICAgICB0aGlzLl9lbXB0eU1zZ0VsZW1lbnQucGFy ZW50RWxlbWVudC5yZW1vdmVDaGlsZCh0aGlzLl9lbXB0eU1zZ0VsZW1lbnQpOworICAgICAgICBp ZiAodGhpcy5fZW1wdHlWaWV3KSB7CisgICAgICAgICAgICB0aGlzLl9lbXB0eVZpZXcuZGV0YWNo KCk7CisgICAgICAgICAgICBkZWxldGUgdGhpcy5fZW1wdHlWaWV3OworICAgICAgICB9CiAKICAg ICAgICAgdGhpcy5fcmVmcmVzaCgpOwogICAgICAgICBXZWJJbnNwZWN0b3IuVmlldy5wcm90b3R5 cGUuc2hvdy5jYWxsKHRoaXMsIHBhcmVudEVsZW1lbnQpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZXNQYW5lbC5qcyBiL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VzUGFuZWwuanMKaW5kZXggOGFkYzlkOWU5 ZGI5NDY1MzljYmJmMGI4MTU2ZWUxMzhjOTA5NjA5Mi4uOWFhOTI3NGIzOTQzYmEyNWIxNTViN2Rl YTUyNjBkMmNmMTA1MzEyYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9SZXNvdXJjZXNQYW5lbC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL1Jlc291cmNlc1BhbmVsLmpzCkBAIC0xNjExLDE3ICsxNjExLDE1IEBAIFdlYklu c3BlY3Rvci5TdG9yYWdlQ2F0ZWdvcnlWaWV3ID0gZnVuY3Rpb24oKQogICAgIFdlYkluc3BlY3Rv ci5WaWV3LmNhbGwodGhpcyk7CiAKICAgICB0aGlzLmVsZW1lbnQuYWRkU3R5bGVDbGFzcygic3Rv cmFnZS12aWV3Iik7Ci0KLSAgICB0aGlzLl9lbXB0eU1zZ0VsZW1lbnQgPSBkb2N1bWVudC5jcmVh dGVFbGVtZW50KCJkaXYiKTsKLSAgICB0aGlzLl9lbXB0eU1zZ0VsZW1lbnQuY2xhc3NOYW1lID0g InN0b3JhZ2UtZW1wdHktdmlldyI7Ci0gICAgdGhpcy5lbGVtZW50LmFwcGVuZENoaWxkKHRoaXMu X2VtcHR5TXNnRWxlbWVudCk7CisgICAgdGhpcy5fZW1wdHlWaWV3ID0gbmV3IFdlYkluc3BlY3Rv ci5FbXB0eVZpZXcoKTsKKyAgICB0aGlzLl9lbXB0eVZpZXcuc2hvdyh0aGlzLmVsZW1lbnQpOwog fQogCiBXZWJJbnNwZWN0b3IuU3RvcmFnZUNhdGVnb3J5Vmlldy5wcm90b3R5cGUgPSB7CiAgICAg c2V0VGV4dDogZnVuY3Rpb24odGV4dCkKICAgICB7Ci0gICAgICAgIHRoaXMuX2VtcHR5TXNnRWxl bWVudC50ZXh0Q29udGVudCA9IHRleHQ7Ci0gICAgfQorICAgICAgICB0aGlzLl9lbXB0eVZpZXcu dGV4dCA9IHRleHQ7ICAgIAorICAgIH0gICAgICAgIAogfQogCiBXZWJJbnNwZWN0b3IuU3RvcmFn ZUNhdGVnb3J5Vmlldy5wcm90b3R5cGUuX19wcm90b19fID0gV2ViSW5zcGVjdG9yLlZpZXcucHJv dG90eXBlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9X ZWJLaXQucXJjIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9XZWJLaXQucXJj CmluZGV4IDk4MTZkYzAzNWEwYTU5NmU5YTg5MGU4N2ZkNjJmMGIwNDExNDQ0NDAuLjQ5MTdkZDY4 ODU4ZGIyNzM2OWQwYjc5OWU0ZmJhYWQ4NTFiODc1NGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvV2ViS2l0LnFyYworKysgYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL1dlYktpdC5xcmMKQEAgLTQwLDYgKzQwLDcgQEAKICAgICA8Zmls ZT5EcmF3ZXIuanM8L2ZpbGU+CiAgICAgPGZpbGU+RWxlbWVudHNQYW5lbC5qczwvZmlsZT4KICAg ICA8ZmlsZT5FbGVtZW50c1RyZWVPdXRsaW5lLmpzPC9maWxlPgorICAgIDxmaWxlPkVtcHR5Vmll dy5qczwvZmlsZT4KICAgICA8ZmlsZT5FdmVudExpc3RlbmVyc1NpZGViYXJQYW5lLmpzPC9maWxl PgogICAgIDxmaWxlPkV4dGVuc2lvbkFQSS5qczwvZmlsZT4KICAgICA8ZmlsZT5FeHRlbnNpb25B dWRpdENhdGVnb3J5LmpzPC9maWxlPgpAQCAtODYsNiArODcsNyBAQAogICAgIDxmaWxlPlJlc291 cmNlSlNPTlZpZXcuanM8L2ZpbGU+CiAgICAgPGZpbGU+UmVzb3VyY2VIVE1MVmlldy5qczwvZmls ZT4KICAgICA8ZmlsZT5SZXNvdXJjZUhlYWRlcnNWaWV3LmpzPC9maWxlPgorICAgIDxmaWxlPlJl c291cmNlUmVzcG9uc2VWaWV3LmpzPC9maWxlPgogICAgIDxmaWxlPlJlc291cmNlVGltaW5nVmll dy5qczwvZmlsZT4KICAgICA8ZmlsZT5SZXNvdXJjZVRyZWVNb2RlbC5qczwvZmlsZT4KICAgICA8 ZmlsZT5SZXNvdXJjZVZpZXcuanM8L2ZpbGU+CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5odG1sIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuaHRtbAppbmRleCBkN2ViYWUxNDExOWU5MTU1N2QyYzZm NjhkNmM5YTc0NTdiNTRkOGUwLi41NDgyMTExZjBmOWU5NWVmMjEzMzFjYzMwOTlmNmI3YzA3YjBj YTk3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3Bl Y3Rvci5odG1sCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVj dG9yLmh0bWwKQEAgLTEyMCwxMyArMTIwLDE1IEBAIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURW SVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCiAgICAgPHNjcmlwdCB0eXBl PSJ0ZXh0L2phdmFzY3JpcHQiIHNyYz0iQXVkaXRSdWxlcy5qcyI+PC9zY3JpcHQ+CiAgICAgPHNj cmlwdCB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQiIHNyYz0iQXVkaXRDYXRlZ29yaWVzLmpzIj48L3Nj cmlwdD4KICAgICA8c2NyaXB0IHR5cGU9InRleHQvamF2YXNjcmlwdCIgc3JjPSJBdWRpdEZvcm1h dHRlcnMuanMiPjwvc2NyaXB0PgorICAgIDxzY3JpcHQgdHlwZT0idGV4dC9qYXZhc2NyaXB0IiBz cmM9Ik5ldHdvcmtJdGVtVmlldy5qcyI+PC9zY3JpcHQ+CisgICAgPHNjcmlwdCB0eXBlPSJ0ZXh0 L2phdmFzY3JpcHQiIHNyYz0iRW1wdHlWaWV3LmpzIj48L3NjcmlwdD4KICAgICA8c2NyaXB0IHR5 cGU9InRleHQvamF2YXNjcmlwdCIgc3JjPSJSZXNvdXJjZUhlYWRlcnNWaWV3LmpzIj48L3Njcmlw dD4KICAgICA8c2NyaXB0IHR5cGU9InRleHQvamF2YXNjcmlwdCIgc3JjPSJSZXNvdXJjZUNvb2tp ZXNWaWV3LmpzIj48L3NjcmlwdD4KICAgICA8c2NyaXB0IHR5cGU9InRleHQvamF2YXNjcmlwdCIg c3JjPSJSZXNvdXJjZVRpbWluZ1ZpZXcuanMiPjwvc2NyaXB0PgogICAgIDxzY3JpcHQgdHlwZT0i dGV4dC9qYXZhc2NyaXB0IiBzcmM9IlJlc291cmNlSlNPTlZpZXcuanMiPjwvc2NyaXB0PgogICAg IDxzY3JpcHQgdHlwZT0idGV4dC9qYXZhc2NyaXB0IiBzcmM9IlJlc291cmNlSFRNTFZpZXcuanMi Pjwvc2NyaXB0PgorICAgIDxzY3JpcHQgdHlwZT0idGV4dC9qYXZhc2NyaXB0IiBzcmM9IlJlc291 cmNlUmVzcG9uc2VWaWV3LmpzIj48L3NjcmlwdD4KICAgICA8c2NyaXB0IHR5cGU9InRleHQvamF2 YXNjcmlwdCIgc3JjPSJSZXNvdXJjZVByZXZpZXdWaWV3LmpzIj48L3NjcmlwdD4KLSAgICA8c2Ny aXB0IHR5cGU9InRleHQvamF2YXNjcmlwdCIgc3JjPSJOZXR3b3JrSXRlbVZpZXcuanMiPjwvc2Ny aXB0PgogICAgIDxzY3JpcHQgdHlwZT0idGV4dC9qYXZhc2NyaXB0IiBzcmM9IlNjcmlwdEZvcm1h dHRlci5qcyI+PC9zY3JpcHQ+CiAgICAgPHNjcmlwdCB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQiIHNy Yz0iRE9NU3ludGF4SGlnaGxpZ2h0ZXIuanMiPjwvc2NyaXB0PgogICAgIDxzY3JpcHQgdHlwZT0i dGV4dC9qYXZhc2NyaXB0IiBzcmM9IlRleHRFZGl0b3JNb2RlbC5qcyI+PC9zY3JpcHQ+Cg==