Fixed max_width_002 and 38 other tests

beeware · Apr 7, 2020 · bd0969d · bd0969d
1 parent e518374
commit bd0969d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 39 deletions.
diff --git a/colosseum/engine.py b/colosseum/engine.py
@@ -398,6 +398,10 @@ def calculate_block_non_replaced_normal_flow_width(node, context):
     "Implements S10.3.3"
     if node.style.width is not AUTO:  # P2
         content_width = node.style.width.px(**context)
+        if node.style.max_width is not None:  # 10.4 Maximum width
+            content_max_width = node.style.max_width.px(**context)
+            if content_width > content_max_width:
+                content_width = content_max_width
         if node.style.min_width is not AUTO:  # 10.4 Minimum width
             content_min_width = node.style.min_width.px(**context)
             if content_width < content_min_width:

diff --git a/tests/web_platform/CSS2/normal_flow/not_implemented b/tests/web_platform/CSS2/normal_flow/not_implemented
@@ -378,42 +378,8 @@ max_height_max_width_001
 max_height_percentage_001
 max_height_percentage_002
 max_height_percentage_003
-max_width_002
-max_width_003
-max_width_004
-max_width_005
-max_width_006
-max_width_007
-max_width_013
-max_width_014
-max_width_015
-max_width_016
-max_width_017
-max_width_018
-max_width_024
-max_width_025
-max_width_026
-max_width_027
-max_width_028
-max_width_029
-max_width_035
 max_width_036
-max_width_037
-max_width_038
-max_width_039
-max_width_040
-max_width_046
 max_width_047
-max_width_048
-max_width_049
-max_width_050
-max_width_051
-max_width_057
-max_width_058
-max_width_059
-max_width_060
-max_width_061
-max_width_062
 max_width_068
 max_width_069
 max_width_070
@@ -431,9 +397,6 @@ max_width_090
 max_width_091
 max_width_092
 max_width_093
-max_width_100
-max_width_101
-max_width_102
 max_width_104
 max_width_105
 max_width_106
@@ -448,15 +411,13 @@ max_width_applies_to_005
 max_width_applies_to_006
 max_width_applies_to_007
 max_width_applies_to_008
-max_width_applies_to_009
 max_width_applies_to_010
 max_width_applies_to_012
 max_width_applies_to_013
 max_width_applies_to_014
 max_width_applies_to_015
 max_width_applies_to_016
 max_width_percentage_002
-max_width_percentage_001
 max_width_percentage_003
 min_height_003
 min_height_006