summaryrefslogtreecommitdiff
path: root/xfa
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2017-04-26 10:55:54 -0700
committerChromium commit bot <commit-bot@chromium.org>2017-04-26 20:07:23 +0000
commite47e0c96009b8633294eebbb9eb0e84caf525c57 (patch)
tree093c0edb121e54c22e40a704ce473eb48491ccfc /xfa
parent2e2a4fcd43677c5882dcf00cb4b99635cb2cfcd3 (diff)
downloadpdfium-e47e0c96009b8633294eebbb9eb0e84caf525c57.tar.xz
Avoid unordered_set and maps for the time being.chromium/3082
See discussion at https://groups.google.com/a/chromium.org/forum/#!topic/chromium-dev/rdxOHKzQmRY Change-Id: I1803ae97c39b592001835814e2f6674b2c7cb3ea Reviewed-on: https://pdfium-review.googlesource.com/4531 Reviewed-by: dsinclair <dsinclair@chromium.org> Reviewed-by: Lei Zhang <thestig@chromium.org> Commit-Queue: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'xfa')
-rw-r--r--xfa/fde/css/cfde_cssstylesheet.h4
-rw-r--r--xfa/fwl/cfwl_notedriver.h5
-rw-r--r--xfa/fxfa/parser/cxfa_document.cpp2
-rw-r--r--xfa/fxfa/parser/cxfa_document.h4
-rw-r--r--xfa/fxfa/parser/cxfa_node.cpp19
5 files changed, 16 insertions, 18 deletions
diff --git a/xfa/fde/css/cfde_cssstylesheet.h b/xfa/fde/css/cfde_cssstylesheet.h
index fa73460634..24bebddcbf 100644
--- a/xfa/fde/css/cfde_cssstylesheet.h
+++ b/xfa/fde/css/cfde_cssstylesheet.h
@@ -7,8 +7,8 @@
#ifndef XFA_FDE_CSS_CFDE_CSSSTYLESHEET_H_
#define XFA_FDE_CSS_CFDE_CSSSTYLESHEET_H_
+#include <map>
#include <memory>
-#include <unordered_map>
#include <vector>
#include "core/fxcrt/fx_string.h"
@@ -34,7 +34,7 @@ class CFDE_CSSStyleSheet {
void SkipRuleSet(CFDE_CSSSyntaxParser* pSyntax);
std::vector<std::unique_ptr<CFDE_CSSStyleRule>> m_RuleArray;
- std::unordered_map<uint32_t, wchar_t*> m_StringCache;
+ std::map<uint32_t, wchar_t*> m_StringCache;
};
#endif // XFA_FDE_CSS_CFDE_CSSSTYLESHEET_H_
diff --git a/xfa/fwl/cfwl_notedriver.h b/xfa/fwl/cfwl_notedriver.h
index 2ea3f97cc0..b55e701c40 100644
--- a/xfa/fwl/cfwl_notedriver.h
+++ b/xfa/fwl/cfwl_notedriver.h
@@ -8,8 +8,8 @@
#define XFA_FWL_CFWL_NOTEDRIVER_H_
#include <deque>
+#include <map>
#include <memory>
-#include <unordered_map>
#include <vector>
#include "xfa/fwl/cfwl_event.h"
@@ -69,8 +69,7 @@ class CFWL_NoteDriver {
std::vector<CFWL_Widget*> m_Forms;
std::deque<std::unique_ptr<CFWL_Message>> m_NoteQueue;
std::vector<CFWL_NoteLoop*> m_NoteLoopQueue;
- std::unordered_map<uint32_t, std::unique_ptr<CFWL_EventTarget>>
- m_eventTargets;
+ std::map<uint32_t, std::unique_ptr<CFWL_EventTarget>> m_eventTargets;
CFWL_Widget* m_pHover;
CFWL_Widget* m_pFocus;
CFWL_Widget* m_pGrab;
diff --git a/xfa/fxfa/parser/cxfa_document.cpp b/xfa/fxfa/parser/cxfa_document.cpp
index 4b0a398ae2..a1180e7b8e 100644
--- a/xfa/fxfa/parser/cxfa_document.cpp
+++ b/xfa/fxfa/parser/cxfa_document.cpp
@@ -345,7 +345,7 @@ void CXFA_Document::DoProtoMerge() {
return;
std::map<uint32_t, CXFA_Node*> mIDMap;
- std::unordered_set<CXFA_Node*> sUseNodes;
+ std::set<CXFA_Node*> sUseNodes;
CXFA_NodeIterator sIterator(pTemplateRoot);
for (CXFA_Node* pNode = sIterator.GetCurrent(); pNode;
pNode = sIterator.MoveToNext()) {
diff --git a/xfa/fxfa/parser/cxfa_document.h b/xfa/fxfa/parser/cxfa_document.h
index 03586b6591..8491febdbf 100644
--- a/xfa/fxfa/parser/cxfa_document.h
+++ b/xfa/fxfa/parser/cxfa_document.h
@@ -9,7 +9,7 @@
#include <map>
#include <memory>
-#include <unordered_set>
+#include <set>
#include <vector>
#include "xfa/fxfa/fxfa.h"
@@ -120,7 +120,7 @@ class CXFA_Document {
std::unique_ptr<CScript_LogPseudoModel> m_pScriptLog;
std::unique_ptr<CScript_LayoutPseudoModel> m_pScriptLayout;
std::unique_ptr<CScript_SignaturePseudoModel> m_pScriptSignature;
- std::unordered_set<CXFA_Node*> m_PurgeNodes;
+ std::set<CXFA_Node*> m_PurgeNodes;
XFA_VERSION m_eCurVersionMode;
uint32_t m_dwDocFlags;
};
diff --git a/xfa/fxfa/parser/cxfa_node.cpp b/xfa/fxfa/parser/cxfa_node.cpp
index 73fc88db8f..9fae4a43aa 100644
--- a/xfa/fxfa/parser/cxfa_node.cpp
+++ b/xfa/fxfa/parser/cxfa_node.cpp
@@ -8,7 +8,7 @@
#include <map>
#include <memory>
-#include <unordered_set>
+#include <set>
#include <utility>
#include <vector>
@@ -90,7 +90,7 @@ int32_t GetCount(CXFA_Node* pInstMgrNode) {
}
std::vector<CXFA_Node*> NodesSortedByDocumentIdx(
- const std::unordered_set<CXFA_Node*>& rgNodeSet) {
+ const std::set<CXFA_Node*>& rgNodeSet) {
if (rgNodeSet.empty())
return std::vector<CXFA_Node*>();
@@ -105,8 +105,7 @@ std::vector<CXFA_Node*> NodesSortedByDocumentIdx(
return rgNodeArray;
}
-using CXFA_NodeSetPair =
- std::pair<std::unordered_set<CXFA_Node*>, std::unordered_set<CXFA_Node*>>;
+using CXFA_NodeSetPair = std::pair<std::set<CXFA_Node*>, std::set<CXFA_Node*>>;
using CXFA_NodeSetPairMap =
std::map<uint32_t, std::unique_ptr<CXFA_NodeSetPair>>;
using CXFA_NodeSetPairMapMap =
@@ -129,8 +128,8 @@ CXFA_NodeSetPair* NodeSetPairForNode(CXFA_Node* pNode,
return (*pNodeSetPairMap)[dwNameHash].get();
}
-void ReorderDataNodes(const std::unordered_set<CXFA_Node*>& sSet1,
- const std::unordered_set<CXFA_Node*>& sSet2,
+void ReorderDataNodes(const std::set<CXFA_Node*>& sSet1,
+ const std::set<CXFA_Node*>& sSet2,
bool bInsertBefore) {
CXFA_NodeSetPairMapMap rgMap;
for (CXFA_Node* pNode : sSet1) {
@@ -231,8 +230,8 @@ void InsertItem(CXFA_Node* pInstMgrNode,
pInstMgrNode->GetNodeItem(XFA_NODEITEM_Parent)
->InsertChild(pNewInstance, pNextSibling);
if (bMoveDataBindingNodes) {
- std::unordered_set<CXFA_Node*> sNew;
- std::unordered_set<CXFA_Node*> sAfter;
+ std::set<CXFA_Node*> sNew;
+ std::set<CXFA_Node*> sAfter;
CXFA_NodeIteratorTemplate<CXFA_Node,
CXFA_TraverseStrategy_XFAContainerNode>
sIteratorNew(pNewInstance);
@@ -262,8 +261,8 @@ void InsertItem(CXFA_Node* pInstMgrNode,
pInstMgrNode->GetNodeItem(XFA_NODEITEM_Parent)
->InsertChild(pNewInstance, pBeforeInstance);
if (bMoveDataBindingNodes) {
- std::unordered_set<CXFA_Node*> sNew;
- std::unordered_set<CXFA_Node*> sBefore;
+ std::set<CXFA_Node*> sNew;
+ std::set<CXFA_Node*> sBefore;
CXFA_NodeIteratorTemplate<CXFA_Node,
CXFA_TraverseStrategy_XFAContainerNode>
sIteratorNew(pNewInstance);