Merge inbound to m-c a=merge

This commit is contained in:
Wes Kocher
2016-09-07 17:54:24 -07:00
271 changed files with 1594 additions and 4202 deletions

View File

@@ -299,7 +299,7 @@ public:
}
RefPtr<HTMLMediaElement> deathGrip = mElement;
mElement->UpdateInitialMediaSize(aSize);
deathGrip->UpdateInitialMediaSize(aSize);
}
void NotifyRealtimeTrackData(MediaStreamGraph* aGraph,
@@ -3952,16 +3952,16 @@ public:
mPendingNotifyOutput = false;
}
if (mElement && mHaveCurrentData) {
RefPtr<HTMLMediaElement> deathGrip = mElement;
mElement->FireTimeUpdate(true);
RefPtr<HTMLMediaElement> kungFuDeathGrip = mElement;
kungFuDeathGrip->FireTimeUpdate(true);
}
}
void DoNotifyHaveCurrentData()
{
mHaveCurrentData = true;
if (mElement) {
RefPtr<HTMLMediaElement> deathGrip = mElement;
mElement->FirstFrameLoaded();
RefPtr<HTMLMediaElement> kungFuDeathGrip = mElement;
kungFuDeathGrip->FirstFrameLoaded();
}
NotifyWatchers();
DoNotifyOutput();