Revert "Issue #80 - De-unify dom/media part 1"

This reverts commit b5b62d841c733dcb62112f3158f1488e670671d6.
This commit is contained in:
Moonchild 2020-04-22 13:17:28 +00:00 • committed by Roy Tam
commit 294a1da59b
40 changed files with 50 additions and 79 deletions

View file

@ -15,6 +15,24 @@
namespace mozilla {
class CaptureTask::MediaStreamEventListener : public MediaStreamTrackListener
{
public:
explicit MediaStreamEventListener(CaptureTask* aCaptureTask)
: mCaptureTask(aCaptureTask) {};
// MediaStreamListener methods.
void NotifyEnded() override
{
if(!mCaptureTask->mImageGrabbedOrTrackEnd) {
mCaptureTask->PostTrackEndEvent();
}
}
private:
CaptureTask* mCaptureTask;
};
CaptureTask::CaptureTask(dom::ImageCapture* aImageCapture)
: mImageCapture(aImageCapture)
, mEventListener(new MediaStreamEventListener(this))

View file

@ -86,24 +86,6 @@ protected:
bool mPrincipalChanged;
};
class CaptureTask::MediaStreamEventListener : public MediaStreamTrackListener
{
public:
explicit MediaStreamEventListener(CaptureTask* aCaptureTask)
: mCaptureTask(aCaptureTask) {};
// MediaStreamListener methods.
void NotifyEnded() override
{
if(!mCaptureTask->mImageGrabbedOrTrackEnd) {
mCaptureTask->PostTrackEndEvent();
}
}
private:
CaptureTask* mCaptureTask;
};
} // namespace mozilla
#endif // CAPTURETASK_H

View file

@ -8,7 +8,7 @@ EXPORTS.mozilla.dom += [
'ImageCapture.h'
]
SOURCES += [
UNIFIED_SOURCES += [
'CaptureTask.cpp',
'ImageCapture.cpp',
]