Title: [261014] trunk
Revision
261014
Author
[email protected]
Date
2020-05-01 12:50:02 -0700 (Fri, 01 May 2020)

Log Message

[GTK] Add additional exports to support hidden visibility
https://bugs.webkit.org/show_bug.cgi?id=211246

Reviewed by Michael Catanzaro.

Source/_javascript_Core:

* API/glib/JSCContextPrivate.h:
* API/glib/JSCValuePrivate.h:
* inspector/remote/glib/RemoteInspectorServer.h:
* inspector/remote/glib/RemoteInspectorUtils.h:

Source/WebCore:

* platform/ContentType.h:
* platform/graphics/cairo/RefPtrCairo.h:
* platform/gtk/GtkUtilities.h:
* platform/network/soup/CertificateInfo.h:
* platform/network/soup/SoupNetworkSession.h:

Source/WebKit:

* WebProcess/InjectedBundle/API/glib/WebKitWebExtensionPrivate.h:

Source/WTF:

* wtf/ASCIICType.cpp:
* wtf/DateMath.h:
* wtf/FileSystem.h:
* wtf/PrintStream.h:
* wtf/RunLoop.h:
* wtf/glib/GLibUtilities.h:
* wtf/glib/GSocketMonitor.h:
* wtf/glib/SocketConnection.h:
(WTF::SocketConnection::isClosed const):
* wtf/linux/CurrentProcessMemoryStatus.h:

Tools:

* DumpRenderTree/TestNetscapePlugIn/main.cpp:
* TestWebKitAPI/InjectedBundleMain.cpp:
* TestWebKitAPI/Tests/WebKitGLib/WebExtensionTest.cpp:
(webkit_web_extension_initialize_with_user_data):
* TestWebKitAPI/Tests/WebKitGLib/WebProcessTest.cpp:
(webkit_web_extension_initialize):
* WebKitTestRunner/InjectedBundle/InjectedBundleMain.cpp:

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/API/glib/JSCContextPrivate.h (261013 => 261014)


--- trunk/Source/_javascript_Core/API/glib/JSCContextPrivate.h	2020-05-01 19:47:39 UTC (rev 261013)
+++ trunk/Source/_javascript_Core/API/glib/JSCContextPrivate.h	2020-05-01 19:50:02 UTC (rev 261014)
@@ -25,9 +25,9 @@
 #include "JSContextRef.h"
 #include <wtf/glib/GRefPtr.h>
 
-GRefPtr<JSCContext> jscContextGetOrCreate(JSGlobalContextRef);
-JSGlobalContextRef jscContextGetJSContext(JSCContext*);
-GRefPtr<JSCValue> jscContextGetOrCreateValue(JSCContext*, JSValueRef);
+JS_EXPORT_PRIVATE GRefPtr<JSCContext> jscContextGetOrCreate(JSGlobalContextRef);
+JS_EXPORT_PRIVATE JSGlobalContextRef jscContextGetJSContext(JSCContext*);
+JS_EXPORT_PRIVATE GRefPtr<JSCValue> jscContextGetOrCreateValue(JSCContext*, JSValueRef);
 void jscContextValueDestroyed(JSCContext*, JSValueRef);
 JSC::JSObject* jscContextGetJSWrapper(JSCContext*, gpointer);
 JSC::JSObject* jscContextGetOrCreateJSWrapper(JSCContext*, JSClassRef, JSValueRef prototype = nullptr, gpointer = nullptr, GDestroyNotify = nullptr);

Modified: trunk/Source/_javascript_Core/API/glib/JSCValuePrivate.h (261013 => 261014)


--- trunk/Source/_javascript_Core/API/glib/JSCValuePrivate.h	2020-05-01 19:47:39 UTC (rev 261013)
+++ trunk/Source/_javascript_Core/API/glib/JSCValuePrivate.h	2020-05-01 19:50:02 UTC (rev 261014)
@@ -21,5 +21,5 @@
 
 #include "JSCValue.h"
 
-JSValueRef jscValueGetJSValue(JSCValue*);
+JS_EXPORT_PRIVATE JSValueRef jscValueGetJSValue(JSCValue*);
 JSCValue* jscValueCreate(JSCContext*, JSValueRef);

Modified: trunk/Source/_javascript_Core/ChangeLog (261013 => 261014)


