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

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

Issue 893123004: Check origin before providing initData in encrypted event (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: nits Created 5 years, 10 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
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 263 matching lines...) Expand 10 before | Expand all | Expand 10 after
274 #if ENABLE(WEB_AUDIO) 274 #if ENABLE(WEB_AUDIO)
275 AudioSourceProviderClient* audioSourceNode() { return m_audioSourceNode; } 275 AudioSourceProviderClient* audioSourceNode() { return m_audioSourceNode; }
276 void setAudioSourceNode(AudioSourceProviderClient*); 276 void setAudioSourceNode(AudioSourceProviderClient*);
277 277
278 AudioSourceProvider* audioSourceProvider(); 278 AudioSourceProvider* audioSourceProvider();
279 #endif 279 #endif
280 280
281 enum InvalidURLAction { DoNothing, Complain }; 281 enum InvalidURLAction { DoNothing, Complain };
282 bool isSafeToLoadURL(const KURL&, InvalidURLAction); 282 bool isSafeToLoadURL(const KURL&, InvalidURLAction);
283 283
284 // Checks to see if current media data is CORS-same-origin as the
285 // specified origin.
286 bool isMediaDataCORSSameOrigin(SecurityOrigin*) const;
287
284 MediaController* controller() const; 288 MediaController* controller() const;
285 void setController(PassRefPtrWillBeRawPtr<MediaController>); // Resets the M ediaGroup and sets the MediaController. 289 void setController(PassRefPtrWillBeRawPtr<MediaController>); // Resets the M ediaGroup and sets the MediaController.
286 290
287 void scheduleEvent(PassRefPtrWillBeRawPtr<Event>); 291 void scheduleEvent(PassRefPtrWillBeRawPtr<Event>);
288 292
289 // Returns the "effective media volume" value as specified in the HTML5 spec . 293 // Returns the "effective media volume" value as specified in the HTML5 spec .
290 double effectiveMediaVolume() const; 294 double effectiveMediaVolume() const;
291 295
292 #if ENABLE(OILPAN) 296 #if ENABLE(OILPAN)
293 bool isFinalizing() const { return m_isFinalizing; } 297 bool isFinalizing() const { return m_isFinalizing; }
(...skipping 335 matching lines...) Expand 10 before | Expand all | Expand 10 after
629 inline bool isHTMLMediaElement(const HTMLElement& element) 633 inline bool isHTMLMediaElement(const HTMLElement& element)
630 { 634 {
631 return isHTMLAudioElement(element) || isHTMLVideoElement(element); 635 return isHTMLAudioElement(element) || isHTMLVideoElement(element);
632 } 636 }
633 637
634 DEFINE_HTMLELEMENT_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement); 638 DEFINE_HTMLELEMENT_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement);
635 639
636 } // namespace blink 640 } // namespace blink
637 641
638 #endif // HTMLMediaElement_h 642 #endif // HTMLMediaElement_h
OLDNEW
« no previous file with comments | « LayoutTests/http/tests/media/encrypted-media/test-encrypted.webm ('k') | Source/core/html/HTMLMediaElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698