Title: [261007] trunk
Revision
261007
Author
[email protected]
Date
2020-05-01 10:48:04 -0700 (Fri, 01 May 2020)

Log Message

Use export macros on all platforms
https://bugs.webkit.org/show_bug.cgi?id=211293

Reviewed by Michael Catanzaro.

.:

Remove explicit setting of USE_EXPORT_MACROS from all ports.

Ports that use declspec require no changes. Ports with visibility attributes
need to set that as the default in the CMake. This is already done on the
PlayStation port.

The export macros can also be overridden for different build variants if
required. For example production builds may want to override them.

* Source/cmake/OptionsFTW.cmake:
* Source/cmake/OptionsPlayStation.cmake:

Source/bmalloc:

Always use export macros on all platforms. Remove BUSE_EXPORT_MACROS and always
define macros based on the platform. Allow overriding of BEXPORT if desired
otherwise use the defaults.

* bmalloc/BExport.h:
* bmalloc/BPlatform.h:

Source/_javascript_Core:

Allow overriding of JS_EXPORT_PRIVATE if desired otherwise use the defaults.

* runtime/JSExportMacros.h:

Source/WebCore:

* platform/PlatformExportMacros.h:

Source/WebCore/PAL:

Allow overriding of PAL_EXPORT if desired otherwise use the defaults.

* pal/ExportMacros.h:

Source/WTF:

Always use export macros on all platforms. Remove USE_EXPORT_MACROS and always
define macros based on the platform. Allow overriding of WTF_EXPORT_PRIVATE otherwise
use the defaults.

Remove definition of WTF_HIDDEN_DECLARATION since its not used anywhere.

* wtf/ExportMacros.h:
* wtf/PlatformUse.h:

Tools:

Remove uses of USE_EXPORT_MACROS from the DumpRenderTree xcode project. This
is the only xcode project that had any references to this value.

* DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj:

Modified Paths

Diff

Modified: trunk/ChangeLog (261006 => 261007)


--- trunk/ChangeLog	2020-05-01 17:25:02 UTC (rev 261006)
+++ trunk/ChangeLog	2020-05-01 17:48:04 UTC (rev 261007)
@@ -1,3 +1,22 @@
+2020-05-01  Don Olmstead  <[email protected]>
+
+        Use export macros on all platforms
+        https://bugs.webkit.org/show_bug.cgi?id=211293
+
+        Reviewed by Michael Catanzaro.
+
+        Remove explicit setting of USE_EXPORT_MACROS from all ports.
+
+        Ports that use declspec require no changes. Ports with visibility attributes
+        need to set that as the default in the CMake. This is already done on the
+        PlayStation port.
+
+        The export macros can also be overridden for different build variants if
+        required. For example production builds may want to override them.
+
+        * Source/cmake/OptionsFTW.cmake:
+        * Source/cmake/OptionsPlayStation.cmake:
+
 2020-04-29  Víctor Manuel Jáquez Leal  <[email protected]>
 
         [GPUP][GTK] compile GPUProcess in GTK port

Modified: trunk/Source/_javascript_Core/ChangeLog (261006 => 261007)


--- trunk/Source/_javascript_Core/ChangeLog	2020-05-01 17:25:02 UTC (rev 261006)
+++ trunk/Source/_javascript_Core/ChangeLog	2020-05-01 17:48:04 UTC (rev 261007)
@@ -1,3 +1,14 @@
+2020-05-01  Don Olmstead  <[email protected]>
+
+        Use export macros on all platforms
+        https://bugs.webkit.org/show_bug.cgi?id=211293
+
+        Reviewed by Michael Catanzaro.
+
+        Allow overriding of JS_EXPORT_PRIVATE if desired otherwise use the defaults.
+
+        * runtime/JSExportMacros.h:
+
 2020-05-01  Saam Barati  <[email protected]>
 
         Unreviewed. Non-speculative build fix for watchOS build.

Modified: trunk/Source/_javascript_Core/runtime/JSExportMacros.h (261006 => 261007)


--- trunk/Source/_javascript_Core/runtime/JSExportMacros.h	2020-05-01 17:25:02 UTC (rev 261006)
+++ trunk/Source/_javascript_Core/runtime/JSExportMacros.h	2020-05-01 17:48:04 UTC (rev 261007)
@@ -31,8 +31,12 @@
 
 #include <wtf/ExportMacros.h>
 
+#if !defined(JS_EXPORT_PRIVATE)
+
 #if defined(BUILDING_JavaScriptCore) || defined(STATICALLY_LINKED_WITH_JavaScriptCore)
 #define JS_EXPORT_PRIVATE WTF_EXPORT_DECLARATION
 #else
 #define JS_EXPORT_PRIVATE WTF_IMPORT_DECLARATION
 #endif
