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

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

Issue 1263003002: Cleanup webaudio related header inclusions in HTMLMediaElement (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 4 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 | « no previous file | 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 14 matching lines...) Expand all
25 25
26 #ifndef HTMLMediaElement_h 26 #ifndef HTMLMediaElement_h
27 #define HTMLMediaElement_h 27 #define HTMLMediaElement_h
28 28
29 #include "core/CoreExport.h" 29 #include "core/CoreExport.h"
30 #include "core/dom/ActiveDOMObject.h" 30 #include "core/dom/ActiveDOMObject.h"
31 #include "core/events/GenericEventQueue.h" 31 #include "core/events/GenericEventQueue.h"
32 #include "core/html/HTMLElement.h" 32 #include "core/html/HTMLElement.h"
33 #include "core/html/track/TextTrack.h" 33 #include "core/html/track/TextTrack.h"
34 #include "platform/Supplementable.h" 34 #include "platform/Supplementable.h"
35 #include "public/platform/WebMediaPlayerClient.h"
36 #include "public/platform/WebMimeRegistry.h"
37
38 #if ENABLE(WEB_AUDIO)
35 #include "platform/audio/AudioSourceProvider.h" 39 #include "platform/audio/AudioSourceProvider.h"
36 #include "public/platform/WebAudioSourceProviderClient.h" 40 #include "public/platform/WebAudioSourceProviderClient.h"
37 #include "public/platform/WebMediaPlayerClient.h" 41 #endif
38 #include "public/platform/WebMimeRegistry.h"
39 42
40 namespace blink { 43 namespace blink {
41 class WebInbandTextTrack; 44 class WebInbandTextTrack;
42 class WebLayer; 45 class WebLayer;
43 } 46 }
44 47
45 namespace blink { 48 namespace blink {
46 49
47 #if ENABLE(WEB_AUDIO) 50 #if ENABLE(WEB_AUDIO)
48 class AudioSourceProvider;
49 class AudioSourceProviderClient; 51 class AudioSourceProviderClient;
52 class WebAudioSourceProvider;
philipj_slow 2015/07/31 07:33:40 This wasn't here before, why is it needed now?
Srirama 2015/07/31 07:38:49 It is indirectly included previously(WebMediaPlaye
philipj_slow 2015/07/31 08:46:31 This isn't an include, but yeah, it used in this h
50 #endif 53 #endif
51 class AudioTrackList; 54 class AudioTrackList;
52 class ContentType; 55 class ContentType;
53 class CueTimeline; 56 class CueTimeline;
54 class Event; 57 class Event;
55 class ExceptionState; 58 class ExceptionState;
56 class HTMLSourceElement; 59 class HTMLSourceElement;
57 class HTMLTrackElement; 60 class HTMLTrackElement;
58 class KURL; 61 class KURL;
59 class MediaController; 62 class MediaController;
(...skipping 565 matching lines...) Expand 10 before | Expand all | Expand 10 after
625 inline bool isHTMLMediaElement(const HTMLElement& element) 628 inline bool isHTMLMediaElement(const HTMLElement& element)
626 { 629 {
627 return isHTMLAudioElement(element) || isHTMLVideoElement(element); 630 return isHTMLAudioElement(element) || isHTMLVideoElement(element);
628 } 631 }
629 632
630 DEFINE_HTMLELEMENT_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement); 633 DEFINE_HTMLELEMENT_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement);
631 634
632 } // namespace blink 635 } // namespace blink
633 636
634 #endif // HTMLMediaElement_h 637 #endif // HTMLMediaElement_h
OLDNEW
« no previous file with comments | « no previous file | Source/core/html/HTMLMediaElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698