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

Side by Side Diff: Source/platform/image-decoders/ImageDecoderTest.cpp

Issue 630853002: Replacing the OVERRIDE with override in third_party/WebKit/Source/platform (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase build fix Created 6 years, 2 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 29 matching lines...) Expand all
40 40
41 using namespace blink; 41 using namespace blink;
42 42
43 class TestImageDecoder : public ImageDecoder { 43 class TestImageDecoder : public ImageDecoder {
44 public: 44 public:
45 TestImageDecoder() 45 TestImageDecoder()
46 : ImageDecoder(ImageSource::AlphaNotPremultiplied, ImageSource::GammaAnd ColorProfileApplied, noDecodedImageByteLimit) 46 : ImageDecoder(ImageSource::AlphaNotPremultiplied, ImageSource::GammaAnd ColorProfileApplied, noDecodedImageByteLimit)
47 { 47 {
48 } 48 }
49 49
50 virtual String filenameExtension() const OVERRIDE { return ""; } 50 virtual String filenameExtension() const override { return ""; }
51 virtual ImageFrame* frameBufferAtIndex(size_t) OVERRIDE { return 0; } 51 virtual ImageFrame* frameBufferAtIndex(size_t) override { return 0; }
52 52
53 Vector<ImageFrame, 1>& frameBufferCache() 53 Vector<ImageFrame, 1>& frameBufferCache()
54 { 54 {
55 return m_frameBufferCache; 55 return m_frameBufferCache;
56 } 56 }
57 57
58 void resetRequiredPreviousFrames(bool knownOpaque = false) 58 void resetRequiredPreviousFrames(bool knownOpaque = false)
59 { 59 {
60 for (size_t i = 0; i < m_frameBufferCache.size(); ++i) 60 for (size_t i = 0; i < m_frameBufferCache.size(); ++i)
61 m_frameBufferCache[i].setRequiredPreviousFrameIndex(findRequiredPrev iousFrame(i, knownOpaque)); 61 m_frameBufferCache[i].setRequiredPreviousFrameIndex(findRequiredPrev iousFrame(i, knownOpaque));
(...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after
240 decoder->resetRequiredPreviousFrames(); 240 decoder->resetRequiredPreviousFrames();
241 decoder->clearCacheExceptFrame(5); 241 decoder->clearCacheExceptFrame(5);
242 for (size_t i = 0; i < numFrames; ++i) { 242 for (size_t i = 0; i < numFrames; ++i) {
243 SCOPED_TRACE(testing::Message() << i); 243 SCOPED_TRACE(testing::Message() << i);
244 if (i == 5) 244 if (i == 5)
245 EXPECT_EQ(ImageFrame::FrameComplete, frameBuffers[i].status()); 245 EXPECT_EQ(ImageFrame::FrameComplete, frameBuffers[i].status());
246 else 246 else
247 EXPECT_EQ(ImageFrame::FrameEmpty, frameBuffers[i].status()); 247 EXPECT_EQ(ImageFrame::FrameEmpty, frameBuffers[i].status());
248 } 248 }
249 } 249 }
OLDNEW
« no previous file with comments | « Source/platform/heap/glue/MessageLoopInterruptor.h ('k') | Source/platform/image-decoders/bmp/BMPImageDecoder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698