--- trunk/Source/_javascript_Core/ChangeLog	2020-05-01 19:47:39 UTC (rev 261013)
+++ trunk/Source/_javascript_Core/ChangeLog	2020-05-01 19:50:02 UTC (rev 261014)
@@ -1,5 +1,17 @@
 2020-05-01  Don Olmstead  <[email protected]>
 
+        [GTK] Add additional exports to support hidden visibility
+        https://bugs.webkit.org/show_bug.cgi?id=211246
+
+        Reviewed by Michael Catanzaro.
+
+        * API/glib/JSCContextPrivate.h:
+        * API/glib/JSCValuePrivate.h:
+        * inspector/remote/glib/RemoteInspectorServer.h:
+        * inspector/remote/glib/RemoteInspectorUtils.h:
+
+2020-05-01  Don Olmstead  <[email protected]>
+
         Use export macros on all platforms
         https://bugs.webkit.org/show_bug.cgi?id=211293
 

Modified: trunk/Source/_javascript_Core/inspector/remote/glib/RemoteInspectorServer.h (261013 => 261014)


--- trunk/Source/_javascript_Core/inspector/remote/glib/RemoteInspectorServer.h	2020-05-01 19:47:39 UTC (rev 261013)
+++ trunk/Source/_javascript_Core/inspector/remote/glib/RemoteInspectorServer.h	2020-05-01 19:50:02 UTC (rev 261014)
@@ -40,10 +40,10 @@
 
 class RemoteInspectorServer {
 public:
-    static RemoteInspectorServer& singleton();
+    JS_EXPORT_PRIVATE static RemoteInspectorServer& singleton();
     ~RemoteInspectorServer();
 
-    bool start(const char* address, unsigned port);
+    JS_EXPORT_PRIVATE bool start(const char* address, unsigned port);
     bool isRunning() const { return !!m_service; }
 
 private:

Modified: trunk/Source/_javascript_Core/inspector/remote/glib/RemoteInspectorUtils.h (261013 => 261014)


--- trunk/Source/_javascript_Core/inspector/remote/glib/RemoteInspectorUtils.h	2020-05-01 19:47:39 UTC (rev 261013)
+++ trunk/Source/_javascript_Core/inspector/remote/glib/RemoteInspectorUtils.h	2020-05-01 19:50:02 UTC (rev 261014)
@@ -35,7 +35,7 @@
 namespace Inspector {
 
 GRefPtr<GBytes> backendCommands();
-const CString& backendCommandsHash();
+JS_EXPORT_PRIVATE const CString& backendCommandsHash();
 
 } // namespace Inspector
 

Modified: trunk/Source/WTF/ChangeLog (261013 => 261014)


--- trunk/Source/WTF/ChangeLog	2020-05-01 19:47:39 UTC (rev 261013)
+++ trunk/Source/WTF/ChangeLog	2020-05-01 19:50:02 UTC (rev 261014)
@@ -1,3 +1,21 @@
+2020-05-01  Don Olmstead  <[email protected]>
+
+        [GTK] Add additional exports to support hidden visibility
+        https://bugs.webkit.org/show_bug.cgi?id=211246
+
+        Reviewed by Michael Catanzaro.
+
+        * wtf/ASCIICType.cpp:
+        * wtf/DateMath.h:
+        * wtf/FileSystem.h:
+        * wtf/PrintStream.h:
+        * wtf/RunLoop.h:
+        * wtf/glib/GLibUtilities.h:
+        * wtf/glib/GSocketMonitor.h:
+        * wtf/glib/SocketConnection.h:
+        (WTF::SocketConnection::isClosed const):
+        * wtf/linux/CurrentProcessMemoryStatus.h:
+
 2020-05-01  Yusuke Suzuki  <[email protected]>
 
         Introduce MainThreadNeverDestroyed / MainThreadLazyNeverDestroyed

Modified: trunk/Source/WTF/wtf/ASCIICType.cpp (261013 => 261014)


--- trunk/Source/WTF/wtf/ASCIICType.cpp	2020-05-01 19:47:39 UTC (rev 261013)
+++ trunk/Source/WTF/wtf/ASCIICType.cpp	2020-05-01 19:50:02 UTC (rev 261014)
@@ -27,7 +27,7 @@
 
 namespace WTF {
 
-WTF_EXPORT_PRIVATE const unsigned char asciiCaseFoldTable[256] = {
+const unsigned char asciiCaseFoldTable[256] = {
     0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
     0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
     0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,

Modified: trunk/Source/WTF/wtf/DateMath.h (261013 => 261014)


--- trunk/Source/WTF/wtf/DateMath.h	2020-05-01 19:47:39 UTC (rev 261013)
+++ trunk/Source/WTF/wtf/DateMath.h	2020-05-01 19:50:02 UTC (rev 261014)
@@ -93,7 +93,7 @@
 WTF_EXPORT_PRIVATE double parseDateFromNullTerminatedCharacters(const char* dateString);
 WTF_EXPORT_PRIVATE double parseDateFromNullTerminatedCharacters(const char* dateString, bool& isLocalTime);
 // dayOfWeek: [0, 6] 0 being Monday, day: [1, 31], month: [0, 11], year: ex: 2011, hours: [0, 23], minutes: [0, 59], seconds: [0, 59], utcOffset: [-720,720]. 
-String makeRFC2822DateString(unsigned dayOfWeek, unsigned day, unsigned month, unsigned year, unsigned hours, unsigned minutes, unsigned seconds, int utcOffset);
+WTF_EXPORT_PRIVATE String makeRFC2822DateString(unsigned dayOfWeek, unsigned day, unsigned month, unsigned year, unsigned hours, unsigned minutes, unsigned seconds, int utcOffset);
 
 inline double jsCurrentTime()
 {

Modified: trunk/Source/WTF/wtf/FileSystem.h (261013 => 261014)


--- trunk/Source/WTF/wtf/FileSystem.h	2020-05-01 19:47:39 UTC (rev 261013)
+++ trunk/Source/WTF/wtf/FileSystem.h	2020-05-01 19:50:02 UTC (rev 261014)
@@ -140,7 +140,7 @@
 WTF_EXPORT_PRIVATE Vector<String> listDirectory(const String& path, const String& filter);
 
 WTF_EXPORT_PRIVATE CString fileSystemRepresentation(const String&);
-String stringFromFileSystemRepresentation(const char*);
+WTF_EXPORT_PRIVATE String stringFromFileSystemRepresentation(const char*);
 
 inline bool isHandleValid(const PlatformFileHandle& handle) { return handle != invalidPlatformFileHandle; }
 

Modified: trunk/Source/WTF/wtf/PrintStream.h (261013 => 261014)


--- trunk/Source/WTF/wtf/PrintStream.h	2020-05-01 19:47:39 UTC (rev 261013)
+++ trunk/Source/WTF/wtf/PrintStream.h	2020-05-01 19:50:02 UTC (rev 261014)
@@ -89,8 +89,8 @@
         printImpl(remainingValues...);
     }
     
-    virtual PrintStream& begin();
-    virtual void end();
+    WTF_EXPORT_PRIVATE virtual PrintStream& begin();
+    WTF_EXPORT_PRIVATE virtual void end();
 };
 
 WTF_EXPORT_PRIVATE void printInternal(PrintStream&, const char*);

Modified: trunk/Source/WTF/wtf/RunLoop.h (261013 => 261014)


--- trunk/Source/WTF/wtf/RunLoop.h	2020-05-01 19:47:39 UTC (rev 261013)
+++ trunk/Source/WTF/wtf/RunLoop.h	2020-05-01 19:50:02 UTC (rev 261014)
@@ -117,8 +117,8 @@
         virtual void fired() = 0;
 
 #if USE(GLIB_EVENT_LOOP)
-        void setName(const char*);
-        void setPriority(int);
+        WTF_EXPORT_PRIVATE void setName(const char*);
+        WTF_EXPORT_PRIVATE void setPriority(int);
 #endif
 
     private:

Modified: trunk/Source/WTF/wtf/glib/GLibUtilities.h (261013 => 261014)


--- trunk/Source/WTF/wtf/glib/GLibUtilities.h	2020-05-01 19:47:39 UTC (rev 261013)
+++ trunk/Source/WTF/wtf/glib/GLibUtilities.h	2020-05-01 19:50:02 UTC (rev 261014)
@@ -24,9 +24,9 @@
 #include <wtf/Assertions.h>
 #include <wtf/text/CString.h>
 
-CString getCurrentExecutablePath();
-CString getCurrentExecutableName();
-CString enumToString(GType, guint value);
+WTF_EXPORT_PRIVATE CString getCurrentExecutablePath();
+WTF_EXPORT_PRIVATE CString getCurrentExecutableName();
+WTF_EXPORT_PRIVATE CString enumToString(GType, guint value);
 
 // These might be added to glib in the future, but in the meantime they're defined here.
 #ifndef GULONG_TO_POINTER

Modified: trunk/Source/WTF/wtf/glib/GSocketMonitor.h (261013 => 261014)


--- trunk/Source/WTF/wtf/glib/GSocketMonitor.h	2020-05-01 19:47:39 UTC (rev 261013)
+++ trunk/Source/WTF/wtf/glib/GSocketMonitor.h	2020-05-01 19:50:02 UTC (rev 261014)
@@ -39,10 +39,10 @@
     WTF_MAKE_NONCOPYABLE(GSocketMonitor);
 public:
     GSocketMonitor() = default;
-    ~GSocketMonitor();
+    WTF_EXPORT_PRIVATE ~GSocketMonitor();
 
-    void start(GSocket*, GIOCondition, RunLoop&, Function<gboolean(GIOCondition)>&&);
-    void stop();
+    WTF_EXPORT_PRIVATE void start(GSocket*, GIOCondition, RunLoop&, Function<gboolean(GIOCondition)>&&);
+    WTF_EXPORT_PRIVATE void stop();
     bool isActive() const { return !!m_source; }
 
 private:

Modified: trunk/Source/WTF/wtf/glib/SocketConnection.h (261013 => 261014)


--- trunk/Source/WTF/wtf/glib/SocketConnection.h	2020-05-01 19:47:39 UTC (rev 261013)
+++ trunk/Source/WTF/wtf/glib/SocketConnection.h	2020-05-01 19:50:02 UTC (rev 261014)
@@ -40,14 +40,15 @@
     {
         return adoptRef(*new SocketConnection(WTFMove(connection), messageHandlers, userData));
     }
-    ~SocketConnection();
+    WTF_EXPORT_PRIVATE ~SocketConnection();
 
+    WTF_EXPORT_PRIVATE void sendMessage(const char*, GVariant*);
+
     bool isClosed() const { return !m_connection; }
-    void sendMessage(const char*, GVariant*);
     void close();
 
 private:
-    SocketConnection(GRefPtr<GSocketConnection>&&, const MessageHandlers&, gpointer);
+    WTF_EXPORT_PRIVATE SocketConnection(GRefPtr<GSocketConnection>&&, const MessageHandlers&, gpointer);
 
     bool read();
     bool readMessage();

Modified: trunk/Source/WTF/wtf/linux/CurrentProcessMemoryStatus.h (261013 => 261014)


--- trunk/Source/WTF/wtf/linux/CurrentProcessMemoryStatus.h	2020-05-01 19:47:39 UTC (rev 261013)
+++ trunk/Source/WTF/wtf/linux/CurrentProcessMemoryStatus.h	2020-05-01 19:50:02 UTC (rev 261014)
@@ -38,7 +38,7 @@
     size_t dt { 0 };
 };
 
-void currentProcessMemoryStatus(ProcessMemoryStatus&);
+WTF_EXPORT_PRIVATE void currentProcessMemoryStatus(ProcessMemoryStatus&);
 
 } // namespace WTF
 

Modified: trunk/Source/WebCore/ChangeLog (261013 => 261014)


--- trunk/Source/WebCore/ChangeLog	2020-05-01 19:47:39 UTC (rev 261013)
+++ trunk/Source/WebCore/ChangeLog	2020-05-01 19:50:02 UTC (rev 261014)
@@ -1,3 +1,16 @@
+2020-05-01  Don Olmstead  <[email protected]>
+
+        [GTK] Add additional exports to support hidden visibility
+        https://bugs.webkit.org/show_bug.cgi?id=211246
+
+        Reviewed by Michael Catanzaro.
+
+        * platform/ContentType.h:
+        * platform/graphics/cairo/RefPtrCairo.h:
+        * platform/gtk/GtkUtilities.h:
+        * platform/network/soup/CertificateInfo.h:
+        * platform/network/soup/SoupNetworkSession.h:
+
 2020-05-01  Yusuke Suzuki  <[email protected]>
 
         Introduce MainThreadNeverDestroyed / MainThreadLazyNeverDestroyed

Modified: trunk/Source/WebCore/platform/ContentType.h (261013 => 261014)


--- trunk/Source/WebCore/platform/ContentType.h	2020-05-01 19:47:39 UTC (rev 261013)
+++ trunk/Source/WebCore/platform/ContentType.h	2020-05-01 19:50:02 UTC (rev 261014)
@@ -37,11 +37,11 @@
     WEBCORE_EXPORT explicit ContentType(const String& type);
     ContentType() = default;
 
-    static const String& codecsParameter();
+    WEBCORE_EXPORT static const String& codecsParameter();
     static const String& profilesParameter();
 
-    String parameter(const String& parameterName) const;
-    String containerType() const;
+    WEBCORE_EXPORT String parameter(const String& parameterName) const;
+    WEBCORE_EXPORT String containerType() const;
     Vector<String> codecs() const;
     Vector<String> profiles() const;
     const String& raw() const { return m_type; }

Modified: trunk/Source/WebCore/platform/graphics/cairo/RefPtrCairo.h (261013 => 261014)


--- trunk/Source/WebCore/platform/graphics/cairo/RefPtrCairo.h	2020-05-01 19:47:39 UTC (rev 261013)
+++ trunk/Source/WebCore/platform/graphics/cairo/RefPtrCairo.h	2020-05-01 19:50:02 UTC (rev 261014)
@@ -36,7 +36,7 @@
 template<> void refIfNotNull(cairo_t* ptr);
 template<> WEBCORE_EXPORT void derefIfNotNull(cairo_t* ptr);
 
-template<> void refIfNotNull(cairo_surface_t* ptr);
+template<> WEBCORE_EXPORT void refIfNotNull(cairo_surface_t* ptr);
 template<> WEBCORE_EXPORT void derefIfNotNull(cairo_surface_t* ptr);
 
 template<> void refIfNotNull(cairo_font_face_t* ptr);

Modified: trunk/Source/WebCore/platform/gtk/GtkUtilities.h (261013 => 261014)


--- trunk/Source/WebCore/platform/gtk/GtkUtilities.h	2020-05-01 19:47:39 UTC (rev 261013)
+++ trunk/Source/WebCore/platform/gtk/GtkUtilities.h	2020-05-01 19:50:02 UTC (rev 261014)
@@ -45,6 +45,6 @@
 
 String defaultGtkSystemFont();
 
-unsigned stateModifierForGdkButton(unsigned button);
+WEBCORE_EXPORT unsigned stateModifierForGdkButton(unsigned button);
 
 } // namespace WebCore

