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

Side by Side Diff: skia/ext/SkDiscardableMemory_chrome.h

Issue 641523002: Replace OVERRIDE with its C++11 counterparts in src/skia (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
« no previous file with comments | « AUTHORS ('k') | skia/ext/analysis_canvas.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef SKIA_EXT_SK_DISCARDABLE_MEMORY_CHROME_H_ 5 #ifndef SKIA_EXT_SK_DISCARDABLE_MEMORY_CHROME_H_
6 #define SKIA_EXT_SK_DISCARDABLE_MEMORY_CHROME_H_ 6 #define SKIA_EXT_SK_DISCARDABLE_MEMORY_CHROME_H_
7 7
8 #include "base/memory/discardable_memory.h" 8 #include "base/memory/discardable_memory.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "third_party/skia/src/core/SkDiscardableMemory.h" 10 #include "third_party/skia/src/core/SkDiscardableMemory.h"
11 11
12 // This class implements the SkDiscardableMemory interface using 12 // This class implements the SkDiscardableMemory interface using
13 // base::DiscardableMemory. 13 // base::DiscardableMemory.
14 class SK_API SkDiscardableMemoryChrome : public SkDiscardableMemory { 14 class SK_API SkDiscardableMemoryChrome : public SkDiscardableMemory {
15 public: 15 public:
16 virtual ~SkDiscardableMemoryChrome(); 16 virtual ~SkDiscardableMemoryChrome();
17 17
18 // SkDiscardableMemory: 18 // SkDiscardableMemory:
19 virtual bool lock() OVERRIDE; 19 virtual bool lock() override;
20 virtual void* data() OVERRIDE; 20 virtual void* data() override;
21 virtual void unlock() OVERRIDE; 21 virtual void unlock() override;
22 22
23 private: 23 private:
24 friend class SkDiscardableMemory; 24 friend class SkDiscardableMemory;
25 25
26 SkDiscardableMemoryChrome(scoped_ptr<base::DiscardableMemory> memory); 26 SkDiscardableMemoryChrome(scoped_ptr<base::DiscardableMemory> memory);
27 27
28 scoped_ptr<base::DiscardableMemory> discardable_; 28 scoped_ptr<base::DiscardableMemory> discardable_;
29 }; 29 };
30 30
31 #endif // SKIA_EXT_SK_DISCARDABLE_MEMORY_CHROME_H_ 31 #endif // SKIA_EXT_SK_DISCARDABLE_MEMORY_CHROME_H_
OLDNEW
« no previous file with comments | « AUTHORS ('k') | skia/ext/analysis_canvas.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698