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

Side by Side Diff: third_party/WebKit/Source/modules/mediasource/MediaSource.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) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 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 are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * 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 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 double duration() const override; 83 double duration() const override;
84 TimeRanges* buffered() const override; 84 TimeRanges* buffered() const override;
85 TimeRanges* seekable() const override; 85 TimeRanges* seekable() const override;
86 #if !ENABLE(OILPAN) 86 #if !ENABLE(OILPAN)
87 void refHTMLMediaSource() override { ref(); } 87 void refHTMLMediaSource() override { ref(); }
88 void derefHTMLMediaSource() override { deref(); } 88 void derefHTMLMediaSource() override { deref(); }
89 #endif 89 #endif
90 90
91 // EventTarget interface 91 // EventTarget interface
92 const AtomicString& interfaceName() const override; 92 const AtomicString& interfaceName() const override;
93 ExecutionContext* executionContext() const override; 93 ExecutionContext* getExecutionContext() const override;
94 94
95 // ActiveDOMObject interface 95 // ActiveDOMObject interface
96 bool hasPendingActivity() const override; 96 bool hasPendingActivity() const override;
97 void stop() override; 97 void stop() override;
98 98
99 // URLRegistrable interface 99 // URLRegistrable interface
100 URLRegistry& registry() const override; 100 URLRegistry& registry() const override;
101 101
102 // Used by SourceBuffer. 102 // Used by SourceBuffer.
103 void openIfInEndedState(); 103 void openIfInEndedState();
(...skipping 30 matching lines...) Expand all
134 134
135 Member<SourceBufferList> m_sourceBuffers; 135 Member<SourceBufferList> m_sourceBuffers;
136 Member<SourceBufferList> m_activeSourceBuffers; 136 Member<SourceBufferList> m_activeSourceBuffers;
137 137
138 bool m_isAddedToRegistry; 138 bool m_isAddedToRegistry;
139 }; 139 };
140 140
141 } // namespace blink 141 } // namespace blink
142 142
143 #endif // MediaSource_h 143 #endif // MediaSource_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698