Diff
Modified: trunk/Source/WebCore/ChangeLog (252165 => 252166)
--- trunk/Source/WebCore/ChangeLog 2019-11-07 02:04:31 UTC (rev 252165)
+++ trunk/Source/WebCore/ChangeLog 2019-11-07 02:28:07 UTC (rev 252166)
@@ -1,3 +1,31 @@
+2019-11-06 Fujii Hironori <hironori.fu...@sony.com>
+
+ WEBCORE_TESTSUPPORT_EXPORT should be used only for WebCoreTestSupport, not for WebCore
+ https://bugs.webkit.org/show_bug.cgi?id=203876
+
+ Reviewed by Ross Kirsling.
+
+ WEBCORE_TESTSUPPORT_EXPORT shouldn't be used for WebCore. It is
+ only for WebCoreTestSupport module.
+
+ WebCoreTestSupport symbols don't need to export on Windows because
+ it is a static library on it. WEBCORE_TESTSUPPORT_EXPORT should be
+ empty.
+
+ No behavioral changes.
+
+ * Modules/encryptedmedia/MediaKeyEncryptionScheme.idl:
+ * Modules/encryptedmedia/MediaKeySessionType.idl:
+ * Modules/encryptedmedia/MediaKeysRequirement.idl:
+ * Modules/mediastream/NavigatorMediaDevices.h:
+ * bindings/scripts/test/JS/JSTestNode.h:
+ * bindings/scripts/test/TestNode.idl:
+ * workers/service/context/ServiceWorkerThreadProxy.h:
+ Replaced wrongly marked WEBCORE_TESTSUPPORT_EXPORT with WEBCORE_EXPORT.
+
+ * testing/js/WebCoreTestSupportPrefix.h: Define WEBCORE_TESTSUPPORT_EXPORT empty.
+ * WebCorePrefix.h: Removed WEBCORE_TESTSUPPORT_EXPORT definition.
+
2019-11-06 Jer Noble <jer.no...@apple.com>
Screen locks while watching previously-muted-then-unmuted video
Modified: trunk/Source/WebCore/Modules/encryptedmedia/MediaKeyEncryptionScheme.idl (252165 => 252166)
--- trunk/Source/WebCore/Modules/encryptedmedia/MediaKeyEncryptionScheme.idl 2019-11-07 02:04:31 UTC (rev 252165)
+++ trunk/Source/WebCore/Modules/encryptedmedia/MediaKeyEncryptionScheme.idl 2019-11-07 02:28:07 UTC (rev 252166)
@@ -26,7 +26,7 @@
[
Conditional=ENCRYPTED_MEDIA,
ImplementedAs=MediaKeyEncryptionScheme,
- ExportMacro=WEBCORE_TESTSUPPORT_EXPORT
+ ExportMacro=WEBCORE_EXPORT
]
enum MediaKeyEncryptionScheme {
"cenc",
Modified: trunk/Source/WebCore/Modules/encryptedmedia/MediaKeySessionType.idl (252165 => 252166)
--- trunk/Source/WebCore/Modules/encryptedmedia/MediaKeySessionType.idl 2019-11-07 02:04:31 UTC (rev 252165)
+++ trunk/Source/WebCore/Modules/encryptedmedia/MediaKeySessionType.idl 2019-11-07 02:28:07 UTC (rev 252166)
@@ -26,7 +26,7 @@
[
Conditional=ENCRYPTED_MEDIA,
ImplementedAs=MediaKeySessionType,
- ExportMacro=WEBCORE_TESTSUPPORT_EXPORT
+ ExportMacro=WEBCORE_EXPORT
]
enum MediaKeySessionType {
"temporary",
Modified: trunk/Source/WebCore/Modules/encryptedmedia/MediaKeysRequirement.idl (252165 => 252166)
--- trunk/Source/WebCore/Modules/encryptedmedia/MediaKeysRequirement.idl 2019-11-07 02:04:31 UTC (rev 252165)
+++ trunk/Source/WebCore/Modules/encryptedmedia/MediaKeysRequirement.idl 2019-11-07 02:28:07 UTC (rev 252166)
@@ -26,7 +26,7 @@
[
Conditional=ENCRYPTED_MEDIA,
ImplementedAs=MediaKeysRequirement,
- ExportMacro=WEBCORE_TESTSUPPORT_EXPORT
+ ExportMacro=WEBCORE_EXPORT
]
enum MediaKeysRequirement {
"required",
Modified: trunk/Source/WebCore/Modules/mediastream/NavigatorMediaDevices.h (252165 => 252166)
--- trunk/Source/WebCore/Modules/mediastream/NavigatorMediaDevices.h 2019-11-07 02:04:31 UTC (rev 252165)
+++ trunk/Source/WebCore/Modules/mediastream/NavigatorMediaDevices.h 2019-11-07 02:28:07 UTC (rev 252166)
@@ -47,7 +47,7 @@
virtual ~NavigatorMediaDevices();
static NavigatorMediaDevices* from(Navigator*);
- WEBCORE_TESTSUPPORT_EXPORT static MediaDevices* mediaDevices(Navigator&);
+ WEBCORE_EXPORT static MediaDevices* mediaDevices(Navigator&);
MediaDevices* mediaDevices() const;
private:
Modified: trunk/Source/WebCore/WebCorePrefix.h (252165 => 252166)
--- trunk/Source/WebCore/WebCorePrefix.h 2019-11-07 02:04:31 UTC (rev 252165)
+++ trunk/Source/WebCore/WebCorePrefix.h 2019-11-07 02:28:07 UTC (rev 252166)
@@ -44,8 +44,6 @@
#if PLATFORM(WIN)
#undef WEBCORE_EXPORT
#define WEBCORE_EXPORT WTF_EXPORT_DECLARATION
-#undef WEBCORE_TESTSUPPORT_EXPORT
-#define WEBCORE_TESTSUPPORT_EXPORT WTF_EXPORT_DECLARATION
#else
#include <pthread.h>
#endif // PLATFORM(WIN)
Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNode.h (252165 => 252166)
--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNode.h 2019-11-07 02:04:31 UTC (rev 252165)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNode.h 2019-11-07 02:28:07 UTC (rev 252166)
@@ -26,7 +26,7 @@
namespace WebCore {
-class WEBCORE_TESTSUPPORT_EXPORT JSTestNode : public JSNode {
+class WEBCORE_EXPORT JSTestNode : public JSNode {
public:
using Base = JSNode;
using DOMWrapped = TestNode;
@@ -60,7 +60,7 @@
void finishCreation(JSC::VM&);
};
-WEBCORE_TESTSUPPORT_EXPORT JSC::JSValue toJS(JSC::JSGlobalObject*, JSDOMGlobalObject*, TestNode&);
+WEBCORE_EXPORT JSC::JSValue toJS(JSC::JSGlobalObject*, JSDOMGlobalObject*, TestNode&);
inline JSC::JSValue toJS(JSC::JSGlobalObject* lexicalGlobalObject, JSDOMGlobalObject* globalObject, TestNode* impl) { return impl ? toJS(lexicalGlobalObject, globalObject, *impl) : JSC::jsNull(); }
JSC::JSValue toJSNewlyCreated(JSC::JSGlobalObject*, JSDOMGlobalObject*, Ref<TestNode>&&);
inline JSC::JSValue toJSNewlyCreated(JSC::JSGlobalObject* lexicalGlobalObject, JSDOMGlobalObject* globalObject, RefPtr<TestNode>&& impl) { return impl ? toJSNewlyCreated(lexicalGlobalObject, globalObject, impl.releaseNonNull()) : JSC::jsNull(); }
Modified: trunk/Source/WebCore/bindings/scripts/test/TestNode.idl (252165 => 252166)
--- trunk/Source/WebCore/bindings/scripts/test/TestNode.idl 2019-11-07 02:04:31 UTC (rev 252165)
+++ trunk/Source/WebCore/bindings/scripts/test/TestNode.idl 2019-11-07 02:28:07 UTC (rev 252166)
@@ -20,7 +20,7 @@
[
Constructor,
- ExportMacro=WEBCORE_TESTSUPPORT_EXPORT,
+ ExportMacro=WEBCORE_EXPORT,
Exposed=(Window,Worker)
] interface TestNode : Node {
attribute DOMString name;
Modified: trunk/Source/WebCore/testing/js/WebCoreTestSupportPrefix.h (252165 => 252166)
--- trunk/Source/WebCore/testing/js/WebCoreTestSupportPrefix.h 2019-11-07 02:04:31 UTC (rev 252165)
+++ trunk/Source/WebCore/testing/js/WebCoreTestSupportPrefix.h 2019-11-07 02:28:07 UTC (rev 252166)
@@ -44,7 +44,7 @@
#if OS(WINDOWS)
#undef WEBCORE_EXPORT
#define WEBCORE_EXPORT WTF_IMPORT_DECLARATION
-#define WEBCORE_TESTSUPPORT_EXPORT WTF_EXPORT_DECLARATION
+#define WEBCORE_TESTSUPPORT_EXPORT
#else
#include <pthread.h>
Modified: trunk/Source/WebCore/workers/service/context/ServiceWorkerThreadProxy.h (252165 => 252166)
--- trunk/Source/WebCore/workers/service/context/ServiceWorkerThreadProxy.h 2019-11-07 02:04:31 UTC (rev 252165)
+++ trunk/Source/WebCore/workers/service/context/ServiceWorkerThreadProxy.h 2019-11-07 02:28:07 UTC (rev 252166)
@@ -68,8 +68,7 @@
const URL& scriptURL() const { return m_document->url(); }
- // Public only for testing purposes.
- WEBCORE_TESTSUPPORT_EXPORT void notifyNetworkStateChange(bool isOnline);
+ WEBCORE_EXPORT void notifyNetworkStateChange(bool isOnline);
WEBCORE_EXPORT void startFetch(SWServerConnectionIdentifier, FetchIdentifier, Ref<ServiceWorkerFetch::Client>&&, Optional<ServiceWorkerClientIdentifier>&&, ResourceRequest&&, String&& referrer, FetchOptions&&);
WEBCORE_EXPORT void cancelFetch(SWServerConnectionIdentifier, FetchIdentifier);
Modified: trunk/Source/WebKit/ChangeLog (252165 => 252166)
--- trunk/Source/WebKit/ChangeLog 2019-11-07 02:04:31 UTC (rev 252165)
+++ trunk/Source/WebKit/ChangeLog 2019-11-07 02:28:07 UTC (rev 252166)
@@ -1,3 +1,12 @@
+2019-11-06 Fujii Hironori <hironori.fu...@sony.com>
+
+ WEBCORE_TESTSUPPORT_EXPORT should be used only for WebCoreTestSupport, not for WebCore
+ https://bugs.webkit.org/show_bug.cgi?id=203876
+
+ Reviewed by Ross Kirsling.
+
+ * config.h: Removed WEBCORE_TESTSUPPORT_EXPORT definition because it shouldn't be used in WebKit.
+
2019-11-06 Chris Dumez <cdu...@apple.com>
Unreviewed, rolling out r251907.
Modified: trunk/Source/WebKit/config.h (252165 => 252166)
--- trunk/Source/WebKit/config.h 2019-11-07 02:04:31 UTC (rev 252165)
+++ trunk/Source/WebKit/config.h 2019-11-07 02:28:07 UTC (rev 252166)
@@ -36,8 +36,6 @@
#if PLATFORM(WIN)
#undef WEBCORE_EXPORT
#define WEBCORE_EXPORT WTF_EXPORT_DECLARATION
-#undef WEBCORE_TESTSUPPORT_EXPORT
-#define WEBCORE_TESTSUPPORT_EXPORT WTF_EXPORT_DECLARATION
#endif // PLATFORM(WIN)
#ifdef __cplusplus
Modified: trunk/Tools/ChangeLog (252165 => 252166)
--- trunk/Tools/ChangeLog 2019-11-07 02:04:31 UTC (rev 252165)
+++ trunk/Tools/ChangeLog 2019-11-07 02:28:07 UTC (rev 252166)
@@ -1,5 +1,17 @@
2019-11-06 Fujii Hironori <hironori.fu...@sony.com>
+ WEBCORE_TESTSUPPORT_EXPORT should be used only for WebCoreTestSupport, not for WebCore
+ https://bugs.webkit.org/show_bug.cgi?id=203876
+
+ Reviewed by Ross Kirsling.
+
+ * TestWebKitAPI/win/TestWebKitAPIPrefix.h:
+ * WebKitTestRunner/InjectedBundle/win/TestRunnerInjectedBundlePrefix.h:
+ * WebKitTestRunner/WebKitTestRunnerPrefix.h:
+ Define WEBCORE_TESTSUPPORT_EXPORT emtpy.
+
+2019-11-06 Fujii Hironori <hironori.fu...@sony.com>
+
[Win] DumpRenderTree.exe and WebKitTestRunner.exe shouldn't link with WebCoreTestSupport
https://bugs.webkit.org/show_bug.cgi?id=203879
Modified: trunk/Tools/TestWebKitAPI/win/TestWebKitAPIPrefix.h (252165 => 252166)
--- trunk/Tools/TestWebKitAPI/win/TestWebKitAPIPrefix.h 2019-11-07 02:04:31 UTC (rev 252165)
+++ trunk/Tools/TestWebKitAPI/win/TestWebKitAPIPrefix.h 2019-11-07 02:28:07 UTC (rev 252166)
@@ -29,4 +29,4 @@
#undef WEBCORE_EXPORT
#define WEBCORE_EXPORT WTF_IMPORT_DECLARATION
#undef WEBCORE_TESTSUPPORT_EXPORT
-#define WEBCORE_TESTSUPPORT_EXPORT WTF_IMPORT_DECLARATION
+#define WEBCORE_TESTSUPPORT_EXPORT
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/win/TestRunnerInjectedBundlePrefix.h (252165 => 252166)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/win/TestRunnerInjectedBundlePrefix.h 2019-11-07 02:04:31 UTC (rev 252165)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/win/TestRunnerInjectedBundlePrefix.h 2019-11-07 02:28:07 UTC (rev 252166)
@@ -26,4 +26,4 @@
#undef WEBCORE_EXPORT
#define WEBCORE_EXPORT WTF_IMPORT_DECLARATION
#undef WEBCORE_TESTSUPPORT_EXPORT
-#define WEBCORE_TESTSUPPORT_EXPORT WTF_IMPORT_DECLARATION
+#define WEBCORE_TESTSUPPORT_EXPORT
Modified: trunk/Tools/WebKitTestRunner/WebKitTestRunnerPrefix.h (252165 => 252166)
--- trunk/Tools/WebKitTestRunner/WebKitTestRunnerPrefix.h 2019-11-07 02:04:31 UTC (rev 252165)
+++ trunk/Tools/WebKitTestRunner/WebKitTestRunnerPrefix.h 2019-11-07 02:28:07 UTC (rev 252166)
@@ -52,5 +52,5 @@
#undef WEBCORE_EXPORT
#define WEBCORE_EXPORT WTF_IMPORT_DECLARATION
#undef WEBCORE_TESTSUPPORT_EXPORT
-#define WEBCORE_TESTSUPPORT_EXPORT WTF_IMPORT_DECLARATION
+#define WEBCORE_TESTSUPPORT_EXPORT
#endif
