155458 2016-03-14 13:39:59 -0700 Web Inspector: REGRESSION(r197974): HeapAllocationsTimelineView broken, doesn't handle Timeline Sidebar Navigation removal 2016-03-14 16:35:12 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 joepeck joepeck bburg commit-queue graouts joepeck mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1174669 0 joepeck 2016-03-14 13:39:59 -0700 * SUMMARY REGRESSION(r197974): HeapAllocationsTimelineView broken, doesn't handle Timeline Sidebar Navigation removal. * STEPS TO REPRODUCE 1. Start a timeline recording with the HeapAllocations Timeline 2. Stop the timeline recording 3. Select the HeapAllocations Timeline => datagrid is always empty 1174671 1 webkit-bug-importer 2016-03-14 13:40:56 -0700 <rdar://problem/25150803> 1174673 2 274018 joepeck 2016-03-14 13:41:02 -0700 Created attachment 274018 [PATCH] Proposed Fix 1174674 3 274019 joepeck 2016-03-14 13:41:40 -0700 Created attachment 274019 [PATCH] Proposed Fix 1174792 4 274019 commit-queue 2016-03-14 16:35:08 -0700 Comment on attachment 274019 [PATCH] Proposed Fix Clearing flags on attachment: 274019 Committed r198175: <http://trac.webkit.org/changeset/198175> 1174793 5 commit-queue 2016-03-14 16:35:12 -0700 All reviewed patches have been landed. Closing bug. 274018 2016-03-14 13:41:02 -0700 2016-03-14 13:41:40 -0700 [PATCH] Proposed Fix sidebar-removal.patch text/plain 7699 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGU5NzNjMTMuLjRmZWE0ZWIgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIzIEBACiAyMDE2LTAzLTE0ICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKKyAgICAgICAgV2ViIEluc3BlY3RvcjogUkVHUkVT U0lPTihyMTk3OTc0KTogSGVhcEFsbG9jYXRpb25zVGltZWxpbmVWaWV3IGJyb2tlbiwgZG9lc24n dCBoYW5kbGUgVGltZWxpbmUgU2lkZWJhciBOYXZpZ2F0aW9uIHJlbW92YWwKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1NTQ1OAorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3 cy9IZWFwQWxsb2NhdGlvbnNUaW1lbGluZVZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu SGVhcEFsbG9jYXRpb25zVGltZWxpbmVWaWV3KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5IZWFw QWxsb2NhdGlvbnNUaW1lbGluZVZpZXcucHJvdG90eXBlLnNob3dIZWFwU25hcHNob3RUaW1lbGlu ZVJlY29yZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuSGVhcEFsbG9jYXRpb25zVGltZWxpbmVW aWV3LnByb3RvdHlwZS5nZXQgc2VsZWN0aW9uUGF0aENvbXBvbmVudHMpOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLkhlYXBBbGxvY2F0aW9uc1RpbWVsaW5lVmlldy5wcm90b3R5cGUubGF5b3V0KToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5IZWFwQWxsb2NhdGlvbnNUaW1lbGluZVZpZXcucHJvdG90 eXBlLl9jb21wYXJlSGVhcFNuYXBzaG90c0NsaWNrZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9y LkhlYXBBbGxvY2F0aW9uc1RpbWVsaW5lVmlldy5wcm90b3R5cGUuX2RhdGFHcmlkTm9kZVNlbGVj dGVkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5IZWFwQWxsb2NhdGlvbnNUaW1lbGluZVZpZXcu cHJvdG90eXBlLmdldCBuYXZpZ2F0aW9uU2lkZWJhclRyZWVPdXRsaW5lTGFiZWwpOiBEZWxldGVk LgorICAgICAgICBVcGRhdGUgdGhlIFRpbWVsaW5lVmlldyBub3cgdGhhdCB0aGVyZSBpcyBubyBz aWRlYmFyLgorICAgICAgICBSZW1vdmUgYW55IFRyZWVPdXRsaW5lIGxvZ2ljIGFuZCByZXBsYWNl IHdpdGggRGF0YUdyaWQgbG9naWMuCisKKzIwMTYtMDMtMTQgIEpvc2VwaCBQZWNvcmFybyAgPHBl Y29yYXJvQGFwcGxlLmNvbT4KKwogICAgICAgICBXZWIgSW5zcGVjdG9yOiBSRUdSRVNTSU9OKHIx OTgwMjYpOiBDYW4ndCBjbGljayBvbiBTbmFwc2hvdCBpbiBUaW1lbGluZSBPdmVydmlldwogICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU1NDU3CiAgICAg ICAgIDxyZGFyOi8vcHJvYmxlbS8yNTE1MDcwNj4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0hlYXBBbGxvY2F0aW9uc1RpbWVsaW5lVmlldy5q cyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0hlYXBBbGxvY2F0 aW9uc1RpbWVsaW5lVmlldy5qcwppbmRleCBhOGFjYjIxLi4yZGFmY2NiIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9IZWFwQWxsb2NhdGlvbnNU aW1lbGluZVZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvSGVhcEFsbG9jYXRpb25zVGltZWxpbmVWaWV3LmpzCkBAIC03NSw3ICs3NSw3IEBAIFdl Ykluc3BlY3Rvci5IZWFwQWxsb2NhdGlvbnNUaW1lbGluZVZpZXcgPSBjbGFzcyBIZWFwQWxsb2Nh dGlvbnNUaW1lbGluZVZpZXcgZXh0CiAgICAgICAgIHRoaXMuX3NuYXBzaG90TGlzdFBhdGhDb21w b25lbnQgPSBuZXcgV2ViSW5zcGVjdG9yLkhpZXJhcmNoaWNhbFBhdGhDb21wb25lbnQoV2ViSW5z cGVjdG9yLlVJU3RyaW5nKCJTbmFwc2hvdCBMaXN0IiksICJzbmFwc2hvdC1saXN0LWljb24iLCAi c25hcHNob3QtbGlzdCIsIGZhbHNlLCBmYWxzZSk7CiAgICAgICAgIHRoaXMuX3NuYXBzaG90TGlz dFBhdGhDb21wb25lbnQuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuSGllcmFyY2hpY2Fs UGF0aENvbXBvbmVudC5FdmVudC5DbGlja2VkLCB0aGlzLl9zbmFwc2hvdExpc3RQYXRoQ29tcG9u ZW50Q2xpY2tlZCwgdGhpcyk7CiAKLSAgICAgICAgdGhpcy5fZGF0YUdyaWQgPSBuZXcgV2ViSW5z cGVjdG9yLlRpbWVsaW5lRGF0YUdyaWQodGhpcy5uYXZpZ2F0aW9uU2lkZWJhclRyZWVPdXRsaW5l LCBjb2x1bW5zKTsKKyAgICAgICAgdGhpcy5fZGF0YUdyaWQgPSBuZXcgV2ViSW5zcGVjdG9yLlRp bWVsaW5lRGF0YUdyaWQobnVsbCwgY29sdW1ucyk7CiAgICAgICAgIHRoaXMuX2RhdGFHcmlkLnNv cnRDb2x1bW5JZGVudGlmaWVyU2V0dGluZyA9IG5ldyBXZWJJbnNwZWN0b3IuU2V0dGluZygiaGVh cC1hbGxvY2F0aW9ucy10aW1lbGluZS12aWV3LXNvcnQiLCAidGltZXN0YW1wIik7CiAgICAgICAg IHRoaXMuX2RhdGFHcmlkLnNvcnRPcmRlclNldHRpbmcgPSBuZXcgV2ViSW5zcGVjdG9yLlNldHRp bmcoImhlYXAtYWxsb2NhdGlvbnMtdGltZWxpbmUtdmlldy1zb3J0LW9yZGVyIiwgV2ViSW5zcGVj dG9yLkRhdGFHcmlkLlNvcnRPcmRlci5Bc2NlbmRpbmcpOwogICAgICAgICB0aGlzLl9kYXRhR3Jp ZC5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5EYXRhR3JpZC5FdmVudC5TZWxlY3RlZE5v ZGVDaGFuZ2VkLCB0aGlzLl9kYXRhR3JpZE5vZGVTZWxlY3RlZCwgdGhpcyk7CkBAIC0xMjEsMTAg KzEyMSwxMiBAQCBXZWJJbnNwZWN0b3IuSGVhcEFsbG9jYXRpb25zVGltZWxpbmVWaWV3ID0gY2xh c3MgSGVhcEFsbG9jYXRpb25zVGltZWxpbmVWaWV3IGV4dAogICAgICAgICB0aGlzLl9oZWFwU25h cHNob3REaWZmID0gbnVsbDsKICAgICAgICAgdGhpcy5fY2FuY2VsU2VsZWN0Q29tcGFyaXNvbkhl YXBTbmFwc2hvdHMoKTsKIAotICAgICAgICBsZXQgdHJlZUVsZW1lbnQgPSB0aGlzLm5hdmlnYXRp b25TaWRlYmFyVHJlZU91dGxpbmUuZmluZFRyZWVFbGVtZW50KGhlYXBTbmFwc2hvdFRpbWVsaW5l UmVjb3JkKTsKLSAgICAgICAgY29uc29sZS5hc3NlcnQodHJlZUVsZW1lbnQsICJTaG91bGQgaGF2 ZSBhIFRyZWVFbGVtZW50IGZvciB0aGUgSGVhcFNuYXBzaG90Iik7Ci0gICAgICAgIGlmICh0cmVl RWxlbWVudCkKLSAgICAgICAgICAgIHRyZWVFbGVtZW50LnNlbGVjdCgpOworICAgICAgICBmb3Ig KGxldCBkYXRhR3JpZE5vZGUgb2YgdGhpcy5fZGF0YUdyaWQuY2hpbGRyZW4pIHsKKyAgICAgICAg ICAgIGlmIChkYXRhR3JpZE5vZGUucmVjb3JkID09PSBoZWFwU25hcHNob3RUaW1lbGluZVJlY29y ZCkgeworICAgICAgICAgICAgICAgIGRhdGFHcmlkTm9kZS5zZWxlY3QoKTsKKyAgICAgICAgICAg ICAgICBicmVhazsKKyAgICAgICAgICAgIH0KKyAgICAgICAgfQogCiAgICAgICAgIGxldCBzaG91 bGRNYW51YWxseVRyaWdnZXJDb250ZW50Vmlld1VwZGF0ZSA9IHRoaXMuX2NvbnRlbnRWaWV3Q29u dGFpbmVyLmN1cnJlbnRDb250ZW50VmlldyAmJiB0aGlzLl9jb250ZW50Vmlld0NvbnRhaW5lci5j dXJyZW50Q29udGVudFZpZXcucmVwcmVzZW50ZWRPYmplY3QgPT09IGhlYXBTbmFwc2hvdFRpbWVs aW5lUmVjb3JkLmhlYXBTbmFwc2hvdDsKIApAQCAtMTc1LDggKzE3Nyw4IEBAIFdlYkluc3BlY3Rv ci5IZWFwQWxsb2NhdGlvbnNUaW1lbGluZVZpZXcgPSBjbGFzcyBIZWFwQWxsb2NhdGlvbnNUaW1l bGluZVZpZXcgZXh0CiAgICAgICAgICAgICBsZXQgZGlmZkNvbXBvbmVudCA9IG5ldyBXZWJJbnNw ZWN0b3IuSGllcmFyY2hpY2FsUGF0aENvbXBvbmVudChXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlNu YXBzaG90IENvbXBhcmlzb24gKCVkIGFuZCAlZCkiKS5mb3JtYXQoZmlyc3RTbmFwc2hvdElkZW50 aWZpZXIsIHNlY29uZFNuYXBzaG90SWRlbnRpZmllciksICJzbmFwc2hvdC1kaWZmLWljb24iLCAi c25hcHNob3QtZGlmZiIpOwogICAgICAgICAgICAgY29tcG9uZW50cy5wdXNoKGRpZmZDb21wb25l bnQpOwogICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgaWYgKHRoaXMubmF2aWdhdGlvblNp ZGViYXJUcmVlT3V0bGluZS5zZWxlY3RlZFRyZWVFbGVtZW50KSB7Ci0gICAgICAgICAgICAgICAg bGV0IGhlYXBTbmFwc2hvdFBhdGhDb21wb25lbnQgPSBuZXcgV2ViSW5zcGVjdG9yLkdlbmVyYWxU cmVlRWxlbWVudFBhdGhDb21wb25lbnQodGhpcy5uYXZpZ2F0aW9uU2lkZWJhclRyZWVPdXRsaW5l LnNlbGVjdGVkVHJlZUVsZW1lbnQpOworICAgICAgICAgICAgaWYgKHRoaXMuX2RhdGFHcmlkLnNl bGVjdGVkTm9kZSkgeworICAgICAgICAgICAgICAgIGxldCBoZWFwU25hcHNob3RQYXRoQ29tcG9u ZW50ID0gbmV3IFdlYkluc3BlY3Rvci5UaW1lbGluZURhdGFHcmlkTm9kZVBhdGhDb21wb25lbnQo dGhpcy5fZGF0YUdyaWQuc2VsZWN0ZWROb2RlKTsKICAgICAgICAgICAgICAgICBoZWFwU25hcHNo b3RQYXRoQ29tcG9uZW50LmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkhpZXJhcmNoaWNh bFBhdGhDb21wb25lbnQuRXZlbnQuU2libGluZ1dhc1NlbGVjdGVkLCB0aGlzLl9zbmFwc2hvdFBh dGhDb21wb25lbnRTZWxlY3RlZCwgdGhpcyk7CiAgICAgICAgICAgICAgICAgY29tcG9uZW50cy5w dXNoKGhlYXBTbmFwc2hvdFBhdGhDb21wb25lbnQpOwogICAgICAgICAgICAgfQpAQCAtMTg1LDEy ICsxODcsNiBAQCBXZWJJbnNwZWN0b3IuSGVhcEFsbG9jYXRpb25zVGltZWxpbmVWaWV3ID0gY2xh c3MgSGVhcEFsbG9jYXRpb25zVGltZWxpbmVWaWV3IGV4dAogICAgICAgICByZXR1cm4gY29tcG9u ZW50cy5jb25jYXQodGhpcy5fY29udGVudFZpZXdDb250YWluZXIuY3VycmVudENvbnRlbnRWaWV3 LnNlbGVjdGlvblBhdGhDb21wb25lbnRzKTsKICAgICB9CiAKLSAgICBnZXQgbmF2aWdhdGlvblNp ZGViYXJUcmVlT3V0bGluZUxhYmVsKCkKLSAgICB7Ci0gICAgICAgIC8vIEZJWE1FOiBOb3RoaW5n LiBUaGUgc2lkZWJhciB3aWxsIHNvb24gYmUgcmVtb3ZlZC4KLSAgICAgICAgcmV0dXJuIFdlYklu c3BlY3Rvci5VSVN0cmluZygiU25hcHNob3RzIik7Ci0gICAgfQotCiAgICAgdXNlclNlbGVjdGVk UmVjb3JkRnJvbU92ZXJ2aWV3KHRpbWVsaW5lUmVjb3JkKQogICAgIHsKICAgICAgICAgdGhpcy5z aG93SGVhcFNuYXBzaG90VGltZWxpbmVSZWNvcmQodGltZWxpbmVSZWNvcmQpOwpAQCAtMjI1LDkg KzIyMSw4IEBAIFdlYkluc3BlY3Rvci5IZWFwQWxsb2NhdGlvbnNUaW1lbGluZVZpZXcgPSBjbGFz cyBIZWFwQWxsb2NhdGlvbnNUaW1lbGluZVZpZXcgZXh0CiAgICAgICAgIC8vIFdhaXQgdG8gc2hv dyByZWNvcmRzIHVudGlsIG91ciB6ZXJvVGltZSBoYXMgYmVlbiBzZXQuCiAgICAgICAgIGlmICh0 aGlzLl9wZW5kaW5nUmVjb3Jkcy5sZW5ndGggJiYgdGhpcy56ZXJvVGltZSkgewogICAgICAgICAg ICAgZm9yIChsZXQgaGVhcEFsbG9jYXRpb25zVGltZWxpbmVSZWNvcmQgb2YgdGhpcy5fcGVuZGlu Z1JlY29yZHMpIHsKLSAgICAgICAgICAgICAgICBsZXQgdHJlZUVsZW1lbnQgPSBuZXcgV2ViSW5z cGVjdG9yLlRpbWVsaW5lUmVjb3JkVHJlZUVsZW1lbnQoaGVhcEFsbG9jYXRpb25zVGltZWxpbmVS ZWNvcmQpOwogICAgICAgICAgICAgICAgIGxldCBkYXRhR3JpZE5vZGUgPSBuZXcgV2ViSW5zcGVj dG9yLkhlYXBBbGxvY2F0aW9uc1RpbWVsaW5lRGF0YUdyaWROb2RlKGhlYXBBbGxvY2F0aW9uc1Rp bWVsaW5lUmVjb3JkLCB0aGlzLnplcm9UaW1lLCB0aGlzKTsKLSAgICAgICAgICAgICAgICB0aGlz Ll9kYXRhR3JpZC5hZGRSb3dJblNvcnRPcmRlcih0cmVlRWxlbWVudCwgZGF0YUdyaWROb2RlKTsK KyAgICAgICAgICAgICAgICB0aGlzLl9kYXRhR3JpZC5hZGRSb3dJblNvcnRPcmRlcihudWxsLCBk YXRhR3JpZE5vZGUpOwogICAgICAgICAgICAgfQogCiAgICAgICAgICAgICB0aGlzLl9wZW5kaW5n UmVjb3JkcyA9IFtdOwpAQCAtMzMxLDggKzMyNiw4IEBAIFdlYkluc3BlY3Rvci5IZWFwQWxsb2Nh dGlvbnNUaW1lbGluZVZpZXcgPSBjbGFzcyBIZWFwQWxsb2NhdGlvbnNUaW1lbGluZVZpZXcgZXh0 CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KIAotICAgICAgICBpZiAodGhpcy5uYXZp Z2F0aW9uU2lkZWJhclRyZWVPdXRsaW5lLnNlbGVjdGVkVHJlZUVsZW1lbnQpCi0gICAgICAgICAg ICB0aGlzLm5hdmlnYXRpb25TaWRlYmFyVHJlZU91dGxpbmUuc2VsZWN0ZWRUcmVlRWxlbWVudC5k ZXNlbGVjdCgpOworICAgICAgICBpZiAodGhpcy5fZGF0YUdyaWQuc2VsZWN0ZWROb2RlKQorICAg ICAgICAgICAgdGhpcy5fZGF0YUdyaWQuc2VsZWN0ZWROb2RlLmRlc2VsZWN0KCk7CiAKICAgICAg ICAgdGhpcy5fc2VsZWN0aW5nQ29tcGFyaXNvbkhlYXBTbmFwc2hvdHMgPSB0cnVlOwogICAgICAg ICB0aGlzLl9iYXNlbGluZUhlYXBTbmFwc2hvdFRpbWVsaW5lUmVjb3JkID0gbnVsbDsKQEAgLTM1 Miw3ICszNDcsNyBAQCBXZWJJbnNwZWN0b3IuSGVhcEFsbG9jYXRpb25zVGltZWxpbmVWaWV3ID0g Y2xhc3MgSGVhcEFsbG9jYXRpb25zVGltZWxpbmVWaWV3IGV4dAogCiAgICAgICAgIGxldCBoZWFw QWxsb2NhdGlvbnNUaW1lbGluZVJlY29yZCA9IGRhdGFHcmlkTm9kZS5yZWNvcmQ7CiAgICAgICAg IGlmICh0aGlzLl9iYXNlbGluZUhlYXBTbmFwc2hvdFRpbWVsaW5lUmVjb3JkID09PSBoZWFwQWxs b2NhdGlvbnNUaW1lbGluZVJlY29yZCkgewotICAgICAgICAgICAgdGhpcy5uYXZpZ2F0aW9uU2lk ZWJhclRyZWVPdXRsaW5lLnNlbGVjdGVkVHJlZUVsZW1lbnQuZGVzZWxlY3QoKTsKKyAgICAgICAg ICAgIHRoaXMuX2RhdGFHcmlkLnNlbGVjdGVkTm9kZS5kZXNlbGVjdCgpOwogICAgICAgICAgICAg cmV0dXJuOwogICAgICAgICB9CiAKQEAgLTM2MSw3ICszNTYsNyBAQCBXZWJJbnNwZWN0b3IuSGVh cEFsbG9jYXRpb25zVGltZWxpbmVWaWV3ID0gY2xhc3MgSGVhcEFsbG9jYXRpb25zVGltZWxpbmVW aWV3IGV4dAogICAgICAgICAgICAgdGhpcy5fYmFzZWxpbmVEYXRhR3JpZE5vZGUgPSBkYXRhR3Jp ZE5vZGU7CiAgICAgICAgICAgICB0aGlzLl9iYXNlbGluZURhdGFHcmlkTm9kZS5tYXJrQXNCYXNl bGluZSgpOwogICAgICAgICAgICAgdGhpcy5fYmFzZWxpbmVIZWFwU25hcHNob3RUaW1lbGluZVJl Y29yZCA9IGhlYXBBbGxvY2F0aW9uc1RpbWVsaW5lUmVjb3JkOwotICAgICAgICAgICAgdGhpcy5u YXZpZ2F0aW9uU2lkZWJhclRyZWVPdXRsaW5lLnNlbGVjdGVkVHJlZUVsZW1lbnQuZGVzZWxlY3Qo KTsKKyAgICAgICAgICAgIHRoaXMuX2RhdGFHcmlkLnNlbGVjdGVkTm9kZS5kZXNlbGVjdCgpOwog ICAgICAgICAgICAgdGhpcy5fY29tcGFyZUhlYXBTbmFwc2hvdEhlbHBUZXh0SXRlbS50ZXh0ID0g V2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJTZWxlY3QgY29tcGFyaXNvbiBzbmFwc2hvdCIpOwogICAg ICAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLkNvbnRl bnRWaWV3LkV2ZW50Lk5hdmlnYXRpb25JdGVtc0RpZENoYW5nZSk7CiAgICAgICAgICAgICByZXR1 cm47Cg== 274019 2016-03-14 13:41:40 -0700 2016-03-14 16:35:08 -0700 [PATCH] Proposed Fix sidebar-2.patch text/plain 7734 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGU5NzNjMTMuLmU3ZWJjN2QgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI0IEBACiAyMDE2LTAzLTE0ICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKKyAgICAgICAgV2ViIEluc3BlY3RvcjogUkVHUkVT U0lPTihyMTk3OTc0KTogSGVhcEFsbG9jYXRpb25zVGltZWxpbmVWaWV3IGJyb2tlbiwgZG9lc24n dCBoYW5kbGUgVGltZWxpbmUgU2lkZWJhciBOYXZpZ2F0aW9uIHJlbW92YWwKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1NTQ1OAorICAgICAgICA8cmRh cjovL3Byb2JsZW0vMjUxNTA4MDM+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0hlYXBBbGxvY2F0aW9uc1RpbWVs aW5lVmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5IZWFwQWxsb2NhdGlvbnNUaW1lbGlu ZVZpZXcpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkhlYXBBbGxvY2F0aW9uc1RpbWVsaW5lVmll dy5wcm90b3R5cGUuc2hvd0hlYXBTbmFwc2hvdFRpbWVsaW5lUmVjb3JkKToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5IZWFwQWxsb2NhdGlvbnNUaW1lbGluZVZpZXcucHJvdG90eXBlLmdldCBzZWxl Y3Rpb25QYXRoQ29tcG9uZW50cyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuSGVhcEFsbG9jYXRp b25zVGltZWxpbmVWaWV3LnByb3RvdHlwZS5sYXlvdXQpOgorICAgICAgICAoV2ViSW5zcGVjdG9y LkhlYXBBbGxvY2F0aW9uc1RpbWVsaW5lVmlldy5wcm90b3R5cGUuX2NvbXBhcmVIZWFwU25hcHNo b3RzQ2xpY2tlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuSGVhcEFsbG9jYXRpb25zVGltZWxp bmVWaWV3LnByb3RvdHlwZS5fZGF0YUdyaWROb2RlU2VsZWN0ZWQpOgorICAgICAgICAoV2ViSW5z cGVjdG9yLkhlYXBBbGxvY2F0aW9uc1RpbWVsaW5lVmlldy5wcm90b3R5cGUuZ2V0IG5hdmlnYXRp b25TaWRlYmFyVHJlZU91dGxpbmVMYWJlbCk6IERlbGV0ZWQuCisgICAgICAgIFVwZGF0ZSB0aGUg VGltZWxpbmVWaWV3IG5vdyB0aGF0IHRoZXJlIGlzIG5vIHNpZGViYXIuCisgICAgICAgIFJlbW92 ZSBhbnkgVHJlZU91dGxpbmUgbG9naWMgYW5kIHJlcGxhY2Ugd2l0aCBEYXRhR3JpZCBsb2dpYy4K KworMjAxNi0wMy0xNCAgSm9zZXBoIFBlY29yYXJvICA8cGVjb3Jhcm9AYXBwbGUuY29tPgorCiAg ICAgICAgIFdlYiBJbnNwZWN0b3I6IFJFR1JFU1NJT04ocjE5ODAyNik6IENhbid0IGNsaWNrIG9u IFNuYXBzaG90IGluIFRpbWVsaW5lIE92ZXJ2aWV3CiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTU0NTcKICAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzI1 MTUwNzA2PgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvSGVhcEFsbG9jYXRpb25zVGltZWxpbmVWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvSGVhcEFsbG9jYXRpb25zVGltZWxpbmVWaWV3LmpzCmlu ZGV4IGE4YWNiMjEuLjJkYWZjY2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL0hlYXBBbGxvY2F0aW9uc1RpbWVsaW5lVmlldy5qcworKysgYi9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9IZWFwQWxsb2NhdGlvbnNU aW1lbGluZVZpZXcuanMKQEAgLTc1LDcgKzc1LDcgQEAgV2ViSW5zcGVjdG9yLkhlYXBBbGxvY2F0 aW9uc1RpbWVsaW5lVmlldyA9IGNsYXNzIEhlYXBBbGxvY2F0aW9uc1RpbWVsaW5lVmlldyBleHQK ICAgICAgICAgdGhpcy5fc25hcHNob3RMaXN0UGF0aENvbXBvbmVudCA9IG5ldyBXZWJJbnNwZWN0 b3IuSGllcmFyY2hpY2FsUGF0aENvbXBvbmVudChXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlNuYXBz aG90IExpc3QiKSwgInNuYXBzaG90LWxpc3QtaWNvbiIsICJzbmFwc2hvdC1saXN0IiwgZmFsc2Us IGZhbHNlKTsKICAgICAgICAgdGhpcy5fc25hcHNob3RMaXN0UGF0aENvbXBvbmVudC5hZGRFdmVu dExpc3RlbmVyKFdlYkluc3BlY3Rvci5IaWVyYXJjaGljYWxQYXRoQ29tcG9uZW50LkV2ZW50LkNs aWNrZWQsIHRoaXMuX3NuYXBzaG90TGlzdFBhdGhDb21wb25lbnRDbGlja2VkLCB0aGlzKTsKIAot ICAgICAgICB0aGlzLl9kYXRhR3JpZCA9IG5ldyBXZWJJbnNwZWN0b3IuVGltZWxpbmVEYXRhR3Jp ZCh0aGlzLm5hdmlnYXRpb25TaWRlYmFyVHJlZU91dGxpbmUsIGNvbHVtbnMpOworICAgICAgICB0 aGlzLl9kYXRhR3JpZCA9IG5ldyBXZWJJbnNwZWN0b3IuVGltZWxpbmVEYXRhR3JpZChudWxsLCBj b2x1bW5zKTsKICAgICAgICAgdGhpcy5fZGF0YUdyaWQuc29ydENvbHVtbklkZW50aWZpZXJTZXR0 aW5nID0gbmV3IFdlYkluc3BlY3Rvci5TZXR0aW5nKCJoZWFwLWFsbG9jYXRpb25zLXRpbWVsaW5l LXZpZXctc29ydCIsICJ0aW1lc3RhbXAiKTsKICAgICAgICAgdGhpcy5fZGF0YUdyaWQuc29ydE9y ZGVyU2V0dGluZyA9IG5ldyBXZWJJbnNwZWN0b3IuU2V0dGluZygiaGVhcC1hbGxvY2F0aW9ucy10 aW1lbGluZS12aWV3LXNvcnQtb3JkZXIiLCBXZWJJbnNwZWN0b3IuRGF0YUdyaWQuU29ydE9yZGVy LkFzY2VuZGluZyk7CiAgICAgICAgIHRoaXMuX2RhdGFHcmlkLmFkZEV2ZW50TGlzdGVuZXIoV2Vi SW5zcGVjdG9yLkRhdGFHcmlkLkV2ZW50LlNlbGVjdGVkTm9kZUNoYW5nZWQsIHRoaXMuX2RhdGFH cmlkTm9kZVNlbGVjdGVkLCB0aGlzKTsKQEAgLTEyMSwxMCArMTIxLDEyIEBAIFdlYkluc3BlY3Rv ci5IZWFwQWxsb2NhdGlvbnNUaW1lbGluZVZpZXcgPSBjbGFzcyBIZWFwQWxsb2NhdGlvbnNUaW1l bGluZVZpZXcgZXh0CiAgICAgICAgIHRoaXMuX2hlYXBTbmFwc2hvdERpZmYgPSBudWxsOwogICAg ICAgICB0aGlzLl9jYW5jZWxTZWxlY3RDb21wYXJpc29uSGVhcFNuYXBzaG90cygpOwogCi0gICAg ICAgIGxldCB0cmVlRWxlbWVudCA9IHRoaXMubmF2aWdhdGlvblNpZGViYXJUcmVlT3V0bGluZS5m aW5kVHJlZUVsZW1lbnQoaGVhcFNuYXBzaG90VGltZWxpbmVSZWNvcmQpOwotICAgICAgICBjb25z b2xlLmFzc2VydCh0cmVlRWxlbWVudCwgIlNob3VsZCBoYXZlIGEgVHJlZUVsZW1lbnQgZm9yIHRo ZSBIZWFwU25hcHNob3QiKTsKLSAgICAgICAgaWYgKHRyZWVFbGVtZW50KQotICAgICAgICAgICAg dHJlZUVsZW1lbnQuc2VsZWN0KCk7CisgICAgICAgIGZvciAobGV0IGRhdGFHcmlkTm9kZSBvZiB0 aGlzLl9kYXRhR3JpZC5jaGlsZHJlbikgeworICAgICAgICAgICAgaWYgKGRhdGFHcmlkTm9kZS5y ZWNvcmQgPT09IGhlYXBTbmFwc2hvdFRpbWVsaW5lUmVjb3JkKSB7CisgICAgICAgICAgICAgICAg ZGF0YUdyaWROb2RlLnNlbGVjdCgpOworICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAg ICAgfQorICAgICAgICB9CiAKICAgICAgICAgbGV0IHNob3VsZE1hbnVhbGx5VHJpZ2dlckNvbnRl bnRWaWV3VXBkYXRlID0gdGhpcy5fY29udGVudFZpZXdDb250YWluZXIuY3VycmVudENvbnRlbnRW aWV3ICYmIHRoaXMuX2NvbnRlbnRWaWV3Q29udGFpbmVyLmN1cnJlbnRDb250ZW50Vmlldy5yZXBy ZXNlbnRlZE9iamVjdCA9PT0gaGVhcFNuYXBzaG90VGltZWxpbmVSZWNvcmQuaGVhcFNuYXBzaG90 OwogCkBAIC0xNzUsOCArMTc3LDggQEAgV2ViSW5zcGVjdG9yLkhlYXBBbGxvY2F0aW9uc1RpbWVs aW5lVmlldyA9IGNsYXNzIEhlYXBBbGxvY2F0aW9uc1RpbWVsaW5lVmlldyBleHQKICAgICAgICAg ICAgIGxldCBkaWZmQ29tcG9uZW50ID0gbmV3IFdlYkluc3BlY3Rvci5IaWVyYXJjaGljYWxQYXRo Q29tcG9uZW50KFdlYkluc3BlY3Rvci5VSVN0cmluZygiU25hcHNob3QgQ29tcGFyaXNvbiAoJWQg YW5kICVkKSIpLmZvcm1hdChmaXJzdFNuYXBzaG90SWRlbnRpZmllciwgc2Vjb25kU25hcHNob3RJ ZGVudGlmaWVyKSwgInNuYXBzaG90LWRpZmYtaWNvbiIsICJzbmFwc2hvdC1kaWZmIik7CiAgICAg ICAgICAgICBjb21wb25lbnRzLnB1c2goZGlmZkNvbXBvbmVudCk7CiAgICAgICAgIH0gZWxzZSB7 Ci0gICAgICAgICAgICBpZiAodGhpcy5uYXZpZ2F0aW9uU2lkZWJhclRyZWVPdXRsaW5lLnNlbGVj dGVkVHJlZUVsZW1lbnQpIHsKLSAgICAgICAgICAgICAgICBsZXQgaGVhcFNuYXBzaG90UGF0aENv bXBvbmVudCA9IG5ldyBXZWJJbnNwZWN0b3IuR2VuZXJhbFRyZWVFbGVtZW50UGF0aENvbXBvbmVu dCh0aGlzLm5hdmlnYXRpb25TaWRlYmFyVHJlZU91dGxpbmUuc2VsZWN0ZWRUcmVlRWxlbWVudCk7 CisgICAgICAgICAgICBpZiAodGhpcy5fZGF0YUdyaWQuc2VsZWN0ZWROb2RlKSB7CisgICAgICAg ICAgICAgICAgbGV0IGhlYXBTbmFwc2hvdFBhdGhDb21wb25lbnQgPSBuZXcgV2ViSW5zcGVjdG9y LlRpbWVsaW5lRGF0YUdyaWROb2RlUGF0aENvbXBvbmVudCh0aGlzLl9kYXRhR3JpZC5zZWxlY3Rl ZE5vZGUpOwogICAgICAgICAgICAgICAgIGhlYXBTbmFwc2hvdFBhdGhDb21wb25lbnQuYWRkRXZl bnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuSGllcmFyY2hpY2FsUGF0aENvbXBvbmVudC5FdmVudC5T aWJsaW5nV2FzU2VsZWN0ZWQsIHRoaXMuX3NuYXBzaG90UGF0aENvbXBvbmVudFNlbGVjdGVkLCB0 aGlzKTsKICAgICAgICAgICAgICAgICBjb21wb25lbnRzLnB1c2goaGVhcFNuYXBzaG90UGF0aENv bXBvbmVudCk7CiAgICAgICAgICAgICB9CkBAIC0xODUsMTIgKzE4Nyw2IEBAIFdlYkluc3BlY3Rv ci5IZWFwQWxsb2NhdGlvbnNUaW1lbGluZVZpZXcgPSBjbGFzcyBIZWFwQWxsb2NhdGlvbnNUaW1l bGluZVZpZXcgZXh0CiAgICAgICAgIHJldHVybiBjb21wb25lbnRzLmNvbmNhdCh0aGlzLl9jb250 ZW50Vmlld0NvbnRhaW5lci5jdXJyZW50Q29udGVudFZpZXcuc2VsZWN0aW9uUGF0aENvbXBvbmVu dHMpOwogICAgIH0KIAotICAgIGdldCBuYXZpZ2F0aW9uU2lkZWJhclRyZWVPdXRsaW5lTGFiZWwo KQotICAgIHsKLSAgICAgICAgLy8gRklYTUU6IE5vdGhpbmcuIFRoZSBzaWRlYmFyIHdpbGwgc29v biBiZSByZW1vdmVkLgotICAgICAgICByZXR1cm4gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJTbmFw c2hvdHMiKTsKLSAgICB9Ci0KICAgICB1c2VyU2VsZWN0ZWRSZWNvcmRGcm9tT3ZlcnZpZXcodGlt ZWxpbmVSZWNvcmQpCiAgICAgewogICAgICAgICB0aGlzLnNob3dIZWFwU25hcHNob3RUaW1lbGlu ZVJlY29yZCh0aW1lbGluZVJlY29yZCk7CkBAIC0yMjUsOSArMjIxLDggQEAgV2ViSW5zcGVjdG9y LkhlYXBBbGxvY2F0aW9uc1RpbWVsaW5lVmlldyA9IGNsYXNzIEhlYXBBbGxvY2F0aW9uc1RpbWVs aW5lVmlldyBleHQKICAgICAgICAgLy8gV2FpdCB0byBzaG93IHJlY29yZHMgdW50aWwgb3VyIHpl cm9UaW1lIGhhcyBiZWVuIHNldC4KICAgICAgICAgaWYgKHRoaXMuX3BlbmRpbmdSZWNvcmRzLmxl bmd0aCAmJiB0aGlzLnplcm9UaW1lKSB7CiAgICAgICAgICAgICBmb3IgKGxldCBoZWFwQWxsb2Nh dGlvbnNUaW1lbGluZVJlY29yZCBvZiB0aGlzLl9wZW5kaW5nUmVjb3JkcykgewotICAgICAgICAg ICAgICAgIGxldCB0cmVlRWxlbWVudCA9IG5ldyBXZWJJbnNwZWN0b3IuVGltZWxpbmVSZWNvcmRU cmVlRWxlbWVudChoZWFwQWxsb2NhdGlvbnNUaW1lbGluZVJlY29yZCk7CiAgICAgICAgICAgICAg ICAgbGV0IGRhdGFHcmlkTm9kZSA9IG5ldyBXZWJJbnNwZWN0b3IuSGVhcEFsbG9jYXRpb25zVGlt ZWxpbmVEYXRhR3JpZE5vZGUoaGVhcEFsbG9jYXRpb25zVGltZWxpbmVSZWNvcmQsIHRoaXMuemVy b1RpbWUsIHRoaXMpOwotICAgICAgICAgICAgICAgIHRoaXMuX2RhdGFHcmlkLmFkZFJvd0luU29y dE9yZGVyKHRyZWVFbGVtZW50LCBkYXRhR3JpZE5vZGUpOworICAgICAgICAgICAgICAgIHRoaXMu X2RhdGFHcmlkLmFkZFJvd0luU29ydE9yZGVyKG51bGwsIGRhdGFHcmlkTm9kZSk7CiAgICAgICAg ICAgICB9CiAKICAgICAgICAgICAgIHRoaXMuX3BlbmRpbmdSZWNvcmRzID0gW107CkBAIC0zMzEs OCArMzI2LDggQEAgV2ViSW5zcGVjdG9yLkhlYXBBbGxvY2F0aW9uc1RpbWVsaW5lVmlldyA9IGNs YXNzIEhlYXBBbGxvY2F0aW9uc1RpbWVsaW5lVmlldyBleHQKICAgICAgICAgICAgIHJldHVybjsK ICAgICAgICAgfQogCi0gICAgICAgIGlmICh0aGlzLm5hdmlnYXRpb25TaWRlYmFyVHJlZU91dGxp bmUuc2VsZWN0ZWRUcmVlRWxlbWVudCkKLSAgICAgICAgICAgIHRoaXMubmF2aWdhdGlvblNpZGVi YXJUcmVlT3V0bGluZS5zZWxlY3RlZFRyZWVFbGVtZW50LmRlc2VsZWN0KCk7CisgICAgICAgIGlm ICh0aGlzLl9kYXRhR3JpZC5zZWxlY3RlZE5vZGUpCisgICAgICAgICAgICB0aGlzLl9kYXRhR3Jp ZC5zZWxlY3RlZE5vZGUuZGVzZWxlY3QoKTsKIAogICAgICAgICB0aGlzLl9zZWxlY3RpbmdDb21w YXJpc29uSGVhcFNuYXBzaG90cyA9IHRydWU7CiAgICAgICAgIHRoaXMuX2Jhc2VsaW5lSGVhcFNu YXBzaG90VGltZWxpbmVSZWNvcmQgPSBudWxsOwpAQCAtMzUyLDcgKzM0Nyw3IEBAIFdlYkluc3Bl Y3Rvci5IZWFwQWxsb2NhdGlvbnNUaW1lbGluZVZpZXcgPSBjbGFzcyBIZWFwQWxsb2NhdGlvbnNU aW1lbGluZVZpZXcgZXh0CiAKICAgICAgICAgbGV0IGhlYXBBbGxvY2F0aW9uc1RpbWVsaW5lUmVj b3JkID0gZGF0YUdyaWROb2RlLnJlY29yZDsKICAgICAgICAgaWYgKHRoaXMuX2Jhc2VsaW5lSGVh cFNuYXBzaG90VGltZWxpbmVSZWNvcmQgPT09IGhlYXBBbGxvY2F0aW9uc1RpbWVsaW5lUmVjb3Jk KSB7Ci0gICAgICAgICAgICB0aGlzLm5hdmlnYXRpb25TaWRlYmFyVHJlZU91dGxpbmUuc2VsZWN0 ZWRUcmVlRWxlbWVudC5kZXNlbGVjdCgpOworICAgICAgICAgICAgdGhpcy5fZGF0YUdyaWQuc2Vs ZWN0ZWROb2RlLmRlc2VsZWN0KCk7CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KIApA QCAtMzYxLDcgKzM1Niw3IEBAIFdlYkluc3BlY3Rvci5IZWFwQWxsb2NhdGlvbnNUaW1lbGluZVZp ZXcgPSBjbGFzcyBIZWFwQWxsb2NhdGlvbnNUaW1lbGluZVZpZXcgZXh0CiAgICAgICAgICAgICB0 aGlzLl9iYXNlbGluZURhdGFHcmlkTm9kZSA9IGRhdGFHcmlkTm9kZTsKICAgICAgICAgICAgIHRo aXMuX2Jhc2VsaW5lRGF0YUdyaWROb2RlLm1hcmtBc0Jhc2VsaW5lKCk7CiAgICAgICAgICAgICB0 aGlzLl9iYXNlbGluZUhlYXBTbmFwc2hvdFRpbWVsaW5lUmVjb3JkID0gaGVhcEFsbG9jYXRpb25z VGltZWxpbmVSZWNvcmQ7Ci0gICAgICAgICAgICB0aGlzLm5hdmlnYXRpb25TaWRlYmFyVHJlZU91 dGxpbmUuc2VsZWN0ZWRUcmVlRWxlbWVudC5kZXNlbGVjdCgpOworICAgICAgICAgICAgdGhpcy5f ZGF0YUdyaWQuc2VsZWN0ZWROb2RlLmRlc2VsZWN0KCk7CiAgICAgICAgICAgICB0aGlzLl9jb21w YXJlSGVhcFNuYXBzaG90SGVscFRleHRJdGVtLnRleHQgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmco IlNlbGVjdCBjb21wYXJpc29uIHNuYXBzaG90Iik7CiAgICAgICAgICAgICB0aGlzLmRpc3BhdGNo RXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuQ29udGVudFZpZXcuRXZlbnQuTmF2aWdhdGlv bkl0ZW1zRGlkQ2hhbmdlKTsKICAgICAgICAgICAgIHJldHVybjsK