Title: [153719] branches/safari-537-branch/Source/WebCore
- Revision
- 153719
- Author
- lforsch...@apple.com
- Date
- 2013-08-05 12:38:40 -0700 (Mon, 05 Aug 2013)
Log Message
Merged r152884. <rdar://problem/14472043>
Modified Paths
Diff
Modified: branches/safari-537-branch/Source/WebCore/ChangeLog (153718 => 153719)
--- branches/safari-537-branch/Source/WebCore/ChangeLog 2013-08-05 19:35:45 UTC (rev 153718)
+++ branches/safari-537-branch/Source/WebCore/ChangeLog 2013-08-05 19:38:40 UTC (rev 153719)
@@ -1,5 +1,16 @@
2013-08-05 Lucas Forschler <lforsch...@apple.com>
+ Merge r152884
+
+ 2013-07-18 Ryosuke Niwa <rn...@webkit.org>
+
+ Build fix after r152876.
+
+ * platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp:
+ (WebCore::MediaPlayerPrivateAVFoundation::processNewAndRemovedTextTracks):
+
+2013-08-05 Lucas Forschler <lforsch...@apple.com>
+
Merge r152876
2013-07-18 Brent Fulgham <bfulg...@apple.com>
Modified: branches/safari-537-branch/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp (153718 => 153719)
--- branches/safari-537-branch/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp 2013-08-05 19:35:45 UTC (rev 153718)
+++ branches/safari-537-branch/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp 2013-08-05 19:38:40 UTC (rev 153719)
@@ -905,7 +905,7 @@
track->setHasBeenReported(true);
player()->addTextTrack(track.get());
}
- LOG(Media, "MediaPlayerPrivateAVFoundation::processNewAndRemovedTextTracks(%p) - found %i text tracks", this, m_textTracks.size());
+ LOG(Media, "MediaPlayerPrivateAVFoundation::processNewAndRemovedTextTracks(%p) - found %lu text tracks", this, m_textTracks.size());
}
} // namespace WebCore
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
