148005 2015-08-13 17:49:15 -0700 Web Inspector: Long delay when row selection changes in timeline data grids 2015-08-14 15:16:02 -0700 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 mattbaker mattbaker bburg commit-queue graouts joepeck mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1117486 0 mattbaker 2015-08-13 17:49:15 -0700 * SUMMARY Long delay when row selection changes in timeline data grids. The delay is noticeable in all timeline data grids, and is especially slow in the Rendering Frames view. * STEPS TO REPRODUCE 1. Open Timeilnes -> Rendering Frames 2. Record a long timeline (> 100 frames) 3. Select a row 4. Click another row, or use keyboard up/down and attempt to quickly cycle through rows => 0.5 s - 1 s delay while row selection changes * NOTES Inspector^2 shows that tree element mouse down is taking 400-800 ms on average, of which most of the time is spent in NavigationBar.updateLayout, which calls realOffsetWidth for the bar element and for each navigation item element (each time forcing a page reflow). In the Timelines grid, NavigationBar.updateLayout is called 6 times when the row selection changes. In the Rendering Frames grid it's called 18 times! 1117487 1 webkit-bug-importer 2015-08-13 17:49:37 -0700 <rdar://problem/22280383> 1117489 2 258962 mattbaker 2015-08-13 17:57:05 -0700 Created attachment 258962 [Patch] Proposed Fix 1117490 3 258962 timothy 2015-08-13 18:03:58 -0700 Comment on attachment 258962 [Patch] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=258962&action=review > Source/WebInspectorUI/UserInterface/Views/ContentBrowser.js:466 > + this._navigationBar.updateLayoutSoon(); I worry this will cause a disconnect between the DOM and what the layout becomes later. So you might see a flash of content then the layout happens later to adjust. A two step update instead of one. If updateLayoutSoon is using requestAnimationFrame, we should be fine. > Source/WebInspectorUI/UserInterface/Views/RenderingFrameTimelineView.js:35 > + this.navigationSidebarTreeOutline.allowsRepeatSelection = false; We can do this for any sidebar that does not cause a view change. So all Timeline sidebar outlines now. 1117499 4 mattbaker 2015-08-13 18:15:48 -0700 (In reply to comment #3) > Comment on attachment 258962 [details] > [Patch] Proposed Fix > > View in context: > https://bugs.webkit.org/attachment.cgi?id=258962&action=review > > > Source/WebInspectorUI/UserInterface/Views/ContentBrowser.js:466 > > + this._navigationBar.updateLayoutSoon(); > > I worry this will cause a disconnect between the DOM and what the layout > becomes later. So you might see a flash of content then the layout happens > later to adjust. A two step update instead of one. If updateLayoutSoon is > using requestAnimationFrame, we should be fine. > > > Source/WebInspectorUI/UserInterface/Views/RenderingFrameTimelineView.js:35 > > + this.navigationSidebarTreeOutline.allowsRepeatSelection = false; > > We can do this for any sidebar that does not cause a view change. So all > Timeline sidebar outlines now. Except for the Debugger sidebar, which highlights breakpoint lines in the content view when the breakpoint's tree element is clicked. 1117500 5 mattbaker 2015-08-13 18:16:14 -0700 (In reply to comment #4) > (In reply to comment #3) > > Comment on attachment 258962 [details] > > [Patch] Proposed Fix > > > > View in context: > > https://bugs.webkit.org/attachment.cgi?id=258962&action=review > > > > > Source/WebInspectorUI/UserInterface/Views/ContentBrowser.js:466 > > > + this._navigationBar.updateLayoutSoon(); > > > > I worry this will cause a disconnect between the DOM and what the layout > > becomes later. So you might see a flash of content then the layout happens > > later to adjust. A two step update instead of one. If updateLayoutSoon is > > using requestAnimationFrame, we should be fine. > > > > > Source/WebInspectorUI/UserInterface/Views/RenderingFrameTimelineView.js:35 > > > + this.navigationSidebarTreeOutline.allowsRepeatSelection = false; > > > > We can do this for any sidebar that does not cause a view change. So all > > Timeline sidebar outlines now. > > Except for the Debugger sidebar, which highlights breakpoint lines in the > content view when the breakpoint's tree element is clicked. All *timeline* sidebars. Right. :) 1117503 6 timothy 2015-08-13 18:25:57 -0700 We should flip the default for that property. Make it true explicitly for the debugger sidebar. 1117508 7 258968 mattbaker 2015-08-13 18:31:17 -0700 Created attachment 258968 [Patch] Proposed Fix 1117512 8 mattbaker 2015-08-13 18:37:32 -0700 (In reply to comment #3) > Comment on attachment 258962 [details] > [Patch] Proposed Fix > > View in context: > https://bugs.webkit.org/attachment.cgi?id=258962&action=review > > > Source/WebInspectorUI/UserInterface/Views/ContentBrowser.js:466 > > + this._navigationBar.updateLayoutSoon(); > > I worry this will cause a disconnect between the DOM and what the layout > becomes later. So you might see a flash of content then the layout happens > later to adjust. A two step update instead of one. If updateLayoutSoon is > using requestAnimationFrame, we should be fine. Filed a follow up: https://bugs.webkit.org/show_bug.cgi?id=148010 > > Source/WebInspectorUI/UserInterface/Views/RenderingFrameTimelineView.js:35 > > + this.navigationSidebarTreeOutline.allowsRepeatSelection = false; > > We can do this for any sidebar that does not cause a view change. So all > Timeline sidebar outlines now. Updated to set allowsRepeatSelection = false for all TimelineSidebarPanel tree outlines. 1117513 9 258968 timothy 2015-08-13 18:43:16 -0700 Comment on attachment 258968 [Patch] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=258968&action=review > Source/WebInspectorUI/UserInterface/Views/TimelineSidebarPanel.js:232 > + treeOutline.allowsRepeatSelection = false; Actually this will break the sidebar when a non-timeline content view is showing, since we still jump to locations on select in that case. Was there any other reason to change this? 1117751 10 259037 mattbaker 2015-08-14 13:54:14 -0700 Created attachment 259037 [Patch] Proposed Fix 1117753 11 259037 bburg 2015-08-14 14:07:30 -0700 Comment on attachment 259037 [Patch] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=259037&action=review > Source/WebInspectorUI/ChangeLog:14 > + Call updateLayoutSoon instead of updateLayout to compress layout requests. 'coalesce' 1117758 12 259037 bburg 2015-08-14 14:15:33 -0700 Comment on attachment 259037 [Patch] Proposed Fix r=me 1117772 13 259041 mattbaker 2015-08-14 14:29:24 -0700 Created attachment 259041 [Patch] Proposed Fix 1117808 14 259041 commit-queue 2015-08-14 15:15:57 -0700 Comment on attachment 259041 [Patch] Proposed Fix Clearing flags on attachment: 259041 Committed r188494: <http://trac.webkit.org/changeset/188494> 1117809 15 commit-queue 2015-08-14 15:16:02 -0700 All reviewed patches have been landed. Closing bug. 258962 2015-08-13 17:57:05 -0700 2015-08-13 18:31:14 -0700 [Patch] Proposed Fix bug-148005-20150813175647.patch text/plain 3040 mattbaker U3VidmVyc2lvbiBSZXZpc2lvbjogMTg4NDIwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCA0 NzBiY2EzYjNmOTBhZGFmMzg5MmZkZWJiMjgyMThkNzhlNDFiNzNmLi40ZmMxM2VhYmRkMmYzNWU3 ZjYxMTZkM2QwYmEyN2I5YWQ1Mjk1MjcyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs NSArMSwyNSBAQAorMjAxNS0wOC0xMyAgTWF0dCBCYWtlciAgPG1hdHRiYWtlckBhcHBsZS5jb20+ CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogTG9uZyBkZWxheSB3aGVuIHJvdyBzZWxlY3Rpb24g Y2hhbmdlcyBpbiB0aW1lbGluZSBkYXRhIGdyaWRzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDgwMDUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgZmx1cnJ5IG9mIFdlYkluc3BlY3Rvci5Db250ZW50 Vmlldy5FdmVudC5TZWxlY3Rpb25QYXRoQ29tcG9uZW50c0RpZENoYW5nZSBldmVudHMgdGhhdCBm aXJlCisgICAgICAgIGluIHJlc3BvbnNlIHRvIHRyZWUgb3V0bGluZSBhbmQgZGF0YSBncmlkIG5v ZGUgc2VsZWN0aW9uIHJlc3VsdHMgaW4gZXhjZXNzaXZlIGxheW91dCBjYWxscyB0bworICAgICAg ICB0aGUgTmF2aWdhdGlvbkJhciwgd2hpY2ggaXMgZXh0cmVtZWx5IGV4cGVuc2l2ZS4KKworICAg ICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvQ29udGVudEJyb3dzZXIuanM6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuQ29udGVudEJyb3dzZXIucHJvdG90eXBlLl9jb250ZW50Vmlld1NlbGVjdGlv blBhdGhDb21wb25lbnREaWRDaGFuZ2UpOgorICAgICAgICBDYWxsIHVwZGF0ZUxheW91dFNvb24g aW5zdGVhZCBvZiB1cGRhdGVMYXlvdXQgdG8gY29tcHJlc3MgbGF5b3V0IHJlcXVlc3RzLgorCisg ICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9SZW5kZXJpbmdGcmFtZVRpbWVsaW5lVmlldy5q czoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZW5kZXJpbmdGcmFtZVRpbWVsaW5lVmlldyk6Cisg ICAgICAgIEZyYW1lIHNlbGVjdGlvbiBiZXR3ZWVuIHRoZSBvdmVydmlldyBncmFwaCBhbmQgZ3Jp ZCBjYXVzZXMgc29tZSBldmVudCBmZWVkYmFjay4KKyAgICAgICAgTGF5b3V0cyBhcmUgaGFsdmVk IGJ5IGRpc2FsbG93aW5nIHJlcGVhdCBzZWxlY3Rpb24gaW4gdGhlIHRyZWUgb3V0bGluZS4KKwog MjAxNS0wOC0xMyAgTWF0dCBCYWtlciAgPG1hdHRiYWtlckBhcHBsZS5jb20+CiAKICAgICAgICAg V2ViIEluc3BlY3RvcjogU2tpcCByZW5kZXJpbmcgZnJhbWUgcmVjb3JkcyB3aXRob3V0IGNoaWxk cmVuCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDc5 OTMKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvQ29udGVudEJyb3dzZXIuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9Db250ZW50QnJvd3Nlci5qcwppbmRleCAxNjFmNTgxMWRmMjZhNjQwNmM1ZWFjZTg5 ZjY5YWEzMDc5ZDVlMzZiLi5iODY0YjUzYTFlZDlhMmI0NzI3NDc4YzBiZmU1ZmVlMTkwNWIyZmNh IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9D b250ZW50QnJvd3Nlci5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9Db250ZW50QnJvd3Nlci5qcwpAQCAtNDYzLDcgKzQ2Myw3IEBAIFdlYkluc3BlY3Rv ci5Db250ZW50QnJvd3NlciA9IGNsYXNzIENvbnRlbnRCcm93c2VyIGV4dGVuZHMgV2ViSW5zcGVj dG9yLk9iamVjdAogCiAgICAgICAgIHRoaXMuX3VwZGF0ZUNvbnRlbnRWaWV3TmF2aWdhdGlvbkl0 ZW1zKCk7CiAKLSAgICAgICAgdGhpcy5fbmF2aWdhdGlvbkJhci51cGRhdGVMYXlvdXQoKTsKKyAg ICAgICAgdGhpcy5fbmF2aWdhdGlvbkJhci51cGRhdGVMYXlvdXRTb29uKCk7CiAKICAgICAgICAg dGhpcy5fZGlzcGF0Y2hDdXJyZW50UmVwcmVzZW50ZWRPYmplY3RzRGlkQ2hhbmdlRXZlbnRTb29u KCk7CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvUmVuZGVyaW5nRnJhbWVUaW1lbGluZVZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9SZW5kZXJpbmdGcmFtZVRpbWVsaW5lVmlldy5qcwpp bmRleCBhZjgwYmQ0NGJjZTY5YTRkZjgxMGU3MzAwYWIwYWMyYmE4ODZlYjQ0Li41MDg3NTZkYWU2 YjYxNzdjNzFiOGVkNmMyOTE5MDAzYTVlOTIxYTkwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9SZW5kZXJpbmdGcmFtZVRpbWVsaW5lVmlldy5q cworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9SZW5kZXJp bmdGcmFtZVRpbWVsaW5lVmlldy5qcwpAQCAtMzIsNiArMzIsNyBAQCBXZWJJbnNwZWN0b3IuUmVu ZGVyaW5nRnJhbWVUaW1lbGluZVZpZXcgPSBjbGFzcyBSZW5kZXJpbmdGcmFtZVRpbWVsaW5lVmll dyBleHRlbgogICAgICAgICBjb25zb2xlLmFzc2VydChXZWJJbnNwZWN0b3IuVGltZWxpbmVSZWNv cmQuVHlwZS5SZW5kZXJpbmdGcmFtZSk7CiAKICAgICAgICAgdGhpcy5uYXZpZ2F0aW9uU2lkZWJh clRyZWVPdXRsaW5lLmVsZW1lbnQuY2xhc3NMaXN0LmFkZCgicmVuZGVyaW5nLWZyYW1lIik7Cisg ICAgICAgIHRoaXMubmF2aWdhdGlvblNpZGViYXJUcmVlT3V0bGluZS5hbGxvd3NSZXBlYXRTZWxl Y3Rpb24gPSBmYWxzZTsKIAogICAgICAgICB2YXIgc2NvcGVCYXJJdGVtcyA9IFtdOwogICAgICAg ICBmb3IgKHZhciBrZXkgaW4gV2ViSW5zcGVjdG9yLlJlbmRlcmluZ0ZyYW1lVGltZWxpbmVWaWV3 LkR1cmF0aW9uRmlsdGVyKSB7Cg== 258968 2015-08-13 18:31:17 -0700 2015-08-14 13:54:11 -0700 [Patch] Proposed Fix bug-148005-20150813183059.patch text/plain 3191 mattbaker U3VidmVyc2lvbiBSZXZpc2lvbjogMTg4NDIwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCA0 NzBiY2EzYjNmOTBhZGFmMzg5MmZkZWJiMjgyMThkNzhlNDFiNzNmLi40ZmMxM2VhYmRkMmYzNWU3 ZjYxMTZkM2QwYmEyN2I5YWQ1Mjk1MjcyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs NSArMSwyNSBAQAorMjAxNS0wOC0xMyAgTWF0dCBCYWtlciAgPG1hdHRiYWtlckBhcHBsZS5jb20+ CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogTG9uZyBkZWxheSB3aGVuIHJvdyBzZWxlY3Rpb24g Y2hhbmdlcyBpbiB0aW1lbGluZSBkYXRhIGdyaWRzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDgwMDUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgZmx1cnJ5IG9mIFdlYkluc3BlY3Rvci5Db250ZW50 Vmlldy5FdmVudC5TZWxlY3Rpb25QYXRoQ29tcG9uZW50c0RpZENoYW5nZSBldmVudHMgdGhhdCBm aXJlCisgICAgICAgIGluIHJlc3BvbnNlIHRvIHRyZWUgb3V0bGluZSBhbmQgZGF0YSBncmlkIG5v ZGUgc2VsZWN0aW9uIHJlc3VsdHMgaW4gZXhjZXNzaXZlIGxheW91dCBjYWxscyB0bworICAgICAg ICB0aGUgTmF2aWdhdGlvbkJhciwgd2hpY2ggaXMgZXh0cmVtZWx5IGV4cGVuc2l2ZS4KKworICAg ICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvQ29udGVudEJyb3dzZXIuanM6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuQ29udGVudEJyb3dzZXIucHJvdG90eXBlLl9jb250ZW50Vmlld1NlbGVjdGlv blBhdGhDb21wb25lbnREaWRDaGFuZ2UpOgorICAgICAgICBDYWxsIHVwZGF0ZUxheW91dFNvb24g aW5zdGVhZCBvZiB1cGRhdGVMYXlvdXQgdG8gY29tcHJlc3MgbGF5b3V0IHJlcXVlc3RzLgorCisg ICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9SZW5kZXJpbmdGcmFtZVRpbWVsaW5lVmlldy5q czoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZW5kZXJpbmdGcmFtZVRpbWVsaW5lVmlldyk6Cisg ICAgICAgIEZyYW1lIHNlbGVjdGlvbiBiZXR3ZWVuIHRoZSBvdmVydmlldyBncmFwaCBhbmQgZ3Jp ZCBjYXVzZXMgc29tZSBldmVudCBmZWVkYmFjay4KKyAgICAgICAgTGF5b3V0cyBhcmUgaGFsdmVk IGJ5IGRpc2FsbG93aW5nIHJlcGVhdCBzZWxlY3Rpb24gaW4gdGhlIHRyZWUgb3V0bGluZS4KKwog MjAxNS0wOC0xMyAgTWF0dCBCYWtlciAgPG1hdHRiYWtlckBhcHBsZS5jb20+CiAKICAgICAgICAg V2ViIEluc3BlY3RvcjogU2tpcCByZW5kZXJpbmcgZnJhbWUgcmVjb3JkcyB3aXRob3V0IGNoaWxk cmVuCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDc5 OTMKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvQ29udGVudEJyb3dzZXIuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9Db250ZW50QnJvd3Nlci5qcwppbmRleCAxNjFmNTgxMWRmMjZhNjQwNmM1ZWFjZTg5 ZjY5YWEzMDc5ZDVlMzZiLi5iODY0YjUzYTFlZDlhMmI0NzI3NDc4YzBiZmU1ZmVlMTkwNWIyZmNh IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9D b250ZW50QnJvd3Nlci5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9Db250ZW50QnJvd3Nlci5qcwpAQCAtNDYzLDcgKzQ2Myw3IEBAIFdlYkluc3BlY3Rv ci5Db250ZW50QnJvd3NlciA9IGNsYXNzIENvbnRlbnRCcm93c2VyIGV4dGVuZHMgV2ViSW5zcGVj dG9yLk9iamVjdAogCiAgICAgICAgIHRoaXMuX3VwZGF0ZUNvbnRlbnRWaWV3TmF2aWdhdGlvbkl0 ZW1zKCk7CiAKLSAgICAgICAgdGhpcy5fbmF2aWdhdGlvbkJhci51cGRhdGVMYXlvdXQoKTsKKyAg ICAgICAgdGhpcy5fbmF2aWdhdGlvbkJhci51cGRhdGVMYXlvdXRTb29uKCk7CiAKICAgICAgICAg dGhpcy5fZGlzcGF0Y2hDdXJyZW50UmVwcmVzZW50ZWRPYmplY3RzRGlkQ2hhbmdlRXZlbnRTb29u KCk7CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvVGltZWxpbmVTaWRlYmFyUGFuZWwuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVNpZGViYXJQYW5lbC5qcwppbmRleCBkNWZiZTI4 MjJmMWNhODQ1OWI1YjYwMjM0YWRhN2E3MWNiMTA4ZWI1Li44ZmFjNGU1OTdjOGY3NmY5NmIwMDM2 ZDcxMmNkMWE5M2RlYzJjMGQ1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVNpZGViYXJQYW5lbC5qcworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVNpZGViYXJQYW5lbC5qcwpA QCAtMjI2LDYgKzIyNiwxMyBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVTaWRlYmFyUGFuZWwgPSBj bGFzcyBUaW1lbGluZVNpZGViYXJQYW5lbCBleHRlbmRzIFdlYkluc3BlYwogICAgICAgICByZXR1 cm4gISF0aGlzLl9jb250ZW50VHJlZU91dGxpbmUuc2VsZWN0ZWRUcmVlRWxlbWVudCB8fCAhIXRo aXMuX3JlY29yZGluZ3NUcmVlT3V0bGluZS5zZWxlY3RlZFRyZWVFbGVtZW50OwogICAgIH0KIAor ICAgIGNyZWF0ZUNvbnRlbnRUcmVlT3V0bGluZShkb250SGlkZUJ5RGVmYXVsdCwgc3VwcHJlc3NG aWx0ZXJpbmcpCisgICAgeworICAgICAgICB2YXIgdHJlZU91dGxpbmUgPSBzdXBlci5jcmVhdGVD b250ZW50VHJlZU91dGxpbmUoZG9udEhpZGVCeURlZmF1bHQsIHN1cHByZXNzRmlsdGVyaW5nKTsK KyAgICAgICAgdHJlZU91dGxpbmUuYWxsb3dzUmVwZWF0U2VsZWN0aW9uID0gZmFsc2U7CisgICAg ICAgIHJldHVybiB0cmVlT3V0bGluZTsKKyAgICB9CisKICAgICB0cmVlRWxlbWVudEZvclJlcHJl c2VudGVkT2JqZWN0KHJlcHJlc2VudGVkT2JqZWN0KQogICAgIHsKICAgICAgICAgaWYgKHJlcHJl c2VudGVkT2JqZWN0IGluc3RhbmNlb2YgV2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVjb3JkaW5nKQo= 259037 2015-08-14 13:54:14 -0700 2015-08-14 14:29:20 -0700 [Patch] Proposed Fix bug-148005-20150814135359.patch text/plain 3147 mattbaker U3VidmVyc2lvbiBSZXZpc2lvbjogMTg4NDg1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCAx NGIxN2E3ZjkxN2VhMmY4NjY5N2Y3OTU4ZTM1MTJhNWY1YzlkMmYwLi4yZDE5NTRmYjY5MmMyMzJk ZDEyYjlmMmU0NjcxNDRkYWVmNmVhOGYzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMyBAQAorMjAxNS0wOC0xNCAgTWF0dCBCYWtlciAgPG1hdHRiYWtlckBhcHBsZS5jb20+ CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogTG9uZyBkZWxheSB3aGVuIHJvdyBzZWxlY3Rpb24g Y2hhbmdlcyBpbiB0aW1lbGluZSBkYXRhIGdyaWRzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDgwMDUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBTZWxlY3RpbmcgYSB0cmVlIGVsZW1lbnQgaW4gdGhlIFRp bWVsaW5lcyBzaWRlYmFyIGdlbmVyYXRlcyBtdWx0aXBsZQorICAgICAgICBXZWJJbnNwZWN0b3Iu Q29udGVudFZpZXcuU2VsZWN0aW9uUGF0aENvbXBvbmVudHNEaWRDaGFuZ2UgZXZlbnRzLCBlYWNo IG9mIHdoaWNoCisgICAgICAgIGNhdXNlcyBOYXZpZ2F0aW9uQmFyIHRvIHVwZGF0ZSBpdHMgbGF5 b3V0ICh3aGljaCBpcyBleHRyZW1lbHkgZXhwZW5zaXZlKS4KKworICAgICAgICAqIFVzZXJJbnRl cmZhY2UvVmlld3MvQ29udGVudEJyb3dzZXIuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ29u dGVudEJyb3dzZXIucHJvdG90eXBlLl9jb250ZW50Vmlld1NlbGVjdGlvblBhdGhDb21wb25lbnRE aWRDaGFuZ2UpOgorICAgICAgICBDYWxsIHVwZGF0ZUxheW91dFNvb24gaW5zdGVhZCBvZiB1cGRh dGVMYXlvdXQgdG8gY29tcHJlc3MgbGF5b3V0IHJlcXVlc3RzLgorCisgICAgICAgICogVXNlcklu dGVyZmFjZS9WaWV3cy9UaW1lbGluZVJlY29yZGluZ0NvbnRlbnRWaWV3LmpzOgorICAgICAgICAo V2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVjb3JkaW5nQ29udGVudFZpZXcucHJvdG90eXBlLl9yZWNv cmRTZWxlY3RlZCk6CisgICAgICAgIFdoZW4gdGhlIHNlbGVjdGVkIHJlY29yZCBjaGFuZ2VzIGlu IHRoZSBvdmVydmlldyBncmFwaCwgbWFrZSBzdXJlIHRoZSByZWNvcmQncyB0cmVlIGVsZW1lbnQK KyAgICAgICAgaXNuJ3QgYWxyZWFkeSBzZWxlY3RlZC4gUmVzZWxlY3RpbmcgdGhlIHRyZWUgZWxl bWVudCByZXN1bHRzIGluIGFuIGV4dHJhIE5hdmlnYXRpb25CYXIgbGF5b3V0LgorCiAyMDE1LTA4 LTE0ICBEZXZpbiBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5z cGVjdG9yOiBBZGQgdmlzdWFsIGVkaXRvcnMgZm9yIENTUyBwcm9wZXJ0aWVzCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db250ZW50QnJvd3Nl ci5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvbnRlbnRC cm93c2VyLmpzCmluZGV4IDE2MWY1ODExZGYyNmE2NDA2YzVlYWNlODlmNjlhYTMwNzlkNWUzNmIu LmI4NjRiNTNhMWVkOWEyYjQ3Mjc0NzhjMGJmZTVmZWUxOTA1YjJmY2EgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvbnRlbnRCcm93c2VyLmpz CisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvbnRlbnRC cm93c2VyLmpzCkBAIC00NjMsNyArNDYzLDcgQEAgV2ViSW5zcGVjdG9yLkNvbnRlbnRCcm93c2Vy ID0gY2xhc3MgQ29udGVudEJyb3dzZXIgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuT2JqZWN0CiAKICAg ICAgICAgdGhpcy5fdXBkYXRlQ29udGVudFZpZXdOYXZpZ2F0aW9uSXRlbXMoKTsKIAotICAgICAg ICB0aGlzLl9uYXZpZ2F0aW9uQmFyLnVwZGF0ZUxheW91dCgpOworICAgICAgICB0aGlzLl9uYXZp Z2F0aW9uQmFyLnVwZGF0ZUxheW91dFNvb24oKTsKIAogICAgICAgICB0aGlzLl9kaXNwYXRjaEN1 cnJlbnRSZXByZXNlbnRlZE9iamVjdHNEaWRDaGFuZ2VFdmVudFNvb24oKTsKICAgICB9CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGlu ZVJlY29yZGluZ0NvbnRlbnRWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvVGltZWxpbmVSZWNvcmRpbmdDb250ZW50Vmlldy5qcwppbmRleCA3ZWVhYjJh MDNlMWYzZjIxZGI2MWQxOWNkNDM0ODBiNzcwNmIxZGJhLi4zYzQxZDEwODdiZTkyY2U2MDNhZmE5 MWRkZGI5YTIyODNmNmFkMDk5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVJlY29yZGluZ0NvbnRlbnRWaWV3LmpzCisrKyBiL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lUmVjb3JkaW5n Q29udGVudFZpZXcuanMKQEAgLTY4NSw3ICs2ODUsNyBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVS ZWNvcmRpbmdDb250ZW50VmlldyA9IGNsYXNzIFRpbWVsaW5lUmVjb3JkaW5nQ29udGVudFZpZXcg ZQogCiAgICAgICAgIHZhciB0cmVlRWxlbWVudCA9IHRoaXMuY3VycmVudFRpbWVsaW5lVmlldy5u YXZpZ2F0aW9uU2lkZWJhclRyZWVPdXRsaW5lLmZpbmRUcmVlRWxlbWVudChldmVudC5kYXRhLnJl Y29yZCk7CiAgICAgICAgIGNvbnNvbGUuYXNzZXJ0KHRyZWVFbGVtZW50LCAiVGltZWxpbmUgdmll dyBoYXMgbm8gdHJlZSBlbGVtZW50IGZvciByZWNvcmQgc2VsZWN0ZWQgaW4gdGltZWxpbmUgb3Zl cnZpZXcuIiwgdGltZWxpbmVWaWV3LCBldmVudC5kYXRhLnJlY29yZCk7Ci0gICAgICAgIGlmICgh dHJlZUVsZW1lbnQpCisgICAgICAgIGlmICghdHJlZUVsZW1lbnQgfHwgdHJlZUVsZW1lbnQuc2Vs ZWN0ZWQpCiAgICAgICAgICAgICByZXR1cm47CiAKICAgICAgICAgLy8gRG9uJ3Qgc2VsZWN0IHRo ZSByZWNvcmQncyB0cmVlIGVsZW1lbnQgaWYgb25lIG9mIGl0J3MgY2hpbGRyZW4gaXMgYWxyZWFk eSBzZWxlY3RlZC4K 259041 2015-08-14 14:29:24 -0700 2015-08-14 15:15:57 -0700 [Patch] Proposed Fix bug-148005-20150814142909.patch text/plain 3143 mattbaker U3VidmVyc2lvbiBSZXZpc2lvbjogMTg4NDg2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCAx NGIxN2E3ZjkxN2VhMmY4NjY5N2Y3OTU4ZTM1MTJhNWY1YzlkMmYwLi4xZTkwMDY0YTIxNjA3YzEz ZDgxYjgyYjU4Njg4YjIwZTEzZTY3YjQyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMyBAQAorMjAxNS0wOC0xNCAgTWF0dCBCYWtlciAgPG1hdHRiYWtlckBhcHBsZS5jb20+ CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogTG9uZyBkZWxheSB3aGVuIHJvdyBzZWxlY3Rpb24g Y2hhbmdlcyBpbiB0aW1lbGluZSBkYXRhIGdyaWRzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDgwMDUKKworICAgICAgICBSZXZpZXdlZCBieSBCcmlh biBCdXJnLgorCisgICAgICAgIFNlbGVjdGluZyBhIHRyZWUgZWxlbWVudCBpbiB0aGUgVGltZWxp bmVzIHNpZGViYXIgZ2VuZXJhdGVzIG11bHRpcGxlCisgICAgICAgIFdlYkluc3BlY3Rvci5Db250 ZW50Vmlldy5TZWxlY3Rpb25QYXRoQ29tcG9uZW50c0RpZENoYW5nZSBldmVudHMsIGVhY2ggb2Yg d2hpY2gKKyAgICAgICAgY2F1c2VzIE5hdmlnYXRpb25CYXIgdG8gdXBkYXRlIGl0cyBsYXlvdXQg KHdoaWNoIGlzIGV4dHJlbWVseSBleHBlbnNpdmUpLgorCisgICAgICAgICogVXNlckludGVyZmFj ZS9WaWV3cy9Db250ZW50QnJvd3Nlci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db250ZW50 QnJvd3Nlci5wcm90b3R5cGUuX2NvbnRlbnRWaWV3U2VsZWN0aW9uUGF0aENvbXBvbmVudERpZENo YW5nZSk6CisgICAgICAgIENhbGwgdXBkYXRlTGF5b3V0U29vbiBpbnN0ZWFkIG9mIHVwZGF0ZUxh eW91dCB0byBjb2FsZXNjZSBsYXlvdXQgcmVxdWVzdHMuCisKKyAgICAgICAgKiBVc2VySW50ZXJm YWNlL1ZpZXdzL1RpbWVsaW5lUmVjb3JkaW5nQ29udGVudFZpZXcuanM6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuVGltZWxpbmVSZWNvcmRpbmdDb250ZW50Vmlldy5wcm90b3R5cGUuX3JlY29yZFNl bGVjdGVkKToKKyAgICAgICAgV2hlbiB0aGUgc2VsZWN0ZWQgcmVjb3JkIGNoYW5nZXMgaW4gdGhl IG92ZXJ2aWV3IGdyYXBoLCBtYWtlIHN1cmUgdGhlIHJlY29yZCdzIHRyZWUgZWxlbWVudAorICAg ICAgICBpc24ndCBhbHJlYWR5IHNlbGVjdGVkLiBSZXNlbGVjdGluZyB0aGUgdHJlZSBlbGVtZW50 IHJlc3VsdHMgaW4gYW4gZXh0cmEgTmF2aWdhdGlvbkJhciBsYXlvdXQuCisKIDIwMTUtMDgtMTQg IERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0 b3I6IEFkZCB2aXN1YWwgZWRpdG9ycyBmb3IgQ1NTIHByb3BlcnRpZXMKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvbnRlbnRCcm93c2VyLmpz IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29udGVudEJyb3dz ZXIuanMKaW5kZXggMTYxZjU4MTFkZjI2YTY0MDZjNWVhY2U4OWY2OWFhMzA3OWQ1ZTM2Yi4uYjg2 NGI1M2ExZWQ5YTJiNDcyNzQ3OGMwYmZlNWZlZTE5MDViMmZjYSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29udGVudEJyb3dzZXIuanMKKysr IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29udGVudEJyb3dz ZXIuanMKQEAgLTQ2Myw3ICs0NjMsNyBAQCBXZWJJbnNwZWN0b3IuQ29udGVudEJyb3dzZXIgPSBj bGFzcyBDb250ZW50QnJvd3NlciBleHRlbmRzIFdlYkluc3BlY3Rvci5PYmplY3QKIAogICAgICAg ICB0aGlzLl91cGRhdGVDb250ZW50Vmlld05hdmlnYXRpb25JdGVtcygpOwogCi0gICAgICAgIHRo aXMuX25hdmlnYXRpb25CYXIudXBkYXRlTGF5b3V0KCk7CisgICAgICAgIHRoaXMuX25hdmlnYXRp b25CYXIudXBkYXRlTGF5b3V0U29vbigpOwogCiAgICAgICAgIHRoaXMuX2Rpc3BhdGNoQ3VycmVu dFJlcHJlc2VudGVkT2JqZWN0c0RpZENoYW5nZUV2ZW50U29vbigpOwogICAgIH0KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lUmVj b3JkaW5nQ29udGVudFZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9UaW1lbGluZVJlY29yZGluZ0NvbnRlbnRWaWV3LmpzCmluZGV4IDdlZWFiMmEwM2Ux ZjNmMjFkYjYxZDE5Y2Q0MzQ4MGI3NzA2YjFkYmEuLjNjNDFkMTA4N2JlOTJjZTYwM2FmYTkxZGRk YjlhMjI4M2Y2YWQwOTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lUmVjb3JkaW5nQ29udGVudFZpZXcuanMKKysrIGIvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVSZWNvcmRpbmdDb250 ZW50Vmlldy5qcwpAQCAtNjg1LDcgKzY4NSw3IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZVJlY29y ZGluZ0NvbnRlbnRWaWV3ID0gY2xhc3MgVGltZWxpbmVSZWNvcmRpbmdDb250ZW50VmlldyBlCiAK ICAgICAgICAgdmFyIHRyZWVFbGVtZW50ID0gdGhpcy5jdXJyZW50VGltZWxpbmVWaWV3Lm5hdmln YXRpb25TaWRlYmFyVHJlZU91dGxpbmUuZmluZFRyZWVFbGVtZW50KGV2ZW50LmRhdGEucmVjb3Jk KTsKICAgICAgICAgY29uc29sZS5hc3NlcnQodHJlZUVsZW1lbnQsICJUaW1lbGluZSB2aWV3IGhh cyBubyB0cmVlIGVsZW1lbnQgZm9yIHJlY29yZCBzZWxlY3RlZCBpbiB0aW1lbGluZSBvdmVydmll dy4iLCB0aW1lbGluZVZpZXcsIGV2ZW50LmRhdGEucmVjb3JkKTsKLSAgICAgICAgaWYgKCF0cmVl RWxlbWVudCkKKyAgICAgICAgaWYgKCF0cmVlRWxlbWVudCB8fCB0cmVlRWxlbWVudC5zZWxlY3Rl ZCkKICAgICAgICAgICAgIHJldHVybjsKIAogICAgICAgICAvLyBEb24ndCBzZWxlY3QgdGhlIHJl Y29yZCdzIHRyZWUgZWxlbWVudCBpZiBvbmUgb2YgaXQncyBjaGlsZHJlbiBpcyBhbHJlYWR5IHNl bGVjdGVkLgo=