Changeset 100970 in webkit


Ignore:
Timestamp:
Nov 21, 2011 5:20:15 PM (12 years ago)
Author:
commit-queue@webkit.org
Message:

[chromium] MediaStream API: Adding embedding code for GetUserMedia
​https://bugs.webkit.org/show_bug.cgi?id=71678

Patch by Tommy Widenflycht <​tommyw@google.com> on 2011-11-21
Reviewed by Darin Fisher.

  • WebKit.gyp:
  • public/WebUserMediaClient.h: Added.

(WebKit::WebUserMediaClient::~WebUserMediaClient):

  • public/WebUserMediaRequest.h: Added.

(WebKit::WebUserMediaRequest::WebUserMediaRequest):
(WebKit::WebUserMediaRequest::~WebUserMediaRequest):
(WebKit::WebUserMediaRequest::operator=):
(WebKit::WebUserMediaRequest::isNull):
(WebKit::operator==):

  • public/WebViewClient.h:

(WebKit::WebViewClient::userMediaClient):

  • src/UserMediaClientImpl.cpp: Added.

(WebKit::UserMediaClientImpl::UserMediaClientImpl):
(WebKit::UserMediaClientImpl::pageDestroyed):
(WebKit::UserMediaClientImpl::requestUserMedia):
(WebKit::UserMediaClientImpl::cancelUserMediaRequest):

  • src/UserMediaClientImpl.h: Added.
  • src/WebUserMediaRequest.cpp: Added.

(WebKit::WebUserMediaRequest::WebUserMediaRequest):
(WebKit::WebUserMediaRequest::reset):
(WebKit::WebUserMediaRequest::audio):
(WebKit::WebUserMediaRequest::video):
(WebKit::WebUserMediaRequest::cameraPreferenceUser):
(WebKit::WebUserMediaRequest::cameraPreferenceEnvironment):
(WebKit::WebUserMediaRequest::securityOrigin):
(WebKit::WebUserMediaRequest::requestSucceeded):
(WebKit::WebUserMediaRequest::requestFailed):
(WebKit::WebUserMediaRequest::equals):
(WebKit::WebUserMediaRequest::assign):
(WebKit::WebUserMediaRequest::operator PassRefPtr<UserMediaRequest>):

  • src/WebViewImpl.cpp:

(WebKit::WebViewImpl::WebViewImpl):

  • src/WebViewImpl.h:
