Fix WebCore export macros for declspec
authordon.olmstead@sony.com <don.olmstead@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 28 Feb 2020 06:25:51 +0000 (06:25 +0000)
committerdon.olmstead@sony.com <don.olmstead@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 28 Feb 2020 06:25:51 +0000 (06:25 +0000)
https://bugs.webkit.org/show_bug.cgi?id=208363

Reviewed by Konstantin Tokarev.

Source/WebCore:

Modified the PlatformExportMacros to match the other export macros. Originally
Windows ports were treated differently and they had to set their own export macros.
This isn't ideal because how WebCore is built is really dependent on the CMake
definition of the library type.

* CMakeLists.txt:
* WebCorePrefix.h:
* platform/PlatformExportMacros.h:
* testing/js/WebCoreTestSupportPrefix.h:

Source/WebKit:

Add compilation definitions for static linking of PAL and WebCore in WebKit.

* PlatformFTW.cmake:
* PlatformWin.cmake:
* config.h:

Source/WebKitLegacy:

Add compilation definitions for static linking of PAL and WebCore in WebKitLegacy.

* PlatformFTW.cmake:
* PlatformWin.cmake:

Source/WebKitLegacy/win:

Remove setting of WEBCORE_EXPORT from the header files.

* WebKitPrefix.h:

Tools:

Remove setting of WEBCORE_EXPORT and WEBCORE_TESTSUPPORT_EXPORT from the header
files. Removed precompiled headers that were empty.

* DumpRenderTree/DumpRenderTreePrefix.h:
* DumpRenderTree/win/DefaultPolicyDelegate.cpp: Added a missing config.h.
* MiniBrowser/win/stdafx.h:
* TestWebKitAPI/win/TestWebKitAPIPrefix.cpp: Removed.
* TestWebKitAPI/win/TestWebKitAPIPrefix.h: Removed.
* WebKitTestRunner/InjectedBundle/win/TestRunnerInjectedBundlePrefix.cpp: Removed.
* WebKitTestRunner/InjectedBundle/win/TestRunnerInjectedBundlePrefix.h: Removed.
* WebKitTestRunner/PlatformFTW.cmake:
* WebKitTestRunner/PlatformWin.cmake:
* WebKitTestRunner/WebKitTestRunnerPrefix.h:

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

25 files changed:
Source/WebCore/CMakeLists.txt
Source/WebCore/ChangeLog
Source/WebCore/WebCorePrefix.h
Source/WebCore/platform/PlatformExportMacros.h
Source/WebCore/testing/js/WebCoreTestSupportPrefix.h
Source/WebKit/ChangeLog
Source/WebKit/PlatformFTW.cmake
Source/WebKit/PlatformWin.cmake
Source/WebKit/config.h
Source/WebKitLegacy/ChangeLog
Source/WebKitLegacy/PlatformFTW.cmake
Source/WebKitLegacy/PlatformWin.cmake
Source/WebKitLegacy/win/ChangeLog
Source/WebKitLegacy/win/WebKitPrefix.h
Tools/ChangeLog
Tools/DumpRenderTree/DumpRenderTreePrefix.h
Tools/DumpRenderTree/win/DefaultPolicyDelegate.cpp
Tools/MiniBrowser/win/stdafx.h
Tools/TestWebKitAPI/win/TestWebKitAPIPrefix.cpp [deleted file]
Tools/TestWebKitAPI/win/TestWebKitAPIPrefix.h [deleted file]
Tools/WebKitTestRunner/InjectedBundle/win/TestRunnerInjectedBundlePrefix.cpp [deleted file]
Tools/WebKitTestRunner/InjectedBundle/win/TestRunnerInjectedBundlePrefix.h [deleted file]
Tools/WebKitTestRunner/PlatformFTW.cmake
Tools/WebKitTestRunner/PlatformWin.cmake
Tools/WebKitTestRunner/WebKitTestRunnerPrefix.h

