Merge pull request #1372 from emutavchi/wpe-2.38-fix-ref-deref-sting

Fix race in ref/deref of StringImpl for some cases

Author: magomez

Source/WebCore/platform/graphics/gstreamer/mse/MediaSourceTrackGStreamer.h

@@ -45,7 +45,7 @@ class MediaSourceTrackGStreamer final: public ThreadSafeRefCounted<MediaSourceTr
     virtual ~MediaSourceTrackGStreamer();
 
     TrackPrivateBaseGStreamer::TrackType type() const { return m_type; }
-    AtomString trackId() const { return m_trackId; }
+    const AtomString& trackId() const { return m_trackId; }
     GRefPtr<GstCaps>& initialCaps() { return m_initialCaps; }
     DataMutex<TrackQueue>& queueDataMutex() { return m_queueDataMutex; }
 

Source/WebCore/platform/graphics/gstreamer/mse/SourceBufferPrivateGStreamer.cpp

@@ -185,12 +185,12 @@ void SourceBufferPrivateGStreamer::notifyClientWhenReadyForMoreSamples(const Ato
     ASSERT(isMainThread());
     ASSERT(m_tracks.contains(trackId));
     MediaSourceTrackGStreamer* track = m_tracks.get(trackId);
-    track->notifyWhenReadyForMoreSamples([weakPtr = WeakPtr { *this }, this, trackId]() mutable {
-        RunLoop::main().dispatch([weakPtr = WTFMove(weakPtr), this, trackId]() {
+    track->notifyWhenReadyForMoreSamples([weakPtr = WeakPtr { *this }, this, trackId = trackId.string().isolatedCopy()]() mutable {
+        RunLoop::main().dispatch([weakPtr = WTFMove(weakPtr), this, trackId = WTFMove(trackId)]() {
             if (!weakPtr)
                 return;
             if (!m_hasBeenRemovedFromMediaSource)
-                provideMediaData(trackId);
+                provideMediaData(AtomString{ trackId });
         });
     });
 }

Source/WebCore/platform/graphics/nicosia/NicosiaAnimation.cpp

@@ -184,7 +184,7 @@ Animation::Animation(const String& name, const KeyframeValueList& keyframes, con
 }
 
 Animation::Animation(const Animation& other)
-    : m_name(other.m_name.isSafeToSendToAnotherThread() ? other.m_name : other.m_name.isolatedCopy())
+    : m_name(other.m_name.isolatedCopy())
     , m_keyframes(other.m_keyframes)
     , m_boxSize(other.m_boxSize)
     , m_timingFunction(other.m_timingFunction->clone())
@@ -202,7 +202,7 @@ Animation::Animation(const Animation& other)
 
 Animation& Animation::operator=(const Animation& other)
 {
-    m_name = other.m_name.isSafeToSendToAnotherThread() ? other.m_name : other.m_name.isolatedCopy();
+    m_name = other.m_name.isolatedCopy();
     m_keyframes = other.m_keyframes;
     m_boxSize = other.m_boxSize;
     m_timingFunction = other.m_timingFunction->clone();