Remove MediaSourcePrivate/SourceBufferPrivate

Source/web/SourceBufferPrivateImpl.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
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "SourceBufferPrivateImpl.h"
-
-#include "WebSourceBuffer.h"
-
-namespace blink {
-
-SourceBufferPrivateImpl::SourceBufferPrivateImpl(PassOwnPtr<WebSourceBuffer> sourceBuffer)
-    : m_sourceBuffer(sourceBuffer)
-{
-    ASSERT(m_sourceBuffer);
-}
-
-PassRefPtr<WebCore::TimeRanges> SourceBufferPrivateImpl::buffered()
-{
-    WebTimeRanges webRanges = m_sourceBuffer->buffered();
-    RefPtr<WebCore::TimeRanges> ranges = WebCore::TimeRanges::create();
-    for (size_t i = 0; i < webRanges.size(); ++i)
-        ranges->add(webRanges[i].start, webRanges[i].end);
-    return ranges.release();
-}
-
-void SourceBufferPrivateImpl::append(const unsigned char* data, unsigned length)
-{
-    m_sourceBuffer->append(data, length);
-}
-
-void SourceBufferPrivateImpl::abort()
-{
-    m_sourceBuffer->abort();
-}
-
-void SourceBufferPrivateImpl::remove(double start, double end)
-{
-    m_sourceBuffer->remove(start, end);
-}
-
-bool SourceBufferPrivateImpl::setTimestampOffset(double offset)
-{
-    return m_sourceBuffer->setTimestampOffset(offset);
-}
-
-void SourceBufferPrivateImpl::setAppendWindowStart(double start)
-{
-    if (!m_sourceBuffer)

[philipj_slow, 2013/11/12 09:43:51]

I also ignored this and the null check below when moving things around. Should I
also move this up into SourceBuffer.cpp? To me it looks rather strange that the
null check would be needed here but in e.g.
SourceBuffer::appendBufferAsyncPart(). Were these just paranoid null checks?

[acolwell GONE FROM CHROMIUM, 2013/11/12 18:25:17]

I don't think the null check is necessary anymore because of the isRemoved()
check in SourceBuffer::setAppendWindowStart(). This was likely just overly
paranoid checking in this layer.

I believe the appendBufferAsyncPart() should never be called when
m_webSourceBuffer is called because abortIfUpdating() is called before the
pointer is cleared. This should prevent m_appendBufferAsyncPartRunner from
calling that method if a call is pending.

[philipj_slow, 2013/11/12 19:47:58]

Thanks for verifying!

-        return;
-    m_sourceBuffer->setAppendWindowStart(start);
-}
-
-void SourceBufferPrivateImpl::setAppendWindowEnd(double end)
-{
-    if (!m_sourceBuffer)
-        return;
-    m_sourceBuffer->setAppendWindowEnd(end);
-}
-
-void SourceBufferPrivateImpl::removedFromMediaSource()
-{
-    m_sourceBuffer->removedFromMediaSource();
-    m_sourceBuffer.clear();
-}
-
-}