index 7969848..37cb1be 100644 (file)
@@ -1991,6 +1991,7 @@ endif ()
 
 add_library(WebCoreTestSupport ${WebCoreTestSupport_LIBRARY_TYPE} ${WebCoreTestSupport_SOURCES})
 add_dependencies(WebCoreTestSupport WebCore WebCoreTestSupportBindings)
+target_compile_definitions(WebCoreTestSupport PRIVATE "BUILDING_WebCoreTestSupport")
 target_include_directories(WebCoreTestSupport PUBLIC ${WebCoreTestSupport_INCLUDE_DIRECTORIES} ${WebCore_INCLUDE_DIRECTORIES})
 target_include_directories(WebCoreTestSupport PRIVATE ${WebCoreTestSupport_PRIVATE_INCLUDE_DIRECTORIES} ${WebCore_PRIVATE_INCLUDE_DIRECTORIES})
 target_include_directories(WebCoreTestSupport SYSTEM PUBLIC ${WebCoreTestSupport_SYSTEM_INCLUDE_DIRECTORIES} ${WebCore_SYSTEM_INCLUDE_DIRECTORIES})
index 92c5d54..0471755 100644 (file)
@@ -1,3 +1,20 @@
+2020-02-27  Don Olmstead  <don.olmstead@sony.com>
+
+        Fix WebCore export macros for declspec
+        https://bugs.webkit.org/show_bug.cgi?id=208363
+
+        Reviewed by Konstantin Tokarev.
+
+        Modified the PlatformExportMacros to match the other export macros. Originally
+        Windows ports were treated differently and they had to set their own export macros.
+        This isn't ideal because how WebCore is built is really dependent on the CMake
+        definition of the library type.
+
+        * CMakeLists.txt:
+        * WebCorePrefix.h:
+        * platform/PlatformExportMacros.h:
+        * testing/js/WebCoreTestSupportPrefix.h:
+
 2020-02-27  Dean Jackson  <dino@apple.com>
 
         MemoryRelease logging uses a unique_ptr with unclear lifetime
index 7a3fc52..48d491b 100644 (file)
 #endif
 #endif
 
-#if PLATFORM(WIN)
-#undef WEBCORE_EXPORT
-#define WEBCORE_EXPORT WTF_EXPORT_DECLARATION
-#else
+#if !OS(WINDOWS)
 #include <pthread.h>
-#endif // PLATFORM(WIN)
+#endif // !OS(WINDOWS)
 
 #include <sys/types.h>
 #include <fcntl.h>
index 21642ff..3fba3e2 100644 (file)
 
 #include <wtf/ExportMacros.h>
 
-#if USE(EXPORT_MACROS)
-
-#if !PLATFORM(WIN)
+#if !defined(WEBCORE_EXPORT)
+#if defined(BUILDING_WebCore) || defined(STATICALLY_LINKED_WITH_WebCore)
 #define WEBCORE_EXPORT WTF_EXPORT_DECLARATION
-#define WEBCORE_TESTSUPPORT_EXPORT WTF_EXPORT_DECLARATION
 #else
-// Windows must set this per-project
+#define WEBCORE_EXPORT WTF_IMPORT_DECLARATION
+#endif
 #endif
 
-#else // !USE(EXPORT_MACROS)
-#define WEBCORE_EXPORT
-#define WEBCORE_TESTSUPPORT_EXPORT
-
-#endif // USE(EXPORT_MACROS)
+#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
index e607e09..75ba240 100644 (file)
 #endif
 #endif
 
-#if OS(WINDOWS)
-#undef WEBCORE_EXPORT
-#define WEBCORE_EXPORT WTF_IMPORT_DECLARATION
-#define WEBCORE_TESTSUPPORT_EXPORT
-#else
-
+#if !OS(WINDOWS)
 #include <pthread.h>
 
 #define WEBCORE_TESTSUPPORT_EXPORT WEBCORE_EXPORT