Modified: trunk/Source/WebCore/platform/network/soup/CertificateInfo.h (261013 => 261014)


--- trunk/Source/WebCore/platform/network/soup/CertificateInfo.h	2020-05-01 19:47:39 UTC (rev 261013)
+++ trunk/Source/WebCore/platform/network/soup/CertificateInfo.h	2020-05-01 19:50:02 UTC (rev 261014)
@@ -46,7 +46,7 @@
     explicit CertificateInfo(const WebCore::ResourceResponse&);
     explicit CertificateInfo(const WebCore::ResourceError&);
     explicit CertificateInfo(GTlsCertificate*, GTlsCertificateFlags);
-    ~CertificateInfo();
+    WEBCORE_EXPORT ~CertificateInfo();
 
     GTlsCertificate* certificate() const { return m_certificate.get(); }
     void setCertificate(GTlsCertificate* certificate) { m_certificate = certificate; }

Modified: trunk/Source/WebCore/platform/network/soup/SoupNetworkSession.h (261013 => 261014)


--- trunk/Source/WebCore/platform/network/soup/SoupNetworkSession.h	2020-05-01 19:47:39 UTC (rev 261013)
+++ trunk/Source/WebCore/platform/network/soup/SoupNetworkSession.h	2020-05-01 19:50:02 UTC (rev 261014)
@@ -68,7 +68,7 @@
     static void setInitialAcceptLanguages(const CString&);
     void setAcceptLanguages(const CString&);
 
