| Index: src/images/SkImageDecoder_libjpeg.cpp
 | 
| diff --git a/src/images/SkImageDecoder_libjpeg.cpp b/src/images/SkImageDecoder_libjpeg.cpp
 | 
| index f25fb9fcce9dcb39b16d6b514129f3e4790a1017..8c9d26783ca40c82ab4be6ae7d5fc0569d2bdf65 100644
 | 
| --- a/src/images/SkImageDecoder_libjpeg.cpp
 | 
| +++ b/src/images/SkImageDecoder_libjpeg.cpp
 | 
| @@ -229,16 +229,16 @@ public:
 | 
|      }
 | 
|  #endif
 | 
|  
 | 
| -    virtual Format getFormat() const SK_OVERRIDE {
 | 
| +    Format getFormat() const SK_OVERRIDE {
 | 
|          return kJPEG_Format;
 | 
|      }
 | 
|  
 | 
|  protected:
 | 
|  #ifdef SK_BUILD_FOR_ANDROID
 | 
| -    virtual bool onBuildTileIndex(SkStreamRewindable *stream, int *width, int *height) SK_OVERRIDE;
 | 
| -    virtual bool onDecodeSubset(SkBitmap* bitmap, const SkIRect& rect) SK_OVERRIDE;
 | 
| +    bool onBuildTileIndex(SkStreamRewindable *stream, int *width, int *height) SK_OVERRIDE;
 | 
| +    bool onDecodeSubset(SkBitmap* bitmap, const SkIRect& rect) SK_OVERRIDE;
 | 
|  #endif
 | 
| -    virtual Result onDecode(SkStream* stream, SkBitmap* bm, Mode) SK_OVERRIDE;
 | 
| +    Result onDecode(SkStream* stream, SkBitmap* bm, Mode) SK_OVERRIDE;
 | 
|      virtual bool onDecodeYUV8Planes(SkStream* stream, SkISize componentSizes[3],
 | 
|                                      void* planes[3], size_t rowBytes[3],
 | 
|                                      SkYUVColorSpace* colorSpace) SK_OVERRIDE;
 | 
| 
 |