188534 2018-08-13 14:47:33 -0700 Web Inspector: Table should handle row selection instead of the table delegate 2018-08-13 15:44:26 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 mattbaker mattbaker commit-queue inspector-bugzilla-changes joepeck webkit-bug-importer oldest_to_newest 1449784 0 mattbaker 2018-08-13 14:47:33 -0700 To prevent selection, the table delegate can implement `tableShouldSelectRow`, similar to NSTableViewDelegate's shouldSelectRow. 1449785 1 webkit-bug-importer 2018-08-13 14:47:57 -0700 <rdar://problem/43253335> 1449786 2 347043 mattbaker 2018-08-13 14:54:18 -0700 Created attachment 347043 Patch 1449791 3 347043 joepeck 2018-08-13 15:01:36 -0700 Comment on attachment 347043 Patch r=me 1449792 4 347043 joepeck 2018-08-13 15:02:29 -0700 Comment on attachment 347043 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=347043&action=review > Source/WebInspectorUI/UserInterface/Views/ResourceCookiesContentView.js:43 > + tableShouldSelectRow(table, cell, column, rowIndex) This should be under the delegate section (~20 lines down), not the data source. 1449798 5 347047 mattbaker 2018-08-13 15:05:23 -0700 Created attachment 347047 Patch for landing 1449820 6 347047 commit-queue 2018-08-13 15:44:25 -0700 Comment on attachment 347047 Patch for landing Clearing flags on attachment: 347047 Committed r234822: <https://trac.webkit.org/changeset/234822> 1449821 7 commit-queue 2018-08-13 15:44:26 -0700 All reviewed patches have been landed. Closing bug. 347043 2018-08-13 14:54:18 -0700 2018-08-13 15:05:21 -0700 Patch bug-188534-20180813145415.patch text/plain 5123 mattbaker U3VidmVyc2lvbiBSZXZpc2lvbjogMjM0NzY4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCA2 OTc3MzhjZGZhYjNiZjA4ZjJjNmNjZTYxZGJkNjhjYzBmMGIwZDNmLi4xODA5NTE0YzFmMDdmYzli NGI3ZjQxNTFjODMwZTk5N2M3M2YxOWY1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyNiBAQAorMjAxOC0wOC0xMyAgTWF0dCBCYWtlciAgPG1hdHRiYWtlckBhcHBsZS5jb20+ CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogVGFibGUgc2hvdWxkIGhhbmRsZSByb3cgc2VsZWN0 aW9uIGluc3RlYWQgb2YgdGhlIHRhYmxlIGRlbGVnYXRlCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODg1MzQKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVt LzQzMjUzMzM1PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIFJvdyBzZWxlY3Rpb24gc2hvdWxkIGJlIGltcGxlbWVudGVkIGJ5IFRhYmxlLCByYXRoZXIg dGhhbiBpdHMgZGVsZWdhdGUuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL05ldHdv cmtUYWJsZUNvbnRlbnRWaWV3LmpzOgorICAgICAgICAoV0kuTmV0d29ya1RhYmxlQ29udGVudFZp ZXcucHJvdG90eXBlLnRhYmxlU2hvdWxkU2VsZWN0Um93KToKKyAgICAgICAgKFdJLk5ldHdvcmtU YWJsZUNvbnRlbnRWaWV3LnByb3RvdHlwZS50YWJsZUNlbGxNb3VzZURvd24pOiBEZWxldGVkLgor ICAgICAgICBQcmV2ZW50IHNlbGVjdGlvbiB1bmxlc3MgdGhlIGNsaWNrZWQgY2VsbCBiZWxvbmdz IHRvIHRoZSBuYW1lIGNvbHVtbi4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvUmVz b3VyY2VDb29raWVzQ29udGVudFZpZXcuanM6CisgICAgICAgIChXSS5SZXNvdXJjZUNvb2tpZXND b250ZW50Vmlldy5wcm90b3R5cGUudGFibGVTaG91bGRTZWxlY3RSb3cpOgorICAgICAgICBBbHdh eXMgcHJldmVudCBzZWxlY3Rpb24uCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1Rh YmxlLmpzOgorICAgICAgICAoV0kuVGFibGUpOgorICAgICAgICAoV0kuVGFibGUucHJvdG90eXBl Ll9oYW5kbGVNb3VzZURvd24pOgorCiAyMDE4LTA4LTA5ICBOaWtpdGEgVmFzaWx5ZXYgIDxudmFz aWx5ZXZAYXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IERhcmsgTW9kZTogU291 cmNlQ29kZVRleHRFZGl0b3IgZXJyb3Ivd2FybmluZyB0ZXh0IHdpZGdldCBpcyB0b28gbGlnaHQK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL05l dHdvcmtUYWJsZUNvbnRlbnRWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvTmV0d29ya1RhYmxlQ29udGVudFZpZXcuanMKaW5kZXggMGM5ZmIwMmRmZmQ1 NjU3OTE1OGFlNjUxNTUyNGQzNjVlN2U0MzllMS4uYjU0ZmJjMWNjZDAwZTJlOGI2MjVkYzEzMzgz NTg3MGY4MWE4YTVlNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvTmV0d29ya1RhYmxlQ29udGVudFZpZXcuanMKKysrIGIvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTmV0d29ya1RhYmxlQ29udGVudFZpZXcuanMK QEAgLTMyNCwxNCArMzI0LDYgQEAgV0kuTmV0d29ya1RhYmxlQ29udGVudFZpZXcgPSBjbGFzcyBO ZXR3b3JrVGFibGVDb250ZW50VmlldyBleHRlbmRzIFdJLkNvbnRlbnRWaWUKIAogICAgIC8vIFRh YmxlIGRlbGVnYXRlCiAKLSAgICB0YWJsZUNlbGxNb3VzZURvd24odGFibGUsIGNlbGwsIGNvbHVt biwgcm93SW5kZXgsIGV2ZW50KQotICAgIHsKLSAgICAgICAgaWYgKGNvbHVtbiAhPT0gdGhpcy5f bmFtZUNvbHVtbikKLSAgICAgICAgICAgIHJldHVybjsKLQotICAgICAgICB0aGlzLl90YWJsZS5z ZWxlY3RSb3cocm93SW5kZXgpOwotICAgIH0KLQogICAgIHRhYmxlQ2VsbENvbnRleHRNZW51Q2xp Y2tlZCh0YWJsZSwgY2VsbCwgY29sdW1uLCByb3dJbmRleCwgZXZlbnQpCiAgICAgewogICAgICAg ICBpZiAoY29sdW1uICE9PSB0aGlzLl9uYW1lQ29sdW1uKQpAQCAtMzQ3LDYgKzMzOSwxMSBAQCBX SS5OZXR3b3JrVGFibGVDb250ZW50VmlldyA9IGNsYXNzIE5ldHdvcmtUYWJsZUNvbnRlbnRWaWV3 IGV4dGVuZHMgV0kuQ29udGVudFZpZQogICAgICAgICBjb250ZXh0TWVudS5hcHBlbmRJdGVtKFdJ LlVJU3RyaW5nKCJFeHBvcnQgSEFSIiksICgpID0+IHsgdGhpcy5fZXhwb3J0SEFSKCk7IH0pOwog ICAgIH0KIAorICAgIHRhYmxlU2hvdWxkU2VsZWN0Um93KHRhYmxlLCBjZWxsLCBjb2x1bW4sIHJv d0luZGV4KQorICAgIHsKKyAgICAgICAgcmV0dXJuIGNvbHVtbiA9PT0gdGhpcy5fbmFtZUNvbHVt bjsKKyAgICB9CisKICAgICB0YWJsZVNlbGVjdGVkUm93Q2hhbmdlZCh0YWJsZSwgcm93SW5kZXgp CiAgICAgewogICAgICAgICBpZiAoaXNOYU4ocm93SW5kZXgpKSB7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9SZXNvdXJjZUNvb2tpZXNDb250 ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Jl c291cmNlQ29va2llc0NvbnRlbnRWaWV3LmpzCmluZGV4IDVlZTA0NGJiY2U3YTAxMjJkYTMxYTBh MWMxNTk4YjI0Yjc5OTc1YjguLjI1ZDE4YjBjMGRiYjc4ZTcxMmIzZDM5NWM2ODMwZmE4MWFkMTY1 OGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L1Jlc291cmNlQ29va2llc0NvbnRlbnRWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Jlc291cmNlQ29va2llc0NvbnRlbnRWaWV3LmpzCkBAIC00 MCw2ICs0MCwxMSBAQCBXSS5SZXNvdXJjZUNvb2tpZXNDb250ZW50VmlldyA9IGNsYXNzIFJlc291 cmNlQ29va2llc0NvbnRlbnRWaWV3IGV4dGVuZHMgV0kuQ29udAogCiAgICAgLy8gVGFibGUgZGF0 YVNvdXJjZQogCisgICAgdGFibGVTaG91bGRTZWxlY3RSb3codGFibGUsIGNlbGwsIGNvbHVtbiwg cm93SW5kZXgpCisgICAgeworICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgfQorCiAgICAgdGFi bGVOdW1iZXJPZlJvd3ModGFibGUpCiAgICAgewogICAgICAgICByZXR1cm4gdGhpcy5fZGF0YVNv dXJjZUZvclRhYmxlKHRhYmxlKS5sZW5ndGg7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UYWJsZS5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RhYmxlLmpzCmluZGV4IGMyNjMyMzk5MGJmNTQyOGE5Nzkz MDYzYmIwYzkxZGQ4MzNiYTkwZjYuLmIzMzVhOWNjYWM0N2NhMGFjYzVkZmJmMzNlY2VkMmM1NWJi ZDFjMmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL1RhYmxlLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL1RhYmxlLmpzCkBAIC0xLDUgKzEsNSBAQAogLyoKLSAqIENvcHlyaWdodCAoQykgMjAwOC0y MDE3IEFwcGxlIEluYy4gQWxsIFJpZ2h0cyBSZXNlcnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAw OC0yMDE4IEFwcGxlIEluYy4gQWxsIFJpZ2h0cyBSZXNlcnZlZC4KICAqCiAgKiBSZWRpc3RyaWJ1 dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQK ICAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dp bmcgY29uZGl0aW9ucwpAQCAtNTYsOCArNTYsNyBAQCBXSS5UYWJsZSA9IGNsYXNzIFRhYmxlIGV4 dGVuZHMgV0kuVmlldwogICAgICAgICB0aGlzLl9zY3JvbGxDb250YWluZXJFbGVtZW50LmNsYXNz TmFtZSA9ICJkYXRhLWNvbnRhaW5lciI7CiAgICAgICAgIHRoaXMuX3Njcm9sbENvbnRhaW5lckVs ZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigic2Nyb2xsIiwgc2Nyb2xsSGFuZGxlcik7CiAgICAgICAg IHRoaXMuX3Njcm9sbENvbnRhaW5lckVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigibW91c2V3aGVl bCIsIHNjcm9sbEhhbmRsZXIpOwotICAgICAgICBpZiAodGhpcy5fZGVsZWdhdGUudGFibGVDZWxs TW91c2VEb3duKQotICAgICAgICAgICAgdGhpcy5fc2Nyb2xsQ29udGFpbmVyRWxlbWVudC5hZGRF dmVudExpc3RlbmVyKCJtb3VzZWRvd24iLCB0aGlzLl9oYW5kbGVNb3VzZURvd24uYmluZCh0aGlz KSk7CisgICAgICAgIHRoaXMuX3Njcm9sbENvbnRhaW5lckVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5l cigibW91c2Vkb3duIiwgdGhpcy5faGFuZGxlTW91c2VEb3duLmJpbmQodGhpcykpOwogICAgICAg ICBpZiAodGhpcy5fZGVsZWdhdGUudGFibGVDZWxsQ29udGV4dE1lbnVDbGlja2VkKQogICAgICAg ICAgICAgdGhpcy5fc2Nyb2xsQ29udGFpbmVyRWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJjb250 ZXh0bWVudSIsIHRoaXMuX2hhbmRsZUNvbnRleHRNZW51LmJpbmQodGhpcykpOwogCkBAIC0xMjAy LDcgKzEyMDEsMTAgQEAgV0kuVGFibGUgPSBjbGFzcyBUYWJsZSBleHRlbmRzIFdJLlZpZXcKICAg ICAgICAgbGV0IGNvbHVtbiA9IHRoaXMuX3Zpc2libGVDb2x1bW5zW2NvbHVtbkluZGV4XTsKICAg ICAgICAgbGV0IHJvd0luZGV4ID0gcm93Ll9faW5kZXg7CiAKLSAgICAgICAgdGhpcy5fZGVsZWdh dGUudGFibGVDZWxsTW91c2VEb3duKHRoaXMsIGNlbGwsIGNvbHVtbiwgcm93SW5kZXgsIGV2ZW50 KTsKKyAgICAgICAgaWYgKHRoaXMuX2RlbGVnYXRlLnRhYmxlU2hvdWxkU2VsZWN0Um93ICYmICF0 aGlzLl9kZWxlZ2F0ZS50YWJsZVNob3VsZFNlbGVjdFJvdyh0aGlzLCBjZWxsLCBjb2x1bW4sIHJv d0luZGV4KSkKKyAgICAgICAgICAgIHJldHVybjsKKworICAgICAgICB0aGlzLnNlbGVjdFJvdyhy b3dJbmRleCk7CiAgICAgfQogCiAgICAgX2hhbmRsZUNvbnRleHRNZW51KGV2ZW50KQo= 347047 2018-08-13 15:05:23 -0700 2018-08-13 15:44:25 -0700 Patch for landing bug-188534-20180813150519.patch text/plain 5155 mattbaker U3VidmVyc2lvbiBSZXZpc2lvbjogMjM0NzY4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCA2 OTc3MzhjZGZhYjNiZjA4ZjJjNmNjZTYxZGJkNjhjYzBmMGIwZDNmLi4wMzM2ZDkwNTMzNmI3NWQ2 Nzc3N2QyMzkyOGQwMjEzNzJjNjE2NDlhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyNiBAQAorMjAxOC0wOC0xMyAgTWF0dCBCYWtlciAgPG1hdHRiYWtlckBhcHBsZS5jb20+ CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogVGFibGUgc2hvdWxkIGhhbmRsZSByb3cgc2VsZWN0 aW9uIGluc3RlYWQgb2YgdGhlIHRhYmxlIGRlbGVnYXRlCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODg1MzQKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVt LzQzMjUzMzM1PgorCisgICAgICAgIFJldmlld2VkIGJ5IEpvc2VwaCBQZWNvcmFyby4KKworICAg ICAgICBSb3cgc2VsZWN0aW9uIHNob3VsZCBiZSBpbXBsZW1lbnRlZCBieSBUYWJsZSwgcmF0aGVy IHRoYW4gaXRzIGRlbGVnYXRlLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9OZXR3 b3JrVGFibGVDb250ZW50Vmlldy5qczoKKyAgICAgICAgKFdJLk5ldHdvcmtUYWJsZUNvbnRlbnRW aWV3LnByb3RvdHlwZS50YWJsZVNob3VsZFNlbGVjdFJvdyk6CisgICAgICAgIChXSS5OZXR3b3Jr VGFibGVDb250ZW50Vmlldy5wcm90b3R5cGUudGFibGVDZWxsTW91c2VEb3duKTogRGVsZXRlZC4K KyAgICAgICAgUHJldmVudCBzZWxlY3Rpb24gdW5sZXNzIHRoZSBjbGlja2VkIGNlbGwgYmVsb25n cyB0byB0aGUgbmFtZSBjb2x1bW4uCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1Jl c291cmNlQ29va2llc0NvbnRlbnRWaWV3LmpzOgorICAgICAgICAoV0kuUmVzb3VyY2VDb29raWVz Q29udGVudFZpZXcucHJvdG90eXBlLnRhYmxlU2hvdWxkU2VsZWN0Um93KToKKyAgICAgICAgQWx3 YXlzIHByZXZlbnQgc2VsZWN0aW9uLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9U YWJsZS5qczoKKyAgICAgICAgKFdJLlRhYmxlKToKKyAgICAgICAgKFdJLlRhYmxlLnByb3RvdHlw ZS5faGFuZGxlTW91c2VEb3duKToKKwogMjAxOC0wOC0wOSAgTmlraXRhIFZhc2lseWV2ICA8bnZh c2lseWV2QGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBEYXJrIE1vZGU6IFNv dXJjZUNvZGVUZXh0RWRpdG9yIGVycm9yL3dhcm5pbmcgdGV4dCB3aWRnZXQgaXMgdG9vIGxpZ2h0 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9O ZXR3b3JrVGFibGVDb250ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL05ldHdvcmtUYWJsZUNvbnRlbnRWaWV3LmpzCmluZGV4IDBjOWZiMDJkZmZk NTY1NzkxNThhZTY1MTU1MjRkMzY1ZTdlNDM5ZTEuLmI1NGZiYzFjY2QwMGUyZThiNjI1ZGMxMzM4 MzU4NzBmODFhOGE1ZTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL05ldHdvcmtUYWJsZUNvbnRlbnRWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL05ldHdvcmtUYWJsZUNvbnRlbnRWaWV3Lmpz CkBAIC0zMjQsMTQgKzMyNCw2IEBAIFdJLk5ldHdvcmtUYWJsZUNvbnRlbnRWaWV3ID0gY2xhc3Mg TmV0d29ya1RhYmxlQ29udGVudFZpZXcgZXh0ZW5kcyBXSS5Db250ZW50VmllCiAKICAgICAvLyBU YWJsZSBkZWxlZ2F0ZQogCi0gICAgdGFibGVDZWxsTW91c2VEb3duKHRhYmxlLCBjZWxsLCBjb2x1 bW4sIHJvd0luZGV4LCBldmVudCkKLSAgICB7Ci0gICAgICAgIGlmIChjb2x1bW4gIT09IHRoaXMu X25hbWVDb2x1bW4pCi0gICAgICAgICAgICByZXR1cm47Ci0KLSAgICAgICAgdGhpcy5fdGFibGUu c2VsZWN0Um93KHJvd0luZGV4KTsKLSAgICB9Ci0KICAgICB0YWJsZUNlbGxDb250ZXh0TWVudUNs aWNrZWQodGFibGUsIGNlbGwsIGNvbHVtbiwgcm93SW5kZXgsIGV2ZW50KQogICAgIHsKICAgICAg ICAgaWYgKGNvbHVtbiAhPT0gdGhpcy5fbmFtZUNvbHVtbikKQEAgLTM0Nyw2ICszMzksMTEgQEAg V0kuTmV0d29ya1RhYmxlQ29udGVudFZpZXcgPSBjbGFzcyBOZXR3b3JrVGFibGVDb250ZW50Vmll dyBleHRlbmRzIFdJLkNvbnRlbnRWaWUKICAgICAgICAgY29udGV4dE1lbnUuYXBwZW5kSXRlbShX SS5VSVN0cmluZygiRXhwb3J0IEhBUiIpLCAoKSA9PiB7IHRoaXMuX2V4cG9ydEhBUigpOyB9KTsK ICAgICB9CiAKKyAgICB0YWJsZVNob3VsZFNlbGVjdFJvdyh0YWJsZSwgY2VsbCwgY29sdW1uLCBy b3dJbmRleCkKKyAgICB7CisgICAgICAgIHJldHVybiBjb2x1bW4gPT09IHRoaXMuX25hbWVDb2x1 bW47CisgICAgfQorCiAgICAgdGFibGVTZWxlY3RlZFJvd0NoYW5nZWQodGFibGUsIHJvd0luZGV4 KQogICAgIHsKICAgICAgICAgaWYgKGlzTmFOKHJvd0luZGV4KSkgewpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUmVzb3VyY2VDb29raWVzQ29u dGVudFZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9S ZXNvdXJjZUNvb2tpZXNDb250ZW50Vmlldy5qcwppbmRleCA1ZWUwNDRiYmNlN2EwMTIyZGEzMWEw YTFjMTU5OGIyNGI3OTk3NWI4Li5hYzAzMGM0N2IyNGI4MzBkNjJlOTJhNGExODUyYTVkMDQ0Mzcz OTMyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9SZXNvdXJjZUNvb2tpZXNDb250ZW50Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9SZXNvdXJjZUNvb2tpZXNDb250ZW50Vmlldy5qcwpAQCAt NTgsNiArNTgsMTEgQEAgV0kuUmVzb3VyY2VDb29raWVzQ29udGVudFZpZXcgPSBjbGFzcyBSZXNv dXJjZUNvb2tpZXNDb250ZW50VmlldyBleHRlbmRzIFdJLkNvbnQKIAogICAgIC8vIFRhYmxlIGRl bGVnYXRlCiAKKyAgICB0YWJsZVNob3VsZFNlbGVjdFJvdyh0YWJsZSwgY2VsbCwgY29sdW1uLCBy b3dJbmRleCkKKyAgICB7CisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICB9CisKICAgICB0YWJs ZVBvcHVsYXRlQ2VsbCh0YWJsZSwgY2VsbCwgY29sdW1uLCByb3dJbmRleCkKICAgICB7CiAgICAg ICAgIGxldCBjb29raWUgPSB0aGlzLl9kYXRhU291cmNlRm9yVGFibGUodGFibGUpW3Jvd0luZGV4 XTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L1RhYmxlLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGFi bGUuanMKaW5kZXggYzI2MzIzOTkwYmY1NDI4YTk3OTMwNjNiYjBjOTFkZDgzM2JhOTBmNi4uYjMz NWE5Y2NhYzQ3Y2EwYWNjNWRmYmYzM2VjZWQyYzU1YmJkMWMyYyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGFibGUuanMKKysrIGIvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGFibGUuanMKQEAgLTEsNSArMSw1 IEBACiAvKgotICogQ29weXJpZ2h0IChDKSAyMDA4LTIwMTcgQXBwbGUgSW5jLiBBbGwgUmlnaHRz IFJlc2VydmVkLgorICogQ29weXJpZ2h0IChDKSAyMDA4LTIwMTggQXBwbGUgSW5jLiBBbGwgUmln aHRzIFJlc2VydmVkLgogICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFu ZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAogICogbW9kaWZpY2F0aW9uLCBhcmUgcGVy bWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCkBAIC01Niw4ICs1 Niw3IEBAIFdJLlRhYmxlID0gY2xhc3MgVGFibGUgZXh0ZW5kcyBXSS5WaWV3CiAgICAgICAgIHRo aXMuX3Njcm9sbENvbnRhaW5lckVsZW1lbnQuY2xhc3NOYW1lID0gImRhdGEtY29udGFpbmVyIjsK ICAgICAgICAgdGhpcy5fc2Nyb2xsQ29udGFpbmVyRWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJz Y3JvbGwiLCBzY3JvbGxIYW5kbGVyKTsKICAgICAgICAgdGhpcy5fc2Nyb2xsQ29udGFpbmVyRWxl bWVudC5hZGRFdmVudExpc3RlbmVyKCJtb3VzZXdoZWVsIiwgc2Nyb2xsSGFuZGxlcik7Ci0gICAg ICAgIGlmICh0aGlzLl9kZWxlZ2F0ZS50YWJsZUNlbGxNb3VzZURvd24pCi0gICAgICAgICAgICB0 aGlzLl9zY3JvbGxDb250YWluZXJFbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoIm1vdXNlZG93biIs IHRoaXMuX2hhbmRsZU1vdXNlRG93bi5iaW5kKHRoaXMpKTsKKyAgICAgICAgdGhpcy5fc2Nyb2xs Q29udGFpbmVyRWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJtb3VzZWRvd24iLCB0aGlzLl9oYW5k bGVNb3VzZURvd24uYmluZCh0aGlzKSk7CiAgICAgICAgIGlmICh0aGlzLl9kZWxlZ2F0ZS50YWJs ZUNlbGxDb250ZXh0TWVudUNsaWNrZWQpCiAgICAgICAgICAgICB0aGlzLl9zY3JvbGxDb250YWlu ZXJFbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoImNvbnRleHRtZW51IiwgdGhpcy5faGFuZGxlQ29u dGV4dE1lbnUuYmluZCh0aGlzKSk7CiAKQEAgLTEyMDIsNyArMTIwMSwxMCBAQCBXSS5UYWJsZSA9 IGNsYXNzIFRhYmxlIGV4dGVuZHMgV0kuVmlldwogICAgICAgICBsZXQgY29sdW1uID0gdGhpcy5f dmlzaWJsZUNvbHVtbnNbY29sdW1uSW5kZXhdOwogICAgICAgICBsZXQgcm93SW5kZXggPSByb3cu X19pbmRleDsKIAotICAgICAgICB0aGlzLl9kZWxlZ2F0ZS50YWJsZUNlbGxNb3VzZURvd24odGhp cywgY2VsbCwgY29sdW1uLCByb3dJbmRleCwgZXZlbnQpOworICAgICAgICBpZiAodGhpcy5fZGVs ZWdhdGUudGFibGVTaG91bGRTZWxlY3RSb3cgJiYgIXRoaXMuX2RlbGVnYXRlLnRhYmxlU2hvdWxk U2VsZWN0Um93KHRoaXMsIGNlbGwsIGNvbHVtbiwgcm93SW5kZXgpKQorICAgICAgICAgICAgcmV0 dXJuOworCisgICAgICAgIHRoaXMuc2VsZWN0Um93KHJvd0luZGV4KTsKICAgICB9CiAKICAgICBf aGFuZGxlQ29udGV4dE1lbnUoZXZlbnQpCg==