Diff
Modified: trunk/ChangeLog (267176 => 267177)
--- trunk/ChangeLog 2020-09-17 01:57:48 UTC (rev 267176)
+++ trunk/ChangeLog 2020-09-17 02:05:47 UTC (rev 267177)
@@ -1,3 +1,20 @@
+2020-09-16 Fujii Hironori <[email protected]>
+
+ [CMake] Add a new library target TestRunnerShared
+ https://bugs.webkit.org/show_bug.cgi?id=216465
+
+ WinCairo port is using both DRT and WTR. However, it has a problem
+ for precompiled header builds to compile the source of
+ TestRunnerShared twice for DRT and WTR.
+
+ Add a new library target TestRunnerShared. Re-enable precompiled
+ header for DRT and WTR for WinCairo.
+
+ Reviewed by Don Olmstead.
+
+ * Source/cmake/OptionsWinCairo.cmake:
+ * Source/cmake/WebKitFS.cmake:
+
2020-09-16 Stephan Szabo <[email protected]>
Remove ENABLE_METER_ELEMENT
Modified: trunk/Source/cmake/OptionsWinCairo.cmake (267176 => 267177)
--- trunk/Source/cmake/OptionsWinCairo.cmake 2020-09-17 01:57:48 UTC (rev 267176)
+++ trunk/Source/cmake/OptionsWinCairo.cmake 2020-09-17 02:05:47 UTC (rev 267177)
@@ -79,6 +79,7 @@
set(WebCore_DERIVED_SOURCES_DIR ${CMAKE_BINARY_DIR}/WebCore/DerivedSources)
set(WebKitLegacy_DERIVED_SOURCES_DIR ${CMAKE_BINARY_DIR}/WebKitLegacy/DerivedSources)
set(WebKit_DERIVED_SOURCES_DIR ${CMAKE_BINARY_DIR}/WebKit/DerivedSources)
+set(TestRunnerShared_DERIVED_SOURCES_DIR ${CMAKE_BINARY_DIR}/TestRunnerShared/DerivedSources)
# Override scripts directories
set(WTF_SCRIPTS_DIR ${CMAKE_BINARY_DIR}/WTF/Scripts)
Modified: trunk/Source/cmake/WebKitFS.cmake (267176 => 267177)
--- trunk/Source/cmake/WebKitFS.cmake 2020-09-17 01:57:48 UTC (rev 267176)
+++ trunk/Source/cmake/WebKitFS.cmake 2020-09-17 02:05:47 UTC (rev 267177)
@@ -51,6 +51,7 @@
set(WebKit_DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebKit")
set(WebInspectorUI_DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebInspectorUI")
set(MiniBrowser_DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources/MiniBrowser")
+set(TestRunnerShared_DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources/TestRunnerShared")
set(DumpRenderTree_DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources/DumpRenderTree")
set(WebKitTestRunner_DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebKitTestRunner")
Modified: trunk/Tools/ChangeLog (267176 => 267177)
--- trunk/Tools/ChangeLog 2020-09-17 01:57:48 UTC (rev 267176)
+++ trunk/Tools/ChangeLog 2020-09-17 02:05:47 UTC (rev 267177)
@@ -1,3 +1,23 @@
+2020-09-16 Fujii Hironori <[email protected]>
+
+ [CMake] Add a new library target TestRunnerShared
+ https://bugs.webkit.org/show_bug.cgi?id=216465
+
+ Reviewed by Don Olmstead.
+
+ * DumpRenderTree/CMakeLists.txt:
+ * DumpRenderTree/PlatformWin.cmake:
+ * PlatformFTW.cmake:
+ * PlatformGTK.cmake:
+ * PlatformMac.cmake:
+ * PlatformWPE.cmake:
+ * PlatformWin.cmake:
+ * TestRunnerShared/CMakeLists.txt: Added.
+ * TestRunnerShared/config/config.h: Added.
+ * WebKitTestRunner/CMakeLists.txt:
+ * WebKitTestRunner/PlatformFTW.cmake:
+ * WebKitTestRunner/PlatformWin.cmake:
+
2020-09-16 Sam Weinig <[email protected]>
Remove runtime setting for enabling/disabling CSS shadow parts
Modified: trunk/Tools/DumpRenderTree/CMakeLists.txt (267176 => 267177)
--- trunk/Tools/DumpRenderTree/CMakeLists.txt 2020-09-17 01:57:48 UTC (rev 267176)
+++ trunk/Tools/DumpRenderTree/CMakeLists.txt 2020-09-17 02:05:47 UTC (rev 267177)
@@ -6,13 +6,6 @@
file(MAKE_DIRECTORY ${DumpRenderTree_DERIVED_SOURCES_DIR})
set(DumpRenderTree_SOURCES
- ${WebKitTestRunner_SHARED_DIR}/ReftestFunctions.cpp
- ${WebKitTestRunner_SHARED_DIR}/Bindings/JSBasics.cpp
- ${WebKitTestRunner_SHARED_DIR}/Bindings/JSWrapper.cpp
-
- ${WebKitTestRunner_UISCRIPTCONTEXT_DIR}/UIScriptContext.cpp
- ${WebKitTestRunner_UISCRIPTCONTEXT_DIR}/UIScriptControllerShared.cpp
-
AccessibilityController.cpp
AccessibilityTextMarker.cpp
AccessibilityUIElement.cpp
@@ -27,6 +20,7 @@
)
set(DumpRenderTree_LIBRARIES
+ TestRunnerShared
WebKit::WebCoreTestSupport
WebKit::_javascript_Core
)
@@ -46,21 +40,6 @@
${WebKitLegacy_FRAMEWORK_HEADERS_DIR}
)
-set(DumpRenderTree_IDL_FILES
- "${WebKitTestRunner_UISCRIPTCONTEXT_DIR}/Bindings/UIScriptController.idl"
-)
-
-GENERATE_BINDINGS(DumpRenderTreeBindings
- OUTPUT_SOURCE DumpRenderTree_SOURCES
- INPUT_FILES ${DumpRenderTree_IDL_FILES}
- BASE_DIR ${DumpRenderTree_BINDINGS_DIR}
- IDL_INCLUDES Bindings
- FEATURES ${FEATURE_DEFINES_WITH_SPACE_SEPARATOR}
- DESTINATION ${DumpRenderTree_DERIVED_SOURCES_DIR}
- GENERATOR DumpRenderTree)
-
-set(DumpRenderTree_DEPENDENCIES DumpRenderTreeBindings)
-
WEBKIT_EXECUTABLE_DECLARE(DumpRenderTree)
WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
WEBKIT_EXECUTABLE(DumpRenderTree)
Modified: trunk/Tools/DumpRenderTree/PlatformWin.cmake (267176 => 267177)
--- trunk/Tools/DumpRenderTree/PlatformWin.cmake 2020-09-17 01:57:48 UTC (rev 267176)
+++ trunk/Tools/DumpRenderTree/PlatformWin.cmake 2020-09-17 02:05:47 UTC (rev 267177)
@@ -72,9 +72,7 @@
endif ()
endif ()
-if (NOT WTF_PLATFORM_WIN_CAIRO)
- WEBKIT_ADD_PRECOMPILED_HEADER("DumpRenderTreePrefix.h" "win/DumpRenderTreePrefix.cpp" DumpRenderTree_SOURCES)
-endif ()
+WEBKIT_ADD_PRECOMPILED_HEADER("DumpRenderTreePrefix.h" "win/DumpRenderTreePrefix.cpp" DumpRenderTree_SOURCES)
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${MSVC_RUNTIME_LINKER_FLAGS}")
WEBKIT_WRAP_EXECUTABLE(DumpRenderTree
Modified: trunk/Tools/PlatformFTW.cmake (267176 => 267177)
--- trunk/Tools/PlatformFTW.cmake 2020-09-17 01:57:48 UTC (rev 267176)
+++ trunk/Tools/PlatformFTW.cmake 2020-09-17 02:05:47 UTC (rev 267177)
@@ -6,5 +6,6 @@
endif ()
if (ENABLE_WEBKIT)
+ add_subdirectory(TestRunnerShared)
add_subdirectory(WebKitTestRunner)
endif ()
Modified: trunk/Tools/PlatformGTK.cmake (267176 => 267177)
--- trunk/Tools/PlatformGTK.cmake 2020-09-17 01:57:48 UTC (rev 267176)
+++ trunk/Tools/PlatformGTK.cmake 2020-09-17 02:05:47 UTC (rev 267177)
@@ -1,4 +1,5 @@
if (DEVELOPER_MODE)
+ add_subdirectory(TestRunnerShared)
add_subdirectory(WebKitTestRunner)
add_subdirectory(ImageDiff)
Modified: trunk/Tools/PlatformMac.cmake (267176 => 267177)
--- trunk/Tools/PlatformMac.cmake 2020-09-17 01:57:48 UTC (rev 267176)
+++ trunk/Tools/PlatformMac.cmake 2020-09-17 02:05:47 UTC (rev 267177)
@@ -1,3 +1,4 @@
+add_subdirectory(TestRunnerShared)
add_subdirectory(DumpRenderTree)
add_subdirectory(WebKitTestRunner)
add_subdirectory(MiniBrowser/mac)
Modified: trunk/Tools/PlatformWPE.cmake (267176 => 267177)
--- trunk/Tools/PlatformWPE.cmake 2020-09-17 01:57:48 UTC (rev 267176)
+++ trunk/Tools/PlatformWPE.cmake 2020-09-17 02:05:47 UTC (rev 267177)
@@ -4,6 +4,7 @@
if (DEVELOPER_MODE)
add_subdirectory(ImageDiff)
+ add_subdirectory(TestRunnerShared)
add_subdirectory(WebKitTestRunner)
if (ENABLE_API_TESTS)
Modified: trunk/Tools/PlatformWin.cmake (267176 => 267177)
--- trunk/Tools/PlatformWin.cmake 2020-09-17 01:57:48 UTC (rev 267176)
+++ trunk/Tools/PlatformWin.cmake 2020-09-17 02:05:47 UTC (rev 267177)
@@ -4,6 +4,8 @@
add_subdirectory(MiniBrowser/win)
endif ()
+add_subdirectory(TestRunnerShared)
+
if (ENABLE_WEBKIT_LEGACY)
add_subdirectory(DumpRenderTree)
endif ()
Added: trunk/Tools/TestRunnerShared/CMakeLists.txt (0 => 267177)
--- trunk/Tools/TestRunnerShared/CMakeLists.txt (rev 0)
+++ trunk/Tools/TestRunnerShared/CMakeLists.txt 2020-09-17 02:05:47 UTC (rev 267177)
@@ -0,0 +1,57 @@
+WEBKIT_FRAMEWORK_DECLARE(TestRunnerShared)
+
+set(DumpRenderTree_BINDINGS_DIR ${TOOLS_DIR}/DumpRenderTree/Bindings)
+set(TestRunnerShared_DIR ${TOOLS_DIR}/TestRunnerShared)
+
+file(MAKE_DIRECTORY ${TestRunnerShared_DERIVED_SOURCES_DIR})
+
+set(TestRunnerShared_SOURCES
+ ReftestFunctions.cpp
+
+ Bindings/JSBasics.cpp
+ Bindings/JSWrapper.cpp
+
+ UIScriptContext/UIScriptContext.cpp
+ UIScriptContext/UIScriptControllerShared.cpp
+)
+
+set(TestRunnerShared_PRIVATE_LIBRARIES
+ WebKit::_javascript_Core
+ WebKit::WebCoreTestSupport
+)
+
+add_dependencies(TestRunnerShared WebCore_CopyPrivateHeaders)
+
+set(TestRunnerShared_PRIVATE_INCLUDE_DIRECTORIES
+ ${CMAKE_BINARY_DIR}
+ ${TestRunnerShared_DERIVED_SOURCES_DIR}
+ ${TestRunnerShared_DIR}
+ ${TestRunnerShared_DIR}/Bindings
+ ${TestRunnerShared_DIR}/UIScriptContext
+ ${TestRunnerShared_DIR}/config
+ ${WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR}
+)
+
+list(APPEND TestRunnerShared_PRIVATE_INCLUDE_DIRECTORIES
+ ${PAL_FRAMEWORK_HEADERS_DIR}
+ ${WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR}
+)
+
+set(TestRunnerShared_IDL_FILES
+ ${TestRunnerShared_DIR}/UIScriptContext/Bindings/UIScriptController.idl
+)
+
+GENERATE_BINDINGS(TestRunnerSharedBindings
+ OUTPUT_SOURCE TestRunnerShared_SOURCES
+ INPUT_FILES ${TestRunnerShared_IDL_FILES}
+ BASE_DIR ${DumpRenderTree_BINDINGS_DIR}
+ IDL_INCLUDES Bindings
+ FEATURES ${FEATURE_DEFINES_WITH_SPACE_SEPARATOR}
+ DESTINATION ${TestRunnerShared_DERIVED_SOURCES_DIR}
+ GENERATOR DumpRenderTree)
+
+set(TestRunnerShared_LIBRARY_TYPE OBJECT)
+set(TestRunnerShared_DEPENDENCIES TestRunnerSharedBindings)
+
+WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
+WEBKIT_FRAMEWORK(TestRunnerShared)
Added: trunk/Tools/TestRunnerShared/config/config.h (0 => 267177)
--- trunk/Tools/TestRunnerShared/config/config.h (rev 0)
+++ trunk/Tools/TestRunnerShared/config/config.h 2020-09-17 02:05:47 UTC (rev 267177)
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2020 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.
+ *
+ * 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.
+ */
+
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H && defined(BUILDING_WITH_CMAKE)
+#include "cmakeconfig.h"
+#endif
+
+#include <_javascript_Core/JSExportMacros.h>
+#include <WebCore/PlatformExportMacros.h>
Modified: trunk/Tools/WebKitTestRunner/CMakeLists.txt (267176 => 267177)
--- trunk/Tools/WebKitTestRunner/CMakeLists.txt 2020-09-17 01:57:48 UTC (rev 267176)
+++ trunk/Tools/WebKitTestRunner/CMakeLists.txt 2020-09-17 02:05:47 UTC (rev 267177)
@@ -7,12 +7,6 @@
file(MAKE_DIRECTORY ${WebKitTestRunner_DERIVED_SOURCES_DIR}/UIScriptContext)
set(WebKitTestRunner_SOURCES
- ${WebKitTestRunner_BINDINGS_DIR}/JSBasics.cpp
- ${WebKitTestRunner_BINDINGS_DIR}/JSWrapper.cpp
-
- ${WebKitTestRunner_UISCRIPTCONTEXT_DIR}/UIScriptContext.cpp
- ${WebKitTestRunner_UISCRIPTCONTEXT_DIR}/UIScriptControllerShared.cpp
-
CyclicRedundancyCheck.cpp
GeolocationProviderMock.cpp
Options.cpp
@@ -26,6 +20,7 @@
)
set(WebKitTestRunner_LIBRARIES
+ TestRunnerShared
WebCoreTestSupport
WebKit::_javascript_Core
WebKit::WebKit
@@ -48,11 +43,6 @@
)
set(WebKitTestRunnerInjectedBundle_SOURCES
- ${WebKitTestRunner_SHARED_DIR}/ReftestFunctions.cpp
-
- ${WebKitTestRunner_BINDINGS_DIR}/JSBasics.cpp
- ${WebKitTestRunner_BINDINGS_DIR}/JSWrapper.cpp
-
InjectedBundle/AccessibilityController.cpp
InjectedBundle/AccessibilityTextMarker.cpp
InjectedBundle/AccessibilityTextMarkerRange.cpp
@@ -80,6 +70,7 @@
)
set(WebKitTestRunnerInjectedBundle_LIBRARIES
+ TestRunnerShared
WebKit::WebCoreTestSupport
WebKit::WebKit
)
@@ -95,13 +86,8 @@
"${WebKitTestRunner_DIR}/InjectedBundle/Bindings/TextInputController.idl"
)
-set(WebKitTestRunner_IDL_FILES
- "${WebKitTestRunner_UISCRIPTCONTEXT_DIR}/Bindings/UIScriptController.idl"
-)
-
set(WebKitTestRunner_DEPENDENCIES
TestRunnerInjectedBundle
- WebKitTestRunnerBindings
)
GENERATE_BINDINGS(WebKitTestRunnerInjectedBundleBindings
@@ -113,15 +99,6 @@
DESTINATION ${WebKitTestRunner_DERIVED_SOURCES_DIR}/InjectedBundle
GENERATOR TestRunner)
-GENERATE_BINDINGS(WebKitTestRunnerBindings
- OUTPUT_SOURCE WebKitTestRunner_SOURCES
- INPUT_FILES ${WebKitTestRunner_IDL_FILES}
- BASE_DIR ${WebKitTestRunner_DIR}/InjectedBundle/Bindings
- IDL_INCLUDES ${WebKitTestRunner_DIR}/InjectedBundle/Bindings
- FEATURES ${FEATURE_DEFINES_WITH_SPACE_SEPARATOR}
- DESTINATION ${WebKitTestRunner_DERIVED_SOURCES_DIR}/UIScriptContext
- GENERATOR TestRunner)
-
WEBKIT_EXECUTABLE_DECLARE(WebKitTestRunner)
WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
Modified: trunk/Tools/WebKitTestRunner/PlatformFTW.cmake (267176 => 267177)
--- trunk/Tools/WebKitTestRunner/PlatformFTW.cmake 2020-09-17 01:57:48 UTC (rev 267176)
+++ trunk/Tools/WebKitTestRunner/PlatformFTW.cmake 2020-09-17 02:05:47 UTC (rev 267177)
@@ -29,13 +29,7 @@
Oleacc
)
-# Add precompiled header
-# JSWrapper.cpp is shared between the test runner and injected bundle so it can't be
-# present in the list of sources when the macro is invoked. Remove it, create the precompiled
-# header, and add it back to work around this.
-list(REMOVE_ITEM WebKitTestRunner_SOURCES ${WebKitTestRunner_BINDINGS_DIR}/JSWrapper.cpp)
WEBKIT_ADD_PRECOMPILED_HEADER("WebKitTestRunnerPrefix.h" "win/WebKitTestRunnerPrefix.cpp" WebKitTestRunner_SOURCES)
-list(APPEND WebKitTestRunner_SOURCES ${WebKitTestRunner_BINDINGS_DIR}/JSWrapper.cpp)
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${MSVC_RUNTIME_LINKER_FLAGS}")
Modified: trunk/Tools/WebKitTestRunner/PlatformWin.cmake (267176 => 267177)
--- trunk/Tools/WebKitTestRunner/PlatformWin.cmake 2020-09-17 01:57:48 UTC (rev 267176)
+++ trunk/Tools/WebKitTestRunner/PlatformWin.cmake 2020-09-17 02:05:47 UTC (rev 267177)
@@ -34,15 +34,7 @@
$<TARGET_OBJECTS:WebCoreTestSupport>
)
-# Add precompiled header
-# JSWrapper.cpp is shared between the test runner and injected bundle so it can't be
-# present in the list of sources when the macro is invoked. Remove it, create the precompiled
-# header, and add it back to work around this.
-list(REMOVE_ITEM WebKitTestRunner_SOURCES ${WebKitTestRunner_BINDINGS_DIR}/JSWrapper.cpp)
-if (NOT WTF_PLATFORM_WIN_CAIRO)
- WEBKIT_ADD_PRECOMPILED_HEADER("WebKitTestRunnerPrefix.h" "win/WebKitTestRunnerPrefix.cpp" WebKitTestRunner_SOURCES)
-endif ()
-list(APPEND WebKitTestRunner_SOURCES ${WebKitTestRunner_BINDINGS_DIR}/JSWrapper.cpp)
+WEBKIT_ADD_PRECOMPILED_HEADER("WebKitTestRunnerPrefix.h" "win/WebKitTestRunnerPrefix.cpp" WebKitTestRunner_SOURCES)
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${MSVC_RUNTIME_LINKER_FLAGS}")
