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

Side by Side Diff: tests/ImageCacheTest.cpp

Issue 1037793002: C++11 override should now be supported by all of {bots,Chrome,Android,Mozilla} (Closed) Base URL: https://skia.googlesource.com/skia@master
Patch Set: git cl web Created 5 years, 9 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
« no previous file with comments | « tests/GLProgramsTest.cpp ('k') | tests/ImageDecodingTest.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2013 Google Inc. 2 * Copyright 2013 Google Inc.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 #include "SkDiscardableMemory.h" 8 #include "SkDiscardableMemory.h"
9 #include "SkResourceCache.h" 9 #include "SkResourceCache.h"
10 #include "Test.h" 10 #include "Test.h"
11 11
12 namespace { 12 namespace {
13 static void* gGlobalAddress; 13 static void* gGlobalAddress;
14 struct TestingKey : public SkResourceCache::Key { 14 struct TestingKey : public SkResourceCache::Key {
15 intptr_t fValue; 15 intptr_t fValue;
16 16
17 TestingKey(intptr_t value, uint64_t sharedID = 0) : fValue(value) { 17 TestingKey(intptr_t value, uint64_t sharedID = 0) : fValue(value) {
18 this->init(&gGlobalAddress, sharedID, sizeof(fValue)); 18 this->init(&gGlobalAddress, sharedID, sizeof(fValue));
19 } 19 }
20 }; 20 };
21 struct TestingRec : public SkResourceCache::Rec { 21 struct TestingRec : public SkResourceCache::Rec {
22 TestingRec(const TestingKey& key, uint32_t value) : fKey(key), fValue(value) {} 22 TestingRec(const TestingKey& key, uint32_t value) : fKey(key), fValue(value) {}
23 23
24 TestingKey fKey; 24 TestingKey fKey;
25 intptr_t fValue; 25 intptr_t fValue;
26 26
27 const Key& getKey() const SK_OVERRIDE { return fKey; } 27 const Key& getKey() const override { return fKey; }
28 size_t bytesUsed() const SK_OVERRIDE { return sizeof(fKey) + sizeof(fValue); } 28 size_t bytesUsed() const override { return sizeof(fKey) + sizeof(fValue); }
29 29
30 static bool Visitor(const SkResourceCache::Rec& baseRec, void* context) { 30 static bool Visitor(const SkResourceCache::Rec& baseRec, void* context) {
31 const TestingRec& rec = static_cast<const TestingRec&>(baseRec); 31 const TestingRec& rec = static_cast<const TestingRec&>(baseRec);
32 intptr_t* result = (intptr_t*)context; 32 intptr_t* result = (intptr_t*)context;
33 33
34 *result = rec.fValue; 34 *result = rec.fValue;
35 return true; 35 return true;
36 } 36 }
37 }; 37 };
38 } 38 }
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 TestingKey key(1); 142 TestingKey key(1);
143 143
144 cache.add(SkNEW_ARGS(TestingRec, (key, 2))); 144 cache.add(SkNEW_ARGS(TestingRec, (key, 2)));
145 cache.add(SkNEW_ARGS(TestingRec, (key, 3))); 145 cache.add(SkNEW_ARGS(TestingRec, (key, 3)));
146 146
147 // Lookup can return either value. 147 // Lookup can return either value.
148 intptr_t value = -1; 148 intptr_t value = -1;
149 REPORTER_ASSERT(r, cache.find(key, TestingRec::Visitor, &value)); 149 REPORTER_ASSERT(r, cache.find(key, TestingRec::Visitor, &value));
150 REPORTER_ASSERT(r, 2 == value || 3 == value); 150 REPORTER_ASSERT(r, 2 == value || 3 == value);
151 } 151 }
OLDNEW
« no previous file with comments | « tests/GLProgramsTest.cpp ('k') | tests/ImageDecodingTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698