Bug 200936 – CaptureDeviceManager does not need to be CanMakeWeakPtr

• Component: WebRTC
• Status: RESOLVED FIXED

[youenn fablet]

CaptureDeviceManager does not need to be CanMakeWeakPtr

[youenn fablet]

Created attachment 376792 [details]
Patch

[youenn fablet]

Created attachment 376861 [details]
Patch

[EWS Watchlist]

Attachment 376861 [details] did not pass style-queue:


ERROR: Source/WebCore/platform/mediastream/mac/CoreAudioCaptureDeviceManager.cpp:119:  Place brace on its own line for function definitions.  [whitespace/braces] [4]
Total errors found: 1 in 5 files


If any of these errors are false positives, please file a bug against check-webkit-style.

[Alex Christensen]

Comment on attachment 376861 [details]
Patch

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

> Source/WebCore/platform/mediastream/mac/CoreAudioCaptureDeviceManager.cpp:117
> +static inline AudioObjectPropertyListenerBlock createAudioObjectPropertyListenerBlock()

You could've just left this code where it is, removed the Block_copy, and replaced the call to weakThis->refreshAudioCaptureDevices() with CoreAudioCaptureDeviceManager::singleton().refreshAudioCaptureDevices().

> Source/WebCore/platform/mediastream/mac/CoreAudioCaptureDeviceManager.h:51
> +    enum class NotifyIfDevicesHaveChanged { Notify, DoNotNotify };

I don't see why these need to be public now.

[youenn fablet]

Created attachment 376916 [details]
Patch for landing

[youenn fablet]

(In reply to Alex Christensen from comment #4)
> Comment on attachment 376861 [details]
> Patch
> 
> View in context:
> https://bugs.webkit.org/attachment.cgi?id=376861&action=review
> 
> > Source/WebCore/platform/mediastream/mac/CoreAudioCaptureDeviceManager.cpp:117
> > +static inline AudioObjectPropertyListenerBlock createAudioObjectPropertyListenerBlock()
> 
> You could've just left this code where it is, removed the Block_copy, and
> replaced the call to weakThis->refreshAudioCaptureDevices() with
> CoreAudioCaptureDeviceManager::singleton().refreshAudioCaptureDevices().

Sure, the idea was to make sure to not use this.

> > Source/WebCore/platform/mediastream/mac/CoreAudioCaptureDeviceManager.h:51
> > +    enum class NotifyIfDevicesHaveChanged { Notify, DoNotNotify };
> 
> I don't see why these need to be public now.

Because the block is outside CoreAudioCaptureDeviceManager.
I reinlined the block and kept them private.

[Alex Christensen]

Comment on attachment 376916 [details]
Patch for landing

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

> Source/WebCore/platform/mediastream/mac/CoreAudioCaptureDeviceManager.cpp:124
> +        auto listener = Block_copy(^(UInt32 count, const AudioObjectPropertyAddress properties[]) {

I think this Block_copy makes a leak.  Could you use BlockPtr?

[youenn fablet]

Created attachment 377000 [details]
Patch for landing

[EWS Watchlist]

Attachment 377000 [details] did not pass style-queue:


ERROR: Source/WebCore/platform/mediastream/mac/CoreAudioCaptureDeviceManager.cpp:124:  Place brace on its own line for function definitions.  [whitespace/braces] [4]
Total errors found: 1 in 5 files


If any of these errors are false positives, please file a bug against check-webkit-style.

[WebKit Commit Bot]

Comment on attachment 377000 [details]
Patch for landing

Clearing flags on attachment: 377000

Committed r249002: <https://trac.webkit.org/changeset/249002>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.

[Radar WebKit Bug Importer]

<rdar://problem/54593543>