Use AtomicString arguments in TrackPrivateBaseClient callbacks
authorb.long@cablelabs.com <b.long@cablelabs.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 14 Feb 2014 17:51:28 +0000 (17:51 +0000)
committerb.long@cablelabs.com <b.long@cablelabs.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 14 Feb 2014 17:51:28 +0000 (17:51 +0000)
https://bugs.webkit.org/show_bug.cgi?id=128765

Reviewed by Eric Carlson.

No new tests because this doesn't change functionality.

* html/track/AudioTrack.cpp:
(WebCore::AudioTrack::idChanged):
(WebCore::AudioTrack::labelChanged):
(WebCore::AudioTrack::languageChanged):
* html/track/AudioTrack.h:
* html/track/InbandTextTrack.cpp:
(WebCore::InbandTextTrack::InbandTextTrack):
(WebCore::InbandTextTrack::idChanged):
(WebCore::InbandTextTrack::labelChanged):
(WebCore::InbandTextTrack::languageChanged):
* html/track/InbandTextTrack.h:
* html/track/VideoTrack.cpp:
(WebCore::VideoTrack::idChanged):
(WebCore::VideoTrack::labelChanged):
(WebCore::VideoTrack::languageChanged):
* html/track/VideoTrack.h:
* platform/graphics/TrackPrivateBase.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@164106 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/html/track/AudioTrack.cpp
Source/WebCore/html/track/AudioTrack.h
Source/WebCore/html/track/InbandTextTrack.cpp
Source/WebCore/html/track/InbandTextTrack.h
Source/WebCore/html/track/VideoTrack.cpp
Source/WebCore/html/track/VideoTrack.h
Source/WebCore/platform/graphics/TrackPrivateBase.h

index 4b8d2b5..f374a4b 100644 (file)
@@ -1,3 +1,30 @@
+2014-02-14  Brendan Long  <b.long@cablelabs.com>
+
+        Use AtomicString arguments in TrackPrivateBaseClient callbacks
+        https://bugs.webkit.org/show_bug.cgi?id=128765
+
+        Reviewed by Eric Carlson.
+
+        No new tests because this doesn't change functionality.
+
+        * html/track/AudioTrack.cpp:
+        (WebCore::AudioTrack::idChanged):
+        (WebCore::AudioTrack::labelChanged):
+        (WebCore::AudioTrack::languageChanged):
+        * html/track/AudioTrack.h:
+        * html/track/InbandTextTrack.cpp:
+        (WebCore::InbandTextTrack::InbandTextTrack):
+        (WebCore::InbandTextTrack::idChanged):
+        (WebCore::InbandTextTrack::labelChanged):
+        (WebCore::InbandTextTrack::languageChanged):
+        * html/track/InbandTextTrack.h:
+        * html/track/VideoTrack.cpp:
+        (WebCore::VideoTrack::idChanged):
+        (WebCore::VideoTrack::labelChanged):
+        (WebCore::VideoTrack::languageChanged):
+        * html/track/VideoTrack.h:
+        * platform/graphics/TrackPrivateBase.h:
+
 2014-02-14  Renata Hodovan  <rhodovan.u-szeged@partner.samsung.com>
 
         ASSERTION FAILED: comparePositions(newEnd, newStart) >= 0 in WebCore::ApplyStyleCommand::updateStartEnd
index aecdb0a..c807965 100644 (file)
@@ -160,19 +160,19 @@ void AudioTrack::enabledChanged(AudioTrackPrivate* trackPrivate, bool enabled)
     setEnabled(enabled);
 }
 
-void AudioTrack::idChanged(TrackPrivateBase* trackPrivate, const String& id)
+void AudioTrack::idChanged(TrackPrivateBase* trackPrivate, const AtomicString& id)
 {
     ASSERT_UNUSED(trackPrivate, trackPrivate == m_private);
     setId(id);
 }
 
-void AudioTrack::labelChanged(TrackPrivateBase* trackPrivate, const String& label)
+void AudioTrack::labelChanged(TrackPrivateBase* trackPrivate, const AtomicString& label)
 {
     ASSERT_UNUSED(trackPrivate, trackPrivate == m_private);
     setLabel(label);
 }
 