index bfff711..8d9dc5e 100644 (file)
@@ -1,3 +1,16 @@
+2020-02-27  Don Olmstead  <don.olmstead@sony.com>
+
+        Fix WebCore export macros for declspec
+        https://bugs.webkit.org/show_bug.cgi?id=208363
+
+        Reviewed by Konstantin Tokarev.
+
+        Add compilation definitions for static linking of PAL and WebCore in WebKit.
+
+        * PlatformFTW.cmake:
+        * PlatformWin.cmake:
+        * config.h:
+
 2020-02-27  Tim Horton  <timothy_horton@apple.com>
 
         UIProcess crash after using _prepareForMoveToWindow, then deallocating the WKWebView before moving to the window
index 2e46745..47c040d 100644 (file)
@@ -382,3 +382,8 @@ WEBKIT_MAKE_FORWARDING_HEADERS(WebKit
     FILES ${WebKit_PUBLIC_FRAMEWORK_HEADERS}
     FLATTENED
 )
+
+list(APPEND WebKit_PRIVATE_DEFINITIONS
+    STATICALLY_LINKED_WITH_PAL
+    STATICALLY_LINKED_WITH_WebCore
+)
index 5d9628d..75a9c8d 100644 (file)
@@ -381,3 +381,8 @@ WEBKIT_MAKE_FORWARDING_HEADERS(WebKit
     FILES ${WebKit_PUBLIC_FRAMEWORK_HEADERS}
     FLATTENED
 )
+
+list(APPEND WebKit_PRIVATE_DEFINITIONS
+    STATICALLY_LINKED_WITH_PAL
+    STATICALLY_LINKED_WITH_WebCore
+)
index a8ab9b0..8748a4e 100644 (file)
 #include <pal/ExportMacros.h>
 #include <wtf/DisallowCType.h>
 
-#if PLATFORM(WIN)
-#undef WEBCORE_EXPORT
-#define WEBCORE_EXPORT WTF_EXPORT_DECLARATION
-#endif // PLATFORM(WIN)
-
 #ifdef __cplusplus
 
 // These undefs match up with defines in WebKit2Prefix.h for Mac OS X.
index da23f6a..35bb717 100644 (file)
@@ -1,5 +1,17 @@
 2020-02-27  Don Olmstead  <don.olmstead@sony.com>
 
+        Fix WebCore export macros for declspec
+        https://bugs.webkit.org/show_bug.cgi?id=208363
+
+        Reviewed by Konstantin Tokarev.
+
+        Add compilation definitions for static linking of PAL and WebCore in WebKitLegacy.
+
+        * PlatformFTW.cmake:
+        * PlatformWin.cmake:
+
+2020-02-27  Don Olmstead  <don.olmstead@sony.com>
+
         [CMake] Add WebKit::PAL target
         https://bugs.webkit.org/show_bug.cgi?id=198493
 
index 14d93f4..4734847 100644 (file)
@@ -474,3 +474,8 @@ add_dependencies(WebKitLegacyFrameworkHeaders WebCorePrivateFrameworkHeaders)
 set(WebKitLegacy_OUTPUT_NAME
     WebKit${DEBUG_SUFFIX}
 )
+
+list(APPEND WebKitLegacy_PRIVATE_DEFINITIONS
+    STATICALLY_LINKED_WITH_PAL
+    STATICALLY_LINKED_WITH_WebCore
+)
index 5e3e50a..ebb0815 100644 (file)
@@ -489,3 +489,8 @@ endif ()
 set(WebKitLegacy_OUTPUT_NAME
     WebKit${DEBUG_SUFFIX}
 )
