Diff
Modified: trunk/ChangeLog (246631 => 246632)
--- trunk/ChangeLog 2019-06-20 09:40:41 UTC (rev 246631)
+++ trunk/ChangeLog 2019-06-20 11:08:29 UTC (rev 246632)
@@ -1,3 +1,14 @@
+2019-06-20 Carlos Garcia Campos <[email protected]>
+
+ [GTK] Remove support for GTK2 plugins
+ https://bugs.webkit.org/show_bug.cgi?id=199065
+
+ Reviewed by Sergio Villar Senin.
+
+ * Source/cmake/FindGDK2.cmake: Removed.
+ * Source/cmake/FindGTK2.cmake: Removed.
+ * Source/cmake/OptionsGTK.cmake:
+
2019-06-18 Adrian Perez de Castro <[email protected]>
Unreviewed. Update OptionsWPE.cmake and NEWS for the 2.25.1 release
Modified: trunk/PerformanceTests/ChangeLog (246631 => 246632)
--- trunk/PerformanceTests/ChangeLog 2019-06-20 09:40:41 UTC (rev 246631)
+++ trunk/PerformanceTests/ChangeLog 2019-06-20 11:08:29 UTC (rev 246632)
@@ -1,3 +1,12 @@
+2019-06-20 Carlos Garcia Campos <[email protected]>
+
+ [GTK] Remove support for GTK2 plugins
+ https://bugs.webkit.org/show_bug.cgi?id=199065
+
+ Reviewed by Sergio Villar Senin.
+
+ * StitchMarker/wtf/Platform.h:
+
2019-05-08 Caio Lima <[email protected]>
[BigInt] Add ValueMod into DFG
Modified: trunk/PerformanceTests/StitchMarker/wtf/Platform.h (246631 => 246632)
--- trunk/PerformanceTests/StitchMarker/wtf/Platform.h 2019-06-20 09:40:41 UTC (rev 246631)
+++ trunk/PerformanceTests/StitchMarker/wtf/Platform.h 2019-06-20 11:08:29 UTC (rev 246632)
@@ -524,9 +524,6 @@
#if PLATFORM(GTK)
#define GLIB_VERSION_MIN_REQUIRED GLIB_VERSION_2_36
-#endif
-
-#if PLATFORM(GTK) && !defined(GTK_API_VERSION_2)
#define GDK_VERSION_MIN_REQUIRED GDK_VERSION_3_6
#endif
Modified: trunk/Source/WTF/ChangeLog (246631 => 246632)
--- trunk/Source/WTF/ChangeLog 2019-06-20 09:40:41 UTC (rev 246631)
+++ trunk/Source/WTF/ChangeLog 2019-06-20 11:08:29 UTC (rev 246632)
@@ -1,3 +1,13 @@
+2019-06-20 Carlos Garcia Campos <[email protected]>
+
+ [GTK] Remove support for GTK2 plugins
+ https://bugs.webkit.org/show_bug.cgi?id=199065
+
+ Reviewed by Sergio Villar Senin.
+
+ * wtf/Platform.h:
+ * wtf/glib/GTypedefs.h:
+
2019-06-19 Yusuke Suzuki <[email protected]>
[bmalloc] IsoHeap's initialization is racy with IsoHeap::isInitialized
Modified: trunk/Source/WTF/wtf/Platform.h (246631 => 246632)
--- trunk/Source/WTF/wtf/Platform.h 2019-06-20 09:40:41 UTC (rev 246631)
+++ trunk/Source/WTF/wtf/Platform.h 2019-06-20 11:08:29 UTC (rev 246632)
@@ -583,6 +583,7 @@
#if PLATFORM(GTK)
#define GLIB_VERSION_MIN_REQUIRED GLIB_VERSION_2_36
+#define GDK_VERSION_MIN_REQUIRED GDK_VERSION_3_6
#endif
#if PLATFORM(WPE)
@@ -589,10 +590,6 @@
#define GLIB_VERSION_MIN_REQUIRED GLIB_VERSION_2_40
#endif
-#if PLATFORM(GTK) && !defined(GTK_API_VERSION_2)
-#define GDK_VERSION_MIN_REQUIRED GDK_VERSION_3_6
-#endif
-
#if USE(SOUP)
#define SOUP_VERSION_MIN_REQUIRED SOUP_VERSION_2_42
#endif
Modified: trunk/Source/WTF/wtf/glib/GTypedefs.h (246631 => 246632)
--- trunk/Source/WTF/wtf/glib/GTypedefs.h 2019-06-20 09:40:41 UTC (rev 246631)
+++ trunk/Source/WTF/wtf/glib/GTypedefs.h 2019-06-20 11:08:29 UTC (rev 246632)
@@ -75,11 +75,6 @@
typedef struct _cairo_rectangle_int cairo_rectangle_int_t;
#endif
-#if USE(CLUTTER)
-typedef struct _ClutterActor ClutterActor;
-typedef struct _GraphicsLayerActor GraphicsLayerActor;
-#endif
-
#if PLATFORM(GTK)
typedef struct _GtkAction GtkAction;
typedef struct _GtkAdjustment GtkAdjustment;
@@ -96,16 +91,9 @@
typedef struct _GtkThemeParts GtkThemeParts;
typedef struct _GtkWidget GtkWidget;
typedef struct _GtkWindow GtkWindow;
-
-#ifdef GTK_API_VERSION_2
-typedef struct _GdkRectangle GdkRectangle;
-typedef struct _GdkDrawable GdkWindow;
-#else
typedef struct _GdkWindow GdkWindow;
typedef struct _GtkStyleContext GtkStyleContext;
#endif
#endif
-
-#endif
#endif // WTF_GTypedefs_h
Modified: trunk/Source/WebCore/ChangeLog (246631 => 246632)
--- trunk/Source/WebCore/ChangeLog 2019-06-20 09:40:41 UTC (rev 246631)
+++ trunk/Source/WebCore/ChangeLog 2019-06-20 11:08:29 UTC (rev 246632)
@@ -1,3 +1,47 @@
+2019-06-20 Carlos Garcia Campos <[email protected]>
+
+ [GTK] Remove support for GTK2 plugins
+ https://bugs.webkit.org/show_bug.cgi?id=199065
+
+ Reviewed by Sergio Villar Senin.
+
+ * PlatformGTK.cmake:
+ * SourcesGTK.txt:
+ * SourcesWPE.txt:
+ * platform/FreeType.cmake:
+ * platform/SourcesGLib.txt:
+ * platform/graphics/Color.h:
+ * platform/graphics/PlatformDisplay.cpp:
+ (WebCore::PlatformDisplay::createPlatformDisplay):
+ * platform/graphics/gtk/ColorGtk.cpp:
+ (WebCore::Color::operator GdkRGBA const):
+ * platform/graphics/gtk/DisplayRefreshMonitorGtk.cpp:
+ (WebCore::onFrameClockUpdate):
+ (WebCore::DisplayRefreshMonitorGtk::requestRefreshCallback):
+ * platform/graphics/gtk/DisplayRefreshMonitorGtk.h:
+ (WebCore::DisplayRefreshMonitorGtk::create):
+ * platform/graphics/gtk/GdkCairoUtilities.cpp:
+ * platform/gtk/GRefPtrGtk.cpp:
+ * platform/gtk/GRefPtrGtk.h:
+ * platform/gtk/GtkVersioning.c: Removed.
+ * platform/gtk/GtkVersioning.h: Removed.
+ * platform/gtk/PasteboardHelper.cpp:
+ (WebCore::PasteboardHelper::getClipboardContents):
+ * platform/gtk/PlatformKeyboardEventGtk.cpp:
+ (WebCore::modifiersForGdkKeyEvent):
+ (WebCore::PlatformKeyboardEvent::PlatformKeyboardEvent):
+ * platform/gtk/PlatformMouseEventGtk.cpp:
+ (WebCore::PlatformMouseEvent::PlatformMouseEvent):
+ * platform/gtk/PlatformScreenGtk.cpp:
+ (WebCore::screenIsTouchPrimaryInputDevice):
+ * platform/gtk/PlatformWheelEventGtk.cpp:
+ (WebCore::PlatformWheelEvent::PlatformWheelEvent):
+ * platform/gtk/ScrollbarThemeGtk.cpp:
+ * platform/gtk/ScrollbarThemeGtk.h:
+ * platform/gtk/WidgetGtk.cpp:
+ * rendering/RenderThemeGtk.cpp:
+ * rendering/RenderThemeGtk.h:
+
2019-06-19 Myles C. Maxfield <[email protected]>
[WHLSL] Hook up common texture functions
Modified: trunk/Source/WebCore/PlatformGTK.cmake (246631 => 246632)
--- trunk/Source/WebCore/PlatformGTK.cmake 2019-06-20 09:40:41 UTC (rev 246631)
+++ trunk/Source/WebCore/PlatformGTK.cmake 2019-06-20 11:08:29 UTC (rev 246632)
@@ -42,41 +42,6 @@
)
endif ()
-list(APPEND WebCorePlatformGTK_SOURCES
- editing/gtk/EditorGtk.cpp
-
- page/gtk/DragControllerGtk.cpp
-
- platform/glib/EventHandlerGLib.cpp
-
- platform/graphics/PlatformDisplay.cpp
-
- platform/graphics/gtk/ColorGtk.cpp
- platform/graphics/gtk/DisplayRefreshMonitorGtk.cpp
- platform/graphics/gtk/GdkCairoUtilities.cpp
- platform/graphics/gtk/IconGtk.cpp
- platform/graphics/gtk/ImageBufferGtk.cpp
- platform/graphics/gtk/ImageGtk.cpp
-
- platform/gtk/CursorGtk.cpp
- platform/gtk/DragImageGtk.cpp
- platform/gtk/GRefPtrGtk.cpp
- platform/gtk/GtkUtilities.cpp
- platform/gtk/GtkVersioning.c
- platform/gtk/PasteboardHelper.cpp
- platform/gtk/PlatformKeyboardEventGtk.cpp
- platform/gtk/PlatformMouseEventGtk.cpp
- platform/gtk/PlatformPasteboardGtk.cpp
- platform/gtk/PlatformScreenGtk.cpp
- platform/gtk/PlatformWheelEventGtk.cpp
- platform/gtk/RenderThemeGadget.cpp
- platform/gtk/RenderThemeWidget.cpp
- platform/gtk/ScrollbarThemeGtk.cpp
- platform/gtk/WidgetGtk.cpp
-
- rendering/RenderThemeGtk.cpp
-)
-
list(APPEND WebCore_PRIVATE_FRAMEWORK_HEADERS
platform/graphics/x11/PlatformDisplayX11.h
platform/graphics/x11/XErrorTrapper.h
@@ -87,7 +52,6 @@
platform/gtk/GRefPtrGtk.h
platform/gtk/GUniquePtrGtk.h
platform/gtk/GtkUtilities.h
- platform/gtk/GtkVersioning.h
platform/gtk/PasteboardHelper.h
platform/gtk/SelectionData.h
@@ -109,10 +73,12 @@
list(APPEND WebCore_LIBRARIES
${ATK_LIBRARIES}
${ENCHANT_LIBRARIES}
+ ${GDK_LIBRARIES}
${GLIB_GIO_LIBRARIES}
${GLIB_GMODULE_LIBRARIES}
${GLIB_GOBJECT_LIBRARIES}
${GLIB_LIBRARIES}
+ ${GTK_LIBRARIES}
${LIBSECCOMP_LIBRARIES}
${LIBSECRET_LIBRARIES}
${LIBTASN1_LIBRARIES}
@@ -135,8 +101,10 @@
list(APPEND WebCore_SYSTEM_INCLUDE_DIRECTORIES
${ATK_INCLUDE_DIRS}
${ENCHANT_INCLUDE_DIRS}
+ ${GDK_INCLUDE_DIRS}
${GIO_UNIX_INCLUDE_DIRS}
${GLIB_INCLUDE_DIRS}
+ ${GTK_INCLUDE_DIRS}
${LIBSECCOMP_INCLUDE_DIRS}
${LIBSECRET_INCLUDE_DIRS}
${LIBTASN1_INCLUDE_DIRS}
@@ -166,31 +134,6 @@
)
endif ()
-if (ENABLE_PLUGIN_PROCESS_GTK2)
- # WebKitPluginProcess2 needs a version of WebCore compiled against GTK+2, so we've isolated all the GTK+
- # dependent files into a separate library which can be used to construct a GTK+2 WebCore
- # for the plugin process.
- add_library(WebCorePlatformGTK2 ${WebCore_LIBRARY_TYPE} ${WebCorePlatformGTK_SOURCES})
- add_dependencies(WebCorePlatformGTK2 WebCore)
- set_property(TARGET WebCorePlatformGTK2
- APPEND
- PROPERTY COMPILE_DEFINITIONS GTK_API_VERSION_2=1
- )
- target_include_directories(WebCorePlatformGTK2 PRIVATE
- ${WebCore_INCLUDE_DIRECTORIES}
- )
- target_include_directories(WebCorePlatformGTK2 SYSTEM PRIVATE
- ${WebCore_SYSTEM_INCLUDE_DIRECTORIES}
- ${GTK2_INCLUDE_DIRS}
- ${GDK2_INCLUDE_DIRS}
- )
- target_link_libraries(WebCorePlatformGTK2
- ${WebCore_LIBRARIES}
- ${GTK2_LIBRARIES}
- ${GDK2_LIBRARIES}
- )
-endif ()
-
if (ENABLE_WAYLAND_TARGET)
list(APPEND WebCore_PRIVATE_FRAMEWORK_HEADERS
platform/graphics/wayland/PlatformDisplayWayland.h
@@ -204,29 +147,6 @@
)
endif ()
-add_library(WebCorePlatformGTK ${WebCore_LIBRARY_TYPE} ${WebCorePlatformGTK_SOURCES})
-add_dependencies(WebCorePlatformGTK WebCore)
-target_include_directories(WebCorePlatformGTK PRIVATE
- ${WebCore_INCLUDE_DIRECTORIES}
- ${WebCore_PRIVATE_INCLUDE_DIRECTORIES}
-)
-target_include_directories(WebCorePlatformGTK SYSTEM PRIVATE
- ${WebCore_SYSTEM_INCLUDE_DIRECTORIES}
- ${GTK_INCLUDE_DIRS}
- ${GDK_INCLUDE_DIRS}
-)
-target_link_libraries(WebCorePlatformGTK
- ${WebCore_LIBRARIES}
- ${GTK_LIBRARIES}
- ${GDK_LIBRARIES}
-)
-
-include_directories(
- ${WebCore_INCLUDE_DIRECTORIES}
- ${WebCore_PRIVATE_INCLUDE_DIRECTORIES}
- "${WEBCORE_DIR}/bindings/gobject/"
-)
-
include_directories(SYSTEM
${WebCore_SYSTEM_INCLUDE_DIRECTORIES}
)
Modified: trunk/Source/WebCore/SourcesGTK.txt (246631 => 246632)
--- trunk/Source/WebCore/SourcesGTK.txt 2019-06-20 09:40:41 UTC (rev 246631)
+++ trunk/Source/WebCore/SourcesGTK.txt 2019-06-20 11:08:29 UTC (rev 246632)
@@ -41,8 +41,12 @@
editing/atk/FrameSelectionAtk.cpp
+editing/gtk/EditorGtk.cpp
+
loader/soup/ResourceLoaderSoup.cpp
+page/gtk/DragControllerGtk.cpp
+
page/linux/ResourceUsageOverlayLinux.cpp
page/linux/ResourceUsageThreadLinux.cpp
@@ -63,6 +67,7 @@
platform/graphics/GLContext.cpp @no-unify
platform/graphics/GraphicsContext3DPrivate.cpp
+platform/graphics/PlatformDisplay.cpp
platform/graphics/cairo/BackingStoreBackendCairoX11.cpp @no-unify
@@ -73,6 +78,13 @@
platform/graphics/glx/GLContextGLX.cpp
+platform/graphics/gtk/ColorGtk.cpp
+platform/graphics/gtk/DisplayRefreshMonitorGtk.cpp
+platform/graphics/gtk/GdkCairoUtilities.cpp
+platform/graphics/gtk/IconGtk.cpp
+platform/graphics/gtk/ImageBufferGtk.cpp
+platform/graphics/gtk/ImageGtk.cpp
+
platform/graphics/gstreamer/ImageGStreamerCairo.cpp
platform/graphics/libwpe/PlatformDisplayLibWPE.cpp
@@ -89,10 +101,24 @@
platform/graphics/x11/XErrorTrapper.cpp @no-unify
platform/graphics/x11/XUniqueResource.cpp @no-unify
+platform/gtk/CursorGtk.cpp
platform/gtk/DragDataGtk.cpp
+platform/gtk/DragImageGtk.cpp
+platform/gtk/GRefPtrGtk.cpp
+platform/gtk/GtkUtilities.cpp
platform/gtk/LocalizedStringsGtk.cpp
platform/gtk/PasteboardGtk.cpp
+platform/gtk/PasteboardHelper.cpp
+platform/gtk/PlatformKeyboardEventGtk.cpp
+platform/gtk/PlatformMouseEventGtk.cpp
+platform/gtk/PlatformPasteboardGtk.cpp
+platform/gtk/PlatformScreenGtk.cpp
+platform/gtk/PlatformWheelEventGtk.cpp
+platform/gtk/RenderThemeGadget.cpp
+platform/gtk/RenderThemeWidget.cpp
+platform/gtk/ScrollbarThemeGtk.cpp
platform/gtk/SelectionData.cpp
+platform/gtk/WidgetGtk.cpp
platform/text/Hyphenation.cpp
platform/text/LocaleICU.cpp
@@ -104,3 +130,5 @@
platform/unix/LoggingUnix.cpp
platform/xdg/MIMETypeRegistryXdg.cpp
+
+rendering/RenderThemeGtk.cpp
Modified: trunk/Source/WebCore/SourcesWPE.txt (246631 => 246632)
--- trunk/Source/WebCore/SourcesWPE.txt 2019-06-20 09:40:41 UTC (rev 246631)
+++ trunk/Source/WebCore/SourcesWPE.txt 2019-06-20 11:08:29 UTC (rev 246632)
@@ -58,9 +58,6 @@
platform/UserAgentQuirks.cpp
-// This can't go into SourcesGLib.txt because it has to go into WebCorePlatformGTK.
-platform/glib/EventHandlerGLib.cpp
-
platform/graphics/GLContext.cpp
platform/graphics/GraphicsContext3DPrivate.cpp
platform/graphics/PlatformDisplay.cpp
Modified: trunk/Source/WebCore/platform/FreeType.cmake (246631 => 246632)
--- trunk/Source/WebCore/platform/FreeType.cmake 2019-06-20 09:40:41 UTC (rev 246631)
+++ trunk/Source/WebCore/platform/FreeType.cmake 2019-06-20 11:08:29 UTC (rev 246632)
@@ -5,6 +5,7 @@
)
list(APPEND WebCore_SOURCES
+ platform/graphics/freetype/FontCacheFreeType.cpp
platform/graphics/freetype/FontCustomPlatformDataFreeType.cpp
platform/graphics/freetype/FontPlatformDataFreeType.cpp
platform/graphics/freetype/GlyphPageTreeNodeFreeType.cpp
@@ -21,16 +22,6 @@
platform/graphics/harfbuzz/HbUniquePtr.h
)
-if (PORT STREQUAL "GTK")
- list(APPEND WebCorePlatformGTK_SOURCES
- platform/graphics/freetype/FontCacheFreeType.cpp
-)
-else ()
- list(APPEND WebCore_SOURCES
- platform/graphics/freetype/FontCacheFreeType.cpp
-)
-endif ()
-
if (USE_CAIRO)
list(APPEND WebCore_SOURCES
platform/graphics/cairo/FontCairoHarfbuzzNG.cpp
Modified: trunk/Source/WebCore/platform/SourcesGLib.txt (246631 => 246632)
--- trunk/Source/WebCore/platform/SourcesGLib.txt 2019-06-20 09:40:41 UTC (rev 246631)
+++ trunk/Source/WebCore/platform/SourcesGLib.txt 2019-06-20 11:08:29 UTC (rev 246632)
@@ -23,6 +23,7 @@
platform/audio/glib/AudioBusGLib.cpp
+platform/glib/EventHandlerGLib.cpp
platform/glib/EventLoopGlib.cpp
platform/glib/FileMonitorGLib.cpp
platform/glib/KeyedDecoderGlib.cpp
Modified: trunk/Source/WebCore/platform/graphics/Color.h (246631 => 246632)
--- trunk/Source/WebCore/platform/graphics/Color.h 2019-06-20 09:40:41 UTC (rev 246631)
+++ trunk/Source/WebCore/platform/graphics/Color.h 2019-06-20 11:08:29 UTC (rev 246632)
@@ -49,11 +49,8 @@
#endif
#if PLATFORM(GTK)
-typedef struct _GdkColor GdkColor;
-#ifndef GTK_API_VERSION_2
typedef struct _GdkRGBA GdkRGBA;
#endif
-#endif
namespace WTF {
class TextStream;
@@ -252,13 +249,9 @@
bool isSemantic() const { return !isExtended() && (m_colorData.rgbaAndFlags & isSemanticRBGAColorBit); }
#if PLATFORM(GTK)
- Color(const GdkColor&);
- // We can't sensibly go back to GdkColor without losing the alpha value
-#ifndef GTK_API_VERSION_2
Color(const GdkRGBA&);
operator GdkRGBA() const;
#endif
-#endif
#if USE(CG)
WEBCORE_EXPORT Color(CGColorRef);
Modified: trunk/Source/WebCore/platform/graphics/PlatformDisplay.cpp (246631 => 246632)
--- trunk/Source/WebCore/platform/graphics/PlatformDisplay.cpp 2019-06-20 09:40:41 UTC (rev 246631)
+++ trunk/Source/WebCore/platform/graphics/PlatformDisplay.cpp 2019-06-20 11:08:29 UTC (rev 246632)
@@ -54,7 +54,7 @@
#include <gdk/gdkx.h>
#endif
-#if PLATFORM(GTK) && PLATFORM(WAYLAND) && !defined(GTK_API_VERSION_2)
+#if PLATFORM(GTK) && PLATFORM(WAYLAND)
#include <gdk/gdkwayland.h>
#endif
@@ -74,9 +74,6 @@
std::unique_ptr<PlatformDisplay> PlatformDisplay::createPlatformDisplay()
{
#if PLATFORM(GTK)
-#if defined(GTK_API_VERSION_2)
- return PlatformDisplayX11::create(GDK_DISPLAY_XDISPLAY(gdk_display_get_default()));
-#else
if (gtk_init_check(nullptr, nullptr)) {
GdkDisplay* display = gdk_display_manager_get_default_display(gdk_display_manager_get());
#if PLATFORM(X11)
@@ -88,7 +85,6 @@
return PlatformDisplayWayland::create(gdk_wayland_display_get_wl_display(display));
#endif
}
-#endif
#endif // PLATFORM(GTK)
#if USE(WPE_RENDERER)
Modified: trunk/Source/WebCore/platform/graphics/gtk/ColorGtk.cpp (246631 => 246632)
--- trunk/Source/WebCore/platform/graphics/gtk/ColorGtk.cpp 2019-06-20 09:40:41 UTC (rev 246631)
+++ trunk/Source/WebCore/platform/graphics/gtk/ColorGtk.cpp 2019-06-20 11:08:29 UTC (rev 246632)
@@ -25,12 +25,6 @@
namespace WebCore {
-Color::Color(const GdkColor& c)
-{
- setRGB(makeRGB(c.red >> 8, c.green >> 8, c.blue >> 8));
-}
-
-#ifndef GTK_API_VERSION_2
Color::Color(const GdkRGBA& c)
{
setRGB(makeRGBA(static_cast<int>(c.red * 255),
@@ -48,7 +42,6 @@
getRGBA(red, green, blue, alpha);
return { red, green, blue, alpha };
}
-#endif
}
Modified: trunk/Source/WebCore/platform/graphics/gtk/DisplayRefreshMonitorGtk.cpp (246631 => 246632)
--- trunk/Source/WebCore/platform/graphics/gtk/DisplayRefreshMonitorGtk.cpp 2019-06-20 09:40:41 UTC (rev 246631)
+++ trunk/Source/WebCore/platform/graphics/gtk/DisplayRefreshMonitorGtk.cpp 2019-06-20 11:08:29 UTC (rev 246632)
@@ -44,12 +44,10 @@
gtk_widget_destroy(m_window);
}
-#ifndef GTK_API_VERSION_2
static void onFrameClockUpdate(GdkFrameClock*, DisplayRefreshMonitorGtk* monitor)
{
monitor->displayLinkFired();
}
-#endif
bool DisplayRefreshMonitorGtk::requestRefreshCallback()
{
@@ -56,7 +54,6 @@
if (!isActive())
return false;
-#ifndef GTK_API_VERSION_2
if (!m_window) {
// GdkFrameClockIdle is private in GDK, so we need to create a toplevel to get its frame clock.
m_window = gtk_offscreen_window_new();
@@ -75,9 +72,6 @@
LockHolder lock(mutex());
setIsScheduled(true);
return true;
-#else
- return false;
-#endif
}
void DisplayRefreshMonitorGtk::displayLinkFired()
Modified: trunk/Source/WebCore/platform/graphics/gtk/DisplayRefreshMonitorGtk.h (246631 => 246632)
--- trunk/Source/WebCore/platform/graphics/gtk/DisplayRefreshMonitorGtk.h 2019-06-20 09:40:41 UTC (rev 246631)
+++ trunk/Source/WebCore/platform/graphics/gtk/DisplayRefreshMonitorGtk.h 2019-06-20 11:08:29 UTC (rev 246632)
@@ -37,12 +37,7 @@
public:
static RefPtr<DisplayRefreshMonitorGtk> create(PlatformDisplayID displayID)
{
-#ifndef GTK_API_VERSION_2
return adoptRef(*new DisplayRefreshMonitorGtk(displayID));
-#else
- UNUSED_PARAM(displayID);
- return nullptr;
-#endif
}
virtual ~DisplayRefreshMonitorGtk();
Modified: trunk/Source/WebCore/platform/graphics/gtk/GdkCairoUtilities.cpp (246631 => 246632)
--- trunk/Source/WebCore/platform/graphics/gtk/GdkCairoUtilities.cpp 2019-06-20 09:40:41 UTC (rev 246631)
+++ trunk/Source/WebCore/platform/graphics/gtk/GdkCairoUtilities.cpp 2019-06-20 11:08:29 UTC (rev 246632)
@@ -27,7 +27,6 @@
#include "CairoUtilities.h"
#include "GdkCairoUtilities.h"
-#include "GtkVersioning.h"
#include "IntSize.h"
#include <cairo.h>
#include <gtk/gtk.h>
Modified: trunk/Source/WebCore/platform/gtk/GRefPtrGtk.cpp (246631 => 246632)
--- trunk/Source/WebCore/platform/gtk/GRefPtrGtk.cpp 2019-06-20 09:40:41 UTC (rev 246631)
+++ trunk/Source/WebCore/platform/gtk/GRefPtrGtk.cpp 2019-06-20 11:08:29 UTC (rev 246632)
@@ -59,22 +59,6 @@
}
#endif
-#ifdef GTK_API_VERSION_2
-template <> GdkCursor* refGPtr(GdkCursor* ptr)
-{
- if (ptr)
- gdk_cursor_ref(ptr);
- return ptr;
-}
-
-template <> void derefGPtr(GdkCursor* ptr)
-{
- if (ptr)
- gdk_cursor_unref(ptr);
-}
-
-#else
-
template <> GtkWidgetPath* refGPtr(GtkWidgetPath* ptr)
{
if (ptr)
@@ -88,6 +72,4 @@
gtk_widget_path_unref(ptr);
}
-#endif
-
}
Modified: trunk/Source/WebCore/platform/gtk/GRefPtrGtk.h (246631 => 246632)
--- trunk/Source/WebCore/platform/gtk/GRefPtrGtk.h 2019-06-20 09:40:41 UTC (rev 246631)
+++ trunk/Source/WebCore/platform/gtk/GRefPtrGtk.h 2019-06-20 11:08:29 UTC (rev 246632)
@@ -18,8 +18,7 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef GRefPtrGtk_h
-#define GRefPtrGtk_h
+#pragma once
#include <wtf/glib/GRefPtr.h>
@@ -36,14 +35,8 @@
template <> void derefGPtr(SecretValue* ptr);
#endif
-#ifdef GTK_API_VERSION_2
-template <> GdkCursor* refGPtr(GdkCursor* ptr);
-template <> void derefGPtr(GdkCursor* ptr);
-#else
template <> GtkWidgetPath* refGPtr(GtkWidgetPath* ptr);
template <> void derefGPtr(GtkWidgetPath* ptr);
-#endif
}
-#endif
Deleted: trunk/Source/WebCore/platform/gtk/GtkVersioning.c (246631 => 246632)
--- trunk/Source/WebCore/platform/gtk/GtkVersioning.c 2019-06-20 09:40:41 UTC (rev 246631)
+++ trunk/Source/WebCore/platform/gtk/GtkVersioning.c 2019-06-20 11:08:29 UTC (rev 246632)
@@ -1,287 +0,0 @@
-/*
- * Copyright (C) 2010 Collabora Ltd.
- * Copyright (C) 2010 Igalia, S.L.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#include "config.h"
-#include "GtkVersioning.h"
-
-#include <gtk/gtk.h>
-
-#if PLATFORM(X11) && defined(GDK_WINDOWING_X11)
-#include <X11/Xatom.h>
-#include <gdk/gdkx.h>
-#endif
-
-GdkDevice *getDefaultGDKPointerDevice(GdkWindow* window)
-{
-#if GTK_CHECK_VERSION(3, 20, 0)
- return gdk_seat_get_pointer(gdk_display_get_default_seat(gdk_window_get_display(window)));
-#elif !defined(GTK_API_VERSION_2)
- GdkDeviceManager *manager = gdk_display_get_device_manager(gdk_window_get_display(window));
- return gdk_device_manager_get_client_pointer(manager);
-#else
- UNUSED_PARAM(window);
- return gdk_device_get_core_pointer();
-#endif // GTK_API_VERSION_2
-}
-
-#ifdef GTK_API_VERSION_2
-static cairo_format_t
-gdk_cairo_format_for_content(cairo_content_t content)
-{
- switch (content) {
- case CAIRO_CONTENT_COLOR:
- return CAIRO_FORMAT_RGB24;
- case CAIRO_CONTENT_ALPHA:
- return CAIRO_FORMAT_A8;
- case CAIRO_CONTENT_COLOR_ALPHA:
- default:
- return CAIRO_FORMAT_ARGB32;
- }
-}
-
-static cairo_surface_t*
-gdk_cairo_surface_coerce_to_image(cairo_surface_t* surface,
- cairo_content_t content,
- int width,
- int height)
-{
- cairo_surface_t * copy;
- cairo_t * cr;
-
- if (cairo_surface_get_type(surface) == CAIRO_SURFACE_TYPE_IMAGE
- && cairo_surface_get_content(surface) == content
- && cairo_image_surface_get_width(surface) >= width
- && cairo_image_surface_get_height(surface) >= height)
- return cairo_surface_reference(surface);
-
- copy = cairo_image_surface_create(gdk_cairo_format_for_content(content),
- width,
- height);
-
- cr = cairo_create(copy);
- cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
- cairo_set_source_surface(cr, surface, 0, 0);
- cairo_paint(cr);
- cairo_destroy(cr);
-
- return copy;
-}
-
-static void
-convert_alpha(guchar * destData, int destStride,
- guchar * srcData, int srcStride,
- int srcX, int srcY, int width, int height)
-{
- UNUSED_PARAM(srcX);
-
- int x, y;
-
- srcData += srcStride * srcY + srcY * 4;
-
- for (y = 0; y < height; y++) {
- guint32 * src = "" *) srcData;
-
- for (x = 0; x < width; x++) {
- guint alpha = src[x] >> 24;
-
- if (!alpha) {
- destData[x * 4 + 0] = 0;
- destData[x * 4 + 1] = 0;
- destData[x * 4 + 2] = 0;
- } else {
- destData[x * 4 + 0] = (((src[x] & 0xff0000) >> 16) * 255 + alpha / 2) / alpha;
- destData[x * 4 + 1] = (((src[x] & 0x00ff00) >> 8) * 255 + alpha / 2) / alpha;
- destData[x * 4 + 2] = (((src[x] & 0x0000ff) >> 0) * 255 + alpha / 2) / alpha;
- }
- destData[x * 4 + 3] = alpha;
- }
-
- srcData += srcStride;
- destData += destStride;
- }
-}
-
-static void
-convert_no_alpha(guchar * destData, int destStride, guchar * srcData,
- int srcStride, int srcX, int srcY,
- int width, int height)
-{
- int x, y;
-
- srcData += srcStride * srcY + srcX * 4;
-
- for (y = 0; y < height; y++) {
- guint32 * src = "" *) srcData;
-
- for (x = 0; x < width; x++) {
- destData[x * 3 + 0] = src[x] >> 16;
- destData[x * 3 + 1] = src[x] >> 8;
- destData[x * 3 + 2] = src[x];
- }
-
- srcData += srcStride;
- destData += destStride;
- }
-}
-
-/**
- * gdk_pixbuf_get_from_surface:
- * @surface: surface to copy from
- * @src_x: Source X coordinate within @surface
- * @src_y: Source Y coordinate within @surface
- * @width: Width in pixels of region to get
- * @height: Height in pixels of region to get
- *
- * Transfers image data from a #cairo_surface_t and converts it to an RGB(A)
- * representation inside a #GdkPixbuf. This allows you to efficiently read
- * individual pixels from cairo surfaces. For #GdkWindows, use
- * gdk_pixbuf_get_from_window() instead.
- *
- * This function will create an RGB pixbuf with 8 bits per channel. The pixbuf
- * will contain an alpha channel if the @surface contains one.
- *
- * Return value: (transfer full): A newly-created pixbuf with a reference count
- * of 1, or %NULL on error
- **/
-GdkPixbuf*
-gdk_pixbuf_get_from_surface(cairo_surface_t * surface,
- int srcX, int srcY,
- int width, int height)
-{
- cairo_content_t content;
- GdkPixbuf * dest;
-
- /* General sanity checks */
- g_return_val_if_fail(surface, NULL);
- g_return_val_if_fail(srcX >= 0 && srcY >= 0, NULL);
- g_return_val_if_fail(width > 0 && height > 0, NULL);
-
- content = cairo_surface_get_content(surface) | CAIRO_CONTENT_COLOR;
- dest = gdk_pixbuf_new(GDK_COLORSPACE_RGB,
- !!(content & CAIRO_CONTENT_ALPHA),
- 8,
- width, height);
-
- surface = gdk_cairo_surface_coerce_to_image(surface, content, srcX + width, srcY + height);
- cairo_surface_flush(surface);
- if (cairo_surface_status(surface) || !dest) {
- cairo_surface_destroy(surface);
- return NULL;
- }
-
- if (gdk_pixbuf_get_has_alpha(dest))
- convert_alpha(gdk_pixbuf_get_pixels(dest),
- gdk_pixbuf_get_rowstride(dest),
- cairo_image_surface_get_data(surface),
- cairo_image_surface_get_stride(surface),
- srcX, srcY,
- width, height);
- else
- convert_no_alpha(gdk_pixbuf_get_pixels(dest),
- gdk_pixbuf_get_rowstride(dest),
- cairo_image_surface_get_data(surface),
- cairo_image_surface_get_stride(surface),
- srcX, srcY,
- width, height);
-
- cairo_surface_destroy(surface);
- return dest;
-}
-
-#if PLATFORM(X11) && defined(GDK_WINDOWING_X11)
-static int getScreenCurrentDesktop(GdkScreen *screen)
-{
- Display *display = GDK_DISPLAY_XDISPLAY(gdk_screen_get_display(screen));
- Window rootWindow = XRootWindow(display, GDK_SCREEN_XNUMBER(screen));
- Atom currentDesktop = XInternAtom(display, "_NET_CURRENT_DESKTOP", True);
-
- Atom type;
- int format;
- unsigned long itemsCount, bytesAfter;
- unsigned char *returnedData = NULL;
- XGetWindowProperty(display, rootWindow, currentDesktop, 0, G_MAXLONG, False, XA_CARDINAL,
- &type, &format, &itemsCount, &bytesAfter, &returnedData);
-
- int workspace = 0;
- if (type == XA_CARDINAL && format == 32 && itemsCount > 0)
- workspace = (int)returnedData[0];
-
- if (returnedData)
- XFree(returnedData);
-
- return workspace;
-}
-
-static void getScreenWorkArea(GdkScreen *screen, GdkRectangle *area)
-{
- Display *display = GDK_DISPLAY_XDISPLAY(gdk_screen_get_display(screen));
- Atom workArea = XInternAtom(display, "_NET_WORKAREA", True);
-
- /* Defaults in case of error. */
-#if GTK_CHECK_VERSION(3, 22, 0)
- GdkRectangle geom;
- GdkMonitor *monitor = gdk_display_get_primary_monitor(display);
- gdk_monitor_get_geometry(monitor, &geom);
- area->x = geom.x;
- area->y = geom.y;
- area->width = geom.width;
- area->height = geom.height;
-#else
- area->x = 0;
- area->y = 0;
- area->width = gdk_screen_get_width(screen);
- area->height = gdk_screen_get_height(screen);
-#endif
-
- if (workArea == None)
- return;
-
- Window rootWindow = XRootWindow(display, GDK_SCREEN_XNUMBER(screen));
- Atom type;
- int format;
- unsigned long itemsCount, bytesAfter;
- unsigned char *returnedData = 0;
- int result = XGetWindowProperty(display, rootWindow, workArea, 0, 4 * 32 /* Max length */, False, AnyPropertyType,
- &type, &format, &itemsCount, &bytesAfter, &returnedData);
- if (result != Success || type == None || !format || bytesAfter || itemsCount % 4)
- return;
-
- int desktop = getScreenCurrentDesktop(screen);
- long *workAreas = (long *)returnedData;
- area->x = workAreas[desktop * 4];
- area->y = workAreas[desktop * 4 + 1];
- area->width = workAreas[desktop * 4 + 2];
- area->height = workAreas[desktop * 4 + 3];
-
- XFree(returnedData);
-}
-#endif // PLATFORM(X11) && defined(GDK_WINDOWING_X11)
-
-void gdk_screen_get_monitor_workarea(GdkScreen *screen, int monitor, GdkRectangle *area)
-{
- gdk_screen_get_monitor_geometry(screen, monitor, area);
-
-#if PLATFORM(X11) && defined(GDK_WINDOWING_X11)
- GdkRectangle workArea;
- getScreenWorkArea(screen, &workArea);
- gdk_rectangle_intersect(&workArea, area, area);
-#endif
-}
-#endif // GTK_API_VERSION_2
Deleted: trunk/Source/WebCore/platform/gtk/GtkVersioning.h (246631 => 246632)
--- trunk/Source/WebCore/platform/gtk/GtkVersioning.h 2019-06-20 09:40:41 UTC (rev 246631)
+++ trunk/Source/WebCore/platform/gtk/GtkVersioning.h 2019-06-20 11:08:29 UTC (rev 246632)
@@ -1,57 +0,0 @@
-/*
- * Copyright (C) 2010 Collabora Ltd.
- * Copyright (C) 2010 Igalia, S.L.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef GtkVersioning_h
-#define GtkVersioning_h
-
-#include <gtk/gtk.h>
-
-#ifndef GTK_API_VERSION_2
-#include <gdk/gdkkeysyms-compat.h>
-#endif
-
-G_BEGIN_DECLS
-
-// Macros to avoid deprecation checking churn
-#ifndef GTK_API_VERSION_2
-#define GDK_WINDOW_XWINDOW(window) (gdk_x11_window_get_xid(window))
-#else
-GdkPixbuf* gdk_pixbuf_get_from_surface(cairo_surface_t* surface, int srcX, int srcY,
- int width, int height);
-void gdk_screen_get_monitor_workarea(GdkScreen *, int monitor, GdkRectangle *area);
-// Define GDK_IS_X11_DISPLAY dummy for GTK+ 2.0 compatibility.
-#ifdef GDK_WINDOWING_X11
-#define GDK_IS_X11_DISPLAY(display) 1
-#else
-#define GDK_IS_X11_DISPLAY(display) 0
-#endif
-#endif
-
-GdkDevice* getDefaultGDKPointerDevice(GdkWindow* window);
-
-// gtk_widget_get_preferred_size() appeared only in GTK 3.0.
-#if !GTK_CHECK_VERSION (2, 91, 0) // gtk_widget_get_preferred_size appeared about then.
-#define gtk_widget_get_preferred_size(widget, minimumSize, naturalSize) \
- (gtk_widget_size_request((widget), ((minimumSize))))
-#endif
-
-G_END_DECLS
-
-#endif // GtkVersioning_h
Modified: trunk/Source/WebCore/platform/gtk/PasteboardHelper.cpp (246631 => 246632)
--- trunk/Source/WebCore/platform/gtk/PasteboardHelper.cpp 2019-06-20 09:40:41 UTC (rev 246631)
+++ trunk/Source/WebCore/platform/gtk/PasteboardHelper.cpp 2019-06-20 11:08:29 UTC (rev 246632)
@@ -24,7 +24,6 @@
#include "PasteboardHelper.h"
#include "BitmapImage.h"
-#include "GtkVersioning.h"
#include "SelectionData.h"
#include <gtk/gtk.h>
#include <wtf/SetForScope.h>
@@ -119,7 +118,6 @@
}
}
-#ifndef GTK_API_VERSION_2
if (gtk_clipboard_wait_is_image_available(clipboard)) {
if (GRefPtr<GdkPixbuf> pixbuf = adoptGRef(gtk_clipboard_wait_for_image(clipboard))) {
RefPtr<cairo_surface_t> surface = adoptRef(gdk_cairo_surface_create_from_pixbuf(pixbuf.get(), 1, nullptr));
@@ -127,7 +125,6 @@
selection.setImage(image.ptr());
}
}
-#endif
selection.setCanSmartReplace(gtk_clipboard_wait_is_target_available(clipboard, smartPasteAtom));
}
Modified: trunk/Source/WebCore/platform/gtk/PlatformKeyboardEventGtk.cpp (246631 => 246632)
--- trunk/Source/WebCore/platform/gtk/PlatformKeyboardEventGtk.cpp 2019-06-20 09:40:41 UTC (rev 246631)
+++ trunk/Source/WebCore/platform/gtk/PlatformKeyboardEventGtk.cpp 2019-06-20 11:08:29 UTC (rev 246632)
@@ -31,7 +31,6 @@
#include "PlatformKeyboardEvent.h"
#include "GtkUtilities.h"
-#include "GtkVersioning.h"
#include "NotImplemented.h"
#include "TextEncoding.h"
#include "WindowsKeyboardCodes.h"
@@ -1334,14 +1333,11 @@
static OptionSet<PlatformEvent::Modifier> modifiersForGdkKeyEvent(GdkEventKey* event)
{
GdkModifierType state;
+ gdk_event_get_state(reinterpret_cast<GdkEvent*>(event), &state);
guint keyval;
+ gdk_event_get_keyval(reinterpret_cast<GdkEvent*>(event), &keyval);
+
OptionSet<PlatformEvent::Modifier> modifiers;
- gdk_event_get_state(reinterpret_cast<GdkEvent*>(event), &state);
-#ifndef GTK_API_VERSION_2
- gdk_event_get_keyval(reinterpret_cast<GdkEvent*>(event), &keyval);
-#else
- keyval = event->keyval;
-#endif
if (state & GDK_SHIFT_MASK || keyval == GDK_KEY_3270_BackTab)
modifiers.add(PlatformEvent::Modifier::ShiftKey);
if (state & GDK_CONTROL_MASK)
@@ -1365,14 +1361,9 @@
, m_compositionResults(compositionResults)
{
guint keyval;
+ gdk_event_get_keyval(reinterpret_cast<GdkEvent*>(event), &keyval);
guint16 keycode;
-#ifndef GTK_API_VERSION_2
- gdk_event_get_keyval(reinterpret_cast<GdkEvent*>(event), &keyval);
gdk_event_get_keycode(reinterpret_cast<GdkEvent*>(event), &keycode);
-#else
- keyval = event->keyval;
- keycode = event->hardware_keycode;
-#endif
m_text = compositionResults.simpleString.length() ? compositionResults.simpleString : singleCharacterString(keyval);
m_unmodifiedText = m_text;
Modified: trunk/Source/WebCore/platform/gtk/PlatformMouseEventGtk.cpp (246631 => 246632)
--- trunk/Source/WebCore/platform/gtk/PlatformMouseEventGtk.cpp 2019-06-20 09:40:41 UTC (rev 246631)
+++ trunk/Source/WebCore/platform/gtk/PlatformMouseEventGtk.cpp 2019-06-20 11:08:29 UTC (rev 246632)
@@ -39,18 +39,14 @@
// Keep this in sync with the other platform event constructors
PlatformMouseEvent::PlatformMouseEvent(GdkEventButton* event)
{
- gdouble x, y, rootX, rootY;
- GdkModifierType state;
- guint button;
-
+ gdouble x, y;
gdk_event_get_coords(reinterpret_cast<GdkEvent*>(event), &x, &y);
+ gdouble rootX, rootY;
gdk_event_get_root_coords(reinterpret_cast<GdkEvent*>(event), &rootX, &rootY);
+ GdkModifierType state;
gdk_event_get_state(reinterpret_cast<GdkEvent*>(event), &state);
-#ifndef GTK_API_VERSION_2
+ guint button;
gdk_event_get_button(reinterpret_cast<GdkEvent*>(event), &button);
-#else
- button = event->button;
-#endif
m_timestamp = wallTimeForEvent(event);
m_position = IntPoint(static_cast<int>(x), static_cast<int>(y));
Modified: trunk/Source/WebCore/platform/gtk/PlatformScreenGtk.cpp (246631 => 246632)
--- trunk/Source/WebCore/platform/gtk/PlatformScreenGtk.cpp 2019-06-20 09:40:41 UTC (rev 246631)
+++ trunk/Source/WebCore/platform/gtk/PlatformScreenGtk.cpp 2019-06-20 11:08:29 UTC (rev 246632)
@@ -33,7 +33,6 @@
#include "FloatRect.h"
#include "FrameView.h"
-#include "GtkVersioning.h"
#include "HostWindow.h"
#include "NotImplemented.h"
#include "Widget.h"
@@ -220,17 +219,6 @@
}
#if ENABLE(TOUCH_EVENTS)
-#ifdef GTK_API_VERSION_2
-bool screenHasTouchDevice()
-{
- return false;
-}
-
-bool screenIsTouchPrimaryInputDevice()
-{
- return false;
-}
-#else // GTK_API_VERSION_2
#if !GTK_CHECK_VERSION(3, 20, 0)
static void deviceAddedCallback(GdkDeviceManager*, GdkDevice*);
static void deviceRemovedCallback(GdkDeviceManager*, GdkDevice*);
@@ -324,7 +312,6 @@
return device ? gdk_device_get_source(device) == GDK_SOURCE_TOUCHSCREEN : true;
}
-#endif // !GTK_API_VERSION_2
#endif // ENABLE(TOUCH_EVENTS)
} // namespace WebCore
Modified: trunk/Source/WebCore/platform/gtk/PlatformWheelEventGtk.cpp (246631 => 246632)
--- trunk/Source/WebCore/platform/gtk/PlatformWheelEventGtk.cpp 2019-06-20 09:40:41 UTC (rev 246631)
+++ trunk/Source/WebCore/platform/gtk/PlatformWheelEventGtk.cpp 2019-06-20 11:08:29 UTC (rev 246632)
@@ -62,7 +62,6 @@
m_deltaX = 0;
m_deltaY = 0;
GdkScrollDirection direction;
-#ifndef GTK_API_VERSION_2
if (!gdk_event_get_scroll_direction(reinterpret_cast<GdkEvent*>(event), &direction)) {
gdouble deltaX, deltaY;
if (gdk_event_get_scroll_deltas(reinterpret_cast<GdkEvent*>(event), &deltaX, &deltaY)) {
@@ -70,9 +69,6 @@
m_deltaY = -deltaY;
}
}
-#else
- direction = event->direction;
-#endif
// Docs say an upwards scroll (away from the user) has a positive delta
if (!m_deltaX && !m_deltaY) {
@@ -97,7 +93,6 @@
m_wheelTicksY = m_deltaY;
#if ENABLE(ASYNC_SCROLLING)
-#ifndef GTK_API_VERSION_2
#if GTK_CHECK_VERSION(3, 20, 0)
m_phase = gdk_event_is_scroll_stop_event(reinterpret_cast<GdkEvent*>(event)) ?
PlatformWheelEventPhaseEnded :
@@ -107,9 +102,6 @@
PlatformWheelEventPhaseEnded :
PlatformWheelEventPhaseChanged;
#endif
-#else
- m_phase = PlatformWheelEventPhaseChanged;
-#endif // GTK_API_VERSION_2
#endif // ENABLE(ASYNC_SCROLLING)
gdouble x, y, rootX, rootY;
Modified: trunk/Source/WebCore/platform/gtk/ScrollbarThemeGtk.cpp (246631 => 246632)
--- trunk/Source/WebCore/platform/gtk/ScrollbarThemeGtk.cpp 2019-06-20 09:40:41 UTC (rev 246631)
+++ trunk/Source/WebCore/platform/gtk/ScrollbarThemeGtk.cpp 2019-06-20 11:08:29 UTC (rev 246632)
@@ -46,7 +46,6 @@
ScrollbarThemeGtk::~ScrollbarThemeGtk() = default;
-#ifndef GTK_API_VERSION_2
static void themeChangedCallback()
{
ScrollbarTheme::theme().themeChanged();
@@ -836,32 +835,4 @@
return minThumbLength;
}
#endif
-
-#else // GTK_API_VERSION_2
-bool ScrollbarThemeGtk::hasThumb(Scrollbar&)
-{
- return false;
}
-
-IntRect ScrollbarThemeGtk::backButtonRect(Scrollbar&, ScrollbarPart, bool)
-{
- return IntRect();
-}
-
-IntRect ScrollbarThemeGtk::forwardButtonRect(Scrollbar&, ScrollbarPart, bool)
-{
- return IntRect();
-}
-
-IntRect ScrollbarThemeGtk::trackRect(Scrollbar&, bool)
-{
- return IntRect();
-}
-
-bool ScrollbarThemeGtk::hasButtons(Scrollbar&)
-{
- return false;
-}
-#endif // GTK_API_VERSION_2
-
-}
Modified: trunk/Source/WebCore/platform/gtk/ScrollbarThemeGtk.h (246631 => 246632)
--- trunk/Source/WebCore/platform/gtk/ScrollbarThemeGtk.h 2019-06-20 09:40:41 UTC (rev 246631)
+++ trunk/Source/WebCore/platform/gtk/ScrollbarThemeGtk.h 2019-06-20 11:08:29 UTC (rev 246632)
@@ -23,8 +23,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef ScrollbarThemeGtk_h
-#define ScrollbarThemeGtk_h
+#pragma once
#include "ScrollbarThemeComposite.h"
@@ -42,7 +41,6 @@
IntRect forwardButtonRect(Scrollbar&, ScrollbarPart, bool) override;
IntRect trackRect(Scrollbar&, bool) override;
-#ifndef GTK_API_VERSION_2
ScrollbarThemeGtk();
bool paint(Scrollbar&, GraphicsContext&, const IntRect& damageRect) override;
@@ -66,9 +64,7 @@
bool m_hasBackButtonStartPart : 1;
bool m_hasBackButtonEndPart : 1;
bool m_usesOverlayScrollbars { false };
-#endif // GTK_API_VERSION_2
};
}
-#endif
Modified: trunk/Source/WebCore/platform/gtk/WidgetGtk.cpp (246631 => 246632)
--- trunk/Source/WebCore/platform/gtk/WidgetGtk.cpp 2019-06-20 09:40:41 UTC (rev 246631)
+++ trunk/Source/WebCore/platform/gtk/WidgetGtk.cpp 2019-06-20 11:08:29 UTC (rev 246632)
@@ -31,7 +31,6 @@
#include "Cursor.h"
#include "FrameView.h"
#include "GraphicsContext.h"
-#include "GtkVersioning.h"
#include "HostWindow.h"
#include "IntRect.h"
Modified: trunk/Source/WebCore/rendering/RenderThemeGtk.cpp (246631 => 246632)
--- trunk/Source/WebCore/rendering/RenderThemeGtk.cpp 2019-06-20 09:40:41 UTC (rev 246631)
+++ trunk/Source/WebCore/rendering/RenderThemeGtk.cpp 2019-06-20 11:08:29 UTC (rev 246632)
@@ -33,7 +33,6 @@
#include "GUniquePtrGtk.h"
#include "Gradient.h"
#include "GraphicsContext.h"
-#include "GtkVersioning.h"
#include "HTMLInputElement.h"
#include "HTMLMediaElement.h"
#include "LocalizedStrings.h"
@@ -125,8 +124,6 @@
}
#endif
-#ifndef GTK_API_VERSION_2
-
static void themeChangedCallback()
{
Page::updateStyleForAllPagesAfterGlobalChangeInEnvironment();
@@ -2061,6 +2058,4 @@
return scriptBuilder.toString();
}
#endif // ENABLE(VIDEO)
-
-#endif // GTK_API_VERSION_2
}
Modified: trunk/Source/WebCore/rendering/RenderThemeGtk.h (246631 => 246632)
--- trunk/Source/WebCore/rendering/RenderThemeGtk.h 2019-06-20 09:40:41 UTC (rev 246631)
+++ trunk/Source/WebCore/rendering/RenderThemeGtk.h 2019-06-20 11:08:29 UTC (rev 246632)
@@ -48,8 +48,6 @@
void updateCachedSystemFontDescription(CSSValueID, FontCascadeDescription&) const override;
public:
-#ifndef GTK_API_VERSION_2
-
// A method asking if the theme's controls actually care about redrawing when hovered.
bool supportsHover(const RenderStyle&) const override { return true; }
@@ -189,7 +187,6 @@
#endif
static IntRect calculateProgressRect(const RenderObject&, const IntRect&);
-#endif // GTK_API_VERSION_2
};
} // namespace WebCore
Modified: trunk/Source/WebKit/ChangeLog (246631 => 246632)
--- trunk/Source/WebKit/ChangeLog 2019-06-20 09:40:41 UTC (rev 246631)
+++ trunk/Source/WebKit/ChangeLog 2019-06-20 11:08:29 UTC (rev 246632)
@@ -1,3 +1,38 @@
+2019-06-20 Carlos Garcia Campos <[email protected]>
+
+ [GTK] Remove support for GTK2 plugins
+ https://bugs.webkit.org/show_bug.cgi?id=199065
+
+ Reviewed by Sergio Villar Senin.
+
+ * PlatformGTK.cmake:
+ * Shared/Plugins/Netscape/NetscapePluginModule.cpp:
+ (WebKit::moduleMixesGtkSymbols):
+ * Shared/Plugins/Netscape/unix/NetscapePluginModuleUnix.cpp:
+ (WebKit::NetscapePluginModule::getPluginInfo):
+ * Shared/Plugins/PluginModuleInfo.h:
+ * Shared/gtk/WebEventFactory.cpp:
+ (WebKit::isGdkKeyCodeFromKeyPad):
+ (WebKit::buttonForEvent):
+ (WebKit::WebEventFactory::createWebMouseEvent):
+ (WebKit::WebEventFactory::createWebWheelEvent):
+ (WebKit::WebEventFactory::createWebKeyboardEvent):
+ (WebKit::WebEventFactory::createWebTouchEvent):
+ * SourcesGTK.txt:
+ * UIProcess/API/gtk/WebKitWebViewBase.cpp:
+ * UIProcess/Launcher/glib/ProcessLauncherGLib.cpp:
+ (WebKit::ProcessLauncher::launchProcess):
+ * UIProcess/Plugins/PluginProcessProxy.h:
+ * UIProcess/Plugins/gtk/PluginInfoCache.cpp:
+ (WebKit::PluginInfoCache::getPluginInfo):
+ (WebKit::PluginInfoCache::updatePluginInfo):
+ * UIProcess/Plugins/unix/PluginInfoStoreUnix.cpp:
+ (WebKit::PluginInfoStore::getPluginInfo):
+ * UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp:
+ (WebKit::PluginProcessProxy::platformGetLaunchOptionsWithAttributes):
+ (WebKit::PluginProcessProxy::scanPlugin):
+ * WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp:
+
2019-06-19 Dean Jackson <[email protected]>
No menu pop-up when long pressing on a link in Firefox app
Modified: trunk/Source/WebKit/PlatformGTK.cmake (246631 => 246632)
--- trunk/Source/WebKit/PlatformGTK.cmake 2019-06-20 09:40:41 UTC (rev 246631)
+++ trunk/Source/WebKit/PlatformGTK.cmake 2019-06-20 11:08:29 UTC (rev 246632)
@@ -422,8 +422,11 @@
list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES
${CAIRO_INCLUDE_DIRS}
${ENCHANT_INCLUDE_DIRS}
+ ${GLIB_INCLUDE_DIRS}
${GSTREAMER_INCLUDE_DIRS}
${GSTREAMER_PBUTILS_INCLUDE_DIRS}
+ ${GTK_INCLUDE_DIRS}
+ ${GTK_UNIX_PRINT_INCLUDE_DIRS}
${HARFBUZZ_INCLUDE_DIRS}
${LIBSOUP_INCLUDE_DIRS}
)
@@ -447,12 +450,6 @@
set(WebKitCommonIncludeDirectories ${WebKit_INCLUDE_DIRECTORIES})
set(WebKitCommonSystemIncludeDirectories ${WebKit_SYSTEM_INCLUDE_DIRECTORIES})
-list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES
- ${GLIB_INCLUDE_DIRS}
- ${GTK_INCLUDE_DIRS}
- ${GTK_UNIX_PRINT_INCLUDE_DIRS}
-)
-
list(APPEND WebProcess_SOURCES
WebProcess/EntryPoint/unix/WebProcessMain.cpp
)
@@ -466,14 +463,9 @@
)
list(APPEND WebKit_LIBRARIES
- PRIVATE
- WebCorePlatformGTK
- ${GTK_UNIX_PRINT_LIBRARIES}
+ ${GTK_UNIX_PRINT_LIBRARIES}
)
-# WebCore should be specifed before and after WebCorePlatformGTK
-list(APPEND WebKit_LIBRARIES PRIVATE WebCore)
-
if (USE_WPE_RENDERER)
list(APPEND WebKit_LIBRARIES
${WPE_LIBRARIES}
@@ -570,144 +562,6 @@
)
endif ()
-if (ENABLE_PLUGIN_PROCESS_GTK2)
- set(PluginProcessGTK2_EXECUTABLE_NAME WebKitPluginProcess2)
-
- # FIXME: We should remove WebKitPluginProcess2 in 2020, once Flash is no longer supported.
- list(APPEND PluginProcessGTK2_SOURCES
- Platform/Logging.cpp
- Platform/Module.cpp
-
- Platform/IPC/ArgumentCoders.cpp
- Platform/IPC/Attachment.cpp
- Platform/IPC/Connection.cpp
- Platform/IPC/DataReference.cpp
- Platform/IPC/Decoder.cpp
- Platform/IPC/Encoder.cpp
- Platform/IPC/MessageReceiverMap.cpp
- Platform/IPC/MessageSender.cpp
- Platform/IPC/StringReference.cpp
-
- Platform/IPC/glib/GSocketMonitor.cpp
- Platform/IPC/unix/AttachmentUnix.cpp
- Platform/IPC/unix/ConnectionUnix.cpp
-
- Platform/glib/ModuleGlib.cpp
-
- Platform/unix/LoggingUnix.cpp
- Platform/unix/SharedMemoryUnix.cpp
-
- PluginProcess/PluginControllerProxy.cpp
- PluginProcess/PluginCreationParameters.cpp
- PluginProcess/PluginProcess.cpp
- PluginProcess/WebProcessConnection.cpp
-
- PluginProcess/EntryPoint/unix/PluginProcessMain.cpp
-
- PluginProcess/unix/PluginControllerProxyUnix.cpp
- PluginProcess/unix/PluginProcessMainUnix.cpp
- PluginProcess/unix/PluginProcessUnix.cpp
-
- Shared/ActivityAssertion.cpp
- Shared/AuxiliaryProcess.cpp
- Shared/BlobDataFileReferenceWithSandboxExtension.cpp
- Shared/ShareableBitmap.cpp
- Shared/WebCoreArgumentCoders.cpp
- Shared/WebEvent.cpp
- Shared/WebKeyboardEvent.cpp
- Shared/WebKit2Initialize.cpp
- Shared/WebMouseEvent.cpp
- Shared/WebPlatformTouchPoint.cpp
- Shared/WebTouchEvent.cpp
- Shared/WebWheelEvent.cpp
-
- Shared/Plugins/NPIdentifierData.cpp
- Shared/Plugins/NPObjectMessageReceiver.cpp
- Shared/Plugins/NPObjectProxy.cpp
- Shared/Plugins/NPRemoteObjectMap.cpp
- Shared/Plugins/NPVariantData.cpp
- Shared/Plugins/PluginProcessCreationParameters.cpp
-
- Shared/Plugins/Netscape/NetscapePluginModule.cpp
- Shared/Plugins/Netscape/NetscapePluginModuleNone.cpp
-
- Shared/Plugins/Netscape/unix/NetscapePluginModuleUnix.cpp
-
- Shared/cairo/ShareableBitmapCairo.cpp
-
- Shared/glib/ProcessExecutablePathGLib.cpp
-
- Shared/gtk/NativeWebKeyboardEventGtk.cpp
- Shared/gtk/NativeWebMouseEventGtk.cpp
- Shared/gtk/NativeWebTouchEventGtk.cpp
- Shared/gtk/NativeWebWheelEventGtk.cpp
- Shared/gtk/WebEventFactory.cpp
-
- Shared/soup/WebCoreArgumentCodersSoup.cpp
-
- Shared/unix/AuxiliaryProcessMain.cpp
-
- UIProcess/Launcher/ProcessLauncher.cpp
-
- UIProcess/Launcher/glib/BubblewrapLauncher.cpp
- UIProcess/Launcher/glib/FlatpakLauncher.cpp
- UIProcess/Launcher/glib/ProcessLauncherGLib.cpp
-
- UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp
-
- WebProcess/Plugins/Plugin.cpp
-
- WebProcess/Plugins/Netscape/NPRuntimeUtilities.cpp
- WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp
- WebProcess/Plugins/Netscape/NetscapePlugin.cpp
- WebProcess/Plugins/Netscape/NetscapePluginNone.cpp
- WebProcess/Plugins/Netscape/NetscapePluginStream.cpp
-
- WebProcess/Plugins/Netscape/unix/NetscapePluginUnix.cpp
- WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp
-
- ${WebKit_DERIVED_SOURCES_DIR}/AuxiliaryProcessMessageReceiver.cpp
- ${WebKit_DERIVED_SOURCES_DIR}/PluginControllerProxyMessageReceiver.cpp
- ${WebKit_DERIVED_SOURCES_DIR}/PluginProcessMessageReceiver.cpp
- ${WebKit_DERIVED_SOURCES_DIR}/NPObjectMessageReceiverMessageReceiver.cpp
- ${WebKit_DERIVED_SOURCES_DIR}/WebProcessConnectionMessageReceiver.cpp
- )
-
- add_executable(WebKitPluginProcess2 ${PluginProcessGTK2_SOURCES})
- ADD_WEBKIT_PREFIX_HEADER(WebKitPluginProcess2)
-
- # We need ENABLE_PLUGIN_PROCESS for all targets in this directory, but
- # we only want GTK_API_VERSION_2 for the plugin process target.
- set_property(
- TARGET WebKitPluginProcess2
- APPEND
- PROPERTY COMPILE_DEFINITIONS GTK_API_VERSION_2=1
- )
- target_include_directories(WebKitPluginProcess2 PRIVATE
- ${WebKitCommonIncludeDirectories}
- )
- target_include_directories(WebKitPluginProcess2 SYSTEM PRIVATE
- ${WebKitCommonSystemIncludeDirectories}
- ${GTK2_INCLUDE_DIRS}
- ${GDK2_INCLUDE_DIRS}
- )
-
- set(WebKitPluginProcess2_LIBRARIES
- ${SharedWebKitLibraries}
- PRIVATE WebCorePlatformGTK2
- )
- ADD_WHOLE_ARCHIVE_TO_LIBRARIES(WebKitPluginProcess2_LIBRARIES)
- target_link_libraries(WebKitPluginProcess2 ${WebKitPluginProcess2_LIBRARIES})
-
- add_dependencies(WebKitPluginProcess2 WebKit)
-
- install(TARGETS WebKitPluginProcess2 DESTINATION "${LIBEXEC_INSTALL_DIR}")
-
- if (COMPILER_IS_GCC_OR_CLANG)
- WEBKIT_ADD_TARGET_CXX_FLAGS(WebKitPluginProcess2 -Wno-unused-parameter)
- endif ()
-endif () # ENABLE_PLUGIN_PROCESS_GTK2
-
# GTK3 PluginProcess
list(APPEND PluginProcess_SOURCES
PluginProcess/EntryPoint/unix/PluginProcessMain.cpp
Modified: trunk/Source/WebKit/Shared/Plugins/Netscape/NetscapePluginModule.cpp (246631 => 246632)
--- trunk/Source/WebKit/Shared/Plugins/Netscape/NetscapePluginModule.cpp 2019-06-20 09:40:41 UTC (rev 246631)
+++ trunk/Source/WebKit/Shared/Plugins/Netscape/NetscapePluginModule.cpp 2019-06-20 11:08:29 UTC (rev 246632)
@@ -200,11 +200,7 @@
#if PLATFORM(GTK)
static bool moduleMixesGtkSymbols(Module* module)
{
-#ifdef GTK_API_VERSION_2
- return module->functionPointer<gpointer>("gtk_application_get_type");
-#else
return module->functionPointer<gpointer>("gtk_object_get_type");
-#endif
}
#endif
Modified: trunk/Source/WebKit/Shared/Plugins/Netscape/unix/NetscapePluginModuleUnix.cpp (246631 => 246632)
--- trunk/Source/WebKit/Shared/Plugins/Netscape/unix/NetscapePluginModuleUnix.cpp 2019-06-20 09:40:41 UTC (rev 246631)
+++ trunk/Source/WebKit/Shared/Plugins/Netscape/unix/NetscapePluginModuleUnix.cpp 2019-06-20 11:08:29 UTC (rev 246632)
@@ -163,9 +163,6 @@
plugin.info.name = metaData.name;
plugin.info.desc = metaData.description;
parseMIMEDescription(metaData.mimeDescription, plugin.info.mimes);
-#if PLATFORM(GTK)
- plugin.requiresGtk2 = metaData.requiresGtk2;
-#endif
return true;
}
Modified: trunk/Source/WebKit/Shared/Plugins/PluginModuleInfo.h (246631 => 246632)
--- trunk/Source/WebKit/Shared/Plugins/PluginModuleInfo.h 2019-06-20 09:40:41 UTC (rev 246631)
+++ trunk/Source/WebKit/Shared/Plugins/PluginModuleInfo.h 2019-06-20 11:08:29 UTC (rev 246632)
@@ -56,8 +56,6 @@
String versionString;
String shortVersionString;
bool hasSandboxProfile;
-#elif PLATFORM(GTK)
- bool requiresGtk2;
#endif
};
Modified: trunk/Source/WebKit/Shared/gtk/WebEventFactory.cpp (246631 => 246632)
--- trunk/Source/WebKit/Shared/gtk/WebEventFactory.cpp 2019-06-20 09:40:41 UTC (rev 246631)
+++ trunk/Source/WebKit/Shared/gtk/WebEventFactory.cpp 2019-06-20 11:08:29 UTC (rev 246632)
@@ -29,7 +29,6 @@
#include "WebEventFactory.h"
#include <WebCore/GtkUtilities.h>
-#include <WebCore/GtkVersioning.h>
#include <WebCore/PlatformKeyboardEvent.h>
#include <WebCore/Scrollbar.h>
#include <WebCore/WindowsKeyboardCodes.h>
@@ -44,7 +43,7 @@
static inline bool isGdkKeyCodeFromKeyPad(unsigned keyval)
{
- return keyval >= GDK_KP_Space && keyval <= GDK_KP_9;
+ return keyval >= GDK_KEY_KP_Space && keyval <= GDK_KEY_KP_9;
}
static inline OptionSet<WebEvent::Modifier> modifiersForEvent(const GdkEvent* event)
@@ -96,13 +95,10 @@
case GDK_BUTTON_PRESS:
case GDK_2BUTTON_PRESS:
case GDK_3BUTTON_PRESS:
- case GDK_BUTTON_RELEASE:
+ case GDK_BUTTON_RELEASE: {
guint eventButton;
-#ifndef GTK_API_VERSION_2
gdk_event_get_button(event, &eventButton);
-#else
- eventButton = event->button.button;
-#endif
+
if (eventButton == 1)
button = WebMouseEvent::LeftButton;
else if (eventButton == 2)
@@ -110,6 +106,7 @@
else if (eventButton == 3)
button = WebMouseEvent::RightButton;
break;
+ }
default:
ASSERT_NOT_REACHED();
}
@@ -152,11 +149,7 @@
gdk_event_get_state(event, &state);
guint eventButton;
-#ifndef GTK_API_VERSION_2
gdk_event_get_button(event, &eventButton);
-#else
- eventButton = event->button.button;
-#endif
WebEvent::Type type = static_cast<WebEvent::Type>(0);
@@ -204,7 +197,6 @@
WebWheelEvent WebEventFactory::createWebWheelEvent(const GdkEvent* event)
{
-#ifndef GTK_API_VERSION_2
#if GTK_CHECK_VERSION(3, 20, 0)
WebWheelEvent::Phase phase = gdk_event_is_scroll_stop_event(event) ?
WebWheelEvent::Phase::PhaseEnded :
@@ -216,9 +208,6 @@
WebWheelEvent::Phase::PhaseEnded :
WebWheelEvent::Phase::PhaseChanged;
#endif
-#else
- WebWheelEvent::Phase phase = WebWheelEvent::Phase::PhaseChanged;
-#endif // GTK_API_VERSION_2
return createWebWheelEvent(event, phase, WebWheelEvent::Phase::PhaseNone);
}
@@ -225,20 +214,18 @@
WebWheelEvent WebEventFactory::createWebWheelEvent(const GdkEvent* event, WebWheelEvent::Phase phase, WebWheelEvent::Phase momentumPhase)
{
- double x, y, xRoot, yRoot;
- GdkScrollDirection direction;
FloatSize wheelTicks = FloatSize(0, 0);
+ double x, y;
gdk_event_get_coords(event, &x, &y);
+ double xRoot, yRoot;
gdk_event_get_root_coords(event, &xRoot, &yRoot);
-#ifndef GTK_API_VERSION_2
+
+ GdkScrollDirection direction;
if (!gdk_event_get_scroll_direction(event, &direction)) {
double deltaX, deltaY;
if (gdk_event_get_scroll_deltas(event, &deltaX, &deltaY))
wheelTicks = FloatSize(-deltaX, -deltaY);
}
-#else
- direction = event->scroll.direction;
-#endif
if (wheelTicks.isZero()) {
switch (direction) {
@@ -279,14 +266,10 @@
WebKeyboardEvent WebEventFactory::createWebKeyboardEvent(const GdkEvent* event, const WebCore::CompositionResults& compositionResults, Vector<String>&& commands)
{
guint keyval;
+ gdk_event_get_keyval(event, &keyval);
guint16 keycode;
-#ifndef GTK_API_VERSION_2
- gdk_event_get_keyval(event, &keyval);
gdk_event_get_keycode(event, &keycode);
-#else
- keyval = event->key.keyval;
- keycode = event->key.hardware_keycode;
-#endif
+
#if GTK_CHECK_VERSION(3, 10, 0)
GdkEventType type = gdk_event_get_event_type(event);
#else
@@ -311,7 +294,6 @@
#if ENABLE(TOUCH_EVENTS)
WebTouchEvent WebEventFactory::createWebTouchEvent(const GdkEvent* event, Vector<WebPlatformTouchPoint>&& touchPoints)
{
-#ifndef GTK_API_VERSION_2
WebEvent::Type type = WebEvent::NoType;
#if GTK_CHECK_VERSION(3, 10, 0)
GdkEventType eventType = gdk_event_get_event_type(event);
@@ -336,9 +318,6 @@
}
return WebTouchEvent(type, WTFMove(touchPoints), modifiersForEvent(event), wallTimeForEvent(event));
-#else
- return WebTouchEvent();
-#endif // GTK_API_VERSION_2
}
#endif
Modified: trunk/Source/WebKit/SourcesGTK.txt (246631 => 246632)
--- trunk/Source/WebKit/SourcesGTK.txt 2019-06-20 09:40:41 UTC (rev 246631)
+++ trunk/Source/WebKit/SourcesGTK.txt 2019-06-20 11:08:29 UTC (rev 246632)
@@ -21,10 +21,6 @@
// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
// THE POSSIBILITY OF SUCH DAMAGE.
-// FIXME: Many of these files are built with @no-unify to avoid errors
-// linking PluginProcessGTK2. I don't know why this is necessary. These
-// annotations should be revisited after removing PluginProcessGTK2.
-
NetworkProcess/Classifier/WebResourceLoadStatisticsStore.cpp
NetworkProcess/Classifier/WebResourceLoadStatisticsTelemetry.cpp
@@ -49,20 +45,20 @@
NetworkProcess/webrtc/NetworkRTCProvider.cpp
NetworkProcess/webrtc/NetworkRTCSocket.cpp
-Platform/IPC/glib/GSocketMonitor.cpp @no-unify
-Platform/IPC/unix/AttachmentUnix.cpp @no-unify
-Platform/IPC/unix/ConnectionUnix.cpp @no-unify
+Platform/IPC/glib/GSocketMonitor.cpp
+Platform/IPC/unix/AttachmentUnix.cpp
+Platform/IPC/unix/ConnectionUnix.cpp
Platform/classifier/ResourceLoadStatisticsClassifier.cpp
-Platform/glib/ModuleGlib.cpp @no-unify
+Platform/glib/ModuleGlib.cpp
-Platform/unix/LoggingUnix.cpp @no-unify
-Platform/unix/SharedMemoryUnix.cpp @no-unify
+Platform/unix/LoggingUnix.cpp
+Platform/unix/SharedMemoryUnix.cpp
-PluginProcess/unix/PluginControllerProxyUnix.cpp @no-unify
-PluginProcess/unix/PluginProcessMainUnix.cpp @no-unify
-PluginProcess/unix/PluginProcessUnix.cpp @no-unify
+PluginProcess/unix/PluginControllerProxyUnix.cpp
+PluginProcess/unix/PluginProcessMainUnix.cpp
+PluginProcess/unix/PluginProcessUnix.cpp
Shared/API/c/cairo/WKImageCairo.cpp
@@ -80,14 +76,14 @@
Shared/CoordinatedGraphics/threadedcompositor/ThreadedDisplayRefreshMonitor.cpp
Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp
-Shared/Plugins/Netscape/NetscapePluginModuleNone.cpp @no-unify
-Shared/Plugins/Netscape/unix/NetscapePluginModuleUnix.cpp @no-unify
+Shared/Plugins/Netscape/NetscapePluginModuleNone.cpp
+Shared/Plugins/Netscape/unix/NetscapePluginModuleUnix.cpp
Shared/Plugins/unix/PluginSearchPath.cpp
-Shared/cairo/ShareableBitmapCairo.cpp @no-unify
+Shared/cairo/ShareableBitmapCairo.cpp
-Shared/glib/ProcessExecutablePathGLib.cpp @no-unify
+Shared/glib/ProcessExecutablePathGLib.cpp
Shared/glib/WebContextMenuItemGlib.cpp
Shared/gtk/ArgumentCodersGtk.cpp
@@ -102,18 +98,18 @@
Shared/linux/WebMemorySamplerLinux.cpp
-Shared/soup/WebCoreArgumentCodersSoup.cpp @no-unify
+Shared/soup/WebCoreArgumentCodersSoup.cpp
Shared/soup/WebErrorsSoup.cpp
-Shared/unix/AuxiliaryProcessMain.cpp @no-unify
+Shared/unix/AuxiliaryProcessMain.cpp
UIProcess/BackingStore.cpp
UIProcess/DefaultUndoController.cpp
UIProcess/LegacySessionStateCodingNone.cpp
UIProcess/ViewGestureController.cpp
-UIProcess/ViewSnapshotStore.cpp @no-unify
+UIProcess/ViewSnapshotStore.cpp
UIProcess/WebGrammarDetail.cpp
-UIProcess/WebMemoryPressureHandler.cpp @no-unify
+UIProcess/WebMemoryPressureHandler.cpp
UIProcess/WebTextChecker.cpp
UIProcess/WebTextCheckerClient.cpp
UIProcess/WebViewportAttributes.cpp
@@ -220,10 +216,10 @@
UIProcess/linux/MemoryPressureMonitor.cpp
-UIProcess/Plugins/gtk/PluginInfoCache.cpp @no-unify
+UIProcess/Plugins/gtk/PluginInfoCache.cpp
-UIProcess/Plugins/unix/PluginInfoStoreUnix.cpp @no-unify
-UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp @no-unify
+UIProcess/Plugins/unix/PluginInfoStoreUnix.cpp
+UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp
UIProcess/WebsiteData/soup/WebsiteDataStoreSoup.cpp
UIProcess/WebsiteData/unix/WebsiteDataStoreUnix.cpp
@@ -237,20 +233,20 @@
UIProcess/gstreamer/InstallMissingMediaPluginsPermissionRequest.cpp
UIProcess/gstreamer/WebPageProxyGStreamer.cpp
-UIProcess/gtk/AcceleratedBackingStore.cpp @no-unify
+UIProcess/gtk/AcceleratedBackingStore.cpp
UIProcess/gtk/AcceleratedBackingStoreWayland.cpp @no-unify
UIProcess/gtk/AcceleratedBackingStoreX11.cpp @no-unify
UIProcess/gtk/DragAndDropHandler.cpp
UIProcess/gtk/GestureController.cpp
UIProcess/gtk/HardwareAccelerationManager.cpp
-UIProcess/gtk/InputMethodFilter.cpp @no-unify
+UIProcess/gtk/InputMethodFilter.cpp
UIProcess/gtk/KeyBindingTranslator.cpp
-UIProcess/gtk/RemoteWebInspectorProxyGtk.cpp @no-unify
+UIProcess/gtk/RemoteWebInspectorProxyGtk.cpp
UIProcess/gtk/TextCheckerGtk.cpp @no-unify
UIProcess/gtk/ViewGestureControllerGtk.cpp @no-unify
-UIProcess/gtk/ViewSnapshotStoreGtk.cpp @no-unify
+UIProcess/gtk/ViewSnapshotStoreGtk.cpp
UIProcess/gtk/WaylandCompositor.cpp @no-unify
-UIProcess/gtk/WebColorPickerGtk.cpp @no-unify
+UIProcess/gtk/WebColorPickerGtk.cpp
UIProcess/gtk/WebContextMenuProxyGtk.cpp
UIProcess/gtk/WebInspectorProxyGtk.cpp
UIProcess/gtk/WebKitInspectorWindow.cpp
@@ -390,8 +386,8 @@
WebProcess/MediaCache/WebMediaKeyStorageManager.cpp
-WebProcess/Plugins/Netscape/unix/NetscapePluginUnix.cpp @no-unify
-WebProcess/Plugins/Netscape/unix/PluginProxyUnix.cpp @no-unify
+WebProcess/Plugins/Netscape/unix/NetscapePluginUnix.cpp
+WebProcess/Plugins/Netscape/unix/PluginProxyUnix.cpp
WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp @no-unify
Modified: trunk/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp (246631 => 246632)
--- trunk/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp 2019-06-20 09:40:41 UTC (rev 246631)
+++ trunk/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp 2019-06-20 11:08:29 UTC (rev 246632)
@@ -54,7 +54,6 @@
#include <WebCore/CairoUtilities.h>
#include <WebCore/GUniquePtrGtk.h>
#include <WebCore/GtkUtilities.h>
-#include <WebCore/GtkVersioning.h>
#include <WebCore/NotImplemented.h>
#include <WebCore/PasteboardHelper.h>
#include <WebCore/PlatformDisplay.h>
Modified: trunk/Source/WebKit/UIProcess/Launcher/glib/ProcessLauncherGLib.cpp (246631 => 246632)
--- trunk/Source/WebKit/UIProcess/Launcher/glib/ProcessLauncherGLib.cpp 2019-06-20 09:40:41 UTC (rev 246631)
+++ trunk/Source/WebKit/UIProcess/Launcher/glib/ProcessLauncherGLib.cpp 2019-06-20 11:08:29 UTC (rev 246632)
@@ -87,10 +87,6 @@
case ProcessLauncher::ProcessType::Plugin64:
case ProcessLauncher::ProcessType::Plugin32:
executablePath = executablePathOfPluginProcess();
-#if ENABLE(PLUGIN_PROCESS_GTK2)
- if (m_launchOptions.extraInitializationData.contains("requires-gtk2"))
- executablePath.append('2');
-#endif
pluginPath = m_launchOptions.extraInitializationData.get("plugin-path");
realPluginPath = FileSystem::fileSystemRepresentation(pluginPath);
break;
Modified: trunk/Source/WebKit/UIProcess/Plugins/PluginProcessProxy.h (246631 => 246632)
--- trunk/Source/WebKit/UIProcess/Plugins/PluginProcessProxy.h 2019-06-20 09:40:41 UTC (rev 246631)
+++ trunk/Source/WebKit/UIProcess/Plugins/PluginProcessProxy.h 2019-06-20 11:08:29 UTC (rev 246632)
@@ -53,10 +53,6 @@
String name;
String description;
String mimeDescription;
-
-#if PLATFORM(GTK)
- bool requiresGtk2;
-#endif
};
#endif
Modified: trunk/Source/WebKit/UIProcess/Plugins/gtk/PluginInfoCache.cpp (246631 => 246632)
--- trunk/Source/WebKit/UIProcess/Plugins/gtk/PluginInfoCache.cpp 2019-06-20 09:40:41 UTC (rev 246631)
+++ trunk/Source/WebKit/UIProcess/Plugins/gtk/PluginInfoCache.cpp 2019-06-20 11:08:29 UTC (rev 246632)
@@ -133,8 +133,6 @@
NetscapePluginModule::parseMIMEDescription(String::fromUTF8(stringValue.get()), plugin.info.mimes);
#endif
- plugin.requiresGtk2 = g_key_file_get_boolean(m_cacheFile.get(), pluginGroup.data(), "requires-gtk2", nullptr);
-
return true;
}
@@ -154,8 +152,6 @@
g_key_file_set_string(m_cacheFile.get(), pluginGroup.data(), "mime-description", mimeDescription.utf8().data());
#endif
- g_key_file_set_boolean(m_cacheFile.get(), pluginGroup.data(), "requires-gtk2", plugin.requiresGtk2);
-
if (m_cachePath && !m_readOnlyMode) {
// Save the cache file in an idle to make sure it happens in the main thread and
// it's done only once when this is called multiple times in a very short time.
Modified: trunk/Source/WebKit/UIProcess/Plugins/unix/PluginInfoStoreUnix.cpp (246631 => 246632)
--- trunk/Source/WebKit/UIProcess/Plugins/unix/PluginInfoStoreUnix.cpp 2019-06-20 09:40:41 UTC (rev 246631)
+++ trunk/Source/WebKit/UIProcess/Plugins/unix/PluginInfoStoreUnix.cpp 2019-06-20 11:08:29 UTC (rev 246632)
@@ -72,19 +72,8 @@
bool PluginInfoStore::getPluginInfo(const String& pluginPath, PluginModuleInfo& plugin)
{
#if PLATFORM(GTK)
- if (PluginInfoCache::singleton().getPluginInfo(pluginPath, plugin)) {
-#if ENABLE(PLUGIN_PROCESS_GTK2)
- if (plugin.requiresGtk2) {
- if (PlatformDisplay::sharedDisplay().type() != PlatformDisplay::Type::X11)
- return false;
- String pluginProcessPath = executablePathOfPluginProcess();
- pluginProcessPath.append('2');
- if (!FileSystem::fileExists(pluginProcessPath))
- return false;
- }
-#endif
+ if (PluginInfoCache::singleton().getPluginInfo(pluginPath, plugin))
return true;
- }
if (NetscapePluginModule::getPluginInfo(pluginPath, plugin)) {
PluginInfoCache::singleton().updatePluginInfo(pluginPath, plugin);
Modified: trunk/Source/WebKit/UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp (246631 => 246632)
--- trunk/Source/WebKit/UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp 2019-06-20 09:40:41 UTC (rev 246631)
+++ trunk/Source/WebKit/UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp 2019-06-20 11:08:29 UTC (rev 246632)
@@ -53,12 +53,7 @@
void PluginProcessProxy::platformGetLaunchOptionsWithAttributes(ProcessLauncher::LaunchOptions& launchOptions, const PluginProcessAttributes& pluginProcessAttributes)
{
launchOptions.processType = ProcessLauncher::ProcessType::Plugin64;
-
launchOptions.extraInitializationData.add("plugin-path", pluginProcessAttributes.moduleInfo.path);
-#if PLATFORM(GTK)
- if (pluginProcessAttributes.moduleInfo.requiresGtk2)
- launchOptions.extraInitializationData.add("requires-gtk2", emptyString());
-#endif
}
void PluginProcessProxy::platformInitializePluginProcess(PluginProcessCreationParameters&)
@@ -81,21 +76,9 @@
String pluginProcessPath = executablePathOfPluginProcess();
#if PLATFORM(GTK)
- bool requiresGtk2 = pluginRequiresGtk2(pluginPath);
- if (requiresGtk2) {
-#if PLATFORM(WAYLAND)
- if (PlatformDisplay::sharedDisplay().type() == PlatformDisplay::Type::Wayland)
- return false;
-#endif
-#if ENABLE(PLUGIN_PROCESS_GTK2)
- pluginProcessPath.append('2');
- if (!FileSystem::fileExists(pluginProcessPath))
- return false;
-#else
+ if (pluginRequiresGtk2(pluginPath))
return false;
#endif
- }
-#endif
CString binaryPath = FileSystem::fileSystemRepresentation(pluginProcessPath);
CString pluginPathCString = FileSystem::fileSystemRepresentation(pluginPath);
@@ -147,9 +130,6 @@
result.name.swap(lines[0]);
result.description.swap(lines[1]);
result.mimeDescription.swap(lines[2]);
-#if PLATFORM(GTK)
- result.requiresGtk2 = requiresGtk2;
-#endif
return !result.mimeDescription.isEmpty();
}
#endif // PLUGIN_ARCHITECTURE(UNIX)
Modified: trunk/Source/WebKit/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp (246631 => 246632)
--- trunk/Source/WebKit/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp 2019-06-20 09:40:41 UTC (rev 246631)
+++ trunk/Source/WebKit/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp 2019-06-20 11:08:29 UTC (rev 246632)
@@ -39,12 +39,8 @@
#if PLATFORM(GTK)
#include <gtk/gtk.h>
-#ifndef GTK_API_VERSION_2
#include <gtk/gtkx.h>
#endif
-#include <gdk/gdkx.h>
-#include <WebCore/GtkVersioning.h>
-#endif
#if USE(CAIRO)
#include <WebCore/PlatformContextCairo.h>
Deleted: trunk/Source/cmake/FindGDK2.cmake (246631 => 246632)
--- trunk/Source/cmake/FindGDK2.cmake 2019-06-20 09:40:41 UTC (rev 246631)
+++ trunk/Source/cmake/FindGDK2.cmake 2019-06-20 11:08:29 UTC (rev 246632)
@@ -1,49 +0,0 @@
-# - Try to find GDK 2
-# Once done, this will define
-#
-# GDK2_FOUND - system has GDK 2
-# GDK2_INCLUDE_DIRS - the GDK 2 include directories
-# GDK2_LIBRARIES - link these to use GDK 2
-#
-# Copyright (C) 2012 Raphael Kubo da Costa <[email protected]>
-# Copyright (C) 2013 Igalia S.L.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND ITS CONTRIBUTORS ``AS
-# IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR ITS
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-find_package(PkgConfig)
-pkg_check_modules(GDK2 gdk-2.0)
-
-set(VERSION_OK TRUE)
-if (GDK2_VERSION)
- if (GDK2_FIND_VERSION_EXACT)
- if (NOT("${GDK2_FIND_VERSION}" VERSION_EQUAL "${GDK2_VERSION}"))
- set(VERSION_OK FALSE)
- endif ()
- else ()
- if ("${GDK2_VERSION}" VERSION_LESS "${GDK2_FIND_VERSION}")
- set(VERSION_OK FALSE)
- endif ()
- endif ()
-endif ()
-
-include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(GDK2 DEFAULT_MSG GDK2_INCLUDE_DIRS GDK2_LIBRARIES VERSION_OK)
Deleted: trunk/Source/cmake/FindGTK2.cmake (246631 => 246632)
--- trunk/Source/cmake/FindGTK2.cmake 2019-06-20 09:40:41 UTC (rev 246631)
+++ trunk/Source/cmake/FindGTK2.cmake 2019-06-20 11:08:29 UTC (rev 246632)
@@ -1,49 +0,0 @@
-# - Try to find GTK+ 2
-# Once done, this will define
-#
-# GTK2_FOUND - system has GTK+ 2.
-# GTK2_INCLUDE_DIRS - the GTK+ 2. include directories
-# GTK2_LIBRARIES - link these to use GTK+ 2.
-#
-# Copyright (C) 2012 Raphael Kubo da Costa <[email protected]>
-# Copyright (C) 2013 Igalia S.L.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND ITS CONTRIBUTORS ``AS
-# IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR ITS
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-find_package(PkgConfig)
-pkg_check_modules(GTK2 gtk+-2.0)
-
-set(VERSION_OK TRUE)
-if (GTK2_VERSION)
- if (GTK2_FIND_VERSION_EXACT)
- if (NOT("${GTK2_FIND_VERSION}" VERSION_EQUAL "${GTK2_VERSION}"))
- set(VERSION_OK FALSE)
- endif ()
- else ()
- if ("${GTK2_VERSION}" VERSION_LESS "${GTK2_FIND_VERSION}")
- set(VERSION_OK FALSE)
- endif ()
- endif ()
-endif ()
-
-include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(GTK2 DEFAULT_MSG GTK2_INCLUDE_DIRS GTK2_LIBRARIES VERSION_OK)
Modified: trunk/Source/cmake/OptionsGTK.cmake (246631 => 246632)
--- trunk/Source/cmake/OptionsGTK.cmake 2019-06-20 09:40:41 UTC (rev 246631)
+++ trunk/Source/cmake/OptionsGTK.cmake 2019-06-20 11:08:29 UTC (rev 246632)
@@ -77,7 +77,6 @@
WEBKIT_OPTION_DEFINE(ENABLE_GTKDOC "Whether or not to use generate gtkdoc." PUBLIC OFF)
WEBKIT_OPTION_DEFINE(ENABLE_INTROSPECTION "Whether to enable GObject introspection." PUBLIC ON)
WEBKIT_OPTION_DEFINE(ENABLE_OPENGL "Whether to use OpenGL." PUBLIC ON)
-WEBKIT_OPTION_DEFINE(ENABLE_PLUGIN_PROCESS_GTK2 "Whether to build WebKitPluginProcess2 to load GTK2 based plugins." PUBLIC ON)
WEBKIT_OPTION_DEFINE(ENABLE_QUARTZ_TARGET "Whether to enable support for the Quartz windowing target." PUBLIC ${GTK3_SUPPORTS_QUARTZ})
WEBKIT_OPTION_DEFINE(ENABLE_X11_TARGET "Whether to enable support for the X11 windowing target." PUBLIC ${GTK3_SUPPORTS_X11})
WEBKIT_OPTION_DEFINE(ENABLE_WAYLAND_TARGET "Whether to enable support for the Wayland windowing target." PUBLIC ${GTK3_SUPPORTS_WAYLAND})
@@ -99,7 +98,6 @@
WEBKIT_OPTION_DEPEND(ENABLE_ACCELERATED_2D_CANVAS ENABLE_OPENGL)
WEBKIT_OPTION_DEPEND(ENABLE_ASYNC_SCROLLING ENABLE_OPENGL)
WEBKIT_OPTION_DEPEND(ENABLE_GLES2 ENABLE_OPENGL)
-WEBKIT_OPTION_DEPEND(ENABLE_PLUGIN_PROCESS_GTK2 ENABLE_X11_TARGET)
WEBKIT_OPTION_DEPEND(ENABLE_WEBGL ENABLE_OPENGL)
WEBKIT_OPTION_DEPEND(USE_WPE_RENDERER ENABLE_OPENGL)
WEBKIT_OPTION_DEPEND(USE_WPE_RENDERER ENABLE_WAYLAND_TARGET)
@@ -306,11 +304,6 @@
SET_AND_EXPOSE_TO_BUILD(USE_NICOSIA TRUE)
endif ()
-if (ENABLE_PLUGIN_PROCESS_GTK2)
- find_package(GTK2 2.24.10 REQUIRED)
- find_package(GDK2 2.24.10 REQUIRED)
-endif ()
-
if (ENABLE_SPELLCHECK)
find_package(Enchant)
if (NOT PC_ENCHANT_FOUND)
Modified: trunk/Tools/ChangeLog (246631 => 246632)
--- trunk/Tools/ChangeLog 2019-06-20 09:40:41 UTC (rev 246631)
+++ trunk/Tools/ChangeLog 2019-06-20 11:08:29 UTC (rev 246632)
@@ -1,3 +1,16 @@
+2019-06-20 Carlos Garcia Campos <[email protected]>
+
+ [GTK] Remove support for GTK2 plugins
+ https://bugs.webkit.org/show_bug.cgi?id=199065
+
+ Reviewed by Sergio Villar Senin.
+
+ * EWSTools/ubuntu-ews-packages:
+ * TestWebKitAPI/PlatformGTK.cmake:
+ * WebKitTestRunner/PlatformGTK.cmake:
+ * flatpak/org.webkit.GTK.yaml:
+ * gtk/install-dependencies:
+
2019-06-19 Yusuke Suzuki <[email protected]>
[bmalloc] IsoHeap's initialization is racy with IsoHeap::isInitialized
Modified: trunk/Tools/EWSTools/ubuntu-ews-packages (246631 => 246632)
--- trunk/Tools/EWSTools/ubuntu-ews-packages 2019-06-20 09:40:41 UTC (rev 246631)
+++ trunk/Tools/EWSTools/ubuntu-ews-packages 2019-06-20 11:08:29 UTC (rev 246632)
@@ -28,7 +28,6 @@
libnss3-dev
libpam0g-dev
libtool
-libgtk2.0-dev
libpango1.0-dev
libicu-dev
libxslt-dev
Modified: trunk/Tools/TestWebKitAPI/PlatformGTK.cmake (246631 => 246632)
--- trunk/Tools/TestWebKitAPI/PlatformGTK.cmake 2019-06-20 09:40:41 UTC (rev 246631)
+++ trunk/Tools/TestWebKitAPI/PlatformGTK.cmake 2019-06-20 11:08:29 UTC (rev 246632)
@@ -47,8 +47,6 @@
list(APPEND TestWebCore_LIBRARIES
${GDK3_LIBRARIES}
${GTK3_LIBRARIES}
-
- WebCorePlatformGTK
)
ADD_WHOLE_ARCHIVE_TO_LIBRARIES(TestWebCore_LIBRARIES)
Modified: trunk/Tools/WebKitTestRunner/PlatformGTK.cmake (246631 => 246632)
--- trunk/Tools/WebKitTestRunner/PlatformGTK.cmake 2019-06-20 09:40:41 UTC (rev 246631)
+++ trunk/Tools/WebKitTestRunner/PlatformGTK.cmake 2019-06-20 11:08:29 UTC (rev 246632)
@@ -30,7 +30,6 @@
${GTK3_LIBRARIES}
${GLIB_LIBRARIES}
WebCore
- WebCorePlatformGTK
)
set(WebKitTestRunnerInjectedBundle_LIBRARIES
Modified: trunk/Tools/flatpak/org.webkit.GTK.yaml (246631 => 246632)
--- trunk/Tools/flatpak/org.webkit.GTK.yaml 2019-06-20 09:40:41 UTC (rev 246631)
+++ trunk/Tools/flatpak/org.webkit.GTK.yaml 2019-06-20 11:08:29 UTC (rev 246632)
@@ -88,23 +88,6 @@
- --disable-local-transport
- --without-dtrace
-# Required for the GTK2 plugin process
-- name: gtk2
- sources:
- - type: archive
- url: https://download.gnome.org/sources/gtk+/2.24/gtk+-2.24.32.tar.xz
- sha256: b6c8a93ddda5eabe3bfee1eb39636c9a03d2a56c7b62828b359bf197943c582e
- - type: script
- commands:
- - "sed -i '1s/python$/&2/' gtk/gtk-builder-convert"
- - "sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool"
- config-opts:
- - --disable-gtk-doc
- - --disable-cups
- - --disable-papi
- - --enable-introspection=no
- - --with-gdktarget=x11
-
# Required for run-gtk-tests
- name: pycairo
buildsystem: simple
Modified: trunk/Tools/gtk/install-dependencies (246631 => 246632)
--- trunk/Tools/gtk/install-dependencies 2019-06-20 09:40:41 UTC (rev 246631)
+++ trunk/Tools/gtk/install-dependencies 2019-06-20 11:08:29 UTC (rev 246632)
@@ -112,7 +112,6 @@
libgirepository1.0-dev \
libgl1-mesa-dev \
libgl1-mesa-glx \
- libgtk2.0-dev \
libgtk-3-dev \
libgstreamer1.0-dev \
libgstreamer-plugins-bad1.0-dev \
@@ -282,7 +281,6 @@
gobject-introspection \
mesa \
mesa-libgl \
- gtk2 \
gtk3 \
libsystemd \
libjpeg-turbo \
@@ -434,7 +432,6 @@
gstreamer1-plugins-bad-free-devel \
gstreamer1-plugins-base-devel \
gtk-doc \
- gtk2-devel \
gtk3-devel \
hyphen-devel \
intltool \
