Title: [270760] trunk/Source/WebKit/Shared/mac/MediaFormatReader
- Revision
- 270760
- Author
- [email protected]
- Date
- 2020-12-13 20:39:21 -0800 (Sun, 13 Dec 2020)
Log Message
Unreviewed build fix after r270758.
* Shared/mac/MediaFormatReader/CoreMediaWrapped.h: Unrelated renaming.
* Shared/mac/MediaFormatReader/SampleCursor.h: Removed an "#undef" meant for testing.
Modified Paths
Diff
Modified: trunk/Source/WebKit/Shared/mac/MediaFormatReader/CoreMediaWrapped.h (270759 => 270760)
--- trunk/Source/WebKit/Shared/mac/MediaFormatReader/CoreMediaWrapped.h 2020-12-14 04:31:27 UTC (rev 270759)
+++ trunk/Source/WebKit/Shared/mac/MediaFormatReader/CoreMediaWrapped.h 2020-12-14 04:39:21 UTC (rev 270760)
@@ -33,12 +33,12 @@
namespace WebKit {
-template<typename> struct FigTraits;
+template<typename> struct CoreMediaTraits;
#define DECLARE_CORE_MEDIA_TRAITS(ClassName) \
namespace WebKit { \
class ClassName; \
-template<> struct FigTraits<ClassName> { \
+template<> struct CoreMediaTraits<ClassName> { \
using Class = MTPlugin##ClassName##Class; \
using Ref = MTPlugin##ClassName##Ref; \
using VTable = MTPlugin##ClassName##VTable; \
@@ -50,7 +50,7 @@
WTF_FORBID_HEAP_ALLOCATION;
WTF_MAKE_NONCOPYABLE(CoreMediaWrapped);
public:
- using WrapperRef = typename FigTraits<Wrapped>::Ref;
+ using WrapperRef = typename CoreMediaTraits<Wrapped>::Ref;
void ref() { CFRetain(m_leakedWrapper); }
void deref() { CFRelease(m_leakedWrapper); }
@@ -58,7 +58,7 @@
virtual ~CoreMediaWrapped() { m_leakedWrapper = nullptr; }
protected:
- using WrapperClass = typename FigTraits<Wrapped>::Class;
+ using WrapperClass = typename CoreMediaTraits<Wrapped>::Class;
static Wrapped* unwrap(WrapperRef);
@@ -87,7 +87,7 @@
virtual OSStatus copyProperty(CFStringRef, CFAllocatorRef, void* copiedValue) = 0;
private:
- using WrapperVTable = typename FigTraits<Wrapped>::VTable;
+ using WrapperVTable = typename CoreMediaTraits<Wrapped>::VTable;
template<size_t> static constexpr CMBaseClass wrapperClass();
static const WrapperVTable& vTable();
Modified: trunk/Source/WebKit/Shared/mac/MediaFormatReader/SampleCursor.h (270759 => 270760)
--- trunk/Source/WebKit/Shared/mac/MediaFormatReader/SampleCursor.h 2020-12-14 04:31:27 UTC (rev 270759)
+++ trunk/Source/WebKit/Shared/mac/MediaFormatReader/SampleCursor.h 2020-12-14 04:39:21 UTC (rev 270760)
@@ -34,10 +34,6 @@
DECLARE_CORE_MEDIA_TRAITS(SampleCursor);
-#if defined(HAVE_MT_PLUGIN_SAMPLE_CURSOR_PLAYABLE_HORIZON)
-#undef HAVE_MT_PLUGIN_SAMPLE_CURSOR_PLAYABLE_HORIZON
-#endif
-
namespace WebCore {
class MediaSample;
};
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
