[metacity] Revert "theme: use invisible borders only with compositing manager"

[Alberts Muktupāvels <muktupavels src gnome org>]

commit 42bdfedbc87225c3bb09a22e7b8eff04d35467f7
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Mon Feb 9 21:54:10 2015 +0200

    Revert "theme: use invisible borders only with compositing manager"
    
    This reverts commit 43250740ab2a56991744a1525bad2930d7541595.

 src/core/frame.c |    2 +-
 src/ui/theme.c   |   23 ++++-------------------
 2 files changed, 5 insertions(+), 20 deletions(-)
---
diff --git a/src/core/frame.c b/src/core/frame.c
index 6ab3186..6305963 100644
--- a/src/core/frame.c
+++ b/src/core/frame.c
@@ -49,7 +49,7 @@ prefs_changed_callback (MetaPreference preference,
     {
       case META_PREF_COMPOSITING_MANAGER:
         frame->need_reapply_frame_shape = TRUE;
-        meta_window_queue (frame->window, META_QUEUE_MOVE_RESIZE);
+        update_shape (frame);
         break;
       default:
         break;
diff --git a/src/ui/theme.c b/src/ui/theme.c
index 9634eac..af65681 100644
--- a/src/ui/theme.c
+++ b/src/ui/theme.c
@@ -52,7 +52,6 @@
 
 #include <config.h>
 #include "frames.h" /* for META_TYPE_FRAMES */
-#include "prefs.h"
 #include "theme.h"
 #include "theme-parser.h"
 #include "util.h"
@@ -410,7 +409,6 @@ meta_frame_layout_get_borders (const MetaFrameLayout *layout,
                                MetaFrameBorders      *borders)
 {
   int buttons_height, title_height;
-  GtkBorder invisible_border;
 
   meta_frame_borders_clear (borders);
 
@@ -434,31 +432,18 @@ meta_frame_layout_get_borders (const MetaFrameLayout *layout,
   borders->visible.right = layout->right_width;
   borders->visible.bottom = layout->bottom_height;
 
-  invisible_border.left = layout->invisible_border.left;
-  invisible_border.right = layout->invisible_border.right;
-  invisible_border.bottom = layout->invisible_border.bottom;
-  invisible_border.top = layout->invisible_border.top;
-
-  if (!meta_prefs_get_compositing_manager ())
-    {
-      invisible_border.left = 0;
-      invisible_border.right = 0;
-      invisible_border.bottom = 0;
-      invisible_border.top = 0;
-    }
-
   if (flags & META_FRAME_ALLOWS_HORIZONTAL_RESIZE)
     {
-      borders->invisible.left = invisible_border.left;
-      borders->invisible.right = invisible_border.right;
+      borders->invisible.left = layout->invisible_border.left;
+      borders->invisible.right = layout->invisible_border.right;
     }
 
   if (flags & META_FRAME_ALLOWS_VERTICAL_RESIZE)
     {
-      borders->invisible.bottom = invisible_border.bottom;
+      borders->invisible.bottom = layout->invisible_border.bottom;
 
       if (type != META_FRAME_TYPE_ATTACHED)
-        borders->invisible.top = invisible_border.top;
+        borders->invisible.top = layout->invisible_border.top;
     }
 
   borders->total.left = borders->invisible.left + borders->visible.left;