Преглед изворни кода

Make style tags accept xml reserved characters such as in /* <body> */, see #341

Michael Ragazzon пре 3 година
родитељ
комит
e9c3dde531
2 измењених фајлова са 78 додато и 0 уклоњено
  1. 1 0
      Source/Core/XMLParser.cpp
  2. 77 0
      Tests/Source/UnitTests/XMLParser.cpp

+ 1 - 0
Source/Core/XMLParser.cpp

@@ -45,6 +45,7 @@ static SharedPtr<XMLNodeHandler> default_node_handler;
 XMLParser::XMLParser(Element* root)
 {
 	RegisterCDATATag("script");
+	RegisterCDATATag("style");
 
 	for (const String& name : Factory::GetStructuralDataViewAttributeNames())
 		RegisterInnerXMLAttribute(name);

+ 77 - 0
Tests/Source/UnitTests/XMLParser.cpp

@@ -0,0 +1,77 @@
+/*
+ * This source file is part of RmlUi, the HTML/CSS Interface Middleware
+ *
+ * For the latest information, see http://github.com/mikke89/RmlUi
+ *
+ * Copyright (c) 2008-2010 CodePoint Ltd, Shift Technology Ltd
+ * Copyright (c) 2019 The RmlUi Team, and contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ */
+
+#include "../Common/TestsShell.h"
+#include <RmlUi/Core/ComputedValues.h>
+#include <RmlUi/Core/Context.h>
+#include <RmlUi/Core/Element.h>
+#include <RmlUi/Core/ElementDocument.h>
+#include <RmlUi/Core/Factory.h>
+#include <doctest.h>
+
+using namespace Rml;
+
+static const String document_xml_tags_in_css = R"(
+<rml>
+    <head>
+        <style>
+            body {
+                /* <body> */
+                width: 200px;
+                height: 200px;
+                background-color: #00ff00;
+            }
+        </style>
+    </head>
+    <body>
+    </body>
+</rml>
+)";
+
+TEST_CASE("XMLParser")
+{
+	Context* context = TestsShell::GetContext();
+	REQUIRE(context);
+
+	// Style nodes should accept XML reserved characters, see https://github.com/mikke89/RmlUi/issues/341
+
+	ElementDocument* document = context->LoadDocumentFromMemory(document_xml_tags_in_css);
+	REQUIRE(document);
+	document->Show();
+
+	TestsShell::RenderLoop();
+
+	const Colourb background = document->GetComputedValues().background_color();
+	CHECK(background.red == 0);
+	CHECK(background.green == 0xff);
+	CHECK(background.blue == 0);
+	CHECK(background.alpha == 0xff);
+
+	document->Close();
+	TestsShell::ShutdownShell();
+}