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

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

Issue 802013002: Avoid duplicate definitions of JSCONST_n*Hash and QeTable variables. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: Created 6 years 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
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 "../../include/javascript/JavaScript.h" 7 #include "../../include/javascript/JavaScript.h"
8 #include "../../include/javascript/IJavaScript.h" 8 #include "../../include/javascript/IJavaScript.h"
9 #include "../../include/javascript/JS_Define.h" 9 #include "../../include/javascript/JS_Define.h"
10 #include "../../include/javascript/JS_Object.h" 10 #include "../../include/javascript/JS_Object.h"
11 #include "../../include/javascript/JS_Value.h" 11 #include "../../include/javascript/JS_Value.h"
12 #include "../../include/javascript/JS_GlobalData.h" 12 #include "../../include/javascript/JS_GlobalData.h"
13 #include "../../include/javascript/global.h" 13 #include "../../include/javascript/global.h"
14 #include "../../include/javascript/JS_EventHandler.h" 14 #include "../../include/javascript/JS_EventHandler.h"
15 #include "../../include/javascript/JS_Context.h" 15 #include "../../include/javascript/JS_Context.h"
16 16
17 /* ---------------------------- global ---------------------------- */ 17 /* ---------------------------- global ---------------------------- */
18 18
19 extern const unsigned int JSCONST_nStringHash = JS_CalcHash(VALUE_NAME_STRING,wc slen(VALUE_NAME_STRING));
Bo Xu 2014/12/13 01:47:37 Similar here?
brucedawson 2014/12/13 01:56:25 I just noticed that these lines are well over 80 c
Bo Xu 2014/12/13 03:39:55 There is a separate thread by thakis@ requesting r
20 extern const unsigned int JSCONST_nNumberHash = JS_CalcHash(VALUE_NAME_NUMBER,wc slen(VALUE_NAME_NUMBER));
21 extern const unsigned int JSCONST_nBoolHash = JS_CalcHash(VALUE_NAME_BOOLEAN,wcs len(VALUE_NAME_BOOLEAN));
22 extern const unsigned int JSCONST_nDateHash = JS_CalcHash(VALUE_NAME_DATE,wcslen (VALUE_NAME_DATE));
23 extern const unsigned int JSCONST_nObjectHash = JS_CalcHash(VALUE_NAME_OBJECT,wc slen(VALUE_NAME_OBJECT));
24 extern const unsigned int JSCONST_nFXobjHash = JS_CalcHash(VALUE_NAME_FXOBJ,wcsl en(VALUE_NAME_FXOBJ));
25 extern const unsigned int JSCONST_nNullHash = JS_CalcHash(VALUE_NAME_NULL,wcslen (VALUE_NAME_NULL));
26 extern const unsigned int JSCONST_nUndefHash = JS_CalcHash(VALUE_NAME_UNDEFINED, wcslen(VALUE_NAME_UNDEFINED));
27
19 BEGIN_JS_STATIC_CONST(CJS_Global) 28 BEGIN_JS_STATIC_CONST(CJS_Global)
20 END_JS_STATIC_CONST() 29 END_JS_STATIC_CONST()
21 30
22 BEGIN_JS_STATIC_PROP(CJS_Global) 31 BEGIN_JS_STATIC_PROP(CJS_Global)
23 END_JS_STATIC_PROP() 32 END_JS_STATIC_PROP()
24 33
25 BEGIN_JS_STATIC_METHOD(CJS_Global) 34 BEGIN_JS_STATIC_METHOD(CJS_Global)
26 JS_STATIC_METHOD_ENTRY(setPersistent, 2) 35 JS_STATIC_METHOD_ENTRY(setPersistent, 2)
27 END_JS_STATIC_METHOD() 36 END_JS_STATIC_METHOD()
28 37
(...skipping 512 matching lines...) Expand 10 before | Expand all | Expand 10 after
541 } 550 }
542 break; 551 break;
543 default: 552 default:
544 return FALSE; 553 return FALSE;
545 } 554 }
546 555
547 m_mapGlobal.SetAt(propname, (FX_LPVOID)pNewData); 556 m_mapGlobal.SetAt(propname, (FX_LPVOID)pNewData);
548 557
549 return TRUE; 558 return TRUE;
550 } 559 }
OLDNEW
« core/src/fxcodec/jbig2/JBig2_GeneralDecoder.cpp ('K') | « fpdfsdk/include/javascript/JS_Define.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698