144125 2015-04-23 15:04:20 -0700 Web Inspector: Change more places that changed WebInspector.navigationSidebar.selectedSidebarPanel to tabs 2015-04-25 18:36:11 -0700 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED DoNotImportToRadar P2 Normal --- 1 timothy timothy graouts joepeck jonowells mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1088026 0 timothy 2015-04-23 15:04:20 -0700 Used tabs instead of dealing with the navigation sidebar panel. 1088027 1 251496 timothy 2015-04-23 15:05:09 -0700 Created attachment 251496 Patch 1088103 2 251496 joepeck 2015-04-23 17:00:48 -0700 Comment on attachment 251496 Patch r=me 1088642 3 timothy 2015-04-25 18:36:11 -0700 r183322 – r183342 http://trac.webkit.org/log/?revs=183322-183342 251496 2015-04-23 15:05:09 -0700 2015-04-23 17:00:48 -0700 Patch bug-144125-20150423150405.patch text/plain 15919 timothy U3VidmVyc2lvbiBSZXZpc2lvbjogMTgyNzk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCBj YzhiMjIxMGRmZGFhNzU0ZDQ5NmRlZDg1YTcyYWMyMTRlODllYTg4Li4xODRlMTA0YTI4MGRmYmNh OTk4NDI4M2JmN2VmMGM0NjEzZThhZmVmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs NSArMSwzOCBAQAogMjAxNS0wNC0yMyAgVGltb3RoeSBIYXRjaGVyICA8dGltb3RoeUBhcHBsZS5j b20+CiAKKyAgICAgICAgV2ViIEluc3BlY3RvcjogQ2hhbmdlIG1vcmUgcGxhY2VzIHRoYXQgY2hh bmdlZCBXZWJJbnNwZWN0b3IubmF2aWdhdGlvblNpZGViYXIuc2VsZWN0ZWRTaWRlYmFyUGFuZWwg dG8gdGFicworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTQ0MTI1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg KiBVc2VySW50ZXJmYWNlL0Jhc2UvTWFpbi5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5sb2Fk ZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLnRvZ2dsZURldGFpbHNTaWRlYmFyKToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci50YWJDb250ZW50Vmlld0NsYXNzRm9yUmVwcmVzZW50ZWRPYmplY3Qp OgorICAgICAgICAoV2ViSW5zcGVjdG9yLl91cGRhdGVNb2RpZmllcktleXMpOgorICAgICAgICAo V2ViSW5zcGVjdG9yLl9jb25zb2xlUmVzaXplck1vdXNlRG93bi5kb2NrZWRSZXNpemVyRHJhZ0Vu ZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuX2NvbnNvbGVSZXNpemVyTW91c2VEb3duKToKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5saW5raWZ5VVJMQXNOb2RlKToKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5saW5raWZ5U3RyaW5nQXNGcmFnbWVudFdpdGhDdXN0b21MaW5raWZpZXIpOgorICAgICAg ICAqIFVzZXJJbnRlcmZhY2UvUHJvdG9jb2wvSW5zcGVjdG9yRnJvbnRlbmRBUEkuanM6CisgICAg ICAgIChJbnNwZWN0b3JGcm9udGVuZEFQSS5zZXRUaW1lbGluZVByb2ZpbGluZ0VuYWJsZWQpOgor ICAgICAgICAoSW5zcGVjdG9yRnJvbnRlbmRBUEkuc2hvd0NvbnNvbGUpOgorICAgICAgICAoSW5z cGVjdG9yRnJvbnRlbmRBUEkuc2hvd1Jlc291cmNlcyk6CisgICAgICAgICogVXNlckludGVyZmFj ZS9Qcm90b2NvbC9JbnNwZWN0b3JPYnNlcnZlci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5J bnNwZWN0b3JPYnNlcnZlci5wcm90b3R5cGUuaW5zcGVjdCk6CisgICAgICAgICogVXNlckludGVy ZmFjZS9WaWV3cy9EZWJ1Z2dlclRhYkNvbnRlbnRWaWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVj dG9yLkRlYnVnZ2VyVGFiQ29udGVudFZpZXcucHJvdG90eXBlLmNhblNob3dSZXByZXNlbnRlZE9i amVjdCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGVidWdnZXJUYWJDb250ZW50Vmlldy5wcm90 b3R5cGUucmV2ZWFsQW5kU2VsZWN0QnJlYWtwb2ludCk6CisgICAgICAgICogVXNlckludGVyZmFj ZS9WaWV3cy9EZWZhdWx0RGFzaGJvYXJkVmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5E ZWZhdWx0RGFzaGJvYXJkVmlldyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGVmYXVsdERhc2hi b2FyZFZpZXcucHJvdG90eXBlLl9yZXNvdXJjZXNXYXNDbGlja2VkKToKKyAgICAgICAgKiBVc2Vy SW50ZXJmYWNlL1ZpZXdzL1NvdXJjZUNvZGVUZXh0RWRpdG9yLmpzOgorICAgICAgICAoV2ViSW5z cGVjdG9yLlNvdXJjZUNvZGVUZXh0RWRpdG9yLnByb3RvdHlwZS50ZXh0RWRpdG9yR3V0dGVyQ29u dGV4dE1lbnUucmV2ZWFsSW5TaWRlYmFyKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdz L1RhYkJyb3dzZXIuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGFiQnJvd3Nlci5iZXN0VGFi Q29udGVudFZpZXdGb3JDbGFzcyk6CisKKzIwMTUtMDQtMjMgIFRpbW90aHkgSGF0Y2hlciAgPHRp bW90aHlAYXBwbGUuY29tPgorCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IERlYnVnZ2VyU2lkZWJh clBhbmVsJ3MgX2NhbGxTdGFja0NvbnRlbnRUcmVlT3V0bGluZSBzaG91bGQgc3VwcHJlc3MgZmls dGVyaW5nCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x NDQxMTQKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv QmFzZS9NYWluLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9N YWluLmpzCmluZGV4IDVlYWYxMDM1YTZhNjUwMWJhNzNhM2IyNWVmMzI5ODUwOTZjYjRlZjkuLjhm YjBlYzNkYzY2NjZiNjEyMzc1MDZkNGFjMzQ5MGM4Yjk3ZjUxY2MgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvTWFpbi5qcworKysgYi9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL01haW4uanMKQEAgLTEyNyw2ICsxMjcs OCBAQCBXZWJJbnNwZWN0b3IubG9hZGVkID0gZnVuY3Rpb24oKQogICAgIHRoaXMuZGVidWdnZXJN YW5hZ2VyLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkRlYnVnZ2VyTWFuYWdlci5FdmVu dC5SZXN1bWVkLCB0aGlzLl9kZWJ1Z2dlckRpZFJlc3VtZSwgdGhpcyk7CiAgICAgdGhpcy5kb21U cmVlTWFuYWdlci5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5ET01UcmVlTWFuYWdlci5F dmVudC5JbnNwZWN0TW9kZVN0YXRlQ2hhbmdlZCwgdGhpcy5faW5zcGVjdE1vZGVTdGF0ZUNoYW5n ZWQsIHRoaXMpOwogICAgIHRoaXMuZG9tVHJlZU1hbmFnZXIuYWRkRXZlbnRMaXN0ZW5lcihXZWJJ bnNwZWN0b3IuRE9NVHJlZU1hbmFnZXIuRXZlbnQuRE9NTm9kZVdhc0luc3BlY3RlZCwgdGhpcy5f ZG9tTm9kZVdhc0luc3BlY3RlZCwgdGhpcyk7CisgICAgdGhpcy5zdG9yYWdlTWFuYWdlci5hZGRF dmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5TdG9yYWdlTWFuYWdlci5FdmVudC5ET01TdG9yYWdl T2JqZWN0V2FzSW5zcGVjdGVkLCB0aGlzLl9zdG9yYWdlV2FzSW5zcGVjdGVkLCB0aGlzKTsKKyAg ICB0aGlzLnN0b3JhZ2VNYW5hZ2VyLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlN0b3Jh Z2VNYW5hZ2VyLkV2ZW50LkRhdGFiYXNlV2FzSW5zcGVjdGVkLCB0aGlzLl9zdG9yYWdlV2FzSW5z cGVjdGVkLCB0aGlzKTsKICAgICB0aGlzLmZyYW1lUmVzb3VyY2VNYW5hZ2VyLmFkZEV2ZW50TGlz dGVuZXIoV2ViSW5zcGVjdG9yLkZyYW1lUmVzb3VyY2VNYW5hZ2VyLkV2ZW50Lk1haW5GcmFtZURp ZENoYW5nZSwgdGhpcy5fbWFpbkZyYW1lRGlkQ2hhbmdlLCB0aGlzKTsKICAgICB0aGlzLmZyYW1l UmVzb3VyY2VNYW5hZ2VyLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkZyYW1lUmVzb3Vy Y2VNYW5hZ2VyLkV2ZW50LkZyYW1lV2FzQWRkZWQsIHRoaXMuX2ZyYW1lV2FzQWRkZWQsIHRoaXMp OwogCkBAIC02NTMsNiArNjU1LDQyIEBAIFdlYkluc3BlY3Rvci5pc1Nob3dpbmdDb25zb2xlVGFi ID0gZnVuY3Rpb24oKQogICAgIHJldHVybiB0aGlzLnRhYkJyb3dzZXIuc2VsZWN0ZWRUYWJDb250 ZW50VmlldyBpbnN0YW5jZW9mIFdlYkluc3BlY3Rvci5Db25zb2xlVGFiQ29udGVudFZpZXc7CiB9 OwogCitXZWJJbnNwZWN0b3Iuc2hvd0VsZW1lbnRzVGFiID0gZnVuY3Rpb24oKQoreworICAgIHZh ciB0YWJDb250ZW50VmlldyA9IHRoaXMudGFiQnJvd3Nlci5iZXN0VGFiQ29udGVudFZpZXdGb3JD bGFzcyhXZWJJbnNwZWN0b3IuRWxlbWVudHNUYWJDb250ZW50Vmlldyk7CisgICAgaWYgKCF0YWJD b250ZW50VmlldykKKyAgICAgICAgdGFiQ29udGVudFZpZXcgPSBuZXcgV2ViSW5zcGVjdG9yLkVs ZW1lbnRzVGFiQ29udGVudFZpZXc7CisgICAgdGhpcy50YWJCcm93c2VyLnNob3dUYWJGb3JDb250 ZW50Vmlldyh0YWJDb250ZW50Vmlldyk7Cit9OworCitXZWJJbnNwZWN0b3Iuc2hvd0RlYnVnZ2Vy VGFiID0gZnVuY3Rpb24oYnJlYWtwb2ludFRvU2VsZWN0KQoreworICAgIHZhciB0YWJDb250ZW50 VmlldyA9IHRoaXMudGFiQnJvd3Nlci5iZXN0VGFiQ29udGVudFZpZXdGb3JDbGFzcyhXZWJJbnNw ZWN0b3IuRGVidWdnZXJUYWJDb250ZW50Vmlldyk7CisgICAgaWYgKCF0YWJDb250ZW50VmlldykK KyAgICAgICAgdGFiQ29udGVudFZpZXcgPSBuZXcgV2ViSW5zcGVjdG9yLkRlYnVnZ2VyVGFiQ29u dGVudFZpZXc7CisKKyAgICBpZiAoYnJlYWtwb2ludFRvU2VsZWN0IGluc3RhbmNlb2YgV2ViSW5z cGVjdG9yLkJyZWFrcG9pbnQpCisgICAgICAgIHRhYkNvbnRlbnRWaWV3LnJldmVhbEFuZFNlbGVj dEJyZWFrcG9pbnQoYnJlYWtwb2ludFRvU2VsZWN0KTsKKworICAgIHRoaXMudGFiQnJvd3Nlci5z aG93VGFiRm9yQ29udGVudFZpZXcodGFiQ29udGVudFZpZXcpOworfTsKKworV2ViSW5zcGVjdG9y LnNob3dSZXNvdXJjZXNUYWIgPSBmdW5jdGlvbigpCit7CisgICAgdmFyIHRhYkNvbnRlbnRWaWV3 ID0gdGhpcy50YWJCcm93c2VyLmJlc3RUYWJDb250ZW50Vmlld0ZvckNsYXNzKFdlYkluc3BlY3Rv ci5SZXNvdXJjZXNUYWJDb250ZW50Vmlldyk7CisgICAgaWYgKCF0YWJDb250ZW50VmlldykKKyAg ICAgICAgdGFiQ29udGVudFZpZXcgPSBuZXcgV2ViSW5zcGVjdG9yLlJlc291cmNlc1RhYkNvbnRl bnRWaWV3OworICAgIHRoaXMudGFiQnJvd3Nlci5zaG93VGFiRm9yQ29udGVudFZpZXcodGFiQ29u dGVudFZpZXcpOworfTsKKworV2ViSW5zcGVjdG9yLnNob3dUaW1lbGluZVRhYiA9IGZ1bmN0aW9u KCkKK3sKKyAgICB2YXIgdGFiQ29udGVudFZpZXcgPSB0aGlzLnRhYkJyb3dzZXIuYmVzdFRhYkNv bnRlbnRWaWV3Rm9yQ2xhc3MoV2ViSW5zcGVjdG9yLlRpbWVsaW5lVGFiQ29udGVudFZpZXcpOwor ICAgIGlmICghdGFiQ29udGVudFZpZXcpCisgICAgICAgIHRhYkNvbnRlbnRWaWV3ID0gbmV3IFdl Ykluc3BlY3Rvci5UaW1lbGluZVRhYkNvbnRlbnRWaWV3OworICAgIHRoaXMudGFiQnJvd3Nlci5z aG93VGFiRm9yQ29udGVudFZpZXcodGFiQ29udGVudFZpZXcpOworfTsKKwogV2ViSW5zcGVjdG9y LlVJU3RyaW5nID0gZnVuY3Rpb24oc3RyaW5nLCB2YXJhcmcpCiB7CiAgICAgaWYgKFdlYkluc3Bl Y3Rvci5kb250TG9jYWxpemVVc2VySW50ZXJmYWNlKQpAQCAtOTE5LDEyICs5NTcsOSBAQCBXZWJJ bnNwZWN0b3IuX2NhcHR1cmVEaWRTdGFydCA9IGZ1bmN0aW9uKGV2ZW50KQogCiBXZWJJbnNwZWN0 b3IuX2RlYnVnZ2VyRGlkUGF1c2UgPSBmdW5jdGlvbihldmVudCkKIHsKLSAgICB0aGlzLmRlYnVn Z2VyU2lkZWJhclBhbmVsLnNob3coKTsKLSAgICB0aGlzLmRhc2hib2FyZENvbnRhaW5lci5zaG93 RGFzaGJvYXJkVmlld0ZvclJlcHJlc2VudGVkT2JqZWN0KHRoaXMuZGFzaGJvYXJkTWFuYWdlci5k YXNoYm9hcmRzLmRlYnVnZ2VyKTsKKyAgICB0aGlzLnNob3dEZWJ1Z2dlclRhYigpOwogCi0gICAg Ly8gU2luY2UgdGhlIFNjb3BlIENoYWluIGRldGFpbHMgc2lkZWJhciBwYW5lbCBtaWdodCBub3Qg YmUgaW4gdGhlIHNpZGViYXIgeWV0LAotICAgIC8vIHNldCBhIGZsYWcgdG8gc2VsZWN0IGFuZCBz aG93IGl0IHdoZW4gaXQgZG9lcyBiZWNvbWUgYXZhaWxhYmxlLgotICAgIHRoaXMuX3NlbGVjdEFu ZFNob3dTY29wZUNoYWluRGV0YWlsc1NpZGViYXJQYW5lbFdoZW5BdmFpbGFibGUgPSB0cnVlOwor ICAgIHRoaXMuZGFzaGJvYXJkQ29udGFpbmVyLnNob3dEYXNoYm9hcmRWaWV3Rm9yUmVwcmVzZW50 ZWRPYmplY3QodGhpcy5kYXNoYm9hcmRNYW5hZ2VyLmRhc2hib2FyZHMuZGVidWdnZXIpOwogCiAg ICAgSW5zcGVjdG9yRnJvbnRlbmRIb3N0LmJyaW5nVG9Gcm9udCgpOwogfTsKQEAgLTExNjUsMTcg KzEyMDAsNiBAQCBXZWJJbnNwZWN0b3IuX25hdmlnYXRpb25TaWRlYmFyUGFuZWxTZWxlY3RlZCA9 IGZ1bmN0aW9uKGV2ZW50KQogICAgIHRoaXMuX3VwZGF0ZUNvbnRlbnRWaWV3Rm9yQ3VycmVudE5h dmlnYXRpb25TaWRlYmFyKCk7CiB9OwogCi1XZWJJbnNwZWN0b3IuX2RvbU5vZGVXYXNJbnNwZWN0 ZWQgPSBmdW5jdGlvbihldmVudCkKLXsKLSAgICBXZWJJbnNwZWN0b3IuZG9tVHJlZU1hbmFnZXIu aGlnaGxpZ2h0RE9NTm9kZUZvclR3b1NlY29uZHMoZXZlbnQuZGF0YS5ub2RlLmlkKTsKLQotICAg IC8vIFNlbGVjdCB0aGUgU3R5bGUgZGV0YWlscyBzaWRlYmFyIHBhbmVsIGlmIG9uZSBvZiB0aGUg RE9NIGRldGFpbHMgc2lkZWJhciBwYW5lbHMgaXNuJ3QgYWxyZWFkeSBzZWxlY3RlZC4KLSAgICBp ZiAoISh0aGlzLmRldGFpbHNTaWRlYmFyLnNlbGVjdGVkU2lkZWJhclBhbmVsIGluc3RhbmNlb2Yg V2ViSW5zcGVjdG9yLkRPTURldGFpbHNTaWRlYmFyUGFuZWwpKQotICAgICAgICB0aGlzLmRldGFp bHNTaWRlYmFyLnNlbGVjdGVkU2lkZWJhclBhbmVsID0gdGhpcy5jc3NTdHlsZURldGFpbHNTaWRl YmFyUGFuZWw7Ci0KLSAgICBJbnNwZWN0b3JGcm9udGVuZEhvc3QuYnJpbmdUb0Zyb250KCk7Ci19 OwotCiBXZWJJbnNwZWN0b3IuX2NvbnRlbnRCcm93c2VyU2l6ZURpZENoYW5nZSA9IGZ1bmN0aW9u KGV2ZW50KQogewogICAgIHRoaXMuY29udGVudEJyb3dzZXIudXBkYXRlTGF5b3V0KCk7CkBAIC0x NjAxLDYgKzE2MjUsMjEgQEAgV2ViSW5zcGVjdG9yLl9tb3ZlV2luZG93TW91c2VEb3duID0gZnVu Y3Rpb24oZXZlbnQpCiAgICAgV2ViSW5zcGVjdG9yLmVsZW1lbnREcmFnU3RhcnQoZXZlbnQudGFy Z2V0LCB0b29sYmFyRHJhZywgdG9vbGJhckRyYWdFbmQsIGV2ZW50LCAiZGVmYXVsdCIpOwogfTsK IAorV2ViSW5zcGVjdG9yLl9zdG9yYWdlV2FzSW5zcGVjdGVkID0gZnVuY3Rpb24oZXZlbnQpCit7 CisgICAgLy8gRklYTUU6IFRoaXMgc2hvdWxkIHNob3cgYSBTdG9yYWdlIHRhYiB3aGVuIHdlIGhh dmUgb25lLgorICAgIHRoaXMuc2hvd1Jlc291cmNlc1RhYigpOworfTsKKworV2ViSW5zcGVjdG9y Ll9kb21Ob2RlV2FzSW5zcGVjdGVkID0gZnVuY3Rpb24oZXZlbnQpCit7CisgICAgV2ViSW5zcGVj dG9yLmRvbVRyZWVNYW5hZ2VyLmhpZ2hsaWdodERPTU5vZGVGb3JUd29TZWNvbmRzKGV2ZW50LmRh dGEubm9kZS5pZCk7CisKKyAgICBJbnNwZWN0b3JGcm9udGVuZEhvc3QuYnJpbmdUb0Zyb250KCk7 CisKKyAgICB0aGlzLnNob3dNYWluRnJhbWVET01UcmVlKGV2ZW50LmRhdGEubm9kZSk7Cit9Owor CiBXZWJJbnNwZWN0b3IuX2luc3BlY3RNb2RlU3RhdGVDaGFuZ2VkID0gZnVuY3Rpb24oZXZlbnQp CiB7CiAgICAgdGhpcy5faW5zcGVjdE1vZGVUb29sYmFyQnV0dG9uLmFjdGl2YXRlZCA9IFdlYklu c3BlY3Rvci5kb21UcmVlTWFuYWdlci5pbnNwZWN0TW9kZUVuYWJsZWQ7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Qcm90b2NvbC9JbnNwZWN0b3JGcm9u dGVuZEFQSS5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Byb3RvY29s L0luc3BlY3RvckZyb250ZW5kQVBJLmpzCmluZGV4IGJmOTY0N2I5NmZmYWZmZmMwYTAyZDIzYzA1 YmZhMDY4NjBhMTMwNDMuLmI5MGFjODBmMTVmMWIxNDFhNjcxNDdiZWU4ZDA4MjhhMWJkYTcxZTEg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Byb3RvY29s L0luc3BlY3RvckZyb250ZW5kQVBJLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1Byb3RvY29sL0luc3BlY3RvckZyb250ZW5kQVBJLmpzCkBAIC00OCw4ICs0OCw4 IEBAIEluc3BlY3RvckZyb250ZW5kQVBJID0gewogICAgICAgICAgICAgcmV0dXJuOwogCiAgICAg ICAgIGlmIChlbmFibGVkKSB7Ci0gICAgICAgICAgICBXZWJJbnNwZWN0b3IubmF2aWdhdGlvblNp ZGViYXIuc2VsZWN0ZWRTaWRlYmFyUGFuZWwgPSBXZWJJbnNwZWN0b3IudGltZWxpbmVTaWRlYmFy UGFuZWw7Ci0gICAgICAgICAgICBXZWJJbnNwZWN0b3IudGltZWxpbmVTaWRlYmFyUGFuZWwuc2hv d1RpbWVsaW5lT3ZlcnZpZXcoKTsKKyAgICAgICAgICAgIFdlYkluc3BlY3Rvci5pZ25vcmVMYXN0 Q29udGVudENvb2tpZSA9IHRydWU7CisgICAgICAgICAgICBXZWJJbnNwZWN0b3Iuc2hvd1RpbWVs aW5lVGFiKCk7CiAgICAgICAgICAgICBXZWJJbnNwZWN0b3IudGltZWxpbmVNYW5hZ2VyLnN0YXJ0 Q2FwdHVyaW5nKCk7CiAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICBXZWJJbnNwZWN0b3Iu dGltZWxpbmVNYW5hZ2VyLnN0b3BDYXB0dXJpbmcoKTsKQEAgLTYzLDYgKzYzLDcgQEAgSW5zcGVj dG9yRnJvbnRlbmRBUEkgPSB7CiAKICAgICBzaG93Q29uc29sZTogZnVuY3Rpb24oKQogICAgIHsK KyAgICAgICAgV2ViSW5zcGVjdG9yLmlnbm9yZUxhc3RDb250ZW50Q29va2llID0gdHJ1ZTsKICAg ICAgICAgV2ViSW5zcGVjdG9yLnNob3dDb25zb2xlVGFiKCk7CiAKICAgICAgICAgV2ViSW5zcGVj dG9yLnF1aWNrQ29uc29sZS5wcm9tcHQuZm9jdXMoKTsKQEAgLTg1LDggKzg2LDcgQEAgSW5zcGVj dG9yRnJvbnRlbmRBUEkgPSB7CiAgICAgc2hvd1Jlc291cmNlczogZnVuY3Rpb24oKQogICAgIHsK ICAgICAgICAgV2ViSW5zcGVjdG9yLmlnbm9yZUxhc3RDb250ZW50Q29va2llID0gdHJ1ZTsKLSAg ICAgICAgV2ViSW5zcGVjdG9yLm5hdmlnYXRpb25TaWRlYmFyLnNlbGVjdGVkU2lkZWJhclBhbmVs ID0gV2ViSW5zcGVjdG9yLnJlc291cmNlU2lkZWJhclBhbmVsOwotICAgICAgICBXZWJJbnNwZWN0 b3IubmF2aWdhdGlvblNpZGViYXIuY29sbGFwc2VkID0gZmFsc2U7CisgICAgICAgIFdlYkluc3Bl Y3Rvci5zaG93UmVzb3VyY2VzVGFiKCk7CiAgICAgfSwKIAogICAgIHNob3dNYWluUmVzb3VyY2VG b3JGcmFtZTogZnVuY3Rpb24oZnJhbWVJZGVudGlmaWVyKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvUHJvdG9jb2wvSW5zcGVjdG9yT2JzZXJ2ZXIuanMg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Qcm90b2NvbC9JbnNwZWN0b3JP YnNlcnZlci5qcwppbmRleCA4YmRhZGI3ZWRlOWE4ZTZiZDRlYjM4YmJiZDQ4YzIxMTA5ZjA0ODA3 Li5jZTY5MDA1NjkwNGY4MDI1MTM1N2EzZTZkMjc5MzczN2RmODIxMjY1IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Qcm90b2NvbC9JbnNwZWN0b3JPYnNl cnZlci5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Qcm90b2Nv bC9JbnNwZWN0b3JPYnNlcnZlci5qcwpAQCAtNDIsNyArNDIsNiBAQCBXZWJJbnNwZWN0b3IuSW5z cGVjdG9yT2JzZXJ2ZXIgPSBjbGFzcyBJbnNwZWN0b3JPYnNlcnZlcgogICAgICAgICB2YXIgcmVt b3RlT2JqZWN0ID0gV2ViSW5zcGVjdG9yLlJlbW90ZU9iamVjdC5mcm9tUGF5bG9hZChwYXlsb2Fk KTsKICAgICAgICAgaWYgKHJlbW90ZU9iamVjdC5zdWJ0eXBlID09PSAibm9kZSIpIHsKICAgICAg ICAgICAgIFdlYkluc3BlY3Rvci5kb21UcmVlTWFuYWdlci5pbnNwZWN0Tm9kZU9iamVjdChyZW1v dGVPYmplY3QpOwotICAgICAgICAgICAgV2ViSW5zcGVjdG9yLm5hdmlnYXRpb25TaWRlYmFyLnNl bGVjdGVkU2lkZWJhclBhbmVsID0gV2ViSW5zcGVjdG9yLnJlc291cmNlU2lkZWJhclBhbmVsOwog ICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAKQEAgLTUxLDggKzUwLDYgQEAgV2ViSW5z cGVjdG9yLkluc3BlY3Rvck9ic2VydmVyID0gY2xhc3MgSW5zcGVjdG9yT2JzZXJ2ZXIKICAgICAg ICAgZWxzZSBpZiAoaGludHMuZG9tU3RvcmFnZUlkKQogICAgICAgICAgICAgV2ViSW5zcGVjdG9y LnN0b3JhZ2VNYW5hZ2VyLmluc3BlY3RET01TdG9yYWdlKGhpbnRzLmRvbVN0b3JhZ2VJZCk7CiAK LSAgICAgICAgV2ViSW5zcGVjdG9yLm5hdmlnYXRpb25TaWRlYmFyLnNlbGVjdGVkU2lkZWJhclBh bmVsID0gV2ViSW5zcGVjdG9yLnJlc291cmNlU2lkZWJhclBhbmVsOwotCiAgICAgICAgIHJlbW90 ZU9iamVjdC5yZWxlYXNlKCk7CiAgICAgfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9EZWJ1Z2dlclRhYkNvbnRlbnRWaWV3LmpzIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRGVidWdnZXJUYWJDb250ZW50 Vmlldy5qcwppbmRleCBjZjM3MjcxM2IwNmZkNzJiMzYxOGNkMzQzNGVkOGQ4MzZkNmUzNGEzLi5l Y2RlM2EwZTExMzNhMmZhZWM3YTI2ZjNiYjM3NTgyZDkyYjg2YjRhIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9EZWJ1Z2dlclRhYkNvbnRlbnRW aWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0Rl YnVnZ2VyVGFiQ29udGVudFZpZXcuanMKQEAgLTQ2LDUgKzQ2LDE0IEBAIFdlYkluc3BlY3Rvci5E ZWJ1Z2dlclRhYkNvbnRlbnRWaWV3LnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHJldHVybiBm YWxzZTsKIAogICAgICAgICByZXR1cm4gcmVwcmVzZW50ZWRPYmplY3QudHlwZSA9PT0gV2ViSW5z cGVjdG9yLlJlc291cmNlLlR5cGUuRG9jdW1lbnQgfHwgcmVwcmVzZW50ZWRPYmplY3QudHlwZSA9 PT0gV2ViSW5zcGVjdG9yLlJlc291cmNlLlR5cGUuU2NyaXB0OworICAgIH0sCisKKyAgICByZXZl YWxBbmRTZWxlY3RCcmVha3BvaW50OiBmdW5jdGlvbihicmVha3BvaW50KQorICAgIHsKKyAgICAg ICAgY29uc29sZS5hc3NlcnQoYnJlYWtwb2ludCBpbnN0YW5jZW9mIFdlYkluc3BlY3Rvci5CcmVh a3BvaW50KTsKKworICAgICAgICB2YXIgdHJlZUVsZW1lbnQgPSB0aGlzLm5hdmlnYXRpb25TaWRl YmFyUGFuZWwudHJlZUVsZW1lbnRGb3JSZXByZXNlbnRlZE9iamVjdChicmVha3BvaW50KTsKKyAg ICAgICAgaWYgKHRyZWVFbGVtZW50KQorICAgICAgICAgICAgdHJlZUVsZW1lbnQucmV2ZWFsQW5k U2VsZWN0KCk7CiAgICAgfQogfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL0RlZmF1bHREYXNoYm9hcmRWaWV3LmpzIGIvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRGVmYXVsdERhc2hib2FyZFZpZXcuanMKaW5k ZXggZmUxYWRjYTIxMTliOWFjYmVmMzc0M2YzM2JhMWM1Y2JlMzc3N2U3Zi4uMTAzMTYxOTdjY2Mw ZWY0MjNjNTQ3MDM2NmEwNTg1YzE0ZDdkYjZhOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRGVmYXVsdERhc2hib2FyZFZpZXcuanMKKysrIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRGVmYXVsdERhc2hib2Fy ZFZpZXcuanMKQEAgLTMzLDE5ICszMywxOSBAQCBXZWJJbnNwZWN0b3IuRGVmYXVsdERhc2hib2Fy ZFZpZXcgPSBjbGFzcyBEZWZhdWx0RGFzaGJvYXJkVmlldyBleHRlbmRzIFdlYkluc3BlYwogCiAg ICAgICAgIHRoaXMuX2l0ZW1zID0gewogICAgICAgICAgICAgcmVzb3VyY2VzQ291bnQ6IHsKLSAg ICAgICAgICAgICAgICB0b29sdGlwOiBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlRvdGFsIG51bWJl ciBvZiByZXNvdXJjZXMsIGNsaWNrIHRvIHNob3cgdGhlIFJlc291cmNlcyBuYXZpZ2F0aW9uIHNp ZGViYXIiKSwKKyAgICAgICAgICAgICAgICB0b29sdGlwOiBXZWJJbnNwZWN0b3IuVUlTdHJpbmco IlRvdGFsIG51bWJlciBvZiByZXNvdXJjZXMsIGNsaWNrIHRvIHNob3cgdGhlIFJlc291cmNlcyB0 YWIiKSwKICAgICAgICAgICAgICAgICBoYW5kbGVyOiB0aGlzLl9yZXNvdXJjZXNXYXNDbGlja2Vk CiAgICAgICAgICAgICB9LAogICAgICAgICAgICAgbG9nczogewotICAgICAgICAgICAgICAgIHRv b2x0aXA6IFdlYkluc3BlY3Rvci5VSVN0cmluZygiQ29uc29sZSBsb2dzLCBjbGljayB0byBzaG93 IHRoZSBDb25zb2xlIiksCisgICAgICAgICAgICAgICAgdG9vbHRpcDogV2ViSW5zcGVjdG9yLlVJ U3RyaW5nKCJDb25zb2xlIGxvZ3MsIGNsaWNrIHRvIHNob3cgdGhlIENvbnNvbGUgdGFiIiksCiAg ICAgICAgICAgICAgICAgaGFuZGxlcjogdGhpcy5fY29uc29sZUl0ZW1XYXNDbGlja2VkLmJpbmQo dGhpcywgV2ViSW5zcGVjdG9yLkxvZ0NvbnRlbnRWaWV3LlNjb3Blcy5Mb2dzKQogICAgICAgICAg ICAgfSwKICAgICAgICAgICAgIGVycm9yczogewotICAgICAgICAgICAgICAgIHRvb2x0aXA6IFdl Ykluc3BlY3Rvci5VSVN0cmluZygiQ29uc29sZSBlcnJvcnMsIGNsaWNrIHRvIHNob3cgdGhlIENv bnNvbGUiKSwKKyAgICAgICAgICAgICAgICB0b29sdGlwOiBXZWJJbnNwZWN0b3IuVUlTdHJpbmco IkNvbnNvbGUgZXJyb3JzLCBjbGljayB0byBzaG93IHRoZSBDb25zb2xlIHRhYiIpLAogICAgICAg ICAgICAgICAgIGhhbmRsZXI6IHRoaXMuX2NvbnNvbGVJdGVtV2FzQ2xpY2tlZC5iaW5kKHRoaXMs IFdlYkluc3BlY3Rvci5Mb2dDb250ZW50Vmlldy5TY29wZXMuRXJyb3JzKQogICAgICAgICAgICAg fSwKICAgICAgICAgICAgIGlzc3VlczogewotICAgICAgICAgICAgICAgIHRvb2x0aXA6IFdlYklu c3BlY3Rvci5VSVN0cmluZygiQ29uc29sZSB3YXJuaW5ncywgY2xpY2sgdG8gc2hvdyB0aGUgQ29u c29sZSIpLAorICAgICAgICAgICAgICAgIHRvb2x0aXA6IFdlYkluc3BlY3Rvci5VSVN0cmluZygi Q29uc29sZSB3YXJuaW5ncywgY2xpY2sgdG8gc2hvdyB0aGUgQ29uc29sZSB0YWIiKSwKICAgICAg ICAgICAgICAgICBoYW5kbGVyOiB0aGlzLl9jb25zb2xlSXRlbVdhc0NsaWNrZWQuYmluZCh0aGlz LCBXZWJJbnNwZWN0b3IuTG9nQ29udGVudFZpZXcuU2NvcGVzLldhcm5pbmdzKQogICAgICAgICAg ICAgfQogICAgICAgICB9OwpAQCAtMTExLDEzICsxMTEsNyBAQCBXZWJJbnNwZWN0b3IuRGVmYXVs dERhc2hib2FyZFZpZXcgPSBjbGFzcyBEZWZhdWx0RGFzaGJvYXJkVmlldyBleHRlbmRzIFdlYklu c3BlYwogCiAgICAgX3Jlc291cmNlc1dhc0NsaWNrZWQoKQogICAgIHsKLSAgICAgICAgV2ViSW5z cGVjdG9yLm5hdmlnYXRpb25TaWRlYmFyLnNlbGVjdGVkU2lkZWJhclBhbmVsID0gV2ViSW5zcGVj dG9yLnJlc291cmNlU2lkZWJhclBhbmVsOwotICAgICAgICBXZWJJbnNwZWN0b3IubmF2aWdhdGlv blNpZGViYXIuY29sbGFwc2VkID0gZmFsc2U7Ci0gICAgfQotCi0gICAgX25ldHdvcmtJdGVtV2Fz Q2xpY2tlZCgpCi0gICAgewotICAgICAgICBXZWJJbnNwZWN0b3IubmF2aWdhdGlvblNpZGViYXIu c2VsZWN0ZWRTaWRlYmFyUGFuZWwgPSBXZWJJbnNwZWN0b3IudGltZWxpbmVTaWRlYmFyUGFuZWw7 CisgICAgICAgIFdlYkluc3BlY3Rvci5zaG93UmVzb3VyY2VzVGFiKCk7CiAgICAgfQogCiAgICAg X2NvbnNvbGVJdGVtV2FzQ2xpY2tlZChzY29wZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NvdXJjZUNvZGVUZXh0RWRpdG9yLmpzIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU291cmNlQ29kZVRleHRFZGl0 b3IuanMKaW5kZXggMjM4YjkwZDE0NmQ1MmRlZWUzMzE5N2YzODVkZDI5NmFmMzRjMGI0Mi4uNTVk NmZlYWNlNDkyZmJkMzBjNTEyNDE4YzBmNDk1MmMzY2FhOTMwMiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU291cmNlQ29kZVRleHRFZGl0b3Iu anMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU291cmNl Q29kZVRleHRFZGl0b3IuanMKQEAgLTk4OCwxMCArOTg4LDcgQEAgV2ViSW5zcGVjdG9yLlNvdXJj ZUNvZGVUZXh0RWRpdG9yID0gY2xhc3MgU291cmNlQ29kZVRleHRFZGl0b3IgZXh0ZW5kcyBXZWJJ bnNwZWMKIAogICAgICAgICBmdW5jdGlvbiByZXZlYWxJblNpZGViYXIoKQogICAgICAgICB7Ci0g ICAgICAgICAgICBXZWJJbnNwZWN0b3IuZGVidWdnZXJTaWRlYmFyUGFuZWwuc2hvdygpOwotICAg ICAgICAgICAgdmFyIHRyZWVFbGVtZW50ID0gV2ViSW5zcGVjdG9yLmRlYnVnZ2VyU2lkZWJhclBh bmVsLnRyZWVFbGVtZW50Rm9yUmVwcmVzZW50ZWRPYmplY3QoYnJlYWtwb2ludCk7Ci0gICAgICAg ICAgICBpZiAodHJlZUVsZW1lbnQpCi0gICAgICAgICAgICAgICAgdHJlZUVsZW1lbnQucmV2ZWFs QW5kU2VsZWN0KCk7CisgICAgICAgICAgICBXZWJJbnNwZWN0b3Iuc2hvd0RlYnVnZ2VyVGFiKGJy ZWFrcG9pbnQpOwogICAgICAgICB9CiAKICAgICAgICAgdmFyIGNvbnRleHRNZW51ID0gbmV3IFdl Ykluc3BlY3Rvci5Db250ZXh0TWVudShldmVudCk7CkBAIC0xMDM3LDcgKzEwMzQsNyBAQCBXZWJJ bnNwZWN0b3IuU291cmNlQ29kZVRleHRFZGl0b3IgPSBjbGFzcyBTb3VyY2VDb2RlVGV4dEVkaXRv ciBleHRlbmRzIFdlYkluc3BlYwogCiAgICAgICAgICAgICBicmVha3BvaW50LmFwcGVuZENvbnRl eHRNZW51SXRlbXMoY29udGV4dE1lbnUsIGV2ZW50LnRhcmdldCk7CiAgICAgICAgICAgICBjb250 ZXh0TWVudS5hcHBlbmRTZXBhcmF0b3IoKTsKLSAgICAgICAgICAgIGNvbnRleHRNZW51LmFwcGVu ZEl0ZW0oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJSZXZlYWwgaW4gRGVidWdnZXIgTmF2aWdhdGlv biBTaWRlYmFyIiksIHJldmVhbEluU2lkZWJhcik7CisgICAgICAgICAgICBjb250ZXh0TWVudS5h cHBlbmRJdGVtKFdlYkluc3BlY3Rvci5VSVN0cmluZygiUmV2ZWFsIGluIERlYnVnZ2VyIFRhYiIp LCByZXZlYWxJblNpZGViYXIpOwogICAgICAgICAgICAgY29udGV4dE1lbnUuc2hvdygpOwogICAg ICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UYWJCcm93c2VyLmpzIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGFiQnJvd3Nlci5qcwppbmRleCAwZmIyMjhmZjA0 OTlhYjgzM2VmZTZlZTg1N2I3NmFkZmUxOWZhMGUxLi4wOTUxODRhMTZkNTBmMzZkNTU0ODA1Yjcx MDMwZTUyN2RiNjlhYzNhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9UYWJCcm93c2VyLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL1RhYkJyb3dzZXIuanMKQEAgLTg3LDYgKzg3LDE4IEBAIFdlYklu c3BlY3Rvci5UYWJCcm93c2VyID0gY2xhc3MgVGFiQnJvd3NlciBleHRlbmRzIFdlYkluc3BlY3Rv ci5PYmplY3QKICAgICAgICAgdGhpcy5fY29udGVudFZpZXdDb250YWluZXIudXBkYXRlTGF5b3V0 KCk7CiAgICAgfQogCisgICAgYmVzdFRhYkNvbnRlbnRWaWV3Rm9yQ2xhc3MoY29uc3RydWN0b3Ip CisgICAgeworICAgICAgICBjb25zb2xlLmFzc2VydCghdGhpcy5zZWxlY3RlZFRhYkNvbnRlbnRW aWV3IHx8IHRoaXMuc2VsZWN0ZWRUYWJDb250ZW50VmlldyA9PT0gdGhpcy5fcmVjZW50VGFiQ29u dGVudFZpZXdzWzBdKTsKKworICAgICAgICBmb3IgKHZhciB0YWJDb250ZW50VmlldyBvZiB0aGlz Ll9yZWNlbnRUYWJDb250ZW50Vmlld3MpIHsKKyAgICAgICAgICAgIGlmICh0YWJDb250ZW50Vmll dyBpbnN0YW5jZW9mIGNvbnN0cnVjdG9yKQorICAgICAgICAgICAgICAgIHJldHVybiB0YWJDb250 ZW50VmlldzsKKyAgICAgICAgfQorCisgICAgICAgIHJldHVybiBudWxsOworICAgIH0KKwogICAg IGJlc3RUYWJDb250ZW50Vmlld0ZvclJlcHJlc2VudGVkT2JqZWN0KHJlcHJlc2VudGVkT2JqZWN0 KQogICAgIHsKICAgICAgICAgY29uc29sZS5hc3NlcnQoIXRoaXMuc2VsZWN0ZWRUYWJDb250ZW50 VmlldyB8fCB0aGlzLnNlbGVjdGVkVGFiQ29udGVudFZpZXcgPT09IHRoaXMuX3JlY2VudFRhYkNv bnRlbnRWaWV3c1swXSk7Cg==