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

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

Issue 1252613002: FX_BOOL considered harmful. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: Manual edits. Created 5 years, 5 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/javascript/app.cpp ('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 "../../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"
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 { 148 {
149 color = CPWL_Color(COLORTYPE_RGB, (FX_FLOAT)d1, (FX_FLOAT)d2, (F X_FLOAT)d3); 149 color = CPWL_Color(COLORTYPE_RGB, (FX_FLOAT)d1, (FX_FLOAT)d2, (F X_FLOAT)d3);
150 } 150 }
151 else if (sSpace == "CMYK") 151 else if (sSpace == "CMYK")
152 { 152 {
153 color = CPWL_Color(COLORTYPE_CMYK, (FX_FLOAT)d1, (FX_FLOAT)d2, ( FX_FLOAT)d3, (FX_FLOAT)d4); 153 color = CPWL_Color(COLORTYPE_CMYK, (FX_FLOAT)d1, (FX_FLOAT)d2, ( FX_FLOAT)d3, (FX_FLOAT)d4);
154 } 154 }
155 } 155 }
156 156
157 #define JS_IMPLEMENT_COLORPROP(prop, var)\ 157 #define JS_IMPLEMENT_COLORPROP(prop, var)\
158 FX_BOOL color::prop(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError )\ 158 bool color::prop(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)\
159 {\ 159 {\
160 CJS_Context* pContext = (CJS_Context*)cc;\ 160 CJS_Context* pContext = (CJS_Context*)cc;\
161 v8::Isolate* isolate = pContext->GetJSRuntime()->GetIsolate();\ 161 v8::Isolate* isolate = pContext->GetJSRuntime()->GetIsolate();\
162 if (vp.IsGetting())\ 162 if (vp.IsGetting())\
163 {\ 163 {\
164 CJS_Array array(isolate);\ 164 CJS_Array array(isolate);\
165 ConvertPWLColorToArray(var, array);\ 165 ConvertPWLColorToArray(var, array);\
166 vp << array;\ 166 vp << array;\
167 }\ 167 }\
168 else\ 168 else\
169 {\ 169 {\
170 CJS_Array array(isolate);\ 170 CJS_Array array(isolate);\
171 » » if (!vp.ConvertToArray(array)) return FALSE;\ 171 » » if (!vp.ConvertToArray(array)) return false;\
172 ConvertArrayToPWLColor(array, var);\ 172 ConvertArrayToPWLColor(array, var);\
173 }\ 173 }\
174 » return TRUE;\ 174 » return true;\
175 } 175 }
176 176
177 JS_IMPLEMENT_COLORPROP(transparent, m_crTransparent) 177 JS_IMPLEMENT_COLORPROP(transparent, m_crTransparent)
178 JS_IMPLEMENT_COLORPROP(black, m_crBlack) 178 JS_IMPLEMENT_COLORPROP(black, m_crBlack)
179 JS_IMPLEMENT_COLORPROP(white, m_crWhite) 179 JS_IMPLEMENT_COLORPROP(white, m_crWhite)
180 JS_IMPLEMENT_COLORPROP(red, m_crRed) 180 JS_IMPLEMENT_COLORPROP(red, m_crRed)
181 JS_IMPLEMENT_COLORPROP(green, m_crGreen) 181 JS_IMPLEMENT_COLORPROP(green, m_crGreen)
182 JS_IMPLEMENT_COLORPROP(blue, m_crBlue) 182 JS_IMPLEMENT_COLORPROP(blue, m_crBlue)
183 JS_IMPLEMENT_COLORPROP(cyan, m_crCyan) 183 JS_IMPLEMENT_COLORPROP(cyan, m_crCyan)
184 JS_IMPLEMENT_COLORPROP(magenta, m_crMagenta) 184 JS_IMPLEMENT_COLORPROP(magenta, m_crMagenta)
185 JS_IMPLEMENT_COLORPROP(yellow, m_crYellow) 185 JS_IMPLEMENT_COLORPROP(yellow, m_crYellow)
186 JS_IMPLEMENT_COLORPROP(dkGray, m_crDKGray) 186 JS_IMPLEMENT_COLORPROP(dkGray, m_crDKGray)
187 JS_IMPLEMENT_COLORPROP(gray, m_crGray) 187 JS_IMPLEMENT_COLORPROP(gray, m_crGray)
188 JS_IMPLEMENT_COLORPROP(ltGray, m_crLTGray) 188 JS_IMPLEMENT_COLORPROP(ltGray, m_crLTGray)
189 189
190 FX_BOOL color::convert(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Valu e& vRet, CFX_WideString& sError) 190 bool color::convert(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
191 { 191 {
192 v8::Isolate* isolate = GetIsolate(cc); 192 v8::Isolate* isolate = GetIsolate(cc);
193 int iSize = params.size(); 193 int iSize = params.size();
194 » if (iSize < 2) return FALSE; 194 » if (iSize < 2) return false;
195 CJS_Array aSource(isolate); 195 CJS_Array aSource(isolate);
196 » if (!params[0].ConvertToArray(aSource)) return FALSE; 196 » if (!params[0].ConvertToArray(aSource)) return false;
197 197
198 CPWL_Color crSource; 198 CPWL_Color crSource;
199 ConvertArrayToPWLColor(aSource, crSource); 199 ConvertArrayToPWLColor(aSource, crSource);
200 200
201 CFX_ByteString sDestSpace = params[1].ToCFXByteString(); 201 CFX_ByteString sDestSpace = params[1].ToCFXByteString();
202 int nColorType = COLORTYPE_TRANSPARENT; 202 int nColorType = COLORTYPE_TRANSPARENT;
203 203
204 if (sDestSpace == "T") 204 if (sDestSpace == "T")
205 { 205 {
206 nColorType = COLORTYPE_TRANSPARENT; 206 nColorType = COLORTYPE_TRANSPARENT;
(...skipping 10 matching lines...) Expand all
217 { 217 {
218 nColorType = COLORTYPE_CMYK; 218 nColorType = COLORTYPE_CMYK;
219 } 219 }
220 220
221 CJS_Array aDest(isolate); 221 CJS_Array aDest(isolate);
222 CPWL_Color crDest = crSource; 222 CPWL_Color crDest = crSource;
223 crDest.ConvertColorType(nColorType); 223 crDest.ConvertColorType(nColorType);
224 ConvertPWLColorToArray(crDest, aDest); 224 ConvertPWLColorToArray(crDest, aDest);
225 vRet = aDest; 225 vRet = aDest;
226 226
227 » return TRUE; 227 » return true;
228 } 228 }
229 229
230 FX_BOOL color::equal(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError) 230 bool color::equal(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vR et, CFX_WideString& sError)
231 { 231 {
232 v8::Isolate* isolate = GetIsolate(cc); 232 v8::Isolate* isolate = GetIsolate(cc);
233 » if (params.size() < 2) return FALSE; 233 » if (params.size() < 2) return false;
234 234
235 CJS_Array array1(isolate), array2(isolate); 235 CJS_Array array1(isolate), array2(isolate);
236 236
237 » if (!params[0].ConvertToArray(array1)) return FALSE; 237 » if (!params[0].ConvertToArray(array1)) return false;
238 » if (!params[1].ConvertToArray(array2)) return FALSE; 238 » if (!params[1].ConvertToArray(array2)) return false;
239 239
240 CPWL_Color color1; 240 CPWL_Color color1;
241 CPWL_Color color2; 241 CPWL_Color color2;
242 242
243 ConvertArrayToPWLColor(array1, color1); 243 ConvertArrayToPWLColor(array1, color1);
244 ConvertArrayToPWLColor(array2, color2); 244 ConvertArrayToPWLColor(array2, color2);
245 245
246 color1.ConvertColorType(color2.nColorType); 246 color1.ConvertColorType(color2.nColorType);
247 247
248 vRet = color1 == color2; 248 vRet = color1 == color2;
249 » return TRUE; 249 » return true;
250 } 250 }
251 251
OLDNEW
« no previous file with comments | « fpdfsdk/src/javascript/app.cpp ('k') | fpdfsdk/src/javascript/console.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698