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

Side by Side Diff: Source/platform/RefCountedSupplement.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
« no previous file with comments | « Source/platform/PODIntervalTree.h ('k') | Source/platform/SharedTimer.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 /* 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 27 matching lines...) Expand all
38 public: 38 public:
39 typedef RefCountedSupplement<T, S> ThisType; 39 typedef RefCountedSupplement<T, S> ThisType;
40 40
41 virtual ~RefCountedSupplement() { } 41 virtual ~RefCountedSupplement() { }
42 42
43 class Wrapper FINAL : public Supplement<T> { 43 class Wrapper FINAL : public Supplement<T> {
44 public: 44 public:
45 explicit Wrapper(PassRefPtr<ThisType> wrapped) : m_wrapped(wrapped) { } 45 explicit Wrapper(PassRefPtr<ThisType> wrapped) : m_wrapped(wrapped) { }
46 virtual ~Wrapper() { } 46 virtual ~Wrapper() { }
47 #if ENABLE(SECURITY_ASSERT) 47 #if ENABLE(SECURITY_ASSERT)
48 virtual bool isRefCountedWrapper() const OVERRIDE { return true; } 48 virtual bool isRefCountedWrapper() const override { return true; }
49 #endif 49 #endif
50 ThisType* wrapped() const { return m_wrapped.get(); } 50 ThisType* wrapped() const { return m_wrapped.get(); }
51 51
52 private: 52 private:
53 53
54 RefPtr<ThisType> m_wrapped; 54 RefPtr<ThisType> m_wrapped;
55 }; 55 };
56 56
57 static void provideTo(Supplementable<T>& host, const char* key, PassRefPtr<T hisType> supplement) 57 static void provideTo(Supplementable<T>& host, const char* key, PassRefPtr<T hisType> supplement)
58 { 58 {
59 host.provideSupplement(key, adoptPtr(new Wrapper(supplement))); 59 host.provideSupplement(key, adoptPtr(new Wrapper(supplement)));
60 } 60 }
61 61
62 static ThisType* from(Supplementable<T>& host, const char* key) 62 static ThisType* from(Supplementable<T>& host, const char* key)
63 { 63 {
64 Supplement<T>* found = static_cast<Supplement<T>*>(host.requireSupplemen t(key)); 64 Supplement<T>* found = static_cast<Supplement<T>*>(host.requireSupplemen t(key));
65 if (!found) 65 if (!found)
66 return 0; 66 return 0;
67 ASSERT_WITH_SECURITY_IMPLICATION(found->isRefCountedWrapper()); 67 ASSERT_WITH_SECURITY_IMPLICATION(found->isRefCountedWrapper());
68 return static_cast<Wrapper*>(found)->wrapped(); 68 return static_cast<Wrapper*>(found)->wrapped();
69 } 69 }
70 }; 70 };
71 #endif 71 #endif
72 72
73 } // namespace blink 73 } // namespace blink
74 74
75 #endif // RefCountedSupplement_h 75 #endif // RefCountedSupplement_h
OLDNEW
« no previous file with comments | « Source/platform/PODIntervalTree.h ('k') | Source/platform/SharedTimer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698