media query parser and more test cases

Source/Core/StyleSheetParser.cpp

@@ -141,6 +141,54 @@ class SpritesheetPropertyParser final : public AbstractPropertyParser {
 
 static UniquePtr<SpritesheetPropertyParser> spritesheet_property_parser;
 
+/*
+ * Media queries need a special parser because they have unique properties that 
+ * aren't admissible in other property declaration contexts and the syntax of
+*/
+class MediaQueryPropertyParser final : public AbstractPropertyParser {
+private:
+	// The dictionary to store the properties in.
+	PropertyDictionary* properties;
+
+	PropertySpecification specification;
+
+public:
+	MediaQueryPropertyParser() : specification(14, 0) 
+	{	
+		specification.RegisterProperty("width", "", false, false, PropertyId::Width).AddParser("pixels");
+		specification.RegisterProperty("min-width", "", false, false, PropertyId::MinWidth).AddParser("pixels");
+		specification.RegisterProperty("max-width", "", false, false, PropertyId::MaxWidth).AddParser("pixels");
+
+		specification.RegisterProperty("height", "", false, false, PropertyId::Height).AddParser("pixels");
+		specification.RegisterProperty("min-height", "", false, false, PropertyId::MinHeight).AddParser("pixels");
+		specification.RegisterProperty("max-height", "", false, false, PropertyId::MaxHeight).AddParser("pixels");
+
+		specification.RegisterProperty("aspect-ratio", "", false, false, PropertyId::AspectRatio).AddParser("aspect_ratio");
+		specification.RegisterProperty("min-aspect-ratio", "", false, false, PropertyId::MinAspectRatio).AddParser("aspect_ratio");
+		specification.RegisterProperty("max-aspect-ratio", "", false, false, PropertyId::MaxAspectRatio).AddParser("aspect_ratio");
+
+		specification.RegisterProperty("resolution", "", false, false, PropertyId::Resolution).AddParser("resolution");
+		specification.RegisterProperty("min-resolution", "", false, false, PropertyId::MinResolution).AddParser("resolution");
+		specification.RegisterProperty("max-resolution", "", false, false, PropertyId::MaxResolution).AddParser("resolution");
+
+		specification.RegisterProperty("orientation", "", false, false, PropertyId::Orientation).AddParser("keyword", "landscape, portrait");
+	}
+
+	void SetTargetProperties(PropertyDictionary* _properties)
+	{
+		properties = _properties;
+	}
+
+	bool Parse(const String& name, const String& value) override
+	{
+		RMLUI_ASSERT(properties);
+		return specification.ParsePropertyDeclaration(*properties, name, value);
+	}
+};
+
+
+static UniquePtr<MediaQueryPropertyParser> media_query_property_parser;
+
 
 StyleSheetParser::StyleSheetParser()
 {
@@ -156,6 +204,7 @@ StyleSheetParser::~StyleSheetParser()
 void StyleSheetParser::Initialise()
 {
 	spritesheet_property_parser = MakeUnique<SpritesheetPropertyParser>();
+	media_query_property_parser = MakeUnique<MediaQueryPropertyParser>();
 }
 
 void StyleSheetParser::Shutdown()
@@ -338,8 +387,10 @@ bool StyleSheetParser::ParseDecoratorBlock(const String& at_name, DecoratorSpeci
 	return true;
 }
 
-bool StyleSheetParser::ParseMediaFeatureMap(AbstractPropertyParser& parser, const String & rules)
+bool StyleSheetParser::ParseMediaFeatureMap(PropertyDictionary& properties, const String & rules)
 {
+	media_query_property_parser->SetTargetProperties(&properties);
+
 	enum ParseState { Global, Name, Value };
 	ParseState state = Name;
 
@@ -389,16 +440,8 @@ bool StyleSheetParser::ParseMediaFeatureMap(AbstractPropertyParser& parser, cons
 
 			current_string = StringUtilities::StripWhitespace(StringUtilities::ToLower(current_string));
 
-			Log::Message(Log::LT_DEBUG, "%s:%s", name.c_str(), current_string.c_str());
-
-			if (!IsValidIdentifier(current_string))
-			{
-				Log::Message(Log::LT_WARNING, "Malformed property value '%s' in @media query list at %s:%d.", current_string.c_str(), stream_file_name.c_str(), line_number);
-				return false;
-			}
-
-			if(!parser.Parse(name, current_string))
-				Log::Message(Log::LT_WARNING, "Syntax error parsing property declaration '%s: %s;' in %s: %d.", name.c_str(), current_string.c_str(), stream_file_name.c_str(), line_number);
+			if(!media_query_property_parser->Parse(name, current_string))
+				Log::Message(Log::LT_WARNING, "Syntax error parsing media-query property declaration '%s: %s;' in %s: %d.", name.c_str(), current_string.c_str(), stream_file_name.c_str(), line_number);
 
 			current_string.clear();
 			state = Global;
@@ -579,8 +622,7 @@ int StyleSheetParser::Parse(MediaBlockListRaw& style_sheets, Stream* _stream, in
 
 						// parse media query list into block
 						PropertyDictionary feature_map;
-						PropertySpecificationParser parser(feature_map, StyleSheetSpecification::GetPropertySpecification());
-						ParseMediaFeatureMap(parser, pre_token_str.substr(pre_token_str.find(' ') + 1));
+						ParseMediaFeatureMap(feature_map, pre_token_str.substr(pre_token_str.find(' ') + 1));
 						current_block = {feature_map, MakeUnique<StyleSheet>()};
 
 						inside_media_block = true;

Source/Core/StyleSheetParser.h

@@ -109,7 +109,7 @@ class StyleSheetParser
 	bool ParseDecoratorBlock(const String& at_name, DecoratorSpecificationMap& decorator_map, const StyleSheet& style_sheet, const SharedPtr<const PropertySource>& source);
 
 	// Attempts to parse the properties of a @media query
-	bool ParseMediaFeatureMap(AbstractPropertyParser& parser, const String& rules);
+	bool ParseMediaFeatureMap(PropertyDictionary& properties, const String& rules);
 
 	// Attempts to find one of the given character tokens in the active stream
 	// If it's found, buffer is filled with all content up until the token

Source/Core/StyleSheetSpecification.cpp

@@ -58,6 +58,7 @@ struct DefaultStyleSheetParsers {
 	PropertyParserTransform transform = PropertyParserTransform();
 	PropertyParserAspectRatio aspect_ratio = PropertyParserAspectRatio();
 	PropertyParserNumber resolution = PropertyParserNumber(Property::DPI);
+	PropertyParserNumber pixels = PropertyParserNumber(Property::PX);
 };
 
 StyleSheetSpecification::StyleSheetSpecification() : 
@@ -252,6 +253,7 @@ void StyleSheetSpecification::RegisterDefaultParsers()
 	RegisterParser("transform", &default_parsers->transform);
 	RegisterParser("aspect_ratio", &default_parsers->aspect_ratio);
 	RegisterParser("resolution", &default_parsers->resolution);
+	RegisterParser("pixels", &default_parsers->pixels);
 }
 
 
@@ -416,7 +418,6 @@ void StyleSheetSpecification::RegisterDefaultProperties()
 	// Rare properties (not added to computed values)
 	RegisterProperty(PropertyId::FillImage, "fill-image", "", false, false).AddParser("string");
 
-	RMLUI_ASSERTMSG(instance->properties.property_map->AssertAllInserted(PropertyId::NumDefinedIds), "Missing specification for one or more Property IDs.");
 	RMLUI_ASSERTMSG(instance->properties.shorthand_map->AssertAllInserted(ShorthandId::NumDefinedIds), "Missing specification for one or more Shorthand IDs.");
 }
 

Tests/Source/UnitTests/MediaQueries.cpp

@@ -47,17 +47,106 @@ static const String document_media_query1_rml = R"(
 			bottom: 0;
 		}
 
+		div {
+			height: 48px;
+			width: 48px;
+		}
+
+		@media (min-width: 640px) {
+			div {
+				height: 32px;
+				width: 32px;
+			}
+		}
+
 		@media (max-width: 639px) {
 			div {
-				background: #666;
+				height: 64px;
+				width: 64px;
+			}
+		}
+	</style>
+</head>
+
+<body>
+<div/>
+</body>
+</rml>
+)";
+
+static const String document_media_query2_rml = R"(
+<rml>
+<head>
+	<title>Test</title>
+	<link type="text/rcss" href="/assets/rml.rcss"/>
+	<style>
+		body {
+			left: 0;
+			top: 0;
+			right: 0;
+			bottom: 0;
+		}
+
+		div {
+			height: 48px;
+			width: 48px;
+		}
+
+		@media (orientation: landscape) {
+			div {
 				height: 32px;
 				width: 32px;
 			}
 		}
 
-		@media (min-width: 640px) {
+		@media (max-aspect-ratio: 3/4) {
+			div {
+				height: 64px;
+				width: 64px;
+			}
+		}
+
+		@media (min-resolution: 90dpi) {
+			div {
+				height: 128px;
+			}
+		}
+	</style>
+</head>
+
+<body>
+<div/>
+</body>
+</rml>
+)";
+
+static const String document_media_query3_rml = R"(
+<rml>
+<head>
+	<title>Test</title>
+	<link type="text/rcss" href="/assets/rml.rcss"/>
+	<style>
+		body {
+			left: 0;
+			top: 0;
+			right: 0;
+			bottom: 0;
+		}
+
+		div {
+			height: 48px;
+			width: 48px;
+		}
+
+		@media (orientation: landscape) and (min-width: 640px) {
+			div {
+				height: 32px;
+				width: 32px;
+			}
+		}
+
+		@media (max-aspect-ratio: 4/3) {
 			div {
-				background: #333;
 				height: 64px;
 				width: 64px;
 			}
@@ -93,7 +182,65 @@ TEST_CASE("mediaqueries.basic")
 	document->GetElementsByTagName(elems, "div");
 	CHECK(elems.size() == 1);
 
-	CHECK(elems[0]->GetBox() == Box(Vector2f(64.0f, 64.0f)));
+	CHECK(elems[0]->GetBox() == Box(Vector2f(32.0f, 32.0f)));
+
+	document->Close();
+
+	TestsShell::ShutdownShell();
+}
+
+TEST_CASE("mediaqueries.custom_properties")
+{
+	Context* context = TestsShell::GetContext();
+	REQUIRE(context);
+
+	context->SetDensityIndependentPixelRatio(90.0f);
+
+	// There should be no warnings loading this document. There should be one div of 32px width & height
+	ElementDocument* document = context->LoadDocumentFromMemory(document_media_query2_rml, "assets/");
+	REQUIRE(document);
+	document->Show();
+
+	context->Update();
+	context->Render();
+
+	TestsShell::RenderLoop();
+
+	// Shell default window dimensions are 1500, 800
+
+	ElementList elems;
+	document->GetElementsByTagName(elems, "div");
+	CHECK(elems.size() == 1);
+
+	CHECK(elems[0]->GetBox() == Box(Vector2f(32.0f, 128.0f)));
+
+	document->Close();
+
+	TestsShell::ShutdownShell();
+}
+
+TEST_CASE("mediaqueries.composite")
+{
+	Context* context = TestsShell::GetContext();
+	REQUIRE(context);
+
+	// There should be no warnings loading this document. There should be one div of 32px width & height
+	ElementDocument* document = context->LoadDocumentFromMemory(document_media_query3_rml, "assets/");
+	REQUIRE(document);
+	document->Show();
+
+	context->Update();
+	context->Render();
+
+	TestsShell::RenderLoop();
+
+	// Shell default window dimensions are 1500, 800
+
+	ElementList elems;
+	document->GetElementsByTagName(elems, "div");
+	CHECK(elems.size() == 1);
+
+	CHECK(elems[0]->GetBox() == Box(Vector2f(32.0f, 32.0f)));
 
 	document->Close();