Diff
Modified: trunk/Source/WTF/ChangeLog (261459 => 261460)
--- trunk/Source/WTF/ChangeLog 2020-05-10 21:21:59 UTC (rev 261459)
+++ trunk/Source/WTF/ChangeLog 2020-05-10 21:35:30 UTC (rev 261460)
@@ -1,3 +1,12 @@
+2020-05-10 Darin Adler <[email protected]>
+
+ Remove now-unneeded HAVE(CORE_VIDEO)
+ https://bugs.webkit.org/show_bug.cgi?id=211677
+
+ Reviewed by Dan Bernstein.
+
+ * wtf/PlatformHave.h: Remove HAVE_CORE_VIDEO.
+
2020-05-09 Darin Adler <[email protected]>
Delete some dead code in WorkQueueCocoa.cpp
Modified: trunk/Source/WTF/wtf/PlatformHave.h (261459 => 261460)
--- trunk/Source/WTF/wtf/PlatformHave.h 2020-05-10 21:21:59 UTC (rev 261459)
+++ trunk/Source/WTF/wtf/PlatformHave.h 2020-05-10 21:35:30 UTC (rev 261460)
@@ -270,10 +270,6 @@
#endif
#if PLATFORM(COCOA)
-#define HAVE_CORE_VIDEO 1
-#endif
-
-#if PLATFORM(COCOA)
#define HAVE_MEDIA_ACCESSIBILITY_FRAMEWORK 1
#endif
Modified: trunk/Source/WebCore/ChangeLog (261459 => 261460)
--- trunk/Source/WebCore/ChangeLog 2020-05-10 21:21:59 UTC (rev 261459)
+++ trunk/Source/WebCore/ChangeLog 2020-05-10 21:35:30 UTC (rev 261460)
@@ -1,3 +1,25 @@
+2020-05-10 Darin Adler <[email protected]>
+
+ Remove now-unneeded HAVE(CORE_VIDEO)
+ https://bugs.webkit.org/show_bug.cgi?id=211677
+
+ Reviewed by Dan Bernstein.
+
+ * page/cocoa/MemoryReleaseCocoa.mm:
+ * platform/cocoa/CoreVideoSoftLink.cpp: Remove HAVE(CORE_VIDEO).
+ * platform/cocoa/CoreVideoSoftLink.h: Ditto.
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h: Ditto.
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::updateLastImage): Ditto.
+ * platform/graphics/avfoundation/objc/MediaSampleAVFObjC.mm:
+ (WebCore::MediaSampleAVFObjC::getRGBAImageData const): Ditto.
+ * platform/graphics/cv/PixelBufferConformerCV.cpp: Ditto.
+ * platform/graphics/cv/PixelBufferConformerCV.h: Ditto.
+ * platform/graphics/cv/TextureCacheCV.h: Ditto.
+ * platform/graphics/cv/TextureCacheCV.mm: Ditto.
+ * platform/graphics/cv/VideoTextureCopierCV.cpp: Ditto.
+ * platform/graphics/cv/VideoTextureCopierCV.h: Ditto.
+
2020-05-09 Darin Adler <[email protected]>
Tighten up logic in DocumentTimelinesController::updateAnimationsAndSendEvents
Modified: trunk/Source/WebCore/platform/cocoa/CoreVideoSoftLink.cpp (261459 => 261460)
--- trunk/Source/WebCore/platform/cocoa/CoreVideoSoftLink.cpp 2020-05-10 21:21:59 UTC (rev 261459)
+++ trunk/Source/WebCore/platform/cocoa/CoreVideoSoftLink.cpp 2020-05-10 21:35:30 UTC (rev 261460)
@@ -25,8 +25,6 @@
#include "config.h"
-#if HAVE(CORE_VIDEO)
-
#include <CoreVideo/CoreVideo.h>
#include <wtf/SoftLinking.h>
@@ -93,4 +91,3 @@
SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, CoreVideo, CVPixelBufferCreateWithBytes, CVReturn, (CFAllocatorRef allocator, size_t width, size_t height, OSType pixelFormatType, void* data, size_t bytesPerRow, void (*releaseCallback)(void*, const void*), void* releasePointer, CFDictionaryRef pixelBufferAttributes, CVPixelBufferRef *pixelBufferOut), (allocator, width, height, pixelFormatType, data, bytesPerRow, releaseCallback, releasePointer, pixelBufferAttributes, pixelBufferOut))
SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, CoreVideo, CVPixelBufferCreateWithIOSurface, CVReturn, (CFAllocatorRef allocator, IOSurfaceRef surface, CFDictionaryRef pixelBufferAttributes, CVPixelBufferRef * pixelBufferOut), (allocator, surface, pixelBufferAttributes, pixelBufferOut))
-#endif // HAVE(CORE_VIDEO)
Modified: trunk/Source/WebCore/platform/cocoa/CoreVideoSoftLink.h (261459 => 261460)
--- trunk/Source/WebCore/platform/cocoa/CoreVideoSoftLink.h 2020-05-10 21:21:59 UTC (rev 261459)
+++ trunk/Source/WebCore/platform/cocoa/CoreVideoSoftLink.h 2020-05-10 21:35:30 UTC (rev 261460)
@@ -25,8 +25,6 @@
#pragma once
-#if HAVE(CORE_VIDEO)
-
#include <CoreVideo/CoreVideo.h>
#include <wtf/SoftLinking.h>
@@ -147,5 +145,3 @@
#define CVPixelBufferCreateWithBytes softLink_CoreVideo_CVPixelBufferCreateWithBytes
SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, CoreVideo, CVPixelBufferCreateWithIOSurface, CVReturn, (CFAllocatorRef allocator, IOSurfaceRef surface, CFDictionaryRef pixelBufferAttributes, CVPixelBufferRef * pixelBufferOut), (allocator, surface, pixelBufferAttributes, pixelBufferOut))
#define CVPixelBufferCreateWithIOSurface softLink_CoreVideo_CVPixelBufferCreateWithIOSurface
-
-#endif // HAVE(CORE_VIDEO)
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h (261459 => 261460)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h 2020-05-10 21:21:59 UTC (rev 261459)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h 2020-05-10 21:35:30 UTC (rev 261460)
@@ -344,10 +344,7 @@
RetainPtr<CGImageRef> m_lastImage;
std::unique_ptr<ImageRotationSessionVT> m_imageRotationSession;
std::unique_ptr<VideoTextureCopierCV> m_videoTextureCopier;
-
-#if HAVE(CORE_VIDEO)
std::unique_ptr<PixelBufferConformerCV> m_pixelBufferConformer;
-#endif
friend class WebCoreAVFResourceLoader;
HashMap<RetainPtr<CFTypeRef>, RefPtr<WebCoreAVFResourceLoader>> m_resourceLoaderMap;
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (261459 => 261460)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2020-05-10 21:21:59 UTC (rev 261459)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2020-05-10 21:35:30 UTC (rev 261460)
@@ -2195,7 +2195,6 @@
void MediaPlayerPrivateAVFoundationObjC::updateLastImage(UpdateType type)
{
-#if HAVE(CORE_VIDEO)
if (!m_avPlayerItem)
return;
@@ -2218,7 +2217,6 @@
m_lastImage = m_pixelBufferConformer->createImageFromPixelBuffer(m_lastPixelBuffer.get());
INFO_LOG(LOGIDENTIFIER, "creating buffer took ", (MonotonicTime::now() - start).seconds());
-#endif // HAVE(CORE_VIDEO)
}
void MediaPlayerPrivateAVFoundationObjC::paintWithVideoOutput(GraphicsContext& context, const FloatRect& outputRect)
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaSampleAVFObjC.mm (261459 => 261460)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaSampleAVFObjC.mm 2020-05-10 21:21:59 UTC (rev 261459)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaSampleAVFObjC.mm 2020-05-10 21:35:30 UTC (rev 261460)
@@ -289,7 +289,6 @@
RefPtr<JSC::Uint8ClampedArray> MediaSampleAVFObjC::getRGBAImageData() const
{
-#if HAVE(CORE_VIDEO)
const OSType imageFormat = kCVPixelFormatType_32RGBA;
RetainPtr<CFNumberRef> imageFormatNumber = adoptCF(CFNumberCreate(nullptr, kCFNumberIntType, &imageFormat));
@@ -310,9 +309,6 @@
ASSERT(status == noErr);
return result;
-#else
- return nullptr;
-#endif
}
void MediaSampleAVFObjC::setAsDisplayImmediately(MediaSample& sample)
Modified: trunk/Source/WebCore/platform/graphics/cv/PixelBufferConformerCV.cpp (261459 => 261460)
--- trunk/Source/WebCore/platform/graphics/cv/PixelBufferConformerCV.cpp 2020-05-10 21:21:59 UTC (rev 261459)
+++ trunk/Source/WebCore/platform/graphics/cv/PixelBufferConformerCV.cpp 2020-05-10 21:35:30 UTC (rev 261460)
@@ -26,8 +26,6 @@
#include "config.h"
#include "PixelBufferConformerCV.h"
-#if HAVE(CORE_VIDEO)
-
#include "GraphicsContextCG.h"
#include "ImageBufferUtilitiesCG.h"
#include "Logging.h"
@@ -178,5 +176,3 @@
}
}
-
-#endif // HAVE(CORE_VIDEO)
Modified: trunk/Source/WebCore/platform/graphics/cv/PixelBufferConformerCV.h (261459 => 261460)
--- trunk/Source/WebCore/platform/graphics/cv/PixelBufferConformerCV.h 2020-05-10 21:21:59 UTC (rev 261459)
+++ trunk/Source/WebCore/platform/graphics/cv/PixelBufferConformerCV.h 2020-05-10 21:35:30 UTC (rev 261460)
@@ -25,8 +25,6 @@
#pragma once
-#if HAVE(CORE_VIDEO)
-
#include <wtf/RetainPtr.h>
typedef struct OpaqueVTPixelBufferConformer* VTPixelBufferConformerRef;
@@ -47,5 +45,3 @@
};
}
-
-#endif // HAVE(CORE_VIDEO)
Modified: trunk/Source/WebCore/platform/graphics/cv/TextureCacheCV.h (261459 => 261460)
--- trunk/Source/WebCore/platform/graphics/cv/TextureCacheCV.h 2020-05-10 21:21:59 UTC (rev 261459)
+++ trunk/Source/WebCore/platform/graphics/cv/TextureCacheCV.h 2020-05-10 21:35:30 UTC (rev 261460)
@@ -25,8 +25,6 @@
#pragma once
-#if HAVE(CORE_VIDEO)
-
#include "GraphicsTypesGL.h"
#include <wtf/Ref.h>
#include <wtf/RetainPtr.h>
@@ -67,5 +65,3 @@
};
}
-
-#endif // HAVE(CORE_VIDEO)
Modified: trunk/Source/WebCore/platform/graphics/cv/TextureCacheCV.mm (261459 => 261460)
--- trunk/Source/WebCore/platform/graphics/cv/TextureCacheCV.mm 2020-05-10 21:21:59 UTC (rev 261459)
+++ trunk/Source/WebCore/platform/graphics/cv/TextureCacheCV.mm 2020-05-10 21:35:30 UTC (rev 261460)
@@ -26,8 +26,6 @@
#import "config.h"
#import "TextureCacheCV.h"
-#if HAVE(CORE_VIDEO)
-
#import "GraphicsContextGLOpenGL.h"
#import "CoreVideoSoftLink.h"
@@ -108,5 +106,3 @@
}
}
-
-#endif // HAVE(CORE_VIDEO)
Modified: trunk/Source/WebCore/platform/graphics/cv/VideoTextureCopierCV.cpp (261459 => 261460)
--- trunk/Source/WebCore/platform/graphics/cv/VideoTextureCopierCV.cpp 2020-05-10 21:21:59 UTC (rev 261459)
+++ trunk/Source/WebCore/platform/graphics/cv/VideoTextureCopierCV.cpp 2020-05-10 21:35:30 UTC (rev 261460)
@@ -26,8 +26,6 @@
#include "config.h"
#include "VideoTextureCopierCV.h"
-#if HAVE(CORE_VIDEO)
-
#include "FourCC.h"
#include "Logging.h"
#include "TextureCacheCV.h"
@@ -1066,5 +1064,3 @@
}
}
-
-#endif // HAVE(CORE_VIDEO)
Modified: trunk/Source/WebCore/platform/graphics/cv/VideoTextureCopierCV.h (261459 => 261460)
--- trunk/Source/WebCore/platform/graphics/cv/VideoTextureCopierCV.h 2020-05-10 21:21:59 UTC (rev 261459)
+++ trunk/Source/WebCore/platform/graphics/cv/VideoTextureCopierCV.h 2020-05-10 21:35:30 UTC (rev 261460)
@@ -25,8 +25,6 @@
#pragma once
-#if HAVE(CORE_VIDEO)
-
#import "GraphicsContextGLOpenGL.h"
#import <wtf/UnsafePointer.h>
@@ -107,5 +105,3 @@
};
}
-
-#endif // HAVE(CORE_VIDEO)
