Title: [256720] trunk
Revision
256720
Author
[email protected]
Date
2020-02-16 18:49:45 -0800 (Sun, 16 Feb 2020)

Log Message

Remove remaining WTF_EXPORT and WTF_IMPORT by replacing them with WTF_EXPORT_DECLARATION and WTF_IMPORT_DECLARATION
https://bugs.webkit.org/show_bug.cgi?id=207746

Reviewed by Don Olmstead.

Source/_javascript_Core:

* runtime/JSExportMacros.h:

Source/WebCore:

* platform/PlatformExportMacros.h:

Source/WebCore/PAL:

Removed unused PAL_TESTSUPPORT_EXPORT.

* pal/ExportMacros.h:

Source/WebKit:

* WebProcess/win/WebProcessWin.cpp:
(loadResourceIntoBuffer): Removed WTF_EXPORT. loadResourceIntoBuffer is used from WebCore which is in same DLL.

Source/WTF:

I removed WTF_EXPORT from function declarations in r256420 (Bug 207453).
WTF_EXPORT is still used mostly in *ExportMacros.h. However, there is no
difference between WTF_EXPORT and WTF_EXPORT_DECLARATION.

Removed WTF_EXPORT and WTF_IMPORT by replacing them with
WTF_EXPORT_DECLARATION and WTF_IMPORT_DECLARATION

Removed unused WTF_HIDDEN.

Defined WTF_EXPORT_DECLARATION, WTF_IMPORT_DECLARATION and WTF_HIDDEN_DECLARATION empty
in case of !USE(EXPORT_MACROS) to simplify *ExportMacros.h.

* wtf/ExportMacros.h:

Tools:

* MiniBrowser/win/stdafx.h:

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (256719 => 256720)


--- trunk/Source/_javascript_Core/ChangeLog	2020-02-17 02:11:42 UTC (rev 256719)
+++ trunk/Source/_javascript_Core/ChangeLog	2020-02-17 02:49:45 UTC (rev 256720)
@@ -1,3 +1,12 @@
+2020-02-16  Fujii Hironori  <[email protected]>
+
+        Remove remaining WTF_EXPORT and WTF_IMPORT by replacing them with WTF_EXPORT_DECLARATION and WTF_IMPORT_DECLARATION
+        https://bugs.webkit.org/show_bug.cgi?id=207746
+
+        Reviewed by Don Olmstead.
+
+        * runtime/JSExportMacros.h:
+
 2020-02-16  Paulo Matos  <[email protected]>
 
         Remove nonArgGPR1 for ARMv7 and ARM64 (unused)

Modified: trunk/Source/_javascript_Core/runtime/JSExportMacros.h (256719 => 256720)


--- trunk/Source/_javascript_Core/runtime/JSExportMacros.h	2020-02-17 02:11:42 UTC (rev 256719)
+++ trunk/Source/_javascript_Core/runtime/JSExportMacros.h	2020-02-17 02:49:45 UTC (rev 256720)
@@ -31,16 +31,8 @@
 
 #include <wtf/ExportMacros.h>
 
-#if USE(EXPORT_MACROS)
-
 #if defined(BUILDING_JavaScriptCore) || defined(STATICALLY_LINKED_WITH_JavaScriptCore)
-#define JS_EXPORT_PRIVATE WTF_EXPORT
+#define JS_EXPORT_PRIVATE WTF_EXPORT_DECLARATION
 #else
-#define JS_EXPORT_PRIVATE WTF_IMPORT
+#define JS_EXPORT_PRIVATE WTF_IMPORT_DECLARATION
 #endif
-
-#else // !USE(EXPORT_MACROS)
-
-#define JS_EXPORT_PRIVATE
-
-#endif // USE(EXPORT_MACROS)

Modified: trunk/Source/WTF/ChangeLog (256719 => 256720)


--- trunk/Source/WTF/ChangeLog	2020-02-17 02:11:42 UTC (rev 256719)
+++ trunk/Source/WTF/ChangeLog	2020-02-17 02:49:45 UTC (rev 256720)
@@ -1,3 +1,24 @@
+2020-02-16  Fujii Hironori  <[email protected]>
+
+        Remove remaining WTF_EXPORT and WTF_IMPORT by replacing them with WTF_EXPORT_DECLARATION and WTF_IMPORT_DECLARATION
+        https://bugs.webkit.org/show_bug.cgi?id=207746
+
+        Reviewed by Don Olmstead.
+
+        I removed WTF_EXPORT from function declarations in r256420 (Bug 207453).
+        WTF_EXPORT is still used mostly in *ExportMacros.h. However, there is no
+        difference between WTF_EXPORT and WTF_EXPORT_DECLARATION.
+
+        Removed WTF_EXPORT and WTF_IMPORT by replacing them with
+        WTF_EXPORT_DECLARATION and WTF_IMPORT_DECLARATION
+
+        Removed unused WTF_HIDDEN.
+
+        Defined WTF_EXPORT_DECLARATION, WTF_IMPORT_DECLARATION and WTF_HIDDEN_DECLARATION empty
+        in case of !USE(EXPORT_MACROS) to simplify *ExportMacros.h.
+
+        * wtf/ExportMacros.h:
+
 2020-02-14  Commit Queue  <[email protected]>
 
         Unreviewed, rolling out r256633.