+
+#endif

Modified: trunk/Source/WTF/ChangeLog (261006 => 261007)


--- trunk/Source/WTF/ChangeLog	2020-05-01 17:25:02 UTC (rev 261006)
+++ trunk/Source/WTF/ChangeLog	2020-05-01 17:48:04 UTC (rev 261007)
@@ -1,3 +1,19 @@
+2020-05-01  Don Olmstead  <[email protected]>
+
+        Use export macros on all platforms
+        https://bugs.webkit.org/show_bug.cgi?id=211293
+
+        Reviewed by Michael Catanzaro.
+
+        Always use export macros on all platforms. Remove USE_EXPORT_MACROS and always
+        define macros based on the platform. Allow overriding of WTF_EXPORT_PRIVATE otherwise
+        use the defaults.
+
+        Remove definition of WTF_HIDDEN_DECLARATION since its not used anywhere.
+
+        * wtf/ExportMacros.h:
+        * wtf/PlatformUse.h:
+
 2020-04-30  Ross Kirsling  <[email protected]>
 
         TriState should be an enum class and use "Indeterminate" instead of "Mixed"

Modified: trunk/Source/WTF/wtf/ExportMacros.h (261006 => 261007)


--- trunk/Source/WTF/wtf/ExportMacros.h	2020-05-01 17:25:02 UTC (rev 261006)
+++ trunk/Source/WTF/wtf/ExportMacros.h	2020-05-01 17:48:04 UTC (rev 261007)
@@ -47,32 +47,23 @@
 #define WTF_INTERNAL
 #endif
 
-#if !USE(EXPORT_MACROS)
-
-#define WTF_EXPORT_DECLARATION
-#define WTF_IMPORT_DECLARATION
-#define WTF_HIDDEN_DECLARATION
-
-#elif USE(DECLSPEC_ATTRIBUTE)
-
+#if USE(DECLSPEC_ATTRIBUTE)
 #define WTF_EXPORT_DECLARATION __declspec(dllexport)
 #define WTF_IMPORT_DECLARATION __declspec(dllimport)
-#define WTF_HIDDEN_DECLARATION
-
 #elif USE(VISIBILITY_ATTRIBUTE)
-
 #define WTF_EXPORT_DECLARATION __attribute__((visibility("default")))
 #define WTF_IMPORT_DECLARATION WTF_EXPORT_DECLARATION
-#define WTF_HIDDEN_DECLARATION __attribute__((visibility("hidden")))
-
 #else
+#define WTF_EXPORT_DECLARATION
+#define WTF_IMPORT_DECLARATION
+#endif
 
-#error "Unknown platform"
+#if !defined(WTF_EXPORT_PRIVATE)
 
-#endif
-
 #if defined(BUILDING_WTF) || defined(STATICALLY_LINKED_WITH_WTF)
 #define WTF_EXPORT_PRIVATE WTF_EXPORT_DECLARATION
 #else
 #define WTF_EXPORT_PRIVATE WTF_IMPORT_DECLARATION
 #endif
+
+#endif

Modified: trunk/Source/WTF/wtf/PlatformUse.h (261006 => 261007)


--- trunk/Source/WTF/wtf/PlatformUse.h	2020-05-01 17:25:02 UTC (rev 261006)
+++ trunk/Source/WTF/wtf/PlatformUse.h	2020-05-01 17:48:04 UTC (rev 261007)
@@ -177,10 +177,6 @@
 #define USE_METAL 1
 #endif
 
-#if !defined(USE_EXPORT_MACROS) && (PLATFORM(COCOA) || OS(WINDOWS))
-#define USE_EXPORT_MACROS 1
-#endif
-
 #if PLATFORM(GTK) || PLATFORM(WPE)
 #define USE_UNIX_DOMAIN_SOCKETS 1
 #endif

Modified: trunk/Source/WebCore/ChangeLog (261006 => 261007)


--- trunk/Source/WebCore/ChangeLog	2020-05-01 17:25:02 UTC (rev 261006)
+++ trunk/Source/WebCore/ChangeLog	2020-05-01 17:48:04 UTC (rev 261007)
@@ -1,3 +1,12 @@
+2020-05-01  Don Olmstead  <[email protected]>
+
+        Use export macros on all platforms
+        https://bugs.webkit.org/show_bug.cgi?id=211293
+
+        Reviewed by Michael Catanzaro.
+
+        * platform/PlatformExportMacros.h:
+
 2020-05-01  Eric Carlson  <[email protected]>
 
         [MSE] Audio session category is sometimes not set correctly after changing video source

Modified: trunk/Source/WebCore/PAL/ChangeLog (261006 => 261007)


