Changeset 101058 in webkit


Ignore:
Timestamp:
Nov 23, 2011 2:02:27 AM (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

This patch includes a fix for ​https://bugs.webkit.org/show_bug.cgi?id=72925.

Patch by Tommy Widenflycht <​tommyw@google.com> on 2011-11-23
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 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

    r101055 r101058  
     12011-11-23  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        This patch includes a fix for https://bugs.webkit.org/show_bug.cgi?id=72925.
     7
     8        Reviewed by Darin Fisher.
     9
     10        * WebKit.gyp:
     11        * public/WebUserMediaClient.h: Added.
     12        (WebKit::WebUserMediaClient::~WebUserMediaClient):
     13        * public/WebUserMediaRequest.h: Added.
     14        (WebKit::WebUserMediaRequest::WebUserMediaRequest):
     15        (WebKit::WebUserMediaRequest::~WebUserMediaRequest):
     16        (WebKit::WebUserMediaRequest::operator=):
     17        (WebKit::WebUserMediaRequest::isNull):
     18        (WebKit::operator==):
     19        * public/WebViewClient.h:
     20        (WebKit::WebViewClient::userMediaClient):
     21        * src/UserMediaClientImpl.cpp: Added.
     22        (WebKit::UserMediaClientImpl::UserMediaClientImpl):
     23        (WebKit::UserMediaClientImpl::pageDestroyed):
     24        (WebKit::UserMediaClientImpl::requestUserMedia):
     25        (WebKit::UserMediaClientImpl::cancelUserMediaRequest):
     26        * src/UserMediaClientImpl.h: Added.
     27        * src/WebUserMediaRequest.cpp: Added.
     28        (WebKit::WebUserMediaRequest::WebUserMediaRequest):
     29        (WebKit::WebUserMediaRequest::reset):
     30        (WebKit::WebUserMediaRequest::audio):
     31        (WebKit::WebUserMediaRequest::video):
     32        (WebKit::WebUserMediaRequest::cameraPreferenceUser):
     33        (WebKit::WebUserMediaRequest::cameraPreferenceEnvironment):
     34        (WebKit::WebUserMediaRequest::securityOrigin):
     35        (WebKit::WebUserMediaRequest::requestSucceeded):
     36        (WebKit::WebUserMediaRequest::requestFailed):
     37        (WebKit::WebUserMediaRequest::equals):
     38        (WebKit::WebUserMediaRequest::assign):
     39        (WebKit::WebUserMediaRequest::operator UserMediaRequest*):
     40        * src/WebViewImpl.cpp:
     41        (WebKit::WebViewImpl::WebViewImpl):
     42        * src/WebViewImpl.h:
     43
    1442011-11-23  Antoine Labour  <piman@chromium.org>
    245

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

    r101021 r101058  
    328328                'public/WebURLRequest.h',
    329329                'public/WebURLResponse.h',
     330                'public/WebUserMediaClient.h',
     331                'public/WebUserMediaRequest.h',
    330332                'public/WebVector.h',
    331333                'public/WebView.h',
    … …  
    455457                'src/StorageNamespaceProxy.cpp',
    456458                'src/StorageNamespaceProxy.h',
     459                'src/UserMediaClientImpl.h',
     460                'src/UserMediaClientImpl.cpp',
    457461                'src/WebTextCheckingCompletionImpl.h',
    458462                'src/WebTextCheckingCompletionImpl.cpp',
    … …  
    638642                'src/WebURLResponsePrivate.h',
    639643                'src/WebURLError.cpp',
     644                'src/WebUserMediaRequest.cpp',
    640645                'src/WebViewImpl.cpp',
    641646                'src/WebViewImpl.h',

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

    r100977 r101058  
    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

    r100977 r101058  
    371371    , m_gestureRecognizer(WebCore::PlatformGestureRecognizer::create())
    372372#endif
     373#if ENABLE(MEDIA_STREAM)
     374    , m_userMediaClientImpl(this)
     375#endif
    373376{
    374377    // WebKit/win/WebView.cpp does the same thing, except they call the
    … …  
    393396    pageClients.geolocationClient = m_geolocationClientProxy.get();
    394397    pageClients.backForwardClient = BackForwardListChromium::create(this);
     398#if ENABLE(MEDIA_STREAM)
     399    pageClients.userMediaClient = &m_userMediaClientImpl;
     400#endif
    395401
    396402    m_page = adoptPtr(new Page(pageClients));

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

    r100977 r101058  
    4949#include "NotificationPresenterImpl.h"
    5050#include "PageOverlay.h"
     51#include "UserMediaClientImpl.h"
    5152#include "cc/CCLayerTreeHost.h"
    5253#include <wtf/OwnPtr.h>
    … …  
    8283class GeolocationClientProxy;
    8384class SpeechInputClientImpl;
     85class UserMediaClientImpl;
    8486class WebAccessibilityObject;
    8587class WebCompositorImpl;
    … …  
    626628    OwnPtr<WebCore::PlatformGestureRecognizer> m_gestureRecognizer;
    627629#endif
     630
     631#if ENABLE(MEDIA_STREAM)
     632    UserMediaClientImpl m_userMediaClientImpl;
     633#endif
    628634};
    629635
Note: See TracChangeset for help on using the changeset viewer.