diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-23 21:37:18 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-23 21:37:18 +0000 |
| commit | 6a8e9bacac7b6646111952bb60255c866aff5b3e (patch) | |
| tree | 831c019508aa14ed9add660a321727b2fb8d33a4 /skia | |
| parent | bc8032acb6f8534cb7034afe02b7f9d1a2609941 (diff) | |
| download | chromium_src-6a8e9bacac7b6646111952bb60255c866aff5b3e.zip chromium_src-6a8e9bacac7b6646111952bb60255c866aff5b3e.tar.gz chromium_src-6a8e9bacac7b6646111952bb60255c866aff5b3e.tar.bz2 | |
Add OVERRIDE to skia/.
BUG=104314
TEST=no change
Review URL: http://codereview.chromium.org/8681014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111413 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia')
| -rw-r--r-- | skia/ext/SkFontHost_fontconfig_direct.h | 5 | ||||
| -rw-r--r-- | skia/ext/vector_platform_device_skia.h | 26 |
2 files changed, 20 insertions, 11 deletions
diff --git a/skia/ext/SkFontHost_fontconfig_direct.h b/skia/ext/SkFontHost_fontconfig_direct.h index 4f9fbf6..ee1790e 100644 --- a/skia/ext/SkFontHost_fontconfig_direct.h +++ b/skia/ext/SkFontHost_fontconfig_direct.h @@ -22,6 +22,7 @@ #include <map> #include <string> +#include "base/compiler_specific.h" #include "SkThread.h" #include "SkFontHost_fontconfig_impl.h" @@ -35,8 +36,8 @@ class SK_API FontConfigDirect : public FontConfigInterface { bool filefaceid_valid, unsigned filefaceid, const std::string& family, const void* characters, size_t characters_bytes, - bool* is_bold, bool* is_italic); - virtual int Open(unsigned filefaceid); + bool* is_bold, bool* is_italic) OVERRIDE; + virtual int Open(unsigned filefaceid) OVERRIDE; private: SkMutex mutex_; diff --git a/skia/ext/vector_platform_device_skia.h b/skia/ext/vector_platform_device_skia.h index e142413..3db7561 100644 --- a/skia/ext/vector_platform_device_skia.h +++ b/skia/ext/vector_platform_device_skia.h @@ -7,6 +7,7 @@ #pragma once #include "base/basictypes.h" +#include "base/compiler_specific.h" #include "base/logging.h" #include "skia/ext/platform_device.h" #include "third_party/skia/include/core/SkRefCnt.h" @@ -27,19 +28,26 @@ class VectorPlatformDeviceSkia : public PlatformDevice, public SkPDFDevice { virtual ~VectorPlatformDeviceSkia(); // PlatformDevice methods. - virtual bool IsNativeFontRenderingAllowed(); + virtual bool IsNativeFontRenderingAllowed() OVERRIDE; - virtual PlatformSurface BeginPlatformPaint(); - virtual void EndPlatformPaint(); + virtual PlatformSurface BeginPlatformPaint() OVERRIDE; + virtual void EndPlatformPaint() OVERRIDE; #if defined(OS_WIN) - virtual void DrawToNativeContext(HDC dc, int x, int y, const RECT* src_rect); + virtual void DrawToNativeContext(HDC dc, + int x, + int y, + const RECT* src_rect) OVERRIDE; #elif defined(OS_MACOSX) - virtual void DrawToNativeContext(CGContext* context, int x, int y, - const CGRect* src_rect); - virtual CGContextRef GetBitmapContext(); + virtual void DrawToNativeContext(CGContext* context, + int x, + int y, + const CGRect* src_rect) OVERRIDE; + virtual CGContextRef GetBitmapContext() OVERRIDE; #elif defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_OPENBSD) - virtual void DrawToNativeContext(PlatformSurface surface, int x, int y, - const PlatformRect* src_rect); + virtual void DrawToNativeContext(PlatformSurface surface, + int x, + int y, + const PlatformRect* src_rect) OVERRIDE; #endif private: |