[mutter] Revert "workspace: Use existing focus_window when asked to focus default window"

[Marge Bot <marge-bot src gnome org>]

commit c3210b0ab2a2fc4c4a38c6353c4f1ba0f18950cc
Author: Sebastian Keller <skeller gnome org>
Date:   Wed May 4 23:29:39 2022 +0200

    Revert "workspace: Use existing focus_window when asked to focus default window"
    
    This reverts commit d0de671c1d23a4869f35bd7b832871bacdfeb212.
    
    The change introduced a regression when focusing java/swing windows.
    
    Fixes: https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/5395
    Reopens: https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/5162
    Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2402>

 src/core/workspace.c | 12 ------------
 1 file changed, 12 deletions(-)
---
diff --git a/src/core/workspace.c b/src/core/workspace.c
index 357e37d894..3bd517fca6 100644
--- a/src/core/workspace.c
+++ b/src/core/workspace.c
@@ -1332,22 +1332,10 @@ meta_workspace_focus_default_window (MetaWorkspace *workspace,
                                      MetaWindow    *not_this_one,
                                      guint32        timestamp)
 {
-  MetaWindow *current_focus;
-
   if (timestamp == META_CURRENT_TIME)
     meta_warning ("META_CURRENT_TIME used to choose focus window; "
                   "focus window may not be correct.");
 
-  current_focus = workspace->display->focus_window;
-
-  if (current_focus &&
-      current_focus != not_this_one &&
-      meta_window_located_on_workspace (current_focus, workspace))
-    {
-      meta_window_focus (current_focus, timestamp);
-      return;
-    }
-
   if (meta_prefs_get_focus_mode () == G_DESKTOP_FOCUS_MODE_CLICK ||
       !workspace->display->mouse_mode)
     focus_ancestor_or_top_window (workspace, not_this_one, timestamp);