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

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

Issue 1261643002: Remove unnecessary condition for audioSourceProvider (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: change audioSourceProvider to return reference 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 224 matching lines...) Expand 10 before | Expand all | Expand 10 after
235 void sourceWasAdded(HTMLSourceElement*); 235 void sourceWasAdded(HTMLSourceElement*);
236 236
237 // ActiveDOMObject functions. 237 // ActiveDOMObject functions.
238 bool hasPendingActivity() const final; 238 bool hasPendingActivity() const final;
239 void contextDestroyed() final; 239 void contextDestroyed() final;
240 240
241 #if ENABLE(WEB_AUDIO) 241 #if ENABLE(WEB_AUDIO)
242 AudioSourceProviderClient* audioSourceNode() { return m_audioSourceNode; } 242 AudioSourceProviderClient* audioSourceNode() { return m_audioSourceNode; }
243 void setAudioSourceNode(AudioSourceProviderClient*); 243 void setAudioSourceNode(AudioSourceProviderClient*);
244 244
245 AudioSourceProvider* audioSourceProvider() { return &m_audioSourceProvider; } 245 AudioSourceProvider& audioSourceProvider() { return m_audioSourceProvider; }
246 #endif 246 #endif
247 247
248 enum InvalidURLAction { DoNothing, Complain }; 248 enum InvalidURLAction { DoNothing, Complain };
249 bool isSafeToLoadURL(const KURL&, InvalidURLAction); 249 bool isSafeToLoadURL(const KURL&, InvalidURLAction);
250 250
251 // Checks to see if current media data is CORS-same-origin as the 251 // Checks to see if current media data is CORS-same-origin as the
252 // specified origin. 252 // specified origin.
253 bool isMediaDataCORSSameOrigin(SecurityOrigin*) const; 253 bool isMediaDataCORSSameOrigin(SecurityOrigin*) const;
254 254
255 MediaController* controller() const; 255 MediaController* controller() const;
(...skipping 369 matching lines...) Expand 10 before | Expand all | Expand 10 after
625 inline bool isHTMLMediaElement(const HTMLElement& element) 625 inline bool isHTMLMediaElement(const HTMLElement& element)
626 { 626 {
627 return isHTMLAudioElement(element) || isHTMLVideoElement(element); 627 return isHTMLAudioElement(element) || isHTMLVideoElement(element);
628 } 628 }
629 629
630 DEFINE_HTMLELEMENT_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement); 630 DEFINE_HTMLELEMENT_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement);
631 631
632 } // namespace blink 632 } // namespace blink
633 633
634 #endif // HTMLMediaElement_h 634 #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