Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(374)

Issue 12326102: Merge 142773 (Closed)

Created:
7 years, 10 months ago by Tommy Widenflycht
Modified:
7 years, 10 months ago
Reviewers:
tommyw
CC:
chromium-reviews
Base URL:
http://svn.webkit.org/repository/webkit/branches/chromium/1410/
Visibility:
Public.

Description

Merge 142773 > MediaStream API: Use the source id when creating new tracks > https://bugs.webkit.org/show_bug.cgi?id=109688 > > Reviewed by Adam Barth. > > Source/Platform: > > Added id to initialize and renamed audio/videoSources to audio/videoTracks. > > * chromium/public/WebMediaStream.h: > (WebKit): > (WebMediaStream): > (WebKit::WebMediaStream::audioSources): > (WebKit::WebMediaStream::videoSources): > * chromium/public/WebMediaStreamTrack.h: > (WebMediaStreamTrack): > > Source/WebCore: > > This patch reuses the ids from the source when creating tracks instead of creating a new one. > This was requested by the chromium port to greatly simplify their implementation. > In the longer run the API should be rewritten to only use tracks instead of sources. > > Covered by existing tests. > > * platform/chromium/support/WebMediaStream.cpp: > (WebKit::WebMediaStream::audioTracks): > (WebKit::WebMediaStream::videoTracks): > (WebKit::WebMediaStream::initialize): > (WebKit): > * platform/chromium/support/WebMediaStreamTrack.cpp: > (WebKit::WebMediaStreamTrack::initialize): > (WebKit): > * platform/mediastream/MediaStreamComponent.h: > (WebCore::MediaStreamComponent::create): > (MediaStreamComponent): > (WebCore::MediaStreamComponent::MediaStreamComponent): > (WebCore): > * platform/mediastream/MediaStreamDescriptor.h: > (WebCore::MediaStreamDescriptor::create): > (MediaStreamDescriptor): > (WebCore::MediaStreamDescriptor::MediaStreamDescriptor): > > Tools: > > Switching mock to new API. > > * DumpRenderTree/chromium/TestRunner/src/WebUserMediaClientMock.cpp: > (WebTestRunner::WebUserMediaClientMock::requestUserMedia): > TBR=dharani@google.com Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=143919

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+82 lines, -22 lines) Patch
M Source/Platform/chromium/public/WebMediaStream.h View 3 chunks +11 lines, -3 lines 0 comments Download
M Source/Platform/chromium/public/WebMediaStreamTrack.h View 1 chunk +3 lines, -0 lines 0 comments Download
M Source/WebCore/platform/chromium/support/WebMediaStream.cpp View 2 chunks +29 lines, -15 lines 0 comments Download
M Source/WebCore/platform/chromium/support/WebMediaStreamTrack.cpp View 1 chunk +5 lines, -0 lines 0 comments Download
M Source/WebCore/platform/mediastream/MediaStreamComponent.h View 3 chunks +12 lines, -4 lines 0 comments Download
M Source/WebCore/platform/mediastream/MediaStreamDescriptor.h View 3 chunks +22 lines, -0 lines 0 comments Download

Messages

Total messages: 2 (0 generated)
Tommy Widenflycht
7 years, 10 months ago (2013-02-25 14:35:32 UTC) #1
Tommy Widenflycht
7 years, 10 months ago (2013-02-25 14:36:18 UTC) #2
Message was sent while issue was closed.
Committed patchset #1 manually as r143919.

Powered by Google App Engine
This is Rietveld 408576698