+
+list(APPEND WebKitLegacy_PRIVATE_DEFINITIONS
+    STATICALLY_LINKED_WITH_PAL
+    STATICALLY_LINKED_WITH_WebCore
+)
index f72c7f3..e610359 100644 (file)
@@ -1,3 +1,14 @@
+2020-02-27  Don Olmstead  <don.olmstead@sony.com>
+
+        Fix WebCore export macros for declspec
+        https://bugs.webkit.org/show_bug.cgi?id=208363
+
+        Reviewed by Konstantin Tokarev.
+
+        Remove setting of WEBCORE_EXPORT from the header files.
+
+        * WebKitPrefix.h:
+
 2020-02-27  Daniel Bates  <dabates@apple.com>
 
         Change HitTestRequestType to an OptionSet
index 3fbacf6..c83ca59 100644 (file)
@@ -67,8 +67,3 @@ typedef float CGFloat;
 #define CGFLOAT_DEFINED 1
 #endif
 #endif /* USE(CG) */
-
-// WebKit.dll is expected to export the symbols in WebCore that have been marked
-// as WEBCORE_EXPORT
-#undef WEBCORE_EXPORT
-#define WEBCORE_EXPORT WTF_EXPORT_DECLARATION
index d907938..c6dcf82 100644 (file)
@@ -1,3 +1,24 @@
+2020-02-27  Don Olmstead  <don.olmstead@sony.com>
+
+        Fix WebCore export macros for declspec
+        https://bugs.webkit.org/show_bug.cgi?id=208363
+
+        Reviewed by Konstantin Tokarev.
+
+        Remove setting of WEBCORE_EXPORT and WEBCORE_TESTSUPPORT_EXPORT from the header
+        files. Removed precompiled headers that were empty.
+
+        * DumpRenderTree/DumpRenderTreePrefix.h:
+        * DumpRenderTree/win/DefaultPolicyDelegate.cpp: Added a missing config.h.
+        * MiniBrowser/win/stdafx.h:
+        * TestWebKitAPI/win/TestWebKitAPIPrefix.cpp: Removed.
+        * TestWebKitAPI/win/TestWebKitAPIPrefix.h: Removed.
+        * WebKitTestRunner/InjectedBundle/win/TestRunnerInjectedBundlePrefix.cpp: Removed.
+        * WebKitTestRunner/InjectedBundle/win/TestRunnerInjectedBundlePrefix.h: Removed.
+        * WebKitTestRunner/PlatformFTW.cmake:
+        * WebKitTestRunner/PlatformWin.cmake:
+        * WebKitTestRunner/WebKitTestRunnerPrefix.h:
+
 2020-02-27  Tim Horton  <timothy_horton@apple.com>
 
         UIProcess crash after using _prepareForMoveToWindow, then deallocating the WKWebView before moving to the window
index a34ab82..39777e0 100644 (file)
 #ifdef __OBJC__
 #import <Foundation/Foundation.h>
 #endif
-
-#if PLATFORM(WIN)
-#undef WEBCORE_EXPORT
-#define WEBCORE_EXPORT WTF_IMPORT_DECLARATION
-#undef WEBCORE_TESTSUPPORT_EXPORT
-#define WEBCORE_TESTSUPPORT_EXPORT
-#endif
index 29c3d37..9e8f06b 100644 (file)
@@ -23,6 +23,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
+#include "config.h"
 #include "DefaultPolicyDelegate.h"
 
 #include "DumpRenderTree.h"
index c85a1f1..8436fba 100644 (file)
 #include <tchar.h>
 #include <windows.h>
 #include <wininet.h>
-#include <wtf/ExportMacros.h>
 #include <wtf/Platform.h>
 
+#include <JavaScriptCore/JSExportMacros.h>
+#include <WebCore/PlatformExportMacros.h>
+
 #if 0
 // Visual Studio Leak Detection
 // <http://msdn2.microsoft.com/en-US/library/e5ewb1h3.aspx>
@@ -69,5 +71,3 @@
 #include <crtdbg.h>
 #endif
 #endif
