Diff
Modified: trunk/ChangeLog (243933 => 243934)
--- trunk/ChangeLog 2019-04-05 13:45:08 UTC (rev 243933)
+++ trunk/ChangeLog 2019-04-05 15:35:32 UTC (rev 243934)
@@ -1,3 +1,17 @@
+2019-04-05 Commit Queue <commit-qu...@webkit.org>
+
+ Unreviewed, rolling out r243833.
+ https://bugs.webkit.org/show_bug.cgi?id=196645
+
+ This change breaks build of WPE and GTK ports (Requested by
+ annulen on #webkit).
+
+ Reverted changeset:
+
+ "[CMake][WTF] Mirror XCode header directories"
+ https://bugs.webkit.org/show_bug.cgi?id=191662
+ https://trac.webkit.org/changeset/243833
+
2019-04-03 Don Olmstead <don.olmst...@sony.com>
[CMake][WTF] Mirror XCode header directories
Modified: trunk/Source/_javascript_Core/CMakeLists.txt (243933 => 243934)
--- trunk/Source/_javascript_Core/CMakeLists.txt 2019-04-05 13:45:08 UTC (rev 243933)
+++ trunk/Source/_javascript_Core/CMakeLists.txt 2019-04-05 15:35:32 UTC (rev 243934)
@@ -1,6 +1,5 @@
cmake_minimum_required(VERSION 2.8.12)
include(WebKitCommon)
-include(frameworks/WTF)
set_property(DIRECTORY . PROPERTY FOLDER "_javascript_Core")
list(APPEND _javascript_Core_UNIFIED_SOURCE_LIST_FILES
@@ -120,7 +119,7 @@
)
set(_javascript_Core_LIBRARIES
- WTFFramework
+ WTF${DEBUG_SUFFIX}
${ICU_I18N_LIBRARIES}
)
@@ -300,9 +299,9 @@
${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/LLIntDesiredOffsets.h ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/Bytecodes.h ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/BytecodeStructs.h
)
-target_link_libraries(LLIntSettingsExtractor WTFFramework)
+target_link_libraries(LLIntSettingsExtractor WTF)
add_dependencies(LLIntSettingsExtractor _javascript_CoreForwardingHeaders)
-target_link_libraries(LLIntOffsetsExtractor WTFFramework)
+target_link_libraries(LLIntOffsetsExtractor WTF)
add_dependencies(LLIntOffsetsExtractor _javascript_CoreForwardingHeaders)
# The build system will execute asm.rb every time LLIntOffsetsExtractor's mtime is newer than
Modified: trunk/Source/_javascript_Core/ChangeLog (243933 => 243934)
--- trunk/Source/_javascript_Core/ChangeLog 2019-04-05 13:45:08 UTC (rev 243933)
+++ trunk/Source/_javascript_Core/ChangeLog 2019-04-05 15:35:32 UTC (rev 243934)
@@ -1,3 +1,17 @@
+2019-04-05 Commit Queue <commit-qu...@webkit.org>
+
+ Unreviewed, rolling out r243833.
+ https://bugs.webkit.org/show_bug.cgi?id=196645
+
+ This change breaks build of WPE and GTK ports (Requested by
+ annulen on #webkit).
+
+ Reverted changeset:
+
+ "[CMake][WTF] Mirror XCode header directories"
+ https://bugs.webkit.org/show_bug.cgi?id=191662
+ https://trac.webkit.org/changeset/243833
+
2019-04-05 Caitlin Potter <ca...@igalia.com>
[JSC] throw if ownKeys Proxy trap result contains duplicate keys
Modified: trunk/Source/_javascript_Core/shell/CMakeLists.txt (243933 => 243934)
--- trunk/Source/_javascript_Core/shell/CMakeLists.txt 2019-04-05 13:45:08 UTC (rev 243933)
+++ trunk/Source/_javascript_Core/shell/CMakeLists.txt 2019-04-05 15:35:32 UTC (rev 243934)
@@ -5,7 +5,7 @@
set(JSC_LIBRARIES
${CMAKE_DL_LIBS}
_javascript_Core${DEBUG_SUFFIX}
- WTFFramework
+ WTF${DEBUG_SUFFIX}
)
if (WTF_OS_MAC_OS_X)
Modified: trunk/Source/WTF/ChangeLog (243933 => 243934)
--- trunk/Source/WTF/ChangeLog 2019-04-05 13:45:08 UTC (rev 243933)
+++ trunk/Source/WTF/ChangeLog 2019-04-05 15:35:32 UTC (rev 243934)
@@ -1,3 +1,17 @@
+2019-04-05 Commit Queue <commit-qu...@webkit.org>
+
+ Unreviewed, rolling out r243833.
+ https://bugs.webkit.org/show_bug.cgi?id=196645
+
+ This change breaks build of WPE and GTK ports (Requested by
+ annulen on #webkit).
+
+ Reverted changeset:
+
+ "[CMake][WTF] Mirror XCode header directories"
+ https://bugs.webkit.org/show_bug.cgi?id=191662
+ https://trac.webkit.org/changeset/243833
+
2019-04-05 Ryosuke Niwa <rn...@webkit.org>
Make WeakPtr<Element> possible and deploy it in form associated elements code
Modified: trunk/Source/WTF/wtf/CMakeLists.txt (243933 => 243934)
--- trunk/Source/WTF/wtf/CMakeLists.txt 2019-04-05 13:45:08 UTC (rev 243933)
+++ trunk/Source/WTF/wtf/CMakeLists.txt 2019-04-05 15:35:32 UTC (rev 243934)
@@ -502,8 +502,7 @@
WEBKIT_FRAMEWORK(WTF)
WEBKIT_MAKE_FORWARDING_HEADERS(WTF
- TARGET_NAME WTFFrameworkHeaders
- DESTINATION ${WTF_FRAMEWORK_HEADERS_DIR}/wtf
+ DESTINATION ${FORWARDING_HEADERS_DIR}/wtf
FILES ${WTF_PUBLIC_HEADERS}
)
Modified: trunk/Source/WebCore/CMakeLists.txt (243933 => 243934)
--- trunk/Source/WebCore/CMakeLists.txt 2019-04-05 13:45:08 UTC (rev 243933)
+++ trunk/Source/WebCore/CMakeLists.txt 2019-04-05 15:35:32 UTC (rev 243934)
@@ -2,7 +2,6 @@
include(WebKitCommon)
include(WebCoreMacros.cmake)
-include(frameworks/WTF)
set_property(DIRECTORY . PROPERTY FOLDER "WebCore")
Modified: trunk/Source/WebCore/ChangeLog (243933 => 243934)
--- trunk/Source/WebCore/ChangeLog 2019-04-05 13:45:08 UTC (rev 243933)
+++ trunk/Source/WebCore/ChangeLog 2019-04-05 15:35:32 UTC (rev 243934)
@@ -1,3 +1,17 @@
+2019-04-05 Commit Queue <commit-qu...@webkit.org>
+
+ Unreviewed, rolling out r243833.
+ https://bugs.webkit.org/show_bug.cgi?id=196645
+
+ This change breaks build of WPE and GTK ports (Requested by
+ annulen on #webkit).
+
+ Reverted changeset:
+
+ "[CMake][WTF] Mirror XCode header directories"
+ https://bugs.webkit.org/show_bug.cgi?id=191662
+ https://trac.webkit.org/changeset/243833
+
2019-04-05 David Kilzer <ddkil...@apple.com>
REGRESSION(r243887): Try to fix Windows builds by including <wtf/IsoMalloc.h>
Modified: trunk/Source/WebCore/PlatformWin.cmake (243933 => 243934)
--- trunk/Source/WebCore/PlatformWin.cmake 2019-04-05 13:45:08 UTC (rev 243933)
+++ trunk/Source/WebCore/PlatformWin.cmake 2019-04-05 15:35:32 UTC (rev 243934)
@@ -365,8 +365,8 @@
WebCore${DEBUG_SUFFIX}
)
-list(APPEND WebCore_LIBRARIES WTFFramework)
+list(APPEND WebCore_LIBRARIES WTF${DEBUG_SUFFIX})
if (TARGET libEGL)
list(APPEND WebCore_LIBRARIES libEGL)
endif ()
-list(APPEND WebCoreTestSupport_LIBRARIES WTFFramework)
+list(APPEND WebCoreTestSupport_LIBRARIES WTF${DEBUG_SUFFIX})
Modified: trunk/Source/WebDriver/CMakeLists.txt (243933 => 243934)
--- trunk/Source/WebDriver/CMakeLists.txt 2019-04-05 13:45:08 UTC (rev 243933)
+++ trunk/Source/WebDriver/CMakeLists.txt 2019-04-05 15:35:32 UTC (rev 243934)
@@ -17,7 +17,7 @@
)
set(WebDriver_LIBRARIES
- WTFFramework
+ WTF
)
set(WebDriver_SCRIPTS
Modified: trunk/Source/WebDriver/ChangeLog (243933 => 243934)
--- trunk/Source/WebDriver/ChangeLog 2019-04-05 13:45:08 UTC (rev 243933)
+++ trunk/Source/WebDriver/ChangeLog 2019-04-05 15:35:32 UTC (rev 243934)
@@ -1,3 +1,17 @@
+2019-04-05 Commit Queue <commit-qu...@webkit.org>
+
+ Unreviewed, rolling out r243833.
+ https://bugs.webkit.org/show_bug.cgi?id=196645
+
+ This change breaks build of WPE and GTK ports (Requested by
+ annulen on #webkit).
+
+ Reverted changeset:
+
+ "[CMake][WTF] Mirror XCode header directories"
+ https://bugs.webkit.org/show_bug.cgi?id=191662
+ https://trac.webkit.org/changeset/243833
+
2019-04-03 Don Olmstead <don.olmst...@sony.com>
[CMake][WTF] Mirror XCode header directories
Modified: trunk/Source/WebKit/CMakeLists.txt (243933 => 243934)
--- trunk/Source/WebKit/CMakeLists.txt 2019-04-05 13:45:08 UTC (rev 243933)
+++ trunk/Source/WebKit/CMakeLists.txt 2019-04-05 15:35:32 UTC (rev 243934)
@@ -1,5 +1,4 @@
include(WebKitCommon)
-include(frameworks/WTF)
set_property(DIRECTORY . PROPERTY FOLDER "WebKit")
Modified: trunk/Source/WebKit/ChangeLog (243933 => 243934)
--- trunk/Source/WebKit/ChangeLog 2019-04-05 13:45:08 UTC (rev 243933)
+++ trunk/Source/WebKit/ChangeLog 2019-04-05 15:35:32 UTC (rev 243934)
@@ -1,3 +1,17 @@
+2019-04-05 Commit Queue <commit-qu...@webkit.org>
+
+ Unreviewed, rolling out r243833.
+ https://bugs.webkit.org/show_bug.cgi?id=196645
+
+ This change breaks build of WPE and GTK ports (Requested by
+ annulen on #webkit).
+
+ Reverted changeset:
+
+ "[CMake][WTF] Mirror XCode header directories"
+ https://bugs.webkit.org/show_bug.cgi?id=191662
+ https://trac.webkit.org/changeset/243833
+
2019-04-05 David Kilzer <ddkil...@apple.com>
REGRESSION(r240685): Remove duplicate Headers entry for _WKInspectorWindow.h in Xcode project
Modified: trunk/Source/WebKitLegacy/CMakeLists.txt (243933 => 243934)
--- trunk/Source/WebKitLegacy/CMakeLists.txt 2019-04-05 13:45:08 UTC (rev 243933)
+++ trunk/Source/WebKitLegacy/CMakeLists.txt 2019-04-05 15:35:32 UTC (rev 243934)
@@ -1,6 +1,5 @@
cmake_minimum_required(VERSION 2.8.12)
include(WebKitCommon)
-include(frameworks/WTF)
set_property(DIRECTORY . PROPERTY FOLDER "WebKitLegacy")
set(WebKitLegacy_SOURCES
Modified: trunk/Source/WebKitLegacy/ChangeLog (243933 => 243934)
--- trunk/Source/WebKitLegacy/ChangeLog 2019-04-05 13:45:08 UTC (rev 243933)
+++ trunk/Source/WebKitLegacy/ChangeLog 2019-04-05 15:35:32 UTC (rev 243934)
@@ -1,3 +1,17 @@
+2019-04-05 Commit Queue <commit-qu...@webkit.org>
+
+ Unreviewed, rolling out r243833.
+ https://bugs.webkit.org/show_bug.cgi?id=196645
+
+ This change breaks build of WPE and GTK ports (Requested by
+ annulen on #webkit).
+
+ Reverted changeset:
+
+ "[CMake][WTF] Mirror XCode header directories"
+ https://bugs.webkit.org/show_bug.cgi?id=191662
+ https://trac.webkit.org/changeset/243833
+
2019-04-03 Don Olmstead <don.olmst...@sony.com>
[CMake][WTF] Mirror XCode header directories
Modified: trunk/Source/WebKitLegacy/PlatformWin.cmake (243933 => 243934)
--- trunk/Source/WebKitLegacy/PlatformWin.cmake 2019-04-05 13:45:08 UTC (rev 243933)
+++ trunk/Source/WebKitLegacy/PlatformWin.cmake 2019-04-05 15:35:32 UTC (rev 243934)
@@ -34,7 +34,7 @@
)
endif ()
-list(APPEND WebKitLegacy_LIBRARIES PRIVATE WTFFramework)
+list(APPEND WebKitLegacy_LIBRARIES PRIVATE WTF${DEBUG_SUFFIX})
add_custom_command(
OUTPUT ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/WebKitVersion.h
Modified: trunk/Source/WebKitLegacy/win/ChangeLog (243933 => 243934)
--- trunk/Source/WebKitLegacy/win/ChangeLog 2019-04-05 13:45:08 UTC (rev 243933)
+++ trunk/Source/WebKitLegacy/win/ChangeLog 2019-04-05 15:35:32 UTC (rev 243934)
@@ -1,3 +1,17 @@
+2019-04-05 Commit Queue <commit-qu...@webkit.org>
+
+ Unreviewed, rolling out r243833.
+ https://bugs.webkit.org/show_bug.cgi?id=196645
+
+ This change breaks build of WPE and GTK ports (Requested by
+ annulen on #webkit).
+
+ Reverted changeset:
+
+ "[CMake][WTF] Mirror XCode header directories"
+ https://bugs.webkit.org/show_bug.cgi?id=191662
+ https://trac.webkit.org/changeset/243833
+
2019-04-03 Don Olmstead <don.olmst...@sony.com>
[CMake][WTF] Mirror XCode header directories
Modified: trunk/Source/WebKitLegacy/win/WebKitQuartzCoreAdditions/CMakeLists.txt (243933 => 243934)
--- trunk/Source/WebKitLegacy/win/WebKitQuartzCoreAdditions/CMakeLists.txt 2019-04-05 13:45:08 UTC (rev 243933)
+++ trunk/Source/WebKitLegacy/win/WebKitQuartzCoreAdditions/CMakeLists.txt 2019-04-05 15:35:32 UTC (rev 243934)
@@ -59,7 +59,7 @@
set_target_properties(WebKitQuartzCoreAdditions PROPERTIES OUTPUT_NAME WebKitQuartzCoreAdditions${DEBUG_SUFFIX})
target_link_libraries(WebKitQuartzCoreAdditions
D3d9
- WTFFramework
+ WTF${DEBUG_SUFFIX}
CoreFoundation${DEBUG_SUFFIX}
CoreGraphics${DEBUG_SUFFIX}
QuartzCore${DEBUG_SUFFIX}
Modified: trunk/Source/cmake/WebKitFS.cmake (243933 => 243934)
--- trunk/Source/cmake/WebKitFS.cmake 2019-04-05 13:45:08 UTC (rev 243933)
+++ trunk/Source/cmake/WebKitFS.cmake 2019-04-05 15:35:32 UTC (rev 243934)
@@ -39,12 +39,8 @@
set(DERIVED_SOURCES_WEBINSPECTORUI_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebInspectorUI")
set(DERIVED_SOURCES_WTF_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WTF")
-set(WTF_FRAMEWORK_HEADERS_DIR ${CMAKE_BINARY_DIR}/FrameworkHeaders/WTF.framework/Headers)
-
set(FORWARDING_HEADERS_DIR ${DERIVED_SOURCES_DIR}/ForwardingHeaders)
-file(MAKE_DIRECTORY ${WTF_FRAMEWORK_HEADERS_DIR}/wtf)
-
file(MAKE_DIRECTORY ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR})
file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/Source/_javascript_Core/runtime)
Modified: trunk/Tools/CMakeLists.txt (243933 => 243934)
--- trunk/Tools/CMakeLists.txt 2019-04-05 13:45:08 UTC (rev 243933)
+++ trunk/Tools/CMakeLists.txt 2019-04-05 15:35:32 UTC (rev 243934)
@@ -1,5 +1,4 @@
set_property(DIRECTORY . PROPERTY FOLDER "Tools")
-include(frameworks/WTF)
# Individual subdirectories are added in the port's cmake file
WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
Modified: trunk/Tools/ChangeLog (243933 => 243934)
--- trunk/Tools/ChangeLog 2019-04-05 13:45:08 UTC (rev 243933)
+++ trunk/Tools/ChangeLog 2019-04-05 15:35:32 UTC (rev 243934)
@@ -1,3 +1,17 @@
+2019-04-05 Commit Queue <commit-qu...@webkit.org>
+
+ Unreviewed, rolling out r243833.
+ https://bugs.webkit.org/show_bug.cgi?id=196645
+
+ This change breaks build of WPE and GTK ports (Requested by
+ annulen on #webkit).
+
+ Reverted changeset:
+
+ "[CMake][WTF] Mirror XCode header directories"
+ https://bugs.webkit.org/show_bug.cgi?id=191662
+ https://trac.webkit.org/changeset/243833
+
2019-04-04 Simon Fraser <simon.fra...@apple.com>
Simple iframe scrolling test fails to get a composited scrolling frame in WebKitTestRunnerApp
Modified: trunk/Tools/DumpRenderTree/CMakeLists.txt (243933 => 243934)
--- trunk/Tools/DumpRenderTree/CMakeLists.txt 2019-04-05 13:45:08 UTC (rev 243933)
+++ trunk/Tools/DumpRenderTree/CMakeLists.txt 2019-04-05 15:35:32 UTC (rev 243934)
@@ -66,7 +66,7 @@
set(TestNetscapePlugIn_LIBRARIES
_javascript_Core
- WTFFramework
+ WTF
WebCoreTestSupport
)
Modified: trunk/Tools/DumpRenderTree/PlatformWin.cmake (243933 => 243934)
--- trunk/Tools/DumpRenderTree/PlatformWin.cmake 2019-04-05 13:45:08 UTC (rev 243933)
+++ trunk/Tools/DumpRenderTree/PlatformWin.cmake 2019-04-05 15:35:32 UTC (rev 243934)
@@ -70,7 +70,7 @@
)
list(APPEND DumpRenderTree_LIBRARIES
- WTFFramework
+ WTF
WebKitLegacy
shlwapi
)
Modified: trunk/Tools/MiniBrowser/win/CMakeLists.txt (243933 => 243934)
--- trunk/Tools/MiniBrowser/win/CMakeLists.txt 2019-04-05 13:45:08 UTC (rev 243933)
+++ trunk/Tools/MiniBrowser/win/CMakeLists.txt 2019-04-05 15:35:32 UTC (rev 243934)
@@ -24,7 +24,7 @@
set(MiniBrowser_LIBRARIES
DbgHelp
- WTFFramework
+ WTF
WebKitLegacy
WebKitLegacyGUID
comctl32
Modified: trunk/Tools/TestWebKitAPI/CMakeLists.txt (243933 => 243934)
--- trunk/Tools/TestWebKitAPI/CMakeLists.txt 2019-04-05 13:45:08 UTC (rev 243933)
+++ trunk/Tools/TestWebKitAPI/CMakeLists.txt 2019-04-05 15:35:32 UTC (rev 243934)
@@ -1,23 +1,23 @@
set(TESTWEBKITAPI_DIR "${TOOLS_DIR}/TestWebKitAPI")
-
set(test_wtf_LIBRARIES
- WTFFramework
+ WTF${DEBUG_SUFFIX}
gtest
)
set(test_webcore_LIBRARIES
- WTFFramework
+ WTF${DEBUG_SUFFIX}
WebCore${DEBUG_SUFFIX}
gtest
)
set(TestWebKitAPI_LIBRARIES
- WTFFramework
+ WTF${DEBUG_SUFFIX}
)
set(TestWebKitAPI_DEPENDENCIES
_javascript_CoreForwardingHeaders
_javascript_CorePrivateForwardingHeaders
+ WTFForwardingHeaders
)
if (ENABLE_WEBCORE)
@@ -28,7 +28,7 @@
set(test_webkit_api_LIBRARIES
_javascript_Core
TestWebKitAPIBase
- WTFFramework
+ WTF
WebKit
gtest
)
@@ -88,7 +88,7 @@
set(TestWebKitAPIBase_LIBRARIES
_javascript_Core
- WTFFramework
+ WTF
WebKit
gtest
)
@@ -246,7 +246,7 @@
)
target_link_libraries(TestWebKitAPIInjectedBundle ${TestWebKitAPI_LIBRARIES})
- add_dependencies(TestWebKitAPIInjectedBundle ${TestWebKitAPI_DEPENDENCIES})
+ add_dependencies(TestWebKitAPIInjectedBundle WTF ${TestWebKitAPI_DEPENDENCIES})
if (COMPILER_IS_GCC_OR_CLANG)
WEBKIT_ADD_TARGET_CXX_FLAGS(TestWebKitAPIInjectedBundle -Wno-dangling-else
@@ -271,7 +271,7 @@
if (WIN32)
add_dependencies(TestWTF TestWTFLib)
else ()
- add_dependencies(TestWTF ${TestWebKitAPI_DEPENDENCIES})
+ add_dependencies(TestWTF WTF ${TestWebKitAPI_DEPENDENCIES})
endif ()
target_link_libraries(TestWTF ${test_wtf_LIBRARIES})
Modified: trunk/Tools/TestWebKitAPI/PlatformWin.cmake (243933 => 243934)
--- trunk/Tools/TestWebKitAPI/PlatformWin.cmake 2019-04-05 13:45:08 UTC (rev 243933)
+++ trunk/Tools/TestWebKitAPI/PlatformWin.cmake 2019-04-05 15:35:32 UTC (rev 243934)
@@ -147,7 +147,6 @@
endif ()
set(test_webkitlegacy_LIBRARIES
- WTFFramework
WebCoreTestSupport
WebKitLegacy${DEBUG_SUFFIX}
gtest
Modified: trunk/Tools/WebKitTestRunner/PlatformGTK.cmake (243933 => 243934)
--- trunk/Tools/WebKitTestRunner/PlatformGTK.cmake 2019-04-05 13:45:08 UTC (rev 243933)
+++ trunk/Tools/WebKitTestRunner/PlatformGTK.cmake 2019-04-05 15:35:32 UTC (rev 243934)
@@ -29,7 +29,7 @@
${CAIRO_LIBRARIES}
${GTK3_LIBRARIES}
${GLIB_LIBRARIES}
- WTFFramework
+ WTF
WebCore
WebCorePlatformGTK
)
Modified: trunk/Tools/WebKitTestRunner/PlatformWin.cmake (243933 => 243934)
--- trunk/Tools/WebKitTestRunner/PlatformWin.cmake 2019-04-05 13:45:08 UTC (rev 243933)
+++ trunk/Tools/WebKitTestRunner/PlatformWin.cmake 2019-04-05 15:35:32 UTC (rev 243934)
@@ -36,7 +36,7 @@
)
list(APPEND WebKitTestRunner_LIBRARIES
- WTFFramework
+ WTF
WebKit
)
