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

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

Issue 260523002: Remove modules/webaudio/MediaElementAudioSourceNode.h dependency from core. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 7 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
« no previous file with comments | « Source/core/DEPS ('k') | Source/core/html/HTMLMediaElement.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 28 matching lines...) Expand all
39 namespace blink { 39 namespace blink {
40 class WebContentDecryptionModule; 40 class WebContentDecryptionModule;
41 class WebInbandTextTrack; 41 class WebInbandTextTrack;
42 class WebLayer; 42 class WebLayer;
43 } 43 }
44 44
45 namespace WebCore { 45 namespace WebCore {
46 46
47 #if ENABLE(WEB_AUDIO) 47 #if ENABLE(WEB_AUDIO)
48 class AudioSourceProvider; 48 class AudioSourceProvider;
49 class MediaElementAudioSourceNode; 49 class AudioSourceProviderClient;
50 #endif 50 #endif
51 class ContentType; 51 class ContentType;
52 class Event; 52 class Event;
53 class ExceptionState; 53 class ExceptionState;
54 class HTMLSourceElement; 54 class HTMLSourceElement;
55 class HTMLTrackElement; 55 class HTMLTrackElement;
56 class KURL; 56 class KURL;
57 class MediaController; 57 class MediaController;
58 class MediaControls; 58 class MediaControls;
59 class MediaError; 59 class MediaError;
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after
248 void sourceWasRemoved(HTMLSourceElement*); 248 void sourceWasRemoved(HTMLSourceElement*);
249 void sourceWasAdded(HTMLSourceElement*); 249 void sourceWasAdded(HTMLSourceElement*);
250 250
251 bool isPlaying() const { return m_playing; } 251 bool isPlaying() const { return m_playing; }
252 252
253 // ActiveDOMObject functions. 253 // ActiveDOMObject functions.
254 virtual bool hasPendingActivity() const OVERRIDE FINAL; 254 virtual bool hasPendingActivity() const OVERRIDE FINAL;
255 virtual void contextDestroyed() OVERRIDE FINAL; 255 virtual void contextDestroyed() OVERRIDE FINAL;
256 256
257 #if ENABLE(WEB_AUDIO) 257 #if ENABLE(WEB_AUDIO)
258 MediaElementAudioSourceNode* audioSourceNode() { return m_audioSourceNode; } 258 AudioSourceProviderClient* audioSourceNode() { return m_audioSourceNode; }
259 void setAudioSourceNode(MediaElementAudioSourceNode*); 259 void setAudioSourceNode(AudioSourceProviderClient*);
260 260
261 AudioSourceProvider* audioSourceProvider(); 261 AudioSourceProvider* audioSourceProvider();
262 #endif 262 #endif
263 263
264 enum InvalidURLAction { DoNothing, Complain }; 264 enum InvalidURLAction { DoNothing, Complain };
265 bool isSafeToLoadURL(const KURL&, InvalidURLAction); 265 bool isSafeToLoadURL(const KURL&, InvalidURLAction);
266 266
267 MediaController* controller() const; 267 MediaController* controller() const;
268 void setController(PassRefPtr<MediaController>); // Resets the MediaGroup an d sets the MediaController. 268 void setController(PassRefPtr<MediaController>); // Resets the MediaGroup an d sets the MediaController.
269 269
(...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after
505 RefPtrWillBeMember<TextTrackList> m_textTracks; 505 RefPtrWillBeMember<TextTrackList> m_textTracks;
506 WillBeHeapVector<RefPtrWillBeMember<TextTrack> > m_textTracksWhenResourceSel ectionBegan; 506 WillBeHeapVector<RefPtrWillBeMember<TextTrack> > m_textTracksWhenResourceSel ectionBegan;
507 507
508 CueIntervalTree m_cueTree; 508 CueIntervalTree m_cueTree;
509 509
510 CueList m_currentlyActiveCues; 510 CueList m_currentlyActiveCues;
511 int m_ignoreTrackDisplayUpdate; 511 int m_ignoreTrackDisplayUpdate;
512 512
513 #if ENABLE(WEB_AUDIO) 513 #if ENABLE(WEB_AUDIO)
514 // This is a weak reference, since m_audioSourceNode holds a reference to us . 514 // This is a weak reference, since m_audioSourceNode holds a reference to us .
515 // The value is set just after the MediaElementAudioSourceNode is created. 515 AudioSourceProviderClient* m_audioSourceNode;
516 // The value is cleared in MediaElementAudioSourceNode::~MediaElementAudioSo urceNode().
517 MediaElementAudioSourceNode* m_audioSourceNode;
518 #endif 516 #endif
519 517
520 friend class MediaController; 518 friend class MediaController;
521 RefPtr<MediaController> m_mediaController; 519 RefPtr<MediaController> m_mediaController;
522 520
523 friend class Internals; 521 friend class Internals;
524 friend class TrackDisplayUpdateScope; 522 friend class TrackDisplayUpdateScope;
525 523
526 static URLRegistry* s_mediaStreamRegistry; 524 static URLRegistry* s_mediaStreamRegistry;
527 }; 525 };
(...skipping 25 matching lines...) Expand all
553 inline bool isHTMLMediaElement(const HTMLElement& element) 551 inline bool isHTMLMediaElement(const HTMLElement& element)
554 { 552 {
555 return isHTMLAudioElement(element) || isHTMLVideoElement(element); 553 return isHTMLAudioElement(element) || isHTMLVideoElement(element);
556 } 554 }
557 555
558 DEFINE_HTMLELEMENT_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement); 556 DEFINE_HTMLELEMENT_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement);
559 557
560 } //namespace 558 } //namespace
561 559
562 #endif 560 #endif
OLDNEW
« no previous file with comments | « Source/core/DEPS ('k') | Source/core/html/HTMLMediaElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698