-    static void setShouldIgnoreTLSErrors(bool);
+    WEBCORE_EXPORT static void setShouldIgnoreTLSErrors(bool);
     static Optional<ResourceError> checkTLSErrors(const URL&, GTlsCertificate*, GTlsCertificateFlags);
     static void allowSpecificHTTPSCertificateForHost(const CertificateInfo&, const String& host);
 

Modified: trunk/Source/WebKit/ChangeLog (261013 => 261014)


--- trunk/Source/WebKit/ChangeLog	2020-05-01 19:47:39 UTC (rev 261013)
+++ trunk/Source/WebKit/ChangeLog	2020-05-01 19:50:02 UTC (rev 261014)
@@ -1,3 +1,12 @@
+2020-05-01  Don Olmstead  <[email protected]>
+
+        [GTK] Add additional exports to support hidden visibility
+        https://bugs.webkit.org/show_bug.cgi?id=211246
+
+        Reviewed by Michael Catanzaro.
+
+        * WebProcess/InjectedBundle/API/glib/WebKitWebExtensionPrivate.h:
+
 2020-05-01  Per Arne Vollan  <[email protected]>
 
         [iOS] Update message filtering rules in the WebContent process' sandbox

Modified: trunk/Source/WebKit/WebProcess/InjectedBundle/API/glib/WebKitWebExtensionPrivate.h (261013 => 261014)


