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

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

Issue 1296233002: Remove unneeded "using" statements and blink prefixes (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: cleanup the header file as well 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 23 matching lines...) Expand all
34 #include "platform/Supplementable.h" 34 #include "platform/Supplementable.h"
35 #include "public/platform/WebMediaPlayerClient.h" 35 #include "public/platform/WebMediaPlayerClient.h"
36 #include "public/platform/WebMimeRegistry.h" 36 #include "public/platform/WebMimeRegistry.h"
37 37
38 #if ENABLE(WEB_AUDIO) 38 #if ENABLE(WEB_AUDIO)
39 #include "platform/audio/AudioSourceProvider.h" 39 #include "platform/audio/AudioSourceProvider.h"
40 #include "public/platform/WebAudioSourceProviderClient.h" 40 #include "public/platform/WebAudioSourceProviderClient.h"
41 #endif 41 #endif
42 42
43 namespace blink { 43 namespace blink {
44 class WebInbandTextTrack;
45 class WebLayer;
46 }
47
48 namespace blink {
49 44
50 #if ENABLE(WEB_AUDIO) 45 #if ENABLE(WEB_AUDIO)
51 class AudioSourceProviderClient; 46 class AudioSourceProviderClient;
52 class WebAudioSourceProvider; 47 class WebAudioSourceProvider;
53 #endif 48 #endif
54 class AudioTrackList; 49 class AudioTrackList;
55 class ContentType; 50 class ContentType;
56 class CueTimeline; 51 class CueTimeline;
57 class Event; 52 class Event;
58 class ExceptionState; 53 class ExceptionState;
59 class HTMLSourceElement; 54 class HTMLSourceElement;
60 class HTMLTrackElement; 55 class HTMLTrackElement;
61 class KURL; 56 class KURL;
62 class MediaController; 57 class MediaController;
63 class MediaControls; 58 class MediaControls;
64 class MediaError; 59 class MediaError;
65 class HTMLMediaSource; 60 class HTMLMediaSource;
66 class TextTrackContainer; 61 class TextTrackContainer;
67 class TextTrackList; 62 class TextTrackList;
68 class TimeRanges; 63 class TimeRanges;
69 class URLRegistry; 64 class URLRegistry;
70 class VideoTrackList; 65 class VideoTrackList;
66 class WebInbandTextTrack;
67 class WebLayer;
71 68
72 class CORE_EXPORT HTMLMediaElement : public HTMLElement, public WillBeHeapSupple mentable<HTMLMediaElement>, public ActiveDOMObject, private WebMediaPlayerClient { 69 class CORE_EXPORT HTMLMediaElement : public HTMLElement, public WillBeHeapSupple mentable<HTMLMediaElement>, public ActiveDOMObject, private WebMediaPlayerClient {
73 DEFINE_WRAPPERTYPEINFO(); 70 DEFINE_WRAPPERTYPEINFO();
74 WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(HTMLMediaElement); 71 WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(HTMLMediaElement);
75 WILL_BE_USING_PRE_FINALIZER(HTMLMediaElement, dispose); 72 WILL_BE_USING_PRE_FINALIZER(HTMLMediaElement, dispose);
76 public: 73 public:
77 static WebMimeRegistry::SupportsType supportsType(const ContentType&, const String& keySystem = String()); 74 static WebMimeRegistry::SupportsType supportsType(const ContentType&, const String& keySystem = String());
78 75
79 static void setMediaStreamRegistry(URLRegistry*); 76 static void setMediaStreamRegistry(URLRegistry*);
80 static bool isMediaStreamURL(const String& url); 77 static bool isMediaStreamURL(const String& url);
(...skipping 548 matching lines...) Expand 10 before | Expand all | Expand 10 after
629 inline bool isHTMLMediaElement(const HTMLElement& element) 626 inline bool isHTMLMediaElement(const HTMLElement& element)
630 { 627 {
631 return isHTMLAudioElement(element) || isHTMLVideoElement(element); 628 return isHTMLAudioElement(element) || isHTMLVideoElement(element);
632 } 629 }
633 630
634 DEFINE_HTMLELEMENT_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement); 631 DEFINE_HTMLELEMENT_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement);
635 632
636 } // namespace blink 633 } // namespace blink
637 634
638 #endif // HTMLMediaElement_h 635 #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