Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2016 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 |
| 11 * copyright notice, this list of conditions and the following disclaimer | 11 * copyright notice, this list of conditions and the following disclaimer |
| 12 * in the documentation and/or other materials provided with the | 12 * in the documentation and/or other materials provided with the |
| 13 * distribution. | 13 * distribution. |
| 14 * * Neither the name of Google Inc. nor the names of its | 14 * * Neither the name of Google Inc. nor the names of its |
| 15 * contributors may be used to endorse or promote products derived from | 15 * contributors may be used to endorse or promote products derived from |
| 16 * this software without specific prior written permission. | 16 * this software without specific prior written permission. |
| 17 * | 17 * |
| 18 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS | 18 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS |
| 19 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT | 19 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT |
| 20 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | 20 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR |
| 21 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT | 21 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT |
| 22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | 22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
| 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
| 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 29 * | |
| 30 */ | 29 */ |
| 31 | 30 |
| 32 #ifndef PrerendererClient_h | 31 #ifndef SourceBufferAudioTrack_h |
| 33 #define PrerendererClient_h | 32 #define SourceBufferAudioTrack_h |
| 34 | 33 |
| 35 #include "core/CoreExport.h" | |
| 36 #include "core/page/Page.h" | |
| 37 #include "platform/Supplementable.h" | 34 #include "platform/Supplementable.h" |
| 35 #include "wtf/Allocator.h" | |
| 38 | 36 |
| 39 namespace blink { | 37 namespace blink { |
| 40 | 38 |
| 41 class Page; | 39 class AudioTrack; |
| 42 class Prerender; | 40 class SourceBuffer; |
| 43 | 41 |
| 44 class CORE_EXPORT PrerendererClient : public WillBeHeapSupplement<Page> { | 42 class SourceBufferAudioTrack final : public GarbageCollectedFinalized<SourceBuff erAudioTrack>, public HeapSupplement<AudioTrack> { |
|
philipj_slow
2016/02/23 04:35:07
Does it need to be finalized?
servolk
2016/02/24 00:11:36
I guess not, so I've changed to a regulat GarbageC
servolk
2016/02/24 02:37:15
Actually, turns out this needs to be finalized, si
philipj_slow
2016/02/26 13:36:54
The build error was:
In file included from ../../t
servolk
2016/02/27 01:03:45
Yes, I tried completely removing the destructor fi
philipj_slow
2016/03/02 11:20:44
I'm sure this is right then, but which are the non
| |
| 43 USING_GARBAGE_COLLECTED_MIXIN(SourceBufferAudioTrack); | |
| 45 public: | 44 public: |
| 46 virtual void willAddPrerender(Prerender*) = 0; | 45 static SourceBufferAudioTrack& from(AudioTrack&); |
| 46 virtual ~SourceBufferAudioTrack(); | |
| 47 | 47 |
| 48 static SourceBuffer* sourceBuffer(AudioTrack&); | |
| 49 | |
| 50 DECLARE_VIRTUAL_TRACE(); | |
| 51 | |
| 52 private: | |
| 48 static const char* supplementName(); | 53 static const char* supplementName(); |
| 49 static PrerendererClient* from(Page*); | 54 explicit SourceBufferAudioTrack(SourceBuffer*); |
| 50 | 55 |
| 51 protected: | 56 WeakMember<SourceBuffer> m_sourceBuffer; |
| 52 PrerendererClient() { } | |
| 53 }; | 57 }; |
| 54 | 58 |
| 55 CORE_EXPORT void providePrerendererClientTo(Page&, PrerendererClient*); | |
| 56 | |
| 57 } // namespace blink | 59 } // namespace blink |
| 58 | 60 |
| 59 #endif // PrerendererClient_h | 61 #endif |
| OLD | NEW |