css: Remove deprecated number-as-pixels compatibility

Previously, for compatibility with GTK 3.0, we allowed specifying
numbers without units and interpreted them as pixels, even when the CSS
specification didn't.

Remove that now that we can break API.

8 files changed, 13 insertions, 41 deletions

diff --git a/gtk/gtkcsscalcvalue.c b/gtk/gtkcsscalcvalue.c
index b88751beb6..7ea27cdc78 100644
--- a/gtk/gtkcsscalcvalue.c
+++ b/gtk/gtkcsscalcvalue.c
@@ -460,8 +460,6 @@ gtk_css_calc_value_parse (GtkCssParser           *parser,
 {
   GtkCssValue *value;
 
-  /* This confuses '*' and '/' so we disallow backwards compat. */
-  flags &= ~GTK_CSS_NUMBER_AS_PIXELS;
   /* This can only be handled at compute time, we allow '-' after all */
   flags &= ~GTK_CSS_POSITIVE_ONLY;
 
diff --git a/gtk/gtkcsscornervalue.c b/gtk/gtkcsscornervalue.c
index c4ef38d94d..c5ee68ee3f 100644
--- a/gtk/gtkcsscornervalue.c
+++ b/gtk/gtkcsscornervalue.c
@@ -127,7 +127,6 @@ _gtk_css_corner_value_parse (GtkCssParser *parser)
   x = _gtk_css_number_value_parse (parser,
                                    GTK_CSS_POSITIVE_ONLY
                                    | GTK_CSS_PARSE_PERCENT
-                                   | GTK_CSS_NUMBER_AS_PIXELS
                                    | GTK_CSS_PARSE_LENGTH);
   if (x == NULL)
     return NULL;
@@ -139,7 +138,6 @@ _gtk_css_corner_value_parse (GtkCssParser *parser)
       y = _gtk_css_number_value_parse (parser,
                                        GTK_CSS_POSITIVE_ONLY
                                        | GTK_CSS_PARSE_PERCENT
-                                       | GTK_CSS_NUMBER_AS_PIXELS
                                        | GTK_CSS_PARSE_LENGTH);
       if (y == NULL)
         {
diff --git a/gtk/gtkcssnumbervalueprivate.h b/gtk/gtkcssnumbervalueprivate.h
index ddded6674c..3ea9af6b7b 100644
--- a/gtk/gtkcssnumbervalueprivate.h
+++ b/gtk/gtkcssnumbervalueprivate.h
@@ -30,10 +30,9 @@ typedef enum /*< skip >*/ {
   GTK_CSS_POSITIVE_ONLY = (1 << 0),
   GTK_CSS_PARSE_PERCENT = (1 << 1),
   GTK_CSS_PARSE_NUMBER = (1 << 2),
-  GTK_CSS_NUMBER_AS_PIXELS = (1 << 3),
-  GTK_CSS_PARSE_LENGTH = (1 << 4),
-  GTK_CSS_PARSE_ANGLE = (1 << 5),
-  GTK_CSS_PARSE_TIME = (1 << 6)
+  GTK_CSS_PARSE_LENGTH = (1 << 3),
+  GTK_CSS_PARSE_ANGLE = (1 << 4),
+  GTK_CSS_PARSE_TIME = (1 << 5)
 } GtkCssNumberParseFlags;
 
 typedef struct _GtkCssNumberValueClass GtkCssNumberValueClass;
diff --git a/gtk/gtkcssparser.c b/gtk/gtkcssparser.c
index 44ff7bcfca..960445ffb8 100644
--- a/gtk/gtkcssparser.c
+++ b/gtk/gtkcssparser.c
@@ -707,13 +707,6 @@ gtk_css_dimension_value_parse (GtkCssParser           *parser,
           else
             unit = GTK_CSS_PERCENT;
         }
-      else if (flags & GTK_CSS_NUMBER_AS_PIXELS)
-        {
-          _gtk_css_parser_error_full (parser,
-                                      GTK_CSS_PROVIDER_ERROR_DEPRECATED,
-                                      "Not using units is deprecated. Assuming 'px'.");
-          unit = GTK_CSS_PX;
-        }
       else if (flags & GTK_CSS_PARSE_NUMBER)
         {
           unit = GTK_CSS_NUMBER;
diff --git a/gtk/gtkcssshadowvalue.c b/gtk/gtkcssshadowvalue.c
index ed56504166..3c7d1160cb 100644
--- a/gtk/gtkcssshadowvalue.c
+++ b/gtk/gtkcssshadowvalue.c
@@ -235,14 +235,12 @@ _gtk_css_shadow_value_parse (GtkCssParser *parser,
         gtk_css_number_value_can_parse (parser))
       {
         values[HOFFSET] = _gtk_css_number_value_parse (parser,
-                                                       GTK_CSS_PARSE_LENGTH
-                                                       | GTK_CSS_NUMBER_AS_PIXELS);
+                                                       GTK_CSS_PARSE_LENGTH);
         if (values[HOFFSET] == NULL)
           goto fail;
 
         values[VOFFSET] = _gtk_css_number_value_parse (parser,
-                                                       GTK_CSS_PARSE_LENGTH
-                                                       | GTK_CSS_NUMBER_AS_PIXELS);
+                                                       GTK_CSS_PARSE_LENGTH);
         if (values[VOFFSET] == NULL)
           goto fail;
 
@@ -250,8 +248,7 @@ _gtk_css_shadow_value_parse (GtkCssParser *parser,
           {
             values[RADIUS] = _gtk_css_number_value_parse (parser,
                                                           GTK_CSS_PARSE_LENGTH
-                                                          | GTK_CSS_POSITIVE_ONLY
-                                                          | GTK_CSS_NUMBER_AS_PIXELS);
+                                                          | GTK_CSS_POSITIVE_ONLY);
             if (values[RADIUS] == NULL)
               goto fail;
           }
@@ -261,8 +258,7 @@ _gtk_css_shadow_value_parse (GtkCssParser *parser,
         if (box_shadow_mode && gtk_css_number_value_can_parse (parser))
           {
             values[SPREAD] = _gtk_css_number_value_parse (parser,
-                                                          GTK_CSS_PARSE_LENGTH
-                                                          | GTK_CSS_NUMBER_AS_PIXELS);
+                                                          GTK_CSS_PARSE_LENGTH);
             if (values[SPREAD] == NULL)
               goto fail;
           }
diff --git a/gtk/gtkcssshorthandpropertyimpl.c b/gtk/gtkcssshorthandpropertyimpl.c
index d16e23f982..252ed2fa4b 100644
--- a/gtk/gtkcssshorthandpropertyimpl.c
+++ b/gtk/gtkcssshorthandpropertyimpl.c
@@ -97,8 +97,7 @@ parse_margin (GtkCssShorthandProperty  *shorthand,
   return parse_four_numbers (shorthand,
                              values,
                              parser,
-                             GTK_CSS_NUMBER_AS_PIXELS
-                             | GTK_CSS_PARSE_LENGTH);
+                             GTK_CSS_PARSE_LENGTH);
 }
 
 static gboolean
@@ -110,7 +109,6 @@ parse_padding (GtkCssShorthandProperty  *shorthand,
                              values,
                              parser,
                              GTK_CSS_POSITIVE_ONLY
-                             | GTK_CSS_NUMBER_AS_PIXELS
                              | GTK_CSS_PARSE_LENGTH);
 }
 
@@ -123,7 +121,6 @@ parse_border_width (GtkCssShorthandProperty  *shorthand,
                              values,
                              parser,
                              GTK_CSS_POSITIVE_ONLY
-                             | GTK_CSS_NUMBER_AS_PIXELS
                              | GTK_CSS_PARSE_LENGTH);
 }
 
