183015 2018-02-21 13:20:06 -0800 Web Inspector: Canvas tab: ensure that the Recording TreeOutline has a specified height for virtualization 2018-03-07 15:09:07 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 174968 182667 175485 1 hi hi commit-queue inspector-bugzilla-changes mattbaker webkit-bug-importer oldest_to_newest 1401241 0 hi 2018-02-21 13:20:06 -0800 The Recording TreeOutline was added to its own container, but that container's height was never constrained, meaning that it's height is the full height of all the TreeElement children. Since TreeOutline uses `offsetHeight` to determine how many elements to show, the virtualization logic of TreeOutline then proceeds to add everything back to the DOM since it thinks it has room. 1401244 1 334409 hi 2018-02-21 13:25:23 -0800 Created attachment 334409 Patch 1401245 2 webkit-bug-importer 2018-02-21 13:26:13 -0800 <rdar://problem/37758441> 1404442 3 334409 mattbaker 2018-03-07 12:42:04 -0800 Comment on attachment 334409 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=334409&action=review r-, because it looks like this breaks the recording tree outline: 1. Goto https://developer.mozilla.org/en-US/docs/Web/API/Canvas_API/Tutorial/Basic_animations 2. Record frames from "a looping panorama" demo 3. Open recording, expand first frame => No child elements > Source/WebInspectorUI/UserInterface/Views/TreeOutline.js:716 > + if (!isNaN(this._virtualizedPreviousFirstItem) && Math.abs(firstItem - this._virtualizedPreviousFirstItem) < numberVisible) Why is this needed? The bug title/summary gives the impression that the problem is with how TreeOutline is used in the CanvasSidebarPanel, not with TreeOutline itself. Please add a clarifying comment to the change log. 1404450 4 334409 hi 2018-03-07 13:04:12 -0800 Comment on attachment 334409 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=334409&action=review >> Source/WebInspectorUI/UserInterface/Views/TreeOutline.js:716 >> + if (!isNaN(this._virtualizedPreviousFirstItem) && Math.abs(firstItem - this._virtualizedPreviousFirstItem) < numberVisible) > > Why is this needed? The bug title/summary gives the impression that the problem is with how TreeOutline is used in the CanvasSidebarPanel, not with TreeOutline itself. Please add a clarifying comment to the change log. This is what caused the breakage. I was trying to optimize the virtualization functionality, but I see that it needs some tweaking. :P 1404451 5 335208 hi 2018-03-07 13:04:57 -0800 Created attachment 335208 Patch 1404484 6 335208 mattbaker 2018-03-07 14:39:19 -0800 Comment on attachment 335208 Patch r=me 1404497 7 335208 commit-queue 2018-03-07 15:09:05 -0800 Comment on attachment 335208 Patch Clearing flags on attachment: 335208 Committed r229377: <https://trac.webkit.org/changeset/229377> 1404498 8 commit-queue 2018-03-07 15:09:07 -0800 All reviewed patches have been landed. Closing bug. 334409 2018-02-21 13:25:23 -0800 2018-03-07 13:04:56 -0800 Patch bug-183015-20180221132522.patch text/plain 6757 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGQyNWE0OWUwMzkwYzQ2NjkwNTBiMDFiYjAwZmEy NjYyZTcwYjgyZDEuLjM2ZGExMDFhMjUzYWVmYjZmODYzNjcwYmQ3ZGU0NTAwZTBlYWRkMWQgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDE4LTAyLTIxICBEZXZp biBSb3Vzc28gIDx3ZWJraXRAZGV2aW5yb3Vzc28uY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IENhbnZhcyB0YWI6IGVuc3VyZSB0aGF0IHRoZSBSZWNvcmRpbmcgVHJlZU91dGxpbmUgaGFz IGEgc3BlY2lmaWVkIGhlaWdodCBmb3IgdmlydHVhbGl6YXRpb24KKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4MzAxNQorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9DYW52 YXNTaWRlYmFyUGFuZWwuanM6CisgICAgICAgIChXSS5DYW52YXNTaWRlYmFyUGFuZWwpOgorCisg ICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9DYW52YXNTaWRlYmFyUGFuZWwuY3NzOgorICAg ICAgICAoLnNpZGViYXIgPiAucGFuZWwubmF2aWdhdGlvbi5jYW52YXMgPiAuY29udGVudCk6Cisg ICAgICAgICguc2lkZWJhciA+IC5wYW5lbC5uYXZpZ2F0aW9uLmNhbnZhcyA+IC5jb250ZW50ID4g Lm5hdmlnYXRpb24tYmFyKToKKyAgICAgICAgKC5zaWRlYmFyID4gLnBhbmVsLm5hdmlnYXRpb24u Y2FudmFzLmhhcy1yZWNvcmRpbmdzID4gLmNvbnRlbnQgPiAucmVjb3JkaW5nLWNvbnRlbnQpOgor ICAgICAgICAoLnNpZGViYXIgPiAucGFuZWwubmF2aWdhdGlvbi5jYW52YXM6bm90KC5oYXMtcmVj b3JkaW5ncykgPiAuZmlsdGVyLWJhciwpOgorICAgICAgICAoLnNpZGViYXIgPiAucGFuZWwubmF2 aWdhdGlvbi5jYW52YXMgPiAuY29udGVudCA+IC5yZWNvcmRpbmctY29udGVudCA+IC5uYXZpZ2F0 aW9uLWJhcik6IERlbGV0ZWQuCisgICAgICAgICguc2lkZWJhciA+IC5wYW5lbC5uYXZpZ2F0aW9u LmNhbnZhcy5oYXMtcmVjb3JkaW5ncyA+IC5jb250ZW50ID4gLnRyZWUtb3V0bGluZS5jYW52YXMp OiBEZWxldGVkLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9UcmVlT3V0bGluZS5q czoKKyAgICAgICAgKFdJLlRyZWVPdXRsaW5lKToKKyAgICAgICAgKFdJLlRyZWVPdXRsaW5lLnBy b3RvdHlwZS51cGRhdGVWaXJ0dWFsaXplZEVsZW1lbnRzKToKKworICAgICAgICAqIFVzZXJJbnRl cmZhY2UvVmlld3MvVHJlZUVsZW1lbnQuanM6CisgICAgICAgIChXSS5UcmVlRWxlbWVudC5wcm90 b3R5cGUuX2RldGFjaCk6CisKIDIwMTgtMDItMTkgIE1hdHQgQmFrZXIgIDxtYXR0YmFrZXJAYXBw bGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IENhbnZhcyB0YWI6IGhpZGUgbmF2aWdh dGlvbiBzaWRlYmFyIHdoZW4gdmlld2luZyB0aGUgb3ZlcnZpZXcKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NhbnZhc1NpZGViYXJQYW5lbC5j c3MgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9DYW52YXNTaWRl YmFyUGFuZWwuY3NzCmluZGV4IDZkZmNlOTE2Yjk1NGFiYmNmM2UzYzgyMzU1MGFhZDM5YmY2OWIy ZWMuLjNlYTg5N2Y2MmJhNmZkNWY5OThhZDRjZWZhYTE1Y2JmN2Y4NzRhYjggMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NhbnZhc1NpZGViYXJQ YW5lbC5jc3MKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv Q2FudmFzU2lkZWJhclBhbmVsLmNzcwpAQCAtMjQsNyArMjQsMTAgQEAKICAqLwogCiAuc2lkZWJh ciA+IC5wYW5lbC5uYXZpZ2F0aW9uLmNhbnZhcyA+IC5jb250ZW50IHsKKyAgICBkaXNwbGF5OiBm bGV4OworICAgIGZsZXgtZGlyZWN0aW9uOiBjb2x1bW47CiAgICAgdG9wOiB2YXIoLS1uYXZpZ2F0 aW9uLWJhci1oZWlnaHQpOworICAgIG92ZXJmbG93LXk6IGhpZGRlbjsKIH0KIAogLnNpZGViYXIg PiAucGFuZWwubmF2aWdhdGlvbi5jYW52YXMgPiAubmF2aWdhdGlvbi1iYXIgPiAuaXRlbS5yZWNv cmQtc3RhcnQtc3RvcC5kaXNhYmxlZCB7CkBAIC00MCwxNyArNDMsMTYgQEAKICAgICBjb250ZW50 OiB1cmwoLi4vSW1hZ2VzL0NhbnZhczNELnN2Zyk7CiB9CiAKLS5zaWRlYmFyID4gLnBhbmVsLm5h dmlnYXRpb24uY2FudmFzID4gLmNvbnRlbnQgPiAucmVjb3JkaW5nLWNvbnRlbnQgPiAubmF2aWdh dGlvbi1iYXIgeworLnNpZGViYXIgPiAucGFuZWwubmF2aWdhdGlvbi5jYW52YXMgPiAuY29udGVu dCA+IC5uYXZpZ2F0aW9uLWJhciB7CiAgICAgYm9yZGVyLXRvcDogMXB4IHNvbGlkIHZhcigtLWJv cmRlci1jb2xvcik7CiB9CiAKLS5zaWRlYmFyID4gLnBhbmVsLm5hdmlnYXRpb24uY2FudmFzLmhh cy1yZWNvcmRpbmdzID4gLmNvbnRlbnQgPiAudHJlZS1vdXRsaW5lLmNhbnZhcyB7Ci0gICAgbWF4 LWhlaWdodDogNTAlOworLnNpZGViYXIgPiAucGFuZWwubmF2aWdhdGlvbi5jYW52YXMuaGFzLXJl Y29yZGluZ3MgPiAuY29udGVudCA+IC5yZWNvcmRpbmctY29udGVudCB7CiAgICAgb3ZlcmZsb3ct eTogc2Nyb2xsOwogfQogCiAuc2lkZWJhciA+IC5wYW5lbC5uYXZpZ2F0aW9uLmNhbnZhczpub3Qo Lmhhcy1yZWNvcmRpbmdzKSA+IC5maWx0ZXItYmFyLAotLnNpZGViYXIgPiAucGFuZWwubmF2aWdh dGlvbi5jYW52YXM6bm90KC5oYXMtcmVjb3JkaW5ncykgPiAuY29udGVudCA+IC5yZWNvcmRpbmct Y29udGVudCB7Cisuc2lkZWJhciA+IC5wYW5lbC5uYXZpZ2F0aW9uLmNhbnZhczpub3QoLmhhcy1y ZWNvcmRpbmdzKSA+IC5jb250ZW50ID4gOm1hdGNoZXMoLm5hdmlnYXRpb24tYmFyLCAucmVjb3Jk aW5nLWNvbnRlbnQpIHsKICAgICBkaXNwbGF5OiBub25lOwogfQogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9DYW52YXNTaWRlYmFyUGFuZWwu anMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9DYW52YXNTaWRl YmFyUGFuZWwuanMKaW5kZXggZmVkNTc2MzEzYzE2ZTMzYzM5NzdiYWEyMmI3MTMyYzlhNWQ0MGU4 Ny4uNDQwZGQ2ZTgyMmE0OWZkYzk4M2Y1NGFkMGEwODY0MDVhMzlmYzlmNiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ2FudmFzU2lkZWJhclBh bmVsLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0Nh bnZhc1NpZGViYXJQYW5lbC5qcwpAQCAtNDgsMTIgKzQ4LDEyIEBAIFdJLkNhbnZhc1NpZGViYXJQ YW5lbCA9IGNsYXNzIENhbnZhc1NpZGViYXJQYW5lbCBleHRlbmRzIFdJLk5hdmlnYXRpb25TaWRl YmFyUGFuCiAgICAgICAgIHRoaXMuX2NhbnZhc1RyZWVPdXRsaW5lID0gdGhpcy5jcmVhdGVDb250 ZW50VHJlZU91dGxpbmUoc3VwcHJlc3NGaWx0ZXJpbmcpOwogICAgICAgICB0aGlzLl9jYW52YXNU cmVlT3V0bGluZS5lbGVtZW50LmNsYXNzTGlzdC5hZGQoImNhbnZhcyIpOwogCi0gICAgICAgIGxl dCByZWNvcmRpbmdDb250ZW50ID0gdGhpcy5jb250ZW50Vmlldy5lbGVtZW50LmFwcGVuZENoaWxk KGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpKTsKLSAgICAgICAgcmVjb3JkaW5nQ29udGVu dC5jbGFzc05hbWUgPSAicmVjb3JkaW5nLWNvbnRlbnQiOwotCiAgICAgICAgIHRoaXMuX3JlY29y ZGluZ05hdmlnYXRpb25CYXIgPSBuZXcgV0kuTmF2aWdhdGlvbkJhcjsKICAgICAgICAgdGhpcy5f cmVjb3JkaW5nTmF2aWdhdGlvbkJhci5lbGVtZW50LmNsYXNzTGlzdC5hZGQoImhpZGRlbiIpOwot ICAgICAgICByZWNvcmRpbmdDb250ZW50LmFwcGVuZENoaWxkKHRoaXMuX3JlY29yZGluZ05hdmln YXRpb25CYXIuZWxlbWVudCk7CisgICAgICAgIHRoaXMuY29udGVudFZpZXcuYWRkU3Vidmlldyh0 aGlzLl9yZWNvcmRpbmdOYXZpZ2F0aW9uQmFyKTsKKworICAgICAgICBsZXQgcmVjb3JkaW5nQ29u dGVudCA9IHRoaXMuY29udGVudFZpZXcuZWxlbWVudC5hcHBlbmRDaGlsZChkb2N1bWVudC5jcmVh dGVFbGVtZW50KCJkaXYiKSk7CisgICAgICAgIHJlY29yZGluZ0NvbnRlbnQuY2xhc3NOYW1lID0g InJlY29yZGluZy1jb250ZW50IjsKIAogICAgICAgICB0aGlzLl9yZWNvcmRpbmdUcmVlT3V0bGlu ZSA9IHRoaXMuY29udGVudFRyZWVPdXRsaW5lOwogICAgICAgICByZWNvcmRpbmdDb250ZW50LmFw cGVuZENoaWxkKHRoaXMuX3JlY29yZGluZ1RyZWVPdXRsaW5lLmVsZW1lbnQpOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVHJlZUVsZW1lbnQu anMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UcmVlRWxlbWVu dC5qcwppbmRleCAyZWQ4NDQ3YTRjM2Q1MWQ1ZTM2MzY4YzE0NWQzMWE4ZTcwZWUwNzY2Li5kZTll ZTUxZWI0MTc5ZDM5NzQyYTgxMmY2N2I4NjRlMWEzNDNkNTJjIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UcmVlRWxlbWVudC5qcworKysgYi9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UcmVlRWxlbWVudC5qcwpA QCAtMjcxLDYgKzI3MSw5IEBAIFdJLlRyZWVFbGVtZW50ID0gY2xhc3MgVHJlZUVsZW1lbnQgZXh0 ZW5kcyBXSS5PYmplY3QKICAgICAgICAgICAgIHRoaXMuX2xpc3RJdGVtTm9kZS5wYXJlbnROb2Rl LnJlbW92ZUNoaWxkKHRoaXMuX2xpc3RJdGVtTm9kZSk7CiAgICAgICAgIGlmICh0aGlzLl9jaGls ZHJlbkxpc3ROb2RlICYmIHRoaXMuX2NoaWxkcmVuTGlzdE5vZGUucGFyZW50Tm9kZSkKICAgICAg ICAgICAgIHRoaXMuX2NoaWxkcmVuTGlzdE5vZGUucGFyZW50Tm9kZS5yZW1vdmVDaGlsZCh0aGlz Ll9jaGlsZHJlbkxpc3ROb2RlKTsKKworICAgICAgICBpZiAodGhpcy50cmVlT3V0bGluZSkKKyAg ICAgICAgICAgIHRoaXMudHJlZU91dGxpbmUuc29vbi51cGRhdGVWaXJ0dWFsaXplZEVsZW1lbnRz KCk7CiAgICAgfQogCiAgICAgc3RhdGljIHRyZWVFbGVtZW50TW91c2VEb3duKGV2ZW50KQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVHJlZU91 dGxpbmUuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UcmVl T3V0bGluZS5qcwppbmRleCBjYWQ4YWQ4ODVmOWQwNzQ4M2YyNzdiZjVkN2U2ZDNhN2U0NTg1NzEw Li5lNTIyNjc2ZDM3NjlmN2M3MTkwODNmMmM3ZjA3NzBjN2UxZThkZTE3IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UcmVlT3V0bGluZS5qcwor KysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UcmVlT3V0bGlu ZS5qcwpAQCAtNTUsNiArNTUsNyBAQCBXSS5UcmVlT3V0bGluZSA9IGNsYXNzIFRyZWVPdXRsaW5l IGV4dGVuZHMgV0kuT2JqZWN0CiAgICAgICAgIHRoaXMuX2N1c3RvbUluZGVudCA9IGZhbHNlOwog ICAgICAgICB0aGlzLl9zZWxlY3RhYmxlID0gc2VsZWN0YWJsZTsKIAorICAgICAgICB0aGlzLl92 aXJ0dWFsaXplZFByZXZpb3VzRmlyc3RJdGVtID0gTmFOOwogICAgICAgICB0aGlzLl92aXJ0dWFs aXplZFNjcm9sbENvbnRhaW5lciA9IG51bGw7CiAgICAgICAgIHRoaXMuX3ZpcnR1YWxpemVkVHJl ZUl0ZW1IZWlnaHQgPSBOYU47CiAgICAgICAgIHRoaXMuX3ZpcnR1YWxpemVkVG9wU3BhY2VyID0g bnVsbDsKQEAgLTcxMiw2ICs3MTMsOSBAQCBXSS5UcmVlT3V0bGluZSA9IGNsYXNzIFRyZWVPdXRs aW5lIGV4dGVuZHMgV0kuT2JqZWN0CiAgICAgICAgICAgICBzaG91bGRTY3JvbGwgPSBpbmRleCA8 IGZpcnN0SXRlbSB8fCBpbmRleCA+IGxhc3RJdGVtOwogICAgICAgICB9CiAKKyAgICAgICAgaWYg KCFpc05hTih0aGlzLl92aXJ0dWFsaXplZFByZXZpb3VzRmlyc3RJdGVtKSAmJiBNYXRoLmFicyhm aXJzdEl0ZW0gLSB0aGlzLl92aXJ0dWFsaXplZFByZXZpb3VzRmlyc3RJdGVtKSA8IG51bWJlclZp c2libGUpCisgICAgICAgICAgICByZXR1cm47CisKICAgICAgICAgbGV0IHRvdGFsSXRlbXMgPSB3 YWxrKHRoaXMsICh7cGFyZW50LCB0cmVlRWxlbWVudCwgY291bnR9KSA9PiB7CiAgICAgICAgICAg ICBpZiAoY291bnQgPj0gZmlyc3RJdGVtICYmIGNvdW50IDw9IGxhc3RJdGVtKSB7CiAgICAgICAg ICAgICAgICAgcGFyZW50Ll9jaGlsZHJlbkxpc3ROb2RlLmFwcGVuZENoaWxkKHRyZWVFbGVtZW50 LmVsZW1lbnQpOwpAQCAtNzMxLDYgKzczNSw4IEBAIFdJLlRyZWVPdXRsaW5lID0gY2xhc3MgVHJl ZU91dGxpbmUgZXh0ZW5kcyBXSS5PYmplY3QKIAogICAgICAgICBpZiAoc2hvdWxkU2Nyb2xsKQog ICAgICAgICAgICAgdGhpcy5fdmlydHVhbGl6ZWRTY3JvbGxDb250YWluZXIuc2Nyb2xsVG9wID0g KGZpcnN0SXRlbSArIGV4dHJhUm93cykgKiB0aGlzLl92aXJ0dWFsaXplZFRyZWVJdGVtSGVpZ2h0 OworCisgICAgICAgIHRoaXMuX3ZpcnR1YWxpemVkUHJldmlvdXNGaXJzdEl0ZW0gPSBmaXJzdEl0 ZW07CiAgICAgfQogCiAgICAgLy8gUHJvdGVjdGVkCg== 335208 2018-03-07 13:04:57 -0800 2018-03-07 15:09:05 -0800 Patch bug-183015-20180307130452.patch text/plain 5114 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDIwZTJjYzU0MTFiNWIxNzYxZDQxMThjMmQxYmUw NzFmY2Y5M2Y3NTcuLmVjNmJiZTUwYTYwZGUxOGNmZWNkZTMwZTQ4MGUwM2EzZTU5ZTFkYTUgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDE4LTAzLTA3ICBEZXZp biBSb3Vzc28gIDx3ZWJraXRAZGV2aW5yb3Vzc28uY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IENhbnZhcyB0YWI6IGVuc3VyZSB0aGF0IHRoZSBSZWNvcmRpbmcgVHJlZU91dGxpbmUgaGFz IGEgc3BlY2lmaWVkIGhlaWdodCBmb3IgdmlydHVhbGl6YXRpb24KKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4MzAxNQorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9DYW52 YXNTaWRlYmFyUGFuZWwuanM6CisgICAgICAgIChXSS5DYW52YXNTaWRlYmFyUGFuZWwpOgorCisg ICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9DYW52YXNTaWRlYmFyUGFuZWwuY3NzOgorICAg ICAgICAoLnNpZGViYXIgPiAucGFuZWwubmF2aWdhdGlvbi5jYW52YXMgPiAuY29udGVudCk6Cisg ICAgICAgICguc2lkZWJhciA+IC5wYW5lbC5uYXZpZ2F0aW9uLmNhbnZhcyA+IC5jb250ZW50ID4g Lm5hdmlnYXRpb24tYmFyKToKKyAgICAgICAgKC5zaWRlYmFyID4gLnBhbmVsLm5hdmlnYXRpb24u Y2FudmFzLmhhcy1yZWNvcmRpbmdzID4gLmNvbnRlbnQgPiAucmVjb3JkaW5nLWNvbnRlbnQpOgor ICAgICAgICAoLnNpZGViYXIgPiAucGFuZWwubmF2aWdhdGlvbi5jYW52YXM6bm90KC5oYXMtcmVj b3JkaW5ncykgPiAuZmlsdGVyLWJhciwpOgorICAgICAgICAoLnNpZGViYXIgPiAucGFuZWwubmF2 aWdhdGlvbi5jYW52YXMgPiAuY29udGVudCA+IC5yZWNvcmRpbmctY29udGVudCA+IC5uYXZpZ2F0 aW9uLWJhcik6IERlbGV0ZWQuCisgICAgICAgICguc2lkZWJhciA+IC5wYW5lbC5uYXZpZ2F0aW9u LmNhbnZhcy5oYXMtcmVjb3JkaW5ncyA+IC5jb250ZW50ID4gLnRyZWUtb3V0bGluZS5jYW52YXMp OiBEZWxldGVkLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9UcmVlRWxlbWVudC5q czoKKyAgICAgICAgKFdJLlRyZWVFbGVtZW50LnByb3RvdHlwZS5fZGV0YWNoKToKKwogMjAxOC0w Mi0yNiAgRGV2aW4gUm91c3NvICA8d2Via2l0QGRldmlucm91c3NvLmNvbT4KIAogICAgICAgICBX ZWIgSW5zcGVjdG9yOiBDYW52YXMgVGFiOiBTY3JvbGwgaW50byB2aWV3IC8gSW5zcGVjdCBlbGVt ZW50IGlmIENhbnZhcyBoYXMgRE9NIG5vZGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NhbnZhc1NpZGViYXJQYW5lbC5jc3MgYi9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9DYW52YXNTaWRlYmFyUGFuZWwuY3Nz CmluZGV4IDZkZmNlOTE2Yjk1NGFiYmNmM2UzYzgyMzU1MGFhZDM5YmY2OWIyZWMuLjNlYTg5N2Y2 MmJhNmZkNWY5OThhZDRjZWZhYTE1Y2JmN2Y4NzRhYjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NhbnZhc1NpZGViYXJQYW5lbC5jc3MKKysr IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ2FudmFzU2lkZWJh clBhbmVsLmNzcwpAQCAtMjQsNyArMjQsMTAgQEAKICAqLwogCiAuc2lkZWJhciA+IC5wYW5lbC5u YXZpZ2F0aW9uLmNhbnZhcyA+IC5jb250ZW50IHsKKyAgICBkaXNwbGF5OiBmbGV4OworICAgIGZs ZXgtZGlyZWN0aW9uOiBjb2x1bW47CiAgICAgdG9wOiB2YXIoLS1uYXZpZ2F0aW9uLWJhci1oZWln aHQpOworICAgIG92ZXJmbG93LXk6IGhpZGRlbjsKIH0KIAogLnNpZGViYXIgPiAucGFuZWwubmF2 aWdhdGlvbi5jYW52YXMgPiAubmF2aWdhdGlvbi1iYXIgPiAuaXRlbS5yZWNvcmQtc3RhcnQtc3Rv cC5kaXNhYmxlZCB7CkBAIC00MCwxNyArNDMsMTYgQEAKICAgICBjb250ZW50OiB1cmwoLi4vSW1h Z2VzL0NhbnZhczNELnN2Zyk7CiB9CiAKLS5zaWRlYmFyID4gLnBhbmVsLm5hdmlnYXRpb24uY2Fu dmFzID4gLmNvbnRlbnQgPiAucmVjb3JkaW5nLWNvbnRlbnQgPiAubmF2aWdhdGlvbi1iYXIgewor LnNpZGViYXIgPiAucGFuZWwubmF2aWdhdGlvbi5jYW52YXMgPiAuY29udGVudCA+IC5uYXZpZ2F0 aW9uLWJhciB7CiAgICAgYm9yZGVyLXRvcDogMXB4IHNvbGlkIHZhcigtLWJvcmRlci1jb2xvcik7 CiB9CiAKLS5zaWRlYmFyID4gLnBhbmVsLm5hdmlnYXRpb24uY2FudmFzLmhhcy1yZWNvcmRpbmdz ID4gLmNvbnRlbnQgPiAudHJlZS1vdXRsaW5lLmNhbnZhcyB7Ci0gICAgbWF4LWhlaWdodDogNTAl OworLnNpZGViYXIgPiAucGFuZWwubmF2aWdhdGlvbi5jYW52YXMuaGFzLXJlY29yZGluZ3MgPiAu Y29udGVudCA+IC5yZWNvcmRpbmctY29udGVudCB7CiAgICAgb3ZlcmZsb3cteTogc2Nyb2xsOwog fQogCiAuc2lkZWJhciA+IC5wYW5lbC5uYXZpZ2F0aW9uLmNhbnZhczpub3QoLmhhcy1yZWNvcmRp bmdzKSA+IC5maWx0ZXItYmFyLAotLnNpZGViYXIgPiAucGFuZWwubmF2aWdhdGlvbi5jYW52YXM6 bm90KC5oYXMtcmVjb3JkaW5ncykgPiAuY29udGVudCA+IC5yZWNvcmRpbmctY29udGVudCB7Cisu c2lkZWJhciA+IC5wYW5lbC5uYXZpZ2F0aW9uLmNhbnZhczpub3QoLmhhcy1yZWNvcmRpbmdzKSA+ IC5jb250ZW50ID4gOm1hdGNoZXMoLm5hdmlnYXRpb24tYmFyLCAucmVjb3JkaW5nLWNvbnRlbnQp IHsKICAgICBkaXNwbGF5OiBub25lOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9DYW52YXNTaWRlYmFyUGFuZWwuanMgYi9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9DYW52YXNTaWRlYmFyUGFuZWwuanMK aW5kZXggZmVkNTc2MzEzYzE2ZTMzYzM5NzdiYWEyMmI3MTMyYzlhNWQ0MGU4Ny4uNDQwZGQ2ZTgy MmE0OWZkYzk4M2Y1NGFkMGEwODY0MDVhMzlmYzlmNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ2FudmFzU2lkZWJhclBhbmVsLmpzCisrKyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NhbnZhc1NpZGViYXJQ YW5lbC5qcwpAQCAtNDgsMTIgKzQ4LDEyIEBAIFdJLkNhbnZhc1NpZGViYXJQYW5lbCA9IGNsYXNz IENhbnZhc1NpZGViYXJQYW5lbCBleHRlbmRzIFdJLk5hdmlnYXRpb25TaWRlYmFyUGFuCiAgICAg ICAgIHRoaXMuX2NhbnZhc1RyZWVPdXRsaW5lID0gdGhpcy5jcmVhdGVDb250ZW50VHJlZU91dGxp bmUoc3VwcHJlc3NGaWx0ZXJpbmcpOwogICAgICAgICB0aGlzLl9jYW52YXNUcmVlT3V0bGluZS5l bGVtZW50LmNsYXNzTGlzdC5hZGQoImNhbnZhcyIpOwogCi0gICAgICAgIGxldCByZWNvcmRpbmdD b250ZW50ID0gdGhpcy5jb250ZW50Vmlldy5lbGVtZW50LmFwcGVuZENoaWxkKGRvY3VtZW50LmNy ZWF0ZUVsZW1lbnQoImRpdiIpKTsKLSAgICAgICAgcmVjb3JkaW5nQ29udGVudC5jbGFzc05hbWUg PSAicmVjb3JkaW5nLWNvbnRlbnQiOwotCiAgICAgICAgIHRoaXMuX3JlY29yZGluZ05hdmlnYXRp b25CYXIgPSBuZXcgV0kuTmF2aWdhdGlvbkJhcjsKICAgICAgICAgdGhpcy5fcmVjb3JkaW5nTmF2 aWdhdGlvbkJhci5lbGVtZW50LmNsYXNzTGlzdC5hZGQoImhpZGRlbiIpOwotICAgICAgICByZWNv cmRpbmdDb250ZW50LmFwcGVuZENoaWxkKHRoaXMuX3JlY29yZGluZ05hdmlnYXRpb25CYXIuZWxl bWVudCk7CisgICAgICAgIHRoaXMuY29udGVudFZpZXcuYWRkU3Vidmlldyh0aGlzLl9yZWNvcmRp bmdOYXZpZ2F0aW9uQmFyKTsKKworICAgICAgICBsZXQgcmVjb3JkaW5nQ29udGVudCA9IHRoaXMu Y29udGVudFZpZXcuZWxlbWVudC5hcHBlbmRDaGlsZChkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJk aXYiKSk7CisgICAgICAgIHJlY29yZGluZ0NvbnRlbnQuY2xhc3NOYW1lID0gInJlY29yZGluZy1j b250ZW50IjsKIAogICAgICAgICB0aGlzLl9yZWNvcmRpbmdUcmVlT3V0bGluZSA9IHRoaXMuY29u dGVudFRyZWVPdXRsaW5lOwogICAgICAgICByZWNvcmRpbmdDb250ZW50LmFwcGVuZENoaWxkKHRo aXMuX3JlY29yZGluZ1RyZWVPdXRsaW5lLmVsZW1lbnQpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVHJlZUVsZW1lbnQuanMgYi9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UcmVlRWxlbWVudC5qcwppbmRleCAy ZWQ4NDQ3YTRjM2Q1MWQ1ZTM2MzY4YzE0NWQzMWE4ZTcwZWUwNzY2Li5kZTllZTUxZWI0MTc5ZDM5 NzQyYTgxMmY2N2I4NjRlMWEzNDNkNTJjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9UcmVlRWxlbWVudC5qcworKysgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UcmVlRWxlbWVudC5qcwpAQCAtMjcxLDYgKzI3 MSw5IEBAIFdJLlRyZWVFbGVtZW50ID0gY2xhc3MgVHJlZUVsZW1lbnQgZXh0ZW5kcyBXSS5PYmpl Y3QKICAgICAgICAgICAgIHRoaXMuX2xpc3RJdGVtTm9kZS5wYXJlbnROb2RlLnJlbW92ZUNoaWxk KHRoaXMuX2xpc3RJdGVtTm9kZSk7CiAgICAgICAgIGlmICh0aGlzLl9jaGlsZHJlbkxpc3ROb2Rl ICYmIHRoaXMuX2NoaWxkcmVuTGlzdE5vZGUucGFyZW50Tm9kZSkKICAgICAgICAgICAgIHRoaXMu X2NoaWxkcmVuTGlzdE5vZGUucGFyZW50Tm9kZS5yZW1vdmVDaGlsZCh0aGlzLl9jaGlsZHJlbkxp c3ROb2RlKTsKKworICAgICAgICBpZiAodGhpcy50cmVlT3V0bGluZSkKKyAgICAgICAgICAgIHRo aXMudHJlZU91dGxpbmUuc29vbi51cGRhdGVWaXJ0dWFsaXplZEVsZW1lbnRzKCk7CiAgICAgfQog CiAgICAgc3RhdGljIHRyZWVFbGVtZW50TW91c2VEb3duKGV2ZW50KQo=