--- trunk/Source/WebKit/WebProcess/InjectedBundle/API/glib/WebKitWebExtensionPrivate.h	2020-05-01 19:47:39 UTC (rev 261013)
+++ trunk/Source/WebKit/WebProcess/InjectedBundle/API/glib/WebKitWebExtensionPrivate.h	2020-05-01 19:50:02 UTC (rev 261014)
@@ -21,8 +21,9 @@
 
 #include "InjectedBundle.h"
 #include "UserMessage.h"
+#include "WKDeclarationSpecifiers.h"
 #include "WebKitWebExtension.h"
 
 WebKitWebExtension* webkitWebExtensionCreate(WebKit::InjectedBundle*);
 void webkitWebExtensionDidReceiveUserMessage(WebKitWebExtension*, WebKit::UserMessage&&);
-void webkitWebExtensionSetGarbageCollectOnPageDestroy(WebKitWebExtension*);
+WK_EXPORT void webkitWebExtensionSetGarbageCollectOnPageDestroy(WebKitWebExtension*);

Modified: trunk/Tools/ChangeLog (261013 => 261014)


--- trunk/Tools/ChangeLog	2020-05-01 19:47:39 UTC (rev 261013)
+++ trunk/Tools/ChangeLog	2020-05-01 19:50:02 UTC (rev 261014)
@@ -1,5 +1,20 @@
 2020-05-01  Don Olmstead  <[email protected]>
 
