summaryrefslogtreecommitdiff
path: root/fxjs/cjs_globalvariablearray.cpp
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2018-09-17 23:36:22 +0000
committerChromium commit bot <commit-bot@chromium.org>2018-09-17 23:36:22 +0000
commite063301440f00207c5d72a01883777adb1686455 (patch)
treebb1df3b68cfc44e1aa419bfa3671f9cb46ad18ee /fxjs/cjs_globalvariablearray.cpp
parent4c3b4aa6d1df54fe02912fed04a08adc6826310f (diff)
downloadpdfium-e063301440f00207c5d72a01883777adb1686455.tar.xz
Replace CJS_GlobalVariableArray::Copy() with operator=().
Change-Id: I71794f87a99f9dcbb04296f42e8a5cd55656bd90 Reviewed-on: https://pdfium-review.googlesource.com/42615 Commit-Queue: Tom Sepez <tsepez@chromium.org> Reviewed-by: Lei Zhang <thestig@chromium.org>
Diffstat (limited to 'fxjs/cjs_globalvariablearray.cpp')
-rw-r--r--fxjs/cjs_globalvariablearray.cpp13
1 files changed, 9 insertions, 4 deletions
diff --git a/fxjs/cjs_globalvariablearray.cpp b/fxjs/cjs_globalvariablearray.cpp
index c4ac00cc9a..e8155b6dc0 100644
--- a/fxjs/cjs_globalvariablearray.cpp
+++ b/fxjs/cjs_globalvariablearray.cpp
@@ -15,10 +15,14 @@ CJS_GlobalVariableArray::CJS_GlobalVariableArray() {}
CJS_GlobalVariableArray::~CJS_GlobalVariableArray() {}
-void CJS_GlobalVariableArray::Copy(const CJS_GlobalVariableArray& array) {
+CJS_GlobalVariableArray& CJS_GlobalVariableArray::operator=(
+ const CJS_GlobalVariableArray& that) {
+ if (this == &that)
+ return *this;
+
m_Array.clear();
- for (int i = 0, sz = array.Count(); i < sz; i++) {
- CJS_KeyValue* pOldObjData = array.GetAt(i);
+ for (int i = 0, sz = that.Count(); i < sz; i++) {
+ CJS_KeyValue* pOldObjData = that.GetAt(i);
switch (pOldObjData->nType) {
case JS_GlobalDataType::NUMBER: {
auto pNewObjData = pdfium::MakeUnique<CJS_KeyValue>();
@@ -45,7 +49,7 @@ void CJS_GlobalVariableArray::Copy(const CJS_GlobalVariableArray& array) {
auto pNewObjData = pdfium::MakeUnique<CJS_KeyValue>();
pNewObjData->sKey = pOldObjData->sKey;
pNewObjData->nType = pOldObjData->nType;
- pNewObjData->objData.Copy(pOldObjData->objData);
+ pNewObjData->objData = pOldObjData->objData;
Add(std::move(pNewObjData));
} break;
case JS_GlobalDataType::NULLOBJ: {
@@ -56,6 +60,7 @@ void CJS_GlobalVariableArray::Copy(const CJS_GlobalVariableArray& array) {
} break;
}
}
+ return *this;
}
void CJS_GlobalVariableArray::Add(std::unique_ptr<CJS_KeyValue> pKeyValue) {