Modified: trunk/Source/WebCore/CMakeLists.txt (273309 => 273310)
--- trunk/Source/WebCore/CMakeLists.txt 2021-02-23 16:58:16 UTC (rev 273309)
+++ trunk/Source/WebCore/CMakeLists.txt 2021-02-23 17:08:46 UTC (rev 273310)
@@ -1792,21 +1792,6 @@
)
list(APPEND WebCoreTestSupport_SOURCES
- dom/AbstractRange.cpp
-
- inspector/InspectorFrontendClientLocal.cpp
-
- platform/graphics/HEVCUtilities.cpp
- platform/graphics/VP9Utilities.cpp
-
- platform/mediarecorder/MediaRecorderPrivateMock.cpp
-
- platform/mock/PlatformSpeechSynthesizerMock.cpp
- platform/mock/mediasource/MockBox.cpp
- platform/mock/mediasource/MockMediaPlayerMediaSource.cpp
- platform/mock/mediasource/MockMediaSourcePrivate.cpp
- platform/mock/mediasource/MockSourceBufferPrivate.cpp
-
testing/GCObservation.cpp
testing/InternalSettings.cpp
testing/Internals.cpp
@@ -1822,7 +1807,6 @@
testing/js/WebCoreTestSupport.cpp
)
-
if (ENABLE_WEBXR)
list(APPEND WebCoreTestSupport_IDL_FILES
testing/FakeXRBoundsPoint.idl
Modified: trunk/Source/WebCore/ChangeLog (273309 => 273310)
--- trunk/Source/WebCore/ChangeLog 2021-02-23 16:58:16 UTC (rev 273309)
+++ trunk/Source/WebCore/ChangeLog 2021-02-23 17:08:46 UTC (rev 273310)
@@ -1,3 +1,30 @@
+2021-02-23 Don Olmstead <[email protected]>
+
+ Only files in WebCore/testing should be in WebCoreTestSupport
+ https://bugs.webkit.org/show_bug.cgi?id=222297
+
+ Reviewed by Eric Carlson.
+
+ After r272721 the non-unified WinCairo build reported error C2859, filename is not the
+ type file that was used when this precompiled header was created. This was because a
+ handful of files were in the WebCore library as well as the WebCoreTestSupport library.
+
+ Investigating the XCode project it turned out that the files listed in the CMake for
+ WebCoreTestSupport didn't match. The XCode project had all of the mock files within
+ platform in WebCore and WebCoreTestSupport just had files in the testing directory.
+
+ All mock related files were added to the Sources.txt and the erroneous listing of them
+ in WebCoreTestSupport_SOURCES were removed.
+
+ During the investigation it turned out some mocks were being compiled in both WebCore
+ and WebCoreTestSupport within the XCode build. This was rectified and an additional
+ WEBCORE_EXPORT in PlatformSpeechSynthesizerMock was added to support this.
+
+ * CMakeLists.txt:
+ * Sources.txt:
+ * WebCore.xcodeproj/project.pbxproj:
+ * platform/mock/PlatformSpeechSynthesizerMock.h:
+
2021-02-23 Philippe Normand <[email protected]>
[GStreamer] fast/mediastream/captureStream/canvas2d.html is flaky timing out since GStreamer 1.18 update
Modified: trunk/Source/WebCore/Sources.txt (273309 => 273310)
--- trunk/Source/WebCore/Sources.txt 2021-02-23 16:58:16 UTC (rev 273309)
+++ trunk/Source/WebCore/Sources.txt 2021-02-23 17:08:46 UTC (rev 273310)
@@ -2101,10 +2101,15 @@
platform/mock/MockRealtimeAudioSource.cpp
platform/mock/MockRealtimeMediaSourceCenter.cpp
platform/mock/MockRealtimeVideoSource.cpp
+platform/mock/PlatformSpeechSynthesizerMock.cpp
platform/mock/RTCDataChannelHandlerMock.cpp
platform/mock/RTCNotifiersMock.cpp
platform/mock/ScrollAnimatorMock.cpp
platform/mock/ScrollbarThemeMock.cpp
+platform/mock/mediasource/MockBox.cpp
+platform/mock/mediasource/MockMediaPlayerMediaSource.cpp
+platform/mock/mediasource/MockMediaSourcePrivate.cpp
+platform/mock/mediasource/MockSourceBufferPrivate.cpp
platform/network/AuthenticationChallengeBase.cpp
platform/network/BlobData.cpp
platform/network/BlobDataFileReference.cpp
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (273309 => 273310)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2021-02-23 16:58:16 UTC (rev 273309)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2021-02-23 17:08:46 UTC (rev 273310)
@@ -1411,12 +1411,8 @@
508CCA4F13CF106B003151F3 /* RenderFragmentedFlow.h in Headers */ = {isa = PBXBuildFile; fileRef = 508CCA4D13CF106B003151F3 /* RenderFragmentedFlow.h */; };
510184690B08602A004A825F /* CachedPage.h in Headers */ = {isa = PBXBuildFile; fileRef = 510184670B08602A004A825F /* CachedPage.h */; settings = {ATTRIBUTES = (Private, ); }; };
51058ADB1D6792C1009A538C /* MockGamepad.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51058AD71D679257009A538C /* MockGamepad.cpp */; };
- 51058ADC1D6792C1009A538C /* MockGamepad.h in Headers */ = {isa = PBXBuildFile; fileRef = 51058AD81D679257009A538C /* MockGamepad.h */; settings = {ATTRIBUTES = (Private, ); }; };
51058ADD1D6792C1009A538C /* MockGamepadProvider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51058AD91D679257009A538C /* MockGamepadProvider.cpp */; };
- 51058ADE1D6792C1009A538C /* MockGamepadProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 51058ADA1D679257009A538C /* MockGamepadProvider.h */; settings = {ATTRIBUTES = (Private, ); }; };
- 51058ADF1D67C229009A538C /* MockGamepad.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51058AD71D679257009A538C /* MockGamepad.cpp */; };
51058AE01D67C229009A538C /* MockGamepad.h in Headers */ = {isa = PBXBuildFile; fileRef = 51058AD81D679257009A538C /* MockGamepad.h */; settings = {ATTRIBUTES = (Private, ); }; };
- 51058AE11D67C229009A538C /* MockGamepadProvider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51058AD91D679257009A538C /* MockGamepadProvider.cpp */; };
51058AE21D67C229009A538C /* MockGamepadProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 51058ADA1D679257009A538C /* MockGamepadProvider.h */; settings = {ATTRIBUTES = (Private, ); }; };
5105F0691D4BA9D900FB80BC /* IDBGetRecordData.h in Headers */ = {isa = PBXBuildFile; fileRef = 5105F0681D4BA54100FB80BC /* IDBGetRecordData.h */; settings = {ATTRIBUTES = (Private, ); }; };
5106D7BE18BDB76F000AB166 /* ContextMenuContext.h in Headers */ = {isa = PBXBuildFile; fileRef = 5106D7BC18BDB76F000AB166 /* ContextMenuContext.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -3597,7 +3593,6 @@
AA478A7F16CD70C3007D1BB4 /* WebAccessibilityObjectWrapperMac.h in Headers */ = {isa = PBXBuildFile; fileRef = AA478A7D16CD70C3007D1BB4 /* WebAccessibilityObjectWrapperMac.h */; settings = {ATTRIBUTES = (Private, ); }; };
AA4C3A770B2B1679002334A2 /* InlineStyleSheetOwner.h in Headers */ = {isa = PBXBuildFile; fileRef = AA4C3A750B2B1679002334A2 /* InlineStyleSheetOwner.h */; settings = {ATTRIBUTES = (Private, ); }; };
AA5F3B8D16CC33D100455EB0 /* PlatformSpeechSynthesizerMock.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE27B7516CBFC0D00623043 /* PlatformSpeechSynthesizerMock.h */; };
- AA5F3B8F16CC4B3900455EB0 /* PlatformSpeechSynthesizerMock.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AAE27B7416CBFC0D00623043 /* PlatformSpeechSynthesizerMock.cpp */; };
AA5F3B9116CC5BEB00455EB0 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AA5F3B9016CC5BEB00455EB0 /* CoreFoundation.framework */; };
AA7FEEA716A4E6F3004C0C33 /* JSSpeechSynthesisUtterance.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7FEE9F16A4E6F3004C0C33 /* JSSpeechSynthesisUtterance.h */; };
AA7FEEA916A4E6F3004C0C33 /* JSSpeechSynthesisVoice.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7FEEA116A4E6F3004C0C33 /* JSSpeechSynthesisVoice.h */; };
@@ -4418,13 +4413,9 @@
CDF1350824C9FA4400432E1E /* SourceBufferParserWebM.h in Headers */ = {isa = PBXBuildFile; fileRef = CD8F667224C0F208000C421C /* SourceBufferParserWebM.h */; settings = {ATTRIBUTES = (Private, ); }; };
CDF1350924C9FCA300432E1E /* SourceBufferParser.h in Headers */ = {isa = PBXBuildFile; fileRef = CDEB3D7324C41A6E001FBEEF /* SourceBufferParser.h */; settings = {ATTRIBUTES = (Private, ); }; };
CDF2B004181F059C00F2B424 /* MediaDescription.h in Headers */ = {isa = PBXBuildFile; fileRef = CDF2B003181F059C00F2B424 /* MediaDescription.h */; settings = {ATTRIBUTES = (Private, ); }; };
- CDF2B0101820540600F2B424 /* MockBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDF2B0061820540600F2B424 /* MockBox.cpp */; };
CDF2B0111820540600F2B424 /* MockBox.h in Headers */ = {isa = PBXBuildFile; fileRef = CDF2B0071820540600F2B424 /* MockBox.h */; };
- CDF2B0121820540600F2B424 /* MockMediaPlayerMediaSource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDF2B0081820540600F2B424 /* MockMediaPlayerMediaSource.cpp */; };
CDF2B0131820540600F2B424 /* MockMediaPlayerMediaSource.h in Headers */ = {isa = PBXBuildFile; fileRef = CDF2B0091820540600F2B424 /* MockMediaPlayerMediaSource.h */; };
- CDF2B0141820540600F2B424 /* MockMediaSourcePrivate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDF2B00A1820540600F2B424 /* MockMediaSourcePrivate.cpp */; };
CDF2B0151820540600F2B424 /* MockMediaSourcePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = CDF2B00B1820540600F2B424 /* MockMediaSourcePrivate.h */; };
- CDF2B0161820540700F2B424 /* MockSourceBufferPrivate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDF2B00C1820540600F2B424 /* MockSourceBufferPrivate.cpp */; };
CDF2B0171820540700F2B424 /* MockSourceBufferPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = CDF2B00D1820540600F2B424 /* MockSourceBufferPrivate.h */; };
CDF2B0191820540700F2B424 /* MockTracks.h in Headers */ = {isa = PBXBuildFile; fileRef = CDF2B00F1820540600F2B424 /* MockTracks.h */; };
CDF4B7121E0087AE00E235A2 /* LegacyCDMSession.h in Headers */ = {isa = PBXBuildFile; fileRef = CDDE02E918B3DFC700CF7FF1 /* LegacyCDMSession.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -36129,7 +36120,6 @@
2D97F04719DD413C001EE9C3 /* MockPageOverlayClient.cpp in Sources */,
A1AFEDE71F8BFF6D0087013F /* MockPaymentCoordinator.cpp in Sources */,
A140618B1E2ECA0A0032B34E /* MockPreviewLoaderClient.cpp in Sources */,
- AA5F3B8F16CC4B3900455EB0 /* PlatformSpeechSynthesizerMock.cpp in Sources */,
417F0D821FFEE979008EF303 /* ServiceWorkerInternals.cpp in Sources */,
41D41C672256874F00697942 /* ServiceWorkerInternals.mm in Sources */,
DE7710861FA2F0D600460016 /* WebArchiveDumpSupport.mm in Sources */,
@@ -36231,12 +36221,6 @@
07638A9A1884487200E15A1B /* MediaSessionManagerIOS.mm in Sources */,
CDC8B5A6180474F70016E685 /* MediaSourcePrivateAVFObjC.mm in Sources */,
4133CB8B20F80E9900E89B11 /* MediaStreamAudioSourceCocoa.cpp in Sources */,
- CDF2B0101820540600F2B424 /* MockBox.cpp in Sources */,
- 51058ADF1D67C229009A538C /* MockGamepad.cpp in Sources */,
- 51058AE11D67C229009A538C /* MockGamepadProvider.cpp in Sources */,
- CDF2B0121820540600F2B424 /* MockMediaPlayerMediaSource.cpp in Sources */,
- CDF2B0141820540600F2B424 /* MockMediaSourcePrivate.cpp in Sources */,
- CDF2B0161820540700F2B424 /* MockSourceBufferPrivate.cpp in Sources */,
2D9BF7421DBFDC27007A7D99 /* NavigatorEME.cpp in Sources */,
51A4BB101954D62700FA5C2E /* NavigatorGamepad.cpp in Sources */,
E1EE8B942413195000E794D6 /* NavigatorWebXR.cpp in Sources */,
Modified: trunk/Source/WebCore/platform/mock/PlatformSpeechSynthesizerMock.h (273309 => 273310)
--- trunk/Source/WebCore/platform/mock/PlatformSpeechSynthesizerMock.h 2021-02-23 16:58:16 UTC (rev 273309)
+++ trunk/Source/WebCore/platform/mock/PlatformSpeechSynthesizerMock.h 2021-02-23 17:08:46 UTC (rev 273310)
@@ -35,7 +35,7 @@
class PlatformSpeechSynthesizerMock : public PlatformSpeechSynthesizer {
public:
- explicit PlatformSpeechSynthesizerMock(PlatformSpeechSynthesizerClient*);
+ WEBCORE_EXPORT explicit PlatformSpeechSynthesizerMock(PlatformSpeechSynthesizerClient*);
virtual ~PlatformSpeechSynthesizerMock();
virtual void speak(RefPtr<PlatformSpeechSynthesisUtterance>&&);
