[gtk+] Revert "ScrolledWindow—Don’t req size for auto-hidden bars"

[Daniel Boles <dboles src gnome org>]

commit 10e49a2861f4aa23f1946b287c713bbce84d93b0
Author: Daniel Boles <dboles src gnome org>
Date:   Wed Feb 22 19:13:49 2017 +0000

    Revert "ScrolledWindow—Don’t req size for auto-hidden bars"
    
    This reverts commit 901e5ff3a36b74b8ae4c19f4f20e84bc70b44913.
    
    This causes criticals in e.g. the Text View: Multiple Buffers demo.
    More work is required to get a fix for Bug 778853 that does not cause
    anything else to regress.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=778853

 gtk/gtkscrolledwindow.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c
index 238f1dc..b51875c 100644
--- a/gtk/gtkscrolledwindow.c
+++ b/gtk/gtkscrolledwindow.c
@@ -1784,7 +1784,7 @@ gtk_scrolled_window_measure (GtkCssGadget   *gadget,
    * Now add to the requisition any additional space for surrounding scrollbars
    * and the special scrollable border.
    */
-  if (priv->hscrollbar_policy == GTK_POLICY_ALWAYS)
+  if (policy_may_be_visible (priv->hscrollbar_policy))
     {
       minimum_req.width = MAX (minimum_req.width, hscrollbar_requisition.width + sborder.left + 
sborder.right);
       natural_req.width = MAX (natural_req.width, hscrollbar_requisition.width + sborder.left + 
sborder.right);
@@ -1796,7 +1796,7 @@ gtk_scrolled_window_measure (GtkCssGadget   *gadget,
        }
     }
 
-  if (priv->vscrollbar_policy == GTK_POLICY_ALWAYS)
+  if (policy_may_be_visible (priv->vscrollbar_policy))
     {
       minimum_req.height = MAX (minimum_req.height, vscrollbar_requisition.height + sborder.top + 
sborder.bottom);
       natural_req.height = MAX (natural_req.height, vscrollbar_requisition.height + sborder.top + 
sborder.bottom);