[gtk/wip/otte/boxes: 17/20] xxx: cssboxes

[Benjamin Otte <otte src gnome org>]

commit 2bbb3891f570d47c85073cc8a125511e0ac421f1
Author: Benjamin Otte <otte redhat com>
Date:   Fri Feb 15 03:48:59 2019 +0100

    xxx: cssboxes

 gtk/gtkcssboxesimplprivate.h | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/gtk/gtkcssboxesimplprivate.h b/gtk/gtkcssboxesimplprivate.h
index ed42f32c98..98c1b71e0d 100644
--- a/gtk/gtkcssboxesimplprivate.h
+++ b/gtk/gtkcssboxesimplprivate.h
@@ -31,11 +31,13 @@ static inline void
 gtk_css_boxes_init (GtkCssBoxes *boxes,
                     GtkWidget   *widget)
 {
+  GtkWidgetPrivate *priv = widget->priv;
+
   gtk_css_boxes_init_content_box (boxes,
-                                  gtk_css_node_get_style (widget->priv->cssnode),
+                                  gtk_css_node_get_style (priv->cssnode),
                                   0, 0,
-                                  gtk_widget_get_width (widget),
-                                  gtk_widget_get_height (widget));
+                                  priv->width,
+                                  priv->height);
 }
 
 static inline void
@@ -203,7 +205,7 @@ gtk_css_boxes_compute_margin_rect (GtkCssBoxes *boxes)
   if (boxes->has_rect[GTK_CSS_AREA_MARGIN_BOX])
     return;
 
-  gtk_css_boxes_compute_padding_rect (boxes);
+  gtk_css_boxes_compute_border_rect (boxes);
 
   gtk_css_boxes_rect_grow (&boxes->box[GTK_CSS_AREA_MARGIN_BOX],
                            &boxes->box[GTK_CSS_AREA_BORDER_BOX],