Title: [206327] tags/Safari-603.1.6.0.2/Source/WebCore
- Revision
- 206327
- Author
- [email protected]
- Date
- 2016-09-23 13:28:40 -0700 (Fri, 23 Sep 2016)
Log Message
Merged r206301. rdar://problem/28436707
Modified Paths
Diff
Modified: tags/Safari-603.1.6.0.2/Source/WebCore/ChangeLog (206326 => 206327)
--- tags/Safari-603.1.6.0.2/Source/WebCore/ChangeLog 2016-09-23 20:24:57 UTC (rev 206326)
+++ tags/Safari-603.1.6.0.2/Source/WebCore/ChangeLog 2016-09-23 20:28:40 UTC (rev 206327)
@@ -1,5 +1,16 @@
2016-09-23 Babak Shafiei <[email protected]>
+ Merge r206301.
+
+ 2016-09-23 Jer Noble <[email protected]>
+
+ Unreviewed build fix; Missed a file in the last checkin.
+
+ * platform/graphics/SourceBufferPrivate.h:
+ (WebCore::SourceBufferPrivate::enqueuedSamplesForTrackID):
+
+2016-09-23 Babak Shafiei <[email protected]>
+
Merge r206300.
2016-09-23 Jer Noble <[email protected]>
Modified: tags/Safari-603.1.6.0.2/Source/WebCore/platform/graphics/SourceBufferPrivate.h (206326 => 206327)
--- tags/Safari-603.1.6.0.2/Source/WebCore/platform/graphics/SourceBufferPrivate.h 2016-09-23 20:24:57 UTC (rev 206326)
+++ tags/Safari-603.1.6.0.2/Source/WebCore/platform/graphics/SourceBufferPrivate.h 2016-09-23 20:28:40 UTC (rev 206327)
@@ -63,6 +63,8 @@
virtual void setActive(bool) { }
virtual void stopAskingForMoreSamples(AtomicString) { }
virtual void notifyClientWhenReadyForMoreSamples(AtomicString) { }
+
+ virtual Vector<String> enqueuedSamplesForTrackID(AtomicString) { return {}; }
};
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