-void AudioTrack::languageChanged(TrackPrivateBase* trackPrivate, const String& language)
+void AudioTrack::languageChanged(TrackPrivateBase* trackPrivate, const AtomicString& language)
 {
     ASSERT_UNUSED(trackPrivate, trackPrivate == m_private);
     setLanguage(language);
index 29c5bd4..a0ee67d 100644 (file)
@@ -77,9 +77,9 @@ private:
     virtual bool isValidKind(const AtomicString&) const override;
 
     virtual void enabledChanged(AudioTrackPrivate*, bool) override;
-    virtual void idChanged(TrackPrivateBase*, const String&) override;
-    virtual void labelChanged(TrackPrivateBase*, const String&) override;
-    virtual void languageChanged(TrackPrivateBase*, const String&) override;
+    virtual void idChanged(TrackPrivateBase*, const AtomicString&) override;
+    virtual void labelChanged(TrackPrivateBase*, const AtomicString&) override;
+    virtual void languageChanged(TrackPrivateBase*, const AtomicString&) override;
     virtual void willRemove(TrackPrivateBase*) override;
 
     bool m_enabled;
index f8772cb..af0a0fd 100644 (file)
@@ -58,7 +58,7 @@ PassRefPtr<InbandTextTrack> InbandTextTrack::create(ScriptExecutionContext* cont
 }
 
 InbandTextTrack::InbandTextTrack(ScriptExecutionContext* context, TextTrackClient* client, PassRefPtr<InbandTextTrackPrivate> trackPrivate)
-    : TextTrack(context, client, emptyString(), trackPrivate->id(), trackPrivate->label(), trackPrivate->language(), InBand)
+    : TextTrack(context, client, emptyAtom, trackPrivate->id(), trackPrivate->label(), trackPrivate->language(), InBand)
     , m_private(trackPrivate)
 {
     m_private->setClient(this);
@@ -154,19 +154,19 @@ size_t InbandTextTrack::inbandTrackIndex()
     return m_private->trackIndex();
 }
 
-void InbandTextTrack::idChanged(TrackPrivateBase* trackPrivate, const String& id)
+void InbandTextTrack::idChanged(TrackPrivateBase* trackPrivate, const AtomicString& id)
 {
     ASSERT_UNUSED(trackPrivate, trackPrivate == m_private);
     setId(id);
 }
 
-void InbandTextTrack::labelChanged(TrackPrivateBase* trackPrivate, const String& label)
+void InbandTextTrack::labelChanged(TrackPrivateBase* trackPrivate, const AtomicString& label)
 {
     ASSERT_UNUSED(trackPrivate, trackPrivate == m_private);
     setLabel(label);
 }
 
-void InbandTextTrack::languageChanged(TrackPrivateBase* trackPrivate, const String& language)
+void InbandTextTrack::languageChanged(TrackPrivateBase* trackPrivate, const AtomicString& language)
 {
     ASSERT_UNUSED(trackPrivate, trackPrivate == m_private);
     setLanguage(language);
index 1e1313b..cfa31f1 100644 (file)
@@ -55,9 +55,9 @@ protected:
 
 private:
 
-    virtual void idChanged(TrackPrivateBase*, const String&) override;
-    virtual void labelChanged(TrackPrivateBase*, const String&) override;
-    virtual void languageChanged(TrackPrivateBase*, const String&) override;
+    virtual void idChanged(TrackPrivateBase*, const AtomicString&) override;
+    virtual void labelChanged(TrackPrivateBase*, const AtomicString&) override;
+    virtual void languageChanged(TrackPrivateBase*, const AtomicString&) override;
     virtual void willRemove(TrackPrivateBase*) override;
 
 #if USE(PLATFORM_TEXT_TRACK_MENU)
index c0480fe..05825e8 100644 (file)
@@ -164,19 +164,19 @@ void VideoTrack::selectedChanged(VideoTrackPrivate* trackPrivate, bool selected)
     setSelected(selected);
 }
 
-void VideoTrack::idChanged(TrackPrivateBase* trackPrivate, const String& id)
+void VideoTrack::idChanged(TrackPrivateBase* trackPrivate, const AtomicString& id)
 {
     ASSERT_UNUSED(trackPrivate, trackPrivate == m_private);
     setId(id);
 }
 
-void VideoTrack::labelChanged(TrackPrivateBase* trackPrivate, const String& label)
+void VideoTrack::labelChanged(TrackPrivateBase* trackPrivate, const AtomicString& label)
 {
     ASSERT_UNUSED(trackPrivate, trackPrivate == m_private);
     setLabel(label);
 }
 
-void VideoTrack::languageChanged(TrackPrivateBase* trackPrivate, const String& language)
+void VideoTrack::languageChanged(TrackPrivateBase* trackPrivate, const AtomicString& language)
 {
     ASSERT_UNUSED(trackPrivate, trackPrivate == m_private);
     setLanguage(language);
index 6343a07..44312a5 100644 (file)
@@ -85,9 +85,9 @@ private:
     virtual bool isValidKind(const AtomicString&) const override;
 
     virtual void selectedChanged(VideoTrackPrivate*, bool) override;
-    virtual void idChanged(TrackPrivateBase*, const String&) override;
-    virtual void labelChanged(TrackPrivateBase*, const String&) override;
-    virtual void languageChanged(TrackPrivateBase*, const String&) override;
+    virtual void idChanged(TrackPrivateBase*, const AtomicString&) override;
+    virtual void labelChanged(TrackPrivateBase*, const AtomicString&) override;
+    virtual void languageChanged(TrackPrivateBase*, const AtomicString&) override;
     virtual void willRemove(TrackPrivateBase*) override;
 
     virtual bool enabled() const override { return selected(); }
index 01d23ae..1ad6101 100644 (file)
@@ -42,9 +42,9 @@ class TrackPrivateBase;
 class TrackPrivateBaseClient {
 public:
     virtual ~TrackPrivateBaseClient() { }
-    virtual void idChanged(TrackPrivateBase*, const String&) = 0;
-    virtual void labelChanged(TrackPrivateBase*, const String&) = 0;
-    virtual void languageChanged(TrackPrivateBase*, const String&) = 0;
+    virtual void idChanged(TrackPrivateBase*, const AtomicString&) = 0;
+    virtual void labelChanged(TrackPrivateBase*, const AtomicString&) = 0;
+    virtual void languageChanged(TrackPrivateBase*, const AtomicString&) = 0;
     virtual void willRemove(TrackPrivateBase*) = 0;
 };