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

Side by Side Diff: Source/core/html/HTMLMediaElement.cpp

Issue 1248353002: Oilpan: fix build after r199375. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: finalize HTMLMediaElementEncryptedMedia, now needed Created 5 years, 5 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 | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved. 2 * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple 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 3668 matching lines...) Expand 10 before | Expand all | Expand 10 after
3679 visitor->trace(m_currentSourceNode); 3679 visitor->trace(m_currentSourceNode);
3680 visitor->trace(m_nextChildNodeToConsider); 3680 visitor->trace(m_nextChildNodeToConsider);
3681 visitor->trace(m_mediaSource); 3681 visitor->trace(m_mediaSource);
3682 visitor->trace(m_audioTracks); 3682 visitor->trace(m_audioTracks);
3683 visitor->trace(m_videoTracks); 3683 visitor->trace(m_videoTracks);
3684 visitor->trace(m_cueTimeline); 3684 visitor->trace(m_cueTimeline);
3685 visitor->trace(m_textTracks); 3685 visitor->trace(m_textTracks);
3686 visitor->trace(m_textTracksWhenResourceSelectionBegan); 3686 visitor->trace(m_textTracksWhenResourceSelectionBegan);
3687 visitor->trace(m_mediaController); 3687 visitor->trace(m_mediaController);
3688 #if ENABLE(WEB_AUDIO) 3688 #if ENABLE(WEB_AUDIO)
3689 visitor->trace(m_audioSourceProvider);
3689 visitor->template registerWeakMembers<HTMLMediaElement, &HTMLMediaElement::c learWeakMembers>(this); 3690 visitor->template registerWeakMembers<HTMLMediaElement, &HTMLMediaElement::c learWeakMembers>(this);
3690 #endif 3691 #endif
3691 HeapSupplementable<HTMLMediaElement>::trace(visitor); 3692 HeapSupplementable<HTMLMediaElement>::trace(visitor);
3692 #endif 3693 #endif
3693 HTMLElement::trace(visitor); 3694 HTMLElement::trace(visitor);
3694 ActiveDOMObject::trace(visitor); 3695 ActiveDOMObject::trace(visitor);
3695 } 3696 }
3696 3697
3697 void HTMLMediaElement::createPlaceholderTracksIfNecessary() 3698 void HTMLMediaElement::createPlaceholderTracksIfNecessary()
3698 { 3699 {
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
3780 void HTMLMediaElement::AudioClientImpl::setFormat(size_t numberOfChannels, float sampleRate) 3781 void HTMLMediaElement::AudioClientImpl::setFormat(size_t numberOfChannels, float sampleRate)
3781 { 3782 {
3782 if (m_client) 3783 if (m_client)
3783 m_client->setFormat(numberOfChannels, sampleRate); 3784 m_client->setFormat(numberOfChannels, sampleRate);
3784 } 3785 }
3785 3786
3786 DEFINE_TRACE(HTMLMediaElement::AudioClientImpl) 3787 DEFINE_TRACE(HTMLMediaElement::AudioClientImpl)
3787 { 3788 {
3788 visitor->trace(m_client); 3789 visitor->trace(m_client);
3789 } 3790 }
3791
3792 DEFINE_TRACE(HTMLMediaElement::AudioSourceProviderImpl)
3793 {
3794 visitor->trace(m_client);
3795 }
3790 #endif 3796 #endif
3791 3797
3792 } 3798 }
OLDNEW
« no previous file with comments | « Source/core/html/HTMLMediaElement.h ('k') | Source/modules/encryptedmedia/HTMLMediaElementEncryptedMedia.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698