Location:
trunk/Source/WebKit/chromium
Files:
5 added
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/chromium/ChangeLog

    r100963 r100970  
     12011-11-21  Tommy Widenflycht  <tommyw@google.com>
     2
     3        [chromium] MediaStream API: Adding embedding code for GetUserMedia
     4        https://bugs.webkit.org/show_bug.cgi?id=71678
     5
     6        Reviewed by Darin Fisher.
     7
     8        * WebKit.gyp:
     9        * public/WebUserMediaClient.h: Added.
     10        (WebKit::WebUserMediaClient::~WebUserMediaClient):
     11        * public/WebUserMediaRequest.h: Added.
     12        (WebKit::WebUserMediaRequest::WebUserMediaRequest):
     13        (WebKit::WebUserMediaRequest::~WebUserMediaRequest):
     14        (WebKit::WebUserMediaRequest::operator=):
     15        (WebKit::WebUserMediaRequest::isNull):
     16        (WebKit::operator==):
     17        * public/WebViewClient.h:
     18        (WebKit::WebViewClient::userMediaClient):
     19        * src/UserMediaClientImpl.cpp: Added.
     20        (WebKit::UserMediaClientImpl::UserMediaClientImpl):
     21        (WebKit::UserMediaClientImpl::pageDestroyed):
     22        (WebKit::UserMediaClientImpl::requestUserMedia):
     23        (WebKit::UserMediaClientImpl::cancelUserMediaRequest):
     24        * src/UserMediaClientImpl.h: Added.
     25        * src/WebUserMediaRequest.cpp: Added.
     26        (WebKit::WebUserMediaRequest::WebUserMediaRequest):
     27        (WebKit::WebUserMediaRequest::reset):
     28        (WebKit::WebUserMediaRequest::audio):
     29        (WebKit::WebUserMediaRequest::video):
     30        (WebKit::WebUserMediaRequest::cameraPreferenceUser):
     31        (WebKit::WebUserMediaRequest::cameraPreferenceEnvironment):
     32        (WebKit::WebUserMediaRequest::securityOrigin):
     33        (WebKit::WebUserMediaRequest::requestSucceeded):
     34        (WebKit::WebUserMediaRequest::requestFailed):
     35        (WebKit::WebUserMediaRequest::equals):
     36        (WebKit::WebUserMediaRequest::assign):
     37        (WebKit::WebUserMediaRequest::operator PassRefPtr<UserMediaRequest>):
     38        * src/WebViewImpl.cpp:
     39        (WebKit::WebViewImpl::WebViewImpl):
     40        * src/WebViewImpl.h:
     41
    1422011-11-21  James Robinson  <jamesr@chromium.org>
    243

  • trunk/Source/WebKit/chromium/WebKit.gyp

    r100895 r100970  
    326326                'public/WebURLRequest.h',
    327327                'public/WebURLResponse.h',
     328                'public/WebUserMediaClient.h',
     329                'public/WebUserMediaRequest.h',
    328330                'public/WebVector.h',
    329331                'public/WebView.h',
    … …  
    453455                'src/StorageNamespaceProxy.cpp',
    454456                'src/StorageNamespaceProxy.h',
     457                'src/UserMediaClientImpl.h',
     458                'src/UserMediaClientImpl.cpp',
    455459                'src/WebTextCheckingCompletionImpl.h',
    456460                'src/WebTextCheckingCompletionImpl.cpp',
    … …  
    636640                'src/WebURLResponsePrivate.h',
    637641                'src/WebURLError.cpp',
     642                'src/WebUserMediaRequest.cpp',
    638643                'src/WebViewImpl.cpp',
    639644                'src/WebViewImpl.h',

  • trunk/Source/WebKit/chromium/public/WebViewClient.h

    r100821 r100970  
    6868class WebURL;
    6969class WebURLRequest;
     70class WebUserMediaClient;
    7071class WebView;
    7172class WebWidget;
    … …  
    320321    }
    321322
     323    // Media Streams -------------------------------------------------------
     324
     325    virtual WebUserMediaClient* userMediaClient() { return 0; }
     326
    322327protected:
    323328    ~WebViewClient() { }

  • trunk/Source/WebKit/chromium/src/WebViewImpl.cpp

    r100870 r100970  
    107107#include "TypingCommand.h"
    108108#include "UserGestureIndicator.h"
     109#include "UserMediaClientImpl.h"
    109110#include "Vector.h"
    110111#include "WebAccessibilityObject.h"
    … …  
    371372    , m_gestureRecognizer(WebCore::PlatformGestureRecognizer::create())
    372373#endif
     374#if ENABLE(MEDIA_STREAM)
     375    , m_userMediaClient(adoptPtr(new UserMediaClientImpl(client)))
     376#endif
    373377{
    374378    // WebKit/win/WebView.cpp does the same thing, except they call the
    … …  
    393397    pageClients.geolocationClient = m_geolocationClientProxy.get();
    394398    pageClients.backForwardClient = BackForwardListChromium::create(this);
     399#if ENABLE(MEDIA_STREAM)
     400    pageClients.userMediaClient = m_userMediaClient.get();
     401#endif
    395402
    396403    m_page = adoptPtr(new Page(pageClients));

  • trunk/Source/WebKit/chromium/src/WebViewImpl.h

    r100821 r100970  
    8282class GeolocationClientProxy;
    8383class SpeechInputClientImpl;
     84class UserMediaClientImpl;
    8485class WebAccessibilityObject;
    8586class WebCompositorImpl;
    … …  
    626627    OwnPtr<WebCore::PlatformGestureRecognizer> m_gestureRecognizer;
    627628#endif
     629
     630#if ENABLE(MEDIA_STREAM)
     631    OwnPtr<UserMediaClientImpl> m_userMediaClient;
     632#endif
    628633};
    629634
Note: See TracChangeset for help on using the changeset viewer.