Remove MEDIA_SOURCE feature define.

Source/WebCore/html/HTMLMediaElement.cpp

 /*
  * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 46 matching lines @@
 #include "MediaController.h"
 #include "MediaControls.h"
 #include "MediaDocument.h"
 #include "MediaError.h"
 #include "MediaFragmentURIParser.h"
 #include "MediaKeyError.h"
 #include "MediaKeyEvent.h"
 #include "MediaList.h"
 #include "MediaPlayer.h"
 #include "MediaQueryEvaluator.h"
+#include "MediaSource.h"
+#include "MediaSourceRegistry.h"
 #include "MouseEvent.h"
 #include "MIMETypeRegistry.h"
 #include "NodeRenderingContext.h"
 #include "Page.h"
 #include "PageGroup.h"
 #include "RenderVideo.h"
 #include "RenderView.h"
 #include "ScriptController.h"
 #include "ScriptEventListener.h"
 #include "SecurityOrigin.h"
@@ skipping 31 matching lines @@
 
 #if ENABLE(WEB_AUDIO)
 #include "AudioSourceProvider.h"
 #include "MediaElementAudioSourceNode.h"
 #endif
 
 #if PLATFORM(MAC)
 #include "DisplaySleepDisabler.h"
 #endif
 
-#if ENABLE(MEDIA_SOURCE)
-#include "MediaSource.h"
-#include "MediaSourceRegistry.h"
-#endif
-
 #if ENABLE(MEDIA_STREAM)
 #include "MediaStreamRegistry.h"
 #endif
 
 #if ENABLE(ENCRYPTED_MEDIA_V2)
 #include "MediaKeyNeededEvent.h"
 #include "MediaKeys.h"
 #endif
 
 #if USE(PLATFORM_TEXT_TRACK_MENU)
@@ skipping 25 matching lines @@
 // the logging.
 #define LOG_MEDIA_EVENTS 0
 #endif
 
 #ifndef LOG_CACHED_TIME_WARNINGS
 // Default to not logging warnings about excessive drift in the cached media time because it adds a
 // fair amount of overhead and logging.
 #define LOG_CACHED_TIME_WARNINGS 0
 #endif
 
-#if ENABLE(MEDIA_SOURCE)
 // URL protocol used to signal that the media source API is being used.
 static const char* mediaSourceBlobProtocol = "blob";
-#endif
 
 using namespace HTMLNames;
 using namespace std;
 
 typedef HashMap<Document*, HashSet<HTMLMediaElement*> > DocumentElementSetMap;
 static DocumentElementSetMap& documentToElementSetMap()
 {
     DEFINE_STATIC_LOCAL(DocumentElementSetMap, map, ());
     return map;
 }
@@ skipping 150 matching lines @@
         m_textTracks->clearOwner();
     if (m_textTracks) {
         for (unsigned i = 0; i < m_textTracks->length(); ++i)
             m_textTracks->item(i)->clearClient();
     }
 #endif
 
     if (m_mediaController)
         m_mediaController->removeMediaElement(this);
 
-#if ENABLE(MEDIA_SOURCE)
     setSourceState(MediaSource::closedKeyword());
-#endif
 
 #if ENABLE(ENCRYPTED_MEDIA_V2)
     setMediaKeys(0);
 #endif
 
     removeElementFromDocumentMap(this, document());
 
     m_completelyLoaded = true;
     clearMediaPlayer(-1);
 }
@@ skipping 388 matching lines @@
 
     // 2 - If there are any tasks from the media element's media element event task source in 
     // one of the task queues, then remove those tasks.
     cancelPendingEventsAndCallbacks();
 
     // 3 - If the media element's networkState is set to NETWORK_LOADING or NETWORK_IDLE, queue
     // a task to fire a simple event named abort at the media element.
     if (m_networkState == NETWORK_LOADING || m_networkState == NETWORK_IDLE)
         scheduleEvent(eventNames().abortEvent);
 
-#if ENABLE(MEDIA_SOURCE)
     setSourceState(MediaSource::closedKeyword());
-#endif
 
 #if !ENABLE(PLUGIN_PROXY_FOR_VIDEO)
     createMediaPlayer();
 #else
     if (m_player)
         m_player->cancelLoad();
     else
         createMediaPlayerProxy();
 #endif
 
@@ skipping 218 matching lines @@
     setDisplayMode(Unknown);
 
     if (!autoplay())
         m_player->setPreload(m_preload);
     m_player->setPreservesPitch(m_webkitPreservesPitch);
 
     if (fastHasAttribute(mutedAttr))
         m_muted = true;
     updateVolume();
 
-#if ENABLE(MEDIA_SOURCE)
     ASSERT(!m_mediaSource);
 
     if (url.protocolIs(mediaSourceBlobProtocol))
         m_mediaSource = MediaSourceRegistry::registry().lookupMediaSource(url.string());
 
     if (m_mediaSource) {
         if (!m_player->load(url, m_mediaSource))
             mediaLoadingFailed(MediaPlayer::FormatError);
-    } else
-#endif
-    if (!m_player->load(url, contentType, keySystem))
+    } else if (!m_player->load(url, contentType, keySystem)) {
         mediaLoadingFailed(MediaPlayer::FormatError);
+    }
 
     // If there is no poster to display, allow the media engine to render video frames as soon as
     // they are available.
     updateDisplayState();
 
     if (renderer())
         renderer()->updateFromElement();
 }
 
 #if ENABLE(VIDEO_TRACK)
@@ skipping 466 matching lines @@
     m_error = MediaError::create(MediaError::MEDIA_ERR_SRC_NOT_SUPPORTED);
 
     // 6.2 - Forget the media element's media-resource-specific text tracks.
 
     // 6.3 - Set the element's networkState attribute to the NETWORK_NO_SOURCE value.
     m_networkState = NETWORK_NO_SOURCE;
 
     // 7 - Queue a task to fire a simple event named error at the media element.
     scheduleEvent(eventNames().errorEvent);
 
-#if ENABLE(MEDIA_SOURCE)
     setSourceState(MediaSource::closedKeyword());
-#endif
 
     // 8 - Set the element's delaying-the-load-event flag to false. This stops delaying the load event.
     setShouldDelayLoadEvent(false);
 
     // 9 - Abort these steps. Until the load() method is invoked or the src attribute is changed, 
     // the element won't attempt to load another resource.
 
     updateDisplayState();
 
     if (renderer())
         renderer()->updateFromElement();
 }
 
 void HTMLMediaElement::mediaEngineError(PassRefPtr<MediaError> err)
 {
     LOG(Media, "HTMLMediaElement::mediaEngineError(%d)", static_cast<int>(err->code()));
 
     // 1 - The user agent should cancel the fetching process.
     stopPeriodicTimers();
     m_loadState = WaitingForSource;
 
     // 2 - Set the error attribute to a new MediaError object whose code attribute is 
     // set to MEDIA_ERR_NETWORK/MEDIA_ERR_DECODE.
     m_error = err;
 
     // 3 - Queue a task to fire a simple event named error at the media element.
     scheduleEvent(eventNames().errorEvent);
 
-#if ENABLE(MEDIA_SOURCE)
     setSourceState(MediaSource::closedKeyword());
-#endif
 
     // 4 - Set the element's networkState attribute to the NETWORK_EMPTY value and queue a
     // task to fire a simple event called emptied at the element.
     m_networkState = NETWORK_EMPTY;
     scheduleEvent(eventNames().emptiedEvent);
 
     // 5 - Set the element's delaying-the-load-event flag to false. This stops delaying the load event.
     setShouldDelayLoadEvent(false);
 
     // 6 - Abort the overall resource selection algorithm.
@@ skipping 485 matching lines @@
     // seekable attribute, then let it be the position in one of the ranges given in the seekable attribute 
     // that is the nearest to the new playback position. ... If there are no ranges given in the seekable
     // attribute then set the seeking IDL attribute to false and abort these steps.
     RefPtr<TimeRanges> seekableRanges = seekable();
 
     // Short circuit seeking to the current time by just firing the events if no seek is required.
     // Don't skip calling the media engine if we are in poster mode because a seek should always 
     // cancel poster display.
     bool noSeekRequired = !seekableRanges->length() || (time == now && displayMode() != Poster);
 
-#if ENABLE(MEDIA_SOURCE)
     // Always notify the media engine of a seek if the source is not closed. This ensures that the source is
     // always in a flushed state when the 'seeking' event fires.
     if (m_mediaSource && m_mediaSource->readyState() != MediaSource::closedKeyword())
         noSeekRequired = false;
-#endif
 
     if (noSeekRequired) {
         if (time == now) {
             scheduleEvent(eventNames().seekingEvent);
             scheduleTimeupdateEvent(false);
             scheduleEvent(eventNames().seekedEvent);
         }
         m_seeking = false;
         return;
     }
@@ skipping 341 matching lines @@
 
     if (!m_paused) {
         m_paused = true;
         scheduleTimeupdateEvent(false);
         scheduleEvent(eventNames().pauseEvent);
     }
 
     updatePlayState();
 }
 
-#if ENABLE(MEDIA_SOURCE)
 void HTMLMediaElement::setSourceState(const String& state)
 {
     if (!m_mediaSource)
          return;
 
     m_mediaSource->setReadyState(state);
     if (state == MediaSource::closedKeyword())
         m_mediaSource = 0;
 }
-#endif
 
 #if ENABLE(ENCRYPTED_MEDIA)
 void HTMLMediaElement::webkitGenerateKeyRequest(const String& keySystem, PassRefPtr<Uint8Array> initData, ExceptionCode& ec)
 {
 #if ENABLE(ENCRYPTED_MEDIA_V2)
     static bool firstTime = true;
     if (firstTime && scriptExecutionContext()) {
         scriptExecutionContext()->addConsoleMessage(JSMessageSource, WarningMessageLevel, "'HTMLMediaElement.webkitGenerateKeyRequest()' is deprecated.  Use 'MediaKeys.createSession()' instead.");
         firstTime = false;
     }
@@ skipping 1381 matching lines @@
 
     // 1 - The user agent should cancel the fetching process.
     clearMediaPlayer(-1);
 
     // 2 - Set the error attribute to a new MediaError object whose code attribute is set to MEDIA_ERR_ABORTED.
     m_error = MediaError::create(MediaError::MEDIA_ERR_ABORTED);
 
     // 3 - Queue a task to fire a simple event named error at the media element.
     scheduleEvent(eventNames().abortEvent);
 
-#if ENABLE(MEDIA_SOURCE)
     setSourceState(MediaSource::closedKeyword());
-#endif
 
     // 4 - If the media element's readyState attribute has a value equal to HAVE_NOTHING, set the 
     // element's networkState attribute to the NETWORK_EMPTY value and queue a task to fire a 
     // simple event named emptied at the element. Otherwise, set the element's networkState 
     // attribute to the NETWORK_IDLE value.
     if (m_readyState == HAVE_NOTHING) {
         m_networkState = NETWORK_EMPTY;
         scheduleEvent(eventNames().emptiedEvent);
     }
     else
@@ skipping 22 matching lines @@
         m_platformMenu = 0;
     }
 #endif
 
 #if ENABLE(VIDEO_TRACK)
     removeAllInbandTracks();
 #endif
 
 #if !ENABLE(PLUGIN_PROXY_FOR_VIDEO)
 
-#if ENABLE(MEDIA_SOURCE)
     setSourceState(MediaSource::closedKeyword());
-#endif
 
     m_player.clear();
 #endif
     stopPeriodicTimers();
     m_loadTimer.stop();
 
     m_pendingActionFlags &= ~flags;
     m_loadState = WaitingForSource;
 
 #if ENABLE(VIDEO_TRACK)
@@ skipping 569 matching lines @@
     return 0;
 }
 
 void HTMLMediaElement::createMediaPlayer()
 {
 #if ENABLE(WEB_AUDIO)
     if (m_audioSourceNode)
         m_audioSourceNode->lock();
 #endif
 
-#if ENABLE(MEDIA_SOURCE)
     if (m_mediaSource)
         m_mediaSource->setReadyState(MediaSource::closedKeyword());
-#endif
 
     m_player = MediaPlayer::create(this);
 
 #if ENABLE(WEB_AUDIO)
     if (m_audioSourceNode) {
         // When creating the player, make sure its AudioSourceProvider knows about the MediaElementAudioSourceNode.
         if (audioSourceProvider())
             audioSourceProvider()->setClient(m_audioSourceNode);
 
         m_audioSourceNode->unlock();
@@ skipping 322 matching lines @@
     info.addMember(m_playedTimeRanges, "playedTimeRanges");
     info.addMember(m_asyncEventQueue, "asyncEventQueue");
     info.addMember(m_currentSrc, "currentSrc");
     info.addMember(m_error, "error");
     info.addMember(m_currentSourceNode, "currentSourceNode");
     info.addMember(m_nextChildNodeToConsider, "nextChildNodeToConsider");
     info.addMember(m_player, "player");
 #if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
     info.addMember(m_proxyWidget, "proxyWidget");
 #endif
-#if ENABLE(MEDIA_SOURCE)
     info.addMember(m_mediaSource, "mediaSource");
-#endif
 #if ENABLE(VIDEO_TRACK)
     info.addMember(m_textTracks, "textTracks");
     info.addMember(m_textTracksWhenResourceSelectionBegan, "textTracksWhenResourceSelectionBegan");
     info.addMember(m_cueTree, "cueTree");
     info.addMember(m_currentlyActiveCues, "currentlyActiveCues");
 #endif
     info.addMember(m_mediaGroup, "mediaGroup");
     info.addMember(m_mediaController, "mediaController");
 
 #if PLATFORM(MAC)
     info.addMember(m_sleepDisabler, "sleepDisabler");
 #endif
 #if ENABLE(WEB_AUDIO)
     info.addMember(m_audioSourceNode, "audioSourceNode");
 #endif
 
 }
 
 }
 #endif