178222 2017-10-12 12:03:05 -0700 Web Inspector: Layers tab mistakenly throws out the root element's layer. 2017-10-16 13:28:17 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 174176 1 ross.kirsling webkit-unassigned bburg commit-queue don.olmstead inspector-bugzilla-changes webkit-bug-importer oldest_to_newest 1359660 0 ross.kirsling 2017-10-12 12:03:05 -0700 Whoops, the Layers tab is currently always throwing out the layer for the root element. (This means any worries about "no layers available" UX are moot...) This should be fixed in LayerTreeManager#layersForNode, as the API is currently overtailored to the legacy sidebar. 1359662 1 323542 ross.kirsling 2017-10-12 12:07:32 -0700 Created attachment 323542 Patch 1359701 2 323542 bburg 2017-10-12 13:28:46 -0700 Comment on attachment 323542 Patch Can you write a test for the manager level change? 1359756 3 ross.kirsling 2017-10-12 14:54:09 -0700 It looks like there are protocol tests for LayerTree (which are not affected by this change) but no inspector tests for the manager. I'm really just trying to make the manager method a simple passthrough for the agent method -- do you know of an existing example where both get tested? 1359769 4 bburg 2017-10-12 15:15:21 -0700 (In reply to Ross Kirsling from comment #3) > It looks like there are protocol tests for LayerTree (which are not affected > by this change) but no inspector tests for the manager. I'm really just > trying to make the manager method a simple passthrough for the agent method > -- do you know of an existing example where both get tested? Tests in LayoutTests/inspector/layers/ are protocol tests, so they don't use the manager. That said, all you need to do is borrow the same test content from those tests and dump out the layers for root node. Sorry to force you into writing tests, but we have to start somewhere. Fortunately there is test content you can already use. 1359903 5 323627 ross.kirsling 2017-10-12 20:52:41 -0700 Created attachment 323627 Patch 1360907 6 323627 bburg 2017-10-16 12:57:11 -0700 Comment on attachment 323627 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=323627&action=review r=me > Source/WebInspectorUI/UserInterface/Views/LayerTreeDetailsSidebarPanel.js:83 > + let layerForNode = layers[0] && layers[0].nodeId === this.domNode.id && !layers[0].isGeneratedContent ? layers[0] : null; This is kind of complicated for one line, but that's okay I guess. 1360919 7 323627 commit-queue 2017-10-16 13:25:33 -0700 Comment on attachment 323627 Patch Clearing flags on attachment: 323627 Committed r223428: <https://trac.webkit.org/changeset/223428> 1360920 8 commit-queue 2017-10-16 13:25:35 -0700 All reviewed patches have been landed. Closing bug. 1360923 9 webkit-bug-importer 2017-10-16 13:28:17 -0700 <rdar://problem/35013279> 323542 2017-10-12 12:07:32 -0700 2017-10-12 20:52:39 -0700 Patch bug-178222-20171012120730.patch text/plain 4393 ross.kirsling U3VidmVyc2lvbiBSZXZpc2lvbjogMjIzMjA5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCA0 MDZjMDhkNTU3ZTBiMWI3ZWUzYWU2MGNkNDI4YTMwNmZiMmQ2OGNjLi5hYTljZmM1MWY1ZWNmZTU2 NzRmMmNjMzk3YjY2MGIyY2UxODQyMmNkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMiBAQAorMjAxNy0xMC0xMiAgUm9zcyBLaXJzbGluZyAgPHJvc3Mua2lyc2xpbmdAc29u eS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogTGF5ZXJzIHRhYiBtaXN0YWtlbmx5IHRo cm93cyBvdXQgdGhlIHJvb3QgZWxlbWVudCdzIGxheWVyLgorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc4MjIyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0xh eWVyVHJlZU1hbmFnZXIuanM6CisgICAgICAgIChXSS5MYXllclRyZWVNYW5hZ2VyLnByb3RvdHlw ZS5sYXllcnNGb3JOb2RlKToKKyAgICAgICAgRml4IHRoZSBpc3N1ZSBhdCB0aGUgbWFuYWdlciBs ZXZlbC4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvTGF5ZXJzM0RDb250ZW50Vmll dy5qczoKKyAgICAgICAgKFdJLkxheWVyczNEQ29udGVudFZpZXcucHJvdG90eXBlLmxheW91dCk6 CisgICAgICAgIFVwZGF0ZSBuZXcgc2lkZWJhciBiYXNlZCBvbiBzaW1wbGlmaWVkIG1hbmFnZXIg QVBJLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9MYXllclRyZWVEZXRhaWxzU2lk ZWJhclBhbmVsLmpzOgorICAgICAgICAoV0kuTGF5ZXJUcmVlRGV0YWlsc1NpZGViYXJQYW5lbC5w cm90b3R5cGUubGF5b3V0KToKKyAgICAgICAgTW92ZSBvdmVydGFpbG9yZWQgY29kZSBmcm9tIG1h bmFnZXIgdG8gbGVnYWN5IHNpZGViYXIuCisKIDIwMTctMTAtMTEgIFJvc3MgS2lyc2xpbmcgIDxy b3NzLmtpcnNsaW5nQHNvbnkuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IE1ha2UgM0Qg b2JqZWN0cyBzZWxlY3RhYmxlIGluIExheWVycyB2aXN1YWxpemF0aW9uCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9MYXllclRyZWVN YW5hZ2VyLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxl cnMvTGF5ZXJUcmVlTWFuYWdlci5qcwppbmRleCAxNGMwZjMwYWQ4YzRkZWJkODRlYzU1YTNmODQz NmVmY2I2YzQ5ZTQ3Li40MjY4MDhhNTU2N2U0ZGFiNmJmNWQxYzNlODAzYWQ4ODk3MjEwYzc3IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVy cy9MYXllclRyZWVNYW5hZ2VyLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL0NvbnRyb2xsZXJzL0xheWVyVHJlZU1hbmFnZXIuanMKQEAgLTEyMiwxNyArMTIyLDEz IEBAIFdJLkxheWVyVHJlZU1hbmFnZXIgPSBjbGFzcyBMYXllclRyZWVNYW5hZ2VyIGV4dGVuZHMg V0kuT2JqZWN0CiAgICAgewogICAgICAgICBjb25zb2xlLmFzc2VydCh0aGlzLnN1cHBvcnRlZCk7 CiAKLSAgICAgICAgTGF5ZXJUcmVlQWdlbnQubGF5ZXJzRm9yTm9kZShub2RlLmlkLCBmdW5jdGlv bihlcnJvciwgbGF5ZXJzKSB7Ci0gICAgICAgICAgICBpZiAoZXJyb3IgfHwgaXNFbXB0eU9iamVj dChsYXllcnMpKSB7Ci0gICAgICAgICAgICAgICAgY2FsbGJhY2sobnVsbCwgW10pOworICAgICAg ICBMYXllclRyZWVBZ2VudC5sYXllcnNGb3JOb2RlKG5vZGUuaWQsIChlcnJvciwgbGF5ZXJzKSA9 PiB7CisgICAgICAgICAgICBpZiAoZXJyb3IpIHsKKyAgICAgICAgICAgICAgICBjYWxsYmFjayhb XSk7CiAgICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICAgICAgfQogCi0gICAgICAgICAg ICBsYXllcnMgPSBsYXllcnMubWFwKFdJLkxheWVyLmZyb21QYXlsb2FkKTsKLQotICAgICAgICAg ICAgdmFyIGZpcnN0TGF5ZXIgPSBsYXllcnNbMF07Ci0gICAgICAgICAgICB2YXIgbGF5ZXJGb3JO b2RlID0gZmlyc3RMYXllci5ub2RlSWQgPT09IG5vZGUuaWQgJiYgIWZpcnN0TGF5ZXIuaXNHZW5l cmF0ZWRDb250ZW50ID8gbGF5ZXJzLnNoaWZ0KCkgOiBudWxsOwotICAgICAgICAgICAgY2FsbGJh Y2sobGF5ZXJGb3JOb2RlLCBsYXllcnMpOworICAgICAgICAgICAgY2FsbGJhY2sobGF5ZXJzLm1h cChXSS5MYXllci5mcm9tUGF5bG9hZCkpOwogICAgICAgICB9KTsKICAgICB9CiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xheWVyVHJlZURl dGFpbHNTaWRlYmFyUGFuZWwuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9MYXllclRyZWVEZXRhaWxzU2lkZWJhclBhbmVsLmpzCmluZGV4IGUwNDFmZDQwNWZh Y2U1MDY1NzIyYmNhNjgxNzc1NmE5ZjQxY2NiMTcuLjMxNTY3NTA5ODMyNjBkNDAyNjFhN2IyZDM4 YWEwOWRmZDM5NTA3YzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL0xheWVyVHJlZURldGFpbHNTaWRlYmFyUGFuZWwuanMKKysrIGIvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTGF5ZXJUcmVlRGV0YWlsc1NpZGVi YXJQYW5lbC5qcwpAQCAtNzksNyArNzksOSBAQCBXSS5MYXllclRyZWVEZXRhaWxzU2lkZWJhclBh bmVsID0gY2xhc3MgTGF5ZXJUcmVlRGV0YWlsc1NpZGViYXJQYW5lbCBleHRlbmRzIFdJLgogICAg ICAgICBpZiAoIXRoaXMuZG9tTm9kZSkKICAgICAgICAgICAgIHJldHVybjsKIAotICAgICAgICBX SS5sYXllclRyZWVNYW5hZ2VyLmxheWVyc0Zvck5vZGUodGhpcy5kb21Ob2RlLCAobGF5ZXJGb3JO b2RlLCBjaGlsZExheWVycykgPT4geworICAgICAgICBXSS5sYXllclRyZWVNYW5hZ2VyLmxheWVy c0Zvck5vZGUodGhpcy5kb21Ob2RlLCAobGF5ZXJzKSA9PiB7CisgICAgICAgICAgICBsZXQgbGF5 ZXJGb3JOb2RlID0gbGF5ZXJzWzBdICYmIGxheWVyc1swXS5ub2RlSWQgPT09IHRoaXMuZG9tTm9k ZS5pZCAmJiAhbGF5ZXJzWzBdLmlzR2VuZXJhdGVkQ29udGVudCA/IGxheWVyc1swXSA6IG51bGw7 CisgICAgICAgICAgICBsZXQgY2hpbGRMYXllcnMgPSBsYXllcnMuc2xpY2UobGF5ZXJGb3JOb2Rl ID8gMSA6IDApOwogICAgICAgICAgICAgdGhpcy5fdW5maWx0ZXJlZENoaWxkTGF5ZXJzID0gY2hp bGRMYXllcnM7CiAgICAgICAgICAgICB0aGlzLl91cGRhdGVEaXNwbGF5V2l0aExheWVycyhsYXll ckZvck5vZGUsIGNoaWxkTGF5ZXJzKTsKICAgICAgICAgfSk7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9MYXllcnMzRENvbnRlbnRWaWV3Lmpz IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTGF5ZXJzM0RDb250 ZW50Vmlldy5qcwppbmRleCBiMTNhZWJkNDRkMmFkMWMzNWM4NzFmYzAzYjE3MmI5MWU0MjgxZWRk Li5jZDk0OWE4MDMxN2JjOTcwNDQ2ZDI4MjM3MjVhMWRiMmVhZmIyYzQ4IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9MYXllcnMzRENvbnRlbnRW aWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xh eWVyczNEQ29udGVudFZpZXcuanMKQEAgLTEyNyw4ICsxMjcsOCBAQCBXSS5MYXllcnMzRENvbnRl bnRWaWV3ID0gY2xhc3MgTGF5ZXJzM0RDb250ZW50VmlldyBleHRlbmRzIFdJLkNvbnRlbnRWaWV3 CiAgICAgICAgICAgICByZXR1cm47CiAKICAgICAgICAgV0kuZG9tVHJlZU1hbmFnZXIucmVxdWVz dERvY3VtZW50KChub2RlKSA9PiB7Ci0gICAgICAgICAgICBXSS5sYXllclRyZWVNYW5hZ2VyLmxh eWVyc0Zvck5vZGUobm9kZSwgKGxheWVyRm9yTm9kZSwgY2hpbGRMYXllcnMpID0+IHsKLSAgICAg ICAgICAgICAgICB0aGlzLl91cGRhdGVMYXllcnMoY2hpbGRMYXllcnMpOworICAgICAgICAgICAg V0kubGF5ZXJUcmVlTWFuYWdlci5sYXllcnNGb3JOb2RlKG5vZGUsIChsYXllcnMpID0+IHsKKyAg ICAgICAgICAgICAgICB0aGlzLl91cGRhdGVMYXllcnMobGF5ZXJzKTsKICAgICAgICAgICAgICAg ICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXSS5Db250ZW50Vmlldy5FdmVudC5TZWxl Y3Rpb25QYXRoQ29tcG9uZW50c0RpZENoYW5nZSk7CiAgICAgICAgICAgICB9KTsKICAgICAgICAg fSk7Cg== 323627 2017-10-12 20:52:41 -0700 2017-10-16 13:25:33 -0700 Patch bug-178222-20171012205240.patch text/plain 10469 ross.kirsling U3VidmVyc2lvbiBSZXZpc2lvbjogMjIzMjA5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCA0 MDZjMDhkNTU3ZTBiMWI3ZWUzYWU2MGNkNDI4YTMwNmZiMmQ2OGNjLi5hYTljZmM1MWY1ZWNmZTU2 NzRmMmNjMzk3YjY2MGIyY2UxODQyMmNkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMiBAQAorMjAxNy0xMC0xMiAgUm9zcyBLaXJzbGluZyAgPHJvc3Mua2lyc2xpbmdAc29u eS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogTGF5ZXJzIHRhYiBtaXN0YWtlbmx5IHRo cm93cyBvdXQgdGhlIHJvb3QgZWxlbWVudCdzIGxheWVyLgorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc4MjIyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0xh eWVyVHJlZU1hbmFnZXIuanM6CisgICAgICAgIChXSS5MYXllclRyZWVNYW5hZ2VyLnByb3RvdHlw ZS5sYXllcnNGb3JOb2RlKToKKyAgICAgICAgRml4IHRoZSBpc3N1ZSBhdCB0aGUgbWFuYWdlciBs ZXZlbC4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvTGF5ZXJzM0RDb250ZW50Vmll dy5qczoKKyAgICAgICAgKFdJLkxheWVyczNEQ29udGVudFZpZXcucHJvdG90eXBlLmxheW91dCk6 CisgICAgICAgIFVwZGF0ZSBuZXcgc2lkZWJhciBiYXNlZCBvbiBzaW1wbGlmaWVkIG1hbmFnZXIg QVBJLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9MYXllclRyZWVEZXRhaWxzU2lk ZWJhclBhbmVsLmpzOgorICAgICAgICAoV0kuTGF5ZXJUcmVlRGV0YWlsc1NpZGViYXJQYW5lbC5w cm90b3R5cGUubGF5b3V0KToKKyAgICAgICAgTW92ZSBvdmVydGFpbG9yZWQgY29kZSBmcm9tIG1h bmFnZXIgdG8gbGVnYWN5IHNpZGViYXIuCisKIDIwMTctMTAtMTEgIFJvc3MgS2lyc2xpbmcgIDxy b3NzLmtpcnNsaW5nQHNvbnkuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IE1ha2UgM0Qg b2JqZWN0cyBzZWxlY3RhYmxlIGluIExheWVycyB2aXN1YWxpemF0aW9uCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9MYXllclRyZWVN YW5hZ2VyLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxl cnMvTGF5ZXJUcmVlTWFuYWdlci5qcwppbmRleCAxNGMwZjMwYWQ4YzRkZWJkODRlYzU1YTNmODQz NmVmY2I2YzQ5ZTQ3Li5kZWJhZTkxYWY2ZDY1ZmI1NGRlNjdkNTQyYWJiZDNmY2I5ZDAzNzBhIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVy cy9MYXllclRyZWVNYW5hZ2VyLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL0NvbnRyb2xsZXJzL0xheWVyVHJlZU1hbmFnZXIuanMKQEAgLTEyMiwxNyArMTIyLDgg QEAgV0kuTGF5ZXJUcmVlTWFuYWdlciA9IGNsYXNzIExheWVyVHJlZU1hbmFnZXIgZXh0ZW5kcyBX SS5PYmplY3QKICAgICB7CiAgICAgICAgIGNvbnNvbGUuYXNzZXJ0KHRoaXMuc3VwcG9ydGVkKTsK IAotICAgICAgICBMYXllclRyZWVBZ2VudC5sYXllcnNGb3JOb2RlKG5vZGUuaWQsIGZ1bmN0aW9u KGVycm9yLCBsYXllcnMpIHsKLSAgICAgICAgICAgIGlmIChlcnJvciB8fCBpc0VtcHR5T2JqZWN0 KGxheWVycykpIHsKLSAgICAgICAgICAgICAgICBjYWxsYmFjayhudWxsLCBbXSk7Ci0gICAgICAg ICAgICAgICAgcmV0dXJuOwotICAgICAgICAgICAgfQotCi0gICAgICAgICAgICBsYXllcnMgPSBs YXllcnMubWFwKFdJLkxheWVyLmZyb21QYXlsb2FkKTsKLQotICAgICAgICAgICAgdmFyIGZpcnN0 TGF5ZXIgPSBsYXllcnNbMF07Ci0gICAgICAgICAgICB2YXIgbGF5ZXJGb3JOb2RlID0gZmlyc3RM YXllci5ub2RlSWQgPT09IG5vZGUuaWQgJiYgIWZpcnN0TGF5ZXIuaXNHZW5lcmF0ZWRDb250ZW50 ID8gbGF5ZXJzLnNoaWZ0KCkgOiBudWxsOwotICAgICAgICAgICAgY2FsbGJhY2sobGF5ZXJGb3JO b2RlLCBsYXllcnMpOworICAgICAgICBMYXllclRyZWVBZ2VudC5sYXllcnNGb3JOb2RlKG5vZGUu aWQsIChlcnJvciwgbGF5ZXJzKSA9PiB7CisgICAgICAgICAgICBjYWxsYmFjayhlcnJvciA/IFtd IDogbGF5ZXJzLm1hcChXSS5MYXllci5mcm9tUGF5bG9hZCkpOwogICAgICAgICB9KTsKICAgICB9 CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Rlc3Qu aHRtbCBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Rlc3QuaHRtbAppbmRl eCBkZWE3MzFhNWY0ZmFhMjhhOTk1YmJlYmE1YmYxYTY2M2Q0MGU1MDZhLi5iY2JlZjM4MTZkYjk1 NWVkODkwM2E4YjJhOTA5MWE1MTc3ODBiNTAzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9UZXN0Lmh0bWwKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVGVzdC5odG1sCkBAIC04MCw2ICs4MCw3IEBACiAgICAgPHNjcmlwdCBz cmM9IlByb3RvY29sL0RPTVN0b3JhZ2VPYnNlcnZlci5qcyI+PC9zY3JpcHQ+CiAgICAgPHNjcmlw dCBzcmM9IlByb3RvY29sL0RlYnVnZ2VyT2JzZXJ2ZXIuanMiPjwvc2NyaXB0PgogICAgIDxzY3Jp cHQgc3JjPSJQcm90b2NvbC9IZWFwT2JzZXJ2ZXIuanMiPjwvc2NyaXB0PgorICAgIDxzY3JpcHQg c3JjPSJQcm90b2NvbC9MYXllclRyZWVPYnNlcnZlci5qcyI+PC9zY3JpcHQ+CiAgICAgPHNjcmlw dCBzcmM9IlByb3RvY29sL01lbW9yeU9ic2VydmVyLmpzIj48L3NjcmlwdD4KICAgICA8c2NyaXB0 IHNyYz0iUHJvdG9jb2wvTmV0d29ya09ic2VydmVyLmpzIj48L3NjcmlwdD4KICAgICA8c2NyaXB0 IHNyYz0iUHJvdG9jb2wvUGFnZU9ic2VydmVyLmpzIj48L3NjcmlwdD4KQEAgLTEzNyw2ICsxMzgs NyBAQAogICAgIDxzY3JpcHQgc3JjPSJNb2RlbHMvSW5kZXhlZERhdGFiYXNlT2JqZWN0U3RvcmUu anMiPjwvc2NyaXB0PgogICAgIDxzY3JpcHQgc3JjPSJNb2RlbHMvSW5kZXhlZERhdGFiYXNlT2Jq ZWN0U3RvcmVJbmRleC5qcyI+PC9zY3JpcHQ+CiAgICAgPHNjcmlwdCBzcmM9Ik1vZGVscy9Jc3N1 ZU1lc3NhZ2UuanMiPjwvc2NyaXB0PgorICAgIDxzY3JpcHQgc3JjPSJNb2RlbHMvTGF5ZXIuanMi Pjwvc2NyaXB0PgogICAgIDxzY3JpcHQgc3JjPSJNb2RlbHMvTGF5b3V0SW5zdHJ1bWVudC5qcyI+ PC9zY3JpcHQ+CiAgICAgPHNjcmlwdCBzcmM9Ik1vZGVscy9MYXlvdXRUaW1lbGluZVJlY29yZC5q cyI+PC9zY3JpcHQ+CiAgICAgPHNjcmlwdCBzcmM9Ik1vZGVscy9MYXp5U291cmNlQ29kZUxvY2F0 aW9uLmpzIj48L3NjcmlwdD4KQEAgLTIwMiw2ICsyMDQsNyBAQAogICAgIDxzY3JpcHQgc3JjPSJD b250cm9sbGVycy9GcmFtZVJlc291cmNlTWFuYWdlci5qcyI+PC9zY3JpcHQ+CiAgICAgPHNjcmlw dCBzcmM9IkNvbnRyb2xsZXJzL0hlYXBNYW5hZ2VyLmpzIj48L3NjcmlwdD4KICAgICA8c2NyaXB0 IHNyYz0iQ29udHJvbGxlcnMvSXNzdWVNYW5hZ2VyLmpzIj48L3NjcmlwdD4KKyAgICA8c2NyaXB0 IHNyYz0iQ29udHJvbGxlcnMvTGF5ZXJUcmVlTWFuYWdlci5qcyI+PC9zY3JpcHQ+CiAgICAgPHNj cmlwdCBzcmM9IkNvbnRyb2xsZXJzL0xvZ01hbmFnZXIuanMiPjwvc2NyaXB0PgogICAgIDxzY3Jp cHQgc3JjPSJDb250cm9sbGVycy9NZW1vcnlNYW5hZ2VyLmpzIj48L3NjcmlwdD4KICAgICA8c2Ny aXB0IHNyYz0iQ29udHJvbGxlcnMvUHJvYmVNYW5hZ2VyLmpzIj48L3NjcmlwdD4KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Rlc3QvVGVzdC5qcyBiL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Rlc3QvVGVzdC5qcwppbmRleCBiNDM3 ZDI0ZDVjZWJlNzcyODY2MTFkNWE4MTE5ZDUwOGU0YzlhMDIwLi45Y2Y2YTQ3ZjE2ZjMzNDI4YjQ2 N2RkOTVjZjY5NDgwZjlkYTQxNWJkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9UZXN0L1Rlc3QuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVGVzdC9UZXN0LmpzCkBAIC0zOSw2ICszOSw3IEBAIFdJLmxvYWRlZCA9IGZ1 bmN0aW9uKCkKICAgICBJbnNwZWN0b3JCYWNrZW5kLnJlZ2lzdGVyU2NyaXB0UHJvZmlsZXJEaXNw YXRjaGVyKG5ldyBXSS5TY3JpcHRQcm9maWxlck9ic2VydmVyKTsKICAgICBJbnNwZWN0b3JCYWNr ZW5kLnJlZ2lzdGVyVGltZWxpbmVEaXNwYXRjaGVyKG5ldyBXSS5UaW1lbGluZU9ic2VydmVyKTsK ICAgICBJbnNwZWN0b3JCYWNrZW5kLnJlZ2lzdGVyQ1NTRGlzcGF0Y2hlcihuZXcgV0kuQ1NTT2Jz ZXJ2ZXIpOworICAgIEluc3BlY3RvckJhY2tlbmQucmVnaXN0ZXJMYXllclRyZWVEaXNwYXRjaGVy KG5ldyBXSS5MYXllclRyZWVPYnNlcnZlcik7CiAgICAgSW5zcGVjdG9yQmFja2VuZC5yZWdpc3Rl clJ1bnRpbWVEaXNwYXRjaGVyKG5ldyBXSS5SdW50aW1lT2JzZXJ2ZXIpOwogICAgIEluc3BlY3Rv ckJhY2tlbmQucmVnaXN0ZXJXb3JrZXJEaXNwYXRjaGVyKG5ldyBXSS5Xb3JrZXJPYnNlcnZlcik7 CiAgICAgSW5zcGVjdG9yQmFja2VuZC5yZWdpc3RlckNhbnZhc0Rpc3BhdGNoZXIobmV3IFdJLkNh bnZhc09ic2VydmVyKTsKQEAgLTU4LDYgKzU5LDcgQEAgV0kubG9hZGVkID0gZnVuY3Rpb24oKQog ICAgIHRoaXMubWVtb3J5TWFuYWdlciA9IG5ldyBXSS5NZW1vcnlNYW5hZ2VyOwogICAgIHRoaXMu dGltZWxpbmVNYW5hZ2VyID0gbmV3IFdJLlRpbWVsaW5lTWFuYWdlcjsKICAgICB0aGlzLmRlYnVn Z2VyTWFuYWdlciA9IG5ldyBXSS5EZWJ1Z2dlck1hbmFnZXI7CisgICAgdGhpcy5sYXllclRyZWVN YW5hZ2VyID0gbmV3IFdJLkxheWVyVHJlZU1hbmFnZXI7CiAgICAgdGhpcy5wcm9iZU1hbmFnZXIg PSBuZXcgV0kuUHJvYmVNYW5hZ2VyOwogICAgIHRoaXMud29ya2VyTWFuYWdlciA9IG5ldyBXSS5X b3JrZXJNYW5hZ2VyOwogICAgIHRoaXMuZG9tRGVidWdnZXJNYW5hZ2VyID0gbmV3IFdJLkRPTURl YnVnZ2VyTWFuYWdlcjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL0xheWVyVHJlZURldGFpbHNTaWRlYmFyUGFuZWwuanMgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9MYXllclRyZWVEZXRhaWxzU2lkZWJhclBh bmVsLmpzCmluZGV4IGUwNDFmZDQwNWZhY2U1MDY1NzIyYmNhNjgxNzc1NmE5ZjQxY2NiMTcuLjMx NTY3NTA5ODMyNjBkNDAyNjFhN2IyZDM4YWEwOWRmZDM5NTA3YzEgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xheWVyVHJlZURldGFpbHNTaWRl YmFyUGFuZWwuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvTGF5ZXJUcmVlRGV0YWlsc1NpZGViYXJQYW5lbC5qcwpAQCAtNzksNyArNzksOSBAQCBXSS5M YXllclRyZWVEZXRhaWxzU2lkZWJhclBhbmVsID0gY2xhc3MgTGF5ZXJUcmVlRGV0YWlsc1NpZGVi YXJQYW5lbCBleHRlbmRzIFdJLgogICAgICAgICBpZiAoIXRoaXMuZG9tTm9kZSkKICAgICAgICAg ICAgIHJldHVybjsKIAotICAgICAgICBXSS5sYXllclRyZWVNYW5hZ2VyLmxheWVyc0Zvck5vZGUo dGhpcy5kb21Ob2RlLCAobGF5ZXJGb3JOb2RlLCBjaGlsZExheWVycykgPT4geworICAgICAgICBX SS5sYXllclRyZWVNYW5hZ2VyLmxheWVyc0Zvck5vZGUodGhpcy5kb21Ob2RlLCAobGF5ZXJzKSA9 PiB7CisgICAgICAgICAgICBsZXQgbGF5ZXJGb3JOb2RlID0gbGF5ZXJzWzBdICYmIGxheWVyc1sw XS5ub2RlSWQgPT09IHRoaXMuZG9tTm9kZS5pZCAmJiAhbGF5ZXJzWzBdLmlzR2VuZXJhdGVkQ29u dGVudCA/IGxheWVyc1swXSA6IG51bGw7CisgICAgICAgICAgICBsZXQgY2hpbGRMYXllcnMgPSBs YXllcnMuc2xpY2UobGF5ZXJGb3JOb2RlID8gMSA6IDApOwogICAgICAgICAgICAgdGhpcy5fdW5m aWx0ZXJlZENoaWxkTGF5ZXJzID0gY2hpbGRMYXllcnM7CiAgICAgICAgICAgICB0aGlzLl91cGRh dGVEaXNwbGF5V2l0aExheWVycyhsYXllckZvck5vZGUsIGNoaWxkTGF5ZXJzKTsKICAgICAgICAg fSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9MYXllcnMzRENvbnRlbnRWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvTGF5ZXJzM0RDb250ZW50Vmlldy5qcwppbmRleCBiMTNhZWJkNDRkMmFkMWMz NWM4NzFmYzAzYjE3MmI5MWU0MjgxZWRkLi5jZDk0OWE4MDMxN2JjOTcwNDQ2ZDI4MjM3MjVhMWRi MmVhZmIyYzQ4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9MYXllcnMzRENvbnRlbnRWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xheWVyczNEQ29udGVudFZpZXcuanMKQEAgLTEyNyw4ICsx MjcsOCBAQCBXSS5MYXllcnMzRENvbnRlbnRWaWV3ID0gY2xhc3MgTGF5ZXJzM0RDb250ZW50Vmll dyBleHRlbmRzIFdJLkNvbnRlbnRWaWV3CiAgICAgICAgICAgICByZXR1cm47CiAKICAgICAgICAg V0kuZG9tVHJlZU1hbmFnZXIucmVxdWVzdERvY3VtZW50KChub2RlKSA9PiB7Ci0gICAgICAgICAg ICBXSS5sYXllclRyZWVNYW5hZ2VyLmxheWVyc0Zvck5vZGUobm9kZSwgKGxheWVyRm9yTm9kZSwg Y2hpbGRMYXllcnMpID0+IHsKLSAgICAgICAgICAgICAgICB0aGlzLl91cGRhdGVMYXllcnMoY2hp bGRMYXllcnMpOworICAgICAgICAgICAgV0kubGF5ZXJUcmVlTWFuYWdlci5sYXllcnNGb3JOb2Rl KG5vZGUsIChsYXllcnMpID0+IHsKKyAgICAgICAgICAgICAgICB0aGlzLl91cGRhdGVMYXllcnMo bGF5ZXJzKTsKICAgICAgICAgICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhX SS5Db250ZW50Vmlldy5FdmVudC5TZWxlY3Rpb25QYXRoQ29tcG9uZW50c0RpZENoYW5nZSk7CiAg ICAgICAgICAgICB9KTsKICAgICAgICAgfSk7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggMmQzOTFjNzg0YzFkNjMwMjQ0YmYw YmRlYThlZTk2OGJkZmYxZGI2MS4uZjNmMGQ0MDkwMDk0NTViMWIyMzg2MDdhMjgyNjJmNzhhY2Nk NzA3MiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3Rz L0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDE3LTEwLTEyICBSb3NzIEtpcnNsaW5nICA8 cm9zcy5raXJzbGluZ0Bzb255LmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBMYXllcnMg dGFiIG1pc3Rha2VubHkgdGhyb3dzIG91dCB0aGUgcm9vdCBlbGVtZW50J3MgbGF5ZXIuCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzgyMjIKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGluc3BlY3Rvci9s YXllcnMvbGF5ZXItdHJlZS1tYW5hZ2VyLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICog aW5zcGVjdG9yL2xheWVycy9sYXllci10cmVlLW1hbmFnZXIuaHRtbDogQWRkZWQuCisKIDIwMTct MTAtMTEgIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CiAKICAgICAgICAgU2FuaXRp emUgVVJMIGluIHBhc3RlYm9hcmQgZm9yIG90aGVyIGFwcGxpY2F0aW9ucyBhbmQgY3Jvc3Mgb3Jp Z2luIGNvbnRlbnQKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9sYXllcnMvbGF5 ZXItdHJlZS1tYW5hZ2VyLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9sYXll cnMvbGF5ZXItdHJlZS1tYW5hZ2VyLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NApp bmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4xYjU0YmE0ZjJk ODU5MmYwYWZkNDU0NDM0MTAyMzc4YjhkNTYxYmRjCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0 VGVzdHMvaW5zcGVjdG9yL2xheWVycy9sYXllci10cmVlLW1hbmFnZXItZXhwZWN0ZWQudHh0CkBA IC0wLDAgKzEsOCBAQAorVGVzdHMgZm9yIExheWVyVHJlZU1hbmFnZXIuCisKKworPT0gUnVubmlu ZyB0ZXN0IHN1aXRlOiBMYXllclRyZWVNYW5hZ2VyCistLSBSdW5uaW5nIHRlc3QgY2FzZTogTGF5 ZXJUcmVlTWFuYWdlci5sYXllcnNGb3JOb2RlLnJvb3QKK1BBU1M6IFJldHVybmVkIGFycmF5IHNo b3VsZCBpbmNsdWRlIGFsbCBsYXllcnMuCitQQVNTOiBBcnJheSBlbGVtZW50cyBzaG91bGQgYmUg TGF5ZXIgaW5zdGFuY2VzLgorCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvbGF5 ZXJzL2xheWVyLXRyZWUtbWFuYWdlci5odG1sIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2xheWVy cy9sYXllci10cmVlLW1hbmFnZXIuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5jZDEwNjM1MGJkOWEwYzBjN2M3 ZjE1ZTZlYjA1NGQ0YjExZDc2OThlCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvaW5z cGVjdG9yL2xheWVycy9sYXllci10cmVlLW1hbmFnZXIuaHRtbApAQCAtMCwwICsxLDY1IEBACis8 IWRvY3R5cGUgaHRtbD4KKzxodG1sPgorPGhlYWQ+Cis8c2NyaXB0IHNyYz0iLi4vLi4vaHR0cC90 ZXN0cy9pbnNwZWN0b3IvcmVzb3VyY2VzL2luc3BlY3Rvci10ZXN0LmpzIj48L3NjcmlwdD4KKzxz Y3JpcHQ+CitmdW5jdGlvbiB0ZXN0KCkKK3sKKyAgICBsZXQgc3VpdGUgPSBJbnNwZWN0b3JUZXN0 LmNyZWF0ZUFzeW5jU3VpdGUoIkxheWVyVHJlZU1hbmFnZXIiKTsKKworICAgIHN1aXRlLmFkZFRl c3RDYXNlKHsKKyAgICAgICAgbmFtZTogIkxheWVyVHJlZU1hbmFnZXIubGF5ZXJzRm9yTm9kZS5y b290IiwKKyAgICAgICAgZGVzY3JpcHRpb246ICJDYWxsaW5nIHRoZSBMYXllclRyZWVNYW5hZ2Vy I2xheWVyc0Zvck5vZGUgbWV0aG9kIHdpdGggdGhlIHJvb3Qgbm9kZSBzaG91bGQgdGhlIGZ1bGwg bGF5ZXIgbGlzdC4iLAorICAgICAgICB0ZXN0KHJlc29sdmUsIHJlamVjdCkgeworICAgICAgICAg ICAgV0kuZG9tVHJlZU1hbmFnZXIucmVxdWVzdERvY3VtZW50KChub2RlKSA9PiB7CisgICAgICAg ICAgICAgICAgV0kubGF5ZXJUcmVlTWFuYWdlci5sYXllcnNGb3JOb2RlKG5vZGUsIChsYXllcnMp ID0+IHsKKyAgICAgICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5leHBlY3RFcXVhbChsYXll cnMubGVuZ3RoLCA1LCAiUmV0dXJuZWQgYXJyYXkgc2hvdWxkIGluY2x1ZGUgYWxsIGxheWVycy4i KTsKKyAgICAgICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5leHBlY3RUaGF0KGxheWVycy5l dmVyeSgobGF5ZXIpID0+IGxheWVyIGluc3RhbmNlb2YgV0kuTGF5ZXIpLCAiQXJyYXkgZWxlbWVu dHMgc2hvdWxkIGJlIExheWVyIGluc3RhbmNlcy4iKTsKKyAgICAgICAgICAgICAgICAgICAgcmVz b2x2ZSgpOworICAgICAgICAgICAgICAgIH0pOworICAgICAgICAgICAgfSk7CisgICAgICAgIH0K KyAgICB9KTsKKworICAgIHN1aXRlLnJ1blRlc3RDYXNlc0FuZEZpbmlzaCgpOworfQorPC9zY3Jp cHQ+Cis8c3R5bGU+CitkaXYgeworICAgIHBvc2l0aW9uOiBhYnNvbHV0ZTsKKyAgICB0b3A6IDA7 CisgICAgbGVmdDogMDsKK30KKworLnJlZ3VsYXIgeworICAgIHdpZHRoOiAxMDBweDsKKyAgICBo ZWlnaHQ6IDEwMHB4OworICAgIGJhY2tncm91bmQtY29sb3I6IGJsYWNrOworfQorCisuY29tcG9z aXRlZCB7CisgICAgdG9wOiAyNXB4OworICAgIGxlZnQ6IDI1cHg7CisgICAgd2lkdGg6IDUwcHg7 CisgICAgaGVpZ2h0OiA1MHB4OworICAgIGJhY2tncm91bmQtY29sb3I6IGJsdWU7CisgICAgLXdl YmtpdC10cmFuc2Zvcm06IHRyYW5zbGF0ZVooMCk7Cit9CisKKy5vZmZzZXQgeworICAgIGxlZnQ6 IDIwMHB4OworICAgIC13ZWJraXQtdHJhbnNmb3JtOiB0cmFuc2xhdGVaKDApOworfQorPC9zdHls ZT4KKzwvaGVhZD4KKzxib2R5IG9ubG9hZD0icnVuVGVzdCgpIj4KKzxwPlRlc3RzIGZvciBMYXll clRyZWVNYW5hZ2VyLjwvcD4KKzxkaXYgY2xhc3M9InJlZ3VsYXIiPjwvZGl2PgorPGRpdiBjbGFz cz0iY29tcG9zaXRlZCI+CisgICAgPGRpdiBjbGFzcz0iY29tcG9zaXRlZCI+PC9kaXY+Cis8L2Rp dj4KKzxkaXYgY2xhc3M9InJlZ3VsYXIgb2Zmc2V0Ij4KKyAgICA8ZGl2IGNsYXNzPSJjb21wb3Np dGVkIj48L2Rpdj4KKzwvZGl2PgorPC9ib2R5PgorPC9odG1sPgo=