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

Side by Side Diff: Source/WebCore/platform/graphics/MediaPlayer.cpp

Issue 10536097: Merge 119742 - Plumb CORS attribute information from HTMLMediaElement to media players so it can be… (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1132/
Patch Set: Created 8 years, 6 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 Apple Inc. All rights reserved. 2 * Copyright (C) 2007, 2008, 2009, 2010, 2011 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 780 matching lines...) Expand 10 before | Expand all | Expand 10 after
791 { 791 {
792 return m_private->supportsAcceleratedRendering(); 792 return m_private->supportsAcceleratedRendering();
793 } 793 }
794 #endif // USE(ACCELERATED_COMPOSITING) 794 #endif // USE(ACCELERATED_COMPOSITING)
795 795
796 bool MediaPlayer::hasSingleSecurityOrigin() const 796 bool MediaPlayer::hasSingleSecurityOrigin() const
797 { 797 {
798 return m_private->hasSingleSecurityOrigin(); 798 return m_private->hasSingleSecurityOrigin();
799 } 799 }
800 800
801 bool MediaPlayer::didPassCORSAccessCheck() const
802 {
803 return m_private->didPassCORSAccessCheck();
804 }
805
801 MediaPlayer::MovieLoadType MediaPlayer::movieLoadType() const 806 MediaPlayer::MovieLoadType MediaPlayer::movieLoadType() const
802 { 807 {
803 return m_private->movieLoadType(); 808 return m_private->movieLoadType();
804 } 809 }
805 810
806 float MediaPlayer::mediaTimeForTimeValue(float timeValue) const 811 float MediaPlayer::mediaTimeForTimeValue(float timeValue) const
807 { 812 {
808 return m_private->mediaTimeForTimeValue(timeValue); 813 return m_private->mediaTimeForTimeValue(timeValue);
809 } 814 }
810 815
(...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after
1023 { 1028 {
1024 if (!m_mediaPlayerClient) 1029 if (!m_mediaPlayerClient)
1025 return String(); 1030 return String();
1026 1031
1027 return m_mediaPlayerClient->mediaPlayerUserAgent(); 1032 return m_mediaPlayerClient->mediaPlayerUserAgent();
1028 } 1033 }
1029 1034
1030 } 1035 }
1031 1036
1032 #endif 1037 #endif
OLDNEW
« no previous file with comments | « Source/WebCore/platform/graphics/MediaPlayer.h ('k') | Source/WebCore/platform/graphics/MediaPlayerPrivate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698