Bug 120650 – Get MEDIA_STREAM compiling on OS X

• Status: RESOLVED
• Resolution: FIXED
• Component: Media

[Eric Carlson]

Update MEDIA_STREAM flagged code so it compiles for the Mac port.

[Eric Carlson]

Created attachment 210410 [details]
Proposed patch

[Darin Adler]

Comment on attachment 210410 [details]
Proposed patch

View in context: https://bugs.webkit.org/attachment.cgi?id=210410&action=review

> Source/WebCore/Modules/mediastream/MediaStreamRegistry.cpp:61
> -    return m_streamDescriptors.get(url).get();
> +    
> +    RefPtr<MediaStreamDescriptor> descriptor = m_streamDescriptors.get(url);
> +    return descriptor.get();

What typecast does this avoid? I don’t understand. The old code looks better than the new.

> Source/WebCore/Modules/mediastream/RTCSessionDescription.cpp:100
>  void RTCSessionDescription::setSdp(const String& sdp, ExceptionCode& ec)

Why include this ExceptionCode argument if it‘s always zero? Better to fix the IDL file.

> Source/WebCore/Modules/mediastream/RTCStatsResponse.cpp:51
> +    return m_idmap.find(name) != m_idmap.end();

Should use contains, not find != end.

[Eric Carlson]

(In reply to comment #2)
> (From update of attachment 210410 [details])
> View in context: https://bugs.webkit.org/attachment.cgi?id=210410&action=review
> 
> > Source/WebCore/Modules/mediastream/MediaStreamRegistry.cpp:61
> > -    return m_streamDescriptors.get(url).get();
> > +    
> > +    RefPtr<MediaStreamDescriptor> descriptor = m_streamDescriptors.get(url);
> > +    return descriptor.get();
> 
> What typecast does this avoid? I don’t understand. The old code looks better than the new.
> 
The old code wouldn't compile yesterday, but I updated my tools this morning and it works. Removed my change.

> > Source/WebCore/Modules/mediastream/RTCSessionDescription.cpp:100
> >  void RTCSessionDescription::setSdp(const String& sdp, ExceptionCode& ec)
> 
> Why include this ExceptionCode argument if it‘s always zero? Better to fix the IDL file.
> 
  Good point, removed.

> > Source/WebCore/Modules/mediastream/RTCStatsResponse.cpp:51
> > +    return m_idmap.find(name) != m_idmap.end();
> 
> Should use contains, not find != end.
>
  Done.

Thanks!

[Eric Carlson]

Committed r155057: https://trac.webkit.org/r155057

[Csaba Osztrogonác]

(In reply to comment #4)
> Committed r155057: https://trac.webkit.org/r155057

FYI: It broke the build on the Windows bots. Could you fix it please?

[Csaba Osztrogonác]

   1>C:\cygwin\home\buildbot\slave\win-debug\build\WebKitBuild\Debug\obj32\WebCore\DerivedSources\JSNavigator.cpp(36): fatal error C1083: Cannot open include file: 'NavigatorMediaStream.h': No such file or directory

[Csaba Osztrogonác]

ping?

[Eric Carlson]

(In reply to comment #7)
> ping?

bfulgham is working on a fix.