+        [GTK] Add additional exports to support hidden visibility
+        https://bugs.webkit.org/show_bug.cgi?id=211246
+
+        Reviewed by Michael Catanzaro.
+
+        * DumpRenderTree/TestNetscapePlugIn/main.cpp:
+        * TestWebKitAPI/InjectedBundleMain.cpp:
+        * TestWebKitAPI/Tests/WebKitGLib/WebExtensionTest.cpp:
+        (webkit_web_extension_initialize_with_user_data):
+        * TestWebKitAPI/Tests/WebKitGLib/WebProcessTest.cpp:
+        (webkit_web_extension_initialize):
+        * WebKitTestRunner/InjectedBundle/InjectedBundleMain.cpp:
+
+2020-05-01  Don Olmstead  <[email protected]>
+
         Use export macros on all platforms
         https://bugs.webkit.org/show_bug.cgi?id=211293
 

Modified: trunk/Tools/DumpRenderTree/TestNetscapePlugIn/main.cpp (261013 => 261014)


--- trunk/Tools/DumpRenderTree/TestNetscapePlugIn/main.cpp	2020-05-01 19:47:39 UTC (rev 261013)
+++ trunk/Tools/DumpRenderTree/TestNetscapePlugIn/main.cpp	2020-05-01 19:50:02 UTC (rev 261014)
@@ -53,11 +53,12 @@
 #endif
 
 extern "C" {
+WTF_EXPORT_DECLARATION
 NPError STDCALL NP_GetEntryPoints(NPPluginFuncs *pluginFuncs);
 }
 
 // Entry points
-extern "C"
+extern "C" WTF_EXPORT_DECLARATION
 NPError STDCALL NP_Initialize(NPNetscapeFuncs *browserFuncs
 #if defined(XP_UNIX)
                               , NPPluginFuncs *pluginFuncs
@@ -114,7 +115,7 @@
     return NPERR_NO_ERROR;
 }
 
