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

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

Issue 1439223003: Merge to XFA: Remove relative includes. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@xfa
Patch Set: fix merge Created 5 years, 1 month 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/javascript/color.h ('k') | fpdfsdk/src/javascript/console.cpp » ('j') | 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 "color.h" 7 #include "color.h"
8 8
9 #include "../../include/javascript/IJavaScript.h" 9 #include "JS_Context.h"
10 #include "JS_Define.h" 10 #include "JS_Define.h"
11 #include "JS_EventHandler.h"
11 #include "JS_Object.h" 12 #include "JS_Object.h"
13 #include "JS_Runtime.h"
12 #include "JS_Value.h" 14 #include "JS_Value.h"
13 #include "JS_EventHandler.h" 15 #include "fpdfsdk/include/javascript/IJavaScript.h"
14 #include "JS_Context.h"
15 #include "JS_Runtime.h"
16 16
17 /* -------------------------- color -------------------------- */ 17 /* -------------------------- color -------------------------- */
18 18
19 BEGIN_JS_STATIC_CONST(CJS_Color) 19 BEGIN_JS_STATIC_CONST(CJS_Color)
20 END_JS_STATIC_CONST() 20 END_JS_STATIC_CONST()
21 21
22 BEGIN_JS_STATIC_PROP(CJS_Color) 22 BEGIN_JS_STATIC_PROP(CJS_Color)
23 JS_STATIC_PROP_ENTRY(black) 23 JS_STATIC_PROP_ENTRY(black)
24 JS_STATIC_PROP_ENTRY(blue) 24 JS_STATIC_PROP_ENTRY(blue)
25 JS_STATIC_PROP_ENTRY(cyan) 25 JS_STATIC_PROP_ENTRY(cyan)
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after
213 return FALSE; 213 return FALSE;
214 214
215 CPWL_Color color1; 215 CPWL_Color color1;
216 CPWL_Color color2; 216 CPWL_Color color2;
217 ConvertArrayToPWLColor(array1, color1); 217 ConvertArrayToPWLColor(array1, color1);
218 ConvertArrayToPWLColor(array2, color2); 218 ConvertArrayToPWLColor(array2, color2);
219 color1.ConvertColorType(color2.nColorType); 219 color1.ConvertColorType(color2.nColorType);
220 vRet = color1 == color2; 220 vRet = color1 == color2;
221 return TRUE; 221 return TRUE;
222 } 222 }
OLDNEW
« no previous file with comments | « fpdfsdk/src/javascript/color.h ('k') | fpdfsdk/src/javascript/console.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698