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

Side by Side Diff: third_party/WebKit/Source/platform/mediastream/MediaStreamComponent.h

Issue 1773813007: blink: Rename modules/ method to prefix with get when they collide. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: clash-modules: rebase-fixes Created 4 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
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 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 // So this class runs pre-finalizer to finalize |m_extraData| promptly. 61 // So this class runs pre-finalizer to finalize |m_extraData| promptly.
62 void dispose(); 62 void dispose();
63 63
64 MediaStreamSource* source() const { return m_source.get(); } 64 MediaStreamSource* source() const { return m_source.get(); }
65 65
66 String id() const { return m_id; } 66 String id() const { return m_id; }
67 bool enabled() const { return m_enabled; } 67 bool enabled() const { return m_enabled; }
68 void setEnabled(bool enabled) { m_enabled = enabled; } 68 void setEnabled(bool enabled) { m_enabled = enabled; }
69 bool muted() const { return m_muted; } 69 bool muted() const { return m_muted; }
70 void setMuted(bool muted) { m_muted = muted; } 70 void setMuted(bool muted) { m_muted = muted; }
71 AudioSourceProvider* audioSourceProvider() { return &m_sourceProvider; } 71 AudioSourceProvider* getAudioSourceProvider() { return &m_sourceProvider; }
72 void setSourceProvider(WebAudioSourceProvider* provider) { m_sourceProvider. wrap(provider); } 72 void setSourceProvider(WebAudioSourceProvider* provider) { m_sourceProvider. wrap(provider); }
73 73
74 ExtraData* extraData() const { return m_extraData.get(); } 74 ExtraData* extraData() const { return m_extraData.get(); }
75 void setExtraData(PassOwnPtr<ExtraData> extraData) { m_extraData = std::move (extraData); } 75 void setExtraData(PassOwnPtr<ExtraData> extraData) { m_extraData = std::move (extraData); }
76 76
77 DECLARE_TRACE(); 77 DECLARE_TRACE();
78 78
79 private: 79 private:
80 MediaStreamComponent(const String& id, MediaStreamSource*); 80 MediaStreamComponent(const String& id, MediaStreamSource*);
81 81
(...skipping 26 matching lines...) Expand all
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

Powered by Google App Engine
This is Rietveld 408576698