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

Side by Side Diff: Source/platform/mediastream/MediaStreamComponent.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) 2011 Ericsson AB. All rights reserved. 2 * Copyright (C) 2011 Ericsson AB. All rights reserved.
3 * Copyright (C) 2013 Google Inc. All rights reserved. 3 * Copyright (C) 2013 Google Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 8 *
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 : m_webAudioSourceProvider(0) 86 : m_webAudioSourceProvider(0)
87 { 87 {
88 } 88 }
89 89
90 virtual ~AudioSourceProviderImpl() { } 90 virtual ~AudioSourceProviderImpl() { }
91 91
92 // Wraps the given blink::WebAudioSourceProvider to blink::AudioSourcePr ovider. 92 // Wraps the given blink::WebAudioSourceProvider to blink::AudioSourcePr ovider.
93 void wrap(WebAudioSourceProvider*); 93 void wrap(WebAudioSourceProvider*);
94 94
95 // blink::AudioSourceProvider 95 // blink::AudioSourceProvider
96 virtual void provideInput(blink::AudioBus*, size_t framesToProcess) OVER RIDE; 96 virtual void provideInput(blink::AudioBus*, size_t framesToProcess) over ride;
97 97
98 private: 98 private:
99 WebAudioSourceProvider* m_webAudioSourceProvider; 99 WebAudioSourceProvider* m_webAudioSourceProvider;
100 Mutex m_provideInputLock; 100 Mutex m_provideInputLock;
101 }; 101 };
102 102
103 AudioSourceProviderImpl m_sourceProvider; 103 AudioSourceProviderImpl m_sourceProvider;
104 #endif // ENABLE(WEB_AUDIO) 104 #endif // ENABLE(WEB_AUDIO)
105 105
106 Member<MediaStreamSource> m_source; 106 Member<MediaStreamSource> m_source;
107 String m_id; 107 String m_id;
108 bool m_enabled; 108 bool m_enabled;
109 bool m_muted; 109 bool m_muted;
110 OwnPtr<ExtraData> m_extraData; 110 OwnPtr<ExtraData> m_extraData;
111 }; 111 };
112 112
113 typedef HeapVector<Member<MediaStreamComponent> > MediaStreamComponentVector; 113 typedef HeapVector<Member<MediaStreamComponent> > MediaStreamComponentVector;
114 114
115 } // namespace blink 115 } // namespace blink
116 116
117 #endif // MediaStreamComponent_h 117 #endif // MediaStreamComponent_h
OLDNEW
« no previous file with comments | « Source/platform/mediastream/MediaStreamCenter.h ('k') | Source/platform/mediastream/MediaStreamWebAudioSource.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698