Merge to XFA: Use override in more classes in fpdfsdk/

fpdfsdk/include/javascript/color.h

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #ifndef FPDFSDK_INCLUDE_JAVASCRIPT_COLOR_H_
 #define FPDFSDK_INCLUDE_JAVASCRIPT_COLOR_H_
 
 #include "JS_Define.h"
 // TODO(tsepez): include CPWL_Color.h once its own IWYU is fixed.
 
 class color : public CJS_EmbedObj {
  public:
   color(CJS_Object* pJSObject);
-  virtual ~color(void);
+  ~color() override;
 
   FX_BOOL black(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError);
   FX_BOOL blue(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError);
   FX_BOOL cyan(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError);
   FX_BOOL dkGray(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError);
   FX_BOOL gray(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError);
   FX_BOOL green(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError);
   FX_BOOL ltGray(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError);
   FX_BOOL magenta(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError);
   FX_BOOL red(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError);
@@ skipping 26 matching lines @@
   CPWL_Color m_crCyan;
   CPWL_Color m_crMagenta;
   CPWL_Color m_crYellow;
   CPWL_Color m_crDKGray;
   CPWL_Color m_crGray;
   CPWL_Color m_crLTGray;
 };
 
 class CJS_Color : public CJS_Object {
  public:
-  CJS_Color(JSFXObject pObject) : CJS_Object(pObject){};
-  virtual ~CJS_Color(void){};
+  CJS_Color(JSFXObject pObject) : CJS_Object(pObject) {}
+  ~CJS_Color() override {}
 
   DECLARE_JS_CLASS(CJS_Color);
 
   JS_STATIC_PROP(black, color);
   JS_STATIC_PROP(blue, color);
   JS_STATIC_PROP(cyan, color);
   JS_STATIC_PROP(dkGray, color);
   JS_STATIC_PROP(gray, color);
   JS_STATIC_PROP(green, color);
   JS_STATIC_PROP(ltGray, color);
   JS_STATIC_PROP(magenta, color);
   JS_STATIC_PROP(red, color);
   JS_STATIC_PROP(transparent, color);
   JS_STATIC_PROP(white, color);
   JS_STATIC_PROP(yellow, color);
 
   JS_STATIC_METHOD(convert, color);
   JS_STATIC_METHOD(equal, color);
 };
 
 #endif  // FPDFSDK_INCLUDE_JAVASCRIPT_COLOR_H_