Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 19:35:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge mozilla-central to mozilla-inbound

Browse Source
This commit is contained in:
Carsten "Tomcat" Book 2016-09-12 13:22:44 +02:00
commit 19dc112fbb
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
browser/components/extensions/test/browser/browser_ext_tabs_onUpdated.js
View File

@ -30,7 +30,11 @@ add_task(function* () {
let collectedSequence = [];
browser.tabs.onUpdated.addListener(function(tabId, updatedInfo) {
collectedSequence.push(updatedInfo);
// onUpdated also fires with updatedInfo.faviconUrl, so explicitly
// check for updatedInfo.status before recording the event.
if ("status" in updatedInfo) {
collectedSequence.push(updatedInfo);
}
});
browser.runtime.onMessage.addListener(function() {

11
dom/media/MediaDecoderStateMachine.cpp
View File

@ -224,6 +224,7 @@ public:
// Event handlers for various events.
// Return true if the event is handled by this state object.
virtual bool HandleDormant(bool aDormant) { return false; }
virtual bool HandleCDMProxyReady() { return false; }
protected:
using Master = MediaDecoderStateMachine;
@ -379,6 +380,12 @@ public:
{
return DECODER_STATE_WAIT_FOR_CDM;
}
bool HandleCDMProxyReady() override
{
SetState(DECODER_STATE_DECODING_FIRSTFRAME);
return true;
}
};
class MediaDecoderStateMachine::DormantState
@ -2954,9 +2961,7 @@ MediaDecoderStateMachine::OnCDMProxyReady(RefPtr<CDMProxy> aProxy)
mCDMProxyPromise.Complete();
mCDMProxy = aProxy;
mReader->SetCDMProxy(aProxy);
if (mState == DECODER_STATE_WAIT_FOR_CDM) {
SetState(DECODER_STATE_DECODING_FIRSTFRAME);
}
mStateObj->HandleCDMProxyReady();
}
void