Unified build fixes in media code

youennf · youennf · commit f99f047fa91c · 2020-09-18T15:13:34.000Z
https://bugs.webkit.org/show_bug.cgi?id=216691 Reviewed by Sam Weinig. Add missing includes and/or missing undef. No change of behavior. * GPUProcess/webrtc/RemoteAudioMediaStreamTrackRenderer.cpp: * GPUProcess/webrtc/RemoteMediaRecorder.cpp: * WebProcess/WebPage/WebPageOverlay.h: * WebProcess/cocoa/RemoteRealtimeMediaSource.cpp: * WebProcess/cocoa/RemoteRealtimeMediaSource.h: Canonical link: https://commits.webkit.org/229500@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@267237 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
@@ -1,3 +1,19 @@
+2020-09-18  Youenn Fablet  <youenn@apple.com>
+
+        Unified build fixes in media code
+        https://bugs.webkit.org/show_bug.cgi?id=216691
+
+        Reviewed by Sam Weinig.
+
+        Add missing includes and/or missing undef.
+        No change of behavior.
+
+        * GPUProcess/webrtc/RemoteAudioMediaStreamTrackRenderer.cpp:
+        * GPUProcess/webrtc/RemoteMediaRecorder.cpp:
+        * WebProcess/WebPage/WebPageOverlay.h:
+        * WebProcess/cocoa/RemoteRealtimeMediaSource.cpp:
+        * WebProcess/cocoa/RemoteRealtimeMediaSource.h:
+
 2020-09-18  Noam Rosenthal  <noam@webkit.org>
 
         Enable paint timing by default
diff --git a/Source/WebKit/GPUProcess/webrtc/RemoteAudioMediaStreamTrackRenderer.cpp b/Source/WebKit/GPUProcess/webrtc/RemoteAudioMediaStreamTrackRenderer.cpp
@@ -136,4 +136,6 @@ void RemoteAudioMediaStreamTrackRenderer::audioSamplesAvailable(MediaTime time,
 
 }
 
+#undef MESSAGE_CHECK
+
 #endif // PLATFORM(COCOA) && ENABLE(GPU_PROCESS) && ENABLE(MEDIA_STREAM)
diff --git a/Source/WebKit/GPUProcess/webrtc/RemoteMediaRecorder.cpp b/Source/WebKit/GPUProcess/webrtc/RemoteMediaRecorder.cpp
@@ -137,4 +137,6 @@ void RemoteMediaRecorder::stopRecording()
 
 }
 
+#undef MESSAGE_CHECK
+
 #endif // PLATFORM(COCOA) && ENABLE(GPU_PROCESS) && ENABLE(MEDIA_STREAM) && HAVE(AVASSETWRITERDELEGATE)
diff --git a/Source/WebKit/WebProcess/WebPage/WebPageOverlay.h b/Source/WebKit/WebProcess/WebPage/WebPageOverlay.h
@@ -28,6 +28,7 @@
 #include "APIObject.h"
 #include <WebCore/FloatPoint.h>
 #include <WebCore/PageOverlay.h>
+#include <WebCore/SimpleRange.h>
 #include <wtf/RetainPtr.h>
 
 OBJC_CLASS DDActionContext;
diff --git a/Source/WebKit/WebProcess/cocoa/RemoteRealtimeMediaSource.cpp b/Source/WebKit/WebProcess/cocoa/RemoteRealtimeMediaSource.cpp
@@ -33,9 +33,11 @@
 #include "UserMediaCaptureManager.h"
 #include "UserMediaCaptureManagerMessages.h"
 #include "UserMediaCaptureManagerProxyMessages.h"
+#include "WebCoreArgumentCoders.h"
 #include "WebProcess.h"
 #include <WebCore/ImageTransferSessionVT.h>
 #include <WebCore/MediaConstraints.h>
+#include <WebCore/RealtimeMediaSource.h>
 #include <WebCore/RealtimeMediaSourceCenter.h>
 #include <WebCore/RemoteVideoSample.h>
 #include <WebCore/WebAudioBufferList.h>
diff --git a/Source/WebKit/WebProcess/cocoa/RemoteRealtimeMediaSource.h b/Source/WebKit/WebProcess/cocoa/RemoteRealtimeMediaSource.h
@@ -30,6 +30,11 @@
 #include <WebCore/CaptureDevice.h>
 #include <WebCore/RealtimeMediaSource.h>
 #include <WebCore/RealtimeMediaSourceIdentifier.h>
+#include <wtf/Deque.h>
+
+namespace IPC {
+class Connection;
+}
 
 namespace WebCore {
 class CAAudioStreamDescription;

Original file line number	Diff line number	Diff line change
`@@ -136,4 +136,6 @@ void RemoteAudioMediaStreamTrackRenderer::audioSamplesAvailable(MediaTime time,`
`136`	`136`
`137`	`137`	`}`
`138`	`138`
	`139`	`+#undef MESSAGE_CHECK`
	`140`	`+`
`139`	`141`	`#endif // PLATFORM(COCOA) && ENABLE(GPU_PROCESS) && ENABLE(MEDIA_STREAM)`
Original file line number	Diff line number	Diff line change
`@@ -137,4 +137,6 @@ void RemoteMediaRecorder::stopRecording()`
`137`	`137`
`138`	`138`	`}`
`139`	`139`
	`140`	`+#undef MESSAGE_CHECK`
	`141`	`+`
`140`	`142`	`#endif // PLATFORM(COCOA) && ENABLE(GPU_PROCESS) && ENABLE(MEDIA_STREAM) && HAVE(AVASSETWRITERDELEGATE)`