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

Side by Side Diff: Source/platform/graphics/ImageDecodingStore.h

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) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 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 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 return adoptPtr(new DecoderCacheEntry(generator, 0, decoder)); 137 return adoptPtr(new DecoderCacheEntry(generator, 0, decoder));
138 } 138 }
139 139
140 DecoderCacheEntry(const ImageFrameGenerator* generator, int count, PassO wnPtr<ImageDecoder> decoder) 140 DecoderCacheEntry(const ImageFrameGenerator* generator, int count, PassO wnPtr<ImageDecoder> decoder)
141 : CacheEntry(generator, count) 141 : CacheEntry(generator, count)
142 , m_cachedDecoder(decoder) 142 , m_cachedDecoder(decoder)
143 , m_size(SkISize::Make(m_cachedDecoder->decodedSize().width(), m_cac hedDecoder->decodedSize().height())) 143 , m_size(SkISize::Make(m_cachedDecoder->decodedSize().width(), m_cac hedDecoder->decodedSize().height()))
144 { 144 {
145 } 145 }
146 146
147 virtual size_t memoryUsageInBytes() const OVERRIDE { return m_size.width () * m_size.height() * 4; } 147 virtual size_t memoryUsageInBytes() const override { return m_size.width () * m_size.height() * 4; }
148 virtual CacheType type() const OVERRIDE { return TypeDecoder; } 148 virtual CacheType type() const override { return TypeDecoder; }
149 149
150 static DecoderCacheKey makeCacheKey(const ImageFrameGenerator* generator , const SkISize& size) 150 static DecoderCacheKey makeCacheKey(const ImageFrameGenerator* generator , const SkISize& size)
151 { 151 {
152 return std::make_pair(generator, size); 152 return std::make_pair(generator, size);
153 } 153 }
154 static DecoderCacheKey makeCacheKey(const ImageFrameGenerator* generator , const ImageDecoder* decoder) 154 static DecoderCacheKey makeCacheKey(const ImageFrameGenerator* generator , const ImageDecoder* decoder)
155 { 155 {
156 return std::make_pair(generator, SkISize::Make(decoder->decodedSize( ).width(), decoder->decodedSize().height())); 156 return std::make_pair(generator, SkISize::Make(decoder->decodedSize( ).width(), decoder->decodedSize().height()));
157 } 157 }
158 DecoderCacheKey cacheKey() const { return makeCacheKey(m_generator, m_si ze); } 158 DecoderCacheKey cacheKey() const { return makeCacheKey(m_generator, m_si ze); }
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
211 // m_heapLimitInBytes 211 // m_heapLimitInBytes
212 // m_heapMemoryUsageInBytes 212 // m_heapMemoryUsageInBytes
213 // This mutex also protects calls to underlying skBitmap's 213 // This mutex also protects calls to underlying skBitmap's
214 // lockPixels()/unlockPixels() as they are not threadsafe. 214 // lockPixels()/unlockPixels() as they are not threadsafe.
215 Mutex m_mutex; 215 Mutex m_mutex;
216 }; 216 };
217 217
218 } // namespace blink 218 } // namespace blink
219 219
220 #endif 220 #endif
OLDNEW
« no previous file with comments | « Source/platform/graphics/GraphicsLayerTest.cpp ('k') | Source/platform/graphics/ImageFrameGenerator.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698