Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(517)

Side by Side Diff: fpdfsdk/src/javascript/JS_GlobalData.cpp

Issue 1554453002: Merge to XFA: Take care fall-through cases of switch in pdfium (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@xfa
Patch Set: Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « fpdfsdk/src/formfiller/FFL_FormFiller.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 PDFium Authors. All rights reserved. 1 // Copyright 2014 PDFium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com 5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
6 6
7 #include "JS_GlobalData.h" 7 #include "JS_GlobalData.h"
8 8
9 #include "core/include/fdrm/fx_crypt.h" 9 #include "core/include/fdrm/fx_crypt.h"
10 #include "fpdfsdk/include/javascript/IJavaScript.h" 10 #include "fpdfsdk/include/javascript/IJavaScript.h"
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 pNewObjData->nType = pOldObjData->nType; 44 pNewObjData->nType = pOldObjData->nType;
45 pNewObjData->sData = pOldObjData->sData; 45 pNewObjData->sData = pOldObjData->sData;
46 Add(pNewObjData); 46 Add(pNewObjData);
47 } break; 47 } break;
48 case JS_GLOBALDATA_TYPE_OBJECT: { 48 case JS_GLOBALDATA_TYPE_OBJECT: {
49 CJS_KeyValue* pNewObjData = new CJS_KeyValue; 49 CJS_KeyValue* pNewObjData = new CJS_KeyValue;
50 pNewObjData->sKey = pOldObjData->sKey; 50 pNewObjData->sKey = pOldObjData->sKey;
51 pNewObjData->nType = pOldObjData->nType; 51 pNewObjData->nType = pOldObjData->nType;
52 pNewObjData->objData.Copy(pOldObjData->objData); 52 pNewObjData->objData.Copy(pOldObjData->objData);
53 Add(pNewObjData); 53 Add(pNewObjData);
54 } 54 } break;
55 case JS_GLOBALDATA_TYPE_NULL: { 55 case JS_GLOBALDATA_TYPE_NULL: {
56 CJS_KeyValue* pNewObjData = new CJS_KeyValue; 56 CJS_KeyValue* pNewObjData = new CJS_KeyValue;
57 pNewObjData->sKey = pOldObjData->sKey; 57 pNewObjData->sKey = pOldObjData->sKey;
58 pNewObjData->nType = pOldObjData->nType; 58 pNewObjData->nType = pOldObjData->nType;
59 Add(pNewObjData); 59 Add(pNewObjData);
60 } 60 } break;
61 } 61 }
62 } 62 }
63 } 63 }
64 64
65 void CJS_GlobalVariableArray::Add(CJS_KeyValue* p) { 65 void CJS_GlobalVariableArray::Add(CJS_KeyValue* p) {
66 array.Add(p); 66 array.Add(p);
67 } 67 }
68 68
69 int CJS_GlobalVariableArray::Count() const { 69 int CJS_GlobalVariableArray::Count() const {
70 return array.GetSize(); 70 return array.GetSize();
(...skipping 410 matching lines...) Expand 10 before | Expand all | Expand 10 after
481 case JS_GLOBALDATA_TYPE_NULL: { 481 case JS_GLOBALDATA_TYPE_NULL: {
482 FX_DWORD dwNameLen = (FX_DWORD)name.GetLength(); 482 FX_DWORD dwNameLen = (FX_DWORD)name.GetLength();
483 sData.AppendBlock(&dwNameLen, sizeof(FX_DWORD)); 483 sData.AppendBlock(&dwNameLen, sizeof(FX_DWORD));
484 sData.AppendString(name); 484 sData.AppendString(name);
485 sData.AppendBlock(&wType, sizeof(FX_DWORD)); 485 sData.AppendBlock(&wType, sizeof(FX_DWORD));
486 } break; 486 } break;
487 default: 487 default:
488 break; 488 break;
489 } 489 }
490 } 490 }
OLDNEW
« no previous file with comments | « fpdfsdk/src/formfiller/FFL_FormFiller.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698