939662 - Remove "using namespace mozilla::dom;" from MediaDecoder.h and fix fallout

Status: RESOLVED FIXED

(Core :: Audio/Video, defect)

Description

[Matthew Gregan [:kinetik]]

This also makes a bunch of fields on MediaDecoder protected that were unnecessarily public.

Comment 1

[Matthew Gregan [:kinetik]]

Attachment: bug939662_v0.patch

Comment 2

[Chris Pearce [:cpearce (Not reading bugmail)]]

Comment on attachment 8333651 [details] [diff] [review]
bug939662_v0.patch

Review of attachment 8333651 [details] [diff] [review]:
-----------------------------------------------------------------

Looks like some changes that were destined for another patch got qref'd into this one?

::: content/media/mediasource/SourceBuffer.cpp
@@ +322,5 @@
>    }
>    // TODO: Run coded frame eviction algorithm.
>    // TODO: Test buffer full flag.
>    LOG(PR_LOG_DEBUG, ("%p Append(ArrayBuffer=%u)", this, aLength));
> +  if (mDecoder->GetResource()->BufferFull()) {

This looks like a change that was supposed to be in another patch?

::: content/media/mediasource/SourceBufferResource.cpp
@@ +151,5 @@
> +  return false;
> +}
> +
> +void
> +SourceBufferResource::MaybeDiscard()

The changes in this file look like they were destined for another patch?

::: content/media/mediasource/SourceBufferResource.h
@@ +61,5 @@
>    virtual int64_t Tell() MOZ_OVERRIDE { return mOffset; }
>    virtual void Pin() MOZ_OVERRIDE {}
>    virtual void Unpin() MOZ_OVERRIDE {}
>    virtual double GetDownloadRate(bool* aIsReliable) MOZ_OVERRIDE { return 0; }
> +  virtual int64_t GetLength() MOZ_OVERRIDE { return mDiscarded + mInputBuffer.Length(); }

The changes in this file look like they were destined for another patch?

Comment 3

[Matthew Gregan [:kinetik]]

Yeah, sorry, I accidentally picked them up with a cross-tree git diff.  I'll remove those changes before landing.

Comment 4

[Matthew Gregan [:kinetik]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/4fd2bf2ec8db

Comment 5

[Phil Ringnalda (:philor)]

Backed out in https://hg.mozilla.org/integration/mozilla-inbound/rev/5fd1b6c4ad77 because Windows says https://tbpl.mozilla.org/php/getParsedLog.php?id=30742242&tree=Mozilla-Inbound

Comment 6

[Phil Ringnalda (:philor)]

And because b2g can never stand to be less busted than Windows, https://tbpl.mozilla.org/php/getParsedLog.php?id=30742755&tree=Mozilla-Inbound

Comment 7

[Matthew Gregan [:kinetik]]

Build fix: https://tbpl.mozilla.org/?tree=Try&rev=65cb21948804

Comment 8

[Matthew Gregan [:kinetik]]

And relanded: https://hg.mozilla.org/integration/mozilla-inbound/rev/6ae587e0c6d0

Comment 9

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/6ae587e0c6d0