Changeset 261460 in webkit


Ignore:
Timestamp:
May 10, 2020 2:35:30 PM (4 years ago)
Author:
Darin Adler
Message:

Remove now-unneeded HAVE(CORE_VIDEO)
​https://bugs.webkit.org/show_bug.cgi?id=211677

Reviewed by Dan Bernstein.

Source/WebCore:

  • 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.

Source/WTF:

  • wtf/PlatformHave.h: Remove HAVE_CORE_VIDEO.
Location:
trunk/Source
Files:
14 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WTF/ChangeLog

    r261448 r261460  
     12020-05-10  Darin Adler  <darin@apple.com>
     2
     3        Remove now-unneeded HAVE(CORE_VIDEO)
     4        https://bugs.webkit.org/show_bug.cgi?id=211677
     5
     6        Reviewed by Dan Bernstein.
     7
     8        * wtf/PlatformHave.h: Remove HAVE_CORE_VIDEO.
     9
    1102020-05-09  Darin Adler  <darin@apple.com>
    211

  • trunk/Source/WTF/wtf/PlatformHave.h

    r261436 r261460  
    271271
    272272#if PLATFORM(COCOA)
    273 #define HAVE_CORE_VIDEO 1
    274 #endif
    275 
    276 #if PLATFORM(COCOA)
    277273#define HAVE_MEDIA_ACCESSIBILITY_FRAMEWORK 1
    278274#endif

  • trunk/Source/WebCore/ChangeLog

    r261459 r261460  
     12020-05-10  Darin Adler  <darin@apple.com>
     2
     3        Remove now-unneeded HAVE(CORE_VIDEO)
     4        https://bugs.webkit.org/show_bug.cgi?id=211677
     5
     6        Reviewed by Dan Bernstein.
     7
     8        * page/cocoa/MemoryReleaseCocoa.mm:
     9        * platform/cocoa/CoreVideoSoftLink.cpp: Remove HAVE(CORE_VIDEO).
     10        * platform/cocoa/CoreVideoSoftLink.h: Ditto.
     11        * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h: Ditto.
     12        * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
     13        (WebCore::MediaPlayerPrivateAVFoundationObjC::updateLastImage): Ditto.
     14        * platform/graphics/avfoundation/objc/MediaSampleAVFObjC.mm:
     15        (WebCore::MediaSampleAVFObjC::getRGBAImageData const): Ditto.
     16        * platform/graphics/cv/PixelBufferConformerCV.cpp: Ditto.
     17        * platform/graphics/cv/PixelBufferConformerCV.h: Ditto.
     18        * platform/graphics/cv/TextureCacheCV.h: Ditto.
     19        * platform/graphics/cv/TextureCacheCV.mm: Ditto.
     20        * platform/graphics/cv/VideoTextureCopierCV.cpp: Ditto.
     21        * platform/graphics/cv/VideoTextureCopierCV.h: Ditto.
     22
    1232020-05-09  Darin Adler  <darin@apple.com>
    224

  • trunk/Source/WebCore/platform/cocoa/CoreVideoSoftLink.cpp

    r252245 r261460  
    2525
    2626#include "config.h"
    27 
    28 #if HAVE(CORE_VIDEO)
    2927
    3028#include <CoreVideo/CoreVideo.h>
    … …  
    9492SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, CoreVideo, CVPixelBufferCreateWithIOSurface, CVReturn, (CFAllocatorRef allocator, IOSurfaceRef surface, CFDictionaryRef pixelBufferAttributes, CVPixelBufferRef * pixelBufferOut), (allocator, surface, pixelBufferAttributes, pixelBufferOut))
    9593
    96 #endif // HAVE(CORE_VIDEO)

  • trunk/Source/WebCore/platform/cocoa/CoreVideoSoftLink.h

    r252245 r261460  
    2525
    2626#pragma once
    27 
    28 #if HAVE(CORE_VIDEO)
    2927
    3028#include <CoreVideo/CoreVideo.h>
    … …  
    148146SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, CoreVideo, CVPixelBufferCreateWithIOSurface, CVReturn, (CFAllocatorRef allocator, IOSurfaceRef surface, CFDictionaryRef pixelBufferAttributes, CVPixelBufferRef * pixelBufferOut), (allocator, surface, pixelBufferAttributes, pixelBufferOut))
    149147#define CVPixelBufferCreateWithIOSurface softLink_CoreVideo_CVPixelBufferCreateWithIOSurface
    150 
    151 #endif // HAVE(CORE_VIDEO)

  • trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h

    r261424 r261460  
    345345    std::unique_ptr<ImageRotationSessionVT> m_imageRotationSession;
    346346    std::unique_ptr<VideoTextureCopierCV> m_videoTextureCopier;
    347 
    348 #if HAVE(CORE_VIDEO)
    349347    std::unique_ptr<PixelBufferConformerCV> m_pixelBufferConformer;
    350 #endif
    351348
    352349    friend class WebCoreAVFResourceLoader;

  • trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm

    r261424 r261460  
    21962196void MediaPlayerPrivateAVFoundationObjC::updateLastImage(UpdateType type)
    21972197{
    2198 #if HAVE(CORE_VIDEO)
    21992198    if (!m_avPlayerItem)
    22002199        return;
    … …  
    22192218
    22202219    INFO_LOG(LOGIDENTIFIER, "creating buffer took ", (MonotonicTime::now() - start).seconds());
    2221 #endif // HAVE(CORE_VIDEO)
    22222220}
    22232221

  • trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaSampleAVFObjC.mm

    r258846 r261460  
    290290RefPtr<JSC::Uint8ClampedArray> MediaSampleAVFObjC::getRGBAImageData() const
    291291{
    292 #if HAVE(CORE_VIDEO)
    293292    const OSType imageFormat = kCVPixelFormatType_32RGBA;
    294293    RetainPtr<CFNumberRef> imageFormatNumber = adoptCF(CFNumberCreate(nullptr,  kCFNumberIntType,  &imageFormat));
    … …  
    311310
    312311    return result;
    313 #else
    314     return nullptr;
    315 #endif
    316312}
    317313

  • trunk/Source/WebCore/platform/graphics/cv/PixelBufferConformerCV.cpp

    r261170 r261460  
    2626#include "config.h"
    2727#include "PixelBufferConformerCV.h"
    28 
    29 #if HAVE(CORE_VIDEO)
    3028
    3129#include "GraphicsContextCG.h"
    … …  
    179177
    180178}
    181 
    182 #endif // HAVE(CORE_VIDEO)

  • trunk/Source/WebCore/platform/graphics/cv/PixelBufferConformerCV.h

    r261170 r261460  
    2626#pragma once
    2727
    28 #if HAVE(CORE_VIDEO)
    29 
    3028#include <wtf/RetainPtr.h>
    3129
    … …  
    4846
    4947}
    50 
    51 #endif // HAVE(CORE_VIDEO)

  • trunk/Source/WebCore/platform/graphics/cv/TextureCacheCV.h

    r254214 r261460  
    2525
    2626#pragma once
    27 
    28 #if HAVE(CORE_VIDEO)
    2927
    3028#include "GraphicsTypesGL.h"
    … …  
    6866
    6967}
    70 
    71 #endif // HAVE(CORE_VIDEO)

  • trunk/Source/WebCore/platform/graphics/cv/TextureCacheCV.mm

    r260366 r261460  
    2626#import "config.h"
    2727#import "TextureCacheCV.h"
    28 
    29 #if HAVE(CORE_VIDEO)
    3028
    3129#import "GraphicsContextGLOpenGL.h"
    … …  
    109107
    110108}
    111 
    112 #endif // HAVE(CORE_VIDEO)

  • trunk/Source/WebCore/platform/graphics/cv/VideoTextureCopierCV.cpp

    r261133 r261460  
    2626#include "config.h"
    2727#include "VideoTextureCopierCV.h"
    28 
    29 #if HAVE(CORE_VIDEO)
    3028
    3129#include "FourCC.h"
    … …  
    10671065
    10681066}
    1069 
    1070 #endif // HAVE(CORE_VIDEO)

  • trunk/Source/WebCore/platform/graphics/cv/VideoTextureCopierCV.h

    r261133 r261460  
    2525
    2626#pragma once
    27 
    28 #if HAVE(CORE_VIDEO)
    2927
    3028#import "GraphicsContextGLOpenGL.h"
    … …  
    108106
    109107}
    110 
    111 #endif // HAVE(CORE_VIDEO)
Note: See TracChangeset for help on using the changeset viewer.