Title: [237265] trunk/Source/WebCore
- Revision
- 237265
- Author
- pvol...@apple.com
- Date
- 2018-10-18 14:30:27 -0700 (Thu, 18 Oct 2018)
Log Message
[WebVTT] The TextTrackLoader parameter in TextTrackLoaderClient virtual methods should be a reference
https://bugs.webkit.org/show_bug.cgi?id=190730
Reviewed by Chris Dumez.
No new tests. No change in behavior.
* html/track/LoadableTextTrack.cpp:
(WebCore::LoadableTextTrack::newCuesAvailable):
(WebCore::LoadableTextTrack::cueLoadingCompleted):
(WebCore::LoadableTextTrack::newRegionsAvailable):
* html/track/LoadableTextTrack.h:
* loader/TextTrackLoader.cpp:
(WebCore::TextTrackLoader::cueLoadTimerFired):
(WebCore::TextTrackLoader::newRegionsParsed):
* loader/TextTrackLoader.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (237264 => 237265)
--- trunk/Source/WebCore/ChangeLog 2018-10-18 21:16:52 UTC (rev 237264)
+++ trunk/Source/WebCore/ChangeLog 2018-10-18 21:30:27 UTC (rev 237265)
@@ -1,3 +1,22 @@
+2018-10-18 Per Arne Vollan <pvol...@apple.com>
+
+ [WebVTT] The TextTrackLoader parameter in TextTrackLoaderClient virtual methods should be a reference
+ https://bugs.webkit.org/show_bug.cgi?id=190730
+
+ Reviewed by Chris Dumez.
+
+ No new tests. No change in behavior.
+
+ * html/track/LoadableTextTrack.cpp:
+ (WebCore::LoadableTextTrack::newCuesAvailable):
+ (WebCore::LoadableTextTrack::cueLoadingCompleted):
+ (WebCore::LoadableTextTrack::newRegionsAvailable):
+ * html/track/LoadableTextTrack.h:
+ * loader/TextTrackLoader.cpp:
+ (WebCore::TextTrackLoader::cueLoadTimerFired):
+ (WebCore::TextTrackLoader::newRegionsParsed):
+ * loader/TextTrackLoader.h:
+
2018-10-18 Alex Christensen <achristen...@webkit.org>
Clean up FrameLoader two-state enums
Modified: trunk/Source/WebCore/html/track/LoadableTextTrack.cpp (237264 => 237265)
--- trunk/Source/WebCore/html/track/LoadableTextTrack.cpp 2018-10-18 21:16:52 UTC (rev 237264)
+++ trunk/Source/WebCore/html/track/LoadableTextTrack.cpp 2018-10-18 21:30:27 UTC (rev 237265)
@@ -86,9 +86,9 @@
m_trackElement->didCompleteLoad(HTMLTrackElement::Failure);
}
-void LoadableTextTrack::newCuesAvailable(TextTrackLoader* loader)
+void LoadableTextTrack::newCuesAvailable(TextTrackLoader& loader)
{
- ASSERT_UNUSED(loader, m_loader.get() == loader);
+ ASSERT_UNUSED(loader, m_loader.get() == &loader);
Vector<RefPtr<TextTrackCue>> newCues;
m_loader->getNewCues(newCues);
@@ -106,9 +106,9 @@
client()->textTrackAddCues(*this, *m_cues);
}
-void LoadableTextTrack::cueLoadingCompleted(TextTrackLoader* loader, bool loadingFailed)
+void LoadableTextTrack::cueLoadingCompleted(TextTrackLoader& loader, bool loadingFailed)
{
- ASSERT_UNUSED(loader, m_loader.get() == loader);
+ ASSERT_UNUSED(loader, m_loader.get() == &loader);
if (!m_trackElement)
return;
@@ -118,9 +118,9 @@
m_trackElement->didCompleteLoad(loadingFailed ? HTMLTrackElement::Failure : HTMLTrackElement::Success);
}
-void LoadableTextTrack::newRegionsAvailable(TextTrackLoader* loader)
+void LoadableTextTrack::newRegionsAvailable(TextTrackLoader& loader)
{
- ASSERT_UNUSED(loader, m_loader.get() == loader);
+ ASSERT_UNUSED(loader, m_loader.get() == &loader);
Vector<RefPtr<VTTRegion>> newRegions;
m_loader->getNewRegions(newRegions);
Modified: trunk/Source/WebCore/html/track/LoadableTextTrack.h (237264 => 237265)
--- trunk/Source/WebCore/html/track/LoadableTextTrack.h 2018-10-18 21:16:52 UTC (rev 237264)
+++ trunk/Source/WebCore/html/track/LoadableTextTrack.h 2018-10-18 21:30:27 UTC (rev 237265)
@@ -53,9 +53,9 @@
private:
LoadableTextTrack(HTMLTrackElement&, const String& kind, const String& label, const String& language);
- void newCuesAvailable(TextTrackLoader*) final;
- void cueLoadingCompleted(TextTrackLoader*, bool loadingFailed) final;
- void newRegionsAvailable(TextTrackLoader*) final;
+ void newCuesAvailable(TextTrackLoader&) final;
+ void cueLoadingCompleted(TextTrackLoader&, bool loadingFailed) final;
+ void newRegionsAvailable(TextTrackLoader&) final;
void newStyleSheetsAvailable(TextTrackLoader&) final;
AtomicString id() const final;
Modified: trunk/Source/WebCore/loader/TextTrackLoader.cpp (237264 => 237265)
--- trunk/Source/WebCore/loader/TextTrackLoader.cpp 2018-10-18 21:16:52 UTC (rev 237264)
+++ trunk/Source/WebCore/loader/TextTrackLoader.cpp 2018-10-18 21:30:27 UTC (rev 237265)
@@ -65,11 +65,11 @@
{
if (m_newCuesAvailable) {
m_newCuesAvailable = false;
- m_client.newCuesAvailable(this);
+ m_client.newCuesAvailable(*this);
}
if (m_state >= Finished)
- m_client.cueLoadingCompleted(this, m_state == Failed);
+ m_client.cueLoadingCompleted(*this, m_state == Failed);
}
void TextTrackLoader::cancelLoad()
@@ -178,7 +178,7 @@
void TextTrackLoader::newRegionsParsed()
{
- m_client.newRegionsAvailable(this);
+ m_client.newRegionsAvailable(*this);
}
void TextTrackLoader::newStyleSheetsParsed()
Modified: trunk/Source/WebCore/loader/TextTrackLoader.h (237264 => 237265)
--- trunk/Source/WebCore/loader/TextTrackLoader.h 2018-10-18 21:16:52 UTC (rev 237264)
+++ trunk/Source/WebCore/loader/TextTrackLoader.h 2018-10-18 21:30:27 UTC (rev 237265)
@@ -45,9 +45,9 @@
public:
virtual ~TextTrackLoaderClient() = default;
- virtual void newCuesAvailable(TextTrackLoader*) = 0;
- virtual void cueLoadingCompleted(TextTrackLoader*, bool loadingFailed) = 0;
- virtual void newRegionsAvailable(TextTrackLoader*) = 0;
+ virtual void newCuesAvailable(TextTrackLoader&) = 0;
+ virtual void cueLoadingCompleted(TextTrackLoader&, bool loadingFailed) = 0;
+ virtual void newRegionsAvailable(TextTrackLoader&) = 0;
virtual void newStyleSheetsAvailable(TextTrackLoader&) = 0;
};
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