-
-#define WEBCORE_EXPORT WTF_IMPORT_DECLARATION
diff --git a/Tools/TestWebKitAPI/win/TestWebKitAPIPrefix.cpp b/Tools/TestWebKitAPI/win/TestWebKitAPIPrefix.cpp
deleted file mode 100644 (file)
index 11959fb..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (C) 2015 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1.  Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- * 2.  Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- * 3.  Neither the name of Apple Inc. ("Apple") nor the names of
- *     its contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-#include "TestWebKitAPIPrefix.h"
diff --git a/Tools/TestWebKitAPI/win/TestWebKitAPIPrefix.h b/Tools/TestWebKitAPI/win/TestWebKitAPIPrefix.h
deleted file mode 100644 (file)
index b21a280..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2015 Apple Inc.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1.  Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer. 
- * 2.  Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution. 
- * 3.  Neither the name of Apple Inc. ("Apple") nor the names of
- *     its contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission. 
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#undef WEBCORE_EXPORT
-#define WEBCORE_EXPORT WTF_IMPORT_DECLARATION
-#undef WEBCORE_TESTSUPPORT_EXPORT
-#define WEBCORE_TESTSUPPORT_EXPORT
diff --git a/Tools/WebKitTestRunner/InjectedBundle/win/TestRunnerInjectedBundlePrefix.cpp b/Tools/WebKitTestRunner/InjectedBundle/win/TestRunnerInjectedBundlePrefix.cpp
deleted file mode 100644 (file)
index b8ecf34..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (C) 2015 Apple Inc. All rights reserved.
- * Copyright (C) 2018 Sony Interactive Entertainment Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1.  Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- * 2.  Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- * 3.  Neither the name of Apple Inc. ("Apple") nor the names of
- *     its contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-#include "TestRunnerInjectedBundlePrefix.h"
diff --git a/Tools/WebKitTestRunner/InjectedBundle/win/TestRunnerInjectedBundlePrefix.h b/Tools/WebKitTestRunner/InjectedBundle/win/TestRunnerInjectedBundlePrefix.h
deleted file mode 100644 (file)
index 23dbbd3..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (C) 2010 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#undef WEBCORE_EXPORT
-#define WEBCORE_EXPORT WTF_IMPORT_DECLARATION
-#undef WEBCORE_TESTSUPPORT_EXPORT
-#define WEBCORE_TESTSUPPORT_EXPORT
index 524de8f..0275f47 100644 (file)
@@ -53,10 +53,6 @@ WEBKIT_ADD_PRECOMPILED_HEADER(WebKitTestRunnerPrefix.h
     ${WEBKIT_TESTRUNNER_DIR}/win/WebKitTestRunnerPrefix.cpp
     WebKitTestRunnerLib_SOURCES
 )
-WEBKIT_ADD_PRECOMPILED_HEADER(TestRunnerInjectedBundlePrefix.h
-    ${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/win/TestRunnerInjectedBundlePrefix.cpp
-    WebKitTestRunnerInjectedBundle_SOURCES
-)
 
 list(APPEND
     WebKitTestRunnerLib_SOURCES
index 4b40adf..e191e98 100644 (file)
@@ -57,10 +57,6 @@ WEBKIT_ADD_PRECOMPILED_HEADER(WebKitTestRunnerPrefix.h
     ${WEBKIT_TESTRUNNER_DIR}/win/WebKitTestRunnerPrefix.cpp
     WebKitTestRunnerLib_SOURCES
 )
-WEBKIT_ADD_PRECOMPILED_HEADER(TestRunnerInjectedBundlePrefix.h
-    ${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/win/TestRunnerInjectedBundlePrefix.cpp
-    WebKitTestRunnerInjectedBundle_SOURCES
-)
 
 list(APPEND
     WebKitTestRunnerLib_SOURCES
index 10a8ba9..3f70c49 100644 (file)
 #undef try
 #undef catch
 #endif
-
-#if PLATFORM(WIN)
-#undef WEBCORE_EXPORT
-#define WEBCORE_EXPORT WTF_IMPORT_DECLARATION
-#undef WEBCORE_TESTSUPPORT_EXPORT
-#define WEBCORE_TESTSUPPORT_EXPORT
-#endif