Diff
Modified: trunk/Source/WebCore/ChangeLog (212926 => 212927)
--- trunk/Source/WebCore/ChangeLog 2017-02-23 22:51:03 UTC (rev 212926)
+++ trunk/Source/WebCore/ChangeLog 2017-02-23 22:52:55 UTC (rev 212927)
@@ -1,3 +1,18 @@
+2017-02-23 Alex Christensen <achristen...@webkit.org>
+
+ Re-soft-link CoreVideo after r212906
+ https://bugs.webkit.org/show_bug.cgi?id=168803
+
+ Reviewed by Jer Noble.
+
+ CoreVideo should be soft linked to reduce startup time.
+ Linking against the framework just for a few symbols used in one file was the wrong solution.
+
+ * Configurations/WebCore.xcconfig:
+ * platform/cocoa/CoreVideoSoftLink.cpp:
+ * platform/cocoa/CoreVideoSoftLink.h:
+ * platform/mediastream/mac/RealtimeOutgoingVideoSource.cpp:
+
2017-02-23 Chris Dumez <cdu...@apple.com>
Report domains using abnormally high CPU usage via enhanced privacy logging
Modified: trunk/Source/WebCore/Configurations/WebCore.xcconfig (212926 => 212927)
--- trunk/Source/WebCore/Configurations/WebCore.xcconfig 2017-02-23 22:51:03 UTC (rev 212926)
+++ trunk/Source/WebCore/Configurations/WebCore.xcconfig 2017-02-23 22:52:55 UTC (rev 212927)
@@ -68,7 +68,7 @@
LIBWEBRTC_LDFLAGS = $(LIBWEBRTC_LDFLAGS_$(ENABLE_WEB_RTC));
LIBWEBRTC_LDFLAGS_ = ;
-LIBWEBRTC_LDFLAGS_ENABLE_WEB_RTC = -framework VideoToolbox -framework CoreMedia -framework CoreVideo -weak-lwebrtc;
+LIBWEBRTC_LDFLAGS_ENABLE_WEB_RTC = -framework VideoToolbox -framework CoreMedia -weak-lwebrtc;
OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_PLATFORM)
OTHER_LDFLAGS_BASE = -lsqlite3 -lobjc -lANGLE;
Modified: trunk/Source/WebCore/platform/cocoa/CoreVideoSoftLink.cpp (212926 => 212927)
--- trunk/Source/WebCore/platform/cocoa/CoreVideoSoftLink.cpp 2017-02-23 22:51:03 UTC (rev 212926)
+++ trunk/Source/WebCore/platform/cocoa/CoreVideoSoftLink.cpp 2017-02-23 22:52:55 UTC (rev 212927)
@@ -36,6 +36,7 @@
SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, CoreVideo, CVPixelBufferGetBytesPerRow, size_t, (CVPixelBufferRef pixelBuffer), (pixelBuffer))
SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, CoreVideo, CVPixelBufferGetDataSize, size_t, (CVPixelBufferRef pixelBuffer), (pixelBuffer))
SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, CoreVideo, CVPixelBufferGetPixelFormatType, OSType, (CVPixelBufferRef pixelBuffer), (pixelBuffer))
+SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, CoreVideo, CVPixelBufferGetBaseAddressOfPlane, void *, (CVPixelBufferRef pixelBuffer, size_t planeIndex), (pixelBuffer, planeIndex));
SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, CoreVideo, CVPixelBufferLockBaseAddress, CVReturn, (CVPixelBufferRef pixelBuffer, CVOptionFlags lockFlags), (pixelBuffer, lockFlags))
SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, CoreVideo, CVPixelBufferUnlockBaseAddress, CVReturn, (CVPixelBufferRef pixelBuffer, CVOptionFlags lockFlags), (pixelBuffer, lockFlags))
SOFT_LINK_CONSTANT_FOR_SOURCE(WebCore, CoreVideo, kCVPixelBufferPixelFormatTypeKey, CFStringRef)
Modified: trunk/Source/WebCore/platform/cocoa/CoreVideoSoftLink.h (212926 => 212927)
--- trunk/Source/WebCore/platform/cocoa/CoreVideoSoftLink.h 2017-02-23 22:51:03 UTC (rev 212926)
+++ trunk/Source/WebCore/platform/cocoa/CoreVideoSoftLink.h 2017-02-23 22:52:55 UTC (rev 212927)
@@ -43,6 +43,8 @@
#define CVPixelBufferGetDataSize softLink_CoreVideo_CVPixelBufferGetDataSize
SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, CoreVideo, CVPixelBufferGetPixelFormatType, OSType, (CVPixelBufferRef pixelBuffer), (pixelBuffer))
#define CVPixelBufferGetPixelFormatType softLink_CoreVideo_CVPixelBufferGetPixelFormatType
+SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, CoreVideo, CVPixelBufferGetBaseAddressOfPlane, void *, (CVPixelBufferRef pixelBuffer, size_t planeIndex), (pixelBuffer, planeIndex));
+#define CVPixelBufferGetBaseAddressOfPlane softLink_CoreVideo_CVPixelBufferGetBaseAddressOfPlane
SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, CoreVideo, CVPixelBufferLockBaseAddress, CVReturn, (CVPixelBufferRef pixelBuffer, CVOptionFlags lockFlags), (pixelBuffer, lockFlags))
#define CVPixelBufferLockBaseAddress softLink_CoreVideo_CVPixelBufferLockBaseAddress
SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, CoreVideo, CVPixelBufferUnlockBaseAddress, CVReturn, (CVPixelBufferRef pixelBuffer, CVOptionFlags lockFlags), (pixelBuffer, lockFlags))
Modified: trunk/Source/WebCore/platform/mediastream/mac/RealtimeOutgoingVideoSource.cpp (212926 => 212927)
--- trunk/Source/WebCore/platform/mediastream/mac/RealtimeOutgoingVideoSource.cpp 2017-02-23 22:51:03 UTC (rev 212926)
+++ trunk/Source/WebCore/platform/mediastream/mac/RealtimeOutgoingVideoSource.cpp 2017-02-23 22:52:55 UTC (rev 212927)
@@ -35,6 +35,7 @@
#include <webrtc/media/base/videoframe.h>
#include "CoreMediaSoftLink.h"
+#include "CoreVideoSoftLink.h"
namespace WebCore {
