135740 2014-08-07 20:50:34 -0700 Web Inspector: Timeline Filter Bars are not appearing at all 2014-08-07 23:56:48 -0700 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 joepeck joepeck burg commit-queue graouts joepeck timothy webkit-bug-importer oldest_to_newest 1027746 0 joepeck 2014-08-07 20:50:34 -0700 * SUMMARY Timelines used to have filter bars, and they aren't showing at all. The code is still there, looks like an accident. * STEPS TO REPRODUCE 1. Inspect apple.com 2. Reload 3. Go to Network Timeline => should be able to filter just images 1027747 1 webkit-bug-importer 2014-08-07 20:50:47 -0700 <rdar://problem/17955461> 1027750 2 236260 joepeck 2014-08-07 20:53:09 -0700 Created attachment 236260 [PATCH] Proposed Fix 1027752 3 236260 joepeck 2014-08-07 20:53:48 -0700 Comment on attachment 236260 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=236260&action=review > Source/WebInspectorUI/UserInterface/Views/TimelineDataGrid.js:38 > - var scopeBar = columns["scopeBar"]; > + var scopeBar = column.scopeBar; This is the actual fix. At some point "column" accidentally became "columns". 1027776 4 236260 burg 2014-08-07 22:01:40 -0700 Comment on attachment 236260 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=236260&action=review >> Source/WebInspectorUI/UserInterface/Views/TimelineDataGrid.js:38 >> + var scopeBar = column.scopeBar; > > This is the actual fix. At some point "column" accidentally became "columns". Mea culpa, probably happened when column data went from being a map back to being an object. In lieu of UI tests, it would be nice to have a checklist of major functionality to check for each content view. > Source/WebInspectorUI/UserInterface/Views/TimelineDataGrid.js:42 > + scopeBar.columnIdentifier = identifier; ouch. 1027777 5 236260 burg 2014-08-07 22:04:44 -0700 Comment on attachment 236260 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=236260&action=review > Source/WebInspectorUI/UserInterface/Views/ScopeBar.js:67 > + for (var item of this._items) { Or, go FP and do: var defaultItem = this._defaultItem; return this._items.some(function(item) { return item.selected && item !== defaultItem; }) > Source/WebInspectorUI/UserInterface/Views/TimelineDataGrid.js:364 > + this.element.classList.toggle(WebInspector.TimelineDataGrid.HasNonDefaultFilterStyleClassName, scopeBar.hasNonDefaultItemSelected()); Mmm, toggle. I like toggle. 1027779 6 236266 joepeck 2014-08-07 22:15:35 -0700 Created attachment 236266 [PATCH] Proposed Fix I agree with the Array.prototype.some(callback, [thisObject]) suggestion. I wanted to do that. 1027805 7 236266 commit-queue 2014-08-07 23:56:46 -0700 Comment on attachment 236266 [PATCH] Proposed Fix Clearing flags on attachment: 236266 Committed r172334: <http://trac.webkit.org/changeset/172334> 1027806 8 commit-queue 2014-08-07 23:56:48 -0700 All reviewed patches have been landed. Closing bug. 236260 2014-08-07 20:53:09 -0700 2014-08-07 22:15:35 -0700 [PATCH] Proposed Fix scope-bar.patch text/plain 7086 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDU3ODI3YWQuLmYyMWE5ZjggMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMwIEBACiAyMDE0LTA4LTA3ICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKKyAgICAgICAgV2ViIEluc3BlY3RvcjogVGltZWxp bmUgRmlsdGVyIEJhcnMgYXJlIG5vdCBhcHBlYXJpbmcgYXQgYWxsCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzU3NDAKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvVGlt ZWxpbmVEYXRhR3JpZC5jc3M6CisgICAgICAgICguZGF0YS1ncmlkLnRpbWVsaW5lLmhhcy1ub24t ZGVmYXVsdC1maWx0ZXIgPiAubmF2aWdhdGlvbi1iYXItY29udGFpbmVyKToKKyAgICAgICAgKC5k YXRhLWdyaWQudGltZWxpbmUgPiAubmF2aWdhdGlvbi1iYXItY29udGFpbmVyID4gLm5hdmlnYXRp b24tYmFyKToKKyAgICAgICAgKGJvZHkubWFjLXBsYXRmb3JtLmxlZ2FjeSAuZGF0YS1ncmlkLnRp bWVsaW5lID4gLm5hdmlnYXRpb24tYmFyLWNvbnRhaW5lciA+IC5uYXZpZ2F0aW9uLWJhcik6Cisg ICAgICAgIFVwZGF0ZSB0aGUgcG9zaXRpb25pbmcgYW5kIGhlaWdodCBmb3Igbm9uLWxlZ2FjeSBi ZWNhdXNlIHRoZSBjb25zb2xlIGlzIG5vdyB0YWxsZXIuCisKKyAgICAgICAgKiBVc2VySW50ZXJm YWNlL1ZpZXdzL1Njb3BlQmFyLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNjb3BlQmFyLnBy b3RvdHlwZS5oYXNOb25EZWZhdWx0SXRlbVNlbGVjdGVkKToKKyAgICAgICAgSGVscGVyIHRvIGtu b3cgaWYgdGhlcmUgaXMgYSBub24tZGVmYXVsdCBmaWx0ZXIuCisKKyAgICAgICAgKiBVc2VySW50 ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lRGF0YUdyaWQuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu VGltZWxpbmVEYXRhR3JpZC5wcm90b3R5cGUudHJlZUVsZW1lbnRNYXRjaGVzQWN0aXZlU2NvcGVG aWx0ZXJzKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZURhdGFHcmlkLnByb3RvdHlw ZS5fc2NvcGVCYXJTZWxlY3RlZEl0ZW1zRGlkQ2hhbmdlKToKKyAgICAgICAgVXBkYXRlIHNjb3Bl IGJhciB2aXNpYmlsaXR5LiBJZiBub24tZGVmYXVsdCB3ZSB3YW50IHRvIGFsd2F5cyBzaG93IGl0 LgorICAgICAgICAKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZURhdGFHcmlkLnByb3Rv dHlwZS5fdXBkYXRlU2NvcGVCYXJGb3JjZWRWaXNpYmlsaXR5KToKKyAgICAgICAgSWYgdGhlcmUg aXMgYSBub24tZGVmYXVsdCBmaWx0ZXIsIGZvcmNlIHNob3dpbmcgdGhlIGJhci4KKworMjAxNC0w OC0wNyAgSm9zZXBoIFBlY29yYXJvICA8cGVjb3Jhcm9AYXBwbGUuY29tPgorCiAgICAgICAgIFdl YiBJbnNwZWN0b3I6IERhc2hib2FyZCBjb250ZW50cyBzaGlmdCB3aGVuIHdpbmRvdyBjaGFuZ2Vz IGFjdGl2ZSBzdGF0ZQogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTM1NzI0CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL1Njb3BlQmFyLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvU2NvcGVCYXIuanMKaW5kZXggYzE3MzU1MS4uM2MyM2RlNiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2NvcGVCYXIuanMK KysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2NvcGVCYXIu anMKQEAgLTYyLDYgKzYyLDE2IEBAIFdlYkluc3BlY3Rvci5TY29wZUJhci5wcm90b3R5cGUgPSB7 CiAgICAgICAgIH0pOwogICAgIH0sCiAKKyAgICBoYXNOb25EZWZhdWx0SXRlbVNlbGVjdGVkOiBm dW5jdGlvbigpCisgICAgeworICAgICAgICBmb3IgKHZhciBpdGVtIG9mIHRoaXMuX2l0ZW1zKSB7 CisgICAgICAgICAgICBpZiAoaXRlbS5zZWxlY3RlZCAmJiBpdGVtICE9PSB0aGlzLl9kZWZhdWx0 SXRlbSkKKyAgICAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAgICAgfQorCisgICAgICAg IHJldHVybiBmYWxzZTsKKyAgICB9LAorCiAgICAgdXBkYXRlTGF5b3V0OiBmdW5jdGlvbihleHBh bmRPbmx5KQogICAgIHsKICAgICAgICAgaWYgKGV4cGFuZE9ubHkpCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZURhdGFHcmlkLmNz cyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lRGF0 YUdyaWQuY3NzCmluZGV4IDUwODVmOWMuLjNlY2I2ZTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lRGF0YUdyaWQuY3NzCisrKyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lRGF0YUdy aWQuY3NzCkBAIC0xNDgsNiArMTQ4LDEwIEBACiAgICAgdmlzaWJpbGl0eTogaGlkZGVuOwogfQog CisuZGF0YS1ncmlkLnRpbWVsaW5lLmhhcy1ub24tZGVmYXVsdC1maWx0ZXIgPiAubmF2aWdhdGlv bi1iYXItY29udGFpbmVyIHsKKyAgICB2aXNpYmlsaXR5OiB2aXNpYmxlOworfQorCiAuZGF0YS1n cmlkLnRpbWVsaW5lOmhvdmVyID4gLm5hdmlnYXRpb24tYmFyLWNvbnRhaW5lciB7CiAgICAgcG9p bnRlci1ldmVudHM6IGFsbDsKICAgICB2aXNpYmlsaXR5OiB2aXNpYmxlOwpAQCAtMTU1LDEwICsx NTksMTAgQEAKIAogLmRhdGEtZ3JpZC50aW1lbGluZSA+IC5uYXZpZ2F0aW9uLWJhci1jb250YWlu ZXIgPiAubmF2aWdhdGlvbi1iYXIgewogICAgIHBvc2l0aW9uOiBhYnNvbHV0ZTsKLSAgICB0b3A6 IDEwcHg7CisgICAgdG9wOiA0cHg7CiAgICAgbGVmdDogMDsKICAgICByaWdodDogMDsKLSAgICBo ZWlnaHQ6IDIycHg7CisgICAgaGVpZ2h0OiAyOHB4OwogCiAgICAgYm9yZGVyLWJvdHRvbTogbm9u ZTsKICAgICBib3JkZXItdG9wOiAxcHggc29saWQgcmdiKDIwMCwgMjAwLCAyMDApOwpAQCAtMTY3 LDYgKzE3MSwxMSBAQAogICAgIGJhY2tncm91bmQtY29sb3I6IHdoaXRlOwogfQogCitib2R5Lm1h Yy1wbGF0Zm9ybS5sZWdhY3kgLmRhdGEtZ3JpZC50aW1lbGluZSA+IC5uYXZpZ2F0aW9uLWJhci1j b250YWluZXIgPiAubmF2aWdhdGlvbi1iYXIgeworICAgIHRvcDogMTBweDsKKyAgICBoZWlnaHQ6 IDIycHg7Cit9CisKIC50aW1lbGluZS1kYXRhLWdyaWQtdHJlZS1vdXRsaW5lIHsKICAgICBwb3Np dGlvbjogcmVsYXRpdmU7CiAgICAgcGFkZGluZzogMDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lRGF0YUdyaWQuanMgYi9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZURhdGFHcmlkLmpz CmluZGV4IGMyMjE5OWEuLjBiOWVhZTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lRGF0YUdyaWQuanMKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVEYXRhR3JpZC5qcwpAQCAt MzUsMTEgKzM1LDExIEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZURhdGFHcmlkID0gZnVuY3Rpb24o dHJlZU91dGxpbmUsIGNvbHVtbnMsIGRlbGVnYXRlLCBlZGl0Q2FsCiAKICAgICAvLyBDaGVjayBp ZiBhbnkgb2YgdGhlIGNlbGxzIGNhbiBiZSBmaWx0ZXJlZC4KICAgICBmb3IgKHZhciBbaWRlbnRp ZmllciwgY29sdW1uXSBvZiB0aGlzLmNvbHVtbnMpIHsKLSAgICAgICAgdmFyIHNjb3BlQmFyID0g Y29sdW1uc1sic2NvcGVCYXIiXTsKKyAgICAgICAgdmFyIHNjb3BlQmFyID0gY29sdW1uLnNjb3Bl QmFyOwogICAgICAgICBpZiAoIXNjb3BlQmFyKQogICAgICAgICAgICAgY29udGludWU7CiAgICAg ICAgIHRoaXMuX2ZpbHRlcmFibGVDb2x1bW5zLnB1c2goaWRlbnRpZmllcik7Ci0gICAgICAgIHNj b3BlQmFyLmNvbHVtbklkZW5maWZpZXIgPSBpZGVudGlmaWVyOworICAgICAgICBzY29wZUJhci5j b2x1bW5JZGVudGlmaWVyID0gaWRlbnRpZmllcjsKICAgICAgICAgc2NvcGVCYXIuYWRkRXZlbnRM aXN0ZW5lcihXZWJJbnNwZWN0b3IuU2NvcGVCYXIuRXZlbnQuU2VsZWN0aW9uQ2hhbmdlZCwgdGhp cy5fc2NvcGVCYXJTZWxlY3RlZEl0ZW1zRGlkQ2hhbmdlLCB0aGlzKTsKICAgICB9CiAKQEAgLTQ5 LDExICs0OSwxMyBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVEYXRhR3JpZCA9IGZ1bmN0aW9uKHRy ZWVPdXRsaW5lLCBjb2x1bW5zLCBkZWxlZ2F0ZSwgZWRpdENhbAogICAgIH0KIAogICAgIGlmICh0 aGlzLl9maWx0ZXJhYmxlQ29sdW1ucy5sZW5ndGgpIHsKLSAgICAgICAgdmFyIGl0ZW1zID0gW25l dyBXZWJJbnNwZWN0b3IuRmxleGlibGVTcGFjZU5hdmlnYXRpb25JdGVtLCB0aGlzLmNvbHVtbnMu Z2V0KHRoaXMuX2ZpbHRlcmFibGVDb2x1bW5zWzBdKVsic2NvcGVCYXIiXSwgbmV3IFdlYkluc3Bl Y3Rvci5GbGV4aWJsZVNwYWNlTmF2aWdhdGlvbkl0ZW1dOworICAgICAgICB2YXIgaXRlbXMgPSBb bmV3IFdlYkluc3BlY3Rvci5GbGV4aWJsZVNwYWNlTmF2aWdhdGlvbkl0ZW0sIHRoaXMuY29sdW1u cy5nZXQodGhpcy5fZmlsdGVyYWJsZUNvbHVtbnNbMF0pLnNjb3BlQmFyLCBuZXcgV2ViSW5zcGVj dG9yLkZsZXhpYmxlU3BhY2VOYXZpZ2F0aW9uSXRlbV07CiAgICAgICAgIHRoaXMuX25hdmlnYXRp b25CYXIgPSBuZXcgV2ViSW5zcGVjdG9yLk5hdmlnYXRpb25CYXIobnVsbCwgaXRlbXMpOwogICAg ICAgICB2YXIgY29udGFpbmVyID0gdGhpcy5lbGVtZW50LmFwcGVuZENoaWxkKGRvY3VtZW50LmNy ZWF0ZUVsZW1lbnQoImRpdiIpKTsKICAgICAgICAgY29udGFpbmVyLmNsYXNzTmFtZSA9ICJuYXZp Z2F0aW9uLWJhci1jb250YWluZXIiOwogICAgICAgICBjb250YWluZXIuYXBwZW5kQ2hpbGQodGhp cy5fbmF2aWdhdGlvbkJhci5lbGVtZW50KTsKKworICAgICAgICB0aGlzLl91cGRhdGVTY29wZUJh ckZvcmNlZFZpc2liaWxpdHkoKTsKICAgICB9CiAKICAgICB0aGlzLmFkZEV2ZW50TGlzdGVuZXIo V2ViSW5zcGVjdG9yLkRhdGFHcmlkLkV2ZW50LlNlbGVjdGVkTm9kZUNoYW5nZWQsIHRoaXMuX2Rh dGFHcmlkU2VsZWN0ZWROb2RlQ2hhbmdlZCwgdGhpcyk7CkBAIC02Myw2ICs2NSw3IEBAIFdlYklu c3BlY3Rvci5UaW1lbGluZURhdGFHcmlkID0gZnVuY3Rpb24odHJlZU91dGxpbmUsIGNvbHVtbnMs IGRlbGVnYXRlLCBlZGl0Q2FsCiB9CiAKIFdlYkluc3BlY3Rvci5UaW1lbGluZURhdGFHcmlkLlN0 eWxlQ2xhc3NOYW1lID0gInRpbWVsaW5lIjsKK1dlYkluc3BlY3Rvci5UaW1lbGluZURhdGFHcmlk Lkhhc05vbkRlZmF1bHRGaWx0ZXJTdHlsZUNsYXNzTmFtZSA9ICJoYXMtbm9uLWRlZmF1bHQtZmls dGVyIjsKIFdlYkluc3BlY3Rvci5UaW1lbGluZURhdGFHcmlkLkRlbGF5ZWRQb3BvdmVyU2hvd1Rp bWVvdXQgPSAyNTA7CiBXZWJJbnNwZWN0b3IuVGltZWxpbmVEYXRhR3JpZC5EZWxheWVkUG9wb3Zl ckhpZGVDb250ZW50Q2xlYXJUaW1lb3V0ID0gNTAwOwogCkBAIC0xNDksNyArMTUyLDcgQEAgV2Vi SW5zcGVjdG9yLlRpbWVsaW5lRGF0YUdyaWQucHJvdG90eXBlID0gewogICAgICAgICBjb25zb2xl LmFzc2VydChkYXRhR3JpZE5vZGUpOwogCiAgICAgICAgIGZvciAodmFyIGlkZW50aWZpZXIgb2Yg dGhpcy5fZmlsdGVyYWJsZUNvbHVtbnMpIHsKLSAgICAgICAgICAgIHZhciBzY29wZUJhciA9IHRo aXMuY29sdW1ucy5nZXQoaWRlbnRpZmllcilbInNjb3BlQmFyIl07CisgICAgICAgICAgICB2YXIg c2NvcGVCYXIgPSB0aGlzLmNvbHVtbnMuZ2V0KGlkZW50aWZpZXIpLnNjb3BlQmFyOwogICAgICAg ICAgICAgaWYgKCFzY29wZUJhciB8fCBzY29wZUJhci5kZWZhdWx0SXRlbS5zZWxlY3RlZCkKICAg ICAgICAgICAgICAgICBjb250aW51ZTsKIApAQCAtMzUzLDkgKzM1NiwyMiBAQCBXZWJJbnNwZWN0 b3IuVGltZWxpbmVEYXRhR3JpZC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHJldHVybiAodmFsdWUx IDwgdmFsdWUyID8gLTEgOiAodmFsdWUxID4gdmFsdWUyID8gMSA6IDApKSAqIHNvcnREaXJlY3Rp b247CiAgICAgfSwKIAorICAgIF91cGRhdGVTY29wZUJhckZvcmNlZFZpc2liaWxpdHk6IGZ1bmN0 aW9uKCkKKyAgICB7CisgICAgICAgIGZvciAodmFyIGlkZW50aWZpZXIgb2YgdGhpcy5fZmlsdGVy YWJsZUNvbHVtbnMpIHsKKyAgICAgICAgICAgIHZhciBzY29wZUJhciA9IHRoaXMuY29sdW1ucy5n ZXQoaWRlbnRpZmllcikuc2NvcGVCYXI7CisgICAgICAgICAgICBpZiAoc2NvcGVCYXIpIHsKKyAg ICAgICAgICAgICAgICB0aGlzLmVsZW1lbnQuY2xhc3NMaXN0LnRvZ2dsZShXZWJJbnNwZWN0b3Iu VGltZWxpbmVEYXRhR3JpZC5IYXNOb25EZWZhdWx0RmlsdGVyU3R5bGVDbGFzc05hbWUsIHNjb3Bl QmFyLmhhc05vbkRlZmF1bHRJdGVtU2VsZWN0ZWQoKSk7CisgICAgICAgICAgICAgICAgYnJlYWs7 CisgICAgICAgICAgICB9CisgICAgICAgIH0KKyAgICB9LAorCiAgICAgX3Njb3BlQmFyU2VsZWN0 ZWRJdGVtc0RpZENoYW5nZTogZnVuY3Rpb24oZXZlbnQpCiAgICAgewotICAgICAgICB2YXIgY29s dW1uSWRlbnRpZmllciA9IGV2ZW50LnRhcmdldC5jb2x1bW5JZGVuZmlmaWVyOworICAgICAgICB0 aGlzLl91cGRhdGVTY29wZUJhckZvcmNlZFZpc2liaWxpdHkoKTsKKworICAgICAgICB2YXIgY29s dW1uSWRlbnRpZmllciA9IGV2ZW50LnRhcmdldC5jb2x1bW5JZGVudGlmaWVyOwogICAgICAgICB0 aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuVGltZWxpbmVEYXRhR3Jp ZC5FdmVudC5GaWx0ZXJzRGlkQ2hhbmdlLCB7Y29sdW1uSWRlbnRpZmllcjogY29sdW1uSWRlbnRp Zmllcn0pOwogICAgIH0sCiAK 236266 2014-08-07 22:15:35 -0700 2014-08-07 23:56:46 -0700 [PATCH] Proposed Fix agreed.patch text/plain 7068 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDFiYzEwOTUuLjIyY2IyMDkgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMwIEBACiAyMDE0LTA4LTA3ICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKKyAgICAgICAgV2ViIEluc3BlY3RvcjogVGltZWxp bmUgRmlsdGVyIEJhcnMgYXJlIG5vdCBhcHBlYXJpbmcgYXQgYWxsCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzU3NDAKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvVGlt ZWxpbmVEYXRhR3JpZC5jc3M6CisgICAgICAgICguZGF0YS1ncmlkLnRpbWVsaW5lLmhhcy1ub24t ZGVmYXVsdC1maWx0ZXIgPiAubmF2aWdhdGlvbi1iYXItY29udGFpbmVyKToKKyAgICAgICAgKC5k YXRhLWdyaWQudGltZWxpbmUgPiAubmF2aWdhdGlvbi1iYXItY29udGFpbmVyID4gLm5hdmlnYXRp b24tYmFyKToKKyAgICAgICAgKGJvZHkubWFjLXBsYXRmb3JtLmxlZ2FjeSAuZGF0YS1ncmlkLnRp bWVsaW5lID4gLm5hdmlnYXRpb24tYmFyLWNvbnRhaW5lciA+IC5uYXZpZ2F0aW9uLWJhcik6Cisg ICAgICAgIFVwZGF0ZSB0aGUgcG9zaXRpb25pbmcgYW5kIGhlaWdodCBmb3Igbm9uLWxlZ2FjeSBi ZWNhdXNlIHRoZSBjb25zb2xlIGlzIG5vdyB0YWxsZXIuCisKKyAgICAgICAgKiBVc2VySW50ZXJm YWNlL1ZpZXdzL1Njb3BlQmFyLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNjb3BlQmFyLnBy b3RvdHlwZS5oYXNOb25EZWZhdWx0SXRlbVNlbGVjdGVkKToKKyAgICAgICAgSGVscGVyIHRvIGtu b3cgaWYgdGhlcmUgaXMgYSBub24tZGVmYXVsdCBmaWx0ZXIuCisKKyAgICAgICAgKiBVc2VySW50 ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lRGF0YUdyaWQuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu VGltZWxpbmVEYXRhR3JpZC5wcm90b3R5cGUudHJlZUVsZW1lbnRNYXRjaGVzQWN0aXZlU2NvcGVG aWx0ZXJzKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZURhdGFHcmlkLnByb3RvdHlw ZS5fc2NvcGVCYXJTZWxlY3RlZEl0ZW1zRGlkQ2hhbmdlKToKKyAgICAgICAgVXBkYXRlIHNjb3Bl IGJhciB2aXNpYmlsaXR5LiBJZiBub24tZGVmYXVsdCB3ZSB3YW50IHRvIGFsd2F5cyBzaG93IGl0 LgorICAgICAgICAKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZURhdGFHcmlkLnByb3Rv dHlwZS5fdXBkYXRlU2NvcGVCYXJGb3JjZWRWaXNpYmlsaXR5KToKKyAgICAgICAgSWYgdGhlcmUg aXMgYSBub24tZGVmYXVsdCBmaWx0ZXIsIGZvcmNlIHNob3dpbmcgdGhlIGJhci4KKworMjAxNC0w OC0wNyAgSm9zZXBoIFBlY29yYXJvICA8cGVjb3Jhcm9AYXBwbGUuY29tPgorCiAgICAgICAgIFdl YiBJbnNwZWN0b3I6IGJyZWFrcG9pbnRzIGVuYWJsZWQgc3RhdGUgaXMgbm90IHBlcnNpc3RlZCBh Y3Jvc3MgcmUtb3BlbmluZyB0aGUgaW5zcGVjdG9yCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzU3NDUKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2NvcGVCYXIuanMgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TY29wZUJhci5qcwppbmRleCBjMTczNTUxLi5i MzQxZDlmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9TY29wZUJhci5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9TY29wZUJhci5qcwpAQCAtNjIsNiArNjIsMTMgQEAgV2ViSW5zcGVjdG9yLlNjb3Bl QmFyLnByb3RvdHlwZSA9IHsKICAgICAgICAgfSk7CiAgICAgfSwKIAorICAgIGhhc05vbkRlZmF1 bHRJdGVtU2VsZWN0ZWQ6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIHJldHVybiB0aGlzLl9p dGVtcy5zb21lKGZ1bmN0aW9uKGl0ZW0pIHsKKyAgICAgICAgICAgIHJldHVybiBpdGVtLnNlbGVj dGVkICYmIGl0ZW0gIT09IHRoaXMuX2RlZmF1bHRJdGVtOworICAgICAgICB9LCB0aGlzKTsKKyAg ICB9LAorCiAgICAgdXBkYXRlTGF5b3V0OiBmdW5jdGlvbihleHBhbmRPbmx5KQogICAgIHsKICAg ICAgICAgaWYgKGV4cGFuZE9ubHkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZURhdGFHcmlkLmNzcyBiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lRGF0YUdyaWQuY3NzCmluZGV4IDUw ODVmOWMuLjNlY2I2ZTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lRGF0YUdyaWQuY3NzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lRGF0YUdyaWQuY3NzCkBAIC0xNDgsNiAr MTQ4LDEwIEBACiAgICAgdmlzaWJpbGl0eTogaGlkZGVuOwogfQogCisuZGF0YS1ncmlkLnRpbWVs aW5lLmhhcy1ub24tZGVmYXVsdC1maWx0ZXIgPiAubmF2aWdhdGlvbi1iYXItY29udGFpbmVyIHsK KyAgICB2aXNpYmlsaXR5OiB2aXNpYmxlOworfQorCiAuZGF0YS1ncmlkLnRpbWVsaW5lOmhvdmVy ID4gLm5hdmlnYXRpb24tYmFyLWNvbnRhaW5lciB7CiAgICAgcG9pbnRlci1ldmVudHM6IGFsbDsK ICAgICB2aXNpYmlsaXR5OiB2aXNpYmxlOwpAQCAtMTU1LDEwICsxNTksMTAgQEAKIAogLmRhdGEt Z3JpZC50aW1lbGluZSA+IC5uYXZpZ2F0aW9uLWJhci1jb250YWluZXIgPiAubmF2aWdhdGlvbi1i YXIgewogICAgIHBvc2l0aW9uOiBhYnNvbHV0ZTsKLSAgICB0b3A6IDEwcHg7CisgICAgdG9wOiA0 cHg7CiAgICAgbGVmdDogMDsKICAgICByaWdodDogMDsKLSAgICBoZWlnaHQ6IDIycHg7CisgICAg aGVpZ2h0OiAyOHB4OwogCiAgICAgYm9yZGVyLWJvdHRvbTogbm9uZTsKICAgICBib3JkZXItdG9w OiAxcHggc29saWQgcmdiKDIwMCwgMjAwLCAyMDApOwpAQCAtMTY3LDYgKzE3MSwxMSBAQAogICAg IGJhY2tncm91bmQtY29sb3I6IHdoaXRlOwogfQogCitib2R5Lm1hYy1wbGF0Zm9ybS5sZWdhY3kg LmRhdGEtZ3JpZC50aW1lbGluZSA+IC5uYXZpZ2F0aW9uLWJhci1jb250YWluZXIgPiAubmF2aWdh dGlvbi1iYXIgeworICAgIHRvcDogMTBweDsKKyAgICBoZWlnaHQ6IDIycHg7Cit9CisKIC50aW1l bGluZS1kYXRhLWdyaWQtdHJlZS1vdXRsaW5lIHsKICAgICBwb3NpdGlvbjogcmVsYXRpdmU7CiAg ICAgcGFkZGluZzogMDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lRGF0YUdyaWQuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZURhdGFHcmlkLmpzCmluZGV4IGMyMjE5OWEuLjBi OWVhZTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL1RpbWVsaW5lRGF0YUdyaWQuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvVGltZWxpbmVEYXRhR3JpZC5qcwpAQCAtMzUsMTEgKzM1LDExIEBAIFdl Ykluc3BlY3Rvci5UaW1lbGluZURhdGFHcmlkID0gZnVuY3Rpb24odHJlZU91dGxpbmUsIGNvbHVt bnMsIGRlbGVnYXRlLCBlZGl0Q2FsCiAKICAgICAvLyBDaGVjayBpZiBhbnkgb2YgdGhlIGNlbGxz IGNhbiBiZSBmaWx0ZXJlZC4KICAgICBmb3IgKHZhciBbaWRlbnRpZmllciwgY29sdW1uXSBvZiB0 aGlzLmNvbHVtbnMpIHsKLSAgICAgICAgdmFyIHNjb3BlQmFyID0gY29sdW1uc1sic2NvcGVCYXIi XTsKKyAgICAgICAgdmFyIHNjb3BlQmFyID0gY29sdW1uLnNjb3BlQmFyOwogICAgICAgICBpZiAo IXNjb3BlQmFyKQogICAgICAgICAgICAgY29udGludWU7CiAgICAgICAgIHRoaXMuX2ZpbHRlcmFi bGVDb2x1bW5zLnB1c2goaWRlbnRpZmllcik7Ci0gICAgICAgIHNjb3BlQmFyLmNvbHVtbklkZW5m aWZpZXIgPSBpZGVudGlmaWVyOworICAgICAgICBzY29wZUJhci5jb2x1bW5JZGVudGlmaWVyID0g aWRlbnRpZmllcjsKICAgICAgICAgc2NvcGVCYXIuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0 b3IuU2NvcGVCYXIuRXZlbnQuU2VsZWN0aW9uQ2hhbmdlZCwgdGhpcy5fc2NvcGVCYXJTZWxlY3Rl ZEl0ZW1zRGlkQ2hhbmdlLCB0aGlzKTsKICAgICB9CiAKQEAgLTQ5LDExICs0OSwxMyBAQCBXZWJJ bnNwZWN0b3IuVGltZWxpbmVEYXRhR3JpZCA9IGZ1bmN0aW9uKHRyZWVPdXRsaW5lLCBjb2x1bW5z LCBkZWxlZ2F0ZSwgZWRpdENhbAogICAgIH0KIAogICAgIGlmICh0aGlzLl9maWx0ZXJhYmxlQ29s dW1ucy5sZW5ndGgpIHsKLSAgICAgICAgdmFyIGl0ZW1zID0gW25ldyBXZWJJbnNwZWN0b3IuRmxl eGlibGVTcGFjZU5hdmlnYXRpb25JdGVtLCB0aGlzLmNvbHVtbnMuZ2V0KHRoaXMuX2ZpbHRlcmFi bGVDb2x1bW5zWzBdKVsic2NvcGVCYXIiXSwgbmV3IFdlYkluc3BlY3Rvci5GbGV4aWJsZVNwYWNl TmF2aWdhdGlvbkl0ZW1dOworICAgICAgICB2YXIgaXRlbXMgPSBbbmV3IFdlYkluc3BlY3Rvci5G bGV4aWJsZVNwYWNlTmF2aWdhdGlvbkl0ZW0sIHRoaXMuY29sdW1ucy5nZXQodGhpcy5fZmlsdGVy YWJsZUNvbHVtbnNbMF0pLnNjb3BlQmFyLCBuZXcgV2ViSW5zcGVjdG9yLkZsZXhpYmxlU3BhY2VO YXZpZ2F0aW9uSXRlbV07CiAgICAgICAgIHRoaXMuX25hdmlnYXRpb25CYXIgPSBuZXcgV2ViSW5z cGVjdG9yLk5hdmlnYXRpb25CYXIobnVsbCwgaXRlbXMpOwogICAgICAgICB2YXIgY29udGFpbmVy ID0gdGhpcy5lbGVtZW50LmFwcGVuZENoaWxkKGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIp KTsKICAgICAgICAgY29udGFpbmVyLmNsYXNzTmFtZSA9ICJuYXZpZ2F0aW9uLWJhci1jb250YWlu ZXIiOwogICAgICAgICBjb250YWluZXIuYXBwZW5kQ2hpbGQodGhpcy5fbmF2aWdhdGlvbkJhci5l bGVtZW50KTsKKworICAgICAgICB0aGlzLl91cGRhdGVTY29wZUJhckZvcmNlZFZpc2liaWxpdHko KTsKICAgICB9CiAKICAgICB0aGlzLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkRhdGFH cmlkLkV2ZW50LlNlbGVjdGVkTm9kZUNoYW5nZWQsIHRoaXMuX2RhdGFHcmlkU2VsZWN0ZWROb2Rl Q2hhbmdlZCwgdGhpcyk7CkBAIC02Myw2ICs2NSw3IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZURh dGFHcmlkID0gZnVuY3Rpb24odHJlZU91dGxpbmUsIGNvbHVtbnMsIGRlbGVnYXRlLCBlZGl0Q2Fs CiB9CiAKIFdlYkluc3BlY3Rvci5UaW1lbGluZURhdGFHcmlkLlN0eWxlQ2xhc3NOYW1lID0gInRp bWVsaW5lIjsKK1dlYkluc3BlY3Rvci5UaW1lbGluZURhdGFHcmlkLkhhc05vbkRlZmF1bHRGaWx0 ZXJTdHlsZUNsYXNzTmFtZSA9ICJoYXMtbm9uLWRlZmF1bHQtZmlsdGVyIjsKIFdlYkluc3BlY3Rv ci5UaW1lbGluZURhdGFHcmlkLkRlbGF5ZWRQb3BvdmVyU2hvd1RpbWVvdXQgPSAyNTA7CiBXZWJJ bnNwZWN0b3IuVGltZWxpbmVEYXRhR3JpZC5EZWxheWVkUG9wb3ZlckhpZGVDb250ZW50Q2xlYXJU aW1lb3V0ID0gNTAwOwogCkBAIC0xNDksNyArMTUyLDcgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5l RGF0YUdyaWQucHJvdG90eXBlID0gewogICAgICAgICBjb25zb2xlLmFzc2VydChkYXRhR3JpZE5v ZGUpOwogCiAgICAgICAgIGZvciAodmFyIGlkZW50aWZpZXIgb2YgdGhpcy5fZmlsdGVyYWJsZUNv bHVtbnMpIHsKLSAgICAgICAgICAgIHZhciBzY29wZUJhciA9IHRoaXMuY29sdW1ucy5nZXQoaWRl bnRpZmllcilbInNjb3BlQmFyIl07CisgICAgICAgICAgICB2YXIgc2NvcGVCYXIgPSB0aGlzLmNv bHVtbnMuZ2V0KGlkZW50aWZpZXIpLnNjb3BlQmFyOwogICAgICAgICAgICAgaWYgKCFzY29wZUJh ciB8fCBzY29wZUJhci5kZWZhdWx0SXRlbS5zZWxlY3RlZCkKICAgICAgICAgICAgICAgICBjb250 aW51ZTsKIApAQCAtMzUzLDkgKzM1NiwyMiBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVEYXRhR3Jp ZC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHJldHVybiAodmFsdWUxIDwgdmFsdWUyID8gLTEgOiAo dmFsdWUxID4gdmFsdWUyID8gMSA6IDApKSAqIHNvcnREaXJlY3Rpb247CiAgICAgfSwKIAorICAg IF91cGRhdGVTY29wZUJhckZvcmNlZFZpc2liaWxpdHk6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAg ICAgIGZvciAodmFyIGlkZW50aWZpZXIgb2YgdGhpcy5fZmlsdGVyYWJsZUNvbHVtbnMpIHsKKyAg ICAgICAgICAgIHZhciBzY29wZUJhciA9IHRoaXMuY29sdW1ucy5nZXQoaWRlbnRpZmllcikuc2Nv cGVCYXI7CisgICAgICAgICAgICBpZiAoc2NvcGVCYXIpIHsKKyAgICAgICAgICAgICAgICB0aGlz LmVsZW1lbnQuY2xhc3NMaXN0LnRvZ2dsZShXZWJJbnNwZWN0b3IuVGltZWxpbmVEYXRhR3JpZC5I YXNOb25EZWZhdWx0RmlsdGVyU3R5bGVDbGFzc05hbWUsIHNjb3BlQmFyLmhhc05vbkRlZmF1bHRJ dGVtU2VsZWN0ZWQoKSk7CisgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICB9Cisg ICAgICAgIH0KKyAgICB9LAorCiAgICAgX3Njb3BlQmFyU2VsZWN0ZWRJdGVtc0RpZENoYW5nZTog ZnVuY3Rpb24oZXZlbnQpCiAgICAgewotICAgICAgICB2YXIgY29sdW1uSWRlbnRpZmllciA9IGV2 ZW50LnRhcmdldC5jb2x1bW5JZGVuZmlmaWVyOworICAgICAgICB0aGlzLl91cGRhdGVTY29wZUJh ckZvcmNlZFZpc2liaWxpdHkoKTsKKworICAgICAgICB2YXIgY29sdW1uSWRlbnRpZmllciA9IGV2 ZW50LnRhcmdldC5jb2x1bW5JZGVudGlmaWVyOwogICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRU b0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuVGltZWxpbmVEYXRhR3JpZC5FdmVudC5GaWx0ZXJzRGlk Q2hhbmdlLCB7Y29sdW1uSWRlbnRpZmllcjogY29sdW1uSWRlbnRpZmllcn0pOwogICAgIH0sCiAK