151058 2015-11-09 15:51:16 -0800 Web Inspector: Reduce synchronous view layouts 2015-11-18 21:44:41 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 150993 146256 1 mattbaker mattbaker bburg commit-queue graouts joepeck mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1140571 0 mattbaker 2015-11-09 15:51:16 -0800 * SUMMARY Reduce synchronous view layouts. We should be calling View.needsLayout rather than View.updateLayout, unless an up-to-date attribute value for a DOM element is needed. * NOTES Once https://bugs.webkit.org/show_bug.cgi?id=150993 is fixed, we should see the majority of view updates occur on the main animation frame. If not, it means that synchronous layouts are flushing the layout tree before the animation frame fires. Switching to asynchronous layouts should resolve cases where redundant layouts occur (see https://bugs.webkit.org/show_bug.cgi?id=146256). 1140573 1 webkit-bug-importer 2015-11-09 15:52:00 -0800 <rdar://problem/23472397> 1143057 2 265798 mattbaker 2015-11-18 16:06:19 -0800 Created attachment 265798 [Patch] Proposed Fix 1143180 3 265798 commit-queue 2015-11-18 21:44:37 -0800 Comment on attachment 265798 [Patch] Proposed Fix Clearing flags on attachment: 265798 Committed r192612: <http://trac.webkit.org/changeset/192612> 1143181 4 commit-queue 2015-11-18 21:44:41 -0800 All reviewed patches have been landed. Closing bug. 265798 2015-11-18 16:06:19 -0800 2015-11-18 21:44:37 -0800 [Patch] Proposed Fix bug-151058-20151118160608.patch text/plain 11519 mattbaker U3VidmVyc2lvbiBSZXZpc2lvbjogMTkyNTk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCBj MGUxYTRjM2UwYWZkOGZhZGVhNWYxNmRhMzkyOTVmYmM0OTZlZjEwLi45ZDQ0Y2ZhYTE0ODc4NDEx NmRjNWYxODEzMDQwZjFiYWYzODUxYWNjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs NSArMSw1MyBAQAogMjAxNS0xMS0xOCAgTWF0dCBCYWtlciAgPG1hdHRiYWtlckBhcHBsZS5jb20+ CiAKKyAgICAgICAgV2ViIEluc3BlY3RvcjogUmVkdWNlIHN5bmNocm9ub3VzIHZpZXcgbGF5b3V0 cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTUxMDU4 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVwbGFj ZSBjYWxscyB0byBWaWV3LnVwZGF0ZUxheW91dCB3aXRoIG5lZWRzTGF5b3V0LCB3aGVuIGEgc3lu Y2hyb25vdXMgbGF5b3V0CisgICAgICAgIGlzbid0IGFic29sdXRlbHkgbmVjZXNzYXJ5LgorCisg ICAgICAgICogVXNlckludGVyZmFjZS9Nb2RlbHMvQmFja0ZvcndhcmRFbnRyeS5qczoKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5CYWNrRm9yd2FyZEVudHJ5LnByb3RvdHlwZS5wcmVwYXJlVG9TaG93 KToKKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvQXBwbGljYXRpb25DYWNoZUZyYW1l Q29udGVudFZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQXBwbGljYXRpb25DYWNoZUZy YW1lQ29udGVudFZpZXcucHJvdG90eXBlLnVwZGF0ZUxheW91dCk6IERlbGV0ZWQuCisgICAgICAg IFZpZXcgc3ViY2xhc3NlcyBzaG91bGRuJ3Qgb3ZlcnJpZGUgdXBkYXRlTGF5b3V0LgorCisgICAg ICAgICogVXNlckludGVyZmFjZS9WaWV3cy9CdXR0b25OYXZpZ2F0aW9uSXRlbS5qczoKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5CdXR0b25OYXZpZ2F0aW9uSXRlbS5wcm90b3R5cGUuc2V0IGxhYmVs KToKKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvQ29udGVudEJyb3dzZXIuanM6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuQ29udGVudEJyb3dzZXIucHJvdG90eXBlLl9jb250ZW50Vmll d1NlbGVjdGlvblBhdGhDb21wb25lbnREaWRDaGFuZ2UpOgorICAgICAgICAoV2ViSW5zcGVjdG9y LkNvbnRlbnRCcm93c2VyLnByb3RvdHlwZS5fY3VycmVudENvbnRlbnRWaWV3RGlkQ2hhbmdlKToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5Db250ZW50QnJvd3Nlci5wcm90b3R5cGUuX2NvbnRlbnRW aWV3TmF2aWdhdGlvbkl0ZW1zRGlkQ2hhbmdlKToKKworICAgICAgICAqIFVzZXJJbnRlcmZhY2Uv Vmlld3MvRGF0YWJhc2VUYWJsZUNvbnRlbnRWaWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9y LkRhdGFiYXNlVGFibGVDb250ZW50Vmlldy5wcm90b3R5cGUuX3F1ZXJ5RmluaXNoZWQpOgorICAg ICAgICBKdXN0IHVwZGF0ZSBEYXRhR3JpZCdzIGxheW91dCwgbm90IHRoZSB3aG9sZSB2aWV3LiBU aGUgZ3JpZCBpcyB0aGUgb25seSBzdWJ2aWV3CisgICAgICAgIHNvIHRoZSByZXN1bHQgaXMgaWRl bnRpY2FsLCBidXQgdGhlIGludGVudCBpcyBjbGVhcmVkIHRoaXMgd2F5LgorICAgICAgICAoV2Vi SW5zcGVjdG9yLkRhdGFiYXNlVGFibGVDb250ZW50Vmlldy5wcm90b3R5cGUudXBkYXRlTGF5b3V0 KTogRGVsZXRlZC4KKyAgICAgICAgVmlldyBzdWJjbGFzc2VzIHNob3VsZG4ndCBvdmVycmlkZSB1 cGRhdGVMYXlvdXQuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0xvZ0NvbnRlbnRW aWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkxvZ0NvbnRlbnRWaWV3LnByb3RvdHlwZS5k aWRBcHBlbmRDb25zb2xlTWVzc2FnZVZpZXcpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkxvZ0Nv bnRlbnRWaWV3LnByb3RvdHlwZS5wcm9tcHREaWRDaGFuZ2VIZWlnaHQpOiBEZWxldGVkLgorICAg ICAgICBVbnVzZWQgY29kZS4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvU2lkZWJh ci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TaWRlYmFyLnByb3RvdHlwZS5zZXQgd2lkdGgp OgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNpZGViYXIucHJvdG90eXBlLnNldCBjb2xsYXBzZWQp OgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9UZXh0UmVzb3VyY2VDb250ZW50Vmll dy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UZXh0UmVzb3VyY2VDb250ZW50Vmlldy5wcm90 b3R5cGUuX2NvbnRlbnRXaWxsUG9wdWxhdGUpOgorICAgICAgICBBZGQgVGV4dEVkaXRvciBhcyBh IHN1YnZpZXcuCisgICAgICAgIChXZWJJbnNwZWN0b3IuVGV4dFJlc291cmNlQ29udGVudFZpZXcu cHJvdG90eXBlLnVwZGF0ZUxheW91dCk6IERlbGV0ZWQuCisgICAgICAgIFZpZXcgc3ViY2xhc3Nl cyBzaG91bGRuJ3Qgb3ZlcnJpZGUgdXBkYXRlTGF5b3V0LgorCisKKzIwMTUtMTEtMTggIE1hdHQg QmFrZXIgIDxtYXR0YmFrZXJAYXBwbGUuY29tPgorCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IFBy b2JlcyBzaWRlYmFyIHBhbmVsIHNlY3Rpb25zIHNob3VsZCB1c2UgTmF2aWdhdGlvbkJhcgogICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTUxMzczCiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9CYWNr Rm9yd2FyZEVudHJ5LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9k ZWxzL0JhY2tGb3J3YXJkRW50cnkuanMKaW5kZXggNTFmMDMxNzZkMGI1OGIyMTU1ODA4MTk5ZTI1 Y2QzZWIzNTU0N2UyYS4uYzgzYTEyM2M1MGNlZDExYmVlNDVhOGU1NGE4NDQ1NTg5NzZkMzA5MyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL0Jh Y2tGb3J3YXJkRW50cnkuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvTW9kZWxzL0JhY2tGb3J3YXJkRW50cnkuanMKQEAgLTU5LDcgKzU5LDcgQEAgV2ViSW5zcGVj dG9yLkJhY2tGb3J3YXJkRW50cnkgPSBjbGFzcyBCYWNrRm9yd2FyZEVudHJ5IGV4dGVuZHMgV2Vi SW5zcGVjdG9yLk9iamUKICAgICAgICAgdGhpcy5jb250ZW50Vmlldy52aXNpYmxlID0gdHJ1ZTsK ICAgICAgICAgaWYgKHNob3VsZENhbGxTaG93bikKICAgICAgICAgICAgIHRoaXMuY29udGVudFZp ZXcuc2hvd24oKTsKLSAgICAgICAgdGhpcy5jb250ZW50Vmlldy51cGRhdGVMYXlvdXQoKTsKKyAg ICAgICAgdGhpcy5jb250ZW50Vmlldy5uZWVkc0xheW91dCgpOwogICAgIH0KIAogICAgIHByZXBh cmVUb0hpZGUoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvQXBwbGljYXRpb25DYWNoZUZyYW1lQ29udGVudFZpZXcuanMgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9BcHBsaWNhdGlvbkNhY2hlRnJhbWVDb250 ZW50Vmlldy5qcwppbmRleCA1YTgyZDVmY2M3Y2ZjMjQ1Yjg2ZGE4MGY4ODY4NzlmY2JjMWVjMjJm Li5hNmVlNDJiYjNlYjM1MzQzNjU0YWZjNDAxOGYzZGM4NjY0MzlmYzJhIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9BcHBsaWNhdGlvbkNhY2hl RnJhbWVDb250ZW50Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9BcHBsaWNhdGlvbkNhY2hlRnJhbWVDb250ZW50Vmlldy5qcwpAQCAtNTcsMTIg KzU3LDYgQEAgV2ViSW5zcGVjdG9yLkFwcGxpY2F0aW9uQ2FjaGVGcmFtZUNvbnRlbnRWaWV3ID0g Y2xhc3MgQXBwbGljYXRpb25DYWNoZUZyYW1lQ29udGUKICAgICAgICAgV2ViSW5zcGVjdG9yLmFw cGxpY2F0aW9uQ2FjaGVNYW5hZ2VyLnJlbW92ZUV2ZW50TGlzdGVuZXIobnVsbCwgbnVsbCwgdGhp cyk7CiAgICAgfQogCi0gICAgdXBkYXRlTGF5b3V0KCkKLSAgICB7Ci0gICAgICAgIGlmICh0aGlz LmRhdGFHcmlkKQotICAgICAgICAgICAgdGhpcy5kYXRhR3JpZC51cGRhdGVMYXlvdXQoKTsKLSAg ICB9Ci0KICAgICBzYXZlVG9Db29raWUoY29va2llKQogICAgIHsKICAgICAgICAgY29va2llLnR5 cGUgPSBXZWJJbnNwZWN0b3IuQ29udGVudFZpZXdDb29raWVUeXBlLkFwcGxpY2F0aW9uQ2FjaGU7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9C dXR0b25OYXZpZ2F0aW9uSXRlbS5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL0J1dHRvbk5hdmlnYXRpb25JdGVtLmpzCmluZGV4IDc1MjUzNjc2YjQ4YWJjMDhh NjZmNDZlMDhiZmUwOGY2NmExNTVhODAuLmZkZDA2MzY5MjY4NTBlMzY5YmEyNmQ0M2Y5MzU2NWUy NmQ3ZjJlZTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL0J1dHRvbk5hdmlnYXRpb25JdGVtLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0J1dHRvbk5hdmlnYXRpb25JdGVtLmpzCkBAIC03Niw3ICs3 Niw3IEBAIFdlYkluc3BlY3Rvci5CdXR0b25OYXZpZ2F0aW9uSXRlbSA9IGNsYXNzIEJ1dHRvbk5h dmlnYXRpb25JdGVtIGV4dGVuZHMgV2ViSW5zcGVjCiAgICAgICAgIHRoaXMuX2VsZW1lbnQuY2xh c3NMaXN0LmFkZChXZWJJbnNwZWN0b3IuQnV0dG9uTmF2aWdhdGlvbkl0ZW0uVGV4dE9ubHlDbGFz c05hbWUpOwogICAgICAgICB0aGlzLl9lbGVtZW50LnRleHRDb250ZW50ID0gbmV3TGFiZWwgfHwg IiI7CiAgICAgICAgIGlmICh0aGlzLnBhcmVudE5hdmlnYXRpb25CYXIpCi0gICAgICAgICAgICB0 aGlzLnBhcmVudE5hdmlnYXRpb25CYXIudXBkYXRlTGF5b3V0KCk7CisgICAgICAgICAgICB0aGlz LnBhcmVudE5hdmlnYXRpb25CYXIubmVlZHNMYXlvdXQoKTsKICAgICB9CiAKICAgICBnZXQgaW1h Z2UoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvQ29udGVudEJyb3dzZXIuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9Db250ZW50QnJvd3Nlci5qcwppbmRleCA3MTEzNGFiNmU4NGE2NjZjYzJiZDM5NGE2 Mzk5ZjAzZmY0MDk2ODIxLi4wMTI1YjQ0NWE5ZTAxZjM1Yzg5MjUyMmZlZTkzNDQxMjlmNGY5YWNm IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9D b250ZW50QnJvd3Nlci5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9Db250ZW50QnJvd3Nlci5qcwpAQCAtNDM1LDcgKzQzNSw3IEBAIFdlYkluc3BlY3Rv ci5Db250ZW50QnJvd3NlciA9IGNsYXNzIENvbnRlbnRCcm93c2VyIGV4dGVuZHMgV2ViSW5zcGVj dG9yLlZpZXcKIAogICAgICAgICB0aGlzLl91cGRhdGVDb250ZW50Vmlld05hdmlnYXRpb25JdGVt cygpOwogCi0gICAgICAgIHRoaXMuX25hdmlnYXRpb25CYXIudXBkYXRlTGF5b3V0KCk7CisgICAg ICAgIHRoaXMuX25hdmlnYXRpb25CYXIubmVlZHNMYXlvdXQoKTsKIAogICAgICAgICB0aGlzLl9k aXNwYXRjaEN1cnJlbnRSZXByZXNlbnRlZE9iamVjdHNEaWRDaGFuZ2VFdmVudFNvb24oKTsKICAg ICB9CkBAIC00NTksNyArNDU5LDcgQEAgV2ViSW5zcGVjdG9yLkNvbnRlbnRCcm93c2VyID0gY2xh c3MgQ29udGVudEJyb3dzZXIgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuVmlldwogICAgICAgICB0aGlz Ll91cGRhdGVDb250ZW50Vmlld05hdmlnYXRpb25JdGVtcygpOwogICAgICAgICB0aGlzLl91cGRh dGVGaW5kQmFubmVyKGN1cnJlbnRDb250ZW50Vmlldyk7CiAKLSAgICAgICAgdGhpcy5fbmF2aWdh dGlvbkJhci51cGRhdGVMYXlvdXQoKTsKKyAgICAgICAgdGhpcy5fbmF2aWdhdGlvbkJhci5uZWVk c0xheW91dCgpOwogCiAgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYklu c3BlY3Rvci5Db250ZW50QnJvd3Nlci5FdmVudC5DdXJyZW50Q29udGVudFZpZXdEaWRDaGFuZ2Up OwogCkBAIC00NzIsNyArNDcyLDcgQEAgV2ViSW5zcGVjdG9yLkNvbnRlbnRCcm93c2VyID0gY2xh c3MgQ29udGVudEJyb3dzZXIgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuVmlldwogICAgICAgICAgICAg cmV0dXJuOwogCiAgICAgICAgIHRoaXMuX3VwZGF0ZUNvbnRlbnRWaWV3TmF2aWdhdGlvbkl0ZW1z KCk7Ci0gICAgICAgIHRoaXMuX25hdmlnYXRpb25CYXIudXBkYXRlTGF5b3V0KCk7CisgICAgICAg IHRoaXMuX25hdmlnYXRpb25CYXIubmVlZHNMYXlvdXQoKTsKICAgICB9CiAKICAgICBfaGllcmFy Y2hpY2FsUGF0aENvbXBvbmVudFdhc1NlbGVjdGVkKGV2ZW50KQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRGF0YWJhc2VUYWJsZUNvbnRlbnRW aWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRGF0YWJh c2VUYWJsZUNvbnRlbnRWaWV3LmpzCmluZGV4IDk2MjYyOTI2MmI0ODM0ZDYxMTk1OTYyMjA5Y2M3 YTMxYTMwMDQ0YzEuLjUyZDdkZWI5NjJmZDVkYjdhNmY1NWEwMmVjYzk5MmEwMzA2NDA1MzAgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RhdGFi YXNlVGFibGVDb250ZW50Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9EYXRhYmFzZVRhYmxlQ29udGVudFZpZXcuanMKQEAgLTUwLDEyICs1MCw2 IEBAIFdlYkluc3BlY3Rvci5EYXRhYmFzZVRhYmxlQ29udGVudFZpZXcgPSBjbGFzcyBEYXRhYmFz ZVRhYmxlQ29udGVudFZpZXcgZXh0ZW5kcyBXCiAgICAgICAgIHRoaXMucmVwcmVzZW50ZWRPYmpl Y3QuZGF0YWJhc2UuZXhlY3V0ZVNRTCgiU0VMRUNUICogRlJPTSBcIiIgKyB0aGlzLl9lc2NhcGVU YWJsZU5hbWUodGhpcy5yZXByZXNlbnRlZE9iamVjdC5uYW1lKSArICJcIiIsIHRoaXMuX3F1ZXJ5 RmluaXNoZWQuYmluZCh0aGlzKSwgdGhpcy5fcXVlcnlFcnJvci5iaW5kKHRoaXMpKTsKICAgICB9 CiAKLSAgICB1cGRhdGVMYXlvdXQoKQotICAgIHsKLSAgICAgICAgaWYgKHRoaXMuX2RhdGFHcmlk KQotICAgICAgICAgICAgdGhpcy5fZGF0YUdyaWQudXBkYXRlTGF5b3V0KCk7Ci0gICAgfQotCiAg ICAgc2F2ZVRvQ29va2llKGNvb2tpZSkKICAgICB7CiAgICAgICAgIGNvb2tpZS50eXBlID0gV2Vi SW5zcGVjdG9yLkNvbnRlbnRWaWV3Q29va2llVHlwZS5EYXRhYmFzZVRhYmxlOwpAQCAtOTUsNyAr ODksNyBAQCBXZWJJbnNwZWN0b3IuRGF0YWJhc2VUYWJsZUNvbnRlbnRWaWV3ID0gY2xhc3MgRGF0 YWJhc2VUYWJsZUNvbnRlbnRWaWV3IGV4dGVuZHMgVwogICAgICAgICAgICAgdGhpcy5fZGF0YUdy aWQgPSBXZWJJbnNwZWN0b3IuRGF0YUdyaWQuY3JlYXRlU29ydGFibGVEYXRhR3JpZChjb2x1bW5O YW1lcywgdmFsdWVzKTsKIAogICAgICAgICAgICAgdGhpcy5hZGRTdWJ2aWV3KHRoaXMuX2RhdGFH cmlkKTsKLSAgICAgICAgICAgIHRoaXMudXBkYXRlTGF5b3V0KCk7CisgICAgICAgICAgICB0aGlz Ll9kYXRhR3JpZC51cGRhdGVMYXlvdXQoKTsKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAg fQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9Mb2dDb250ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL0xvZ0NvbnRlbnRWaWV3LmpzCmluZGV4IDM1MTA1NmUzNzE5Nzg5ZWY1ZjBjZjE3Njkw M2JiMzAzNGY5NDcxMGIuLmQ2MTg3NGE2OWM2N2Y1MGZkMjFmMTU4NWY4OGI5ZjYzMTU2YmVmYTkg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xv Z0NvbnRlbnRWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL0xvZ0NvbnRlbnRWaWV3LmpzCkBAIC0xMjYsNyArMTI2LDcgQEAgV2ViSW5zcGVjdG9y LkxvZ0NvbnRlbnRWaWV3ID0gY2xhc3MgTG9nQ29udGVudFZpZXcgZXh0ZW5kcyBXZWJJbnNwZWN0 b3IuQ29udGVudFYKICAgICB7CiAgICAgICAgIGNvbnNvbGUuYXNzZXJ0KG1lc3NhZ2VWaWV3IGlu c3RhbmNlb2YgV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlVmlldyB8fCBtZXNzYWdlVmlldyBp bnN0YW5jZW9mIFdlYkluc3BlY3Rvci5Db25zb2xlQ29tbWFuZFZpZXcpOwogCi0gICAgICAgIFdl Ykluc3BlY3Rvci5xdWlja0NvbnNvbGUudXBkYXRlTGF5b3V0KCk7CisgICAgICAgIFdlYkluc3Bl Y3Rvci5xdWlja0NvbnNvbGUubmVlZHNMYXlvdXQoKTsKIAogICAgICAgICAvLyBOZXN0IHRoZSBt ZXNzYWdlLgogICAgICAgICB2YXIgdHlwZSA9IG1lc3NhZ2VWaWV3IGluc3RhbmNlb2YgV2ViSW5z cGVjdG9yLkNvbnNvbGVDb21tYW5kVmlldyA/IG51bGwgOiBtZXNzYWdlVmlldy5tZXNzYWdlLnR5 cGU7CkBAIC0xNjYsMTEgKzE2Niw2IEBAIFdlYkluc3BlY3Rvci5Mb2dDb250ZW50VmlldyA9IGNs YXNzIExvZ0NvbnRlbnRWaWV3IGV4dGVuZHMgV2ViSW5zcGVjdG9yLkNvbnRlbnRWCiAgICAgICAg IHRoaXMuX2xvZ1ZpZXdDb250cm9sbGVyLnNjcm9sbFRvQm90dG9tKCk7CiAgICAgfQogCi0gICAg cHJvbXB0RGlkQ2hhbmdlSGVpZ2h0KCkKLSAgICB7Ci0gICAgICAgIFdlYkluc3BlY3Rvci5xdWlj a0NvbnNvbGUudXBkYXRlTGF5b3V0KCk7Ci0gICAgfQotCiAgICAgZ2V0IHN1cHBvcnRzU2VhcmNo KCkKICAgICB7CiAgICAgICAgIHJldHVybiB0cnVlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2lkZWJhci5qcyBiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NpZGViYXIuanMKaW5kZXggMGE1OWMyZmQ3ODAw YmQ4MDc4NzI3YzNiOTYyOWJkNzY5OWE5ZTc0NC4uMzY3MGJkNjMyODdiNWJjYjc1ZmQyNzgzODFm ZjUyNTgwNWJhM2EzOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvU2lkZWJhci5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9TaWRlYmFyLmpzCkBAIC0xODIsNyArMTgyLDcgQEAgV2ViSW5zcGVjdG9y LlNpZGViYXIgPSBjbGFzcyBTaWRlYmFyIGV4dGVuZHMgV2ViSW5zcGVjdG9yLlZpZXcKICAgICAg ICAgdGhpcy5lbGVtZW50LnN0eWxlLndpZHRoID0gbmV3V2lkdGggKyAicHgiOwogCiAgICAgICAg IGlmICghdGhpcy5jb2xsYXBzZWQgJiYgdGhpcy5fbmF2aWdhdGlvbkJhcikKLSAgICAgICAgICAg IHRoaXMuX25hdmlnYXRpb25CYXIudXBkYXRlTGF5b3V0KCk7CisgICAgICAgICAgICB0aGlzLl9u YXZpZ2F0aW9uQmFyLm5lZWRzTGF5b3V0KCk7CiAKICAgICAgICAgaWYgKCF0aGlzLmNvbGxhcHNl ZCAmJiB0aGlzLl9zZWxlY3RlZFNpZGViYXJQYW5lbCkKICAgICAgICAgICAgIHRoaXMuX3NlbGVj dGVkU2lkZWJhclBhbmVsLndpZHRoRGlkQ2hhbmdlKCk7CkBAIC0yMDMsMTAgKzIwMyw4IEBAIFdl Ykluc3BlY3Rvci5TaWRlYmFyID0gY2xhc3MgU2lkZWJhciBleHRlbmRzIFdlYkluc3BlY3Rvci5W aWV3CiAgICAgICAgIHRoaXMuX2NvbGxhcHNlZCA9IGZsYWcgfHwgZmFsc2U7CiAgICAgICAgIHRo aXMuZWxlbWVudC5jbGFzc0xpc3QudG9nZ2xlKFdlYkluc3BlY3Rvci5TaWRlYmFyLkNvbGxhcHNl ZFN0eWxlQ2xhc3NOYW1lKTsKIAotICAgICAgICBpZiAoIXRoaXMuX2NvbGxhcHNlZCkgewotICAg ICAgICAgICAgaWYgKHRoaXMuX25hdmlnYXRpb25CYXIpCi0gICAgICAgICAgICAgICAgdGhpcy5f bmF2aWdhdGlvbkJhci51cGRhdGVMYXlvdXQoKTsKLSAgICAgICAgfQorICAgICAgICBpZiAoIXRo aXMuX2NvbGxhcHNlZCAmJiB0aGlzLl9uYXZpZ2F0aW9uQmFyKQorICAgICAgICAgICAgdGhpcy5f bmF2aWdhdGlvbkJhci5uZWVkc0xheW91dCgpOwogCiAgICAgICAgIGlmICh0aGlzLl9zZWxlY3Rl ZFNpZGViYXJQYW5lbCkgewogICAgICAgICAgICAgaWYgKHRoaXMuX3NlbGVjdGVkU2lkZWJhclBh bmVsLnZpc2libGUpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9UZXh0UmVzb3VyY2VDb250ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RleHRSZXNvdXJjZUNvbnRlbnRWaWV3LmpzCmluZGV4 IDJkODgzMTQ2ZmFhMWMzZDdmNTQyZjY5ZDNlNzlhZDRkOTY3NmUwNWUuLmY0YzE5OGM5NjUwNTE4 NmRlY2QyNzI3NzBkOWYzOTFiMTRiNWJhZGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RleHRSZXNvdXJjZUNvbnRlbnRWaWV3LmpzCisrKyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RleHRSZXNvdXJjZUNv bnRlbnRWaWV3LmpzCkBAIC0xNzQsMTYgKzE3NCwxMSBAQCBXZWJJbnNwZWN0b3IuVGV4dFJlc291 cmNlQ29udGVudFZpZXcgPSBjbGFzcyBUZXh0UmVzb3VyY2VDb250ZW50VmlldyBleHRlbmRzIFdl YgogICAgICAgICB0aGlzLl90ZXh0RWRpdG9yLnJldmVhbE5leHRTZWFyY2hSZXN1bHQoY2hhbmdl Rm9jdXMpOwogICAgIH0KIAotICAgIHVwZGF0ZUxheW91dCgpCi0gICAgewotICAgICAgICB0aGlz Ll90ZXh0RWRpdG9yLnVwZGF0ZUxheW91dCgpOwotICAgIH0KLQogICAgIC8vIFByaXZhdGUKIAog ICAgIF9jb250ZW50V2lsbFBvcHVsYXRlKGV2ZW50KQogICAgIHsKLSAgICAgICAgaWYgKHRoaXMu X3RleHRFZGl0b3IuZWxlbWVudC5wYXJlbnROb2RlID09PSB0aGlzLmVsZW1lbnQpCisgICAgICAg IGlmICh0aGlzLl90ZXh0RWRpdG9yLnBhcmVudFZpZXcgPT09IHRoaXMpCiAgICAgICAgICAgICBy ZXR1cm47CiAKICAgICAgICAgLy8gQ2hlY2sgdGhlIE1JTUUtdHlwZSBmb3IgQ1NTIHNpbmNlIFJl c291cmNlLlR5cGUuU3R5bGVzaGVldCBhbHNvIGluY2x1ZGVzIFhTTCwgd2hpY2ggd2UgY2FuJ3Qg ZWRpdCB5ZXQuCkBAIC0xOTUsNyArMTkwLDcgQEAgV2ViSW5zcGVjdG9yLlRleHRSZXNvdXJjZUNv bnRlbnRWaWV3ID0gY2xhc3MgVGV4dFJlc291cmNlQ29udGVudFZpZXcgZXh0ZW5kcyBXZWIKICAg ICAgICAgICAgIHRoaXMuX3RleHRFZGl0b3IucmVhZE9ubHkgPSBmYWxzZTsKIAogICAgICAgICB0 aGlzLmVsZW1lbnQucmVtb3ZlQ2hpbGRyZW4oKTsKLSAgICAgICAgdGhpcy5lbGVtZW50LmFwcGVu ZENoaWxkKHRoaXMuX3RleHRFZGl0b3IuZWxlbWVudCk7CisgICAgICAgIHRoaXMuYWRkU3Vidmll dyh0aGlzLl90ZXh0RWRpdG9yKTsKICAgICB9CiAKICAgICBfY29udGVudERpZFBvcHVsYXRlKGV2 ZW50KQo=