WEBCORE_TESTSUPPORT_EXPORT should be used only for WebCoreTestSupport, not for WebCore
authorHironori.Fujii@sony.com <Hironori.Fujii@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 7 Nov 2019 02:28:07 +0000 (02:28 +0000)
committerHironori.Fujii@sony.com <Hironori.Fujii@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 7 Nov 2019 02:28:07 +0000 (02:28 +0000)
https://bugs.webkit.org/show_bug.cgi?id=203876

Reviewed by Ross Kirsling.

Source/WebCore:

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.

Source/WebKit:

* config.h: Removed WEBCORE_TESTSUPPORT_EXPORT definition because it shouldn't be used in WebKit.

Tools:

* TestWebKitAPI/win/TestWebKitAPIPrefix.h:
* WebKitTestRunner/InjectedBundle/win/TestRunnerInjectedBundlePrefix.h:
* WebKitTestRunner/WebKitTestRunnerPrefix.h:
Define WEBCORE_TESTSUPPORT_EXPORT emtpy.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@252166 268f45cc-cd09-0410-ab3c-d52691b4dbfc

16 files changed:
Source/WebCore/ChangeLog
Source/WebCore/Modules/encryptedmedia/MediaKeyEncryptionScheme.idl
Source/WebCore/Modules/encryptedmedia/MediaKeySessionType.idl
Source/WebCore/Modules/encryptedmedia/MediaKeysRequirement.idl
Source/WebCore/Modules/mediastream/NavigatorMediaDevices.h
Source/WebCore/WebCorePrefix.h
Source/WebCore/bindings/scripts/test/JS/JSTestNode.h
Source/WebCore/bindings/scripts/test/TestNode.idl
Source/WebCore/testing/js/WebCoreTestSupportPrefix.h
Source/WebCore/workers/service/context/ServiceWorkerThreadProxy.h
Source/WebKit/ChangeLog
Source/WebKit/config.h
Tools/ChangeLog
Tools/TestWebKitAPI/win/TestWebKitAPIPrefix.h
Tools/WebKitTestRunner/InjectedBundle/win/TestRunnerInjectedBundlePrefix.h
Tools/WebKitTestRunner/WebKitTestRunnerPrefix.h

index a19fa5d..ee27a4c 100644 (file)
@@ -1,3 +1,31 @@
+2019-11-06  Fujii Hironori  <Hironori.Fujii@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.noble@apple.com>
 
         Screen locks while watching previously-muted-then-unmuted video
index 64357dd..de78b13 100644 (file)
@@ -26,7 +26,7 @@
 [
     Conditional=ENCRYPTED_MEDIA,
     ImplementedAs=MediaKeyEncryptionScheme,
-    ExportMacro=WEBCORE_TESTSUPPORT_EXPORT
+    ExportMacro=WEBCORE_EXPORT
 ]
 enum MediaKeyEncryptionScheme {
     "cenc",
index a92e8f6..b2b1117 100644 (file)
@@ -26,7 +26,7 @@
 [
     Conditional=ENCRYPTED_MEDIA,
     ImplementedAs=MediaKeySessionType,
-    ExportMacro=WEBCORE_TESTSUPPORT_EXPORT
+    ExportMacro=WEBCORE_EXPORT
 ]
 enum MediaKeySessionType {
     "temporary",
index a308979..810eee1 100644 (file)
@@ -26,7 +26,7 @@
 [
     Conditional=ENCRYPTED_MEDIA,
     ImplementedAs=MediaKeysRequirement,
-    ExportMacro=WEBCORE_TESTSUPPORT_EXPORT
+    ExportMacro=WEBCORE_EXPORT
 ]
 enum MediaKeysRequirement {
     "required",
index d74f652..33c4396 100644 (file)
@@ -47,7 +47,7 @@ public:
     virtual ~NavigatorMediaDevices();
     static NavigatorMediaDevices* from(Navigator*);
 
-    WEBCORE_TESTSUPPORT_EXPORT static MediaDevices* mediaDevices(Navigator&);
+    WEBCORE_EXPORT static MediaDevices* mediaDevices(Navigator&);
     MediaDevices* mediaDevices() const;
 
 private:
index 025472e..7a3fc52 100644 (file)
@@ -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)
index 28c0f9c..c35b3c4 100644 (file)
@@ -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 @@ protected:
     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(); }
index f1c2a05..ba045e4 100644 (file)
@@ -20,7 +20,7 @@
 
 [
     Constructor,
-    ExportMacro=WEBCORE_TESTSUPPORT_EXPORT,
+    ExportMacro=WEBCORE_EXPORT,
     Exposed=(Window,Worker)
 ] interface TestNode : Node {
     attribute DOMString name;
index e9c4062..e607e09 100644 (file)
@@ -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>
index e412d53..e9bd8a1 100644 (file)
@@ -68,8 +68,7 @@ public:
 
     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);
index 931a0cc..4d02504 100644 (file)
@@ -1,3 +1,12 @@
+2019-11-06  Fujii Hironori  <Hironori.Fujii@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  <cdumez@apple.com>
 
         Unreviewed, rolling out r251907.
index 99d8a5f..a8ab9b0 100644 (file)
@@ -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
index 1bb7e44..2de82ab 100644 (file)
@@ -1,5 +1,17 @@
 2019-11-06  Fujii Hironori  <Hironori.Fujii@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.Fujii@sony.com>
+
         [Win] DumpRenderTree.exe and WebKitTestRunner.exe shouldn't link with WebCoreTestSupport
         https://bugs.webkit.org/show_bug.cgi?id=203879
 
index 9f6c4ff..b21a280 100644 (file)
@@ -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
index 3142550..23dbbd3 100644 (file)
@@ -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
index 580253b..10a8ba9 100644 (file)
@@ -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