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

Side by Side Diff: Source/platform/testing/ArenaTestHelpers.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) 2010 Google Inc. All rights reserved. 2 * Copyright (C) 2010 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 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 26 matching lines...) Expand all
37 37
38 // An allocator for the PODArena which tracks the regions which have 38 // An allocator for the PODArena which tracks the regions which have
39 // been allocated. 39 // been allocated.
40 class TrackedAllocator FINAL : public PODArena::FastMallocAllocator { 40 class TrackedAllocator FINAL : public PODArena::FastMallocAllocator {
41 public: 41 public:
42 static PassRefPtr<TrackedAllocator> create() 42 static PassRefPtr<TrackedAllocator> create()
43 { 43 {
44 return adoptRef(new TrackedAllocator); 44 return adoptRef(new TrackedAllocator);
45 } 45 }
46 46
47 virtual void* allocate(size_t size) OVERRIDE 47 virtual void* allocate(size_t size) override
48 { 48 {
49 void* result = PODArena::FastMallocAllocator::allocate(size); 49 void* result = PODArena::FastMallocAllocator::allocate(size);
50 m_allocatedRegions.append(result); 50 m_allocatedRegions.append(result);
51 return result; 51 return result;
52 } 52 }
53 53
54 virtual void free(void* ptr) OVERRIDE 54 virtual void free(void* ptr) override
55 { 55 {
56 size_t slot = m_allocatedRegions.find(ptr); 56 size_t slot = m_allocatedRegions.find(ptr);
57 ASSERT_NE(slot, kNotFound); 57 ASSERT_NE(slot, kNotFound);
58 m_allocatedRegions.remove(slot); 58 m_allocatedRegions.remove(slot);
59 PODArena::FastMallocAllocator::free(ptr); 59 PODArena::FastMallocAllocator::free(ptr);
60 } 60 }
61 61
62 bool isEmpty() const 62 bool isEmpty() const
63 { 63 {
64 return !numRegions(); 64 return !numRegions();
65 } 65 }
66 66
67 int numRegions() const 67 int numRegions() const
68 { 68 {
69 return m_allocatedRegions.size(); 69 return m_allocatedRegions.size();
70 } 70 }
71 71
72 private: 72 private:
73 TrackedAllocator() { } 73 TrackedAllocator() { }
74 Vector<void*> m_allocatedRegions; 74 Vector<void*> m_allocatedRegions;
75 }; 75 };
76 76
77 } // namespace ArenaTestHelpers 77 } // namespace ArenaTestHelpers
78 } // namespace blink 78 } // namespace blink
79 79
80 #endif // ArenaTestHelpers_h 80 #endif // ArenaTestHelpers_h
OLDNEW
« no previous file with comments | « Source/platform/scroll/ScrollbarThemeOverlayMock.h ('k') | Source/platform/text/DateTimeFormatTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698