167075 2017-01-15 14:23:11 -0800 Web Inspector: split console should be allowed for Network and Timeline tabs when Inspector is not docked 2017-01-18 21:11:04 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 bburg hi commit-queue hi inspector-bugzilla-changes webkit-bug-importer oldest_to_newest 1267053 0 bburg 2017-01-15 14:23:11 -0800 The only problematic case is when docked to bottom, we have basically no room at all. I am pretty sure that this is a getter or method call, so this can be done dynamically. (In that case I don't think we should ever show split console while docked to bottom). 1267054 1 webkit-bug-importer 2017-01-15 14:23:21 -0800 <rdar://problem/30033611> 1267093 2 298937 hi 2017-01-15 21:24:53 -0800 Created attachment 298937 Patch 1267270 3 298937 timothy 2017-01-16 18:54:13 -0800 Comment on attachment 298937 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=298937&action=review > Source/WebInspectorUI/UserInterface/Views/ContentView.js:313 > - return true; > + return WebInspector.dockedConfigurationSupportsSplitContentBrowser(); Maybe if this is the default then the subclass methods that do the same thing can just be removed. > Source/WebInspectorUI/UserInterface/Views/NetworkTabContentView.js:64 > - return false; > + return WebInspector.dockedConfigurationSupportsSplitContentBrowser(); This still poses a problem. Since Network has real sidebar, if the split console is shown, the sidebar will show things that don't line up with the DataGrid in the content view. A comment to that effect should be added to explain this. Give it a try with a lot of network requests and you will see what I mean. > Source/WebInspectorUI/UserInterface/Views/TimelineTabContentView.js:314 > - return false; > + return WebInspector.dockedConfigurationSupportsSplitContentBrowser(); Timeline use to be the same way, but we don't have a real sidebar anymore so it should be fine. 1267296 4 298937 hi 2017-01-16 21:05:15 -0800 Comment on attachment 298937 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=298937&action=review >> Source/WebInspectorUI/UserInterface/Views/ContentView.js:313 >> + return WebInspector.dockedConfigurationSupportsSplitContentBrowser(); > > Maybe if this is the default then the subclass methods that do the same thing can just be removed. Yup. 100% correct. No idea why I didn't do that... >> Source/WebInspectorUI/UserInterface/Views/NetworkTabContentView.js:64 >> + return WebInspector.dockedConfigurationSupportsSplitContentBrowser(); > > This still poses a problem. Since Network has real sidebar, if the split console is shown, the sidebar will show things that don't line up with the DataGrid in the content view. A comment to that effect should be added to explain this. Give it a try with a lot of network requests and you will see what I mean. Oh snap that's a really good point. I'll revert this. 1267299 5 299016 hi 2017-01-16 21:13:11 -0800 Created attachment 299016 Patch 1268026 6 299016 commit-queue 2017-01-18 21:11:00 -0800 Comment on attachment 299016 Patch Clearing flags on attachment: 299016 Committed r210911: <http://trac.webkit.org/changeset/210911> 1268027 7 commit-queue 2017-01-18 21:11:04 -0800 All reviewed patches have been landed. Closing bug. 298937 2017-01-15 21:24:53 -0800 2017-01-16 21:13:07 -0800 Patch bug-167075-20170115222307.patch text/plain 5222 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDk1OTEyOTYxZjYzN2QwOWRhNGZmZDczOGNlMmU3 MjZkNjA5N2RlMDguLjA1M2I4Nzk5M2M0Y2YyODVmNzE0NmE3ZGRlYzc5MmFmZTczNjY2YTYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDE3LTAxLTE1ICBEZXZp biBSb3Vzc28gIDxkY3JvdXNzbyt3ZWJraXRAZ21haWwuY29tPgorCisgICAgICAgIFdlYiBJbnNw ZWN0b3I6IHNwbGl0IGNvbnNvbGUgc2hvdWxkIGJlIGFsbG93ZWQgZm9yIE5ldHdvcmsgYW5kIFRp bWVsaW5lIHRhYnMgd2hlbiBJbnNwZWN0b3IgaXMgbm90IGRvY2tlZAorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTY3MDc1CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL0Jhc2UvTWFp bi5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5kb2NrZWRDb25maWd1cmF0aW9uU3VwcG9ydHNT cGxpdENvbnRlbnRCcm93c2VyKToKKyAgICAgICAgSGVscGVyIGZ1bmN0aW9uIHRvIGRldGVybWlu ZSBpZiB0aGUgY3VycmVudCBkb2NrZWQgc3RhdGUgc3VwcG9ydHMgaGF2aW5nIHRoZSBjb250ZW50 IHZpZXcKKyAgICAgICAgYW5kIHNwbGl0IGNvbnNvbGUgYXQgdGhlIHNhbWUgdGltZS4gIEN1cnJl bnRseSBzZXQgdG8gYmUgdHJ1ZSBpZiBub3QgZG9ja2VkIGJvdHRvbS4KKworICAgICAgICAqIFVz ZXJJbnRlcmZhY2UvVmlld3MvQ2x1c3RlckNvbnRlbnRWaWV3LmpzOgorICAgICAgICAoV2ViSW5z cGVjdG9yLkNsdXN0ZXJDb250ZW50Vmlldy5wcm90b3R5cGUuZ2V0IHN1cHBvcnRzU3BsaXRDb250 ZW50QnJvd3Nlcik6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9Db250ZW50Vmlldy5q czoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db250ZW50Vmlldy5wcm90b3R5cGUuZ2V0IHN1cHBv cnRzU3BsaXRDb250ZW50QnJvd3Nlcik6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9O ZXR3b3JrVGFiQ29udGVudFZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTmV0d29ya1Rh YkNvbnRlbnRWaWV3LnByb3RvdHlwZS5nZXQgc3VwcG9ydHNTcGxpdENvbnRlbnRCcm93c2VyKToK KyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lVGFiQ29udGVudFZpZXcuanM6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVUYWJDb250ZW50Vmlldy5wcm90b3R5cGUu Z2V0IHN1cHBvcnRzU3BsaXRDb250ZW50QnJvd3Nlcik6CisgICAgICAgIFVwZGF0ZSBzdXBwb3J0 c1NwbGl0Q29udGVudEJyb3dzZXIgZnVuY3Rpb25zIHRvIG9ubHkgYmUgdHJ1ZS9mYWxzZSBiYXNl ZCBvbiB0aGUgcmV0dXJuIHZhbHVlCisgICAgICAgIG9mIFdlYkluc3BlY3Rvci5kb2NrZWRDb25m aWd1cmF0aW9uU3VwcG9ydHNTcGxpdENvbnRlbnRCcm93c2VyLgorCiAyMDE3LTAxLTEzICBEZXZp biBSb3Vzc28gIDxkY3JvdXNzbyt3ZWJraXRAZ21haWwuY29tPgogCiAgICAgICAgIFdlYiBJbnNw ZWN0b3I6IFNldHRpbmdzIHRhYiBpcyByZXN0b3JlZCB3aGVuIHJlb3BlbmluZyBpbnNwZWN0b3IK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvTWFp bi5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvTWFpbi5qcwpp bmRleCBhZTE1MDkxZGU0NmM0NDUzYmMwOTE2ZjFiNzI3MzBmMzMwNGI3YTk0Li4yYWE2NjgwODNk NzNkOWMyNjdjNDY2MjA3YzU5NWY3NzYxMTkyNGZiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL01haW4uanMKKysrIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9NYWluLmpzCkBAIC04ODIsNiArODgyLDExIEBAIFdl Ykluc3BlY3Rvci5pc1Nob3dpbmdTcGxpdENvbnNvbGUgPSBmdW5jdGlvbigpCiAgICAgcmV0dXJu ICF0aGlzLnNwbGl0Q29udGVudEJyb3dzZXIuZWxlbWVudC5jbGFzc0xpc3QuY29udGFpbnMoImhp ZGRlbiIpOwogfTsKIAorV2ViSW5zcGVjdG9yLmRvY2tlZENvbmZpZ3VyYXRpb25TdXBwb3J0c1Nw bGl0Q29udGVudEJyb3dzZXIgPSBmdW5jdGlvbigpCit7CisgICAgcmV0dXJuIHRoaXMuX2RvY2tD b25maWd1cmF0aW9uICE9PSBXZWJJbnNwZWN0b3IuRG9ja0NvbmZpZ3VyYXRpb24uQm90dG9tOwor fTsKKwogV2ViSW5zcGVjdG9yLmRvZXNDdXJyZW50VGFiU3VwcG9ydFNwbGl0Q29udGVudEJyb3dz ZXIgPSBmdW5jdGlvbigpCiB7CiAgICAgdmFyIGN1cnJlbnRDb250ZW50VmlldyA9IHRoaXMudGFi QnJvd3Nlci5zZWxlY3RlZFRhYkNvbnRlbnRWaWV3OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ2x1c3RlckNvbnRlbnRWaWV3LmpzIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ2x1c3RlckNvbnRlbnRWaWV3 LmpzCmluZGV4IDIwMDE5MGZhY2M2MTg0YzQyZTU1YzhkMDAwOTZiMmE1OTU2MzBiMDYuLjA0ZTE5 Njg3OWUyZTdiNjQ2ZWRlOGQ2ZWQwNTBjZGRhNDJhNzdiNTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NsdXN0ZXJDb250ZW50Vmlldy5qcwor KysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9DbHVzdGVyQ29u dGVudFZpZXcuanMKQEAgLTU3LDcgKzU3LDcgQEAgV2ViSW5zcGVjdG9yLkNsdXN0ZXJDb250ZW50 VmlldyA9IGNsYXNzIENsdXN0ZXJDb250ZW50VmlldyBleHRlbmRzIFdlYkluc3BlY3Rvci4KICAg ICB7CiAgICAgICAgIGlmICh0aGlzLl9jb250ZW50Vmlld0NvbnRhaW5lci5jdXJyZW50Q29udGVu dFZpZXcpCiAgICAgICAgICAgICByZXR1cm4gdGhpcy5fY29udGVudFZpZXdDb250YWluZXIuY3Vy cmVudENvbnRlbnRWaWV3LnN1cHBvcnRzU3BsaXRDb250ZW50QnJvd3NlcjsKLSAgICAgICAgcmV0 dXJuIHRydWU7CisgICAgICAgIHJldHVybiBXZWJJbnNwZWN0b3IuZG9ja2VkQ29uZmlndXJhdGlv blN1cHBvcnRzU3BsaXRDb250ZW50QnJvd3NlcigpOwogICAgIH0KIAogICAgIHNob3duKCkKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvbnRl bnRWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29u dGVudFZpZXcuanMKaW5kZXggYzNhOGQ4ODE4OThmZGI0ZGZiYmUwMzQ0M2VjM2M3NzNlNzYyZWU5 YS4uNGQ1YWZhOGY0MWIwNWI4MGI1NTA3ZDc4Nzc2OTQ5ZDU0MzJkODQ4NSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29udGVudFZpZXcuanMK KysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29udGVudFZp ZXcuanMKQEAgLTMxMCw3ICszMTAsNyBAQCBXZWJJbnNwZWN0b3IuQ29udGVudFZpZXcgPSBjbGFz cyBDb250ZW50VmlldyBleHRlbmRzIFdlYkluc3BlY3Rvci5WaWV3CiAgICAgZ2V0IHN1cHBvcnRz U3BsaXRDb250ZW50QnJvd3NlcigpCiAgICAgewogICAgICAgICAvLyBJbXBsZW1lbnRlZCBieSBz dWJjbGFzc2VzLgotICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAgICAgcmV0dXJuIFdlYkluc3Bl Y3Rvci5kb2NrZWRDb25maWd1cmF0aW9uU3VwcG9ydHNTcGxpdENvbnRlbnRCcm93c2VyKCk7CiAg ICAgfQogCiAgICAgc2hvd24oKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvTmV0d29ya1RhYkNvbnRlbnRWaWV3LmpzIGIvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTmV0d29ya1RhYkNvbnRlbnRWaWV3LmpzCmlu ZGV4IDM4NjdhNmE2MTlhOGQ1MDg0YzcyOTk1YmI4NzcwZWFiZGRiZThlZmIuLmUyZDlmNmJhMDMz YmYzNDY2MDE5NjFiNTdlN2Y2MTYwNzFkMzlkMzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL05ldHdvcmtUYWJDb250ZW50Vmlldy5qcworKysg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9OZXR3b3JrVGFiQ29u dGVudFZpZXcuanMKQEAgLTYxLDcgKzYxLDcgQEAgV2ViSW5zcGVjdG9yLk5ldHdvcmtUYWJDb250 ZW50VmlldyA9IGNsYXNzIE5ldHdvcmtUYWJDb250ZW50VmlldyBleHRlbmRzIFdlYkluc3AKIAog ICAgIGdldCBzdXBwb3J0c1NwbGl0Q29udGVudEJyb3dzZXIoKQogICAgIHsKLSAgICAgICAgcmV0 dXJuIGZhbHNlOworICAgICAgICByZXR1cm4gV2ViSW5zcGVjdG9yLmRvY2tlZENvbmZpZ3VyYXRp b25TdXBwb3J0c1NwbGl0Q29udGVudEJyb3dzZXIoKTsKICAgICB9CiB9OwogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVRhYkNv bnRlbnRWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv VGltZWxpbmVUYWJDb250ZW50Vmlldy5qcwppbmRleCA5NWRmZmZiMWVlOGY0NTg0NmEzN2UyYWRh ZDQ1OWVkZDBmZjA2ZTM2Li5mYTUzZjFjMDA5ZjM3MDA0ZmRiZmRiN2Q3NDkyZjc3N2JmYTZlOTEw IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9U aW1lbGluZVRhYkNvbnRlbnRWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lVGFiQ29udGVudFZpZXcuanMKQEAgLTMxMSw3ICszMTEs NyBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVUYWJDb250ZW50VmlldyA9IGNsYXNzIFRpbWVsaW5l VGFiQ29udGVudFZpZXcgZXh0ZW5kcyBXZWJJbgogCiAgICAgZ2V0IHN1cHBvcnRzU3BsaXRDb250 ZW50QnJvd3NlcigpCiAgICAgewotICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgIHJldHVy biBXZWJJbnNwZWN0b3IuZG9ja2VkQ29uZmlndXJhdGlvblN1cHBvcnRzU3BsaXRDb250ZW50QnJv d3NlcigpOwogICAgIH0KIAogICAgIC8vIFByb3RlY3RlZAo= 299016 2017-01-16 21:13:11 -0800 2017-01-18 21:11:00 -0800 Patch bug-167075-20170116221123.patch text/plain 5349 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDk1OTEyOTYxZjYzN2QwOWRhNGZmZDczOGNlMmU3 MjZkNjA5N2RlMDguLmVmOGJkNTE5NmU0OTRkZWQ2YjQyYzkxZWY2NzhjZjIwMTc1MGFjYTkgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDE3LTAxLTE2ICBEZXZp biBSb3Vzc28gIDxkY3JvdXNzbyt3ZWJraXRAZ21haWwuY29tPgorCisgICAgICAgIFdlYiBJbnNw ZWN0b3I6IHNwbGl0IGNvbnNvbGUgc2hvdWxkIGJlIGFsbG93ZWQgZm9yIE5ldHdvcmsgYW5kIFRp bWVsaW5lIHRhYnMgd2hlbiBJbnNwZWN0b3IgaXMgbm90IGRvY2tlZAorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTY3MDc1CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL0Jhc2UvTWFp bi5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5kb2NrZWRDb25maWd1cmF0aW9uU3VwcG9ydHNT cGxpdENvbnRlbnRCcm93c2VyKToKKyAgICAgICAgSGVscGVyIGZ1bmN0aW9uIHRvIGRldGVybWlu ZSBpZiB0aGUgY3VycmVudCBkb2NrZWQgc3RhdGUgc3VwcG9ydHMgaGF2aW5nIHRoZSBjb250ZW50 IHZpZXcKKyAgICAgICAgYW5kIHNwbGl0IGNvbnNvbGUgYXQgdGhlIHNhbWUgdGltZS4gIEN1cnJl bnRseSBzZXQgdG8gYmUgdHJ1ZSBpZiBub3QgZG9ja2VkIGJvdHRvbS4KKworICAgICAgICAqIFVz ZXJJbnRlcmZhY2UvVmlld3MvQ2x1c3RlckNvbnRlbnRWaWV3LmpzOgorICAgICAgICAoV2ViSW5z cGVjdG9yLkNsdXN0ZXJDb250ZW50Vmlldy5wcm90b3R5cGUuZ2V0IHN1cHBvcnRzU3BsaXRDb250 ZW50QnJvd3Nlcik6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9Db250ZW50Vmlldy5q czoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db250ZW50Vmlldy5wcm90b3R5cGUuZ2V0IHN1cHBv cnRzU3BsaXRDb250ZW50QnJvd3Nlcik6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9O ZXR3b3JrVGFiQ29udGVudFZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTmV0d29ya1Rh YkNvbnRlbnRWaWV3LnByb3RvdHlwZS5nZXQgc3VwcG9ydHNTcGxpdENvbnRlbnRCcm93c2VyKToK KyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lVGFiQ29udGVudFZpZXcuanM6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVUYWJDb250ZW50Vmlldy5wcm90b3R5cGUu Z2V0IHN1cHBvcnRzU3BsaXRDb250ZW50QnJvd3Nlcik6IERlbGV0ZWQuCisgICAgICAgIFVwZGF0 ZSBzdXBwb3J0c1NwbGl0Q29udGVudEJyb3dzZXIgZnVuY3Rpb25zIHRvIG9ubHkgYmUgdHJ1ZS9m YWxzZSBiYXNlZCBvbiB0aGUgcmV0dXJuIHZhbHVlCisgICAgICAgIG9mIFdlYkluc3BlY3Rvci5k b2NrZWRDb25maWd1cmF0aW9uU3VwcG9ydHNTcGxpdENvbnRlbnRCcm93c2VyLgorCiAyMDE3LTAx LTEzICBEZXZpbiBSb3Vzc28gIDxkY3JvdXNzbyt3ZWJraXRAZ21haWwuY29tPgogCiAgICAgICAg IFdlYiBJbnNwZWN0b3I6IFNldHRpbmdzIHRhYiBpcyByZXN0b3JlZCB3aGVuIHJlb3BlbmluZyBp bnNwZWN0b3IKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L0Jhc2UvTWFpbi5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2Uv TWFpbi5qcwppbmRleCBhZTE1MDkxZGU0NmM0NDUzYmMwOTE2ZjFiNzI3MzBmMzMwNGI3YTk0Li4y YWE2NjgwODNkNzNkOWMyNjdjNDY2MjA3YzU5NWY3NzYxMTkyNGZiIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL01haW4uanMKKysrIGIvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9NYWluLmpzCkBAIC04ODIsNiArODgy LDExIEBAIFdlYkluc3BlY3Rvci5pc1Nob3dpbmdTcGxpdENvbnNvbGUgPSBmdW5jdGlvbigpCiAg ICAgcmV0dXJuICF0aGlzLnNwbGl0Q29udGVudEJyb3dzZXIuZWxlbWVudC5jbGFzc0xpc3QuY29u dGFpbnMoImhpZGRlbiIpOwogfTsKIAorV2ViSW5zcGVjdG9yLmRvY2tlZENvbmZpZ3VyYXRpb25T dXBwb3J0c1NwbGl0Q29udGVudEJyb3dzZXIgPSBmdW5jdGlvbigpCit7CisgICAgcmV0dXJuIHRo aXMuX2RvY2tDb25maWd1cmF0aW9uICE9PSBXZWJJbnNwZWN0b3IuRG9ja0NvbmZpZ3VyYXRpb24u Qm90dG9tOworfTsKKwogV2ViSW5zcGVjdG9yLmRvZXNDdXJyZW50VGFiU3VwcG9ydFNwbGl0Q29u dGVudEJyb3dzZXIgPSBmdW5jdGlvbigpCiB7CiAgICAgdmFyIGN1cnJlbnRDb250ZW50VmlldyA9 IHRoaXMudGFiQnJvd3Nlci5zZWxlY3RlZFRhYkNvbnRlbnRWaWV3OwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ2x1c3RlckNvbnRlbnRWaWV3 LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ2x1c3RlckNv bnRlbnRWaWV3LmpzCmluZGV4IDIwMDE5MGZhY2M2MTg0YzQyZTU1YzhkMDAwOTZiMmE1OTU2MzBi MDYuLjcxNzdiZGRmMzljNGNkZWM0MWI1N2EzZjc0YmZmYjNlYTY5YmFjNWUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NsdXN0ZXJDb250ZW50 Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9D bHVzdGVyQ29udGVudFZpZXcuanMKQEAgLTU3LDcgKzU3LDggQEAgV2ViSW5zcGVjdG9yLkNsdXN0 ZXJDb250ZW50VmlldyA9IGNsYXNzIENsdXN0ZXJDb250ZW50VmlldyBleHRlbmRzIFdlYkluc3Bl Y3Rvci4KICAgICB7CiAgICAgICAgIGlmICh0aGlzLl9jb250ZW50Vmlld0NvbnRhaW5lci5jdXJy ZW50Q29udGVudFZpZXcpCiAgICAgICAgICAgICByZXR1cm4gdGhpcy5fY29udGVudFZpZXdDb250 YWluZXIuY3VycmVudENvbnRlbnRWaWV3LnN1cHBvcnRzU3BsaXRDb250ZW50QnJvd3NlcjsKLSAg ICAgICAgcmV0dXJuIHRydWU7CisKKyAgICAgICAgcmV0dXJuIHN1cGVyLnN1cHBvcnRzU3BsaXRD b250ZW50QnJvd3NlcjsKICAgICB9CiAKICAgICBzaG93bigpCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db250ZW50Vmlldy5qcyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvbnRlbnRWaWV3LmpzCmluZGV4 IGMzYThkODgxODk4ZmRiNGRmYmJlMDM0NDNlYzNjNzczZTc2MmVlOWEuLjRkNWFmYThmNDFiMDVi ODBiNTUwN2Q3ODc3Njk0OWQ1NDMyZDg0ODUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvbnRlbnRWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvbnRlbnRWaWV3LmpzCkBAIC0zMTAsNyAr MzEwLDcgQEAgV2ViSW5zcGVjdG9yLkNvbnRlbnRWaWV3ID0gY2xhc3MgQ29udGVudFZpZXcgZXh0 ZW5kcyBXZWJJbnNwZWN0b3IuVmlldwogICAgIGdldCBzdXBwb3J0c1NwbGl0Q29udGVudEJyb3dz ZXIoKQogICAgIHsKICAgICAgICAgLy8gSW1wbGVtZW50ZWQgYnkgc3ViY2xhc3Nlcy4KLSAgICAg ICAgcmV0dXJuIHRydWU7CisgICAgICAgIHJldHVybiBXZWJJbnNwZWN0b3IuZG9ja2VkQ29uZmln dXJhdGlvblN1cHBvcnRzU3BsaXRDb250ZW50QnJvd3NlcigpOwogICAgIH0KIAogICAgIHNob3du KCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L05ldHdvcmtUYWJDb250ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL05ldHdvcmtUYWJDb250ZW50Vmlldy5qcwppbmRleCAzODY3YTZhNjE5YThk NTA4NGM3Mjk5NWJiODc3MGVhYmRkYmU4ZWZiLi4wZTkwYTA3NTZhODQwZTljOGQwN2ZhNmJhYTM0 ODk1OWE3OWYzZDRmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9OZXR3b3JrVGFiQ29udGVudFZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTmV0d29ya1RhYkNvbnRlbnRWaWV3LmpzCkBAIC02 MSw2ICs2MSw4IEBAIFdlYkluc3BlY3Rvci5OZXR3b3JrVGFiQ29udGVudFZpZXcgPSBjbGFzcyBO ZXR3b3JrVGFiQ29udGVudFZpZXcgZXh0ZW5kcyBXZWJJbnNwCiAKICAgICBnZXQgc3VwcG9ydHNT cGxpdENvbnRlbnRCcm93c2VyKCkKICAgICB7CisgICAgICAgIC8vIFNpbmNlIHRoZSBOZXR3b3Jr IHRhYiBoYXMgYSByZWFsIHNpZGViYXIsIHNob3dpbmcgdGhlIHNwbGl0IGNvbnNvbGUgd291bGQg Y2F1c2UgaXRlbXMgaW4KKyAgICAgICAgLy8gdGhlIHNpZGViYXIgdG8gYmUgYWxpZ25lZCB3aXRo IGFuIGl0ZW0gaW4gdGhlIGRhdGFncmlkIHRoYXQgaXNuJ3Qgc2hvd24uCiAgICAgICAgIHJldHVy biBmYWxzZTsKICAgICB9CiB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVUYWJDb250ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lVGFiQ29udGVudFZpZXcuanMK aW5kZXggOTVkZmZmYjFlZThmNDU4NDZhMzdlMmFkYWQ0NTllZGQwZmYwNmUzNi4uMWM1NmNhNjI1 Y2U3YTc4NjgyZTAwMTE4YTg5YTI3MjAyODBiMzBkOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVUYWJDb250ZW50Vmlldy5qcwor KysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVRh YkNvbnRlbnRWaWV3LmpzCkBAIC0zMDksMTEgKzMwOSw2IEBAIFdlYkluc3BlY3Rvci5UaW1lbGlu ZVRhYkNvbnRlbnRWaWV3ID0gY2xhc3MgVGltZWxpbmVUYWJDb250ZW50VmlldyBleHRlbmRzIFdl YkluCiAgICAgICAgIHJldHVybiByZXByZXNlbnRlZE9iamVjdCBpbnN0YW5jZW9mIFdlYkluc3Bl Y3Rvci5UaW1lbGluZVJlY29yZGluZzsKICAgICB9CiAKLSAgICBnZXQgc3VwcG9ydHNTcGxpdENv bnRlbnRCcm93c2VyKCkKLSAgICB7Ci0gICAgICAgIHJldHVybiBmYWxzZTsKLSAgICB9Ci0KICAg ICAvLyBQcm90ZWN0ZWQKIAogICAgIHJlc3RvcmVGcm9tQ29va2llKGNvb2tpZSkK