--- trunk/Source/WebCore/PAL/ChangeLog	2020-05-01 17:25:02 UTC (rev 261006)
+++ trunk/Source/WebCore/PAL/ChangeLog	2020-05-01 17:48:04 UTC (rev 261007)
@@ -1,3 +1,14 @@
+2020-05-01  Don Olmstead  <[email protected]>
+
+        Use export macros on all platforms
+        https://bugs.webkit.org/show_bug.cgi?id=211293
+
+        Reviewed by Michael Catanzaro.
+
+        Allow overriding of PAL_EXPORT if desired otherwise use the defaults.
+
+        * pal/ExportMacros.h:
+
 2020-04-28  Jer Noble  <[email protected]>
 
         [Mac] Adopt kMTSupportNotification_ShouldPlayHDRVideoChanged notification

Modified: trunk/Source/WebCore/PAL/pal/ExportMacros.h (261006 => 261007)


--- trunk/Source/WebCore/PAL/pal/ExportMacros.h	2020-05-01 17:25:02 UTC (rev 261006)
+++ trunk/Source/WebCore/PAL/pal/ExportMacros.h	2020-05-01 17:48:04 UTC (rev 261007)
@@ -31,8 +31,12 @@
 
 #include <wtf/ExportMacros.h>
 
+#if !defined(PAL_EXPORT)
+
 #if defined(BUILDING_PAL) || defined(STATICALLY_LINKED_WITH_PAL)
 #define PAL_EXPORT WTF_EXPORT_DECLARATION
 #else
 #define PAL_EXPORT WTF_IMPORT_DECLARATION
 #endif
+
+#endif

Modified: trunk/Source/WebCore/platform/PlatformExportMacros.h (261006 => 261007)


--- trunk/Source/WebCore/platform/PlatformExportMacros.h	2020-05-01 17:25:02 UTC (rev 261006)
+++ trunk/Source/WebCore/platform/PlatformExportMacros.h	2020-05-01 17:48:04 UTC (rev 261007)
@@ -32,17 +32,21 @@
 #include <wtf/ExportMacros.h>
 
 #if !defined(WEBCORE_EXPORT)
+
 #if defined(BUILDING_WebCore) || defined(STATICALLY_LINKED_WITH_WebCore)
 #define WEBCORE_EXPORT WTF_EXPORT_DECLARATION
 #else
 #define WEBCORE_EXPORT WTF_IMPORT_DECLARATION
 #endif
+
 #endif
 
 #if !defined(WEBCORE_TESTSUPPORT_EXPORT)
+
 #if defined(BUILDING_WebCoreTestSupport) || defined(STATICALLY_LINKED_WITH_WebCoreTestSupport)
 #define WEBCORE_TESTSUPPORT_EXPORT WTF_EXPORT_DECLARATION
 #else
 #define WEBCORE_TESTSUPPORT_EXPORT WTF_IMPORT_DECLARATION
 #endif
+
 #endif

Modified: trunk/Source/bmalloc/ChangeLog (261006 => 261007)


--- trunk/Source/bmalloc/ChangeLog	2020-05-01 17:25:02 UTC (rev 261006)
+++ trunk/Source/bmalloc/ChangeLog	2020-05-01 17:48:04 UTC (rev 261007)
@@ -1,3 +1,17 @@
+2020-05-01  Don Olmstead  <[email protected]>
+
+        Use export macros on all platforms
+        https://bugs.webkit.org/show_bug.cgi?id=211293
+
+        Reviewed by Michael Catanzaro.
+
+        Always use export macros on all platforms. Remove BUSE_EXPORT_MACROS and always
+        define macros based on the platform. Allow overriding of BEXPORT if desired
+        otherwise use the defaults.
+
+        * bmalloc/BExport.h:
+        * bmalloc/BPlatform.h:
+
 2020-04-29  Mark Lam  <[email protected]>
 
         Freezing of Gigacage and JSC Configs should be thread safe.

Modified: trunk/Source/bmalloc/bmalloc/BExport.h (261006 => 261007)


--- trunk/Source/bmalloc/bmalloc/BExport.h	2020-05-01 17:25:02 UTC (rev 261006)
+++ trunk/Source/bmalloc/bmalloc/BExport.h	2020-05-01 17:48:04 UTC (rev 261007)
@@ -38,7 +38,7 @@
 #define BIMPORT_DECLARATION
 #endif
 
-#if BUSE(EXPORT_MACROS)
+#if !defined(BEXPORT)
 
 #if defined(BUILDING_bmalloc) || defined(STATICALLY_LINKED_WITH_bmalloc)
 #define BEXPORT BEXPORT_DECLARATION
@@ -46,8 +46,6 @@
 #define BEXPORT BIMPORT_DECLARATION
 #endif
 