Modified: trunk/Source/WTF/wtf/ExportMacros.h (256719 => 256720)


--- trunk/Source/WTF/wtf/ExportMacros.h	2020-02-17 02:11:42 UTC (rev 256719)
+++ trunk/Source/WTF/wtf/ExportMacros.h	2020-02-17 02:49:45 UTC (rev 256720)
@@ -47,8 +47,14 @@
 #define WTF_INTERNAL
 #endif
 
-#if USE(DECLSPEC_ATTRIBUTE)
+#if !USE(EXPORT_MACROS)
 
+#define WTF_EXPORT_DECLARATION
+#define WTF_IMPORT_DECLARATION
+#define WTF_HIDDEN_DECLARATION
+
+#elif USE(DECLSPEC_ATTRIBUTE)
+
 #define WTF_EXPORT_DECLARATION __declspec(dllexport)
 #define WTF_IMPORT_DECLARATION __declspec(dllimport)
 #define WTF_HIDDEN_DECLARATION
@@ -61,29 +67,12 @@
 
 #else
 
-#define WTF_EXPORT_DECLARATION
-#define WTF_IMPORT_DECLARATION
-#define WTF_HIDDEN_DECLARATION
+#error "Unknown platform"
 
 #endif
 
-#if USE(EXPORT_MACROS)
-
-#define WTF_EXPORT WTF_EXPORT_DECLARATION
-#define WTF_IMPORT WTF_IMPORT_DECLARATION
-#define WTF_HIDDEN WTF_IMPORT_DECLARATION
-
 #if defined(BUILDING_WTF) || defined(STATICALLY_LINKED_WITH_WTF)
-#define WTF_EXPORT_PRIVATE WTF_EXPORT
+#define WTF_EXPORT_PRIVATE WTF_EXPORT_DECLARATION
 #else
-#define WTF_EXPORT_PRIVATE WTF_IMPORT
+#define WTF_EXPORT_PRIVATE WTF_IMPORT_DECLARATION
 #endif
-
-#else // !USE(EXPORT_MACROS)
-
-#define WTF_EXPORT
-#define WTF_IMPORT
-#define WTF_HIDDEN
-#define WTF_EXPORT_PRIVATE
-
-#endif // USE(EXPORT_MACROS)

Modified: trunk/Source/WebCore/ChangeLog (256719 => 256720)


--- trunk/Source/WebCore/ChangeLog	2020-02-17 02:11:42 UTC (rev 256719)
+++ trunk/Source/WebCore/ChangeLog	2020-02-17 02:49:45 UTC (rev 256720)
@@ -1,3 +1,12 @@
+2020-02-16  Fujii Hironori  <[email protected]>
+
+        Remove remaining WTF_EXPORT and WTF_IMPORT by replacing them with WTF_EXPORT_DECLARATION and WTF_IMPORT_DECLARATION
+        https://bugs.webkit.org/show_bug.cgi?id=207746
+
+        Reviewed by Don Olmstead.
+
+        * platform/PlatformExportMacros.h:
+
 2020-02-16  Alexey Shvayka  <[email protected]>
 
         Implement EventTarget constructor

Modified: trunk/Source/WebCore/PAL/ChangeLog (256719 => 256720)


--- trunk/Source/WebCore/PAL/ChangeLog	2020-02-17 02:11:42 UTC (rev 256719)
+++ trunk/Source/WebCore/PAL/ChangeLog	2020-02-17 02:49:45 UTC (rev 256720)
@@ -1,3 +1,14 @@
+2020-02-16  Fujii Hironori  <[email protected]>
+
+        Remove remaining WTF_EXPORT and WTF_IMPORT by replacing them with WTF_EXPORT_DECLARATION and WTF_IMPORT_DECLARATION
+        https://bugs.webkit.org/show_bug.cgi?id=207746
+
+        Reviewed by Don Olmstead.
+
+        Removed unused PAL_TESTSUPPORT_EXPORT.
+
+        * pal/ExportMacros.h:
+
 2020-02-14  Nikos Mouchtaris  <[email protected]>
 
         WebKit support for Apple Pay Buttons with custom corner radii

Modified: trunk/Source/WebCore/PAL/pal/ExportMacros.h (256719 => 256720)


--- trunk/Source/WebCore/PAL/pal/ExportMacros.h	2020-02-17 02:11:42 UTC (rev 256719)
+++ trunk/Source/WebCore/PAL/pal/ExportMacros.h	2020-02-17 02:49:45 UTC (rev 256720)
@@ -31,19 +31,8 @@
 
 #include <wtf/ExportMacros.h>
 
