From 92eb49f44ff8b2c913c91ec701bf73c1483f4746 Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Thu, 21 Oct 2010 15:19:43 +0000 Subject: [PATCH] Rename CefXmlReader::MoveToNextElement to CefXmlReader::MoveToNextNode to better represent its purpose. git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@120 5089003a-bbd8-11dd-ad1f-f1f9622dbc98 --- include/cef.h | 8 +-- include/cef_capi.h | 8 +-- libcef/xml_reader_impl.cc | 2 +- libcef/xml_reader_impl.h | 2 +- libcef_dll/cpptoc/xml_reader_cpptoc.cc | 6 +- libcef_dll/ctocpp/xml_reader_ctocpp.cc | 6 +- libcef_dll/ctocpp/xml_reader_ctocpp.h | 2 +- libcef_dll/wrapper/cef_xml_object.cc | 4 +- tests/unittests/xml_reader_unittest.cc | 82 +++++++++++++------------- 9 files changed, 60 insertions(+), 60 deletions(-) diff --git a/include/cef.h b/include/cef.h index f95a136da..6898823c6 100644 --- a/include/cef.h +++ b/include/cef.h @@ -1266,11 +1266,11 @@ public: EncodingType encodingType, const std::wstring& URI); - // Moves the cursor to the next element node in the document. This method - // must be called at least once to set the current cursor position. Returns - // true if the cursor position was set successfully. + // Moves the cursor to the next node in the document. This method must be + // called at least once to set the current cursor position. Returns true if + // the cursor position was set successfully. /*--cef()--*/ - virtual bool MoveToNextElement() =0; + virtual bool MoveToNextNode() =0; // Close the document. This must be called directly to ensure that cleanup // occurs on the correct thread. diff --git a/include/cef_capi.h b/include/cef_capi.h index 1d28f221d..71d830bd0 100644 --- a/include/cef_capi.h +++ b/include/cef_capi.h @@ -1010,10 +1010,10 @@ typedef struct _cef_xml_reader_t // Base structure. cef_base_t base; - // Moves the cursor to the next element node in the document. This function - // must be called at least once to set the current cursor position. Returns - // true (1) if the cursor position was set successfully. - int (CEF_CALLBACK *move_to_next_element)(struct _cef_xml_reader_t* self); + // Moves the cursor to the next node in the document. This function must be + // called at least once to set the current cursor position. Returns true (1) + // if the cursor position was set successfully. + int (CEF_CALLBACK *move_to_next_node)(struct _cef_xml_reader_t* self); // Close the document. This must be called directly to ensure that cleanup // occurs on the correct thread. diff --git a/libcef/xml_reader_impl.cc b/libcef/xml_reader_impl.cc index e26ba6458..a421e24dc 100644 --- a/libcef/xml_reader_impl.cc +++ b/libcef/xml_reader_impl.cc @@ -200,7 +200,7 @@ bool CefXmlReaderImpl::Initialize(CefRefPtr stream, return true; } -bool CefXmlReaderImpl::MoveToNextElement() +bool CefXmlReaderImpl::MoveToNextNode() { if (!VerifyContext()) return false; diff --git a/libcef/xml_reader_impl.h b/libcef/xml_reader_impl.h index e0e11aa90..1205d1699 100644 --- a/libcef/xml_reader_impl.h +++ b/libcef/xml_reader_impl.h @@ -21,7 +21,7 @@ public: bool Initialize(CefRefPtr stream, EncodingType encodingType, const std::wstring& URI); - virtual bool MoveToNextElement(); + virtual bool MoveToNextNode(); virtual bool Close(); virtual bool HasError(); virtual std::wstring GetError(); diff --git a/libcef_dll/cpptoc/xml_reader_cpptoc.cc b/libcef_dll/cpptoc/xml_reader_cpptoc.cc index 658d21307..32d3d2ba4 100644 --- a/libcef_dll/cpptoc/xml_reader_cpptoc.cc +++ b/libcef_dll/cpptoc/xml_reader_cpptoc.cc @@ -32,13 +32,13 @@ CEF_EXPORT cef_xml_reader_t* cef_xml_reader_create(cef_stream_reader_t* stream, // MEMBER FUNCTIONS - Body may be edited by hand. -int CEF_CALLBACK xml_reader_move_to_next_element(struct _cef_xml_reader_t* self) +int CEF_CALLBACK xml_reader_move_to_next_node(struct _cef_xml_reader_t* self) { DCHECK(self); if(!self) return 0; - return CefXmlReaderCppToC::Get(self)->MoveToNextElement(); + return CefXmlReaderCppToC::Get(self)->MoveToNextNode(); } int CEF_CALLBACK xml_reader_close(struct _cef_xml_reader_t* self) @@ -367,7 +367,7 @@ int CEF_CALLBACK xml_reader_move_to_carrying_element( CefXmlReaderCppToC::CefXmlReaderCppToC(CefXmlReader* cls) : CefCppToC(cls) { - struct_.struct_.move_to_next_element = xml_reader_move_to_next_element; + struct_.struct_.move_to_next_node = xml_reader_move_to_next_node; struct_.struct_.close = xml_reader_close; struct_.struct_.has_error = xml_reader_has_error; struct_.struct_.get_error = xml_reader_get_error; diff --git a/libcef_dll/ctocpp/xml_reader_ctocpp.cc b/libcef_dll/ctocpp/xml_reader_ctocpp.cc index 6c026584b..a565b9569 100644 --- a/libcef_dll/ctocpp/xml_reader_ctocpp.cc +++ b/libcef_dll/ctocpp/xml_reader_ctocpp.cc @@ -29,12 +29,12 @@ CefRefPtr CefXmlReader::Create(CefRefPtr stream, // VIRTUAL METHODS - Body may be edited by hand. -bool CefXmlReaderCToCpp::MoveToNextElement() +bool CefXmlReaderCToCpp::MoveToNextNode() { - if(CEF_MEMBER_MISSING(struct_, move_to_next_element)) + if(CEF_MEMBER_MISSING(struct_, move_to_next_node)) return false; - return struct_->move_to_next_element(struct_) ? true : false; + return struct_->move_to_next_node(struct_) ? true : false; } bool CefXmlReaderCToCpp::Close() diff --git a/libcef_dll/ctocpp/xml_reader_ctocpp.h b/libcef_dll/ctocpp/xml_reader_ctocpp.h index 7a5d77731..a44a2985d 100644 --- a/libcef_dll/ctocpp/xml_reader_ctocpp.h +++ b/libcef_dll/ctocpp/xml_reader_ctocpp.h @@ -31,7 +31,7 @@ public: virtual ~CefXmlReaderCToCpp() {} // CefXmlReader methods - virtual bool MoveToNextElement(); + virtual bool MoveToNextNode(); virtual bool Close(); virtual bool HasError(); virtual std::wstring GetError(); diff --git a/libcef_dll/wrapper/cef_xml_object.cc b/libcef_dll/wrapper/cef_xml_object.cc index 0f6c55696..2b480a66f 100644 --- a/libcef_dll/wrapper/cef_xml_object.cc +++ b/libcef_dll/wrapper/cef_xml_object.cc @@ -24,7 +24,7 @@ public: if (!reader.get()) return false; - bool ret = reader->MoveToNextElement(); + bool ret = reader->MoveToNextNode(); if (ret) { CefRefPtr cur_object(root_object_), new_object; CefXmlObject::ObjectVector queue; @@ -133,7 +133,7 @@ public: break; } } - } while(reader->MoveToNextElement()); + } while(reader->MoveToNextNode()); } if (reader->HasError()) { diff --git a/tests/unittests/xml_reader_unittest.cc b/tests/unittests/xml_reader_unittest.cc index 98abfa1d8..5031103a5 100644 --- a/tests/unittests/xml_reader_unittest.cc +++ b/tests/unittests/xml_reader_unittest.cc @@ -44,7 +44,7 @@ TEST(XmlReaderTest, Read) ASSERT_TRUE(reader.get() != NULL); // Move to the processing instruction node. - ASSERT_TRUE(reader->MoveToNextElement()); + ASSERT_TRUE(reader->MoveToNextNode()); ASSERT_EQ(reader->GetDepth(), 0); ASSERT_EQ(reader->GetType(), XML_NODE_PROCESSING_INSTRUCTION); ASSERT_EQ(reader->GetLocalName(), L"my_instruction"); @@ -53,7 +53,7 @@ TEST(XmlReaderTest, Read) ASSERT_EQ(reader->GetValue(), L"my_value"); // Move to the DOCTYPE node. - ASSERT_TRUE(reader->MoveToNextElement()); + ASSERT_TRUE(reader->MoveToNextNode()); ASSERT_EQ(reader->GetDepth(), 0); ASSERT_EQ(reader->GetType(), XML_NODE_DOCUMENT_TYPE); ASSERT_EQ(reader->GetLocalName(), L"my_document"); @@ -61,7 +61,7 @@ TEST(XmlReaderTest, Read) ASSERT_FALSE(reader->HasValue()); // Move to ns:obj element start node. - ASSERT_TRUE(reader->MoveToNextElement()); + ASSERT_TRUE(reader->MoveToNextNode()); ASSERT_EQ(reader->GetDepth(), 0); ASSERT_EQ(reader->GetType(), XML_NODE_ELEMENT_START); ASSERT_EQ(reader->GetLocalName(), L"obj"); @@ -76,11 +76,11 @@ TEST(XmlReaderTest, Read) L"http://www.example.org/ns"); // Move to the whitespace node. - ASSERT_TRUE(reader->MoveToNextElement()); + ASSERT_TRUE(reader->MoveToNextNode()); ASSERT_EQ(reader->GetType(), XML_NODE_WHITESPACE); // Move to the ns:objA element start node. - ASSERT_TRUE(reader->MoveToNextElement()); + ASSERT_TRUE(reader->MoveToNextNode()); ASSERT_EQ(reader->GetDepth(), 1); ASSERT_EQ(reader->GetType(), XML_NODE_ELEMENT_START); ASSERT_EQ(reader->GetLocalName(), L"objA"); @@ -92,7 +92,7 @@ TEST(XmlReaderTest, Read) ASSERT_FALSE(reader->HasValue()); // Move to the ns:objA value node. - ASSERT_TRUE(reader->MoveToNextElement()); + ASSERT_TRUE(reader->MoveToNextNode()); ASSERT_EQ(reader->GetDepth(), 2); ASSERT_EQ(reader->GetType(), XML_NODE_TEXT); ASSERT_EQ(reader->GetLocalName(), L"#text"); @@ -101,7 +101,7 @@ TEST(XmlReaderTest, Read) ASSERT_EQ(reader->GetValue(), L"value A"); // Move to the ns:objA element ending node. - ASSERT_TRUE(reader->MoveToNextElement()); + ASSERT_TRUE(reader->MoveToNextNode()); ASSERT_EQ(reader->GetDepth(), 1); ASSERT_EQ(reader->GetType(), XML_NODE_ELEMENT_END); ASSERT_EQ(reader->GetLocalName(), L"objA"); @@ -113,12 +113,12 @@ TEST(XmlReaderTest, Read) ASSERT_FALSE(reader->HasValue()); // Move to the whitespace node. - ASSERT_TRUE(reader->MoveToNextElement()); + ASSERT_TRUE(reader->MoveToNextNode()); ASSERT_EQ(reader->GetDepth(), 1); ASSERT_EQ(reader->GetType(), XML_NODE_WHITESPACE); // Move to the comment node. - ASSERT_TRUE(reader->MoveToNextElement()); + ASSERT_TRUE(reader->MoveToNextNode()); ASSERT_EQ(reader->GetDepth(), 1); ASSERT_EQ(reader->GetType(), XML_NODE_COMMENT); ASSERT_EQ(reader->GetLocalName(), L"#comment"); @@ -127,11 +127,11 @@ TEST(XmlReaderTest, Read) ASSERT_EQ(reader->GetValue(), L" my comment "); // Move to the whitespace node. - ASSERT_TRUE(reader->MoveToNextElement()); + ASSERT_TRUE(reader->MoveToNextNode()); ASSERT_EQ(reader->GetType(), XML_NODE_WHITESPACE); // Move to the ns:objB element start node. - ASSERT_TRUE(reader->MoveToNextElement()); + ASSERT_TRUE(reader->MoveToNextNode()); ASSERT_EQ(reader->GetDepth(), 1); ASSERT_EQ(reader->GetType(), XML_NODE_ELEMENT_START); ASSERT_EQ(reader->GetLocalName(), L"objB"); @@ -143,11 +143,11 @@ TEST(XmlReaderTest, Read) ASSERT_FALSE(reader->HasValue()); // Move to the whitespace node. - ASSERT_TRUE(reader->MoveToNextElement()); + ASSERT_TRUE(reader->MoveToNextNode()); ASSERT_EQ(reader->GetType(), XML_NODE_WHITESPACE); // Move to the ns:objB_1 element start node. - ASSERT_TRUE(reader->MoveToNextElement()); + ASSERT_TRUE(reader->MoveToNextNode()); ASSERT_EQ(reader->GetDepth(), 2); ASSERT_EQ(reader->GetType(), XML_NODE_ELEMENT_START); ASSERT_EQ(reader->GetLocalName(), L"objB_1"); @@ -159,14 +159,14 @@ TEST(XmlReaderTest, Read) ASSERT_FALSE(reader->HasValue()); // Move to the ns:objB_1 value node. - ASSERT_TRUE(reader->MoveToNextElement()); + ASSERT_TRUE(reader->MoveToNextNode()); ASSERT_EQ(reader->GetDepth(), 3); ASSERT_EQ(reader->GetType(), XML_NODE_TEXT); ASSERT_TRUE(reader->HasValue()); ASSERT_EQ(reader->GetValue(), L"value B1"); // Move to the ns:objB_1 element ending node. - ASSERT_TRUE(reader->MoveToNextElement()); + ASSERT_TRUE(reader->MoveToNextNode()); ASSERT_EQ(reader->GetDepth(), 2); ASSERT_EQ(reader->GetType(), XML_NODE_ELEMENT_END); ASSERT_EQ(reader->GetLocalName(), L"objB_1"); @@ -178,11 +178,11 @@ TEST(XmlReaderTest, Read) ASSERT_FALSE(reader->HasValue()); // Move to the whitespace node. - ASSERT_TRUE(reader->MoveToNextElement()); + ASSERT_TRUE(reader->MoveToNextNode()); ASSERT_EQ(reader->GetType(), XML_NODE_WHITESPACE); // Move to the ns:objB_2 element start node. - ASSERT_TRUE(reader->MoveToNextElement()); + ASSERT_TRUE(reader->MoveToNextNode()); ASSERT_EQ(reader->GetDepth(), 2); ASSERT_EQ(reader->GetType(), XML_NODE_ELEMENT_START); ASSERT_EQ(reader->GetLocalName(), L"objB_2"); @@ -194,14 +194,14 @@ TEST(XmlReaderTest, Read) ASSERT_FALSE(reader->HasValue()); // Move to the ns:objB_2 value node. - ASSERT_TRUE(reader->MoveToNextElement()); + ASSERT_TRUE(reader->MoveToNextNode()); ASSERT_EQ(reader->GetDepth(), 3); ASSERT_EQ(reader->GetType(), XML_NODE_CDATA); ASSERT_TRUE(reader->HasValue()); ASSERT_EQ(reader->GetValue(), L"some
data"); // Move to the ns:objB_2 element ending node. - ASSERT_TRUE(reader->MoveToNextElement()); + ASSERT_TRUE(reader->MoveToNextNode()); ASSERT_EQ(reader->GetDepth(), 2); ASSERT_EQ(reader->GetType(), XML_NODE_ELEMENT_END); ASSERT_EQ(reader->GetLocalName(), L"objB_2"); @@ -213,11 +213,11 @@ TEST(XmlReaderTest, Read) ASSERT_FALSE(reader->HasValue()); // Move to the whitespace node. - ASSERT_TRUE(reader->MoveToNextElement()); + ASSERT_TRUE(reader->MoveToNextNode()); ASSERT_EQ(reader->GetType(), XML_NODE_WHITESPACE); // Move to the ns:objB_3 element start node. - ASSERT_TRUE(reader->MoveToNextElement()); + ASSERT_TRUE(reader->MoveToNextNode()); ASSERT_EQ(reader->GetDepth(), 2); ASSERT_EQ(reader->GetType(), XML_NODE_ELEMENT_START); ASSERT_EQ(reader->GetLocalName(), L"objB_3"); @@ -229,7 +229,7 @@ TEST(XmlReaderTest, Read) ASSERT_FALSE(reader->HasValue()); // Move to the EB entity reference node. - ASSERT_TRUE(reader->MoveToNextElement()); + ASSERT_TRUE(reader->MoveToNextNode()); ASSERT_EQ(reader->GetDepth(), 3); ASSERT_EQ(reader->GetType(), XML_NODE_ENTITY_REFERENCE); ASSERT_EQ(reader->GetLocalName(), L"EB"); @@ -238,7 +238,7 @@ TEST(XmlReaderTest, Read) ASSERT_EQ(reader->GetValue(), L"EB Value"); // Move to the ns:objB_3 element ending node. - ASSERT_TRUE(reader->MoveToNextElement()); + ASSERT_TRUE(reader->MoveToNextNode()); ASSERT_EQ(reader->GetDepth(), 2); ASSERT_EQ(reader->GetType(), XML_NODE_ELEMENT_END); ASSERT_EQ(reader->GetLocalName(), L"objB_3"); @@ -250,11 +250,11 @@ TEST(XmlReaderTest, Read) ASSERT_FALSE(reader->HasValue()); // Move to the whitespace node. - ASSERT_TRUE(reader->MoveToNextElement()); + ASSERT_TRUE(reader->MoveToNextNode()); ASSERT_EQ(reader->GetType(), XML_NODE_WHITESPACE); // Move to the ns:objB_4 element start node. - ASSERT_TRUE(reader->MoveToNextElement()); + ASSERT_TRUE(reader->MoveToNextNode()); ASSERT_EQ(reader->GetDepth(), 2); ASSERT_EQ(reader->GetType(), XML_NODE_ELEMENT_START); ASSERT_EQ(reader->GetLocalName(), L"objB_4"); @@ -270,7 +270,7 @@ TEST(XmlReaderTest, Read) L"this is mixed content &EA;"); // Move to the element node. - ASSERT_TRUE(reader->MoveToNextElement()); + ASSERT_TRUE(reader->MoveToNextNode()); ASSERT_EQ(reader->GetDepth(), 3); ASSERT_EQ(reader->GetType(), XML_NODE_ELEMENT_START); ASSERT_EQ(reader->GetLocalName(), L"b"); @@ -280,7 +280,7 @@ TEST(XmlReaderTest, Read) ASSERT_FALSE(reader->HasValue()); // Move to the text node. - ASSERT_TRUE(reader->MoveToNextElement()); + ASSERT_TRUE(reader->MoveToNextNode()); ASSERT_EQ(reader->GetDepth(), 4); ASSERT_EQ(reader->GetType(), XML_NODE_TEXT); ASSERT_EQ(reader->GetLocalName(), L"#text"); @@ -289,14 +289,14 @@ TEST(XmlReaderTest, Read) ASSERT_EQ(reader->GetValue(), L"this is"); // Move to the element node. - ASSERT_TRUE(reader->MoveToNextElement()); + ASSERT_TRUE(reader->MoveToNextNode()); ASSERT_EQ(reader->GetDepth(), 3); ASSERT_EQ(reader->GetType(), XML_NODE_ELEMENT_END); ASSERT_EQ(reader->GetLocalName(), L"b"); ASSERT_EQ(reader->GetQualifiedName(), L"b"); // Move to the text node. - ASSERT_TRUE(reader->MoveToNextElement()); + ASSERT_TRUE(reader->MoveToNextNode()); ASSERT_EQ(reader->GetDepth(), 3); ASSERT_EQ(reader->GetType(), XML_NODE_TEXT); ASSERT_EQ(reader->GetLocalName(), L"#text"); @@ -305,7 +305,7 @@ TEST(XmlReaderTest, Read) ASSERT_EQ(reader->GetValue(), L" mixed content "); // Move to the EA entity reference node. - ASSERT_TRUE(reader->MoveToNextElement()); + ASSERT_TRUE(reader->MoveToNextNode()); ASSERT_EQ(reader->GetDepth(), 3); ASSERT_EQ(reader->GetType(), XML_NODE_ENTITY_REFERENCE); ASSERT_EQ(reader->GetLocalName(), L"EA"); @@ -314,7 +314,7 @@ TEST(XmlReaderTest, Read) ASSERT_EQ(reader->GetValue(), L"EA Value"); // Move to the ns:objB_4 element ending node. - ASSERT_TRUE(reader->MoveToNextElement()); + ASSERT_TRUE(reader->MoveToNextNode()); ASSERT_EQ(reader->GetDepth(), 2); ASSERT_EQ(reader->GetType(), XML_NODE_ELEMENT_END); ASSERT_EQ(reader->GetLocalName(), L"objB_4"); @@ -326,11 +326,11 @@ TEST(XmlReaderTest, Read) ASSERT_FALSE(reader->HasValue()); // Move to the whitespace node. - ASSERT_TRUE(reader->MoveToNextElement()); + ASSERT_TRUE(reader->MoveToNextNode()); ASSERT_EQ(reader->GetType(), XML_NODE_WHITESPACE); // Move to the ns:objB element ending node. - ASSERT_TRUE(reader->MoveToNextElement()); + ASSERT_TRUE(reader->MoveToNextNode()); ASSERT_EQ(reader->GetDepth(), 1); ASSERT_EQ(reader->GetType(), XML_NODE_ELEMENT_END); ASSERT_EQ(reader->GetLocalName(), L"objB"); @@ -342,11 +342,11 @@ TEST(XmlReaderTest, Read) ASSERT_FALSE(reader->HasValue()); // Move to the whitespace node. - ASSERT_TRUE(reader->MoveToNextElement()); + ASSERT_TRUE(reader->MoveToNextNode()); ASSERT_EQ(reader->GetType(), XML_NODE_WHITESPACE); // Move to the ns:objC element start node. - ASSERT_TRUE(reader->MoveToNextElement()); + ASSERT_TRUE(reader->MoveToNextNode()); ASSERT_EQ(reader->GetDepth(), 1); ASSERT_EQ(reader->GetType(), XML_NODE_ELEMENT_START); ASSERT_EQ(reader->GetLocalName(), L"objC"); @@ -447,7 +447,7 @@ TEST(XmlReaderTest, Read) ASSERT_EQ(reader->GetValue(), L"value C1"); // Move to the ns:objD element start node. - ASSERT_TRUE(reader->MoveToNextElement()); + ASSERT_TRUE(reader->MoveToNextNode()); ASSERT_EQ(reader->GetDepth(), 1); ASSERT_EQ(reader->GetType(), XML_NODE_ELEMENT_START); ASSERT_EQ(reader->GetLocalName(), L"objD"); @@ -458,7 +458,7 @@ TEST(XmlReaderTest, Read) ASSERT_FALSE(reader->HasValue()); // Move to the ns:objD element end node. - ASSERT_TRUE(reader->MoveToNextElement()); + ASSERT_TRUE(reader->MoveToNextNode()); ASSERT_EQ(reader->GetDepth(), 1); ASSERT_EQ(reader->GetType(), XML_NODE_ELEMENT_END); ASSERT_EQ(reader->GetLocalName(), L"objD"); @@ -469,11 +469,11 @@ TEST(XmlReaderTest, Read) ASSERT_FALSE(reader->HasValue()); // Move to the whitespace node without returning to the ns:objC element. - ASSERT_TRUE(reader->MoveToNextElement()); + ASSERT_TRUE(reader->MoveToNextNode()); ASSERT_EQ(reader->GetType(), XML_NODE_WHITESPACE); // Move to ns:obj element ending node. - ASSERT_TRUE(reader->MoveToNextElement()); + ASSERT_TRUE(reader->MoveToNextNode()); ASSERT_EQ(reader->GetDepth(), 0); ASSERT_EQ(reader->GetType(), XML_NODE_ELEMENT_END); ASSERT_EQ(reader->GetLocalName(), L"obj"); @@ -489,7 +489,7 @@ TEST(XmlReaderTest, Read) ASSERT_EQ(reader->GetAttributeCount(), 0); // And we're done. - ASSERT_FALSE(reader->MoveToNextElement()); + ASSERT_FALSE(reader->MoveToNextNode()); ASSERT_TRUE(reader->Close()); } @@ -513,7 +513,7 @@ TEST(XmlReaderTest, ReadError) ASSERT_TRUE(reader.get() != NULL); // Move to the processing instruction node and generate parser error. - ASSERT_FALSE(reader->MoveToNextElement()); + ASSERT_FALSE(reader->MoveToNextNode()); ASSERT_TRUE(reader->HasError()); }