-#else
-#define BEXPORT
 #endif
 
 #define BNOEXPORT

Modified: trunk/Source/bmalloc/bmalloc/BPlatform.h (261006 => 261007)


--- trunk/Source/bmalloc/bmalloc/BPlatform.h	2020-05-01 17:25:02 UTC (rev 261006)
+++ trunk/Source/bmalloc/bmalloc/BPlatform.h	2020-05-01 17:48:04 UTC (rev 261007)
@@ -291,10 +291,6 @@
 #define BUSE_OS_LOG 1
 #endif
 
-#if !defined(BUSE_EXPORT_MACROS) && (BPLATFORM(MAC) || BPLATFORM(IOS_FAMILY) || BPLATFORM(PLAYSTATION))
-#define BUSE_EXPORT_MACROS 1
-#endif
-
 /* BUNUSED_PARAM */
 #if !defined(BUNUSED_PARAM)
 #define BUNUSED_PARAM(variable) (void)variable

Modified: trunk/Source/cmake/OptionsFTW.cmake (261006 => 261007)


--- trunk/Source/cmake/OptionsFTW.cmake	2020-05-01 17:25:02 UTC (rev 261006)
+++ trunk/Source/cmake/OptionsFTW.cmake	2020-05-01 17:48:04 UTC (rev 261007)
@@ -238,7 +238,6 @@
 SET_AND_EXPOSE_TO_BUILD(USE_CURL ON)
 SET_AND_EXPOSE_TO_BUILD(USE_DIRECT2D ON)
 SET_AND_EXPOSE_TO_BUILD(USE_EGL ON)
-SET_AND_EXPOSE_TO_BUILD(USE_EXPORT_MACROS ON)
 SET_AND_EXPOSE_TO_BUILD(USE_OPENGL_ES ON)
 SET_AND_EXPOSE_TO_BUILD(HAVE_OPENGL_ES_3 ON)
 SET_AND_EXPOSE_TO_BUILD(USE_OPENSSL ON)

Modified: trunk/Source/cmake/OptionsPlayStation.cmake (261006 => 261007)


--- trunk/Source/cmake/OptionsPlayStation.cmake	2020-05-01 17:25:02 UTC (rev 261006)
+++ trunk/Source/cmake/OptionsPlayStation.cmake	2020-05-01 17:48:04 UTC (rev 261007)
@@ -126,8 +126,6 @@
 
 SET_AND_EXPOSE_TO_BUILD(HAVE_PTHREAD_SETNAME_NP ON)
 
-SET_AND_EXPOSE_TO_BUILD(USE_EXPORT_MACROS ON)
-
 SET_AND_EXPOSE_TO_BUILD(USE_CAIRO ON)
 SET_AND_EXPOSE_TO_BUILD(USE_CURL ON)
 SET_AND_EXPOSE_TO_BUILD(USE_FREETYPE ON)

Modified: trunk/Tools/ChangeLog (261006 => 261007)


--- trunk/Tools/ChangeLog	2020-05-01 17:25:02 UTC (rev 261006)
+++ trunk/Tools/ChangeLog	2020-05-01 17:48:04 UTC (rev 261007)
@@ -1,3 +1,15 @@
+2020-05-01  Don Olmstead  <[email protected]>
+
+        Use export macros on all platforms
+        https://bugs.webkit.org/show_bug.cgi?id=211293
+
+        Reviewed by Michael Catanzaro.
+
+        Remove uses of USE_EXPORT_MACROS from the DumpRenderTree xcode project. This
+        is the only xcode project that had any references to this value.
+
+        * DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj:
+
 2020-05-01  Peng Liu  <[email protected]>
 
         A PiP window doesn’t actually dismiss after the browser navigates to a different page within the same domain

Modified: trunk/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj (261006 => 261007)


--- trunk/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj	2020-05-01 17:25:02 UTC (rev 261006)
+++ trunk/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj	2020-05-01 17:48:04 UTC (rev 261007)
@@ -1426,7 +1426,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				PRODUCT_NAME = All;
-				USE_EXPORT_MACROS = 0;
 			};
 			name = Production;
 		};
@@ -1500,7 +1499,6 @@
 				OTHER_REZFLAGS = "";
 				PRODUCT_NAME = All;
 				SECTORDER_FLAGS = "";
-				USE_EXPORT_MACROS = 0;
 				WARNING_CFLAGS = (
 					"-Wmost",
 					"-Wno-four-char-constants",
@@ -1518,7 +1516,6 @@
 				OTHER_REZFLAGS = "";
 				PRODUCT_NAME = All;
 				SECTORDER_FLAGS = "";
-				USE_EXPORT_MACROS = 0;
 				WARNING_CFLAGS = (
 					"-Wmost",
 					"-Wno-four-char-constants",
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to