Diff
Modified: trunk/Source/WebKit/ChangeLog (293768 => 293769)
--- trunk/Source/WebKit/ChangeLog 2022-05-04 09:30:16 UTC (rev 293768)
+++ trunk/Source/WebKit/ChangeLog 2022-05-04 10:12:32 UTC (rev 293769)
@@ -1,3 +1,20 @@
+2022-05-04 Youenn Fablet <you...@apple.com>
+
+ LibWebRTCCodecs does no longer need a pixel conformer
+ https://bugs.webkit.org/show_bug.cgi?id=240004
+
+ Reviewed by Eric Carlson.
+
+ Removing no longer used code.
+ No change of behavior.
+ Unified build fix.
+
+ * SourcesCocoa.txt:
+ * WebKit.xcodeproj/project.pbxproj:
+ * WebProcess/GPU/webrtc/LibWebRTCCodecs.h:
+ * WebProcess/GPU/webrtc/LibWebRTCCodecs.mm: Removed.
+ * WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInNodeHandle.mm:
+
2022-05-04 Megan Gardner <megan_gard...@apple.com>
Enable TextCheckingType::Correction on MacCatalyst.
Modified: trunk/Source/WebKit/SourcesCocoa.txt (293768 => 293769)
--- trunk/Source/WebKit/SourcesCocoa.txt 2022-05-04 09:30:16 UTC (rev 293768)
+++ trunk/Source/WebKit/SourcesCocoa.txt 2022-05-04 10:12:32 UTC (rev 293769)
@@ -639,7 +639,6 @@
WebProcess/GPU/media/cocoa/VideoLayerRemoteCocoa.mm
WebProcess/GPU/media/ios/RemoteMediaSessionHelper.cpp
WebProcess/GPU/webrtc/AudioMediaStreamTrackRendererInternalUnitManager.cpp
-WebProcess/GPU/webrtc/LibWebRTCCodecs.mm
WebProcess/InjectedBundle/API/c/WKBundlePageBanner.cpp
Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (293768 => 293769)
--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2022-05-04 09:30:16 UTC (rev 293768)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2022-05-04 10:12:32 UTC (rev 293769)
@@ -4476,7 +4476,6 @@
4135FBCF1F4FB7F20074C47B /* CacheStorageEngineCaches.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CacheStorageEngineCaches.cpp; sourceTree = "<group>"; };
4135FBD01F4FB7F20074C47B /* CacheStorageEngineCaches.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CacheStorageEngineCaches.h; sourceTree = "<group>"; };
413C542227C90F4C002FCDA8 /* RemoteVideoFrameObjectHeap.messages.in */ = {isa = PBXFileReference; lastKnownFileType = text; path = RemoteVideoFrameObjectHeap.messages.in; sourceTree = "<group>"; };
- 413C8B1325516BFA00E65055 /* LibWebRTCCodecs.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = LibWebRTCCodecs.mm; sourceTree = "<group>"; };
4150A5A023E06C910051264A /* GPUProcessSessionParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPUProcessSessionParameters.h; sourceTree = "<group>"; };
41518535222704F5005430C6 /* ServiceWorkerFetchTask.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ServiceWorkerFetchTask.h; sourceTree = "<group>"; };
41518536222704F6005430C6 /* ServiceWorkerFetchTask.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ServiceWorkerFetchTask.cpp; sourceTree = "<group>"; };
@@ -10012,7 +10011,6 @@
4172198A23B6128200AE5686 /* LibWebRTCCodecs.cpp */,
4172198923B6128200AE5686 /* LibWebRTCCodecs.h */,
4172198D23B62C7C00AE5686 /* LibWebRTCCodecs.messages.in */,
- 413C8B1325516BFA00E65055 /* LibWebRTCCodecs.mm */,
4176E89723C361BD003E83FE /* MediaRecorderIdentifier.h */,
4176E89423C34E26003E83FE /* MediaRecorderPrivate.cpp */,
4176E89523C34E27003E83FE /* MediaRecorderPrivate.h */,
Modified: trunk/Source/WebKit/WebProcess/GPU/webrtc/LibWebRTCCodecs.h (293768 => 293769)
--- trunk/Source/WebKit/WebProcess/GPU/webrtc/LibWebRTCCodecs.h 2022-05-04 09:30:16 UTC (rev 293768)
+++ trunk/Source/WebKit/WebProcess/GPU/webrtc/LibWebRTCCodecs.h 2022-05-04 10:12:32 UTC (rev 293769)
@@ -37,7 +37,6 @@
#include "RemoteVideoFrameIdentifier.h"
#include "RemoteVideoFrameProxy.h"
#include "SharedVideoFrame.h"
-#include <WebCore/PixelBufferConformerCV.h>
#include <map>
#include <webrtc/api/video/video_codec_type.h>
#include <wtf/HashMap.h>
@@ -160,7 +159,6 @@
Vector<Function<void()>> m_tasksToDispatchAfterEstablishingConnection;
Ref<WorkQueue> m_queue;
- std::unique_ptr<WebCore::PixelBufferConformerCV> m_pixelBufferConformer;
RetainPtr<CVPixelBufferPoolRef> m_pixelBufferPool;
size_t m_pixelBufferPoolWidth { 0 };
size_t m_pixelBufferPoolHeight { 0 };
Deleted: trunk/Source/WebKit/WebProcess/GPU/webrtc/LibWebRTCCodecs.mm (293768 => 293769)
--- trunk/Source/WebKit/WebProcess/GPU/webrtc/LibWebRTCCodecs.mm 2022-05-04 09:30:16 UTC (rev 293768)
+++ trunk/Source/WebKit/WebProcess/GPU/webrtc/LibWebRTCCodecs.mm 2022-05-04 10:12:32 UTC (rev 293769)
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2020 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "LibWebRTCCodecs.h"
-
-#if USE(LIBWEBRTC) && PLATFORM(COCOA) && ENABLE(GPU_PROCESS)
-
-#include <WebCore/CoreVideoSoftLink.h>
-
-namespace WebKit {
-using namespace WebCore;
-
-RetainPtr<CVPixelBufferRef> LibWebRTCCodecs::convertToBGRA(CVPixelBufferRef pixelBuffer)
-{
- if (!m_pixelBufferConformer)
- m_pixelBufferConformer = makeUnique<PixelBufferConformerCV>((__bridge CFDictionaryRef)@{ (__bridge NSString *)kCVPixelBufferPixelFormatTypeKey: @(kCVPixelFormatType_32BGRA) });
- return m_pixelBufferConformer->convert(pixelBuffer);
-}
-
-}
-
-#endif
Modified: trunk/Source/WebKit/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInNodeHandle.mm (293768 => 293769)
--- trunk/Source/WebKit/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInNodeHandle.mm 2022-05-04 09:30:16 UTC (rev 293768)
+++ trunk/Source/WebKit/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInNodeHandle.mm 2022-05-04 10:12:32 UTC (rev 293769)
@@ -32,6 +32,7 @@
#import "WebImage.h"
#import <WebCore/HTMLTextFormControlElement.h>
#import <WebCore/IntRect.h>
+#import <WebCore/NativeImage.h>
#import <WebCore/WebCoreObjCExtras.h>
@implementation WKWebProcessPlugInNodeHandle {
