170418 2017-04-03 13:51:49 -0700 Web Inspector: Reorder Debugger tab sidebar panels: Scope Chain, Resource, Probes 2017-04-06 11:52:24 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 mattbaker mattbaker commit-queue hi inspector-bugzilla-changes timothy oldest_to_newest 1293782 0 mattbaker 2017-04-03 13:51:49 -0700 Summary: Debugger tab should support only the Scope Chain sidebar panel. The Resource panel doesn't fit in with the Debugger tab workflow, and only distracts from the (very important) Scope Chain panel. 1293783 1 mattbaker 2017-04-03 13:52:06 -0700 <rdar://problem/31410771> 1293786 2 mattbaker 2017-04-03 14:00:24 -0700 (In reply to Matt Baker from comment #0) > Summary: > Debugger tab should support only the Scope Chain sidebar panel. Reworded the bug. I'd forgotten about Probes. 1293788 3 hi 2017-04-03 14:02:03 -0700 (In reply to Matt Baker from comment #0) > Summary: > Debugger tab should support only the Scope Chain sidebar panel. > > The Resource panel doesn't fit in with the Debugger tab workflow, and only > distracts from the (very important) Scope Chain panel. I think that there are some cases where showing the Resource panel is useful. The Scope Chain panel is really only useful when the debugger has paused execution (with the exception of Watch Expressions). I've had situations where I've looked at a file via the Debugger tab and then gone on to find where its initiated (via the Resource panel) and put a breakpoint there. Personally, I think a setting would be more apt than just removing the Resource panel altogether. <https://webkit.org/b/149487> 1293792 4 306107 mattbaker 2017-04-03 14:06:39 -0700 Created attachment 306107 Patch 1293820 5 timothy 2017-04-03 14:47:33 -0700 I agree with Devin, the sidebar is useful for some things. It is the only place we show the full URL for example. That could be needed when debugging and it would be a pain to switch tabs and find the resource again. 1293860 6 mattbaker 2017-04-03 15:27:51 -0700 Okay, I think a good solution will be to keep the Resource panel but reorder the panels making Scope Chain first. Since navigation items are added/removed as the currently inspected object changes, ContentBrowserTabContentView will need to maintain the ordering based on the order defined by TabContentView.detailsSidebarPanels. 1293904 7 306140 mattbaker 2017-04-03 16:54:27 -0700 Created attachment 306140 Patch 1293927 8 timothy 2017-04-03 17:34:00 -0700 Transient sidebars like Scope Chain should be last. The goal being that hit targets for labels would not move. That being said, the labels are center aligned so they move anyway. Does Devin's recent change make this not matter as much? https://trac.webkit.org/changeset/214847 1293968 9 306140 timothy 2017-04-03 19:58:05 -0700 Comment on attachment 306140 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=306140&action=review > Source/WebInspectorUI/UserInterface/Views/ContentBrowserTabContentView.js:154 > + WebInspector.detailsSidebar.addSidebarPanel(sidebarPanel, (a, b) => { Wouldn't we know the index it needs inserted at? You would be better off adding a inserSidebarPanel function that takes an index. No need to sort the array for one item insert when the order is known already. > Source/WebInspectorUI/UserInterface/Views/Sidebar.js:63 > + addSidebarPanel(sidebarPanel, comparator) The index implementation you add below can be used for a new insertSidebarPanel. And you can make addSidebarPanel use it to reduce duplication. 1294550 10 mattbaker 2017-04-05 10:27:34 -0700 (In reply to Timothy Hatcher from comment #8) > Transient sidebars like Scope Chain should be last. The goal being that hit I think it's actually the Resource sidebar that is transient, Scope Chain is always shown. 1294573 11 306300 mattbaker 2017-04-05 11:27:39 -0700 Created attachment 306300 Patch 1294974 12 306300 timothy 2017-04-06 11:45:40 -0700 Comment on attachment 306300 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=306300&action=review > Source/WebInspectorUI/UserInterface/Views/ContentBrowserTabContentView.js:157 > + let index = this.detailsSidebarPanels.indexOf(sidebarPanel) - hiddenSidebarPanels; > + WebInspector.detailsSidebar.insertSidebarPanel(sidebarPanel, index); This could just be: let index = i - hiddenSidebarPanels 1294978 13 306300 mattbaker 2017-04-06 11:52:09 -0700 Comment on attachment 306300 Patch Landed: https://trac.webkit.org/changeset/215047/webkit. 306107 2017-04-03 14:06:39 -0700 2017-04-03 16:54:25 -0700 Patch bug-170418-20170403140639.patch text/plain 1857 mattbaker U3VidmVyc2lvbiBSZXZpc2lvbjogMjE0ODIyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCBj YzZhODAzMGFiYmQ0NmFjNTA5NTlkZDNlOWNhZDlhMDA1YTk2ZGU2Li5mY2M4OTVmZGI4NjRkYjRi NzAwOTNmYzY1NGEyYmFiYTUxMzAxZWRkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNiBAQAorMjAxNy0wNC0wMyAgTWF0dCBCYWtlciAgPG1hdHRiYWtlckBhcHBsZS5jb20+ CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogRGlzYWxsb3cgdGhlIFJlc291cmNlIHNpZGViYXIg cGFuZWwgaW4gdGhlIERlYnVnZ2VyIHRhYgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTcwNDE4CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zMTQxMDc3 MT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBPbmx5 IHNob3cgU2NvcGUgQ2hhaW4gYW5kIFByb2Jlcy4gCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNl L1ZpZXdzL0RlYnVnZ2VyVGFiQ29udGVudFZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu RGVidWdnZXJUYWJDb250ZW50Vmlldyk6CisKIDIwMTctMDQtMDEgIEpvbiBMZWUgIDxqb25sZWVA YXBwbGUuY29tPgogCiAgICAgICAgIEFkZCBtaXNzaW5nIHRleHQgc3R5bGVzCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9EZWJ1Z2dlclRhYkNv bnRlbnRWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv RGVidWdnZXJUYWJDb250ZW50Vmlldy5qcwppbmRleCBhMTU0MDZkYTExM2JlOWNkZjY0MGI3ZThi ZjE1Mzk5ZTU2YWMxYjYwLi5hODU2OTE1MGUxMmI1MTEyZmZmMzBhMWFmNWIzN2ZhMTI3YTNkNDhk IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9E ZWJ1Z2dlclRhYkNvbnRlbnRWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL0RlYnVnZ2VyVGFiQ29udGVudFZpZXcuanMKQEAgLTI5LDcgKzI5LDcg QEAgV2ViSW5zcGVjdG9yLkRlYnVnZ2VyVGFiQ29udGVudFZpZXcgPSBjbGFzcyBEZWJ1Z2dlclRh YkNvbnRlbnRWaWV3IGV4dGVuZHMgV2ViSW4KICAgICB7CiAgICAgICAgIGxldCB7aW1hZ2UsIHRp dGxlfSA9IFdlYkluc3BlY3Rvci5EZWJ1Z2dlclRhYkNvbnRlbnRWaWV3LnRhYkluZm8oKTsKICAg ICAgICAgbGV0IHRhYkJhckl0ZW0gPSBuZXcgV2ViSW5zcGVjdG9yLkdlbmVyYWxUYWJCYXJJdGVt KGltYWdlLCB0aXRsZSk7Ci0gICAgICAgIGxldCBkZXRhaWxzU2lkZWJhclBhbmVscyA9IFtXZWJJ bnNwZWN0b3IucmVzb3VyY2VEZXRhaWxzU2lkZWJhclBhbmVsLCBXZWJJbnNwZWN0b3Iuc2NvcGVD aGFpbkRldGFpbHNTaWRlYmFyUGFuZWwsIFdlYkluc3BlY3Rvci5wcm9iZURldGFpbHNTaWRlYmFy UGFuZWxdOworICAgICAgICBsZXQgZGV0YWlsc1NpZGViYXJQYW5lbHMgPSBbV2ViSW5zcGVjdG9y LnNjb3BlQ2hhaW5EZXRhaWxzU2lkZWJhclBhbmVsLCBXZWJJbnNwZWN0b3IucHJvYmVEZXRhaWxz U2lkZWJhclBhbmVsXTsKIAogICAgICAgICBzdXBlcihpZGVudGlmaWVyIHx8ICJkZWJ1Z2dlciIs ICJkZWJ1Z2dlciIsIHRhYkJhckl0ZW0sIFdlYkluc3BlY3Rvci5EZWJ1Z2dlclNpZGViYXJQYW5l bCwgZGV0YWlsc1NpZGViYXJQYW5lbHMpOwogICAgIH0K 306140 2017-04-03 16:54:27 -0700 2017-04-05 11:27:38 -0700 Patch bug-170418-20170403165426.patch text/plain 5130 mattbaker U3VidmVyc2lvbiBSZXZpc2lvbjogMjE0ODIyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCBj YzZhODAzMGFiYmQ0NmFjNTA5NTlkZDNlOWNhZDlhMDA1YTk2ZGU2Li42NDYzZjgwNzBjMTE5OWEy ODE1YWQxMzczOTZiNzE5NGI5YThhYTRkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMyBAQAorMjAxNy0wNC0wMyAgTWF0dCBCYWtlciAgPG1hdHRiYWtlckBhcHBsZS5jb20+ CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogUmVvcmRlciBEZWJ1Z2dlciB0YWIgc2lkZWJhciBw YW5lbHM6IFNjb3BlIENoYWluLCBSZXNvdXJjZSwgUHJvYmVzCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzA0MTgKKyAgICAgICAgPHJkYXI6Ly9wcm9i bGVtLzMxNDEwNzcxPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9Db250ZW50QnJvd3NlclRhYkNvbnRlbnRWaWV3 LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNvbnRlbnRCcm93c2VyVGFiQ29udGVudFZpZXcu cHJvdG90eXBlLnNob3dEZXRhaWxzU2lkZWJhclBhbmVscyk6CisgICAgICAgIENvbXBhcmUgc2lk ZWJhciBwYW5lbHMgYmFzZWQgb24gdGhlaXIgaW5kaWNlcyBpbiBUYWJDb250ZW50Vmlldy5kZXRh aWxzU2lkZWJhclBhbmVscy4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvRGVidWdn ZXJUYWJDb250ZW50Vmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EZWJ1Z2dlclRhYkNv bnRlbnRWaWV3KToKKyAgICAgICAgTmV3IHNpZGViYXIgcGFuZWwgb3JkZXI6IFNjb3BlIENoYWlu LCBSZXNvdXJjZSwgUHJvYmVzLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9TaWRl YmFyLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNpZGViYXIucHJvdG90eXBlLmFkZFNpZGVi YXJQYW5lbCk6CisgICAgICAgIEFjY2VwdCBhbiBvcHRpb25hbCBjb21wYXJhdG9yIGZ1bmN0aW9u LgorCiAyMDE3LTA0LTAxICBKb24gTGVlICA8am9ubGVlQGFwcGxlLmNvbT4KIAogICAgICAgICBB ZGQgbWlzc2luZyB0ZXh0IHN0eWxlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvQ29udGVudEJyb3dzZXJUYWJDb250ZW50Vmlldy5qcyBiL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvbnRlbnRCcm93c2VyVGFi Q29udGVudFZpZXcuanMKaW5kZXggNzgxNDg5M2M3MmE0M2RlNDEwMGEzOTJiZTg0NzUzMDI4MDc0 YzEzYy4uYTdhNjc0ZDdlNGNhYjhkYjEyNTgxYmU0ZWE0ZTFhY2M4ZGE4MzkzNiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29udGVudEJyb3dz ZXJUYWJDb250ZW50Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9Db250ZW50QnJvd3NlclRhYkNvbnRlbnRWaWV3LmpzCkBAIC0xNTEsNyArMTUx LDExIEBAIFdlYkluc3BlY3Rvci5Db250ZW50QnJvd3NlclRhYkNvbnRlbnRWaWV3ID0gY2xhc3Mg Q29udGVudEJyb3dzZXJUYWJDb250ZW50VmlldyBlCiAgICAgICAgICAgICAgICAgfQogCiAgICAg ICAgICAgICAgICAgLy8gVGhlIHNpZGViYXIgcGFuZWwgd2FzIG5vdCBwcmV2aW91c2x5IHNob3dp bmcsIHNvIGFkZCB0aGUgcGFuZWwuCi0gICAgICAgICAgICAgICAgV2ViSW5zcGVjdG9yLmRldGFp bHNTaWRlYmFyLmFkZFNpZGViYXJQYW5lbChzaWRlYmFyUGFuZWwpOworICAgICAgICAgICAgICAg IFdlYkluc3BlY3Rvci5kZXRhaWxzU2lkZWJhci5hZGRTaWRlYmFyUGFuZWwoc2lkZWJhclBhbmVs LCAoYSwgYikgPT4geworICAgICAgICAgICAgICAgICAgICBsZXQgYUluZGV4ID0gdGhpcy5kZXRh aWxzU2lkZWJhclBhbmVscy5pbmRleE9mKGEpOworICAgICAgICAgICAgICAgICAgICBsZXQgYklu ZGV4ID0gdGhpcy5kZXRhaWxzU2lkZWJhclBhbmVscy5pbmRleE9mKGIpOworICAgICAgICAgICAg ICAgICAgICByZXR1cm4gYUluZGV4IC0gYkluZGV4OworICAgICAgICAgICAgICAgIH0pOwogCiAg ICAgICAgICAgICAgICAgaWYgKHRoaXMuX2xhc3RTZWxlY3RlZERldGFpbHNTaWRlYmFyUGFuZWxT ZXR0aW5nLnZhbHVlID09PSBzaWRlYmFyUGFuZWwuaWRlbnRpZmllcikgewogICAgICAgICAgICAg ICAgICAgICAvLyBSZXN0b3JlIHRoZSBzaWRlYmFyIHBhbmVsIHNlbGVjdGlvbiBpZiB0aGlzIHNp ZGViYXIgcGFuZWwgd2FzIHRoZSBsYXN0IG9uZSBzZWxlY3RlZCBieSB0aGUgdXNlci4KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RlYnVnZ2Vy VGFiQ29udGVudFZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9EZWJ1Z2dlclRhYkNvbnRlbnRWaWV3LmpzCmluZGV4IGExNTQwNmRhMTEzYmU5Y2RmNjQw YjdlOGJmMTUzOTllNTZhYzFiNjAuLmRmYmM0YTBhNDUyMjA1NmRiYTIzOTc1M2Y3MzlkZDc0NGU3 MDI4N2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL0RlYnVnZ2VyVGFiQ29udGVudFZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvRGVidWdnZXJUYWJDb250ZW50Vmlldy5qcwpAQCAtMjksNyAr MjksNyBAQCBXZWJJbnNwZWN0b3IuRGVidWdnZXJUYWJDb250ZW50VmlldyA9IGNsYXNzIERlYnVn Z2VyVGFiQ29udGVudFZpZXcgZXh0ZW5kcyBXZWJJbgogICAgIHsKICAgICAgICAgbGV0IHtpbWFn ZSwgdGl0bGV9ID0gV2ViSW5zcGVjdG9yLkRlYnVnZ2VyVGFiQ29udGVudFZpZXcudGFiSW5mbygp OwogICAgICAgICBsZXQgdGFiQmFySXRlbSA9IG5ldyBXZWJJbnNwZWN0b3IuR2VuZXJhbFRhYkJh ckl0ZW0oaW1hZ2UsIHRpdGxlKTsKLSAgICAgICAgbGV0IGRldGFpbHNTaWRlYmFyUGFuZWxzID0g W1dlYkluc3BlY3Rvci5yZXNvdXJjZURldGFpbHNTaWRlYmFyUGFuZWwsIFdlYkluc3BlY3Rvci5z Y29wZUNoYWluRGV0YWlsc1NpZGViYXJQYW5lbCwgV2ViSW5zcGVjdG9yLnByb2JlRGV0YWlsc1Np ZGViYXJQYW5lbF07CisgICAgICAgIGxldCBkZXRhaWxzU2lkZWJhclBhbmVscyA9IFtXZWJJbnNw ZWN0b3Iuc2NvcGVDaGFpbkRldGFpbHNTaWRlYmFyUGFuZWwsIFdlYkluc3BlY3Rvci5yZXNvdXJj ZURldGFpbHNTaWRlYmFyUGFuZWwsIFdlYkluc3BlY3Rvci5wcm9iZURldGFpbHNTaWRlYmFyUGFu ZWxdOwogCiAgICAgICAgIHN1cGVyKGlkZW50aWZpZXIgfHwgImRlYnVnZ2VyIiwgImRlYnVnZ2Vy IiwgdGFiQmFySXRlbSwgV2ViSW5zcGVjdG9yLkRlYnVnZ2VyU2lkZWJhclBhbmVsLCBkZXRhaWxz U2lkZWJhclBhbmVscyk7CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvU2lkZWJhci5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL1NpZGViYXIuanMKaW5kZXggMzNiN2I3Mzk3MTc2ZTdkZjNhY2M0 YmMyYTA4MjY3ZDEzMTZkMDQxNC4uNDQ0YjdhMTRmY2JlNzJmOWVlZTBiN2QzOWI4NGUyYTU2Njc5 MjFkOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvU2lkZWJhci5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9TaWRlYmFyLmpzCkBAIC02MCw3ICs2MCw3IEBAIFdlYkluc3BlY3Rvci5TaWRlYmFyID0g Y2xhc3MgU2lkZWJhciBleHRlbmRzIFdlYkluc3BlY3Rvci5WaWV3CiAKICAgICAvLyBQdWJsaWMK IAotICAgIGFkZFNpZGViYXJQYW5lbChzaWRlYmFyUGFuZWwpCisgICAgYWRkU2lkZWJhclBhbmVs KHNpZGViYXJQYW5lbCwgY29tcGFyYXRvcikKICAgICB7CiAgICAgICAgIGNvbnNvbGUuYXNzZXJ0 KHNpZGViYXJQYW5lbCBpbnN0YW5jZW9mIFdlYkluc3BlY3Rvci5TaWRlYmFyUGFuZWwpOwogICAg ICAgICBpZiAoIShzaWRlYmFyUGFuZWwgaW5zdGFuY2VvZiBXZWJJbnNwZWN0b3IuU2lkZWJhclBh bmVsKSkKQEAgLTcwLDEyICs3MCwxNSBAQCBXZWJJbnNwZWN0b3IuU2lkZWJhciA9IGNsYXNzIFNp ZGViYXIgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuVmlldwogICAgICAgICBpZiAoc2lkZWJhclBhbmVs LnBhcmVudFNpZGViYXIpCiAgICAgICAgICAgICByZXR1cm4gbnVsbDsKIAotICAgICAgICB0aGlz Ll9zaWRlYmFyUGFuZWxzLnB1c2goc2lkZWJhclBhbmVsKTsKLSAgICAgICAgdGhpcy5hZGRTdWJ2 aWV3KHNpZGViYXJQYW5lbCk7CisgICAgICAgIGxldCBpbmRleCA9IGNvbXBhcmF0b3IgPyBpbnNl cnRpb25JbmRleEZvck9iamVjdEluTGlzdFNvcnRlZEJ5RnVuY3Rpb24oc2lkZWJhclBhbmVsLCB0 aGlzLl9zaWRlYmFyUGFuZWxzLCBjb21wYXJhdG9yKSA6IHRoaXMuX3NpZGViYXJQYW5lbHMubGVu Z3RoOworICAgICAgICB0aGlzLl9zaWRlYmFyUGFuZWxzLnNwbGljZShpbmRleCwgMCwgc2lkZWJh clBhbmVsKTsKKworICAgICAgICBsZXQgcmVmZXJlbmNlVmlldyA9IHRoaXMuX3NpZGViYXJQYW5l bHNbaW5kZXggKyAxXSB8fCBudWxsOworICAgICAgICB0aGlzLmluc2VydFN1YnZpZXdCZWZvcmUo c2lkZWJhclBhbmVsLCByZWZlcmVuY2VWaWV3KTsKIAogICAgICAgICBpZiAodGhpcy5fbmF2aWdh dGlvbkJhcikgewogICAgICAgICAgICAgY29uc29sZS5hc3NlcnQoc2lkZWJhclBhbmVsLm5hdmln YXRpb25JdGVtKTsKLSAgICAgICAgICAgIHRoaXMuX25hdmlnYXRpb25CYXIuYWRkTmF2aWdhdGlv bkl0ZW0oc2lkZWJhclBhbmVsLm5hdmlnYXRpb25JdGVtKTsKKyAgICAgICAgICAgIHRoaXMuX25h dmlnYXRpb25CYXIuaW5zZXJ0TmF2aWdhdGlvbkl0ZW0oc2lkZWJhclBhbmVsLm5hdmlnYXRpb25J dGVtLCBpbmRleCk7CiAgICAgICAgIH0KIAogICAgICAgICBzaWRlYmFyUGFuZWwuYWRkZWQoKTsK 306300 2017-04-05 11:27:39 -0700 2017-04-06 11:52:09 -0700 Patch bug-170418-20170405112738.patch text/plain 6685 mattbaker U3VidmVyc2lvbiBSZXZpc2lvbjogMjE0ODIyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCBj YzZhODAzMGFiYmQ0NmFjNTA5NTlkZDNlOWNhZDlhMDA1YTk2ZGU2Li4xOTc1YmY3NDI4OTVjZTE3 Zjk2NzI5ZjVmMmQ3OWE0MGUyOGQ5ZmRmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyOSBAQAorMjAxNy0wNC0wNSAgTWF0dCBCYWtlciAgPG1hdHRiYWtlckBhcHBsZS5jb20+ CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogUmVvcmRlciBEZWJ1Z2dlciB0YWIgc2lkZWJhciBw YW5lbHM6IFNjb3BlIENoYWluLCBSZXNvdXJjZSwgUHJvYmVzCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzA0MTgKKyAgICAgICAgPHJkYXI6Ly9wcm9i bGVtLzMxNDEwNzcxPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIE1haW50YWluIHRoZSBzaWRlYmFyIHBhbmVsIG9yZGVyIGRlZmluZWQgYnkgVGFiQ29u dGVudFZpZXcgd2hlbiBhZGRpbmcKKyAgICAgICAgYW5kIHJlbW92aW5nIHBhbmVscy4KKworICAg ICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvQ29udGVudEJyb3dzZXJUYWJDb250ZW50Vmlldy5q czoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db250ZW50QnJvd3NlclRhYkNvbnRlbnRWaWV3LnBy b3RvdHlwZS5zaG93RGV0YWlsc1NpZGViYXJQYW5lbHMpOgorICAgICAgICBJbnNlcnQgc2lkZWJh ciBwYW5lbCBiYXNlZCBvbiB0aGUgcGFuZWwgb3JkZXIgZGVmaW5lZCBieSBUYWJDb250ZW50Vmll dy4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvRGVidWdnZXJUYWJDb250ZW50Vmll dy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EZWJ1Z2dlclRhYkNvbnRlbnRWaWV3KToKKwor ICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvU2lkZWJhci5qczoKKyAgICAgICAgKFdlYklu c3BlY3Rvci5TaWRlYmFyLnByb3RvdHlwZS5hZGRTaWRlYmFyUGFuZWwpOgorICAgICAgICBJbXBs ZW1lbnRlZCBhcyBhbiBpbnNlcnQgYXQgdGhlIGVuZC4KKyAgICAgICAgKFdlYkluc3BlY3Rvci5T aWRlYmFyLnByb3RvdHlwZS5pbnNlcnRTaWRlYmFyUGFuZWwpOgorICAgICAgICBBbGxvdyBpbnNl cnRpbmcgaW50byB0aGUgc2lkZWJhciBwYW5lbCBjb2xsZWN0aW9uLgorICAgICAgICAoV2ViSW5z cGVjdG9yLlNpZGViYXIucHJvdG90eXBlLnJlbW92ZVNpZGViYXJQYW5lbCk6CisgICAgICAgIFJl bW92ZSB1bnVzZWQgcmV0dXJuIHZhbHVlLgorCiAyMDE3LTA0LTAxICBKb24gTGVlICA8am9ubGVl QGFwcGxlLmNvbT4KIAogICAgICAgICBBZGQgbWlzc2luZyB0ZXh0IHN0eWxlcwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29udGVudEJyb3dz ZXJUYWJDb250ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL0NvbnRlbnRCcm93c2VyVGFiQ29udGVudFZpZXcuanMKaW5kZXggNzgxNDg5M2M3MmE0 M2RlNDEwMGEzOTJiZTg0NzUzMDI4MDc0YzEzYy4uYjRlYWQxNDI1MDA4YWIyNjM5NDE5ZjNmNzli OTJjYmUyMDFjNGU0ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvQ29udGVudEJyb3dzZXJUYWJDb250ZW50Vmlldy5qcworKysgYi9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db250ZW50QnJvd3NlclRhYkNvbnRl bnRWaWV3LmpzCkBAIC0xNDIsNiArMTQyLDggQEAgV2ViSW5zcGVjdG9yLkNvbnRlbnRCcm93c2Vy VGFiQ29udGVudFZpZXcgPSBjbGFzcyBDb250ZW50QnJvd3NlclRhYkNvbnRlbnRWaWV3IGUKICAg ICAgICAgdGhpcy5faWdub3JlRGV0YWlsc1NpZGViYXJQYW5lbFNlbGVjdGVkRXZlbnQgPSB0cnVl OwogICAgICAgICB0aGlzLl9pZ25vcmVEZXRhaWxzU2lkZWJhclBhbmVsQ29sbGFwc2VkRXZlbnQg PSB0cnVlOwogCisgICAgICAgIGxldCBoaWRkZW5TaWRlYmFyUGFuZWxzID0gMDsKKwogICAgICAg ICBmb3IgKHZhciBpID0gMDsgaSA8IHRoaXMuZGV0YWlsc1NpZGViYXJQYW5lbHMubGVuZ3RoOyAr K2kpIHsKICAgICAgICAgICAgIHZhciBzaWRlYmFyUGFuZWwgPSB0aGlzLmRldGFpbHNTaWRlYmFy UGFuZWxzW2ldOwogICAgICAgICAgICAgaWYgKHNpZGViYXJQYW5lbC5pbnNwZWN0KGN1cnJlbnRS ZXByZXNlbnRlZE9iamVjdHMpKSB7CkBAIC0xNTEsNyArMTUzLDggQEAgV2ViSW5zcGVjdG9yLkNv bnRlbnRCcm93c2VyVGFiQ29udGVudFZpZXcgPSBjbGFzcyBDb250ZW50QnJvd3NlclRhYkNvbnRl bnRWaWV3IGUKICAgICAgICAgICAgICAgICB9CiAKICAgICAgICAgICAgICAgICAvLyBUaGUgc2lk ZWJhciBwYW5lbCB3YXMgbm90IHByZXZpb3VzbHkgc2hvd2luZywgc28gYWRkIHRoZSBwYW5lbC4K LSAgICAgICAgICAgICAgICBXZWJJbnNwZWN0b3IuZGV0YWlsc1NpZGViYXIuYWRkU2lkZWJhclBh bmVsKHNpZGViYXJQYW5lbCk7CisgICAgICAgICAgICAgICAgbGV0IGluZGV4ID0gdGhpcy5kZXRh aWxzU2lkZWJhclBhbmVscy5pbmRleE9mKHNpZGViYXJQYW5lbCkgLSBoaWRkZW5TaWRlYmFyUGFu ZWxzOworICAgICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5kZXRhaWxzU2lkZWJhci5pbnNlcnRT aWRlYmFyUGFuZWwoc2lkZWJhclBhbmVsLCBpbmRleCk7CiAKICAgICAgICAgICAgICAgICBpZiAo dGhpcy5fbGFzdFNlbGVjdGVkRGV0YWlsc1NpZGViYXJQYW5lbFNldHRpbmcudmFsdWUgPT09IHNp ZGViYXJQYW5lbC5pZGVudGlmaWVyKSB7CiAgICAgICAgICAgICAgICAgICAgIC8vIFJlc3RvcmUg dGhlIHNpZGViYXIgcGFuZWwgc2VsZWN0aW9uIGlmIHRoaXMgc2lkZWJhciBwYW5lbCB3YXMgdGhl IGxhc3Qgb25lIHNlbGVjdGVkIGJ5IHRoZSB1c2VyLgpAQCAtMTYwLDYgKzE2Myw3IEBAIFdlYklu c3BlY3Rvci5Db250ZW50QnJvd3NlclRhYkNvbnRlbnRWaWV3ID0gY2xhc3MgQ29udGVudEJyb3dz ZXJUYWJDb250ZW50VmlldyBlCiAgICAgICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgICAg IC8vIFRoZSBzaWRlYmFyIHBhbmVsIGNhbid0IGluc3BlY3QgdGhlIGN1cnJlbnQgcmVwcmVzZW50 ZWQgb2JqZWN0cywgc28gcmVtb3ZlIHRoZSBwYW5lbCBhbmQgaGlkZSB0aGUgdG9vbGJhciBpdGVt LgogICAgICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5kZXRhaWxzU2lkZWJhci5yZW1vdmVTaWRl YmFyUGFuZWwoc2lkZWJhclBhbmVsKTsKKyAgICAgICAgICAgICAgICBoaWRkZW5TaWRlYmFyUGFu ZWxzKys7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRGVidWdnZXJUYWJDb250ZW50Vmlldy5q cyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RlYnVnZ2VyVGFi Q29udGVudFZpZXcuanMKaW5kZXggYTE1NDA2ZGExMTNiZTljZGY2NDBiN2U4YmYxNTM5OWU1NmFj MWI2MC4uZGZiYzRhMGE0NTIyMDU2ZGJhMjM5NzUzZjczOWRkNzQ0ZTcwMjg3YiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRGVidWdnZXJUYWJD b250ZW50Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9EZWJ1Z2dlclRhYkNvbnRlbnRWaWV3LmpzCkBAIC0yOSw3ICsyOSw3IEBAIFdlYkluc3Bl Y3Rvci5EZWJ1Z2dlclRhYkNvbnRlbnRWaWV3ID0gY2xhc3MgRGVidWdnZXJUYWJDb250ZW50Vmll dyBleHRlbmRzIFdlYkluCiAgICAgewogICAgICAgICBsZXQge2ltYWdlLCB0aXRsZX0gPSBXZWJJ bnNwZWN0b3IuRGVidWdnZXJUYWJDb250ZW50Vmlldy50YWJJbmZvKCk7CiAgICAgICAgIGxldCB0 YWJCYXJJdGVtID0gbmV3IFdlYkluc3BlY3Rvci5HZW5lcmFsVGFiQmFySXRlbShpbWFnZSwgdGl0 bGUpOwotICAgICAgICBsZXQgZGV0YWlsc1NpZGViYXJQYW5lbHMgPSBbV2ViSW5zcGVjdG9yLnJl c291cmNlRGV0YWlsc1NpZGViYXJQYW5lbCwgV2ViSW5zcGVjdG9yLnNjb3BlQ2hhaW5EZXRhaWxz U2lkZWJhclBhbmVsLCBXZWJJbnNwZWN0b3IucHJvYmVEZXRhaWxzU2lkZWJhclBhbmVsXTsKKyAg ICAgICAgbGV0IGRldGFpbHNTaWRlYmFyUGFuZWxzID0gW1dlYkluc3BlY3Rvci5zY29wZUNoYWlu RGV0YWlsc1NpZGViYXJQYW5lbCwgV2ViSW5zcGVjdG9yLnJlc291cmNlRGV0YWlsc1NpZGViYXJQ YW5lbCwgV2ViSW5zcGVjdG9yLnByb2JlRGV0YWlsc1NpZGViYXJQYW5lbF07CiAKICAgICAgICAg c3VwZXIoaWRlbnRpZmllciB8fCAiZGVidWdnZXIiLCAiZGVidWdnZXIiLCB0YWJCYXJJdGVtLCBX ZWJJbnNwZWN0b3IuRGVidWdnZXJTaWRlYmFyUGFuZWwsIGRldGFpbHNTaWRlYmFyUGFuZWxzKTsK ICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9TaWRlYmFyLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvU2lkZWJhci5qcwppbmRleCAzM2I3YjczOTcxNzZlN2RmM2FjYzRiYzJhMDgyNjdkMTMxNmQw NDE0Li40MjFlOTYyYzQ1OWNlYTRmYTRjN2NlYzAwYTg3ZGViZWU3NDFmMzE2IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TaWRlYmFyLmpzCisr KyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NpZGViYXIuanMK QEAgLTYyLDMyICs2MiwzOCBAQCBXZWJJbnNwZWN0b3IuU2lkZWJhciA9IGNsYXNzIFNpZGViYXIg ZXh0ZW5kcyBXZWJJbnNwZWN0b3IuVmlldwogCiAgICAgYWRkU2lkZWJhclBhbmVsKHNpZGViYXJQ YW5lbCkKICAgICB7CisgICAgICAgIHRoaXMuaW5zZXJ0U2lkZWJhclBhbmVsKHNpZGViYXJQYW5l bCwgdGhpcy5fc2lkZWJhclBhbmVscy5sZW5ndGgpOworICAgIH0KKworICAgIGluc2VydFNpZGVi YXJQYW5lbChzaWRlYmFyUGFuZWwsIGluZGV4KQorICAgIHsKICAgICAgICAgY29uc29sZS5hc3Nl cnQoc2lkZWJhclBhbmVsIGluc3RhbmNlb2YgV2ViSW5zcGVjdG9yLlNpZGViYXJQYW5lbCk7CiAg ICAgICAgIGlmICghKHNpZGViYXJQYW5lbCBpbnN0YW5jZW9mIFdlYkluc3BlY3Rvci5TaWRlYmFy UGFuZWwpKQotICAgICAgICAgICAgcmV0dXJuIG51bGw7CisgICAgICAgICAgICByZXR1cm47CiAK ICAgICAgICAgY29uc29sZS5hc3NlcnQoIXNpZGViYXJQYW5lbC5wYXJlbnRTaWRlYmFyKTsKICAg ICAgICAgaWYgKHNpZGViYXJQYW5lbC5wYXJlbnRTaWRlYmFyKQotICAgICAgICAgICAgcmV0dXJu IG51bGw7CisgICAgICAgICAgICByZXR1cm47CisKKyAgICAgICAgY29uc29sZS5hc3NlcnQoaW5k ZXggPj0gMCAmJiBpbmRleCA8PSB0aGlzLl9zaWRlYmFyUGFuZWxzLmxlbmd0aCk7CisgICAgICAg IHRoaXMuX3NpZGViYXJQYW5lbHMuc3BsaWNlKGluZGV4LCAwLCBzaWRlYmFyUGFuZWwpOwogCi0g ICAgICAgIHRoaXMuX3NpZGViYXJQYW5lbHMucHVzaChzaWRlYmFyUGFuZWwpOwotICAgICAgICB0 aGlzLmFkZFN1YnZpZXcoc2lkZWJhclBhbmVsKTsKKyAgICAgICAgbGV0IHJlZmVyZW5jZVZpZXcg PSB0aGlzLl9zaWRlYmFyUGFuZWxzW2luZGV4ICsgMV0gfHwgbnVsbDsKKyAgICAgICAgdGhpcy5p bnNlcnRTdWJ2aWV3QmVmb3JlKHNpZGViYXJQYW5lbCwgcmVmZXJlbmNlVmlldyk7CiAKICAgICAg ICAgaWYgKHRoaXMuX25hdmlnYXRpb25CYXIpIHsKICAgICAgICAgICAgIGNvbnNvbGUuYXNzZXJ0 KHNpZGViYXJQYW5lbC5uYXZpZ2F0aW9uSXRlbSk7Ci0gICAgICAgICAgICB0aGlzLl9uYXZpZ2F0 aW9uQmFyLmFkZE5hdmlnYXRpb25JdGVtKHNpZGViYXJQYW5lbC5uYXZpZ2F0aW9uSXRlbSk7Cisg ICAgICAgICAgICB0aGlzLl9uYXZpZ2F0aW9uQmFyLmluc2VydE5hdmlnYXRpb25JdGVtKHNpZGVi YXJQYW5lbC5uYXZpZ2F0aW9uSXRlbSwgaW5kZXgpOwogICAgICAgICB9CiAKICAgICAgICAgc2lk ZWJhclBhbmVsLmFkZGVkKCk7Ci0KLSAgICAgICAgcmV0dXJuIHNpZGViYXJQYW5lbDsKICAgICB9 CiAKICAgICByZW1vdmVTaWRlYmFyUGFuZWwoc2lkZWJhclBhbmVsT3JJZGVudGlmaWVyT3JJbmRl eCkKICAgICB7CiAgICAgICAgIHZhciBzaWRlYmFyUGFuZWwgPSB0aGlzLmZpbmRTaWRlYmFyUGFu ZWwoc2lkZWJhclBhbmVsT3JJZGVudGlmaWVyT3JJbmRleCk7CiAgICAgICAgIGlmICghc2lkZWJh clBhbmVsKQotICAgICAgICAgICAgcmV0dXJuIG51bGw7CisgICAgICAgICAgICByZXR1cm47CiAK ICAgICAgICAgc2lkZWJhclBhbmVsLnNlbGVjdGVkID0gZmFsc2U7CiAKQEAgLTExMCw4ICsxMTYs NiBAQCBXZWJJbnNwZWN0b3IuU2lkZWJhciA9IGNsYXNzIFNpZGViYXIgZXh0ZW5kcyBXZWJJbnNw ZWN0b3IuVmlldwogICAgICAgICB9CiAKICAgICAgICAgc2lkZWJhclBhbmVsLnJlbW92ZWQoKTsK LQotICAgICAgICByZXR1cm4gc2lkZWJhclBhbmVsOwogICAgIH0KIAogICAgIGdldCBzZWxlY3Rl ZFNpZGViYXJQYW5lbCgpCg==