-extern "C"
+extern "C" WTF_EXPORT_DECLARATION
 void STDCALL NP_Shutdown(void)
 {
     PluginTest::NP_Shutdown();
@@ -728,13 +729,13 @@
 }
 
 #if defined(XP_UNIX)
-extern "C"
+extern "C" WTF_EXPORT_DECLARATION
 const char* NP_GetMIMEDescription(void)
 {
     return "application/x-webkit-test-netscape:testnetscape:test netscape content;image/png:png:PNG image";
 }
 
-extern "C"
+extern "C" WTF_EXPORT_DECLARATION
 NPError NP_GetValue(NPP instance, NPPVariable variable, void* value)
 {
     return NPP_GetValue(instance, variable, value);

Modified: trunk/Tools/TestWebKitAPI/InjectedBundleMain.cpp (261013 => 261014)


--- trunk/Tools/TestWebKitAPI/InjectedBundleMain.cpp	2020-05-01 19:47:39 UTC (rev 261013)
+++ trunk/Tools/TestWebKitAPI/InjectedBundleMain.cpp	2020-05-01 19:50:02 UTC (rev 261014)
@@ -30,11 +30,7 @@
 #include "InjectedBundleController.h"
 #include <WebKit/WKBundleInitialize.h>
 
-#if defined(WIN32) || defined(_WIN32)
-extern "C" __declspec(dllexport) 
-#else
-extern "C"
-#endif
+extern "C" WTF_EXPORT_DECLARATION
 void WKBundleInitialize(WKBundleRef bundle, WKTypeRef initializationUserData)
 {
     TestWebKitAPI::InjectedBundleController::singleton().initialize(bundle, initializationUserData);

Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitGLib/WebExtensionTest.cpp (261013 => 261014)


--- trunk/Tools/TestWebKitAPI/Tests/WebKitGLib/WebExtensionTest.cpp	2020-05-01 19:47:39 UTC (rev 261013)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitGLib/WebExtensionTest.cpp	2020-05-01 19:50:02 UTC (rev 261014)
@@ -704,7 +704,7 @@
     g_resource_unref(resource);
 }
 
-extern "C" void webkit_web_extension_initialize_with_user_data(WebKitWebExtension* extension, GVariant* userData)
+extern "C" WTF_EXPORT_DECLARATION void webkit_web_extension_initialize_with_user_data(WebKitWebExtension* extension, GVariant* userData)
 {
     WebKitScriptWorld* isolatedWorld = webkit_script_world_new_with_name("WebExtensionTestScriptWorld");
     g_assert_true(WEBKIT_IS_SCRIPT_WORLD(isolatedWorld));

Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitGLib/WebProcessTest.cpp (261013 => 261014)


--- trunk/Tools/TestWebKitAPI/Tests/WebKitGLib/WebProcessTest.cpp	2020-05-01 19:47:39 UTC (rev 261013)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitGLib/WebProcessTest.cpp	2020-05-01 19:50:02 UTC (rev 261014)
@@ -99,7 +99,7 @@
     jsc_context_set_value(context.get(), "WebProcessTestRunner", testRunner.get());
 }
 
-extern "C" void webkit_web_extension_initialize(WebKitWebExtension* extension)
+extern "C" WTF_EXPORT_DECLARATION void webkit_web_extension_initialize(WebKitWebExtension* extension)
 {
     webkitWebExtensionSetGarbageCollectOnPageDestroy(extension);
     g_signal_connect(webkit_script_world_get_default(), "window-object-cleared", G_CALLBACK(windowObjectClearedCallback), extension);

Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundleMain.cpp (261013 => 261014)


--- trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundleMain.cpp	2020-05-01 19:47:39 UTC (rev 261013)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundleMain.cpp	2020-05-01 19:50:02 UTC (rev 261014)
@@ -28,11 +28,7 @@
 
 #include <WebKit/WKBundleInitialize.h>
 
-#if defined(WIN32)
-extern "C" __declspec(dllexport)
-#else
-extern "C"
-#endif
+extern "C" WTF_EXPORT_DECLARATION
 void WKBundleInitialize(WKBundleRef bundle, WKTypeRef initializationUserData)
 {
     WTR::InjectedBundle::singleton().initialize(bundle, initializationUserData);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to