From 88e28aa259bc0f318cccf17eebabd3c887a15a46 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Tue, 27 Oct 2015 08:58:46 -0700 Subject: Revert accidental commits to XFA. Revert "Add an embedded test case" This reverts commit ec44186fdbca423eddf432be8b5c38914674023a. Revert "Update the format" This reverts commit 1df068061b5bb5e768a623318186523ffd251aaa. Revert "Update .in file" This reverts commit c13090439e1fbfd8a18c358058f137f897a7477b. Revert "Address review comments" This reverts commit 24967515b8be77a79aa1599f8fbf5d3ecbcd1769. TBR=jun_fang@foxitsoftware.com TBR=thestig@chromium.org Review URL: https://codereview.chromium.org/1414033007 . --- BUILD.gn | 1 - pdfium.gyp | 1 - testing/resources/bug_216.in | 39 --------------------- testing/resources/bug_216.pdf | 40 ---------------------- xfa/src/fxfa/src/parser/xfa_parser_imp.cpp | 39 +++++++-------------- .../src/parser/xfa_parser_imp_embeddertest.cpp | 15 -------- 6 files changed, 13 insertions(+), 122 deletions(-) delete mode 100644 testing/resources/bug_216.in delete mode 100644 testing/resources/bug_216.pdf delete mode 100644 xfa/src/fxfa/src/parser/xfa_parser_imp_embeddertest.cpp diff --git a/BUILD.gn b/BUILD.gn index 8f8b90332f..5657296bc9 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -1511,7 +1511,6 @@ test("pdfium_embeddertests") { "testing/embedder_test.h", "testing/embedder_test_mock_delegate.h", "testing/embedder_test_timer_handling_delegate.h", - "xfa/src/fxfa/src/parser/xfa_parser_imp_embeddertest.cpp", ] deps = [ "//testing/gmock", diff --git a/pdfium.gyp b/pdfium.gyp index 22d6304302..b101096439 100644 --- a/pdfium.gyp +++ b/pdfium.gyp @@ -806,7 +806,6 @@ 'testing/embedder_test.h', 'testing/embedder_test_mock_delegate.h', 'testing/embedder_test_timer_handling_delegate.h', - 'xfa/src/fxfa/src/parser/xfa_parser_imp_embeddertest.cpp', ], 'conditions': [ ['pdf_enable_v8==1', { diff --git a/testing/resources/bug_216.in b/testing/resources/bug_216.in deleted file mode 100644 index 1ecd862c17..0000000000 --- a/testing/resources/bug_216.in +++ /dev/null @@ -1,39 +0,0 @@ -{{header}} -{{object 1 0}} << - /Type /Catalog - /Pages 2 0 R - /AcroForm 4 0 R ->> -endobj -{{object 2 0}} << - /Type /Pages - /Count 1 ->> -endobj -{{object 4 0}} << - /XFA [ - (xdp:xdp) 23 0 R - (form) 29 0 R - () 30 0 R] ->> -endobj -{{object 23 0}} << ->>stream - - -endstream -endobj -{{object 29 0}} << ->>stream -
-
-endstream -endobj -{{object 30 0}} << ->>stream - -endstream -endobj -trailer -<> -%%EOF diff --git a/testing/resources/bug_216.pdf b/testing/resources/bug_216.pdf deleted file mode 100644 index 2d5987277f..0000000000 --- a/testing/resources/bug_216.pdf +++ /dev/null @@ -1,40 +0,0 @@ -%PDF-1.7 -% ò¤ô -1 0 obj << - /Type /Catalog - /Pages 2 0 R - /AcroForm 4 0 R ->> -endobj -2 0 obj << - /Type /Pages - /Count 1 ->> -endobj -4 0 obj << - /XFA [ - (xdp:xdp) 23 0 R - (form) 29 0 R - () 30 0 R] ->> -endobj -23 0 obj << ->>stream - - -endstream -endobj -29 0 obj << ->>stream -
-
-endstream -endobj -30 0 obj << ->>stream - -endstream -endobj -trailer -<> -%%EOF diff --git a/xfa/src/fxfa/src/parser/xfa_parser_imp.cpp b/xfa/src/fxfa/src/parser/xfa_parser_imp.cpp index 48547d7e9f..9e85c1f539 100644 --- a/xfa/src/fxfa/src/parser/xfa_parser_imp.cpp +++ b/xfa/src/fxfa/src/parser/xfa_parser_imp.cpp @@ -386,12 +386,12 @@ CXFA_Node* CXFA_SimpleParser::ParseAsXDPPacket_XDP( pXMLDocumentNode, XFA_GetPacketByIndex(XFA_PACKET_XDP)->pName, XFA_GetPacketByIndex(XFA_PACKET_XDP)->pURI, XFA_GetPacketByIndex(XFA_PACKET_XDP)->eFlags)) { - return nullptr; + return NULL; } CXFA_Node* pXFARootNode = m_pFactory->CreateNode(XFA_XDPPACKET_XDP, XFA_ELEMENT_Xfa); if (!pXFARootNode) { - return nullptr; + return NULL; } m_pRootNode = pXFARootNode; pXFARootNode->SetCData(XFA_ATTRIBUTE_Name, FX_WSTRC(L"xfa")); @@ -408,8 +408,8 @@ CXFA_Node* CXFA_SimpleParser::ParseAsXDPPacket_XDP( } } } - IFDE_XMLNode* pXMLConfigDOMRoot = nullptr; - CXFA_Node* pXFAConfigDOMRoot = nullptr; + IFDE_XMLNode* pXMLConfigDOMRoot = NULL; + CXFA_Node* pXFAConfigDOMRoot = NULL; { for (IFDE_XMLNode* pChildItem = pXMLDocumentNode->GetNodeItem(IFDE_XMLNode::FirstChild); @@ -423,7 +423,7 @@ CXFA_Node* CXFA_SimpleParser::ParseAsXDPPacket_XDP( } if (CXFA_Node* pChildNode = pXFARootNode->GetFirstChildByName(pPacketInfo->uHash)) { - return nullptr; + return NULL; } pXMLConfigDOMRoot = pChildItem; pXFAConfigDOMRoot = @@ -431,9 +431,8 @@ CXFA_Node* CXFA_SimpleParser::ParseAsXDPPacket_XDP( pXFARootNode->InsertChild(pXFAConfigDOMRoot, NULL); } } - IFDE_XMLNode* pXMLDatasetsDOMRoot = nullptr; - IFDE_XMLNode* pXMLFormDOMRoot = nullptr; - IFDE_XMLNode* pXMLTemplateDOMRoot = nullptr; + IFDE_XMLNode* pXMLDatasetsDOMRoot = NULL; + IFDE_XMLNode* pXMLFormDOMRoot = NULL; { for (IFDE_XMLNode* pChildItem = pXMLDocumentNode->GetNodeItem(IFDE_XMLNode::FirstChild); @@ -454,7 +453,7 @@ CXFA_Node* CXFA_SimpleParser::ParseAsXDPPacket_XDP( if (!XFA_FDEExtension_MatchNodeName(pElement, pPacketInfo->pName, pPacketInfo->pURI, pPacketInfo->eFlags)) { - pPacketInfo = nullptr; + pPacketInfo = NULL; } } XFA_XDPPACKET ePacket = @@ -464,41 +463,29 @@ CXFA_Node* CXFA_SimpleParser::ParseAsXDPPacket_XDP( } if (ePacket == XFA_XDPPACKET_Datasets) { if (pXMLDatasetsDOMRoot) { - return nullptr; + pXMLDatasetsDOMRoot = NULL; + return NULL; } pXMLDatasetsDOMRoot = pElement; } else if (ePacket == XFA_XDPPACKET_Form) { if (pXMLFormDOMRoot) { - return nullptr; + pXMLFormDOMRoot = NULL; + return NULL; } pXMLFormDOMRoot = pElement; - } else if (ePacket == XFA_XDPPACKET_Template) { - if (pXMLTemplateDOMRoot) { - // Found a duplicate template packet. - return nullptr; - } - CXFA_Node* pPacketNode = ParseAsXDPPacket(pElement, ePacket); - if (pPacketNode) { - pXMLTemplateDOMRoot = pElement; - pXFARootNode->InsertChild(pPacketNode); - } } else { CXFA_Node* pPacketNode = ParseAsXDPPacket(pElement, ePacket); if (pPacketNode) { if (pPacketInfo && (pPacketInfo->eFlags & XFA_XDPPACKET_FLAGS_SUPPORTONE) && pXFARootNode->GetFirstChildByName(pPacketInfo->uHash)) { - return nullptr; + return NULL; } pXFARootNode->InsertChild(pPacketNode); } } } } - if (!pXMLTemplateDOMRoot) { - // No template is found. - return nullptr; - } if (pXMLDatasetsDOMRoot) { CXFA_Node* pPacketNode = ParseAsXDPPacket(pXMLDatasetsDOMRoot, XFA_XDPPACKET_Datasets); diff --git a/xfa/src/fxfa/src/parser/xfa_parser_imp_embeddertest.cpp b/xfa/src/fxfa/src/parser/xfa_parser_imp_embeddertest.cpp deleted file mode 100644 index 5a3059c0f5..0000000000 --- a/xfa/src/fxfa/src/parser/xfa_parser_imp_embeddertest.cpp +++ /dev/null @@ -1,15 +0,0 @@ -// Copyright 2015 PDFium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "../../../../../testing/embedder_test.h" -#include "testing/gtest/include/gtest/gtest.h" - -class XFAParserImpEmbeddertest : public EmbedderTest {}; - -TEST_F(XFAParserImpEmbeddertest, Bug_216) { - EXPECT_TRUE(OpenDocument("testing/resources/bug_216.pdf")); - FPDF_PAGE page = LoadPage(0); - EXPECT_NE(nullptr, page); - UnloadPage(page); -} \ No newline at end of file -- cgit v1.2.3