Attachment 357325 Details for Bug 192708 – Patch v1

[patch] Patch v1

bug-192708-20181214112616.patch (text/plain), 11.20 KB, created by David Kilzer (:ddkilzer) on 2018-12-14 11:26:17 PST

(hide)

Description:

Filename:

MIME Type:

Creator: David Kilzer (:ddkilzer)

Created: 2018-12-14 11:26:17 PST

Size: 11.20 KB

patch

obsolete

>Subversion Revision: 239112
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 1d451e16a4b62a6ab547b3374efe85365b70689c..d2d8769ee44e03bffea9bf9171317d0c4e65d010 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,39 @@
>+2018-12-14  David Kilzer  <ddkilzer@apple.com>
>+
>+        clang-tidy: Fix unnecessary object copies in WebCore/platform/graphics/avfoundation/objc/
>+        <https://webkit.org/b/192708>
>+        <rdar://problem/46735907>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * platform/graphics/avfoundation/objc/ImageDecoderAVFObjC.mm:
>+        (WebCore::toSample):
>+        - Make argument a const reference.
>+
>+        * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h:
>+        - Update method signatures for implementation changes.
>+        * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
>+        (WebCore::MediaPlayerPrivateAVFoundationObjC::setAsset):
>+        (WebCore::MediaPlayerPrivateAVFoundationObjC::seekableTimeRangesDidChange):
>+        (WebCore::MediaPlayerPrivateAVFoundationObjC::loadedTimeRangesDidChange):
>+        - Make RetainPtr<> argument an rvalue reference and use WTFMove().
>+        (WebCore::MediaPlayerPrivateAVFoundationObjC::metadataDidArrive):
>+        (WebCore::MediaPlayerPrivateAVFoundationObjC::tracksDidChange):
>+        - Make RetainPtr<> argument a const reference.
>+
>+        * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm:
>+        (WebCore::MediaPlayerPrivateMediaSourceAVFObjC::setVolume):
>+        (WebCore::MediaPlayerPrivateMediaSourceAVFObjC::setMuted):
>+        (WebCore::MediaPlayerPrivateMediaSourceAVFObjC::setPreservesPitch):
>+        - Change for loop keys to be const references.
>+
>+        * platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.h:
>+        - Update method signatures for implementation changes.
>+        * platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm:
>+        (WebCore::SourceBufferPrivateAVFObjC::fastSeekTimeForMediaTime):
>+        (WebCore::SourceBufferPrivateAVFObjC::seekToTime):
>+        - Make Mediatime arguments a const reference.
>+
> 2018-12-14  David Kilzer  <ddkilzer@apple.com>
> 
>         clang-tidy: Fix unnecessary object copy in CPUMonitor::setCPULimit()
>diff --git a/Source/WebCore/platform/graphics/avfoundation/objc/ImageDecoderAVFObjC.mm b/Source/WebCore/platform/graphics/avfoundation/objc/ImageDecoderAVFObjC.mm
>index d6d1486748013e93cf07e3d621ef9174528dd74f..ce8dab2822258900bbcb72cadc90670ff4d28c32 100644
>--- a/Source/WebCore/platform/graphics/avfoundation/objc/ImageDecoderAVFObjC.mm
>+++ b/Source/WebCore/platform/graphics/avfoundation/objc/ImageDecoderAVFObjC.mm
>@@ -300,7 +300,7 @@ private:
>     bool m_hasAlpha { false };
> };
> 
>-static ImageDecoderAVFObjCSample* toSample(PresentationOrderSampleMap::value_type pair)
>+static ImageDecoderAVFObjCSample* toSample(const PresentationOrderSampleMap::value_type& pair)
> {
>     return (ImageDecoderAVFObjCSample*)pair.second.get();
> }
>diff --git a/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h b/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h
>index 3ab94623fd83e8cb8a74799a51b163f2dbc3321b..71a698c69dd9216e28612040cf8053e4129d1322 100644
>--- a/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h
>+++ b/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h
>@@ -78,7 +78,7 @@ public:
>     static void clearMediaCache(const String&, WallTime modifiedSince);
>     static void clearMediaCacheForOrigins(const String&, const HashSet<RefPtr<SecurityOrigin>>&);
> 
>-    void setAsset(RetainPtr<id>);
>+    void setAsset(RetainPtr<id>&&);
>     void tracksChanged() override;
> 
> #if HAVE(AVFOUNDATION_MEDIA_SELECTION_GROUP)
>@@ -106,14 +106,14 @@ public:
>     void playbackBufferEmptyDidChange(bool);
>     void playbackBufferFullWillChange();
>     void playbackBufferFullDidChange(bool);
>-    void loadedTimeRangesDidChange(RetainPtr<NSArray>);
>-    void seekableTimeRangesDidChange(RetainPtr<NSArray>);
>-    void tracksDidChange(RetainPtr<NSArray>);
>+    void loadedTimeRangesDidChange(RetainPtr<NSArray>&&);
>+    void seekableTimeRangesDidChange(RetainPtr<NSArray>&&);
>+    void tracksDidChange(const RetainPtr<NSArray>&);
>     void hasEnabledAudioDidChange(bool);
>     void presentationSizeDidChange(FloatSize);
>     void durationDidChange(const MediaTime&);
>     void rateDidChange(double);
>-    void metadataDidArrive(RetainPtr<NSArray>, const MediaTime&);
>+    void metadataDidArrive(const RetainPtr<NSArray>&, const MediaTime&);
>     void firstFrameAvailableDidChange(bool);
>     void trackEnabledDidChange(bool);
>     void canPlayFastReverseDidChange(bool);
>diff --git a/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm b/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm
>index 2a0560b43843bfe54dbee723a1154b8cc89bede9..ca657f0aae8ad532a64eb47e59bdbddb13ae4576 100644
>--- a/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm
>+++ b/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm
>@@ -1530,9 +1530,9 @@ unsigned long long MediaPlayerPrivateAVFoundationObjC::totalBytes() const
>     return m_cachedTotalBytes;
> }
> 
>-void MediaPlayerPrivateAVFoundationObjC::setAsset(RetainPtr<id> asset)
>+void MediaPlayerPrivateAVFoundationObjC::setAsset(RetainPtr<id>&& asset)
> {
>-    m_avAsset = asset;
>+    m_avAsset = WTFMove(asset);
> }
> 
> MediaPlayerPrivateAVFoundation::AssetStatus MediaPlayerPrivateAVFoundationObjC::assetStatus() const
>@@ -3051,17 +3051,17 @@ void MediaPlayerPrivateAVFoundationObjC::playbackBufferFullDidChange(bool buffer
>         updateStates();
> }
> 
>-void MediaPlayerPrivateAVFoundationObjC::seekableTimeRangesDidChange(RetainPtr<NSArray> seekableRanges)
>+void MediaPlayerPrivateAVFoundationObjC::seekableTimeRangesDidChange(RetainPtr<NSArray>&& seekableRanges)
> {
>-    m_cachedSeekableRanges = seekableRanges;
>+    m_cachedSeekableRanges = WTFMove(seekableRanges);
> 
>     seekableTimeRangesChanged();
>     updateStates();
> }
> 
>-void MediaPlayerPrivateAVFoundationObjC::loadedTimeRangesDidChange(RetainPtr<NSArray> loadedRanges)
>+void MediaPlayerPrivateAVFoundationObjC::loadedTimeRangesDidChange(RetainPtr<NSArray>&& loadedRanges)
> {
>-    m_cachedLoadedRanges = loadedRanges;
>+    m_cachedLoadedRanges = WTFMove(loadedRanges);
> 
>     loadedTimeRangesChanged();
>     updateStates();
>@@ -3123,7 +3123,7 @@ static const AtomicString& metadataType(NSString *avMetadataKeySpace)
> 
> #endif
> 
>-void MediaPlayerPrivateAVFoundationObjC::metadataDidArrive(RetainPtr<NSArray> metadata, const MediaTime& mediaTime)
>+void MediaPlayerPrivateAVFoundationObjC::metadataDidArrive(const RetainPtr<NSArray>& metadata, const MediaTime& mediaTime)
> {
>     m_currentMetaData = metadata && ![metadata isKindOfClass:[NSNull class]] ? metadata : nil;
> 
>@@ -3165,7 +3165,7 @@ void MediaPlayerPrivateAVFoundationObjC::metadataDidArrive(RetainPtr<NSArray> me
> #endif
> }
> 
>-void MediaPlayerPrivateAVFoundationObjC::tracksDidChange(RetainPtr<NSArray> tracks)
>+void MediaPlayerPrivateAVFoundationObjC::tracksDidChange(const RetainPtr<NSArray>& tracks)
> {
>     for (AVPlayerItemTrack *track in m_cachedTracks.get())
>         [track removeObserver:m_objcObserver.get() forKeyPath:@"enabled"];
>diff --git a/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm b/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm
>index fa7325bc588fc75242495378a8b6bde114368d1f..d77323df3e83c89f82a016b69b2c9cda240a32d5 100644
>--- a/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm
>+++ b/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm
>@@ -301,7 +301,7 @@ bool MediaPlayerPrivateMediaSourceAVFObjC::paused() const
> 
> void MediaPlayerPrivateMediaSourceAVFObjC::setVolume(float volume)
> {
>-    for (auto key : m_sampleBufferAudioRendererMap.keys())
>+    for (const auto& key : m_sampleBufferAudioRendererMap.keys())
>         [(__bridge AVSampleBufferAudioRenderer *)key.get() setVolume:volume];
> }
> 
>@@ -312,7 +312,7 @@ bool MediaPlayerPrivateMediaSourceAVFObjC::supportsScanning() const
> 
> void MediaPlayerPrivateMediaSourceAVFObjC::setMuted(bool muted)
> {
>-    for (auto key : m_sampleBufferAudioRendererMap.keys())
>+    for (const auto& key : m_sampleBufferAudioRendererMap.keys())
>         [(__bridge AVSampleBufferAudioRenderer *)key.get() setMuted:muted];
> }
> 
>@@ -460,7 +460,7 @@ void MediaPlayerPrivateMediaSourceAVFObjC::setRateDouble(double rate)
> void MediaPlayerPrivateMediaSourceAVFObjC::setPreservesPitch(bool preservesPitch)
> {
>     NSString *algorithm = preservesPitch ? AVAudioTimePitchAlgorithmSpectral : AVAudioTimePitchAlgorithmVarispeed;
>-    for (auto key : m_sampleBufferAudioRendererMap.keys())
>+    for (const auto& key : m_sampleBufferAudioRendererMap.keys())
>         [(__bridge AVSampleBufferAudioRenderer *)key.get() setAudioTimePitchAlgorithm:algorithm];
> }
> 
>diff --git a/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.h b/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.h
>index e7a0fdc82abb0ff62bf66f6577bab618e3e70c5e..8300dc3b6e39e8cab145aeba2176e9811dfc9871 100644
>--- a/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.h
>+++ b/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.h
>@@ -102,8 +102,8 @@ public:
>     void trackDidChangeEnabled(AudioTrackPrivateMediaSourceAVFObjC*);
> 
>     void willSeek();
>-    void seekToTime(MediaTime);
>-    MediaTime fastSeekTimeForMediaTime(MediaTime, MediaTime negativeThreshold, MediaTime positiveThreshold);
>+    void seekToTime(const MediaTime&);
>+    MediaTime fastSeekTimeForMediaTime(const MediaTime&, const MediaTime& negativeThreshold, const MediaTime& positiveThreshold);
>     FloatSize naturalSize();
> 
>     int protectedTrackID() const { return m_protectedTrackID; }
>diff --git a/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm b/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm
>index 75e01d80b9b7ec1932a1f116566395a2a8083656..a99feb7f653c99116d0f339ec3775fc20cef0bed 100644
>--- a/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm
>+++ b/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm
>@@ -1159,7 +1159,7 @@ void SourceBufferPrivateAVFObjC::setActive(bool isActive)
>         m_mediaSource->sourceBufferPrivateDidChangeActiveState(this, isActive);
> }
> 
>-MediaTime SourceBufferPrivateAVFObjC::fastSeekTimeForMediaTime(MediaTime time, MediaTime negativeThreshold, MediaTime positiveThreshold)
>+MediaTime SourceBufferPrivateAVFObjC::fastSeekTimeForMediaTime(const MediaTime& time, const MediaTime& negativeThreshold, const MediaTime& positiveThreshold)
> {
>     if (!m_client)
>         return time;
>@@ -1171,7 +1171,7 @@ void SourceBufferPrivateAVFObjC::willSeek()
>     flush();
> }
> 
>-void SourceBufferPrivateAVFObjC::seekToTime(MediaTime time)
>+void SourceBufferPrivateAVFObjC::seekToTime(const MediaTime& time)
> {
>     if (m_client)
>         m_client->sourceBufferPrivateSeekToTime(time);

Actions: View | Formatted Diff | Diff

Attachments on bug 192708: 357325