162642 2016-09-27 16:07:29 -0700 Web Inspector: TimelineDataGridNode assertions when refreshing page 2016-11-18 14:04:19 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 mattbaker mattbaker bburg commit-queue joepeck mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1234108 0 mattbaker 2016-09-27 16:07:29 -0700 Summary: TimelineDataGridNode assertions when refreshing page. NetworkSidebarPanel is marking NetworkGridContentView visible when the network timeline resets. Once marked visible, the view will try to create data grid nodes for incoming timeline records, causing layouts and causing a flood of assertions. Note: ElementsTabContentView also attempts to show a DOM tree content view when the main frame navigates. Steps to Reproduce: 1. Open Inspector 2. Make active tab something other than Network 3. Reload inspected page => Inspector² shows hundreds of asserts: [Error] Assertion Failed refreshGraph (TimelineDataGridNode.js:230) refreshGraph and: [Error] Assertion Failed refresh (TimelineRecordBar.js:238) createBar (TimelineDataGridNode.js:243) createBar createCombinedBars (TimelineRecordBar.js:87) refreshGraph (TimelineDataGridNode.js:284) refreshGraph 1234109 1 webkit-bug-importer 2016-09-27 16:07:56 -0700 <rdar://problem/28505898> 1235650 2 290447 mattbaker 2016-10-01 16:20:33 -0700 Created attachment 290447 Patch 1236703 3 290447 timothy 2016-10-05 10:38:59 -0700 Comment on attachment 290447 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=290447&action=review > Source/WebInspectorUI/ChangeLog:15 > + * UserInterface/Views/ElementsTabContentView.js: > + (WebInspector.ElementsTabContentView): > + (WebInspector.ElementsTabContentView.prototype.shown): > + Drive-by fix: defer showing the DOM content view until the tab is shown. I worry this might have some side effects. The view might need to be created eagerly to get event listeners set up early. Can you look into this more or split it out for further consideration? > Source/WebInspectorUI/UserInterface/Views/NetworkGridContentView.js:145 > + this._dataGrid.updateLayout(WebInspector.View.LayoutReason.Resize); Is this needed because the DataGrid isn't added as a subview? 1252773 4 290447 mattbaker 2016-11-18 12:14:45 -0800 Comment on attachment 290447 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=290447&action=review >> Source/WebInspectorUI/ChangeLog:15 >> + Drive-by fix: defer showing the DOM content view until the tab is shown. > > I worry this might have some side effects. The view might need to be created eagerly to get event listeners set up early. Can you look into this more or split it out for further consideration? FrameDOMTreeContentView will be lazily created, and so will its DOMTree.Event.RootDOMNodeInvalidated listener. This is fine because the handler for the listener just requests a new DOM root node, which is always done when the content view is constructed anyway. >> Source/WebInspectorUI/UserInterface/Views/NetworkGridContentView.js:145 >> + this._dataGrid.updateLayout(WebInspector.View.LayoutReason.Resize); > > Is this needed because the DataGrid isn't added as a subview? The grid is added as a subview, this is needed because View doesn't have a shown/hidden concept. 1252810 5 295184 mattbaker 2016-11-18 13:28:00 -0800 Created attachment 295184 Patch for landing 1252841 6 295184 commit-queue 2016-11-18 14:04:16 -0800 Comment on attachment 295184 Patch for landing Clearing flags on attachment: 295184 Committed r208895: <http://trac.webkit.org/changeset/208895> 1252842 7 commit-queue 2016-11-18 14:04:19 -0800 All reviewed patches have been landed. Closing bug. 290447 2016-10-01 16:20:33 -0700 2016-11-18 13:27:57 -0800 Patch bug-162642-20161001161727.patch text/plain 11294 mattbaker U3VidmVyc2lvbiBSZXZpc2lvbjogMjA2NzA5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCA0 MDg1ZWEwNWEwZGEyNWFjODRjZTU5ZGNkZjU4ZmNiNGRjMzBiYzBiLi43ZWE2N2E2MDI2NjQxZDQw Y2JjOTVlNjQ4OWI1ZDUwNWRiOWRlODUwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSw1NyBAQAorMjAxNi0xMC0wMSAgTWF0dCBCYWtlciAgPG1hdHRiYWtlckBhcHBsZS5jb20+ CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogVGltZWxpbmVEYXRhR3JpZE5vZGUgYXNzZXJ0aW9u cyB3aGVuIHJlZnJlc2hpbmcgcGFnZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTYyNjQyCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8yODUwNTg5OD4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIHBh dGNoIGZpeGVzIGEgbnVtYmVyIG9mIGRlZmljaWVuY2llcyBpbiB0aGUgTmV0d29yayB0YWIgdGhh dCBjYXVzZWQKKyAgICAgICAgVGltZWxpbmVEYXRhR3JpZE5vZGUgZ3JhcGhzIHRvIHJlZnJlc2gg YmVmb3JlIHRoZSB0YWIgYmVjYW1lIHZpc2libGUuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNl L1ZpZXdzL0VsZW1lbnRzVGFiQ29udGVudFZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu RWxlbWVudHNUYWJDb250ZW50Vmlldyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRWxlbWVudHNU YWJDb250ZW50Vmlldy5wcm90b3R5cGUuc2hvd24pOgorICAgICAgICBEcml2ZS1ieSBmaXg6IGRl ZmVyIHNob3dpbmcgdGhlIERPTSBjb250ZW50IHZpZXcgdW50aWwgdGhlIHRhYiBpcyBzaG93bi4K KworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvTmV0d29ya0dyaWRDb250ZW50Vmlldy5q czoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5OZXR3b3JrR3JpZENvbnRlbnRWaWV3KToKKyAgICAg ICAgRHJpdmUtYnkgZXZlbnQgbGlzdGVuZXIgY2xlYW51cC4KKyAgICAgICAgKFdlYkluc3BlY3Rv ci5OZXR3b3JrR3JpZENvbnRlbnRWaWV3LnByb3RvdHlwZS5nZXQgc3RhcnRUaW1lKToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5OZXR3b3JrR3JpZENvbnRlbnRWaWV3LnByb3RvdHlwZS5nZXQgZW5k VGltZSk6CisgICAgICAgIEJhY2sgZW5kVGltZSB3aXRoIGEgdmFyaWFibGUsIGluc3RlYWQgb2Yg dXNpbmcgdGhlIHJ1bGVyIHZhbHVlIHdoaWNoCisgICAgICAgIGlzbid0IHZhbGlkIGJlZm9yZSB0 aGUgdGFiIGlzIHNob3duIGZvciB0aGUgZmlyc3QgdGltZS4KKworICAgICAgICAoV2ViSW5zcGVj dG9yLk5ldHdvcmtHcmlkQ29udGVudFZpZXcucHJvdG90eXBlLnNob3duKToKKyAgICAgICAgRm9y Y2UgdGhlIGdyaWQgdG8gdXBkYXRlIGl0cyBsYXlvdXQsIGFuZCB0aGF0IG9mIHRoZSBUaW1lbGlu ZSBjb2x1bW4gcnVsZXIuCisgICAgICAgIER1cmluZyBsYXlvdXQgdGhlIHJ1bGVyJ3Mgc2Vjb25k c1BlclBpeGVsIHZhbHVlIGlzIHVzZWQsIHdoaWNoIGlzbid0CisgICAgICAgIHZhbGlkIHVudGls IHRoZSBydWxlciBkb2VzIGFuIGluaXRpYWwgbGF5b3V0LgorCisgICAgICAgIChXZWJJbnNwZWN0 b3IuTmV0d29ya0dyaWRDb250ZW50Vmlldy5wcm90b3R5cGUucmVzZXQpOgorICAgICAgICBDbGVh ciBwZW5kaW5nIHJlY29yZHMuIFRoaXMgd2FzIGNhdXNpbmcgZHVwbGljYXRlcyB0byBhcHBlYXIg d2hlbiB0aGUKKyAgICAgICAgaW5zcGVjdGVkIHBhZ2Ugd2FzIHJlZnJlc2hlZCBtdWx0aXBsZSB0 aW1lcyBwcmlvciB0byBzaG93aW5nIHRoZSBOZXR3b3JrCisgICAgICAgIHRhYiBmb3IgdGhlIGZp cnN0IHRpbWUuCisKKyAgICAgICAgKFdlYkluc3BlY3Rvci5OZXR3b3JrR3JpZENvbnRlbnRWaWV3 LnByb3RvdHlwZS5sYXlvdXQpOgorICAgICAgICBTaG91bGQgbW9yZSBjbG9zZWx5IG1hdGNoIGJl aGF2aW9yIGluIE5ldHdvcmtUaW1lbGluZVZpZXcucHJvdG90eXBlLmxheW91dC4KKyAgICAgICAg R3JhcGggZW5kIHRpbWUgcGFkZGluZyBpcyBhZGRlZCBpZiBubyBsb25nZXIgdXBkYXRpbmcgdGhl IGN1cnJlbnQgdGltZS4KKworICAgICAgICAoV2ViSW5zcGVjdG9yLk5ldHdvcmtHcmlkQ29udGVu dFZpZXcucHJvdG90eXBlLl9uZXR3b3JrVGltZWxpbmVSZWNvcmRBZGRlZCk6CisgICAgICAgIFRy YWNrIGVuZFRpbWUgb2YgdGhlIGxhc3QgcmVjb3JkIGFkZGVkLCBzbyB0aGF0IHRoZSBncmFwaCBl bmQgdGltZSBjYW4KKyAgICAgICAgYmUgcGFkZGVkIG9uY2UgdGhlIGN1cnJlbnQgdGltZSBpcyBu byBsb25nZXIgYmVpbmcgdXBkYXRlZC4KKworICAgICAgICAoV2ViSW5zcGVjdG9yLk5ldHdvcmtH cmlkQ29udGVudFZpZXcucHJvdG90eXBlLl91cGRhdGUpOgorICAgICAgICAoV2ViSW5zcGVjdG9y Lk5ldHdvcmtHcmlkQ29udGVudFZpZXcucHJvdG90eXBlLl9zdG9wVXBkYXRpbmdDdXJyZW50VGlt ZSk6CisgICAgICAgIEdyYXBoIGVuZCB0aW1lIHBhZGRpZyBzaG91bGRuJ3QgYmUgYXBwbGllZCBo ZXJlLCBzaW5jZSB0aGlzIGlzbid0IGNhbGxlZAorICAgICAgICBpZiB0aGUgaW5zcGVjdGVkIHBh Z2UgZmluaXNoZXMgbG9hZGluZyBiZWZvcmUgdGhlIHZpZXcgaXMgc2hvd24uCisKKyAgICAgICAg KFdlYkluc3BlY3Rvci5OZXR3b3JrR3JpZENvbnRlbnRWaWV3LnByb3RvdHlwZS5fY2xlYXJOZXR3 b3JrSXRlbXMpOiBEZWxldGVkLgorICAgICAgICBSZXBhbGFjZWQgYnkgYW4gYXJyb3cgZnVuY3Rp b24uCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL05ldHdvcmtTaWRlYmFyUGFuZWwu anM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTmV0d29ya1NpZGViYXJQYW5lbC5wcm90b3R5cGUu X25ldHdvcmtUaW1lbGluZVJlc2V0KToKKyAgICAgICAgRG9uJ3Qgc2hvdyB0aGUgY29udGVudCB2 aWV3IGlmIHRoZSB0YWIgaXMgaGlkZGVuLgorCiAyMDE2LTA5LTMwICBKb3NlcGggUGVjb3Jhcm8g IDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogTWFrZSBkZWJ1 Z2dlciBzdGVwcGluZyBoaWdobGlnaHRzIHdvcmsgaW4gaW5saW5lIDxzY3JpcHQ+cwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRWxlbWVudHNU YWJDb250ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL0VsZW1lbnRzVGFiQ29udGVudFZpZXcuanMKaW5kZXggYTNhMTdiYWViYzEzMWYxNDNiYTg5 YjczYTQwODk1NDkwZTZmMTg0MC4uYjA2NmUyNTEwNjMzYjdlZWVlOGMyNmNkODI5M2IxNWI2Yzdk YWZkNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvRWxlbWVudHNUYWJDb250ZW50Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9FbGVtZW50c1RhYkNvbnRlbnRWaWV3LmpzCkBAIC0zOCw4ICsz OCw2IEBAIFdlYkluc3BlY3Rvci5FbGVtZW50c1RhYkNvbnRlbnRWaWV3ID0gY2xhc3MgRWxlbWVu dHNUYWJDb250ZW50VmlldyBleHRlbmRzIFdlYkluCiAKICAgICAgICAgV2ViSW5zcGVjdG9yLmZy YW1lUmVzb3VyY2VNYW5hZ2VyLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkZyYW1lUmVz b3VyY2VNYW5hZ2VyLkV2ZW50Lk1haW5GcmFtZURpZENoYW5nZSwgdGhpcy5fbWFpbkZyYW1lRGlk Q2hhbmdlLCB0aGlzKTsKICAgICAgICAgV2ViSW5zcGVjdG9yLkZyYW1lLmFkZEV2ZW50TGlzdGVu ZXIoV2ViSW5zcGVjdG9yLkZyYW1lLkV2ZW50Lk1haW5SZXNvdXJjZURpZENoYW5nZSwgdGhpcy5f bWFpblJlc291cmNlRGlkQ2hhbmdlLCB0aGlzKTsKLQotICAgICAgICB0aGlzLl9zaG93RE9NVHJl ZUNvbnRlbnRWaWV3KCk7CiAgICAgfQogCiAgICAgc3RhdGljIHRhYkluZm8oKQpAQCAtODYsNiAr ODQsMTMgQEAgV2ViSW5zcGVjdG9yLkVsZW1lbnRzVGFiQ29udGVudFZpZXcgPSBjbGFzcyBFbGVt ZW50c1RhYkNvbnRlbnRWaWV3IGV4dGVuZHMgV2ViSW4KICAgICAgICAgY29va2llLm5vZGVUb1Nl bGVjdCA9IHVuZGVmaW5lZDsKICAgICB9CiAKKyAgICBzaG93bigpCisgICAgeworICAgICAgICBz dXBlci5zaG93bigpOworCisgICAgICAgIHRoaXMuX3Nob3dET01UcmVlQ29udGVudFZpZXcoKTsK KyAgICB9CisKICAgICBjbG9zZWQoKQogICAgIHsKICAgICAgICAgc3VwZXIuY2xvc2VkKCk7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9OZXR3 b3JrR3JpZENvbnRlbnRWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvTmV0d29ya0dyaWRDb250ZW50Vmlldy5qcwppbmRleCAxZmJiZWE5YzM0YTRiZTg0 YTQ0MjhiZjU5ZTMzZGY4Yzg1ZWE3NzAyLi5lZjUxNGIzMDRiNDIwODMwYzUwNDVkM2U2MTczM2E5 MzNjYjdiNTY0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9OZXR3b3JrR3JpZENvbnRlbnRWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL05ldHdvcmtHcmlkQ29udGVudFZpZXcuanMKQEAgLTEw MiwxMCArMTAyLDExIEBAIFdlYkluc3BlY3Rvci5OZXR3b3JrR3JpZENvbnRlbnRWaWV3ID0gY2xh c3MgTmV0d29ya0dyaWRDb250ZW50VmlldyBleHRlbmRzIFdlYkluCiAgICAgICAgIG5ldHdvcmtU aW1lbGluZS5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5UaW1lbGluZS5FdmVudC5SZXNl dCwgdGhpcy5fbmV0d29ya1RpbWVsaW5lUmVzZXQsIHRoaXMpOwogCiAgICAgICAgIHRoaXMuX2Ns ZWFyTmV0d29ya0l0ZW1zTmF2aWdhdGlvbkl0ZW0gPSBuZXcgV2ViSW5zcGVjdG9yLkJ1dHRvbk5h dmlnYXRpb25JdGVtKCJjbGVhci1uZXR3b3JrLWl0ZW1zIiwgV2ViSW5zcGVjdG9yLlVJU3RyaW5n KCJDbGVhciBOZXR3b3JrIEl0ZW1zIiksICJJbWFnZXMvTmF2aWdhdGlvbkl0ZW1UcmFzaC5zdmci LCAxNSwgMTUpOwotICAgICAgICB0aGlzLl9jbGVhck5ldHdvcmtJdGVtc05hdmlnYXRpb25JdGVt LmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkJ1dHRvbk5hdmlnYXRpb25JdGVtLkV2ZW50 LkNsaWNrZWQsIHRoaXMuX2NsZWFyTmV0d29ya0l0ZW1zLCB0aGlzKTsKKyAgICAgICAgdGhpcy5f Y2xlYXJOZXR3b3JrSXRlbXNOYXZpZ2F0aW9uSXRlbS5hZGRFdmVudExpc3RlbmVyKFdlYkluc3Bl Y3Rvci5CdXR0b25OYXZpZ2F0aW9uSXRlbS5FdmVudC5DbGlja2VkLCAoKSA9PiB0aGlzLnJlc2V0 KCkpOwogCiAgICAgICAgIHRoaXMuX3BlbmRpbmdSZWNvcmRzID0gW107CiAgICAgICAgIHRoaXMu X2xvYWRpbmdSZXNvdXJjZUNvdW50ID0gMDsKKyAgICAgICAgdGhpcy5fbGFzdFJlY29yZEVuZFRp bWUgPSBOYU47CiAgICAgICAgIHRoaXMuX2xhc3RVcGRhdGVUaW1lc3RhbXAgPSBOYU47CiAgICAg ICAgIHRoaXMuX3N0YXJ0VGltZSA9IE5hTjsKICAgICAgICAgdGhpcy5fZW5kVGltZSA9IE5hTjsK QEAgLTExNSw5ICsxMTYsOSBAQCBXZWJJbnNwZWN0b3IuTmV0d29ya0dyaWRDb250ZW50VmlldyA9 IGNsYXNzIE5ldHdvcmtHcmlkQ29udGVudFZpZXcgZXh0ZW5kcyBXZWJJbgogICAgIC8vIFB1Ymxp YwogCiAgICAgZ2V0IHNlY29uZHNQZXJQaXhlbCgpIHsgcmV0dXJuIHRoaXMuX3RpbWVsaW5lUnVs ZXIuc2Vjb25kc1BlclBpeGVsOyB9Ci0gICAgZ2V0IHN0YXJ0VGltZSgpIHsgcmV0dXJuIHRoaXMu X3N0YXJ0VGltZSB8fCAwOyB9CisgICAgZ2V0IHN0YXJ0VGltZSgpIHsgcmV0dXJuIHRoaXMuX3N0 YXJ0VGltZTsgfQogICAgIGdldCBjdXJyZW50VGltZSgpIHsgcmV0dXJuIHRoaXMuZW5kVGltZSB8 fCB0aGlzLnN0YXJ0VGltZTsgfQotICAgIGdldCBlbmRUaW1lKCkgeyByZXR1cm4gdGhpcy5fdGlt ZWxpbmVSdWxlci5lbmRUaW1lOyB9CisgICAgZ2V0IGVuZFRpbWUoKSB7IHJldHVybiB0aGlzLl9l bmRUaW1lOyB9CiAgICAgZ2V0IHplcm9UaW1lKCkgeyByZXR1cm4gdGhpcy5zdGFydFRpbWU7IH0K IAogICAgIGdldCBzZWxlY3Rpb25QYXRoQ29tcG9uZW50cygpCkBAIC0xNDEsNiArMTQyLDggQEAg V2ViSW5zcGVjdG9yLk5ldHdvcmtHcmlkQ29udGVudFZpZXcgPSBjbGFzcyBOZXR3b3JrR3JpZENv bnRlbnRWaWV3IGV4dGVuZHMgV2ViSW4KIAogICAgICAgICB0aGlzLl9kYXRhR3JpZC5zaG93bigp OwogCisgICAgICAgIHRoaXMuX2RhdGFHcmlkLnVwZGF0ZUxheW91dChXZWJJbnNwZWN0b3IuVmll dy5MYXlvdXRSZWFzb24uUmVzaXplKTsKKwogICAgICAgICBpZiAodGhpcy5fbG9hZGluZ1Jlc291 cmNlQ291bnQgJiYgIXRoaXMuX3NjaGVkdWxlZEN1cnJlbnRUaW1lVXBkYXRlSWRlbnRpZmllcikK ICAgICAgICAgICAgIHRoaXMuX3N0YXJ0VXBkYXRpbmdDdXJyZW50VGltZSgpOwogICAgIH0KQEAg LTE2OCw3ICsxNzEsOSBAQCBXZWJJbnNwZWN0b3IuTmV0d29ya0dyaWRDb250ZW50VmlldyA9IGNs YXNzIE5ldHdvcmtHcmlkQ29udGVudFZpZXcgZXh0ZW5kcyBXZWJJbgogICAgICAgICBpZiAodGhp cy5fc2NoZWR1bGVkQ3VycmVudFRpbWVVcGRhdGVJZGVudGlmaWVyKQogICAgICAgICAgICAgdGhp cy5fc3RvcFVwZGF0aW5nQ3VycmVudFRpbWUoKTsKIAorICAgICAgICB0aGlzLl9wZW5kaW5nUmVj b3JkcyA9IFtdOwogICAgICAgICB0aGlzLl9sb2FkaW5nUmVzb3VyY2VDb3VudCA9IDA7CisgICAg ICAgIHRoaXMuX2xhc3RSZWNvcmRFbmRUaW1lID0gTmFOOwogICAgICAgICB0aGlzLl9sYXN0VXBk YXRlVGltZXN0YW1wID0gTmFOOwogICAgICAgICB0aGlzLl9zdGFydFRpbWUgPSBOYU47CiAgICAg ICAgIHRoaXMuX2VuZFRpbWUgPSBOYU47CkBAIC0xODEsMTYgKzE4NiwzMSBAQCBXZWJJbnNwZWN0 b3IuTmV0d29ya0dyaWRDb250ZW50VmlldyA9IGNsYXNzIE5ldHdvcmtHcmlkQ29udGVudFZpZXcg ZXh0ZW5kcyBXZWJJbgogCiAgICAgbGF5b3V0KCkKICAgICB7Ci0gICAgICAgIGlmICghaXNOYU4o dGhpcy5fc3RhcnRUaW1lKSkgewotICAgICAgICAgICAgdGhpcy5fdGltZWxpbmVSdWxlci56ZXJv VGltZSA9IHRoaXMuX3N0YXJ0VGltZTsKLSAgICAgICAgICAgIHRoaXMuX3RpbWVsaW5lUnVsZXIu c3RhcnRUaW1lID0gdGhpcy5fc3RhcnRUaW1lOwotICAgICAgICB9CisgICAgICAgIGlmIChpc05h Tih0aGlzLnN0YXJ0VGltZSkgfHwgaXNOYU4odGhpcy5lbmRUaW1lKSkKKyAgICAgICAgICAgIHJl dHVybjsKKworICAgICAgICBsZXQgb2xkWmVyb1RpbWUgPSB0aGlzLl90aW1lbGluZVJ1bGVyLnpl cm9UaW1lOworICAgICAgICBsZXQgb2xkU3RhcnRUaW1lID0gdGhpcy5fdGltZWxpbmVSdWxlci5z dGFydFRpbWU7CisgICAgICAgIGxldCBvbGRFbmRUaW1lID0gdGhpcy5fdGltZWxpbmVSdWxlci5l bmRUaW1lOworCisgICAgICAgIHRoaXMuX3RpbWVsaW5lUnVsZXIuemVyb1RpbWUgPSB0aGlzLnpl cm9UaW1lOworICAgICAgICB0aGlzLl90aW1lbGluZVJ1bGVyLnN0YXJ0VGltZSA9IHRoaXMuc3Rh cnRUaW1lOwogCiAgICAgICAgIGlmICh0aGlzLnN0YXJ0VGltZSA+PSB0aGlzLmVuZFRpbWUpCiAg ICAgICAgICAgICByZXR1cm47CiAKLSAgICAgICAgZm9yIChsZXQgZGF0YUdyaWROb2RlIG9mIHRo aXMuX2RhdGFHcmlkLmNoaWxkcmVuKQotICAgICAgICAgICAgZGF0YUdyaWROb2RlLnJlZnJlc2hH cmFwaCgpOworICAgICAgICBpZiAoIXRoaXMuX3NjaGVkdWxlZEN1cnJlbnRUaW1lVXBkYXRlSWRl bnRpZmllcikgeworICAgICAgICAgICAgdGhpcy5fdGltZWxpbmVSdWxlci5lbmRUaW1lID0gdGhp cy5lbmRUaW1lOworICAgICAgICAgICAgdGhpcy5fZW5kVGltZSA9IHRoaXMuX2xhc3RSZWNvcmRF bmRUaW1lICsgV2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVjb3JkQmFyLk1pbmltdW1XaWR0aFBpeGVs cyAqIHRoaXMuc2Vjb25kc1BlclBpeGVsOworICAgICAgICB9CisKKyAgICAgICAgdGhpcy5fdGlt ZWxpbmVSdWxlci5lbmRUaW1lID0gdGhpcy5lbmRUaW1lOworCisgICAgICAgIC8vIFdlIG9ubHkg bmVlZCB0byByZWZyZXNoIHRoZSBncmFwaHMgd2hlbiB0aGUgYW55IG9mIHRoZSB0aW1lcyBjaGFu Z2UuCisgICAgICAgIGlmICh0aGlzLnplcm9UaW1lICE9PSBvbGRaZXJvVGltZSB8fCB0aGlzLnN0 YXJ0VGltZSAhPT0gb2xkU3RhcnRUaW1lIHx8IHRoaXMuZW5kVGltZSAhPT0gb2xkRW5kVGltZSkg eworICAgICAgICAgICAgZm9yIChsZXQgZGF0YUdyaWROb2RlIG9mIHRoaXMuX2RhdGFHcmlkLmNo aWxkcmVuKQorICAgICAgICAgICAgICAgIGRhdGFHcmlkTm9kZS5yZWZyZXNoR3JhcGgoKTsKKyAg ICAgICAgfQogCiAgICAgICAgIHRoaXMuX3Byb2Nlc3NQZW5kaW5nUmVjb3JkcygpOwogICAgIH0K QEAgLTI0MSw3ICsyNjEsOCBAQCBXZWJJbnNwZWN0b3IuTmV0d29ya0dyaWRDb250ZW50VmlldyA9 IGNsYXNzIE5ldHdvcmtHcmlkQ29udGVudFZpZXcgZXh0ZW5kcyBXZWJJbgogICAgICAgICAgICAg aWYgKHRoaXMuX2xvYWRpbmdSZXNvdXJjZUNvdW50KQogICAgICAgICAgICAgICAgIHJldHVybjsK IAotICAgICAgICAgICAgdGhpcy5fZW5kVGltZSA9IHJlc291cmNlVGltZWxpbmVSZWNvcmQuZW5k VGltZTsKKyAgICAgICAgICAgIHRoaXMuX2xhc3RSZWNvcmRFbmRUaW1lID0gcmVzb3VyY2VUaW1l bGluZVJlY29yZC5lbmRUaW1lOworICAgICAgICAgICAgdGhpcy5fZW5kVGltZSA9IE1hdGgubWF4 KHRoaXMuX2xhc3RSZWNvcmRFbmRUaW1lLCB0aGlzLl9lbmRUaW1lKTsKIAogICAgICAgICAgICAg aWYgKHRoaXMuX3NjaGVkdWxlZEN1cnJlbnRUaW1lVXBkYXRlSWRlbnRpZmllcikKICAgICAgICAg ICAgICAgICB0aGlzLmRlYm91bmNlKDE1MCkuX3N0b3BVcGRhdGluZ0N1cnJlbnRUaW1lKCk7CkBA IC0yNjQsNyArMjg1LDcgQEAgV2ViSW5zcGVjdG9yLk5ldHdvcmtHcmlkQ29udGVudFZpZXcgPSBj bGFzcyBOZXR3b3JrR3JpZENvbnRlbnRWaWV3IGV4dGVuZHMgV2ViSW4KICAgICAgICAgICAgIHJl dHVybjsKIAogICAgICAgICBpZiAoaXNOYU4odGhpcy5fc3RhcnRUaW1lKSkKLSAgICAgICAgICAg IHRoaXMuX3N0YXJ0VGltZSA9IHJlc291cmNlVGltZWxpbmVSZWNvcmQuc3RhcnRUaW1lOworICAg ICAgICAgICAgdGhpcy5fc3RhcnRUaW1lID0gdGhpcy5fZW5kVGltZSA9IHJlc291cmNlVGltZWxp bmVSZWNvcmQuc3RhcnRUaW1lOwogCiAgICAgICAgIGlmICh0aGlzLnZpc2libGUpCiAgICAgICAg ICAgICB0aGlzLl9zdGFydFVwZGF0aW5nQ3VycmVudFRpbWUoKTsKQEAgLTI5OSwxNyArMzIwLDEz IEBAIFdlYkluc3BlY3Rvci5OZXR3b3JrR3JpZENvbnRlbnRWaWV3ID0gY2xhc3MgTmV0d29ya0dy aWRDb250ZW50VmlldyBleHRlbmRzIFdlYkluCiAgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRv TGlzdGVuZXJzKFdlYkluc3BlY3Rvci5Db250ZW50Vmlldy5FdmVudC5TZWxlY3Rpb25QYXRoQ29t cG9uZW50c0RpZENoYW5nZSk7CiAgICAgfQogCi0gICAgX2NsZWFyTmV0d29ya0l0ZW1zKGV2ZW50 KSB7Ci0gICAgICAgIHRoaXMucmVzZXQoKTsKLSAgICB9Ci0KICAgICBfdXBkYXRlKHRpbWVzdGFt cCkKICAgICB7CiAgICAgICAgIGNvbnNvbGUuYXNzZXJ0KHRoaXMuX3NjaGVkdWxlZEN1cnJlbnRU aW1lVXBkYXRlSWRlbnRpZmllcik7CiAKICAgICAgICAgaWYgKCFpc05hTih0aGlzLl9sYXN0VXBk YXRlVGltZXN0YW1wKSkgewogICAgICAgICAgICAgbGV0IHRpbWVzcGFuU2luY2VMYXN0VXBkYXRl ID0gKHRpbWVzdGFtcCAtIHRoaXMuX2xhc3RVcGRhdGVUaW1lc3RhbXApIC8gMTAwMCB8fCAwOwot ICAgICAgICAgICAgdGhpcy5fdGltZWxpbmVSdWxlci5lbmRUaW1lID0gdGhpcy5jdXJyZW50VGlt ZSArIHRpbWVzcGFuU2luY2VMYXN0VXBkYXRlOworICAgICAgICAgICAgdGhpcy5fZW5kVGltZSAr PSB0aW1lc3BhblNpbmNlTGFzdFVwZGF0ZTsKIAogICAgICAgICAgICAgdGhpcy51cGRhdGVMYXlv dXQoKTsKICAgICAgICAgfQpAQCAtMzQ1LDcgKzM2Miw2IEBAIFdlYkluc3BlY3Rvci5OZXR3b3Jr R3JpZENvbnRlbnRWaWV3ID0gY2xhc3MgTmV0d29ya0dyaWRDb250ZW50VmlldyBleHRlbmRzIFdl YkluCiAgICAgICAgIGNhbmNlbEFuaW1hdGlvbkZyYW1lKHRoaXMuX3NjaGVkdWxlZEN1cnJlbnRU aW1lVXBkYXRlSWRlbnRpZmllcik7CiAgICAgICAgIHRoaXMuX3NjaGVkdWxlZEN1cnJlbnRUaW1l VXBkYXRlSWRlbnRpZmllciA9IHVuZGVmaW5lZDsKIAotICAgICAgICB0aGlzLl90aW1lbGluZVJ1 bGVyLmVuZFRpbWUgPSB0aGlzLl9lbmRUaW1lICsgV2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVjb3Jk QmFyLk1pbmltdW1XaWR0aFBpeGVscyAqIHRoaXMuc2Vjb25kc1BlclBpeGVsOwogICAgICAgICB0 aGlzLm5lZWRzTGF5b3V0KCk7CiAgICAgfQogfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL05ldHdvcmtTaWRlYmFyUGFuZWwuanMgYi9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9OZXR3b3JrU2lkZWJhclBhbmVs LmpzCmluZGV4IDZmMjViYTFiOTg2NmEzMzEwMDRlMmZlNGRlZGE5ZWVmZWRhYjQ1NjcuLmExZjJl YjBmZDlhYjA0MzExNTYzMGE3MTI4NGFhOGNmNTJjMDAyNGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL05ldHdvcmtTaWRlYmFyUGFuZWwuanMK KysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTmV0d29ya1Np ZGViYXJQYW5lbC5qcwpAQCAtMTgxLDcgKzE4MSw5IEBAIFdlYkluc3BlY3Rvci5OZXR3b3JrU2lk ZWJhclBhbmVsID0gY2xhc3MgTmV0d29ya1NpZGViYXJQYW5lbCBleHRlbmRzIFdlYkluc3BlY3Rv CiAgICAgX25ldHdvcmtUaW1lbGluZVJlc2V0KGV2ZW50KQogICAgIHsKICAgICAgICAgdGhpcy5j b250ZW50QnJvd3Nlci5jb250ZW50Vmlld0NvbnRhaW5lci5jbG9zZUFsbENvbnRlbnRWaWV3cygp OwotICAgICAgICB0aGlzLnNob3dEZWZhdWx0Q29udGVudFZpZXcoKTsKKworICAgICAgICBpZiAo dGhpcy52aXNpYmxlKQorICAgICAgICAgICAgdGhpcy5zaG93RGVmYXVsdENvbnRlbnRWaWV3KCk7 CiAgICAgfQogCiAgICAgX2NvbnRlbnRCcm93c2VyQ3VycmVudENvbnRlbnRWaWV3RGlkQ2hhbmdl KGV2ZW50KQo= 295184 2016-11-18 13:28:00 -0800 2016-11-18 14:04:16 -0800 Patch for landing bug-162642-20161118132753.patch text/plain 11479 mattbaker U3VidmVyc2lvbiBSZXZpc2lvbjogMjA4ODkwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCAz NzgxOWJjZjk2YjE1ZDY1NWU4NDU5OTJmMWZhYTM3OTc0ZmMxNDZmLi42Y2QwYzZjNDliNzRkZjE4 MzE4MDQxZmZkMTM4Nzg0ZGQ0OTJlMjIyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSw1NyBAQAorMjAxNi0xMS0xOCAgTWF0dCBCYWtlciAgPG1hdHRiYWtlckBhcHBsZS5jb20+ CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogVGltZWxpbmVEYXRhR3JpZE5vZGUgYXNzZXJ0aW9u cyB3aGVuIHJlZnJlc2hpbmcgcGFnZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTYyNjQyCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8yODUwNTg5OD4K KworICAgICAgICBSZXZpZXdlZCBieSBUaW1vdGh5IEhhdGNoZXIuCisKKyAgICAgICAgVGhpcyBw YXRjaCBmaXhlcyBhIG51bWJlciBvZiBkZWZpY2llbmNpZXMgaW4gdGhlIE5ldHdvcmsgdGFiIHRo YXQgY2F1c2VkCisgICAgICAgIFRpbWVsaW5lRGF0YUdyaWROb2RlIGdyYXBocyB0byByZWZyZXNo IGJlZm9yZSB0aGUgdGFiIGJlY2FtZSB2aXNpYmxlLgorCisgICAgICAgICogVXNlckludGVyZmFj ZS9WaWV3cy9FbGVtZW50c1RhYkNvbnRlbnRWaWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9y LkVsZW1lbnRzVGFiQ29udGVudFZpZXcpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkVsZW1lbnRz VGFiQ29udGVudFZpZXcucHJvdG90eXBlLnNob3duKToKKyAgICAgICAgRHJpdmUtYnkgZml4OiBk ZWZlciBzaG93aW5nIHRoZSBET00gY29udGVudCB2aWV3IHVudGlsIHRoZSB0YWIgaXMgc2hvd24u CisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL05ldHdvcmtHcmlkQ29udGVudFZpZXcu anM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTmV0d29ya0dyaWRDb250ZW50Vmlldyk6CisgICAg ICAgIERyaXZlLWJ5IGV2ZW50IGxpc3RlbmVyIGNsZWFudXAuCisgICAgICAgIChXZWJJbnNwZWN0 b3IuTmV0d29ya0dyaWRDb250ZW50Vmlldy5wcm90b3R5cGUuZ2V0IHN0YXJ0VGltZSk6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuTmV0d29ya0dyaWRDb250ZW50Vmlldy5wcm90b3R5cGUuZ2V0IGVu ZFRpbWUpOgorICAgICAgICBCYWNrIGVuZFRpbWUgd2l0aCBhIHZhcmlhYmxlLCBpbnN0ZWFkIG9m IHVzaW5nIHRoZSBydWxlciB2YWx1ZSB3aGljaAorICAgICAgICBpc24ndCB2YWxpZCBiZWZvcmUg dGhlIHRhYiBpcyBzaG93biBmb3IgdGhlIGZpcnN0IHRpbWUuCisKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5OZXR3b3JrR3JpZENvbnRlbnRWaWV3LnByb3RvdHlwZS5zaG93bik6CisgICAgICAgIEZv cmNlIHRoZSBncmlkIHRvIHVwZGF0ZSBpdHMgbGF5b3V0LCBhbmQgdGhhdCBvZiB0aGUgVGltZWxp bmUgY29sdW1uIHJ1bGVyLgorICAgICAgICBEdXJpbmcgbGF5b3V0IHRoZSBydWxlcidzIHNlY29u ZHNQZXJQaXhlbCB2YWx1ZSBpcyB1c2VkLCB3aGljaCBpc24ndAorICAgICAgICB2YWxpZCB1bnRp bCB0aGUgcnVsZXIgZG9lcyBhbiBpbml0aWFsIGxheW91dC4KKworICAgICAgICAoV2ViSW5zcGVj dG9yLk5ldHdvcmtHcmlkQ29udGVudFZpZXcucHJvdG90eXBlLnJlc2V0KToKKyAgICAgICAgQ2xl YXIgcGVuZGluZyByZWNvcmRzLiBUaGlzIHdhcyBjYXVzaW5nIGR1cGxpY2F0ZXMgdG8gYXBwZWFy IHdoZW4gdGhlCisgICAgICAgIGluc3BlY3RlZCBwYWdlIHdhcyByZWZyZXNoZWQgbXVsdGlwbGUg dGltZXMgcHJpb3IgdG8gc2hvd2luZyB0aGUgTmV0d29yaworICAgICAgICB0YWIgZm9yIHRoZSBm aXJzdCB0aW1lLgorCisgICAgICAgIChXZWJJbnNwZWN0b3IuTmV0d29ya0dyaWRDb250ZW50Vmll dy5wcm90b3R5cGUubGF5b3V0KToKKyAgICAgICAgU2hvdWxkIG1vcmUgY2xvc2VseSBtYXRjaCBi ZWhhdmlvciBpbiBOZXR3b3JrVGltZWxpbmVWaWV3LnByb3RvdHlwZS5sYXlvdXQuCisgICAgICAg IEdyYXBoIGVuZCB0aW1lIHBhZGRpbmcgaXMgYWRkZWQgaWYgbm8gbG9uZ2VyIHVwZGF0aW5nIHRo ZSBjdXJyZW50IHRpbWUuCisKKyAgICAgICAgKFdlYkluc3BlY3Rvci5OZXR3b3JrR3JpZENvbnRl bnRWaWV3LnByb3RvdHlwZS5fbmV0d29ya1RpbWVsaW5lUmVjb3JkQWRkZWQpOgorICAgICAgICBU cmFjayBlbmRUaW1lIG9mIHRoZSBsYXN0IHJlY29yZCBhZGRlZCwgc28gdGhhdCB0aGUgZ3JhcGgg ZW5kIHRpbWUgY2FuCisgICAgICAgIGJlIHBhZGRlZCBvbmNlIHRoZSBjdXJyZW50IHRpbWUgaXMg bm8gbG9uZ2VyIGJlaW5nIHVwZGF0ZWQuCisKKyAgICAgICAgKFdlYkluc3BlY3Rvci5OZXR3b3Jr R3JpZENvbnRlbnRWaWV3LnByb3RvdHlwZS5fdXBkYXRlKToKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5OZXR3b3JrR3JpZENvbnRlbnRWaWV3LnByb3RvdHlwZS5fc3RvcFVwZGF0aW5nQ3VycmVudFRp bWUpOgorICAgICAgICBHcmFwaCBlbmQgdGltZSBwYWRkaW5nIHNob3VsZG4ndCBiZSBhcHBsaWVk IGhlcmUsIHNpbmNlIHRoaXMgaXNuJ3QgY2FsbGVkCisgICAgICAgIGlmIHRoZSBpbnNwZWN0ZWQg cGFnZSBmaW5pc2hlcyBsb2FkaW5nIGJlZm9yZSB0aGUgdmlldyBpcyBzaG93bi4KKworICAgICAg ICAoV2ViSW5zcGVjdG9yLk5ldHdvcmtHcmlkQ29udGVudFZpZXcucHJvdG90eXBlLl9jbGVhck5l dHdvcmtJdGVtcyk6IERlbGV0ZWQuCisgICAgICAgIFJlcGxhY2VkIGJ5IGFuIGFycm93IGZ1bmN0 aW9uLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9OZXR3b3JrU2lkZWJhclBhbmVs LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk5ldHdvcmtTaWRlYmFyUGFuZWwucHJvdG90eXBl Ll9uZXR3b3JrVGltZWxpbmVSZXNldCk6CisgICAgICAgIERvbid0IHNob3cgdGhlIGNvbnRlbnQg dmlldyBpZiB0aGUgdGFiIGlzIGhpZGRlbi4KKwogMjAxNi0xMS0xNyAgRGV2aW4gUm91c3NvICA8 ZGNyb3Vzc28rd2Via2l0QGdtYWlsLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBTaGlm dCBjbGlja2luZyBvbiBuYW1lZCBjb2xvciB2YWx1ZSBvbmx5IHNob3dzIGl0cyBoZXggZm9ybQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRWxl bWVudHNUYWJDb250ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL0VsZW1lbnRzVGFiQ29udGVudFZpZXcuanMKaW5kZXggYWRhYmJlMWM5MTFlOWVj NjBjMjY4MTM4ZmNlZTE4OGEzODhlMGY5Yy4uZjNlYzdmMzIxODcyM2I4MzM2NDRlNmI5NDliMDgw Y2I4OTdmMjIxMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvRWxlbWVudHNUYWJDb250ZW50Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9FbGVtZW50c1RhYkNvbnRlbnRWaWV3LmpzCkBAIC0z OCw4ICszOCw2IEBAIFdlYkluc3BlY3Rvci5FbGVtZW50c1RhYkNvbnRlbnRWaWV3ID0gY2xhc3Mg RWxlbWVudHNUYWJDb250ZW50VmlldyBleHRlbmRzIFdlYkluCiAKICAgICAgICAgV2ViSW5zcGVj dG9yLmZyYW1lUmVzb3VyY2VNYW5hZ2VyLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkZy YW1lUmVzb3VyY2VNYW5hZ2VyLkV2ZW50Lk1haW5GcmFtZURpZENoYW5nZSwgdGhpcy5fbWFpbkZy YW1lRGlkQ2hhbmdlLCB0aGlzKTsKICAgICAgICAgV2ViSW5zcGVjdG9yLkZyYW1lLmFkZEV2ZW50 TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkZyYW1lLkV2ZW50Lk1haW5SZXNvdXJjZURpZENoYW5nZSwg dGhpcy5fbWFpblJlc291cmNlRGlkQ2hhbmdlLCB0aGlzKTsKLQotICAgICAgICB0aGlzLl9zaG93 RE9NVHJlZUNvbnRlbnRWaWV3KCk7CiAgICAgfQogCiAgICAgc3RhdGljIHRhYkluZm8oKQpAQCAt ODYsNiArODQsMTMgQEAgV2ViSW5zcGVjdG9yLkVsZW1lbnRzVGFiQ29udGVudFZpZXcgPSBjbGFz cyBFbGVtZW50c1RhYkNvbnRlbnRWaWV3IGV4dGVuZHMgV2ViSW4KICAgICAgICAgY29va2llLm5v ZGVUb1NlbGVjdCA9IHVuZGVmaW5lZDsKICAgICB9CiAKKyAgICBzaG93bigpCisgICAgeworICAg ICAgICBzdXBlci5zaG93bigpOworCisgICAgICAgIHRoaXMuX3Nob3dET01UcmVlQ29udGVudFZp ZXcoKTsKKyAgICB9CisKICAgICBjbG9zZWQoKQogICAgIHsKICAgICAgICAgc3VwZXIuY2xvc2Vk KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9OZXR3b3JrR3JpZENvbnRlbnRWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvTmV0d29ya0dyaWRDb250ZW50Vmlldy5qcwppbmRleCBmYzI4MTExMGFj OGZiNGMzOWVhZDljY2IzZWQ4OTYwYWQ4ZmU3ZjZmLi5hMzJiMjA4M2NlYzExOTM4ZjVlMzgyODdj NzAwZmNiZjg3OWM5Yzc4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9OZXR3b3JrR3JpZENvbnRlbnRWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL05ldHdvcmtHcmlkQ29udGVudFZpZXcuanMK QEAgLTEwMiwxMCArMTAyLDExIEBAIFdlYkluc3BlY3Rvci5OZXR3b3JrR3JpZENvbnRlbnRWaWV3 ID0gY2xhc3MgTmV0d29ya0dyaWRDb250ZW50VmlldyBleHRlbmRzIFdlYkluCiAgICAgICAgIG5l dHdvcmtUaW1lbGluZS5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5UaW1lbGluZS5FdmVu dC5SZXNldCwgdGhpcy5fbmV0d29ya1RpbWVsaW5lUmVzZXQsIHRoaXMpOwogCiAgICAgICAgIHRo aXMuX2NsZWFyTmV0d29ya0l0ZW1zTmF2aWdhdGlvbkl0ZW0gPSBuZXcgV2ViSW5zcGVjdG9yLkJ1 dHRvbk5hdmlnYXRpb25JdGVtKCJjbGVhci1uZXR3b3JrLWl0ZW1zIiwgV2ViSW5zcGVjdG9yLlVJ U3RyaW5nKCJDbGVhciBOZXR3b3JrIEl0ZW1zIiksICJJbWFnZXMvTmF2aWdhdGlvbkl0ZW1UcmFz aC5zdmciLCAxNSwgMTUpOwotICAgICAgICB0aGlzLl9jbGVhck5ldHdvcmtJdGVtc05hdmlnYXRp b25JdGVtLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkJ1dHRvbk5hdmlnYXRpb25JdGVt LkV2ZW50LkNsaWNrZWQsIHRoaXMuX2NsZWFyTmV0d29ya0l0ZW1zLCB0aGlzKTsKKyAgICAgICAg dGhpcy5fY2xlYXJOZXR3b3JrSXRlbXNOYXZpZ2F0aW9uSXRlbS5hZGRFdmVudExpc3RlbmVyKFdl Ykluc3BlY3Rvci5CdXR0b25OYXZpZ2F0aW9uSXRlbS5FdmVudC5DbGlja2VkLCAoKSA9PiB0aGlz LnJlc2V0KCkpOwogCiAgICAgICAgIHRoaXMuX3BlbmRpbmdSZWNvcmRzID0gW107CiAgICAgICAg IHRoaXMuX2xvYWRpbmdSZXNvdXJjZUNvdW50ID0gMDsKKyAgICAgICAgdGhpcy5fbGFzdFJlY29y ZEVuZFRpbWUgPSBOYU47CiAgICAgICAgIHRoaXMuX2xhc3RVcGRhdGVUaW1lc3RhbXAgPSBOYU47 CiAgICAgICAgIHRoaXMuX3N0YXJ0VGltZSA9IE5hTjsKICAgICAgICAgdGhpcy5fZW5kVGltZSA9 IE5hTjsKQEAgLTExNSw5ICsxMTYsOSBAQCBXZWJJbnNwZWN0b3IuTmV0d29ya0dyaWRDb250ZW50 VmlldyA9IGNsYXNzIE5ldHdvcmtHcmlkQ29udGVudFZpZXcgZXh0ZW5kcyBXZWJJbgogICAgIC8v IFB1YmxpYwogCiAgICAgZ2V0IHNlY29uZHNQZXJQaXhlbCgpIHsgcmV0dXJuIHRoaXMuX3RpbWVs aW5lUnVsZXIuc2Vjb25kc1BlclBpeGVsOyB9Ci0gICAgZ2V0IHN0YXJ0VGltZSgpIHsgcmV0dXJu IHRoaXMuX3N0YXJ0VGltZSB8fCAwOyB9CisgICAgZ2V0IHN0YXJ0VGltZSgpIHsgcmV0dXJuIHRo aXMuX3N0YXJ0VGltZTsgfQogICAgIGdldCBjdXJyZW50VGltZSgpIHsgcmV0dXJuIHRoaXMuZW5k VGltZSB8fCB0aGlzLnN0YXJ0VGltZTsgfQotICAgIGdldCBlbmRUaW1lKCkgeyByZXR1cm4gdGhp cy5fdGltZWxpbmVSdWxlci5lbmRUaW1lOyB9CisgICAgZ2V0IGVuZFRpbWUoKSB7IHJldHVybiB0 aGlzLl9lbmRUaW1lOyB9CiAgICAgZ2V0IHplcm9UaW1lKCkgeyByZXR1cm4gdGhpcy5zdGFydFRp bWU7IH0KIAogICAgIGdldCBzZWxlY3Rpb25QYXRoQ29tcG9uZW50cygpCkBAIC0xNDEsNiArMTQy LDggQEAgV2ViSW5zcGVjdG9yLk5ldHdvcmtHcmlkQ29udGVudFZpZXcgPSBjbGFzcyBOZXR3b3Jr R3JpZENvbnRlbnRWaWV3IGV4dGVuZHMgV2ViSW4KIAogICAgICAgICB0aGlzLl9kYXRhR3JpZC5z aG93bigpOwogCisgICAgICAgIHRoaXMuX2RhdGFHcmlkLnVwZGF0ZUxheW91dChXZWJJbnNwZWN0 b3IuVmlldy5MYXlvdXRSZWFzb24uUmVzaXplKTsKKwogICAgICAgICBpZiAodGhpcy5fbG9hZGlu Z1Jlc291cmNlQ291bnQgJiYgIXRoaXMuX3NjaGVkdWxlZEN1cnJlbnRUaW1lVXBkYXRlSWRlbnRp ZmllcikKICAgICAgICAgICAgIHRoaXMuX3N0YXJ0VXBkYXRpbmdDdXJyZW50VGltZSgpOwogICAg IH0KQEAgLTE3MCw3ICsxNzMsOSBAQCBXZWJJbnNwZWN0b3IuTmV0d29ya0dyaWRDb250ZW50Vmll dyA9IGNsYXNzIE5ldHdvcmtHcmlkQ29udGVudFZpZXcgZXh0ZW5kcyBXZWJJbgogICAgICAgICBp ZiAodGhpcy5fc2NoZWR1bGVkQ3VycmVudFRpbWVVcGRhdGVJZGVudGlmaWVyKQogICAgICAgICAg ICAgdGhpcy5fc3RvcFVwZGF0aW5nQ3VycmVudFRpbWUoKTsKIAorICAgICAgICB0aGlzLl9wZW5k aW5nUmVjb3JkcyA9IFtdOwogICAgICAgICB0aGlzLl9sb2FkaW5nUmVzb3VyY2VDb3VudCA9IDA7 CisgICAgICAgIHRoaXMuX2xhc3RSZWNvcmRFbmRUaW1lID0gTmFOOwogICAgICAgICB0aGlzLl9s YXN0VXBkYXRlVGltZXN0YW1wID0gTmFOOwogICAgICAgICB0aGlzLl9zdGFydFRpbWUgPSBOYU47 CiAgICAgICAgIHRoaXMuX2VuZFRpbWUgPSBOYU47CkBAIC0xODMsMTYgKzE4OCwzMSBAQCBXZWJJ bnNwZWN0b3IuTmV0d29ya0dyaWRDb250ZW50VmlldyA9IGNsYXNzIE5ldHdvcmtHcmlkQ29udGVu dFZpZXcgZXh0ZW5kcyBXZWJJbgogCiAgICAgbGF5b3V0KCkKICAgICB7Ci0gICAgICAgIGlmICgh aXNOYU4odGhpcy5fc3RhcnRUaW1lKSkgewotICAgICAgICAgICAgdGhpcy5fdGltZWxpbmVSdWxl ci56ZXJvVGltZSA9IHRoaXMuX3N0YXJ0VGltZTsKLSAgICAgICAgICAgIHRoaXMuX3RpbWVsaW5l UnVsZXIuc3RhcnRUaW1lID0gdGhpcy5fc3RhcnRUaW1lOwotICAgICAgICB9CisgICAgICAgIGlm IChpc05hTih0aGlzLnN0YXJ0VGltZSkgfHwgaXNOYU4odGhpcy5lbmRUaW1lKSkKKyAgICAgICAg ICAgIHJldHVybjsKKworICAgICAgICBsZXQgb2xkWmVyb1RpbWUgPSB0aGlzLl90aW1lbGluZVJ1 bGVyLnplcm9UaW1lOworICAgICAgICBsZXQgb2xkU3RhcnRUaW1lID0gdGhpcy5fdGltZWxpbmVS dWxlci5zdGFydFRpbWU7CisgICAgICAgIGxldCBvbGRFbmRUaW1lID0gdGhpcy5fdGltZWxpbmVS dWxlci5lbmRUaW1lOworCisgICAgICAgIHRoaXMuX3RpbWVsaW5lUnVsZXIuemVyb1RpbWUgPSB0 aGlzLnplcm9UaW1lOworICAgICAgICB0aGlzLl90aW1lbGluZVJ1bGVyLnN0YXJ0VGltZSA9IHRo aXMuc3RhcnRUaW1lOwogCiAgICAgICAgIGlmICh0aGlzLnN0YXJ0VGltZSA+PSB0aGlzLmVuZFRp bWUpCiAgICAgICAgICAgICByZXR1cm47CiAKLSAgICAgICAgZm9yIChsZXQgZGF0YUdyaWROb2Rl IG9mIHRoaXMuX2RhdGFHcmlkLmNoaWxkcmVuKQotICAgICAgICAgICAgZGF0YUdyaWROb2RlLnJl ZnJlc2hHcmFwaCgpOworICAgICAgICBpZiAoIXRoaXMuX3NjaGVkdWxlZEN1cnJlbnRUaW1lVXBk YXRlSWRlbnRpZmllcikgeworICAgICAgICAgICAgdGhpcy5fdGltZWxpbmVSdWxlci5lbmRUaW1l ID0gdGhpcy5lbmRUaW1lOworICAgICAgICAgICAgdGhpcy5fZW5kVGltZSA9IHRoaXMuX2xhc3RS ZWNvcmRFbmRUaW1lICsgV2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVjb3JkQmFyLk1pbmltdW1XaWR0 aFBpeGVscyAqIHRoaXMuc2Vjb25kc1BlclBpeGVsOworICAgICAgICB9CisKKyAgICAgICAgdGhp cy5fdGltZWxpbmVSdWxlci5lbmRUaW1lID0gdGhpcy5lbmRUaW1lOworCisgICAgICAgIC8vIFdl IG9ubHkgbmVlZCB0byByZWZyZXNoIHRoZSBncmFwaHMgd2hlbiB0aGUgYW55IG9mIHRoZSB0aW1l cyBjaGFuZ2UuCisgICAgICAgIGlmICh0aGlzLnplcm9UaW1lICE9PSBvbGRaZXJvVGltZSB8fCB0 aGlzLnN0YXJ0VGltZSAhPT0gb2xkU3RhcnRUaW1lIHx8IHRoaXMuZW5kVGltZSAhPT0gb2xkRW5k VGltZSkgeworICAgICAgICAgICAgZm9yIChsZXQgZGF0YUdyaWROb2RlIG9mIHRoaXMuX2RhdGFH cmlkLmNoaWxkcmVuKQorICAgICAgICAgICAgICAgIGRhdGFHcmlkTm9kZS5yZWZyZXNoR3JhcGgo KTsKKyAgICAgICAgfQogCiAgICAgICAgIHRoaXMuX3Byb2Nlc3NQZW5kaW5nUmVjb3JkcygpOwog ICAgIH0KQEAgLTI0Myw3ICsyNjMsOCBAQCBXZWJJbnNwZWN0b3IuTmV0d29ya0dyaWRDb250ZW50 VmlldyA9IGNsYXNzIE5ldHdvcmtHcmlkQ29udGVudFZpZXcgZXh0ZW5kcyBXZWJJbgogICAgICAg ICAgICAgaWYgKHRoaXMuX2xvYWRpbmdSZXNvdXJjZUNvdW50KQogICAgICAgICAgICAgICAgIHJl dHVybjsKIAotICAgICAgICAgICAgdGhpcy5fZW5kVGltZSA9IHJlc291cmNlVGltZWxpbmVSZWNv cmQuZW5kVGltZTsKKyAgICAgICAgICAgIHRoaXMuX2xhc3RSZWNvcmRFbmRUaW1lID0gcmVzb3Vy Y2VUaW1lbGluZVJlY29yZC5lbmRUaW1lOworICAgICAgICAgICAgdGhpcy5fZW5kVGltZSA9IE1h dGgubWF4KHRoaXMuX2xhc3RSZWNvcmRFbmRUaW1lLCB0aGlzLl9lbmRUaW1lKTsKIAogICAgICAg ICAgICAgaWYgKHRoaXMuX3NjaGVkdWxlZEN1cnJlbnRUaW1lVXBkYXRlSWRlbnRpZmllcikKICAg ICAgICAgICAgICAgICB0aGlzLmRlYm91bmNlKDE1MCkuX3N0b3BVcGRhdGluZ0N1cnJlbnRUaW1l KCk7CkBAIC0yNjYsNyArMjg3LDcgQEAgV2ViSW5zcGVjdG9yLk5ldHdvcmtHcmlkQ29udGVudFZp ZXcgPSBjbGFzcyBOZXR3b3JrR3JpZENvbnRlbnRWaWV3IGV4dGVuZHMgV2ViSW4KICAgICAgICAg ICAgIHJldHVybjsKIAogICAgICAgICBpZiAoaXNOYU4odGhpcy5fc3RhcnRUaW1lKSkKLSAgICAg ICAgICAgIHRoaXMuX3N0YXJ0VGltZSA9IHJlc291cmNlVGltZWxpbmVSZWNvcmQuc3RhcnRUaW1l OworICAgICAgICAgICAgdGhpcy5fc3RhcnRUaW1lID0gdGhpcy5fZW5kVGltZSA9IHJlc291cmNl VGltZWxpbmVSZWNvcmQuc3RhcnRUaW1lOwogCiAgICAgICAgIC8vIEZJWE1FOiA8aHR0cHM6Ly93 ZWJraXQub3JnL2IvMTUzNjM0PiBXZWIgSW5zcGVjdG9yOiBzb21lIGJhY2tncm91bmQgdGFicyB0 aGluayB0aGV5IGFyZSB0aGUgZm9yZWdyb3VuZCB0YWIgYW5kIGRvIHVubmVjZXNzYXJ5IHdvcmsK ICAgICAgICAgaWYgKCEoV2ViSW5zcGVjdG9yLnRhYkJyb3dzZXIuc2VsZWN0ZWRUYWJDb250ZW50 VmlldyBpbnN0YW5jZW9mIFdlYkluc3BlY3Rvci5OZXR3b3JrVGFiQ29udGVudFZpZXcpKQpAQCAt MzA0LDE3ICszMjUsMTMgQEAgV2ViSW5zcGVjdG9yLk5ldHdvcmtHcmlkQ29udGVudFZpZXcgPSBj bGFzcyBOZXR3b3JrR3JpZENvbnRlbnRWaWV3IGV4dGVuZHMgV2ViSW4KICAgICAgICAgdGhpcy5k aXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLkNvbnRlbnRWaWV3LkV2ZW50LlNl bGVjdGlvblBhdGhDb21wb25lbnRzRGlkQ2hhbmdlKTsKICAgICB9CiAKLSAgICBfY2xlYXJOZXR3 b3JrSXRlbXMoZXZlbnQpIHsKLSAgICAgICAgdGhpcy5yZXNldCgpOwotICAgIH0KLQogICAgIF91 cGRhdGUodGltZXN0YW1wKQogICAgIHsKICAgICAgICAgY29uc29sZS5hc3NlcnQodGhpcy5fc2No ZWR1bGVkQ3VycmVudFRpbWVVcGRhdGVJZGVudGlmaWVyKTsKIAogICAgICAgICBpZiAoIWlzTmFO KHRoaXMuX2xhc3RVcGRhdGVUaW1lc3RhbXApKSB7CiAgICAgICAgICAgICBsZXQgdGltZXNwYW5T aW5jZUxhc3RVcGRhdGUgPSAodGltZXN0YW1wIC0gdGhpcy5fbGFzdFVwZGF0ZVRpbWVzdGFtcCkg LyAxMDAwIHx8IDA7Ci0gICAgICAgICAgICB0aGlzLl90aW1lbGluZVJ1bGVyLmVuZFRpbWUgPSB0 aGlzLmN1cnJlbnRUaW1lICsgdGltZXNwYW5TaW5jZUxhc3RVcGRhdGU7CisgICAgICAgICAgICB0 aGlzLl9lbmRUaW1lICs9IHRpbWVzcGFuU2luY2VMYXN0VXBkYXRlOwogCiAgICAgICAgICAgICB0 aGlzLnVwZGF0ZUxheW91dCgpOwogICAgICAgICB9CkBAIC0zNTAsNyArMzY3LDYgQEAgV2ViSW5z cGVjdG9yLk5ldHdvcmtHcmlkQ29udGVudFZpZXcgPSBjbGFzcyBOZXR3b3JrR3JpZENvbnRlbnRW aWV3IGV4dGVuZHMgV2ViSW4KICAgICAgICAgY2FuY2VsQW5pbWF0aW9uRnJhbWUodGhpcy5fc2No ZWR1bGVkQ3VycmVudFRpbWVVcGRhdGVJZGVudGlmaWVyKTsKICAgICAgICAgdGhpcy5fc2NoZWR1 bGVkQ3VycmVudFRpbWVVcGRhdGVJZGVudGlmaWVyID0gdW5kZWZpbmVkOwogCi0gICAgICAgIHRo aXMuX3RpbWVsaW5lUnVsZXIuZW5kVGltZSA9IHRoaXMuX2VuZFRpbWUgKyBXZWJJbnNwZWN0b3Iu VGltZWxpbmVSZWNvcmRCYXIuTWluaW11bVdpZHRoUGl4ZWxzICogdGhpcy5zZWNvbmRzUGVyUGl4 ZWw7CiAgICAgICAgIHRoaXMubmVlZHNMYXlvdXQoKTsKICAgICB9CiB9OwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTmV0d29ya1NpZGViYXJQ YW5lbC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL05ldHdv cmtTaWRlYmFyUGFuZWwuanMKaW5kZXggNGFlMjM2N2ViOGI4ZTJhMWRjZGM0ODAyYjhlZTQ1MmQ1 NmM4NTA2ZS4uNWMzOWZmZDFhZTgwYzIwZTU1NjUyYmUxNTY5YjhiZjczOGY0MDExMyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTmV0d29ya1Np ZGViYXJQYW5lbC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9OZXR3b3JrU2lkZWJhclBhbmVsLmpzCkBAIC0xNzQsNyArMTc0LDkgQEAgV2ViSW5zcGVj dG9yLk5ldHdvcmtTaWRlYmFyUGFuZWwgPSBjbGFzcyBOZXR3b3JrU2lkZWJhclBhbmVsIGV4dGVu ZHMgV2ViSW5zcGVjdG8KICAgICBfbmV0d29ya1RpbWVsaW5lUmVzZXQoZXZlbnQpCiAgICAgewog ICAgICAgICB0aGlzLmNvbnRlbnRCcm93c2VyLmNvbnRlbnRWaWV3Q29udGFpbmVyLmNsb3NlQWxs Q29udGVudFZpZXdzKCk7Ci0gICAgICAgIHRoaXMuc2hvd0RlZmF1bHRDb250ZW50VmlldygpOwor CisgICAgICAgIGlmICh0aGlzLnZpc2libGUpCisgICAgICAgICAgICB0aGlzLnNob3dEZWZhdWx0 Q29udGVudFZpZXcoKTsKICAgICB9CiAKICAgICBfY29udGVudEJyb3dzZXJDdXJyZW50Q29udGVu dFZpZXdEaWRDaGFuZ2UoZXZlbnQpCg==