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

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

Issue 16753003: Revert "Remove MediaStreamDescriptor and call/use WebMediaStream directly" (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/core.gypi ('k') | Source/core/platform/chromium/support/WebMediaStream.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 862 matching lines...) Expand 10 before | Expand all | Expand 10 after
873 873
874 // The resource fetch algorithm 874 // The resource fetch algorithm
875 m_networkState = NETWORK_LOADING; 875 m_networkState = NETWORK_LOADING;
876 876
877 // Set m_currentSrc *before* changing to the cache url, the fact that we are loading from the app 877 // Set m_currentSrc *before* changing to the cache url, the fact that we are loading from the app
878 // cache is an internal detail not exposed through the media element API. 878 // cache is an internal detail not exposed through the media element API.
879 m_currentSrc = url; 879 m_currentSrc = url;
880 880
881 LOG(Media, "HTMLMediaElement::loadResource - m_currentSrc -> %s", urlForLogg ingMedia(m_currentSrc).utf8().data()); 881 LOG(Media, "HTMLMediaElement::loadResource - m_currentSrc -> %s", urlForLogg ingMedia(m_currentSrc).utf8().data());
882 882
883 if (!(MediaStreamRegistry::registry().lookupWebMediaStream(url.string()).isN ull())) 883 if (MediaStreamRegistry::registry().lookupMediaStreamDescriptor(url.string() ))
884 removeBehaviorRestriction(RequireUserGestureForRateChangeRestriction); 884 removeBehaviorRestriction(RequireUserGestureForRateChangeRestriction);
885 885
886 if (m_sendProgressEvents) 886 if (m_sendProgressEvents)
887 startProgressEventTimer(); 887 startProgressEventTimer();
888 888
889 // Reset display mode to force a recalculation of what to show because we ar e resetting the player. 889 // Reset display mode to force a recalculation of what to show because we ar e resetting the player.
890 setDisplayMode(Unknown); 890 setDisplayMode(Unknown);
891 891
892 if (!autoplay()) 892 if (!autoplay())
893 m_player->setPreload(m_preload); 893 m_player->setPreload(m_preload);
(...skipping 3076 matching lines...) Expand 10 before | Expand all | Expand 10 after
3970 info.addMember(m_mediaGroup, "mediaGroup"); 3970 info.addMember(m_mediaGroup, "mediaGroup");
3971 info.addMember(m_mediaController, "mediaController"); 3971 info.addMember(m_mediaController, "mediaController");
3972 3972
3973 #if ENABLE(WEB_AUDIO) 3973 #if ENABLE(WEB_AUDIO)
3974 info.addMember(m_audioSourceNode, "audioSourceNode"); 3974 info.addMember(m_audioSourceNode, "audioSourceNode");
3975 #endif 3975 #endif
3976 3976
3977 } 3977 }
3978 3978
3979 } 3979 }
OLDNEW
« no previous file with comments | « Source/core/core.gypi ('k') | Source/core/platform/chromium/support/WebMediaStream.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698