From c9171e16d9d4477501d326d8d456fdc03e0f832e Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Thu, 26 Jul 2018 19:34:26 +0000 Subject: Use moar ToXMLElement() in place of static_cast<>. Introduces checks in a few new places, but mainly just consolidates checking/casting logic. Change-Id: I634a03060d254db099972c6978249992367e146c Reviewed-on: https://pdfium-review.googlesource.com/38900 Commit-Queue: Tom Sepez Reviewed-by: Lei Zhang --- core/fxcrt/xml/cfx_xmlelement.cpp | 7 ++----- core/fxcrt/xml/cfx_xmlelement_unittest.cpp | 4 +--- core/fxcrt/xml/cfx_xmlinstruction_unittest.cpp | 2 +- core/fxcrt/xml/cfx_xmlparser.cpp | 15 +++++++-------- 4 files changed, 11 insertions(+), 17 deletions(-) (limited to 'core/fxcrt') diff --git a/core/fxcrt/xml/cfx_xmlelement.cpp b/core/fxcrt/xml/cfx_xmlelement.cpp index 74351b8c58..4bb4eae1bd 100644 --- a/core/fxcrt/xml/cfx_xmlelement.cpp +++ b/core/fxcrt/xml/cfx_xmlelement.cpp @@ -125,11 +125,8 @@ CFX_XMLElement* CFX_XMLElement::GetFirstChildNamed( CFX_XMLElement* CFX_XMLElement::GetNthChildNamed(const WideStringView& name, size_t idx) const { for (auto* child = GetFirstChild(); child; child = child->GetNextSibling()) { - if (child->GetType() != FX_XMLNODE_Element) - continue; - - CFX_XMLElement* elem = static_cast(child); - if (elem->name_ != name) + CFX_XMLElement* elem = ToXMLElement(child); + if (!elem || elem->name_ != name) continue; if (idx == 0) return elem; diff --git a/core/fxcrt/xml/cfx_xmlelement_unittest.cpp b/core/fxcrt/xml/cfx_xmlelement_unittest.cpp index 1e53ef3dd7..dfc60a10c3 100644 --- a/core/fxcrt/xml/cfx_xmlelement_unittest.cpp +++ b/core/fxcrt/xml/cfx_xmlelement_unittest.cpp @@ -73,7 +73,6 @@ TEST(CFX_XMLElementTest, Attributes) { TEST(CFX_XMLElementTest, Clone) { CFX_XMLDocument doc; - CFX_XMLElement node(L"test:node"); node.SetAttribute(L"first", L"one"); node.SetAttribute(L"second", L"two"); @@ -87,10 +86,9 @@ TEST(CFX_XMLElementTest, Clone) { CFX_XMLNode* clone = node.Clone(&doc); EXPECT_TRUE(clone != nullptr); - ASSERT_EQ(FX_XMLNODE_Element, clone->GetType()); - CFX_XMLElement* inst = static_cast(clone); + CFX_XMLElement* inst = ToXMLElement(clone); EXPECT_EQ(L"test:node", inst->GetName()); EXPECT_EQ(L"node", inst->GetLocalTagName()); EXPECT_EQ(L"test", inst->GetNamespacePrefix()); diff --git a/core/fxcrt/xml/cfx_xmlinstruction_unittest.cpp b/core/fxcrt/xml/cfx_xmlinstruction_unittest.cpp index 74ef87e344..b25a18be9c 100644 --- a/core/fxcrt/xml/cfx_xmlinstruction_unittest.cpp +++ b/core/fxcrt/xml/cfx_xmlinstruction_unittest.cpp @@ -132,7 +132,7 @@ TEST(CFX_XMLInstructionTest, ParseAndReSaveInnerInstruction) { ASSERT_TRUE(root->GetFirstChild() != nullptr); ASSERT_TRUE(root->GetFirstChild()->GetType() == FX_XMLNODE_Element); - CFX_XMLElement* node = static_cast(root->GetFirstChild()); + CFX_XMLElement* node = ToXMLElement(root->GetFirstChild()); EXPECT_EQ(L"node", node->GetName()); CFX_XMLInstruction* instruction = nullptr; diff --git a/core/fxcrt/xml/cfx_xmlparser.cpp b/core/fxcrt/xml/cfx_xmlparser.cpp index 268774a10f..dd28cf8adc 100644 --- a/core/fxcrt/xml/cfx_xmlparser.cpp +++ b/core/fxcrt/xml/cfx_xmlparser.cpp @@ -262,11 +262,10 @@ bool CFX_XMLParser::DoSyntaxParse(CFX_XMLDocument* doc) { current_buffer_idx++; current_parser_state = FDE_XmlSyntaxState::AttriName; - if (current_node_ && - current_node_->GetType() == FX_XMLNODE_Element) { - static_cast(current_node_) - ->SetAttribute(current_attribute_name, GetTextData()); - } + CFX_XMLElement* elem = ToXMLElement(current_node_); + if (elem) + elem->SetAttribute(current_attribute_name, GetTextData()); + current_attribute_name.clear(); } else { ProcessTextChar(ch); @@ -311,13 +310,13 @@ bool CFX_XMLParser::DoSyntaxParse(CFX_XMLDocument* doc) { node_type_stack.pop(); current_parser_state = FDE_XmlSyntaxState::Text; - if (current_node_->GetType() != FX_XMLNODE_Element) + CFX_XMLElement* element = ToXMLElement(current_node_); + if (!element) return false; WideString element_name = GetTextData(); if (element_name.GetLength() > 0 && - element_name != - static_cast(current_node_)->GetName()) { + element_name != element->GetName()) { return false; } -- cgit v1.2.3