Use a simple page client for user consent in getUserMedia()
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 17 Nov 2011 03:50:56 +0000 (03:50 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 17 Nov 2011 03:50:56 +0000 (03:50 +0000)
commit49bacb0d4c4e443bab8be490297e9ed6d2abaa13
tree0e9d1faa50057b78c682b103e3e464bf48abf303
parentd5b12c614fc465592e446da6f24dcf78d6224a37
Use a simple page client for user consent in getUserMedia()
https://bugs.webkit.org/show_bug.cgi?id=70897

Patch by Adam Bergkvist <adam.bergkvist@ericsson.com> on 2011-11-16
Reviewed by Adam Barth.

This is one in a series of patches that update the MediaStream feature
to use WebCore platform interfaces.

Covered by existing tests.

* GNUmakefile.list.am:
* WebCore.gypi:
* mediastream/MediaStreamClient.h: Removed.
* mediastream/MediaStreamController.cpp: Removed.
* mediastream/MediaStreamController.h: Removed.
* mediastream/MediaStreamFrameController.cpp: Removed.
* mediastream/MediaStreamFrameController.h: Removed.
* mediastream/UserMediaClient.h: Added.
(WebCore::UserMediaClient::~UserMediaClient):
* mediastream/UserMediaRequest.cpp: Added.
(WebCore::UserMediaRequest::create):
(WebCore::UserMediaRequest::UserMediaRequest):
(WebCore::UserMediaRequest::~UserMediaRequest):
(WebCore::UserMediaRequest::start):
(WebCore::UserMediaRequest::mediaStreamSourcesQueryCompleted):
(WebCore::UserMediaRequest::succeed):
(WebCore::UserMediaRequest::fail):
(WebCore::UserMediaRequest::contextDestroyed):
(WebCore::UserMediaRequest::parseOptions):
* mediastream/UserMediaRequest.h: Added.
(WebCore::UserMediaRequest::audio):
(WebCore::UserMediaRequest::video):
(WebCore::UserMediaRequest::cameraPreferenceUser):
(WebCore::UserMediaRequest::cameraPreferenceEnvironment):
(WebCore::UserMediaRequest::successCallback):
(WebCore::UserMediaRequest::errorCallback):
* page/CallbackTask.h: Removed.
* page/Frame.cpp:
(WebCore::Frame::Frame):
(WebCore::Frame::~Frame):
(WebCore::Frame::pageDestroyed):
(WebCore::Frame::transferChildFrameToNewDocument):
* page/Frame.h:
* page/Navigator.cpp:
(WebCore::Navigator::webkitGetUserMedia):
* page/NavigatorUserMediaErrorCallback.h:
* page/Page.cpp:
(WebCore::Page::Page):
(WebCore::Page::~Page):
(WebCore::Page::PageClients::PageClients):
* page/Page.h:
(WebCore::Page::userMediaClient):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@100555 268f45cc-cd09-0410-ab3c-d52691b4dbfc
18 files changed:
Source/WebCore/ChangeLog
Source/WebCore/GNUmakefile.list.am
Source/WebCore/WebCore.gypi
Source/WebCore/mediastream/MediaStreamClient.h [deleted file]
Source/WebCore/mediastream/MediaStreamController.cpp [deleted file]
Source/WebCore/mediastream/MediaStreamController.h [deleted file]
Source/WebCore/mediastream/MediaStreamFrameController.cpp [deleted file]
Source/WebCore/mediastream/MediaStreamFrameController.h [deleted file]
Source/WebCore/mediastream/UserMediaClient.h [new file with mode: 0644]
Source/WebCore/mediastream/UserMediaRequest.cpp [new file with mode: 0644]
Source/WebCore/mediastream/UserMediaRequest.h [new file with mode: 0644]
Source/WebCore/page/CallbackTask.h [deleted file]
Source/WebCore/page/Frame.cpp
Source/WebCore/page/Frame.h
Source/WebCore/page/Navigator.cpp
Source/WebCore/page/NavigatorUserMediaErrorCallback.h
Source/WebCore/page/Page.cpp
Source/WebCore/page/Page.h