@@ -142,7 +139,6 @@ parse_border_radius (GtkCssShorthandProperty  *shorthand,
       x[i] = _gtk_css_number_value_parse (parser,
                                           GTK_CSS_POSITIVE_ONLY
                                           | GTK_CSS_PARSE_PERCENT
-                                          | GTK_CSS_NUMBER_AS_PIXELS
                                           | GTK_CSS_PARSE_LENGTH);
       if (x[i] == NULL)
         goto fail;
@@ -169,7 +165,6 @@ parse_border_radius (GtkCssShorthandProperty  *shorthand,
           y[i] = _gtk_css_number_value_parse (parser,
                                               GTK_CSS_POSITIVE_ONLY
                                               | GTK_CSS_PARSE_PERCENT
-                                              | GTK_CSS_NUMBER_AS_PIXELS
                                               | GTK_CSS_PARSE_LENGTH);
           if (y[i] == NULL)
             goto fail;
@@ -338,7 +333,6 @@ parse_border_side (GtkCssShorthandProperty  *shorthand,
       {
         values[0] = _gtk_css_number_value_parse (parser,
                                                  GTK_CSS_POSITIVE_ONLY
-                                                 | GTK_CSS_NUMBER_AS_PIXELS
                                                  | GTK_CSS_PARSE_LENGTH);
         if (values[0] == NULL)
           return FALSE;
@@ -380,7 +374,6 @@ parse_border (GtkCssShorthandProperty  *shorthand,
       {
         values[0] = _gtk_css_number_value_parse (parser,
                                                  GTK_CSS_POSITIVE_ONLY
-                                                 | GTK_CSS_NUMBER_AS_PIXELS
                                                  | GTK_CSS_PARSE_LENGTH);
         if (values[0] == NULL)
           return FALSE;
diff --git a/gtk/gtkcssstylefuncs.c b/gtk/gtkcssstylefuncs.c
index 1fe910865d..4af0db5666 100644
--- a/gtk/gtkcssstylefuncs.c
+++ b/gtk/gtkcssstylefuncs.c
@@ -203,7 +203,7 @@ int_value_parse (GtkCssParser *parser,
 
   if (_gtk_css_parser_has_prefix (parser, "-gtk"))
     {
-      GtkCssValue *cssvalue = gtk_css_win32_size_value_parse (parser, GTK_CSS_PARSE_NUMBER | GTK_CSS_NUMBER_AS_PIXELS);
+      GtkCssValue *cssvalue = gtk_css_win32_size_value_parse (parser, GTK_CSS_PARSE_NUMBER);
 
       if (cssvalue)
         {
@@ -333,7 +333,7 @@ border_value_parse (GtkCssParser *parser,
     {
       if (_gtk_css_parser_has_prefix (parser, "-gtk"))
         {
-          GtkCssValue *cssvalue = gtk_css_win32_size_value_parse (parser, GTK_CSS_PARSE_NUMBER | GTK_CSS_NUMBER_AS_PIXELS);
+          GtkCssValue *cssvalue = gtk_css_win32_size_value_parse (parser, GTK_CSS_PARSE_NUMBER);
 
           if (cssvalue)
             {
diff --git a/gtk/gtkcssstylepropertyimpl.c b/gtk/gtkcssstylepropertyimpl.c
index 8fbf512d45..dcf93617a9 100644
--- a/gtk/gtkcssstylepropertyimpl.c
+++ b/gtk/gtkcssstylepropertyimpl.c
@@ -667,8 +667,7 @@ gtk_css_font_size_value_parse (GtkCssParser *parser)
   return _gtk_css_number_value_parse (parser,
                                       GTK_CSS_PARSE_LENGTH
                                       | GTK_CSS_PARSE_PERCENT
-                                      | GTK_CSS_POSITIVE_ONLY
-                                      | GTK_CSS_NUMBER_AS_PIXELS);
+                                      | GTK_CSS_POSITIVE_ONLY);
 }
 
 static GtkCssValue *
@@ -683,8 +682,7 @@ outline_parse (GtkCssStyleProperty *property,
                GtkCssParser        *parser)
 {
   return _gtk_css_number_value_parse (parser,
-                                      GTK_CSS_NUMBER_AS_PIXELS
-                                      | GTK_CSS_PARSE_LENGTH);
+                                      GTK_CSS_PARSE_LENGTH);
 }
 
 static GtkCssValue *
@@ -800,8 +798,7 @@ parse_margin (GtkCssStyleProperty *property,
               GtkCssParser        *parser)
 {
   return _gtk_css_number_value_parse (parser,
-                                      GTK_CSS_NUMBER_AS_PIXELS
-                                      | GTK_CSS_PARSE_LENGTH);
+                                      GTK_CSS_PARSE_LENGTH);
 }
 
 static GtkCssValue *
@@ -810,7 +807,6 @@ parse_padding (GtkCssStyleProperty *property,
 {
   return _gtk_css_number_value_parse (parser,
                                       GTK_CSS_POSITIVE_ONLY
-                                      | GTK_CSS_NUMBER_AS_PIXELS
                                       | GTK_CSS_PARSE_LENGTH);
 }
 
@@ -820,7 +816,6 @@ parse_border_width (GtkCssStyleProperty *property,
 {
   return _gtk_css_number_value_parse (parser,
                                       GTK_CSS_POSITIVE_ONLY
-                                      | GTK_CSS_NUMBER_AS_PIXELS
                                       | GTK_CSS_PARSE_LENGTH);
 }