Title: [214025] trunk/Source/WTF
- Revision
- 214025
- Author
- clo...@igalia.com
- Date
- 2017-03-15 20:15:03 -0700 (Wed, 15 Mar 2017)
Log Message
[CMake][JSCOnly] Fix build with GLib event loop
https://bugs.webkit.org/show_bug.cgi?id=169730
Reviewed by Michael Catanzaro.
* wtf/MainThread.cpp:
* wtf/PlatformJSCOnly.cmake: WorkQueueGLib was removed in r199713.
Modified Paths
Diff
Modified: trunk/Source/WTF/ChangeLog (214024 => 214025)
--- trunk/Source/WTF/ChangeLog 2017-03-16 02:48:28 UTC (rev 214024)
+++ trunk/Source/WTF/ChangeLog 2017-03-16 03:15:03 UTC (rev 214025)
@@ -1,3 +1,13 @@
+2017-03-15 Carlos Alberto Lopez Perez <clo...@igalia.com>
+
+ [CMake][JSCOnly] Fix build with GLib event loop
+ https://bugs.webkit.org/show_bug.cgi?id=169730
+
+ Reviewed by Michael Catanzaro.
+
+ * wtf/MainThread.cpp:
+ * wtf/PlatformJSCOnly.cmake: WorkQueueGLib was removed in r199713.
+
2017-03-15 Dean Jackson <d...@apple.com>
Sort Xcode project files
Modified: trunk/Source/WTF/wtf/MainThread.cpp (214024 => 214025)
--- trunk/Source/WTF/wtf/MainThread.cpp 2017-03-16 02:48:28 UTC (rev 214024)
+++ trunk/Source/WTF/wtf/MainThread.cpp 2017-03-16 03:15:03 UTC (rev 214025)
@@ -178,7 +178,7 @@
scheduleDispatchFunctionsOnMainThread();
}
-#if !OS(DARWIN) && !PLATFORM(GTK)
+#if !OS(DARWIN) && !USE(GLIB_EVENT_LOOP)
bool isMainThread()
{
return currentThread() == mainThreadIdentifier;
Modified: trunk/Source/WTF/wtf/PlatformJSCOnly.cmake (214024 => 214025)
--- trunk/Source/WTF/wtf/PlatformJSCOnly.cmake 2017-03-16 02:48:28 UTC (rev 214024)
+++ trunk/Source/WTF/wtf/PlatformJSCOnly.cmake 2017-03-16 03:15:03 UTC (rev 214025)
@@ -1,6 +1,8 @@
list(APPEND WTF_SOURCES
PlatformUserPreferredLanguagesUnix.cpp
+ generic/WorkQueueGeneric.cpp
+
text/jsconly/TextBreakIteratorInternalICUJSCOnly.cpp
)
@@ -9,7 +11,6 @@
glib/GRefPtr.cpp
glib/MainThreadGLib.cpp
glib/RunLoopGLib.cpp
- glib/WorkQueueGLib.cpp
)
list(APPEND WTF_SYSTEM_INCLUDE_DIRECTORIES
${GLIB_INCLUDE_DIRS}
@@ -23,7 +24,6 @@
list(APPEND WTF_SOURCES
generic/MainThreadGeneric.cpp
generic/RunLoopGeneric.cpp
- generic/WorkQueueGeneric.cpp
)
endif ()
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
