Title: [294881] trunk/Source
- Revision
- 294881
- Author
- [email protected]
- Date
- 2022-05-26 10:25:38 -0700 (Thu, 26 May 2022)
Log Message
Cannot link WebKitTestRunner in non-unified builds
https://bugs.webkit.org/show_bug.cgi?id=240755
Reviewed by Adrian Perez de Castro.
In GTK non-unified build, WebKit shared library didn't export all
WEBCORE_EXPORT marked WebCore symbols because WebCore was a static
library.
WebCore should be an SHARED or OBJECT library to work WEBCORE_EXPORT
macro as expected.
* Source/WebCore/PlatformGTK.cmake:
* Source/WebCore/page/gtk/DragControllerGtk.cpp:
* Source/WebKit/WebProcess/WebPage/gtk/WebPrintOperationGtk.cpp:
* Source/cmake/OptionsGTK.cmake:
* Source/cmake/OptionsWPE.cmake:
Canonical link: https://commits.webkit.org/251011@main
Modified Paths
Diff
Modified: trunk/Source/WebCore/PlatformGTK.cmake (294880 => 294881)
--- trunk/Source/WebCore/PlatformGTK.cmake 2022-05-26 16:56:14 UTC (rev 294880)
+++ trunk/Source/WebCore/PlatformGTK.cmake 2022-05-26 17:25:38 UTC (rev 294881)
@@ -6,8 +6,6 @@
include(platform/Soup.cmake)
include(platform/TextureMapper.cmake)
-set(WebCore_OUTPUT_NAME WebCoreGTK)
-
list(APPEND WebCore_UNIFIED_SOURCE_LIST_FILES
"SourcesGTK.txt"
Modified: trunk/Source/WebCore/page/gtk/DragControllerGtk.cpp (294880 => 294881)
--- trunk/Source/WebCore/page/gtk/DragControllerGtk.cpp 2022-05-26 16:56:14 UTC (rev 294880)
+++ trunk/Source/WebCore/page/gtk/DragControllerGtk.cpp 2022-05-26 17:25:38 UTC (rev 294881)
@@ -32,6 +32,7 @@
#include "Editor.h"
#include "Element.h"
#include "Frame.h"
+#include "FrameDestructionObserverInlines.h"
#include "Pasteboard.h"
#include "markup.h"
Modified: trunk/Source/WebKit/WebProcess/WebPage/gtk/WebPrintOperationGtk.cpp (294880 => 294881)
--- trunk/Source/WebKit/WebProcess/WebPage/gtk/WebPrintOperationGtk.cpp 2022-05-26 16:56:14 UTC (rev 294880)
+++ trunk/Source/WebKit/WebProcess/WebPage/gtk/WebPrintOperationGtk.cpp 2022-05-26 17:25:38 UTC (rev 294881)
@@ -33,6 +33,7 @@
#include "WebProcess.h"
#include <WebCore/DocumentLoader.h>
#include <WebCore/Frame.h>
+#include <WebCore/FrameDestructionObserverInlines.h>
#include <WebCore/FrameLoader.h>
#include <WebCore/GraphicsContextCairo.h>
#include <WebCore/IntRect.h>
Modified: trunk/Source/cmake/OptionsGTK.cmake (294880 => 294881)
--- trunk/Source/cmake/OptionsGTK.cmake 2022-05-26 16:56:14 UTC (rev 294880)
+++ trunk/Source/cmake/OptionsGTK.cmake 2022-05-26 17:25:38 UTC (rev 294881)
@@ -247,6 +247,7 @@
set(CMAKE_CXX_VISIBILITY_PRESET hidden)
set(bmalloc_LIBRARY_TYPE OBJECT)
set(WTF_LIBRARY_TYPE OBJECT)
+set(WebCore_LIBRARY_TYPE OBJECT)
# These are shared variables, but we special case their definition so that we can use the
# CMAKE_INSTALL_* variables that are populated by the GNUInstallDirs macro.
Modified: trunk/Source/cmake/OptionsWPE.cmake (294880 => 294881)
--- trunk/Source/cmake/OptionsWPE.cmake 2022-05-26 16:56:14 UTC (rev 294880)
+++ trunk/Source/cmake/OptionsWPE.cmake 2022-05-26 17:25:38 UTC (rev 294881)
@@ -178,6 +178,7 @@
set(bmalloc_LIBRARY_TYPE OBJECT)
set(WTF_LIBRARY_TYPE OBJECT)
set(_javascript_Core_LIBRARY_TYPE OBJECT)
+set(WebCore_LIBRARY_TYPE OBJECT)
# These are shared variables, but we special case their definition so that we can use the
# CMAKE_INSTALL_* variables that are populated by the GNUInstallDirs macro.
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
