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

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

Issue 1257583003: Make WebMediaPlayerClient inheritance private in HTMLMediaElement (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: address nit 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 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 class MediaController; 59 class MediaController;
60 class MediaControls; 60 class MediaControls;
61 class MediaError; 61 class MediaError;
62 class HTMLMediaSource; 62 class HTMLMediaSource;
63 class TextTrackContainer; 63 class TextTrackContainer;
64 class TextTrackList; 64 class TextTrackList;
65 class TimeRanges; 65 class TimeRanges;
66 class URLRegistry; 66 class URLRegistry;
67 class VideoTrackList; 67 class VideoTrackList;
68 68
69 // TODO(srirama.m): Make the WebMediaPlayerClient inheritance private by 69 class CORE_EXPORT HTMLMediaElement : public HTMLElement, public WillBeHeapSupple mentable<HTMLMediaElement>, public ActiveDOMObject, private WebMediaPlayerClient {
70 // adding a means for getting a WebMediaPlayerEncryptedMediaClient and
71 // WebContentDecryptionModule from an HTMLMediaElement and calling
72 // WebFrameClient::createMediaPlayer() directly.
73 class CORE_EXPORT HTMLMediaElement : public HTMLElement, public WillBeHeapSupple mentable<HTMLMediaElement>, public WebMediaPlayerClient, public ActiveDOMObject {
74 DEFINE_WRAPPERTYPEINFO(); 70 DEFINE_WRAPPERTYPEINFO();
75 WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(HTMLMediaElement); 71 WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(HTMLMediaElement);
76 WILL_BE_USING_PRE_FINALIZER(HTMLMediaElement, dispose); 72 WILL_BE_USING_PRE_FINALIZER(HTMLMediaElement, dispose);
77 public: 73 public:
78 static WebMimeRegistry::SupportsType supportsType(const ContentType&, const String& keySystem = String()); 74 static WebMimeRegistry::SupportsType supportsType(const ContentType&, const String& keySystem = String());
79 75
80 static void setMediaStreamRegistry(URLRegistry*); 76 static void setMediaStreamRegistry(URLRegistry*);
81 static bool isMediaStreamURL(const String& url); 77 static bool isMediaStreamURL(const String& url);
82 78
83 DECLARE_VIRTUAL_TRACE(); 79 DECLARE_VIRTUAL_TRACE();
(...skipping 541 matching lines...) Expand 10 before | Expand all | Expand 10 after
625 inline bool isHTMLMediaElement(const HTMLElement& element) 621 inline bool isHTMLMediaElement(const HTMLElement& element)
626 { 622 {
627 return isHTMLAudioElement(element) || isHTMLVideoElement(element); 623 return isHTMLAudioElement(element) || isHTMLVideoElement(element);
628 } 624 }
629 625
630 DEFINE_HTMLELEMENT_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement); 626 DEFINE_HTMLELEMENT_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement);
631 627
632 } // namespace blink 628 } // namespace blink
633 629
634 #endif // HTMLMediaElement_h 630 #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