157583 2016-05-11 13:26:44 -0700 Web Inspector: Hide filter bar in TimelineViews where it is not needed or not yet working 2016-05-11 14:52:41 -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 1192059 0 joepeck 2016-05-11 13:26:44 -0700 * SUMMARY Hide filter bar in TimelineViews where it is not needed or not yet working - Memory Timeline View - not needed - Heap Snapshot View - not hooked up yet <https://webkit.org/b/157582> Web Inspector: Heap Snapshot Views should be searchable - Script Profile View - not hooked up yet <https://webkit.org/b/157581> Web Inspector: Script ProfileViews should be searchable 1192066 1 278661 joepeck 2016-05-11 13:36:21 -0700 Created attachment 278661 [PATCH] Proposed Fix 1192067 2 webkit-bug-importer 2016-05-11 13:36:51 -0700 <rdar://problem/26228913> 1192072 3 278661 mattbaker 2016-05-11 13:48:42 -0700 Comment on attachment 278661 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=278661&action=review > Source/WebInspectorUI/UserInterface/Views/HeapAllocationsTimelineView.js:259 > + Usually this is handled by the base class, but that requires HeapAllocationsTimelineView to call TimelineView.setupDataGrid in its constructor. Fine for now. 1192074 4 joepeck 2016-05-11 13:52:38 -0700 (In reply to comment #3) > Comment on attachment 278661 [details] > [PATCH] Proposed Fix > > View in context: > https://bugs.webkit.org/attachment.cgi?id=278661&action=review > > > Source/WebInspectorUI/UserInterface/Views/HeapAllocationsTimelineView.js:259 > > + > > Usually this is handled by the base class, but that requires > HeapAllocationsTimelineView to call TimelineView.setupDataGrid in its > constructor. Fine for now. I describe in the ChangeLog why we don't use the default TimelineView filtering (we show all snapshots regardless of the timeline range selection). Maybe that is bad? 1192101 5 278661 commit-queue 2016-05-11 14:52:37 -0700 Comment on attachment 278661 [PATCH] Proposed Fix Clearing flags on attachment: 278661 Committed r200708: <http://trac.webkit.org/changeset/200708> 1192102 6 commit-queue 2016-05-11 14:52:41 -0700 All reviewed patches have been landed. Closing bug. 278661 2016-05-11 13:36:21 -0700 2016-05-11 14:52:37 -0700 [PATCH] Proposed Fix hide-filter-bar.patch text/plain 8676 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGE3MzQ0YzcuLmU5OWU5NzMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ1IEBACisyMDE2LTA1LTExICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogSGlkZSBm aWx0ZXIgYmFyIGluIFRpbWVsaW5lVmlld3Mgd2hlcmUgaXQgaXMgbm90IG5lZWRlZCBvciBub3Qg eWV0IHdvcmtpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTE1NzU4MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgICogVXNlckludGVyZmFjZS9WaWV3cy9IZWFwQWxsb2NhdGlvbnNUaW1lbGluZVZpZXcuanM6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuSGVhcEFsbG9jYXRpb25zVGltZWxpbmVWaWV3LnByb3Rv dHlwZS5nZXQgc2hvd3NGaWx0ZXJCYXIpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkhlYXBBbGxv Y2F0aW9uc1RpbWVsaW5lVmlldy5wcm90b3R5cGUubGF5b3V0KToKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5IZWFwQWxsb2NhdGlvbnNUaW1lbGluZVZpZXcucHJvdG90eXBlLnVwZGF0ZUZpbHRlcik6 CisgICAgICAgIEZpbHRlciBiYXIgbm90IHlldCBob29rZWQgdXAgZm9yIEhlYXBTbmFwc2hvdCB2 aWV3cy4KKyAgICAgICAgTWFrZSBmaWx0ZXJpbmcgd29yayBmb3IgdGhlIG1haW4gdGltZWxpbmUg Z3JpZC4KKyAgICAgICAgSXQgZG9lc24ndCB1c2UgdGhlIG5vcm1hbCBUaW1lbGluZVZpZXcgZmls dGVyIGJhc2VkIG9uIHNlbGVjdGVkIHJhbmdlLgorICAgICAgICBUaGlzIGlzIGludGVudGlvbmFs IGJlY2F1c2UgaXQgbWF5IGJlIHRoZSBjYXNlIHRoYXQgYSBzbmFwc2hvdCBoYXBwZW5zCisgICAg ICAgIG91dHNpZGUgdGhlIHNlbGVjdGVkIHRpbWUgcmFuZ2UgKHZpYSB0aGUgbmF2aWdhdGlvbiBi YXIgYnV0dG9uKSBhbmQKKyAgICAgICAgd2Ugd2FudCB0byBzaG93IGl0LiBPdGhlcndpc2UgYSB1 c2VyIG1pZ2h0IGJlIGNvbmZ1c2VkIHdoeSBpdCBpcyBub3QKKyAgICAgICAgc2hvd2luZyB1cCBp biB0aGUgbGlzdC4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvTWVtb3J5VGltZWxp bmVWaWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk1lbW9yeVRpbWVsaW5lVmlldy5wcm90 b3R5cGUuZ2V0IHNob3dzRmlsdGVyQmFyKToKKyAgICAgICAgRmlsdGVyIGJhciBub3QgbmVlZGVk IGluIHRoZSBNZW1vcnkgdGltZWxpbmUgdmlldy4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2Uv Vmlld3MvU2NyaXB0Q2x1c3RlclRpbWVsaW5lVmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5TY3JpcHRDbHVzdGVyVGltZWxpbmVWaWV3LnByb3RvdHlwZS5nZXQgc2hvd3NGaWx0ZXJCYXIp OgorICAgICAgICBGaWx0ZXIgYmFyIHdvcmtzIGZvciB0aGUgRXZlbnRzIHRpbWVsaW5lIHZpZXcu CisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1NjcmlwdFByb2ZpbGVUaW1lbGluZVZp ZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0UHJvZmlsZVRpbWVsaW5lVmlldy5w cm90b3R5cGUuZ2V0IHNob3dzRmlsdGVyQmFyKToKKyAgICAgICAgRmlsdGVyIGJhciBub3QgeWV0 IGhvb2tlZCB1cCBmb3IgUHJvZmlsZSB2aWV3cy4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2Uv Vmlld3MvVGltZWxpbmVSZWNvcmRpbmdDb250ZW50Vmlldy5qczoKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5UaW1lbGluZVJlY29yZGluZ0NvbnRlbnRWaWV3LnByb3RvdHlwZS5fY3VycmVudENvbnRl bnRWaWV3RGlkQ2hhbmdlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZVJlY29yZGlu Z0NvbnRlbnRWaWV3LnByb3RvdHlwZS5fY29udGVudFZpZXdTZWxlY3Rpb25QYXRoQ29tcG9uZW50 RGlkQ2hhbmdlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZVJlY29yZGluZ0NvbnRl bnRWaWV3LnByb3RvdHlwZS5fdXBkYXRlRmlsdGVyQmFyKToKKyAgICAgICAgVXBkYXRlIHRoZSBm aWx0ZXIgYmFyIHdoZW4gdGhlIHNlbGVjdGlvbiBwYXRoIGNvbXBvbmVudHMgY2hhbmdlLCBzaW5j ZQorICAgICAgICB0aGF0IHRyaWdnZXJzIHdoZW4gYXJiaXRyYXJpbHkgZGVlcCBzdWItY29udGVu dC12aWV3cyBjaGFuZ2UuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5l Vmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZVZpZXcucHJvdG90eXBlLmdl dCBzaG93c0ZpbHRlckJhcik6CisgICAgICAgIERlZmF1bHQgaXMgeWVzLgorCiAyMDE2LTA1LTEw ICBKb3NlcGggUGVjb3Jhcm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIElu c3BlY3RvcjogQXZvaWQgdW5uZWNlc3NhcnkgdGltZW91dCBpZGVudGlmaWVyIGNodXJuIGluIFRp bWVsaW5lTWFuYWdlcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvSGVhcEFsbG9jYXRpb25zVGltZWxpbmVWaWV3LmpzIGIvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvSGVhcEFsbG9jYXRpb25zVGltZWxpbmVWaWV3 LmpzCmluZGV4IGE3YjA5NTAuLmNiZWRhNWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0hlYXBBbGxvY2F0aW9uc1RpbWVsaW5lVmlldy5qcwor KysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9IZWFwQWxsb2Nh dGlvbnNUaW1lbGluZVZpZXcuanMKQEAgLTE1Myw2ICsxNTMsOSBAQCBXZWJJbnNwZWN0b3IuSGVh cEFsbG9jYXRpb25zVGltZWxpbmVWaWV3ID0gY2xhc3MgSGVhcEFsbG9jYXRpb25zVGltZWxpbmVW aWV3IGV4dAogCiAgICAgLy8gUHJvdGVjdGVkCiAKKyAgICAvLyBGSVhNRTogPGh0dHBzOi8vd2Vi a2l0Lm9yZy9iLzE1NzU4Mj4gV2ViIEluc3BlY3RvcjogSGVhcCBTbmFwc2hvdCBWaWV3cyBzaG91 bGQgYmUgc2VhcmNoYWJsZQorICAgIGdldCBzaG93c0ZpbHRlckJhcigpIHsgcmV0dXJuIHRoaXMu X3Nob3dpbmdTbmFwc2hvdExpc3Q7IH0KKwogICAgIGdldCBuYXZpZ2F0aW9uSXRlbXMoKQogICAg IHsKICAgICAgICAgaWYgKHRoaXMuX3Nob3dpbmdTbmFwc2hvdExpc3QpIHsKQEAgLTIyNiw2ICsy MjksNyBAQCBXZWJJbnNwZWN0b3IuSGVhcEFsbG9jYXRpb25zVGltZWxpbmVWaWV3ID0gY2xhc3Mg SGVhcEFsbG9jYXRpb25zVGltZWxpbmVWaWV3IGV4dAogICAgIGxheW91dCgpCiAgICAgewogICAg ICAgICAvLyBXYWl0IHRvIHNob3cgcmVjb3JkcyB1bnRpbCBvdXIgemVyb1RpbWUgaGFzIGJlZW4g c2V0LgorICAgICAgICAvLyBGSVhNRTogV2FpdGluZyB1bnRpbCB6ZXJvIHRpbWUgY2F1c2VzIHNu YXBzaG90cyB0YWtlbiB3aXRob3V0IHJlY29yZGluZyB0byBub3Qgc2hvdyB1cCBpbiB0aGUgbGlz dC4KICAgICAgICAgaWYgKHRoaXMuX3BlbmRpbmdSZWNvcmRzLmxlbmd0aCAmJiB0aGlzLnplcm9U aW1lKSB7CiAgICAgICAgICAgICBmb3IgKGxldCBoZWFwQWxsb2NhdGlvbnNUaW1lbGluZVJlY29y ZCBvZiB0aGlzLl9wZW5kaW5nUmVjb3JkcykgewogICAgICAgICAgICAgICAgIGxldCBkYXRhR3Jp ZE5vZGUgPSBuZXcgV2ViSW5zcGVjdG9yLkhlYXBBbGxvY2F0aW9uc1RpbWVsaW5lRGF0YUdyaWRO b2RlKGhlYXBBbGxvY2F0aW9uc1RpbWVsaW5lUmVjb3JkLCB0aGlzLnplcm9UaW1lLCB0aGlzKTsK QEAgLTI0OCw2ICsyNTIsMTEgQEAgV2ViSW5zcGVjdG9yLkhlYXBBbGxvY2F0aW9uc1RpbWVsaW5l VmlldyA9IGNsYXNzIEhlYXBBbGxvY2F0aW9uc1RpbWVsaW5lVmlldyBleHQKICAgICAgICAgdGhp cy5fdXBkYXRlQ29tcGFyZUhlYXBTbmFwc2hvdEJ1dHRvbigpOwogICAgIH0KIAorICAgIHVwZGF0 ZUZpbHRlcihmaWx0ZXJzKQorICAgIHsKKyAgICAgICAgdGhpcy5fZGF0YUdyaWQuZmlsdGVyVGV4 dCA9IGZpbHRlcnMgPyBmaWx0ZXJzLnRleHQgOiAiIjsKKyAgICB9CisKICAgICAvLyBQcml2YXRl CiAKICAgICBfaGVhcEFsbG9jYXRpb25zVGltZWxpbmVSZWNvcmRBZGRlZChldmVudCkKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL01lbW9yeVRp bWVsaW5lVmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L01lbW9yeVRpbWVsaW5lVmlldy5qcwppbmRleCA4YmRmNThkLi4wMTNlYmU0IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9NZW1vcnlUaW1lbGlu ZVZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv TWVtb3J5VGltZWxpbmVWaWV3LmpzCkBAIC0xNTMsNiArMTUzLDggQEAgV2ViSW5zcGVjdG9yLk1l bW9yeVRpbWVsaW5lVmlldyA9IGNsYXNzIE1lbW9yeVRpbWVsaW5lVmlldyBleHRlbmRzIFdlYklu c3BlY3Rvci4KIAogICAgIC8vIFByb3RlY3RlZAogCisgICAgZ2V0IHNob3dzRmlsdGVyQmFyKCkg eyByZXR1cm4gZmFsc2U7IH0KKwogICAgIGxheW91dCgpCiAgICAgewogICAgICAgICAvLyBBbHdh eXMgdXBkYXRlIHRpbWVsaW5lIHJ1bGVyLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2NyaXB0Q2x1c3RlclRpbWVsaW5lVmlldy5qcyBiL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NjcmlwdENsdXN0ZXJUaW1l bGluZVZpZXcuanMKaW5kZXggMTQyM2IxYi4uYjEzODhjYiAxMDA2NDQKLS0tIGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2NyaXB0Q2x1c3RlclRpbWVsaW5lVmll dy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TY3Jp cHRDbHVzdGVyVGltZWxpbmVWaWV3LmpzCkBAIC02Miw2ICs2Miw3IEBAIFdlYkluc3BlY3Rvci5T Y3JpcHRDbHVzdGVyVGltZWxpbmVWaWV3ID0gY2xhc3MgU2NyaXB0Q2x1c3RlclRpbWVsaW5lVmll dyBleHRlbmRzCiAKICAgICAvLyBGSVhNRTogRGV0ZXJtaW5lIGEgYmV0dGVyIHdheSB0byBicmlk Z2UgVGltZWxpbmVWaWV3IG1ldGhvZHMgdG8gdGhlIHN1Yi10aW1lbGluZSB2aWV3cy4KICAgICBn ZXQgc2hvd3NMaXZlUmVjb3JkaW5nRGF0YSgpIHsgcmV0dXJuIHRoaXMuX2NvbnRlbnRWaWV3Q29u dGFpbmVyLmN1cnJlbnRDb250ZW50Vmlldy5zaG93c0xpdmVSZWNvcmRpbmdEYXRhOyB9CisgICAg Z2V0IHNob3dzRmlsdGVyQmFyKCkgeyByZXR1cm4gdGhpcy5fY29udGVudFZpZXdDb250YWluZXIu Y3VycmVudENvbnRlbnRWaWV3LnNob3dzRmlsdGVyQmFyOyB9CiAgICAgZ2V0IHplcm9UaW1lKCkg eyByZXR1cm4gdGhpcy5fY29udGVudFZpZXdDb250YWluZXIuY3VycmVudENvbnRlbnRWaWV3Lnpl cm9UaW1lOyB9CiAgICAgc2V0IHplcm9UaW1lKHgpIHsgdGhpcy5fY29udGVudFZpZXdDb250YWlu ZXIuY3VycmVudENvbnRlbnRWaWV3Lnplcm9UaW1lID0geDsgfQogICAgIGdldCBzdGFydFRpbWUo KSB7IHJldHVybiB0aGlzLl9jb250ZW50Vmlld0NvbnRhaW5lci5jdXJyZW50Q29udGVudFZpZXcu c3RhcnRUaW1lOyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9TY3JpcHRQcm9maWxlVGltZWxpbmVWaWV3LmpzIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2NyaXB0UHJvZmlsZVRpbWVsaW5lVmlldy5qcwpp bmRleCA1ZGExZDQyLi4xNTQwNTEwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9TY3JpcHRQcm9maWxlVGltZWxpbmVWaWV3LmpzCisrKyBiL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NjcmlwdFByb2ZpbGVUaW1l bGluZVZpZXcuanMKQEAgLTY5LDYgKzY5LDkgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdFByb2ZpbGVU aW1lbGluZVZpZXcgPSBjbGFzcyBTY3JpcHRQcm9maWxlVGltZWxpbmVWaWV3IGV4dGVuZHMKIAog ICAgIGdldCBzaG93c0xpdmVSZWNvcmRpbmdEYXRhKCkgeyByZXR1cm4gZmFsc2U7IH0KIAorICAg IC8vIEZJWE1FOiA8aHR0cHM6Ly93ZWJraXQub3JnL2IvMTU3NTgxPiBXZWIgSW5zcGVjdG9yOiBT Y3JpcHQgUHJvZmlsZVZpZXdzIHNob3VsZCBiZSBzZWFyY2hhYmxlCisgICAgZ2V0IHNob3dzRmls dGVyQmFyKCkgeyByZXR1cm4gZmFsc2U7IH0KKwogICAgIC8vIFByb3RlY3RlZAogCiAgICAgY2xv c2VkKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL1RpbWVsaW5lUmVjb3JkaW5nQ29udGVudFZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVJlY29yZGluZ0NvbnRlbnRWaWV3LmpzCmlu ZGV4IDE3MzE2ODcuLmE5MDZkOTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lUmVjb3JkaW5nQ29udGVudFZpZXcuanMKKysrIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVSZWNvcmRp bmdDb250ZW50Vmlldy5qcwpAQCAtMjc1LDYgKzI3NSw3IEBAIFdlYkluc3BlY3Rvci5UaW1lbGlu ZVJlY29yZGluZ0NvbnRlbnRWaWV3ID0gY2xhc3MgVGltZWxpbmVSZWNvcmRpbmdDb250ZW50Vmll dyBlCiAgICAgICAgIHRoaXMuX3RpbWVsaW5lT3ZlcnZpZXcudmlld01vZGUgPSBuZXdWaWV3TW9k ZTsKICAgICAgICAgdGhpcy5fdXBkYXRlVGltZWxpbmVPdmVydmlld0hlaWdodCgpOwogICAgICAg ICB0aGlzLl91cGRhdGVQcm9ncmVzc1ZpZXcoKTsKKyAgICAgICAgdGhpcy5fdXBkYXRlRmlsdGVy QmFyKCk7CiAKICAgICAgICAgaWYgKHRpbWVsaW5lVmlldykgewogICAgICAgICAgICAgdGhpcy5f dXBkYXRlVGltZWxpbmVWaWV3VGltZXModGltZWxpbmVWaWV3KTsKQEAgLTMxNyw2ICszMTgsOCBA QCBXZWJJbnNwZWN0b3IuVGltZWxpbmVSZWNvcmRpbmdDb250ZW50VmlldyA9IGNsYXNzIFRpbWVs aW5lUmVjb3JkaW5nQ29udGVudFZpZXcgZQogICAgICAgICBpZiAoZXZlbnQudGFyZ2V0ICE9PSB0 aGlzLl90aW1lbGluZUNvbnRlbnRCcm93c2VyLmN1cnJlbnRDb250ZW50VmlldykKICAgICAgICAg ICAgIHJldHVybjsKIAorICAgICAgICB0aGlzLl91cGRhdGVGaWx0ZXJCYXIoKTsKKwogICAgICAg ICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuQ29udGVudFZpZXcu RXZlbnQuU2VsZWN0aW9uUGF0aENvbXBvbmVudHNEaWRDaGFuZ2UpOwogCiAgICAgICAgIGlmICh0 aGlzLmN1cnJlbnRUaW1lbGluZVZpZXcgPT09IHRoaXMuX292ZXJ2aWV3VGltZWxpbmVWaWV3KQpA QCAtNzM5LDQgKzc0Miw5IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZVJlY29yZGluZ0NvbnRlbnRW aWV3ID0gY2xhc3MgVGltZWxpbmVSZWNvcmRpbmdDb250ZW50VmlldyBlCiAgICAgICAgIGxldCBp c0NhcHR1cmluZyA9IFdlYkluc3BlY3Rvci50aW1lbGluZU1hbmFnZXIuaXNDYXB0dXJpbmcoKTsK ICAgICAgICAgdGhpcy5fcHJvZ3Jlc3NWaWV3LnZpc2libGUgPSBpc0NhcHR1cmluZyAmJiB0aGlz LmN1cnJlbnRUaW1lbGluZVZpZXcgJiYgIXRoaXMuY3VycmVudFRpbWVsaW5lVmlldy5zaG93c0xp dmVSZWNvcmRpbmdEYXRhOwogICAgIH0KKworICAgIF91cGRhdGVGaWx0ZXJCYXIoKQorICAgIHsK KyAgICAgICAgdGhpcy5fZmlsdGVyQmFyTmF2aWdhdGlvbkl0ZW0uaGlkZGVuID0gIXRoaXMuY3Vy cmVudFRpbWVsaW5lVmlldyB8fCAhdGhpcy5jdXJyZW50VGltZWxpbmVWaWV3LnNob3dzRmlsdGVy QmFyOworICAgIH0KIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9UaW1lbGluZVZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVZpZXcuanMKaW5kZXggZWI0MzkxMy4uNzMwMDA4NiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGlt ZWxpbmVWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL1RpbWVsaW5lVmlldy5qcwpAQCAtNDksNiArNDksMTIgQEAgV2ViSW5zcGVjdG9yLlRpbWVs aW5lVmlldyA9IGNsYXNzIFRpbWVsaW5lVmlldyBleHRlbmRzIFdlYkluc3BlY3Rvci5Db250ZW50 VmlldwogICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICB9CiAKKyAgICBnZXQgc2hvd3NGaWx0ZXJC YXIoKQorICAgIHsKKyAgICAgICAgLy8gSW1wbGVtZW50ZWQgYnkgc3ViLWNsYXNzZXMgaWYgbmVl ZGVkLgorICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICB9CisKICAgICBnZXQgbmF2aWdhdGlvbkl0 ZW1zKCkKICAgICB7CiAgICAgICAgIHJldHVybiB0aGlzLl9zY29wZUJhciA/IFt0aGlzLl9zY29w ZUJhcl0gOiBbXTsK