MSE: Remove check for not 'updating' in {set,clear}LiveSeekableRange()

third_party/WebKit/Source/modules/mediasource/MediaSource.cpp

 /*
  * Copyright (C) 2013 Google 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 40 matching lines @@
 #include "wtf/text/CString.h"
 #include <memory>
 
 using blink::WebMediaSource;
 using blink::WebSourceBuffer;
 
 #define MSLOG DVLOG(3)
 
 namespace blink {
 
-static bool throwExceptionIfClosedOrUpdating(bool isOpen, bool isUpdating, ExceptionState& exceptionState)
+static bool throwExceptionIfClosed(bool isOpen, ExceptionState& exceptionState)
 {
     if (!isOpen) {
         MediaSource::logAndThrowDOMException(exceptionState, InvalidStateError, "The MediaSource's readyState is not 'open'.");
         return true;
     }
+
+    return false;
+}
+
+static bool throwExceptionIfClosedOrUpdating(bool isOpen, bool isUpdating, ExceptionState& exceptionState)
+{
+    if (throwExceptionIfClosed(isOpen, exceptionState))
+        return true;
+
     if (isUpdating) {
         MediaSource::logAndThrowDOMException(exceptionState, InvalidStateError, "The 'updating' attribute is true on one or more of this MediaSource's SourceBuffers.");
         return true;
     }
 
     return false;
 }
 
 const AtomicString& MediaSource::openKeyword()
 {
@@ skipping 446 matching lines @@
 }
 
 void MediaSource::setLiveSeekableRange(double start, double end, ExceptionState& exceptionState)
 {
     // http://w3c.github.io/media-source/#widl-MediaSource-setLiveSeekableRange-void-double-start-double-end
     // 1. If the readyState attribute is not "open" then throw an
     //    InvalidStateError exception and abort these steps.
     // 2. If the updating attribute equals true on any SourceBuffer in
     //    SourceBuffers, then throw an InvalidStateError exception and abort
     //    these steps.
-    if (throwExceptionIfClosedOrUpdating(isOpen(), isUpdating(), exceptionState))
+    //    Note: https://github.com/w3c/media-source/issues/118, once fixed, will
+    //    remove the updating check (step 2). We skip that check here already.
+    if (throwExceptionIfClosed(isOpen(), exceptionState))
         return;
 
     // 3. If start is negative or greater than end, then throw a TypeError
     //    exception and abort these steps.
     if (start < 0 || start > end) {
         exceptionState.throwTypeError(ExceptionMessages::indexOutsideRange("start value", start, 0.0, ExceptionMessages::InclusiveBound, end, ExceptionMessages::InclusiveBound));
         return;
     }
 
     // 4. Set live seekable range to be a new normalized TimeRanges object
     //    containing a single range whose start position is start and end
     //    position is end.
     m_liveSeekableRange = TimeRanges::create(start, end);
 }
 
 void MediaSource::clearLiveSeekableRange(ExceptionState& exceptionState)
 {
     // http://w3c.github.io/media-source/#widl-MediaSource-clearLiveSeekableRange-void
     // 1. If the readyState attribute is not "open" then throw an
     //    InvalidStateError exception and abort these steps.
     // 2. If the updating attribute equals true on any SourceBuffer in
     //    SourceBuffers, then throw an InvalidStateError exception and abort
     //    these steps.
-    if (throwExceptionIfClosedOrUpdating(isOpen(), isUpdating(), exceptionState))
+    //    Note: https://github.com/w3c/media-source/issues/118, once fixed, will
+    //    remove the updating check (step 2). We skip that check here already.
+    if (throwExceptionIfClosed(isOpen(), exceptionState))
         return;
 
     // 3. If live seekable range contains a range, then set live seekable range
     //    to be a new empty TimeRanges object.
     if (m_liveSeekableRange->length() != 0)
         m_liveSeekableRange = TimeRanges::create();
 }
 
 void MediaSource::endOfStreamInternal(const WebMediaSource::EndOfStreamStatus eosStatus, ExceptionState& exceptionState)
 {
@@ skipping 129 matching lines @@
 
     m_asyncEventQueue->enqueueEvent(event);
 }
 
 URLRegistry& MediaSource::registry() const
 {
     return MediaSourceRegistry::registry();
 }
 
 } // namespace blink