Summary: | [MediaStream] Cleanup platform interface | ||||||||
---|---|---|---|---|---|---|---|---|---|
Product: | WebKit | Reporter: | Eric Carlson <eric.carlson> | ||||||
Component: | WebCore Misc. | Assignee: | Eric Carlson <eric.carlson> | ||||||
Status: | RESOLVED FIXED | ||||||||
Severity: | Normal | CC: | commit-queue, dino, esprehn+autocc, glenn, gyuyoung.kim, hta, jer.noble, kangil.han, rakuco, thiago.lacerda, tommyw | ||||||
Priority: | P2 | Keywords: | InRadar | ||||||
Version: | 528+ (Nightly build) | ||||||||
Hardware: | Unspecified | ||||||||
OS: | Unspecified | ||||||||
Bug Depends on: | |||||||||
Bug Blocks: | 124288 | ||||||||
Attachments: |
|
Description
Eric Carlson
2013-09-25 19:08:20 PDT
Created attachment 212708 [details]
Proposed patch
Patch for the bots to chew on.
Created attachment 212712 [details]
Updated patch
Rebased.
Comment on attachment 212712 [details] Updated patch View in context: https://bugs.webkit.org/attachment.cgi?id=212712&action=review r=me, with nits. > Source/WebCore/Modules/mediastream/MediaStream.cpp:61 > +static MediaStreamCenter*& mediaStreamCenterOverride() > +{ > + static MediaStreamCenter* override; > + return override; > +} > + > +MediaStreamCenter& MediaStream::sharedStreamCenter() > +{ > + MediaStreamCenter* override = mediaStreamCenterOverride(); > + if (override) > + return *override; > + > + return MediaStreamCenter::shared(); > +} > + > +void MediaStream::setSharedStreamCenter(MediaStreamCenter* center) > +{ > + mediaStreamCenterOverride() = center; > +} > + Seems like this should be in MediaStreamCenter and should override the return of MediaStreamCenter::instance(). > Source/WebCore/Modules/mediastream/MediaStream.cpp:91 > - MediaStreamCenter::instance().didCreateMediaStream(descriptor.get()); > + MediaStream::sharedStreamCenter().didCreateMediaStream(descriptor.get()); Then, this wouldn't be necessary. > Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp:182 > - if (!MediaStreamCenter::instance().getMediaStreamTrackSources(request.release())) > + if (!MediaStream::sharedStreamCenter().getMediaStreamTrackSources(request.release())) Ditto. > Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp:214 > -void MediaStreamTrack::didEndTrack() > +void MediaStreamTrack::trackEnded() Why not MediaStreamTrack::trackDidEnd()? Especially since the client method was renamed from trackEnded() to trackDidEnd(). > Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp:217 > + // FIXME: this is wrong, the track shouldn't have to call the descriptor's client! > + MediaStreamDescriptorClient* client = m_source ? m_source->stream()->client() : 0; Bug #? :-) > Source/WebCore/Modules/webaudio/MediaStreamAudioDestinationNode.cpp:57 > - MediaStreamCenter::instance().didCreateMediaStream(m_stream->descriptor()); > + MediaStream::sharedStreamCenter().didCreateMediaStream(m_stream->descriptor()); One more. Committed r156473: https://trac.webkit.org/r156473 |