- Revision
- 262973
- Author
- ape...@igalia.com
- Date
- 2020-06-12 13:52:02 -0700 (Fri, 12 Jun 2020)
Log Message
Build is broken with EVENT_LOOP_TYPE=GLib
https://bugs.webkit.org/show_bug.cgi?id=212987
Reviewed by Konstantin Tokarev.
.:
* Source/cmake/OptionsJSCOnly.cmake: Add gio-unix as a required component of the GLib
package, as it is needed for the remote inspector support with EVENT_LOOP_TYPE=GLib.
Source/_javascript_Core:
* PlatformJSCOnly.cmake: Add sources needed to support the remote inspector to
_javascript_Core_SOURCES.
Source/WTF:
* wtf/CurrentTime.cpp: Make sure that <time.h> is included to get clock_gettime() and
friends defined when USE_GLIB is disabled.
* wtf/PlatformJSCOnly.cmake: Use FileSystemGLib instead of FileSystemPOSIX when
EVENT_LOOP_TYPE=GLib is set, add missing sources needed when ENABLE_REMOTE_INSPECTOR
is set.
* wtf/glib/RunLoopSourcePriority.h: Use the same list of priorities for WPE and JSCOnly.
Modified Paths
Diff
Modified: trunk/ChangeLog (262972 => 262973)
--- trunk/ChangeLog 2020-06-12 20:36:26 UTC (rev 262972)
+++ trunk/ChangeLog 2020-06-12 20:52:02 UTC (rev 262973)
@@ -1,3 +1,13 @@
+2020-06-12 Adrian Perez de Castro <ape...@igalia.com>
+
+ Build is broken with EVENT_LOOP_TYPE=GLib
+ https://bugs.webkit.org/show_bug.cgi?id=212987
+
+ Reviewed by Konstantin Tokarev.
+
+ * Source/cmake/OptionsJSCOnly.cmake: Add gio-unix as a required component of the GLib
+ package, as it is needed for the remote inspector support with EVENT_LOOP_TYPE=GLib.
+
2020-06-12 Carlos Garcia Campos <cgar...@igalia.com>
[GTK4] Get MiniBrowser ready for GTK4
Modified: trunk/Source/_javascript_Core/ChangeLog (262972 => 262973)
--- trunk/Source/_javascript_Core/ChangeLog 2020-06-12 20:36:26 UTC (rev 262972)
+++ trunk/Source/_javascript_Core/ChangeLog 2020-06-12 20:52:02 UTC (rev 262973)
@@ -1,3 +1,13 @@
+2020-06-12 Adrian Perez de Castro <ape...@igalia.com>
+
+ Build is broken with EVENT_LOOP_TYPE=GLib
+ https://bugs.webkit.org/show_bug.cgi?id=212987
+
+ Reviewed by Konstantin Tokarev.
+
+ * PlatformJSCOnly.cmake: Add sources needed to support the remote inspector to
+ _javascript_Core_SOURCES.
+
2020-06-11 Saam Barati <sbar...@apple.com>
Linear Scan uses the wrong Interval for spills for tmps with roles of early def or late use
Modified: trunk/Source/_javascript_Core/PlatformJSCOnly.cmake (262972 => 262973)
--- trunk/Source/_javascript_Core/PlatformJSCOnly.cmake 2020-06-12 20:36:26 UTC (rev 262972)
+++ trunk/Source/_javascript_Core/PlatformJSCOnly.cmake 2020-06-12 20:52:02 UTC (rev 262973)
@@ -1,6 +1,21 @@
add_definitions(-DSTATICALLY_LINKED_WITH_WTF)
+if (ENABLE_REMOTE_INSPECTOR)
+ list(APPEND _javascript_Core_SOURCES
+ inspector/remote/RemoteConnectionToTarget.cpp
+ inspector/remote/RemoteControllableTarget.cpp
+ inspector/remote/RemoteInspectionTarget.cpp
+ inspector/remote/RemoteInspector.cpp
+ )
+endif ()
+
if (USE_GLIB)
+ if (ENABLE_REMOTE_INSPECTOR)
+ list(APPEND _javascript_Core_SOURCES
+ inspector/remote/glib/RemoteInspectorGlib.cpp
+ )
+ endif ()
+
list(APPEND _javascript_Core_SYSTEM_INCLUDE_DIRECTORIES
${GLIB_INCLUDE_DIRS}
)
Modified: trunk/Source/WTF/ChangeLog (262972 => 262973)
--- trunk/Source/WTF/ChangeLog 2020-06-12 20:36:26 UTC (rev 262972)
+++ trunk/Source/WTF/ChangeLog 2020-06-12 20:52:02 UTC (rev 262973)
@@ -1,3 +1,17 @@
+2020-06-12 Adrian Perez de Castro <ape...@igalia.com>
+
+ Build is broken with EVENT_LOOP_TYPE=GLib
+ https://bugs.webkit.org/show_bug.cgi?id=212987
+
+ Reviewed by Konstantin Tokarev.
+
+ * wtf/CurrentTime.cpp: Make sure that <time.h> is included to get clock_gettime() and
+ friends defined when USE_GLIB is disabled.
+ * wtf/PlatformJSCOnly.cmake: Use FileSystemGLib instead of FileSystemPOSIX when
+ EVENT_LOOP_TYPE=GLib is set, add missing sources needed when ENABLE_REMOTE_INSPECTOR
+ is set.
+ * wtf/glib/RunLoopSourcePriority.h: Use the same list of priorities for WPE and JSCOnly.
+
2020-06-11 Alex Christensen <achristen...@webkit.org>
Re-enable download resume tests
Modified: trunk/Source/WTF/wtf/CurrentTime.cpp (262972 => 262973)
--- trunk/Source/WTF/wtf/CurrentTime.cpp 2020-06-12 20:36:26 UTC (rev 262972)
+++ trunk/Source/WTF/wtf/CurrentTime.cpp 2020-06-12 20:52:02 UTC (rev 262973)
@@ -53,6 +53,7 @@
#include <time.h>
#else
#include <sys/time.h>
+#include <time.h>
#endif
#if OS(FUCHSIA)
Modified: trunk/Source/WTF/wtf/PlatformJSCOnly.cmake (262972 => 262973)
--- trunk/Source/WTF/wtf/PlatformJSCOnly.cmake 2020-06-12 20:36:26 UTC (rev 262972)
+++ trunk/Source/WTF/wtf/PlatformJSCOnly.cmake 2020-06-12 20:52:02 UTC (rev 262973)
@@ -31,7 +31,6 @@
list(APPEND WTF_SOURCES
generic/MainThreadGeneric.cpp
- posix/FileSystemPOSIX.cpp
posix/OSAllocatorPOSIX.cpp
posix/ThreadingPOSIX.cpp
@@ -38,7 +37,6 @@
text/unix/TextBreakIteratorInternalICUUnix.cpp
unix/LanguageUnix.cpp
- unix/UniStdExtrasUnix.cpp
)
if (WTF_OS_FUCHSIA)
list(APPEND WTF_SOURCES
@@ -49,6 +47,19 @@
unix/CPUTimeUnix.cpp
)
endif ()
+
+ if (LOWERCASE_EVENT_LOOP_TYPE STREQUAL "glib")
+ list(APPEND WTF_SOURCES
+ glib/FileSystemGlib.cpp
+ )
+ else ()
+ list(APPEND WTF_SOURCES
+ posix/FileSystemPOSIX.cpp
+
+ unix/UniStdExtrasUnix.cpp
+ )
+ endif ()
+
endif ()
if (WIN32)
@@ -107,10 +118,30 @@
glib/GRefPtr.cpp
glib/RunLoopGLib.cpp
)
+ list(APPEND WTF_PUBLIC_HEADERS
+ glib/GRefPtr.h
+ glib/GTypedefs.h
+ glib/RunLoopSourcePriority.h
+ )
+
+ if (ENABLE_REMOTE_INSPECTOR)
+ list(APPEND WTF_SOURCES
+ glib/GSocketMonitor.cpp
+ glib/SocketConnection.cpp
+ )
+ list(APPEND WTF_PUBLIC_HEADERS
+ glib/GSocketMonitor.h
+ glib/GUniquePtr.h
+ glib/SocketConnection.h
+ )
+ endif ()
+
list(APPEND WTF_SYSTEM_INCLUDE_DIRECTORIES
+ ${GIO_UNIX_INCLUDE_DIRS}
${GLIB_INCLUDE_DIRS}
)
list(APPEND WTF_LIBRARIES
+ ${GIO_UNIX_LIBRARIES}
${GLIB_GIO_LIBRARIES}
${GLIB_GOBJECT_LIBRARIES}
${GLIB_LIBRARIES}
Modified: trunk/Source/WTF/wtf/glib/RunLoopSourcePriority.h (262972 => 262973)
--- trunk/Source/WTF/wtf/glib/RunLoopSourcePriority.h 2020-06-12 20:36:26 UTC (rev 262972)
+++ trunk/Source/WTF/wtf/glib/RunLoopSourcePriority.h 2020-06-12 20:52:02 UTC (rev 262973)
@@ -82,7 +82,7 @@
DiskCacheWrite = 200,
};
-#elif PLATFORM(WPE)
+#else
enum RunLoopSourcePriority {
RunLoopDispatcher = 0,
Modified: trunk/Source/cmake/OptionsJSCOnly.cmake (262972 => 262973)
--- trunk/Source/cmake/OptionsJSCOnly.cmake 2020-06-12 20:36:26 UTC (rev 262972)
+++ trunk/Source/cmake/OptionsJSCOnly.cmake 2020-06-12 20:52:02 UTC (rev 262973)
@@ -87,7 +87,7 @@
string(TOLOWER ${EVENT_LOOP_TYPE} LOWERCASE_EVENT_LOOP_TYPE)
if (LOWERCASE_EVENT_LOOP_TYPE STREQUAL "glib")
- find_package(GLIB 2.36 REQUIRED COMPONENTS gio gobject)
+ find_package(GLIB 2.36 REQUIRED COMPONENTS gio gio-unix gobject)
SET_AND_EXPOSE_TO_BUILD(USE_GLIB 1)
SET_AND_EXPOSE_TO_BUILD(USE_GLIB_EVENT_LOOP 1)
SET_AND_EXPOSE_TO_BUILD(WTF_DEFAULT_EVENT_LOOP 0)