-#if USE(EXPORT_MACROS)
-
 #if defined(BUILDING_PAL) || defined(STATICALLY_LINKED_WITH_PAL)
-#define PAL_EXPORT WTF_EXPORT
+#define PAL_EXPORT WTF_EXPORT_DECLARATION
 #else
-#define PAL_EXPORT WTF_IMPORT
+#define PAL_EXPORT WTF_IMPORT_DECLARATION
 #endif
-
-#define PAL_TESTSUPPORT_EXPORT PAL_EXPORT
-
-#else // !USE(EXPORT_MACROS)
-
-#define PAL_EXPORT
-#define PAL_TESTSUPPORT_EXPORT
-
-#endif // USE(EXPORT_MACROS)

Modified: trunk/Source/WebCore/platform/PlatformExportMacros.h (256719 => 256720)


--- trunk/Source/WebCore/platform/PlatformExportMacros.h	2020-02-17 02:11:42 UTC (rev 256719)
+++ trunk/Source/WebCore/platform/PlatformExportMacros.h	2020-02-17 02:49:45 UTC (rev 256720)
@@ -34,8 +34,8 @@
 #if USE(EXPORT_MACROS)
 
 #if !PLATFORM(WIN)
-#define WEBCORE_EXPORT WTF_EXPORT
-#define WEBCORE_TESTSUPPORT_EXPORT WTF_EXPORT
+#define WEBCORE_EXPORT WTF_EXPORT_DECLARATION
+#define WEBCORE_TESTSUPPORT_EXPORT WTF_EXPORT_DECLARATION
 #else
 // Windows must set this per-project
 #endif

Modified: trunk/Source/WebKit/ChangeLog (256719 => 256720)


--- trunk/Source/WebKit/ChangeLog	2020-02-17 02:11:42 UTC (rev 256719)
+++ trunk/Source/WebKit/ChangeLog	2020-02-17 02:49:45 UTC (rev 256720)
@@ -1,3 +1,13 @@
+2020-02-16  Fujii Hironori  <[email protected]>
+
+        Remove remaining WTF_EXPORT and WTF_IMPORT by replacing them with WTF_EXPORT_DECLARATION and WTF_IMPORT_DECLARATION
+        https://bugs.webkit.org/show_bug.cgi?id=207746
+
+        Reviewed by Don Olmstead.
+
+        * WebProcess/win/WebProcessWin.cpp:
+        (loadResourceIntoBuffer): Removed WTF_EXPORT. loadResourceIntoBuffer is used from WebCore which is in same DLL.
+
 2020-02-16  Youenn Fablet  <[email protected]>
 
         Log WebSocket failure in case of network crash

Modified: trunk/Source/WebKit/WebProcess/win/WebProcessWin.cpp (256719 => 256720)


--- trunk/Source/WebKit/WebProcess/win/WebProcessWin.cpp	2020-02-17 02:11:42 UTC (rev 256719)
+++ trunk/Source/WebKit/WebProcess/win/WebProcessWin.cpp	2020-02-17 02:49:45 UTC (rev 256720)
@@ -28,7 +28,7 @@
 
 #include <WebCore/SharedBuffer.h>
 
-WTF_EXPORT RefPtr<WebCore::SharedBuffer> loadResourceIntoBuffer(const char* name)
+RefPtr<WebCore::SharedBuffer> loadResourceIntoBuffer(const char* name)
 {
     return 0;
 }

Modified: trunk/Tools/ChangeLog (256719 => 256720)


--- trunk/Tools/ChangeLog	2020-02-17 02:11:42 UTC (rev 256719)
+++ trunk/Tools/ChangeLog	2020-02-17 02:49:45 UTC (rev 256720)
@@ -1,3 +1,12 @@
+2020-02-16  Fujii Hironori  <[email protected]>
+
+        Remove remaining WTF_EXPORT and WTF_IMPORT by replacing them with WTF_EXPORT_DECLARATION and WTF_IMPORT_DECLARATION
+        https://bugs.webkit.org/show_bug.cgi?id=207746
+
+        Reviewed by Don Olmstead.
+
+        * MiniBrowser/win/stdafx.h:
+
 2020-02-16  Brady Eidson  <[email protected]>
 
         Expose "allowsContentJavaScript" on WKWebpagePreferences

Modified: trunk/Tools/MiniBrowser/win/stdafx.h (256719 => 256720)


--- trunk/Tools/MiniBrowser/win/stdafx.h	2020-02-17 02:11:42 UTC (rev 256719)
+++ trunk/Tools/MiniBrowser/win/stdafx.h	2020-02-17 02:49:45 UTC (rev 256720)
@@ -70,4 +70,4 @@
 #endif
 #endif
 
-#define WEBCORE_EXPORT WTF_IMPORT
+#define WEBCORE_EXPORT WTF_IMPORT_DECLARATION
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to