Title: [278751] trunk/Source/WebKit
- Revision
- 278751
- Author
- [email protected]
- Date
- 2021-06-10 20:22:43 -0700 (Thu, 10 Jun 2021)
Log Message
Unreviewed macOS build fix.
Add some missing header includes.
* Shared/mac/MediaFormatReader/CoreMediaWrapped.h:
* Shared/mac/MediaFormatReader/MediaSampleByteRange.h:
* Shared/mac/MediaFormatReader/MediaSampleCursor.h:
* Shared/mac/MediaFormatReader/MediaTrackReader.cpp:
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (278750 => 278751)
--- trunk/Source/WebKit/ChangeLog 2021-06-11 03:00:58 UTC (rev 278750)
+++ trunk/Source/WebKit/ChangeLog 2021-06-11 03:22:43 UTC (rev 278751)
@@ -1,3 +1,14 @@
+2021-06-10 Chris Dumez <[email protected]>
+
+ Unreviewed macOS build fix.
+
+ Add some missing header includes.
+
+ * Shared/mac/MediaFormatReader/CoreMediaWrapped.h:
+ * Shared/mac/MediaFormatReader/MediaSampleByteRange.h:
+ * Shared/mac/MediaFormatReader/MediaSampleCursor.h:
+ * Shared/mac/MediaFormatReader/MediaTrackReader.cpp:
+
2021-06-10 Fujii Hironori <[email protected]>
[WinCairo] Can't open WebInspector UI since r277787
Modified: trunk/Source/WebKit/Shared/mac/MediaFormatReader/CoreMediaWrapped.h (278750 => 278751)
--- trunk/Source/WebKit/Shared/mac/MediaFormatReader/CoreMediaWrapped.h 2021-06-11 03:00:58 UTC (rev 278750)
+++ trunk/Source/WebKit/Shared/mac/MediaFormatReader/CoreMediaWrapped.h 2021-06-11 03:22:43 UTC (rev 278751)
@@ -29,6 +29,8 @@
#include <pal/spi/cocoa/MediaToolboxSPI.h>
#include <wtf/ForbidHeapAllocation.h>
+#include <wtf/Noncopyable.h>
+#include <wtf/RetainPtr.h>
#include <wtf/cf/TypeCastsCF.h>
namespace WebKit {
Modified: trunk/Source/WebKit/Shared/mac/MediaFormatReader/MediaSampleByteRange.h (278750 => 278751)
--- trunk/Source/WebKit/Shared/mac/MediaFormatReader/MediaSampleByteRange.h 2021-06-11 03:00:58 UTC (rev 278750)
+++ trunk/Source/WebKit/Shared/mac/MediaFormatReader/MediaSampleByteRange.h 2021-06-11 03:22:43 UTC (rev 278751)
@@ -45,12 +45,12 @@
MediaTime decodeTime() const final { return m_decodeTime; }
MediaTime duration() const final { return m_duration; }
size_t sizeInBytes() const final { return m_sizeInBytes; }
- FloatSize presentationSize() const final { return m_presentationSize; }
+ WebCore::FloatSize presentationSize() const final { return m_presentationSize; }
SampleFlags flags() const final { return m_flags; }
std::optional<ByteRange> byteRange() const final { return m_byteRange; }
AtomString trackID() const final;
- PlatformSample platformSample() final;
+ WebCore::PlatformSample platformSample() final;
void offsetTimestampsBy(const MediaTime&) final;
void setTimestamps(const MediaTime&, const MediaTime&) final;
@@ -63,7 +63,7 @@
ByteRange m_byteRange;
uint64_t m_trackID;
size_t m_sizeInBytes;
- FloatSize m_presentationSize;
+ WebCore::FloatSize m_presentationSize;
RetainPtr<MTPluginByteSourceRef> m_byteSource;
RetainPtr<CMFormatDescriptionRef> m_formatDescription;
SampleFlags m_flags;
Modified: trunk/Source/WebKit/Shared/mac/MediaFormatReader/MediaSampleCursor.h (278750 => 278751)
--- trunk/Source/WebKit/Shared/mac/MediaFormatReader/MediaSampleCursor.h 2021-06-11 03:00:58 UTC (rev 278750)
+++ trunk/Source/WebKit/Shared/mac/MediaFormatReader/MediaSampleCursor.h 2021-06-11 03:22:43 UTC (rev 278751)
@@ -29,6 +29,7 @@
#include "CoreMediaWrapped.h"
#include <WebCore/SampleMap.h>
+#include <wtf/Identified.h>
#include <wtf/Lock.h>
#include <wtf/MediaTime.h>
#include <wtf/Variant.h>
@@ -49,8 +50,8 @@
class MediaSampleCursor : public CoreMediaWrapped<MediaSampleCursor>, ThreadSafeIdentified<MediaSampleCursor> {
public:
- using DecodeOrderIterator = DecodeOrderSampleMap::iterator;
- using PresentationOrderIterator = PresentationOrderSampleMap::iterator;
+ using DecodeOrderIterator = WebCore::DecodeOrderSampleMap::iterator;
+ using PresentationOrderIterator = WebCore::PresentationOrderSampleMap::iterator;
using Locator = Variant<MediaTime, DecodeOrderIterator, PresentationOrderIterator>;
struct Timing {
Modified: trunk/Source/WebKit/Shared/mac/MediaFormatReader/MediaTrackReader.cpp (278750 => 278751)
--- trunk/Source/WebKit/Shared/mac/MediaFormatReader/MediaTrackReader.cpp 2021-06-11 03:00:58 UTC (rev 278750)
+++ trunk/Source/WebKit/Shared/mac/MediaFormatReader/MediaTrackReader.cpp 2021-06-11 03:22:43 UTC (rev 278751)
@@ -39,6 +39,7 @@
#include <WebCore/VideoTrackPrivate.h>
#include <pal/avfoundation/MediaTimeAVFoundation.h>
#include <wtf/LoggerHelper.h>
+#include <wtf/WorkQueue.h>
#include <pal/cocoa/MediaToolboxSoftLink.h>
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
