165496 2016-12-06 15:54:35 -0800 REGRESSION(r203912): Web Inspector: Navigation sidebar widths are not saved 2016-12-07 20:27:51 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED P2 Normal --- 1 hi hi bburg commit-queue joepeck mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1257041 0 hi 2016-12-06 15:54:35 -0800 Moving the width-saving WI.Setting logic to the WI.TabBrowser caused the navigation sidebar to no longer remember its width. 1257046 1 296341 hi 2016-12-06 15:57:37 -0800 Created attachment 296341 Patch 1257436 2 296341 mattbaker 2016-12-07 16:25:32 -0800 Comment on attachment 296341 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=296341&action=review Looks good! r=me with nits > Source/WebInspectorUI/UserInterface/Views/TabBrowser.js:299 > + _sidebarWidthDidChange(event) { Open brace should be on its own line. > Source/WebInspectorUI/UserInterface/Views/TabContentView.js:51 > + this._navigationSidebarWidthSetting = new WebInspector.Setting(identifier + "-navigation-sidebar-width", 300); Since 300 is used in two places lets make it a const: const defaultSidebarWidth = 300; 1257492 3 296448 hi 2016-12-07 17:24:32 -0800 Created attachment 296448 Patch 1257576 4 296448 commit-queue 2016-12-07 20:27:47 -0800 Comment on attachment 296448 Patch Clearing flags on attachment: 296448 Committed r209519: <http://trac.webkit.org/changeset/209519> 1257577 5 commit-queue 2016-12-07 20:27:51 -0800 All reviewed patches have been landed. Closing bug. 296341 2016-12-06 15:57:37 -0800 2016-12-07 17:24:32 -0800 Patch bug-165496-20161206155700.patch text/plain 7629 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDZlMjEwN2E3YmExMDkxZDdjMzViM2JiNDBmZDlk NjUxNWVkNzZhMmEuLjZhNTI3YTFiOGM4MTVkMjVjMmZlYzU4ZmJhZTFhNzdjYjJlODdjN2YgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDE2LTEyLTA2ICBEZXZp biBSb3Vzc28gIDxkY3JvdXNzbyt3ZWJraXRAZ21haWwuY29tPgorCisgICAgICAgIFJFR1JFU1NJ T04ocjIwMzkxMik6IFdlYiBJbnNwZWN0b3I6IE5hdmlnYXRpb24gc2lkZWJhciB3aWR0aHMgYXJl IG5vdCBzYXZlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTY1NDk2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1RhYkJyb3dzZXIuanM6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuVGFiQnJvd3Nlcik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGFiQnJvd3Nlci5wcm90 b3R5cGUuX3NpZGViYXJXaWR0aERpZENoYW5nZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGFi QnJvd3Nlci5wcm90b3R5cGUuX3Nob3dOYXZpZ2F0aW9uU2lkZWJhclBhbmVsRm9yVGFiQ29udGVu dFZpZXcpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRhYkJyb3dzZXIucHJvdG90eXBlLl9zaWRl YmFyV2lkdGhEaWRDaGFuZ2UpOiBSZW5hbWVkIGZyb20gX2RldGFpbHNTaWRlYmFyV2lkdGhEaWRD aGFuZ2UuCisgICAgICAgIEFkZCBldmVudCBsaXN0ZW5lciBmb3Igd2hlbiB0aGUgbmF2aWdhdGlv biBzaWRlYmFyJ3Mgd2lkdGggaXMgY2hhbmdlZC4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2Uv Vmlld3MvVGFiQ29udGVudFZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGFiQ29udGVu dFZpZXcpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRhYkNvbnRlbnRWaWV3LnByb3RvdHlwZS5n ZXQgbmF2aWdhdGlvblNpZGViYXJQYW5lbCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGFiQ29u dGVudFZpZXcucHJvdG90eXBlLmdldCBuYXZpZ2F0aW9uU2lkZWJhckNvbGxhcHNlZFNldHRpbmcp OgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRhYkNvbnRlbnRWaWV3LnByb3RvdHlwZS5nZXQgbmF2 aWdhdGlvblNpZGViYXJXaWR0aFNldHRpbmcpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRhYkNv bnRlbnRWaWV3LnByb3RvdHlwZS5nZXQgZGV0YWlsc1NpZGViYXJQYW5lbHMpOgorICAgICAgICAo V2ViSW5zcGVjdG9yLlRhYkNvbnRlbnRWaWV3LnByb3RvdHlwZS5nZXQgZGV0YWlsc1NpZGViYXJD b2xsYXBzZWRTZXR0aW5nKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UYWJDb250ZW50Vmlldy5w cm90b3R5cGUuZ2V0IGRldGFpbHNTaWRlYmFyU2VsZWN0ZWRQYW5lbFNldHRpbmcpOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLlRhYkNvbnRlbnRWaWV3LnByb3RvdHlwZS5nZXQgZGV0YWlsc1NpZGVi YXJXaWR0aFNldHRpbmcpOgorICAgICAgICBBZGQgV2ViSW5zcGVjdG9yLlNldHRpbmcgb2JqZWN0 IGZvciB0aGUgbmF2aWdhdGlvbiBzaWRlYmFyJ3Mgd2lkdGguCisKIDIwMTYtMTItMDIgIEFuZHkg RXN0ZXMgIDxhZXN0ZXNAYXBwbGUuY29tPgogCiAgICAgICAgIFtDb2NvYV0gQWRvcHQgdGhlIFBS T0RVQ1RfQlVORExFX0lERU5USUZJRVIgYnVpbGQgc2V0dGluZwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGFiQnJvd3Nlci5qcyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RhYkJyb3dzZXIuanMKaW5kZXgg OGNlMTg1MjQxM2I2NThiNzg4M2RiZGJmZmE5NDA0NjRlYzUxYjcxZS4uZWE4OWYzMDhlNDhmNGYx NzFhZjczNGY3NjhhYWVmNmQ2NTRlZDcxNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGFiQnJvd3Nlci5qcworKysgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UYWJCcm93c2VyLmpzCkBAIC0zNywxMyArMzcs MTUgQEAgV2ViSW5zcGVjdG9yLlRhYkJyb3dzZXIgPSBjbGFzcyBUYWJCcm93c2VyIGV4dGVuZHMg V2ViSW5zcGVjdG9yLlZpZXcKICAgICAgICAgdGhpcy5fbmF2aWdhdGlvblNpZGViYXIgPSBuYXZp Z2F0aW9uU2lkZWJhciB8fCBudWxsOwogICAgICAgICB0aGlzLl9kZXRhaWxzU2lkZWJhciA9IGRl dGFpbHNTaWRlYmFyIHx8IG51bGw7CiAKLSAgICAgICAgaWYgKHRoaXMuX25hdmlnYXRpb25TaWRl YmFyKQorICAgICAgICBpZiAodGhpcy5fbmF2aWdhdGlvblNpZGViYXIpIHsKICAgICAgICAgICAg IHRoaXMuX25hdmlnYXRpb25TaWRlYmFyLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlNp ZGViYXIuRXZlbnQuQ29sbGFwc2VkU3RhdGVEaWRDaGFuZ2UsIHRoaXMuX3NpZGViYXJDb2xsYXBz ZWRTdGF0ZURpZENoYW5nZSwgdGhpcyk7CisgICAgICAgICAgICB0aGlzLl9uYXZpZ2F0aW9uU2lk ZWJhci5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5TaWRlYmFyLkV2ZW50LldpZHRoRGlk Q2hhbmdlLCB0aGlzLl9zaWRlYmFyV2lkdGhEaWRDaGFuZ2UsIHRoaXMpOworICAgICAgICB9CiAK ICAgICAgICAgaWYgKHRoaXMuX2RldGFpbHNTaWRlYmFyKSB7CiAgICAgICAgICAgICB0aGlzLl9k ZXRhaWxzU2lkZWJhci5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5TaWRlYmFyLkV2ZW50 LkNvbGxhcHNlZFN0YXRlRGlkQ2hhbmdlLCB0aGlzLl9zaWRlYmFyQ29sbGFwc2VkU3RhdGVEaWRD aGFuZ2UsIHRoaXMpOwogICAgICAgICAgICAgdGhpcy5fZGV0YWlsc1NpZGViYXIuYWRkRXZlbnRM aXN0ZW5lcihXZWJJbnNwZWN0b3IuU2lkZWJhci5FdmVudC5TaWRlYmFyUGFuZWxTZWxlY3RlZCwg dGhpcy5fc2lkZWJhclBhbmVsU2VsZWN0ZWQsIHRoaXMpOwotICAgICAgICAgICAgdGhpcy5fZGV0 YWlsc1NpZGViYXIuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuU2lkZWJhci5FdmVudC5X aWR0aERpZENoYW5nZSwgdGhpcy5fZGV0YWlsc1NpZGViYXJXaWR0aERpZENoYW5nZSwgdGhpcyk7 CisgICAgICAgICAgICB0aGlzLl9kZXRhaWxzU2lkZWJhci5hZGRFdmVudExpc3RlbmVyKFdlYklu c3BlY3Rvci5TaWRlYmFyLkV2ZW50LldpZHRoRGlkQ2hhbmdlLCB0aGlzLl9zaWRlYmFyV2lkdGhE aWRDaGFuZ2UsIHRoaXMpOwogICAgICAgICB9CiAKICAgICAgICAgdGhpcy5fY29udGVudFZpZXdD b250YWluZXIgPSBuZXcgV2ViSW5zcGVjdG9yLkNvbnRlbnRWaWV3Q29udGFpbmVyOwpAQCAtMjk0 LDE3ICsyOTYsMjMgQEAgV2ViSW5zcGVjdG9yLlRhYkJyb3dzZXIgPSBjbGFzcyBUYWJCcm93c2Vy IGV4dGVuZHMgV2ViSW5zcGVjdG9yLlZpZXcKICAgICAgICAgICAgIHRhYkNvbnRlbnRWaWV3LmRl dGFpbHNTaWRlYmFyQ29sbGFwc2VkU2V0dGluZy52YWx1ZSA9IHRoaXMuX2RldGFpbHNTaWRlYmFy LmNvbGxhcHNlZDsKICAgICB9CiAKLSAgICBfZGV0YWlsc1NpZGViYXJXaWR0aERpZENoYW5nZShl dmVudCkKLSAgICB7Ci0gICAgICAgIGlmICh0aGlzLl9pZ25vcmVTaWRlYmFyRXZlbnRzKQorICAg IF9zaWRlYmFyV2lkdGhEaWRDaGFuZ2UoZXZlbnQpIHsKKyAgICAgICAgaWYgKHRoaXMuX2lnbm9y ZVNpZGViYXJFdmVudHMgfHwgIWV2ZW50LmRhdGEpCiAgICAgICAgICAgICByZXR1cm47CiAKICAg ICAgICAgbGV0IHRhYkNvbnRlbnRWaWV3ID0gdGhpcy5zZWxlY3RlZFRhYkNvbnRlbnRWaWV3Owog ICAgICAgICBpZiAoIXRhYkNvbnRlbnRWaWV3KQogICAgICAgICAgICAgcmV0dXJuOwogCi0gICAg ICAgIGlmIChldmVudC50YXJnZXQgPT09IHRoaXMuX2RldGFpbHNTaWRlYmFyICYmIGV2ZW50LmRh dGEpCisgICAgICAgIHN3aXRjaCAoZXZlbnQudGFyZ2V0KSB7CisgICAgICAgIGNhc2UgdGhpcy5f bmF2aWdhdGlvblNpZGViYXI6CisgICAgICAgICAgICB0YWJDb250ZW50Vmlldy5uYXZpZ2F0aW9u U2lkZWJhcldpZHRoU2V0dGluZy52YWx1ZSA9IGV2ZW50LmRhdGEubmV3V2lkdGg7CisgICAgICAg ICAgICBicmVhazsKKworICAgICAgICBjYXNlIHRoaXMuX2RldGFpbHNTaWRlYmFyOgogICAgICAg ICAgICAgdGFiQ29udGVudFZpZXcuZGV0YWlsc1NpZGViYXJXaWR0aFNldHRpbmcudmFsdWUgPSBl dmVudC5kYXRhLm5ld1dpZHRoOworICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIH0KICAgICB9 CiAKICAgICBfc2hvd05hdmlnYXRpb25TaWRlYmFyUGFuZWxGb3JUYWJDb250ZW50Vmlldyh0YWJD b250ZW50VmlldykKQEAgLTMyMyw2ICszMzEsOSBAQCBXZWJJbnNwZWN0b3IuVGFiQnJvd3NlciA9 IGNsYXNzIFRhYkJyb3dzZXIgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuVmlldwogICAgICAgICAgICAg cmV0dXJuOwogICAgICAgICB9CiAKKyAgICAgICAgaWYgKHRhYkNvbnRlbnRWaWV3Lm5hdmlnYXRp b25TaWRlYmFyV2lkdGhTZXR0aW5nLnZhbHVlKQorICAgICAgICAgICAgdGhpcy5fbmF2aWdhdGlv blNpZGViYXIud2lkdGggPSB0YWJDb250ZW50Vmlldy5uYXZpZ2F0aW9uU2lkZWJhcldpZHRoU2V0 dGluZy52YWx1ZTsKKwogICAgICAgICB2YXIgbmF2aWdhdGlvblNpZGViYXJQYW5lbCA9IHRhYkNv bnRlbnRWaWV3Lm5hdmlnYXRpb25TaWRlYmFyUGFuZWw7CiAgICAgICAgIGlmICghbmF2aWdhdGlv blNpZGViYXJQYW5lbCkgewogICAgICAgICAgICAgdGhpcy5fbmF2aWdhdGlvblNpZGViYXIuY29s bGFwc2VkID0gdHJ1ZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL1RhYkNvbnRlbnRWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvVGFiQ29udGVudFZpZXcuanMKaW5kZXggMzU4NzA0ODY5YTY4ZTFl MGQ4ODc5YTc3ZDE4YzgzOTU5NWFkYTMyYi4uYjBkMzc3NTQ2NDkxMjU0MjUwZjgzNDlmMWI3ODA2 ZGM0YmI3ZTgxYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvVGFiQ29udGVudFZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvVGFiQ29udGVudFZpZXcuanMKQEAgLTQ4LDEwICs0OCwxMSBAQCBX ZWJJbnNwZWN0b3IuVGFiQ29udGVudFZpZXcgPSBjbGFzcyBUYWJDb250ZW50VmlldyBleHRlbmRz IFdlYkluc3BlY3Rvci5Db250ZW50VgogICAgICAgICB0aGlzLl9kZXRhaWxzU2lkZWJhclBhbmVs cyA9IGRldGFpbHNTaWRlYmFyUGFuZWxzIHx8IFtdOwogCiAgICAgICAgIHRoaXMuX25hdmlnYXRp b25TaWRlYmFyQ29sbGFwc2VkU2V0dGluZyA9IG5ldyBXZWJJbnNwZWN0b3IuU2V0dGluZyhpZGVu dGlmaWVyICsgIi1uYXZpZ2F0aW9uLXNpZGViYXItY29sbGFwc2VkIiwgZmFsc2UpOworICAgICAg ICB0aGlzLl9uYXZpZ2F0aW9uU2lkZWJhcldpZHRoU2V0dGluZyA9IG5ldyBXZWJJbnNwZWN0b3Iu U2V0dGluZyhpZGVudGlmaWVyICsgIi1uYXZpZ2F0aW9uLXNpZGViYXItd2lkdGgiLCAzMDApOwog CiAgICAgICAgIHRoaXMuX2RldGFpbHNTaWRlYmFyQ29sbGFwc2VkU2V0dGluZyA9IG5ldyBXZWJJ bnNwZWN0b3IuU2V0dGluZyhpZGVudGlmaWVyICsgIi1kZXRhaWxzLXNpZGViYXItY29sbGFwc2Vk IiwgdHJ1ZSk7CiAgICAgICAgIHRoaXMuX2RldGFpbHNTaWRlYmFyU2VsZWN0ZWRQYW5lbFNldHRp bmcgPSBuZXcgV2ViSW5zcGVjdG9yLlNldHRpbmcoaWRlbnRpZmllciArICItZGV0YWlscy1zaWRl YmFyLXNlbGVjdGVkLXBhbmVsIiwgbnVsbCk7Ci0gICAgICAgIHRoaXMuX2RldGFpbHNTaWRlYmFy V2lkdGhTZXR0aW5nID0gbmV3IFdlYkluc3BlY3Rvci5TZXR0aW5nKGlkZW50aWZpZXIgKyAiLWRl dGFpbHMtc2lkZWJhci13aWR0aCIsIDApOworICAgICAgICB0aGlzLl9kZXRhaWxzU2lkZWJhcldp ZHRoU2V0dGluZyA9IG5ldyBXZWJJbnNwZWN0b3IuU2V0dGluZyhpZGVudGlmaWVyICsgIi1kZXRh aWxzLXNpZGViYXItd2lkdGgiLCAzMDApOwogCiAgICAgICAgIHRoaXMuX2Nvb2tpZVNldHRpbmcg PSBuZXcgV2ViSW5zcGVjdG9yLlNldHRpbmcoaWRlbnRpZmllciArICItdGFiLWNvb2tpZSIsIHt9 KTsKICAgICB9CkBAIC0xNzAsMzMgKzE3MSwxMiBAQCBXZWJJbnNwZWN0b3IuVGFiQ29udGVudFZp ZXcgPSBjbGFzcyBUYWJDb250ZW50VmlldyBleHRlbmRzIFdlYkluc3BlY3Rvci5Db250ZW50Vgog ICAgICAgICB0aGlzLl9jb29raWVTZXR0aW5nLnZhbHVlID0gY29va2llOwogICAgIH0KIAotICAg IGdldCBuYXZpZ2F0aW9uU2lkZWJhclBhbmVsKCkKLSAgICB7Ci0gICAgICAgIHJldHVybiB0aGlz Ll9uYXZpZ2F0aW9uU2lkZWJhclBhbmVsOwotICAgIH0KLQotICAgIGdldCBuYXZpZ2F0aW9uU2lk ZWJhckNvbGxhcHNlZFNldHRpbmcoKQotICAgIHsKLSAgICAgICAgcmV0dXJuIHRoaXMuX25hdmln YXRpb25TaWRlYmFyQ29sbGFwc2VkU2V0dGluZzsKLSAgICB9Ci0KLSAgICBnZXQgZGV0YWlsc1Np ZGViYXJXaWR0aFNldHRpbmcoKQotICAgIHsKLSAgICAgICAgcmV0dXJuIHRoaXMuX2RldGFpbHNT aWRlYmFyV2lkdGhTZXR0aW5nOwotICAgIH0KKyAgICBnZXQgbmF2aWdhdGlvblNpZGViYXJQYW5l bCgpIHsgcmV0dXJuIHRoaXMuX25hdmlnYXRpb25TaWRlYmFyUGFuZWw7IH0KKyAgICBnZXQgbmF2 aWdhdGlvblNpZGViYXJDb2xsYXBzZWRTZXR0aW5nKCkgeyByZXR1cm4gdGhpcy5fbmF2aWdhdGlv blNpZGViYXJDb2xsYXBzZWRTZXR0aW5nOyB9CisgICAgZ2V0IG5hdmlnYXRpb25TaWRlYmFyV2lk dGhTZXR0aW5nKCkgeyByZXR1cm4gdGhpcy5fbmF2aWdhdGlvblNpZGViYXJXaWR0aFNldHRpbmc7 IH0KIAotICAgIGdldCBkZXRhaWxzU2lkZWJhclBhbmVscygpCi0gICAgewotICAgICAgICByZXR1 cm4gdGhpcy5fZGV0YWlsc1NpZGViYXJQYW5lbHM7Ci0gICAgfQotCi0gICAgZ2V0IGRldGFpbHNT aWRlYmFyQ29sbGFwc2VkU2V0dGluZygpCi0gICAgewotICAgICAgICByZXR1cm4gdGhpcy5fZGV0 YWlsc1NpZGViYXJDb2xsYXBzZWRTZXR0aW5nOwotICAgIH0KLQotICAgIGdldCBkZXRhaWxzU2lk ZWJhclNlbGVjdGVkUGFuZWxTZXR0aW5nKCkKLSAgICB7Ci0gICAgICAgIHJldHVybiB0aGlzLl9k ZXRhaWxzU2lkZWJhclNlbGVjdGVkUGFuZWxTZXR0aW5nOwotICAgIH0KKyAgICBnZXQgZGV0YWls c1NpZGViYXJQYW5lbHMoKSB7IHJldHVybiB0aGlzLl9kZXRhaWxzU2lkZWJhclBhbmVsczsgfQor ICAgIGdldCBkZXRhaWxzU2lkZWJhckNvbGxhcHNlZFNldHRpbmcoKSB7IHJldHVybiB0aGlzLl9k ZXRhaWxzU2lkZWJhckNvbGxhcHNlZFNldHRpbmc7IH0KKyAgICBnZXQgZGV0YWlsc1NpZGViYXJT ZWxlY3RlZFBhbmVsU2V0dGluZygpIHsgcmV0dXJuIHRoaXMuX2RldGFpbHNTaWRlYmFyU2VsZWN0 ZWRQYW5lbFNldHRpbmc7IH0KKyAgICBnZXQgZGV0YWlsc1NpZGViYXJXaWR0aFNldHRpbmcoKSB7 IHJldHVybiB0aGlzLl9kZXRhaWxzU2lkZWJhcldpZHRoU2V0dGluZzsgfQogfTsK 296448 2016-12-07 17:24:32 -0800 2016-12-07 20:27:47 -0800 Patch 165496.diff text/plain 7573 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDZlMjEwN2EuLmZlYWFmOTAgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDE2LTEyLTA3ICBEZXZpbiBSb3Vzc28g IDxkY3JvdXNzbyt3ZWJraXRAZ21haWwuY29tPgorCisgICAgICAgIFJFR1JFU1NJT04ocjIwMzkx Mik6IFdlYiBJbnNwZWN0b3I6IE5hdmlnYXRpb24gc2lkZWJhciB3aWR0aHMgYXJlIG5vdCBzYXZl ZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTY1NDk2 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTWF0dCBCYWtlci4KKworICAgICAgICAqIFVzZXJJbnRl cmZhY2UvVmlld3MvVGFiQnJvd3Nlci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UYWJCcm93 c2VyKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UYWJCcm93c2VyLnByb3RvdHlwZS5fc2lkZWJh cldpZHRoRGlkQ2hhbmdlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UYWJCcm93c2VyLnByb3Rv dHlwZS5fc2hvd05hdmlnYXRpb25TaWRlYmFyUGFuZWxGb3JUYWJDb250ZW50Vmlldyk6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuVGFiQnJvd3Nlci5wcm90b3R5cGUuX3NpZGViYXJXaWR0aERpZENo YW5nZSk6IFJlbmFtZWQgZnJvbSBfZGV0YWlsc1NpZGViYXJXaWR0aERpZENoYW5nZS4KKyAgICAg ICAgQWRkIGV2ZW50IGxpc3RlbmVyIGZvciB3aGVuIHRoZSBuYXZpZ2F0aW9uIHNpZGViYXIncyB3 aWR0aCBpcyBjaGFuZ2VkLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9UYWJDb250 ZW50Vmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UYWJDb250ZW50Vmlldyk6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuVGFiQ29udGVudFZpZXcucHJvdG90eXBlLmdldCBuYXZpZ2F0aW9u U2lkZWJhclBhbmVsKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UYWJDb250ZW50Vmlldy5wcm90 b3R5cGUuZ2V0IG5hdmlnYXRpb25TaWRlYmFyQ29sbGFwc2VkU2V0dGluZyk6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuVGFiQ29udGVudFZpZXcucHJvdG90eXBlLmdldCBuYXZpZ2F0aW9uU2lkZWJh cldpZHRoU2V0dGluZyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGFiQ29udGVudFZpZXcucHJv dG90eXBlLmdldCBkZXRhaWxzU2lkZWJhclBhbmVscyk6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu VGFiQ29udGVudFZpZXcucHJvdG90eXBlLmdldCBkZXRhaWxzU2lkZWJhckNvbGxhcHNlZFNldHRp bmcpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRhYkNvbnRlbnRWaWV3LnByb3RvdHlwZS5nZXQg ZGV0YWlsc1NpZGViYXJTZWxlY3RlZFBhbmVsU2V0dGluZyk6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuVGFiQ29udGVudFZpZXcucHJvdG90eXBlLmdldCBkZXRhaWxzU2lkZWJhcldpZHRoU2V0dGlu Zyk6CisgICAgICAgIEFkZCBXZWJJbnNwZWN0b3IuU2V0dGluZyBvYmplY3QgZm9yIHRoZSBuYXZp Z2F0aW9uIHNpZGViYXIncyB3aWR0aC4KKwogMjAxNi0xMi0wMiAgQW5keSBFc3RlcyAgPGFlc3Rl c0BhcHBsZS5jb20+CiAKICAgICAgICAgW0NvY29hXSBBZG9wdCB0aGUgUFJPRFVDVF9CVU5ETEVf SURFTlRJRklFUiBidWlsZCBzZXR0aW5nCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9UYWJCcm93c2VyLmpzIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGFiQnJvd3Nlci5qcwppbmRleCA4Y2UxODUyLi5hYTM5 NzBkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9UYWJCcm93c2VyLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL1RhYkJyb3dzZXIuanMKQEAgLTM3LDEzICszNywxNSBAQCBXZWJJbnNwZWN0b3IuVGFi QnJvd3NlciA9IGNsYXNzIFRhYkJyb3dzZXIgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuVmlldwogICAg ICAgICB0aGlzLl9uYXZpZ2F0aW9uU2lkZWJhciA9IG5hdmlnYXRpb25TaWRlYmFyIHx8IG51bGw7 CiAgICAgICAgIHRoaXMuX2RldGFpbHNTaWRlYmFyID0gZGV0YWlsc1NpZGViYXIgfHwgbnVsbDsK IAotICAgICAgICBpZiAodGhpcy5fbmF2aWdhdGlvblNpZGViYXIpCisgICAgICAgIGlmICh0aGlz Ll9uYXZpZ2F0aW9uU2lkZWJhcikgewogICAgICAgICAgICAgdGhpcy5fbmF2aWdhdGlvblNpZGVi YXIuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuU2lkZWJhci5FdmVudC5Db2xsYXBzZWRT dGF0ZURpZENoYW5nZSwgdGhpcy5fc2lkZWJhckNvbGxhcHNlZFN0YXRlRGlkQ2hhbmdlLCB0aGlz KTsKKyAgICAgICAgICAgIHRoaXMuX25hdmlnYXRpb25TaWRlYmFyLmFkZEV2ZW50TGlzdGVuZXIo V2ViSW5zcGVjdG9yLlNpZGViYXIuRXZlbnQuV2lkdGhEaWRDaGFuZ2UsIHRoaXMuX3NpZGViYXJX aWR0aERpZENoYW5nZSwgdGhpcyk7CisgICAgICAgIH0KIAogICAgICAgICBpZiAodGhpcy5fZGV0 YWlsc1NpZGViYXIpIHsKICAgICAgICAgICAgIHRoaXMuX2RldGFpbHNTaWRlYmFyLmFkZEV2ZW50 TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlNpZGViYXIuRXZlbnQuQ29sbGFwc2VkU3RhdGVEaWRDaGFu Z2UsIHRoaXMuX3NpZGViYXJDb2xsYXBzZWRTdGF0ZURpZENoYW5nZSwgdGhpcyk7CiAgICAgICAg ICAgICB0aGlzLl9kZXRhaWxzU2lkZWJhci5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5T aWRlYmFyLkV2ZW50LlNpZGViYXJQYW5lbFNlbGVjdGVkLCB0aGlzLl9zaWRlYmFyUGFuZWxTZWxl Y3RlZCwgdGhpcyk7Ci0gICAgICAgICAgICB0aGlzLl9kZXRhaWxzU2lkZWJhci5hZGRFdmVudExp c3RlbmVyKFdlYkluc3BlY3Rvci5TaWRlYmFyLkV2ZW50LldpZHRoRGlkQ2hhbmdlLCB0aGlzLl9k ZXRhaWxzU2lkZWJhcldpZHRoRGlkQ2hhbmdlLCB0aGlzKTsKKyAgICAgICAgICAgIHRoaXMuX2Rl dGFpbHNTaWRlYmFyLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlNpZGViYXIuRXZlbnQu V2lkdGhEaWRDaGFuZ2UsIHRoaXMuX3NpZGViYXJXaWR0aERpZENoYW5nZSwgdGhpcyk7CiAgICAg ICAgIH0KIAogICAgICAgICB0aGlzLl9jb250ZW50Vmlld0NvbnRhaW5lciA9IG5ldyBXZWJJbnNw ZWN0b3IuQ29udGVudFZpZXdDb250YWluZXI7CkBAIC0yOTQsMTcgKzI5NiwyNCBAQCBXZWJJbnNw ZWN0b3IuVGFiQnJvd3NlciA9IGNsYXNzIFRhYkJyb3dzZXIgZXh0ZW5kcyBXZWJJbnNwZWN0b3Iu VmlldwogICAgICAgICAgICAgdGFiQ29udGVudFZpZXcuZGV0YWlsc1NpZGViYXJDb2xsYXBzZWRT ZXR0aW5nLnZhbHVlID0gdGhpcy5fZGV0YWlsc1NpZGViYXIuY29sbGFwc2VkOwogICAgIH0KIAot ICAgIF9kZXRhaWxzU2lkZWJhcldpZHRoRGlkQ2hhbmdlKGV2ZW50KQorICAgIF9zaWRlYmFyV2lk dGhEaWRDaGFuZ2UoZXZlbnQpCiAgICAgewotICAgICAgICBpZiAodGhpcy5faWdub3JlU2lkZWJh ckV2ZW50cykKKyAgICAgICAgaWYgKHRoaXMuX2lnbm9yZVNpZGViYXJFdmVudHMgfHwgIWV2ZW50 LmRhdGEpCiAgICAgICAgICAgICByZXR1cm47CiAKICAgICAgICAgbGV0IHRhYkNvbnRlbnRWaWV3 ID0gdGhpcy5zZWxlY3RlZFRhYkNvbnRlbnRWaWV3OwogICAgICAgICBpZiAoIXRhYkNvbnRlbnRW aWV3KQogICAgICAgICAgICAgcmV0dXJuOwogCi0gICAgICAgIGlmIChldmVudC50YXJnZXQgPT09 IHRoaXMuX2RldGFpbHNTaWRlYmFyICYmIGV2ZW50LmRhdGEpCisgICAgICAgIHN3aXRjaCAoZXZl bnQudGFyZ2V0KSB7CisgICAgICAgIGNhc2UgdGhpcy5fbmF2aWdhdGlvblNpZGViYXI6CisgICAg ICAgICAgICB0YWJDb250ZW50Vmlldy5uYXZpZ2F0aW9uU2lkZWJhcldpZHRoU2V0dGluZy52YWx1 ZSA9IGV2ZW50LmRhdGEubmV3V2lkdGg7CisgICAgICAgICAgICBicmVhazsKKworICAgICAgICBj YXNlIHRoaXMuX2RldGFpbHNTaWRlYmFyOgogICAgICAgICAgICAgdGFiQ29udGVudFZpZXcuZGV0 YWlsc1NpZGViYXJXaWR0aFNldHRpbmcudmFsdWUgPSBldmVudC5kYXRhLm5ld1dpZHRoOworICAg ICAgICAgICAgYnJlYWs7CisgICAgICAgIH0KICAgICB9CiAKICAgICBfc2hvd05hdmlnYXRpb25T aWRlYmFyUGFuZWxGb3JUYWJDb250ZW50Vmlldyh0YWJDb250ZW50VmlldykKQEAgLTMyMyw2ICsz MzIsOSBAQCBXZWJJbnNwZWN0b3IuVGFiQnJvd3NlciA9IGNsYXNzIFRhYkJyb3dzZXIgZXh0ZW5k cyBXZWJJbnNwZWN0b3IuVmlldwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAKKyAg ICAgICAgaWYgKHRhYkNvbnRlbnRWaWV3Lm5hdmlnYXRpb25TaWRlYmFyV2lkdGhTZXR0aW5nLnZh bHVlKQorICAgICAgICAgICAgdGhpcy5fbmF2aWdhdGlvblNpZGViYXIud2lkdGggPSB0YWJDb250 ZW50Vmlldy5uYXZpZ2F0aW9uU2lkZWJhcldpZHRoU2V0dGluZy52YWx1ZTsKKwogICAgICAgICB2 YXIgbmF2aWdhdGlvblNpZGViYXJQYW5lbCA9IHRhYkNvbnRlbnRWaWV3Lm5hdmlnYXRpb25TaWRl YmFyUGFuZWw7CiAgICAgICAgIGlmICghbmF2aWdhdGlvblNpZGViYXJQYW5lbCkgewogICAgICAg ICAgICAgdGhpcy5fbmF2aWdhdGlvblNpZGViYXIuY29sbGFwc2VkID0gdHJ1ZTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RhYkNvbnRlbnRW aWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGFiQ29u dGVudFZpZXcuanMKaW5kZXggMzU4NzA0OC4uZDBhODhhYiAxMDA2NDQKLS0tIGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGFiQ29udGVudFZpZXcuanMKKysrIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGFiQ29udGVudFZpZXcu anMKQEAgLTQ3LDExICs0NywxNCBAQCBXZWJJbnNwZWN0b3IuVGFiQ29udGVudFZpZXcgPSBjbGFz cyBUYWJDb250ZW50VmlldyBleHRlbmRzIFdlYkluc3BlY3Rvci5Db250ZW50VgogICAgICAgICB0 aGlzLl9uYXZpZ2F0aW9uU2lkZWJhclBhbmVsID0gbmF2aWdhdGlvblNpZGViYXJQYW5lbCB8fCBu dWxsOwogICAgICAgICB0aGlzLl9kZXRhaWxzU2lkZWJhclBhbmVscyA9IGRldGFpbHNTaWRlYmFy UGFuZWxzIHx8IFtdOwogCisgICAgICAgIGNvbnN0IGRlZmF1bHRTaWRlYmFyV2lkdGggPSAzMDA7 CisKICAgICAgICAgdGhpcy5fbmF2aWdhdGlvblNpZGViYXJDb2xsYXBzZWRTZXR0aW5nID0gbmV3 IFdlYkluc3BlY3Rvci5TZXR0aW5nKGlkZW50aWZpZXIgKyAiLW5hdmlnYXRpb24tc2lkZWJhci1j b2xsYXBzZWQiLCBmYWxzZSk7CisgICAgICAgIHRoaXMuX25hdmlnYXRpb25TaWRlYmFyV2lkdGhT ZXR0aW5nID0gbmV3IFdlYkluc3BlY3Rvci5TZXR0aW5nKGlkZW50aWZpZXIgKyAiLW5hdmlnYXRp b24tc2lkZWJhci13aWR0aCIsIGRlZmF1bHRTaWRlYmFyV2lkdGgpOwogCiAgICAgICAgIHRoaXMu X2RldGFpbHNTaWRlYmFyQ29sbGFwc2VkU2V0dGluZyA9IG5ldyBXZWJJbnNwZWN0b3IuU2V0dGlu ZyhpZGVudGlmaWVyICsgIi1kZXRhaWxzLXNpZGViYXItY29sbGFwc2VkIiwgdHJ1ZSk7CiAgICAg ICAgIHRoaXMuX2RldGFpbHNTaWRlYmFyU2VsZWN0ZWRQYW5lbFNldHRpbmcgPSBuZXcgV2ViSW5z cGVjdG9yLlNldHRpbmcoaWRlbnRpZmllciArICItZGV0YWlscy1zaWRlYmFyLXNlbGVjdGVkLXBh bmVsIiwgbnVsbCk7Ci0gICAgICAgIHRoaXMuX2RldGFpbHNTaWRlYmFyV2lkdGhTZXR0aW5nID0g bmV3IFdlYkluc3BlY3Rvci5TZXR0aW5nKGlkZW50aWZpZXIgKyAiLWRldGFpbHMtc2lkZWJhci13 aWR0aCIsIDApOworICAgICAgICB0aGlzLl9kZXRhaWxzU2lkZWJhcldpZHRoU2V0dGluZyA9IG5l dyBXZWJJbnNwZWN0b3IuU2V0dGluZyhpZGVudGlmaWVyICsgIi1kZXRhaWxzLXNpZGViYXItd2lk dGgiLCBkZWZhdWx0U2lkZWJhcldpZHRoKTsKIAogICAgICAgICB0aGlzLl9jb29raWVTZXR0aW5n ID0gbmV3IFdlYkluc3BlY3Rvci5TZXR0aW5nKGlkZW50aWZpZXIgKyAiLXRhYi1jb29raWUiLCB7 fSk7CiAgICAgfQpAQCAtMTcwLDMzICsxNzMsMTIgQEAgV2ViSW5zcGVjdG9yLlRhYkNvbnRlbnRW aWV3ID0gY2xhc3MgVGFiQ29udGVudFZpZXcgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuQ29udGVudFYK ICAgICAgICAgdGhpcy5fY29va2llU2V0dGluZy52YWx1ZSA9IGNvb2tpZTsKICAgICB9CiAKLSAg ICBnZXQgbmF2aWdhdGlvblNpZGViYXJQYW5lbCgpCi0gICAgewotICAgICAgICByZXR1cm4gdGhp cy5fbmF2aWdhdGlvblNpZGViYXJQYW5lbDsKLSAgICB9Ci0KLSAgICBnZXQgbmF2aWdhdGlvblNp ZGViYXJDb2xsYXBzZWRTZXR0aW5nKCkKLSAgICB7Ci0gICAgICAgIHJldHVybiB0aGlzLl9uYXZp Z2F0aW9uU2lkZWJhckNvbGxhcHNlZFNldHRpbmc7Ci0gICAgfQotCi0gICAgZ2V0IGRldGFpbHNT aWRlYmFyV2lkdGhTZXR0aW5nKCkKLSAgICB7Ci0gICAgICAgIHJldHVybiB0aGlzLl9kZXRhaWxz U2lkZWJhcldpZHRoU2V0dGluZzsKLSAgICB9CisgICAgZ2V0IG5hdmlnYXRpb25TaWRlYmFyUGFu ZWwoKSB7IHJldHVybiB0aGlzLl9uYXZpZ2F0aW9uU2lkZWJhclBhbmVsOyB9CisgICAgZ2V0IG5h dmlnYXRpb25TaWRlYmFyQ29sbGFwc2VkU2V0dGluZygpIHsgcmV0dXJuIHRoaXMuX25hdmlnYXRp b25TaWRlYmFyQ29sbGFwc2VkU2V0dGluZzsgfQorICAgIGdldCBuYXZpZ2F0aW9uU2lkZWJhcldp ZHRoU2V0dGluZygpIHsgcmV0dXJuIHRoaXMuX25hdmlnYXRpb25TaWRlYmFyV2lkdGhTZXR0aW5n OyB9CiAKLSAgICBnZXQgZGV0YWlsc1NpZGViYXJQYW5lbHMoKQotICAgIHsKLSAgICAgICAgcmV0 dXJuIHRoaXMuX2RldGFpbHNTaWRlYmFyUGFuZWxzOwotICAgIH0KLQotICAgIGdldCBkZXRhaWxz U2lkZWJhckNvbGxhcHNlZFNldHRpbmcoKQotICAgIHsKLSAgICAgICAgcmV0dXJuIHRoaXMuX2Rl dGFpbHNTaWRlYmFyQ29sbGFwc2VkU2V0dGluZzsKLSAgICB9Ci0KLSAgICBnZXQgZGV0YWlsc1Np ZGViYXJTZWxlY3RlZFBhbmVsU2V0dGluZygpCi0gICAgewotICAgICAgICByZXR1cm4gdGhpcy5f ZGV0YWlsc1NpZGViYXJTZWxlY3RlZFBhbmVsU2V0dGluZzsKLSAgICB9CisgICAgZ2V0IGRldGFp bHNTaWRlYmFyUGFuZWxzKCkgeyByZXR1cm4gdGhpcy5fZGV0YWlsc1NpZGViYXJQYW5lbHM7IH0K KyAgICBnZXQgZGV0YWlsc1NpZGViYXJDb2xsYXBzZWRTZXR0aW5nKCkgeyByZXR1cm4gdGhpcy5f ZGV0YWlsc1NpZGViYXJDb2xsYXBzZWRTZXR0aW5nOyB9CisgICAgZ2V0IGRldGFpbHNTaWRlYmFy U2VsZWN0ZWRQYW5lbFNldHRpbmcoKSB7IHJldHVybiB0aGlzLl9kZXRhaWxzU2lkZWJhclNlbGVj dGVkUGFuZWxTZXR0aW5nOyB9CisgICAgZ2V0IGRldGFpbHNTaWRlYmFyV2lkdGhTZXR0aW5nKCkg eyByZXR1cm4gdGhpcy5fZGV0YWlsc1NpZGViYXJXaWR0aFNldHRpbmc7IH0KIH07Cg==