Attachment 459777 Details for Bug 240755 – Patch

[patch] Patch

bug-240755-20220526152913.patch (text/plain), 3.64 KB, created by Fujii Hironori on 2022-05-25 23:29:14 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Fujii Hironori

Created: 2022-05-25 23:29:14 PDT

Size: 3.64 KB

patch

obsolete

>From d9708daceba22ce82bad4f33988fcbbfa21f1ea0 Mon Sep 17 00:00:00 2001
>From: Fujii Hironori <Hironori.Fujii@sony.com>
>Date: Thu, 26 May 2022 15:27:50 +0900
>Subject: [PATCH] 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:
>---
> Source/WebCore/PlatformGTK.cmake                              | 2 --
> Source/WebCore/page/gtk/DragControllerGtk.cpp                 | 1 +
> Source/WebKit/WebProcess/WebPage/gtk/WebPrintOperationGtk.cpp | 1 +
> Source/cmake/OptionsGTK.cmake                                 | 1 +
> Source/cmake/OptionsWPE.cmake                                 | 1 +
> 5 files changed, 4 insertions(+), 2 deletions(-)
>
>diff --git a/Source/WebCore/PlatformGTK.cmake b/Source/WebCore/PlatformGTK.cmake
>index ffe9343f8255..39f1263d7de5 100644
>--- a/Source/WebCore/PlatformGTK.cmake
>+++ b/Source/WebCore/PlatformGTK.cmake
>@@ -6,8 +6,6 @@ include(platform/ImageDecoders.cmake)
> include(platform/Soup.cmake)
> include(platform/TextureMapper.cmake)
> 
>-set(WebCore_OUTPUT_NAME WebCoreGTK)
>-
> list(APPEND WebCore_UNIFIED_SOURCE_LIST_FILES
>     "SourcesGTK.txt"
> 
>diff --git a/Source/WebCore/page/gtk/DragControllerGtk.cpp b/Source/WebCore/page/gtk/DragControllerGtk.cpp
>index 79fb95aa8018..a80eefa5b975 100644
>--- a/Source/WebCore/page/gtk/DragControllerGtk.cpp
>+++ b/Source/WebCore/page/gtk/DragControllerGtk.cpp
>@@ -32,6 +32,7 @@
> #include "Editor.h"
> #include "Element.h"
> #include "Frame.h"
>+#include "FrameDestructionObserverInlines.h"
> #include "Pasteboard.h"
> #include "markup.h"
> 
>diff --git a/Source/WebKit/WebProcess/WebPage/gtk/WebPrintOperationGtk.cpp b/Source/WebKit/WebProcess/WebPage/gtk/WebPrintOperationGtk.cpp
>index c2fbcbc9069c..b82024c8bad1 100644
>--- a/Source/WebKit/WebProcess/WebPage/gtk/WebPrintOperationGtk.cpp
>+++ b/Source/WebKit/WebProcess/WebPage/gtk/WebPrintOperationGtk.cpp
>@@ -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>
>diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake
>index 8dc57e7d0395..5a6a6fd84599 100644
>--- a/Source/cmake/OptionsGTK.cmake
>+++ b/Source/cmake/OptionsGTK.cmake
>@@ -247,6 +247,7 @@ set(CMAKE_C_VISIBILITY_PRESET hidden)
> 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.
>diff --git a/Source/cmake/OptionsWPE.cmake b/Source/cmake/OptionsWPE.cmake
>index 7b2389bcee6a..4d49793a30fd 100644
>--- a/Source/cmake/OptionsWPE.cmake
>+++ b/Source/cmake/OptionsWPE.cmake
>@@ -178,6 +178,7 @@ set(CMAKE_VISIBILITY_INLINES_HIDDEN ON)
> set(bmalloc_LIBRARY_TYPE OBJECT)
> set(WTF_LIBRARY_TYPE OBJECT)
> set(JavaScriptCore_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.
>-- 
>2.34.1
>

Actions: View | Formatted Diff | Diff

Attachments on bug 240755: 459701 | 459767 | 459777