Changeset 246632 in webkit
- Timestamp:
- Jun 20, 2019 4:08:29 AM (5 years ago)
- Location:
- trunk
- Files:
-
- 4 deleted
- 51 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/ChangeLog
r246547 r246632 1 2019-06-20 Carlos Garcia Campos <cgarcia@igalia.com> 2 3 [GTK] Remove support for GTK2 plugins 4 https://bugs.webkit.org/show_bug.cgi?id=199065 5 6 Reviewed by Sergio Villar Senin. 7 8 * Source/cmake/FindGDK2.cmake: Removed. 9 * Source/cmake/FindGTK2.cmake: Removed. 10 * Source/cmake/OptionsGTK.cmake: 11 1 12 2019-06-18 Adrian Perez de Castro <aperez@igalia.com> 2 13 -
trunk/PerformanceTests/ChangeLog
r245063 r246632 1 2019-06-20 Carlos Garcia Campos <cgarcia@igalia.com> 2 3 [GTK] Remove support for GTK2 plugins 4 https://bugs.webkit.org/show_bug.cgi?id=199065 5 6 Reviewed by Sergio Villar Senin. 7 8 * StitchMarker/wtf/Platform.h: 9 1 10 2019-05-08 Caio Lima <ticaiolima@gmail.com> 2 11 -
trunk/PerformanceTests/StitchMarker/wtf/Platform.h
r228590 r246632 525 525 #if PLATFORM(GTK) 526 526 #define GLIB_VERSION_MIN_REQUIRED GLIB_VERSION_2_36 527 #endif528 529 #if PLATFORM(GTK) && !defined(GTK_API_VERSION_2)530 527 #define GDK_VERSION_MIN_REQUIRED GDK_VERSION_3_6 531 528 #endif -
trunk/Source/WTF/ChangeLog
r246630 r246632 1 2019-06-20 Carlos Garcia Campos <cgarcia@igalia.com> 2 3 [GTK] Remove support for GTK2 plugins 4 https://bugs.webkit.org/show_bug.cgi?id=199065 5 6 Reviewed by Sergio Villar Senin. 7 8 * wtf/Platform.h: 9 * wtf/glib/GTypedefs.h: 10 1 11 2019-06-19 Yusuke Suzuki <ysuzuki@apple.com> 2 12 -
trunk/Source/WTF/wtf/Platform.h
r246616 r246632 584 584 #if PLATFORM(GTK) 585 585 #define GLIB_VERSION_MIN_REQUIRED GLIB_VERSION_2_36 586 #define GDK_VERSION_MIN_REQUIRED GDK_VERSION_3_6 586 587 #endif 587 588 588 589 #if PLATFORM(WPE) 589 590 #define GLIB_VERSION_MIN_REQUIRED GLIB_VERSION_2_40 590 #endif591 592 #if PLATFORM(GTK) && !defined(GTK_API_VERSION_2)593 #define GDK_VERSION_MIN_REQUIRED GDK_VERSION_3_6594 591 #endif 595 592 -
trunk/Source/WTF/wtf/glib/GTypedefs.h
r194579 r246632 76 76 #endif 77 77 78 #if USE(CLUTTER)79 typedef struct _ClutterActor ClutterActor;80 typedef struct _GraphicsLayerActor GraphicsLayerActor;81 #endif82 83 78 #if PLATFORM(GTK) 84 79 typedef struct _GtkAction GtkAction; … … 97 92 typedef struct _GtkWidget GtkWidget; 98 93 typedef struct _GtkWindow GtkWindow; 99 100 #ifdef GTK_API_VERSION_2101 typedef struct _GdkRectangle GdkRectangle;102 typedef struct _GdkDrawable GdkWindow;103 #else104 94 typedef struct _GdkWindow GdkWindow; 105 95 typedef struct _GtkStyleContext GtkStyleContext; … … 107 97 108 98 #endif 109 110 #endif111 99 #endif // WTF_GTypedefs_h -
trunk/Source/WebCore/ChangeLog
r246631 r246632 1 2019-06-20 Carlos Garcia Campos <cgarcia@igalia.com> 2 3 [GTK] Remove support for GTK2 plugins 4 https://bugs.webkit.org/show_bug.cgi?id=199065 5 6 Reviewed by Sergio Villar Senin. 7 8 * PlatformGTK.cmake: 9 * SourcesGTK.txt: 10 * SourcesWPE.txt: 11 * platform/FreeType.cmake: 12 * platform/SourcesGLib.txt: 13 * platform/graphics/Color.h: 14 * platform/graphics/PlatformDisplay.cpp: 15 (WebCore::PlatformDisplay::createPlatformDisplay): 16 * platform/graphics/gtk/ColorGtk.cpp: 17 (WebCore::Color::operator GdkRGBA const): 18 * platform/graphics/gtk/DisplayRefreshMonitorGtk.cpp: 19 (WebCore::onFrameClockUpdate): 20 (WebCore::DisplayRefreshMonitorGtk::requestRefreshCallback): 21 * platform/graphics/gtk/DisplayRefreshMonitorGtk.h: 22 (WebCore::DisplayRefreshMonitorGtk::create): 23 * platform/graphics/gtk/GdkCairoUtilities.cpp: 24 * platform/gtk/GRefPtrGtk.cpp: 25 * platform/gtk/GRefPtrGtk.h: 26 * platform/gtk/GtkVersioning.c: Removed. 27 * platform/gtk/GtkVersioning.h: Removed. 28 * platform/gtk/PasteboardHelper.cpp: 29 (WebCore::PasteboardHelper::getClipboardContents): 30 * platform/gtk/PlatformKeyboardEventGtk.cpp: 31 (WebCore::modifiersForGdkKeyEvent): 32 (WebCore::PlatformKeyboardEvent::PlatformKeyboardEvent): 33 * platform/gtk/PlatformMouseEventGtk.cpp: 34 (WebCore::PlatformMouseEvent::PlatformMouseEvent): 35 * platform/gtk/PlatformScreenGtk.cpp: 36 (WebCore::screenIsTouchPrimaryInputDevice): 37 * platform/gtk/PlatformWheelEventGtk.cpp: 38 (WebCore::PlatformWheelEvent::PlatformWheelEvent): 39 * platform/gtk/ScrollbarThemeGtk.cpp: 40 * platform/gtk/ScrollbarThemeGtk.h: 41 * platform/gtk/WidgetGtk.cpp: 42 * rendering/RenderThemeGtk.cpp: 43 * rendering/RenderThemeGtk.h: 44 1 45 2019-06-19 Myles C. Maxfield <mmaxfield@apple.com> 2 46 -
trunk/Source/WebCore/PlatformGTK.cmake
r245807 r246632 43 43 endif () 44 44 45 list(APPEND WebCorePlatformGTK_SOURCES46 editing/gtk/EditorGtk.cpp47 48 page/gtk/DragControllerGtk.cpp49 50 platform/glib/EventHandlerGLib.cpp51 52 platform/graphics/PlatformDisplay.cpp53 54 platform/graphics/gtk/ColorGtk.cpp55 platform/graphics/gtk/DisplayRefreshMonitorGtk.cpp56 platform/graphics/gtk/GdkCairoUtilities.cpp57 platform/graphics/gtk/IconGtk.cpp58 platform/graphics/gtk/ImageBufferGtk.cpp59 platform/graphics/gtk/ImageGtk.cpp60 61 platform/gtk/CursorGtk.cpp62 platform/gtk/DragImageGtk.cpp63 platform/gtk/GRefPtrGtk.cpp64 platform/gtk/GtkUtilities.cpp65 platform/gtk/GtkVersioning.c66 platform/gtk/PasteboardHelper.cpp67 platform/gtk/PlatformKeyboardEventGtk.cpp68 platform/gtk/PlatformMouseEventGtk.cpp69 platform/gtk/PlatformPasteboardGtk.cpp70 platform/gtk/PlatformScreenGtk.cpp71 platform/gtk/PlatformWheelEventGtk.cpp72 platform/gtk/RenderThemeGadget.cpp73 platform/gtk/RenderThemeWidget.cpp74 platform/gtk/ScrollbarThemeGtk.cpp75 platform/gtk/WidgetGtk.cpp76 77 rendering/RenderThemeGtk.cpp78 )79 80 45 list(APPEND WebCore_PRIVATE_FRAMEWORK_HEADERS 81 46 platform/graphics/x11/PlatformDisplayX11.h … … 88 53 platform/gtk/GUniquePtrGtk.h 89 54 platform/gtk/GtkUtilities.h 90 platform/gtk/GtkVersioning.h91 55 platform/gtk/PasteboardHelper.h 92 56 platform/gtk/SelectionData.h … … 110 74 ${ATK_LIBRARIES} 111 75 ${ENCHANT_LIBRARIES} 76 ${GDK_LIBRARIES} 112 77 ${GLIB_GIO_LIBRARIES} 113 78 ${GLIB_GMODULE_LIBRARIES} 114 79 ${GLIB_GOBJECT_LIBRARIES} 115 80 ${GLIB_LIBRARIES} 81 ${GTK_LIBRARIES} 116 82 ${LIBSECCOMP_LIBRARIES} 117 83 ${LIBSECRET_LIBRARIES} … … 136 102 ${ATK_INCLUDE_DIRS} 137 103 ${ENCHANT_INCLUDE_DIRS} 104 ${GDK_INCLUDE_DIRS} 138 105 ${GIO_UNIX_INCLUDE_DIRS} 139 106 ${GLIB_INCLUDE_DIRS} 107 ${GTK_INCLUDE_DIRS} 140 108 ${LIBSECCOMP_INCLUDE_DIRS} 141 109 ${LIBSECRET_INCLUDE_DIRS} … … 167 135 endif () 168 136 169 if (ENABLE_PLUGIN_PROCESS_GTK2)170 # WebKitPluginProcess2 needs a version of WebCore compiled against GTK+2, so we've isolated all the GTK+171 # dependent files into a separate library which can be used to construct a GTK+2 WebCore172 # for the plugin process.173 add_library(WebCorePlatformGTK2 ${WebCore_LIBRARY_TYPE} ${WebCorePlatformGTK_SOURCES})174 add_dependencies(WebCorePlatformGTK2 WebCore)175 set_property(TARGET WebCorePlatformGTK2176 APPEND177 PROPERTY COMPILE_DEFINITIONS GTK_API_VERSION_2=1178 )179 target_include_directories(WebCorePlatformGTK2 PRIVATE180 ${WebCore_INCLUDE_DIRECTORIES}181 )182 target_include_directories(WebCorePlatformGTK2 SYSTEM PRIVATE183 ${WebCore_SYSTEM_INCLUDE_DIRECTORIES}184 ${GTK2_INCLUDE_DIRS}185 ${GDK2_INCLUDE_DIRS}186 )187 target_link_libraries(WebCorePlatformGTK2188 ${WebCore_LIBRARIES}189 ${GTK2_LIBRARIES}190 ${GDK2_LIBRARIES}191 )192 endif ()193 194 137 if (ENABLE_WAYLAND_TARGET) 195 138 list(APPEND WebCore_PRIVATE_FRAMEWORK_HEADERS … … 204 147 ) 205 148 endif () 206 207 add_library(WebCorePlatformGTK ${WebCore_LIBRARY_TYPE} ${WebCorePlatformGTK_SOURCES})208 add_dependencies(WebCorePlatformGTK WebCore)209 target_include_directories(WebCorePlatformGTK PRIVATE210 ${WebCore_INCLUDE_DIRECTORIES}211 ${WebCore_PRIVATE_INCLUDE_DIRECTORIES}212 )213 target_include_directories(WebCorePlatformGTK SYSTEM PRIVATE214 ${WebCore_SYSTEM_INCLUDE_DIRECTORIES}215 ${GTK_INCLUDE_DIRS}216 ${GDK_INCLUDE_DIRS}217 )218 target_link_libraries(WebCorePlatformGTK219 ${WebCore_LIBRARIES}220 ${GTK_LIBRARIES}221 ${GDK_LIBRARIES}222 )223 224 include_directories(225 ${WebCore_INCLUDE_DIRECTORIES}226 ${WebCore_PRIVATE_INCLUDE_DIRECTORIES}227 "${WEBCORE_DIR}/bindings/gobject/"228 )229 149 230 150 include_directories(SYSTEM -
trunk/Source/WebCore/SourcesGTK.txt
r246199 r246632 42 42 editing/atk/FrameSelectionAtk.cpp 43 43 44 editing/gtk/EditorGtk.cpp 45 44 46 loader/soup/ResourceLoaderSoup.cpp 47 48 page/gtk/DragControllerGtk.cpp 45 49 46 50 page/linux/ResourceUsageOverlayLinux.cpp … … 64 68 platform/graphics/GLContext.cpp @no-unify 65 69 platform/graphics/GraphicsContext3DPrivate.cpp 70 platform/graphics/PlatformDisplay.cpp 66 71 67 72 platform/graphics/cairo/BackingStoreBackendCairoX11.cpp @no-unify … … 73 78 74 79 platform/graphics/glx/GLContextGLX.cpp 80 81 platform/graphics/gtk/ColorGtk.cpp 82 platform/graphics/gtk/DisplayRefreshMonitorGtk.cpp 83 platform/graphics/gtk/GdkCairoUtilities.cpp 84 platform/graphics/gtk/IconGtk.cpp 85 platform/graphics/gtk/ImageBufferGtk.cpp 86 platform/graphics/gtk/ImageGtk.cpp 75 87 76 88 platform/graphics/gstreamer/ImageGStreamerCairo.cpp … … 90 102 platform/graphics/x11/XUniqueResource.cpp @no-unify 91 103 104 platform/gtk/CursorGtk.cpp 92 105 platform/gtk/DragDataGtk.cpp 106 platform/gtk/DragImageGtk.cpp 107 platform/gtk/GRefPtrGtk.cpp 108 platform/gtk/GtkUtilities.cpp 93 109 platform/gtk/LocalizedStringsGtk.cpp 94 110 platform/gtk/PasteboardGtk.cpp 111 platform/gtk/PasteboardHelper.cpp 112 platform/gtk/PlatformKeyboardEventGtk.cpp 113 platform/gtk/PlatformMouseEventGtk.cpp 114 platform/gtk/PlatformPasteboardGtk.cpp 115 platform/gtk/PlatformScreenGtk.cpp 116 platform/gtk/PlatformWheelEventGtk.cpp 117 platform/gtk/RenderThemeGadget.cpp 118 platform/gtk/RenderThemeWidget.cpp 119 platform/gtk/ScrollbarThemeGtk.cpp 95 120 platform/gtk/SelectionData.cpp 121 platform/gtk/WidgetGtk.cpp 96 122 97 123 platform/text/Hyphenation.cpp … … 105 131 106 132 platform/xdg/MIMETypeRegistryXdg.cpp 133 134 rendering/RenderThemeGtk.cpp -
trunk/Source/WebCore/SourcesWPE.txt
r245565 r246632 59 59 platform/UserAgentQuirks.cpp 60 60 61 // This can't go into SourcesGLib.txt because it has to go into WebCorePlatformGTK.62 platform/glib/EventHandlerGLib.cpp63 64 61 platform/graphics/GLContext.cpp 65 62 platform/graphics/GraphicsContext3DPrivate.cpp -
trunk/Source/WebCore/platform/FreeType.cmake
r244443 r246632 6 6 7 7 list(APPEND WebCore_SOURCES 8 platform/graphics/freetype/FontCacheFreeType.cpp 8 9 platform/graphics/freetype/FontCustomPlatformDataFreeType.cpp 9 10 platform/graphics/freetype/FontPlatformDataFreeType.cpp … … 21 22 platform/graphics/harfbuzz/HbUniquePtr.h 22 23 ) 23 24 if (PORT STREQUAL "GTK")25 list(APPEND WebCorePlatformGTK_SOURCES26 platform/graphics/freetype/FontCacheFreeType.cpp27 )28 else ()29 list(APPEND WebCore_SOURCES30 platform/graphics/freetype/FontCacheFreeType.cpp31 )32 endif ()33 24 34 25 if (USE_CAIRO) -
trunk/Source/WebCore/platform/SourcesGLib.txt
r240437 r246632 24 24 platform/audio/glib/AudioBusGLib.cpp 25 25 26 platform/glib/EventHandlerGLib.cpp 26 27 platform/glib/EventLoopGlib.cpp 27 28 platform/glib/FileMonitorGLib.cpp -
trunk/Source/WebCore/platform/graphics/Color.h
r241825 r246632 50 50 51 51 #if PLATFORM(GTK) 52 typedef struct _GdkColor GdkColor;53 #ifndef GTK_API_VERSION_254 52 typedef struct _GdkRGBA GdkRGBA; 55 #endif56 53 #endif 57 54 … … 253 250 254 251 #if PLATFORM(GTK) 255 Color(const GdkColor&);256 // We can't sensibly go back to GdkColor without losing the alpha value257 #ifndef GTK_API_VERSION_2258 252 Color(const GdkRGBA&); 259 253 operator GdkRGBA() const; 260 #endif261 254 #endif 262 255 -
trunk/Source/WebCore/platform/graphics/PlatformDisplay.cpp
r245807 r246632 55 55 #endif 56 56 57 #if PLATFORM(GTK) && PLATFORM(WAYLAND) && !defined(GTK_API_VERSION_2)57 #if PLATFORM(GTK) && PLATFORM(WAYLAND) 58 58 #include <gdk/gdkwayland.h> 59 59 #endif … … 75 75 { 76 76 #if PLATFORM(GTK) 77 #if defined(GTK_API_VERSION_2)78 return PlatformDisplayX11::create(GDK_DISPLAY_XDISPLAY(gdk_display_get_default()));79 #else80 77 if (gtk_init_check(nullptr, nullptr)) { 81 78 GdkDisplay* display = gdk_display_manager_get_default_display(gdk_display_manager_get()); … … 89 86 #endif 90 87 } 91 #endif92 88 #endif // PLATFORM(GTK) 93 89 -
trunk/Source/WebCore/platform/graphics/gtk/ColorGtk.cpp
r211853 r246632 26 26 namespace WebCore { 27 27 28 Color::Color(const GdkColor& c)29 {30 setRGB(makeRGB(c.red >> 8, c.green >> 8, c.blue >> 8));31 }32 33 #ifndef GTK_API_VERSION_234 28 Color::Color(const GdkRGBA& c) 35 29 { … … 49 43 return { red, green, blue, alpha }; 50 44 } 51 #endif52 45 53 46 } -
trunk/Source/WebCore/platform/graphics/gtk/DisplayRefreshMonitorGtk.cpp
r233512 r246632 45 45 } 46 46 47 #ifndef GTK_API_VERSION_248 47 static void onFrameClockUpdate(GdkFrameClock*, DisplayRefreshMonitorGtk* monitor) 49 48 { 50 49 monitor->displayLinkFired(); 51 50 } 52 #endif53 51 54 52 bool DisplayRefreshMonitorGtk::requestRefreshCallback() … … 57 55 return false; 58 56 59 #ifndef GTK_API_VERSION_260 57 if (!m_window) { 61 58 // GdkFrameClockIdle is private in GDK, so we need to create a toplevel to get its frame clock. … … 76 73 setIsScheduled(true); 77 74 return true; 78 #else79 return false;80 #endif81 75 } 82 76 -
trunk/Source/WebCore/platform/graphics/gtk/DisplayRefreshMonitorGtk.h
r233512 r246632 38 38 static RefPtr<DisplayRefreshMonitorGtk> create(PlatformDisplayID displayID) 39 39 { 40 #ifndef GTK_API_VERSION_241 40 return adoptRef(*new DisplayRefreshMonitorGtk(displayID)); 42 #else43 UNUSED_PARAM(displayID);44 return nullptr;45 #endif46 41 } 47 42 -
trunk/Source/WebCore/platform/graphics/gtk/GdkCairoUtilities.cpp
r222800 r246632 28 28 29 29 #include "GdkCairoUtilities.h" 30 #include "GtkVersioning.h"31 30 #include "IntSize.h" 32 31 #include <cairo.h> -
trunk/Source/WebCore/platform/gtk/GRefPtrGtk.cpp
r206731 r246632 60 60 #endif 61 61 62 #ifdef GTK_API_VERSION_263 template <> GdkCursor* refGPtr(GdkCursor* ptr)64 {65 if (ptr)66 gdk_cursor_ref(ptr);67 return ptr;68 }69 70 template <> void derefGPtr(GdkCursor* ptr)71 {72 if (ptr)73 gdk_cursor_unref(ptr);74 }75 76 #else77 78 62 template <> GtkWidgetPath* refGPtr(GtkWidgetPath* ptr) 79 63 { … … 89 73 } 90 74 91 #endif92 93 75 } -
trunk/Source/WebCore/platform/gtk/GRefPtrGtk.h
r206731 r246632 19 19 */ 20 20 21 #ifndef GRefPtrGtk_h 22 #define GRefPtrGtk_h 21 #pragma once 23 22 24 23 #include <wtf/glib/GRefPtr.h> … … 37 36 #endif 38 37 39 #ifdef GTK_API_VERSION_240 template <> GdkCursor* refGPtr(GdkCursor* ptr);41 template <> void derefGPtr(GdkCursor* ptr);42 #else43 38 template <> GtkWidgetPath* refGPtr(GtkWidgetPath* ptr); 44 39 template <> void derefGPtr(GtkWidgetPath* ptr); 45 #endif46 40 47 41 } 48 42 49 #endif -
trunk/Source/WebCore/platform/gtk/PasteboardHelper.cpp
r234278 r246632 25 25 26 26 #include "BitmapImage.h" 27 #include "GtkVersioning.h"28 27 #include "SelectionData.h" 29 28 #include <gtk/gtk.h> … … 120 119 } 121 120 122 #ifndef GTK_API_VERSION_2123 121 if (gtk_clipboard_wait_is_image_available(clipboard)) { 124 122 if (GRefPtr<GdkPixbuf> pixbuf = adoptGRef(gtk_clipboard_wait_for_image(clipboard))) { … … 128 126 } 129 127 } 130 #endif131 128 132 129 selection.setCanSmartReplace(gtk_clipboard_wait_is_target_available(clipboard, smartPasteAtom)); -
trunk/Source/WebCore/platform/gtk/PlatformKeyboardEventGtk.cpp
r246496 r246632 32 32 33 33 #include "GtkUtilities.h" 34 #include "GtkVersioning.h"35 34 #include "NotImplemented.h" 36 35 #include "TextEncoding.h" … … 1335 1334 { 1336 1335 GdkModifierType state; 1336 gdk_event_get_state(reinterpret_cast<GdkEvent*>(event), &state); 1337 1337 guint keyval; 1338 gdk_event_get_keyval(reinterpret_cast<GdkEvent*>(event), &keyval); 1339 1338 1340 OptionSet<PlatformEvent::Modifier> modifiers; 1339 gdk_event_get_state(reinterpret_cast<GdkEvent*>(event), &state);1340 #ifndef GTK_API_VERSION_21341 gdk_event_get_keyval(reinterpret_cast<GdkEvent*>(event), &keyval);1342 #else1343 keyval = event->keyval;1344 #endif1345 1341 if (state & GDK_SHIFT_MASK || keyval == GDK_KEY_3270_BackTab) 1346 1342 modifiers.add(PlatformEvent::Modifier::ShiftKey); … … 1366 1362 { 1367 1363 guint keyval; 1364 gdk_event_get_keyval(reinterpret_cast<GdkEvent*>(event), &keyval); 1368 1365 guint16 keycode; 1369 #ifndef GTK_API_VERSION_21370 gdk_event_get_keyval(reinterpret_cast<GdkEvent*>(event), &keyval);1371 1366 gdk_event_get_keycode(reinterpret_cast<GdkEvent*>(event), &keycode); 1372 #else1373 keyval = event->keyval;1374 keycode = event->hardware_keycode;1375 #endif1376 1367 1377 1368 m_text = compositionResults.simpleString.length() ? compositionResults.simpleString : singleCharacterString(keyval); -
trunk/Source/WebCore/platform/gtk/PlatformMouseEventGtk.cpp
r246496 r246632 40 40 PlatformMouseEvent::PlatformMouseEvent(GdkEventButton* event) 41 41 { 42 gdouble x, y, rootX, rootY; 42 gdouble x, y; 43 gdk_event_get_coords(reinterpret_cast<GdkEvent*>(event), &x, &y); 44 gdouble rootX, rootY; 45 gdk_event_get_root_coords(reinterpret_cast<GdkEvent*>(event), &rootX, &rootY); 43 46 GdkModifierType state; 47 gdk_event_get_state(reinterpret_cast<GdkEvent*>(event), &state); 44 48 guint button; 45 46 gdk_event_get_coords(reinterpret_cast<GdkEvent*>(event), &x, &y);47 gdk_event_get_root_coords(reinterpret_cast<GdkEvent*>(event), &rootX, &rootY);48 gdk_event_get_state(reinterpret_cast<GdkEvent*>(event), &state);49 #ifndef GTK_API_VERSION_250 49 gdk_event_get_button(reinterpret_cast<GdkEvent*>(event), &button); 51 #else52 button = event->button;53 #endif54 50 55 51 m_timestamp = wallTimeForEvent(event); -
trunk/Source/WebCore/platform/gtk/PlatformScreenGtk.cpp
r246310 r246632 34 34 #include "FloatRect.h" 35 35 #include "FrameView.h" 36 #include "GtkVersioning.h"37 36 #include "HostWindow.h" 38 37 #include "NotImplemented.h" … … 221 220 222 221 #if ENABLE(TOUCH_EVENTS) 223 #ifdef GTK_API_VERSION_2224 bool screenHasTouchDevice()225 {226 return false;227 }228 229 bool screenIsTouchPrimaryInputDevice()230 {231 return false;232 }233 #else // GTK_API_VERSION_2234 222 #if !GTK_CHECK_VERSION(3, 20, 0) 235 223 static void deviceAddedCallback(GdkDeviceManager*, GdkDevice*); … … 325 313 return device ? gdk_device_get_source(device) == GDK_SOURCE_TOUCHSCREEN : true; 326 314 } 327 #endif // !GTK_API_VERSION_2328 315 #endif // ENABLE(TOUCH_EVENTS) 329 316 -
trunk/Source/WebCore/platform/gtk/PlatformWheelEventGtk.cpp
r246496 r246632 63 63 m_deltaY = 0; 64 64 GdkScrollDirection direction; 65 #ifndef GTK_API_VERSION_266 65 if (!gdk_event_get_scroll_direction(reinterpret_cast<GdkEvent*>(event), &direction)) { 67 66 gdouble deltaX, deltaY; … … 71 70 } 72 71 } 73 #else74 direction = event->direction;75 #endif76 72 77 73 // Docs say an upwards scroll (away from the user) has a positive delta … … 98 94 99 95 #if ENABLE(ASYNC_SCROLLING) 100 #ifndef GTK_API_VERSION_2101 96 #if GTK_CHECK_VERSION(3, 20, 0) 102 97 m_phase = gdk_event_is_scroll_stop_event(reinterpret_cast<GdkEvent*>(event)) ? … … 108 103 PlatformWheelEventPhaseChanged; 109 104 #endif 110 #else111 m_phase = PlatformWheelEventPhaseChanged;112 #endif // GTK_API_VERSION_2113 105 #endif // ENABLE(ASYNC_SCROLLING) 114 106 -
trunk/Source/WebCore/platform/gtk/ScrollbarThemeGtk.cpp
r241654 r246632 47 47 ScrollbarThemeGtk::~ScrollbarThemeGtk() = default; 48 48 49 #ifndef GTK_API_VERSION_250 49 static void themeChangedCallback() 51 50 { … … 837 836 } 838 837 #endif 839 840 #else // GTK_API_VERSION_2 841 bool ScrollbarThemeGtk::hasThumb(Scrollbar&) 842 { 843 return false; 844 } 845 846 IntRect ScrollbarThemeGtk::backButtonRect(Scrollbar&, ScrollbarPart, bool) 847 { 848 return IntRect(); 849 } 850 851 IntRect ScrollbarThemeGtk::forwardButtonRect(Scrollbar&, ScrollbarPart, bool) 852 { 853 return IntRect(); 854 } 855 856 IntRect ScrollbarThemeGtk::trackRect(Scrollbar&, bool) 857 { 858 return IntRect(); 859 } 860 861 bool ScrollbarThemeGtk::hasButtons(Scrollbar&) 862 { 863 return false; 864 } 865 #endif // GTK_API_VERSION_2 866 867 } 838 } -
trunk/Source/WebCore/platform/gtk/ScrollbarThemeGtk.h
r218799 r246632 24 24 */ 25 25 26 #ifndef ScrollbarThemeGtk_h 27 #define ScrollbarThemeGtk_h 26 #pragma once 28 27 29 28 #include "ScrollbarThemeComposite.h" … … 43 42 IntRect trackRect(Scrollbar&, bool) override; 44 43 45 #ifndef GTK_API_VERSION_246 44 ScrollbarThemeGtk(); 47 45 … … 67 65 bool m_hasBackButtonEndPart : 1; 68 66 bool m_usesOverlayScrollbars { false }; 69 #endif // GTK_API_VERSION_270 67 }; 71 68 72 69 } 73 70 74 #endif -
trunk/Source/WebCore/platform/gtk/WidgetGtk.cpp
r238336 r246632 32 32 #include "FrameView.h" 33 33 #include "GraphicsContext.h" 34 #include "GtkVersioning.h"35 34 #include "HostWindow.h" 36 35 #include "IntRect.h" -
trunk/Source/WebCore/rendering/RenderThemeGtk.cpp
r244731 r246632 34 34 #include "Gradient.h" 35 35 #include "GraphicsContext.h" 36 #include "GtkVersioning.h"37 36 #include "HTMLInputElement.h" 38 37 #include "HTMLMediaElement.h" … … 125 124 } 126 125 #endif 127 128 #ifndef GTK_API_VERSION_2129 126 130 127 static void themeChangedCallback() … … 2062 2059 } 2063 2060 #endif // ENABLE(VIDEO) 2064 2065 #endif // GTK_API_VERSION_2 2066 } 2061 } -
trunk/Source/WebCore/rendering/RenderThemeGtk.h
r244635 r246632 49 49 50 50 public: 51 #ifndef GTK_API_VERSION_252 53 51 // A method asking if the theme's controls actually care about redrawing when hovered. 54 52 bool supportsHover(const RenderStyle&) const override { return true; } … … 190 188 191 189 static IntRect calculateProgressRect(const RenderObject&, const IntRect&); 192 #endif // GTK_API_VERSION_2193 190 }; 194 191 -
trunk/Source/WebKit/ChangeLog
r246626 r246632 1 2019-06-20 Carlos Garcia Campos <cgarcia@igalia.com> 2 3 [GTK] Remove support for GTK2 plugins 4 https://bugs.webkit.org/show_bug.cgi?id=199065 5 6 Reviewed by Sergio Villar Senin. 7 8 * PlatformGTK.cmake: 9 * Shared/Plugins/Netscape/NetscapePluginModule.cpp: 10 (WebKit::moduleMixesGtkSymbols): 11 * Shared/Plugins/Netscape/unix/NetscapePluginModuleUnix.cpp: 12 (WebKit::NetscapePluginModule::getPluginInfo): 13 * Shared/Plugins/PluginModuleInfo.h: 14 * Shared/gtk/WebEventFactory.cpp: 15 (WebKit::isGdkKeyCodeFromKeyPad): 16 (WebKit::buttonForEvent): 17 (WebKit::WebEventFactory::createWebMouseEvent): 18 (WebKit::WebEventFactory::createWebWheelEvent): 19 (WebKit::WebEventFactory::createWebKeyboardEvent): 20 (WebKit::WebEventFactory::createWebTouchEvent): 21 * SourcesGTK.txt: 22 * UIProcess/API/gtk/WebKitWebViewBase.cpp: 23 * UIProcess/Launcher/glib/ProcessLauncherGLib.cpp: 24 (WebKit::ProcessLauncher::launchProcess): 25 * UIProcess/Plugins/PluginProcessProxy.h: 26 * UIProcess/Plugins/gtk/PluginInfoCache.cpp: 27 (WebKit::PluginInfoCache::getPluginInfo): 28 (WebKit::PluginInfoCache::updatePluginInfo): 29 * UIProcess/Plugins/unix/PluginInfoStoreUnix.cpp: 30 (WebKit::PluginInfoStore::getPluginInfo): 31 * UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp: 32 (WebKit::PluginProcessProxy::platformGetLaunchOptionsWithAttributes): 33 (WebKit::PluginProcessProxy::scanPlugin): 34 * WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp: 35 1 36 2019-06-19 Dean Jackson <dino@apple.com> 2 37 -
trunk/Source/WebKit/PlatformGTK.cmake
r245807 r246632 423 423 ${CAIRO_INCLUDE_DIRS} 424 424 ${ENCHANT_INCLUDE_DIRS} 425 ${GLIB_INCLUDE_DIRS} 425 426 ${GSTREAMER_INCLUDE_DIRS} 426 427 ${GSTREAMER_PBUTILS_INCLUDE_DIRS} 428 ${GTK_INCLUDE_DIRS} 429 ${GTK_UNIX_PRINT_INCLUDE_DIRS} 427 430 ${HARFBUZZ_INCLUDE_DIRS} 428 431 ${LIBSOUP_INCLUDE_DIRS} … … 448 451 set(WebKitCommonSystemIncludeDirectories ${WebKit_SYSTEM_INCLUDE_DIRECTORIES}) 449 452 450 list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES451 ${GLIB_INCLUDE_DIRS}452 ${GTK_INCLUDE_DIRS}453 ${GTK_UNIX_PRINT_INCLUDE_DIRS}454 )455 456 453 list(APPEND WebProcess_SOURCES 457 454 WebProcess/EntryPoint/unix/WebProcessMain.cpp … … 467 464 468 465 list(APPEND WebKit_LIBRARIES 469 PRIVATE 470 WebCorePlatformGTK 471 ${GTK_UNIX_PRINT_LIBRARIES} 472 ) 473 474 # WebCore should be specifed before and after WebCorePlatformGTK 475 list(APPEND WebKit_LIBRARIES PRIVATE WebCore) 466 ${GTK_UNIX_PRINT_LIBRARIES} 467 ) 476 468 477 469 if (USE_WPE_RENDERER) … … 570 562 ) 571 563 endif () 572 573 if (ENABLE_PLUGIN_PROCESS_GTK2)574 set(PluginProcessGTK2_EXECUTABLE_NAME WebKitPluginProcess2)575 576 # FIXME: We should remove WebKitPluginProcess2 in 2020, once Flash is no longer supported.577 list(APPEND PluginProcessGTK2_SOURCES578 Platform/Logging.cpp579 Platform/Module.cpp580 581 Platform/IPC/ArgumentCoders.cpp582 Platform/IPC/Attachment.cpp583 Platform/IPC/Connection.cpp584 Platform/IPC/DataReference.cpp585 Platform/IPC/Decoder.cpp586 Platform/IPC/Encoder.cpp587 Platform/IPC/MessageReceiverMap.cpp588 Platform/IPC/MessageSender.cpp589 Platform/IPC/StringReference.cpp590 591 Platform/IPC/glib/GSocketMonitor.cpp592 Platform/IPC/unix/AttachmentUnix.cpp593 Platform/IPC/unix/ConnectionUnix.cpp594 595 Platform/glib/ModuleGlib.cpp596 597 Platform/unix/LoggingUnix.cpp598 Platform/unix/SharedMemoryUnix.cpp599 600 PluginProcess/PluginControllerProxy.cpp601 PluginProcess/PluginCreationParameters.cpp602 PluginProcess/PluginProcess.cpp603 PluginProcess/WebProcessConnection.cpp604 605 PluginProcess/EntryPoint/unix/PluginProcessMain.cpp606 607 PluginProcess/unix/PluginControllerProxyUnix.cpp608 PluginProcess/unix/PluginProcessMainUnix.cpp609 PluginProcess/unix/PluginProcessUnix.cpp610 611 Shared/ActivityAssertion.cpp612 Shared/AuxiliaryProcess.cpp613 Shared/BlobDataFileReferenceWithSandboxExtension.cpp614 Shared/ShareableBitmap.cpp615 Shared/WebCoreArgumentCoders.cpp616 Shared/WebEvent.cpp617 Shared/WebKeyboardEvent.cpp618 Shared/WebKit2Initialize.cpp619 Shared/WebMouseEvent.cpp620 Shared/WebPlatformTouchPoint.cpp621 Shared/WebTouchEvent.cpp622 Shared/WebWheelEvent.cpp623 624 Shared/Plugins/NPIdentifierData.cpp625 Shared/Plugins/NPObjectMessageReceiver.cpp626 Shared/Plugins/NPObjectProxy.cpp627 Shared/Plugins/NPRemoteObjectMap.cpp628 Shared/Plugins/NPVariantData.cpp629 Shared/Plugins/PluginProcessCreationParameters.cpp630 631 Shared/Plugins/Netscape/NetscapePluginModule.cpp632 Shared/Plugins/Netscape/NetscapePluginModuleNone.cpp633 634 Shared/Plugins/Netscape/unix/NetscapePluginModuleUnix.cpp635 636 Shared/cairo/ShareableBitmapCairo.cpp637 638 Shared/glib/ProcessExecutablePathGLib.cpp639 640 Shared/gtk/NativeWebKeyboardEventGtk.cpp641 Shared/gtk/NativeWebMouseEventGtk.cpp642 Shared/gtk/NativeWebTouchEventGtk.cpp643 Shared/gtk/NativeWebWheelEventGtk.cpp644 Shared/gtk/WebEventFactory.cpp645 646 Shared/soup/WebCoreArgumentCodersSoup.cpp647 648 Shared/unix/AuxiliaryProcessMain.cpp649 650 UIProcess/Launcher/ProcessLauncher.cpp651 652 UIProcess/Launcher/glib/BubblewrapLauncher.cpp653 UIProcess/Launcher/glib/FlatpakLauncher.cpp654 UIProcess/Launcher/glib/ProcessLauncherGLib.cpp655 656 UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp657 658 WebProcess/Plugins/Plugin.cpp659 660 WebProcess/Plugins/Netscape/NPRuntimeUtilities.cpp661 WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp662 WebProcess/Plugins/Netscape/NetscapePlugin.cpp663 WebProcess/Plugins/Netscape/NetscapePluginNone.cpp664 WebProcess/Plugins/Netscape/NetscapePluginStream.cpp665 666 WebProcess/Plugins/Netscape/unix/NetscapePluginUnix.cpp667 WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp668 669 ${WebKit_DERIVED_SOURCES_DIR}/AuxiliaryProcessMessageReceiver.cpp670 ${WebKit_DERIVED_SOURCES_DIR}/PluginControllerProxyMessageReceiver.cpp671 ${WebKit_DERIVED_SOURCES_DIR}/PluginProcessMessageReceiver.cpp672 ${WebKit_DERIVED_SOURCES_DIR}/NPObjectMessageReceiverMessageReceiver.cpp673 ${WebKit_DERIVED_SOURCES_DIR}/WebProcessConnectionMessageReceiver.cpp674 )675 676 add_executable(WebKitPluginProcess2 ${PluginProcessGTK2_SOURCES})677 ADD_WEBKIT_PREFIX_HEADER(WebKitPluginProcess2)678 679 # We need ENABLE_PLUGIN_PROCESS for all targets in this directory, but680 # we only want GTK_API_VERSION_2 for the plugin process target.681 set_property(682 TARGET WebKitPluginProcess2683 APPEND684 PROPERTY COMPILE_DEFINITIONS GTK_API_VERSION_2=1685 )686 target_include_directories(WebKitPluginProcess2 PRIVATE687 ${WebKitCommonIncludeDirectories}688 )689 target_include_directories(WebKitPluginProcess2 SYSTEM PRIVATE690 ${WebKitCommonSystemIncludeDirectories}691 ${GTK2_INCLUDE_DIRS}692 ${GDK2_INCLUDE_DIRS}693 )694 695 set(WebKitPluginProcess2_LIBRARIES696 ${SharedWebKitLibraries}697 PRIVATE WebCorePlatformGTK2698 )699 ADD_WHOLE_ARCHIVE_TO_LIBRARIES(WebKitPluginProcess2_LIBRARIES)700 target_link_libraries(WebKitPluginProcess2 ${WebKitPluginProcess2_LIBRARIES})701 702 add_dependencies(WebKitPluginProcess2 WebKit)703 704 install(TARGETS WebKitPluginProcess2 DESTINATION "${LIBEXEC_INSTALL_DIR}")705 706 if (COMPILER_IS_GCC_OR_CLANG)707 WEBKIT_ADD_TARGET_CXX_FLAGS(WebKitPluginProcess2 -Wno-unused-parameter)708 endif ()709 endif () # ENABLE_PLUGIN_PROCESS_GTK2710 564 711 565 # GTK3 PluginProcess -
trunk/Source/WebKit/Shared/Plugins/Netscape/NetscapePluginModule.cpp
r243163 r246632 201 201 static bool moduleMixesGtkSymbols(Module* module) 202 202 { 203 #ifdef GTK_API_VERSION_2204 return module->functionPointer<gpointer>("gtk_application_get_type");205 #else206 203 return module->functionPointer<gpointer>("gtk_object_get_type"); 207 #endif208 204 } 209 205 #endif -
trunk/Source/WebKit/Shared/Plugins/Netscape/unix/NetscapePluginModuleUnix.cpp
r240437 r246632 164 164 plugin.info.desc = metaData.description; 165 165 parseMIMEDescription(metaData.mimeDescription, plugin.info.mimes); 166 #if PLATFORM(GTK)167 plugin.requiresGtk2 = metaData.requiresGtk2;168 #endif169 166 170 167 return true; -
trunk/Source/WebKit/Shared/Plugins/PluginModuleInfo.h
r204462 r246632 57 57 String shortVersionString; 58 58 bool hasSandboxProfile; 59 #elif PLATFORM(GTK)60 bool requiresGtk2;61 59 #endif 62 60 }; -
trunk/Source/WebKit/Shared/gtk/WebEventFactory.cpp
r246597 r246632 30 30 31 31 #include <WebCore/GtkUtilities.h> 32 #include <WebCore/GtkVersioning.h>33 32 #include <WebCore/PlatformKeyboardEvent.h> 34 33 #include <WebCore/Scrollbar.h> … … 45 44 static inline bool isGdkKeyCodeFromKeyPad(unsigned keyval) 46 45 { 47 return keyval >= GDK_K P_Space && keyval <= GDK_KP_9;46 return keyval >= GDK_KEY_KP_Space && keyval <= GDK_KEY_KP_9; 48 47 } 49 48 … … 97 96 case GDK_2BUTTON_PRESS: 98 97 case GDK_3BUTTON_PRESS: 99 case GDK_BUTTON_RELEASE: 98 case GDK_BUTTON_RELEASE: { 100 99 guint eventButton; 101 #ifndef GTK_API_VERSION_2102 100 gdk_event_get_button(event, &eventButton); 103 #else 104 eventButton = event->button.button; 105 #endif 101 106 102 if (eventButton == 1) 107 103 button = WebMouseEvent::LeftButton; … … 111 107 button = WebMouseEvent::RightButton; 112 108 break; 109 } 113 110 default: 114 111 ASSERT_NOT_REACHED(); … … 153 150 154 151 guint eventButton; 155 #ifndef GTK_API_VERSION_2156 152 gdk_event_get_button(event, &eventButton); 157 #else158 eventButton = event->button.button;159 #endif160 153 161 154 WebEvent::Type type = static_cast<WebEvent::Type>(0); … … 205 198 WebWheelEvent WebEventFactory::createWebWheelEvent(const GdkEvent* event) 206 199 { 207 #ifndef GTK_API_VERSION_2208 200 #if GTK_CHECK_VERSION(3, 20, 0) 209 201 WebWheelEvent::Phase phase = gdk_event_is_scroll_stop_event(event) ? … … 217 209 WebWheelEvent::Phase::PhaseChanged; 218 210 #endif 219 #else220 WebWheelEvent::Phase phase = WebWheelEvent::Phase::PhaseChanged;221 #endif // GTK_API_VERSION_2222 211 223 212 return createWebWheelEvent(event, phase, WebWheelEvent::Phase::PhaseNone); … … 226 215 WebWheelEvent WebEventFactory::createWebWheelEvent(const GdkEvent* event, WebWheelEvent::Phase phase, WebWheelEvent::Phase momentumPhase) 227 216 { 228 double x, y, xRoot, yRoot; 217 FloatSize wheelTicks = FloatSize(0, 0); 218 double x, y; 219 gdk_event_get_coords(event, &x, &y); 220 double xRoot, yRoot; 221 gdk_event_get_root_coords(event, &xRoot, &yRoot); 222 229 223 GdkScrollDirection direction; 230 FloatSize wheelTicks = FloatSize(0, 0);231 gdk_event_get_coords(event, &x, &y);232 gdk_event_get_root_coords(event, &xRoot, &yRoot);233 #ifndef GTK_API_VERSION_2234 224 if (!gdk_event_get_scroll_direction(event, &direction)) { 235 225 double deltaX, deltaY; … … 237 227 wheelTicks = FloatSize(-deltaX, -deltaY); 238 228 } 239 #else240 direction = event->scroll.direction;241 #endif242 229 243 230 if (wheelTicks.isZero()) { … … 280 267 { 281 268 guint keyval; 269 gdk_event_get_keyval(event, &keyval); 282 270 guint16 keycode; 283 #ifndef GTK_API_VERSION_2284 gdk_event_get_keyval(event, &keyval);285 271 gdk_event_get_keycode(event, &keycode); 286 #else 287 keyval = event->key.keyval; 288 keycode = event->key.hardware_keycode; 289 #endif 272 290 273 #if GTK_CHECK_VERSION(3, 10, 0) 291 274 GdkEventType type = gdk_event_get_event_type(event); … … 312 295 WebTouchEvent WebEventFactory::createWebTouchEvent(const GdkEvent* event, Vector<WebPlatformTouchPoint>&& touchPoints) 313 296 { 314 #ifndef GTK_API_VERSION_2315 297 WebEvent::Type type = WebEvent::NoType; 316 298 #if GTK_CHECK_VERSION(3, 10, 0) … … 337 319 338 320 return WebTouchEvent(type, WTFMove(touchPoints), modifiersForEvent(event), wallTimeForEvent(event)); 339 #else340 return WebTouchEvent();341 #endif // GTK_API_VERSION_2342 321 } 343 322 #endif -
trunk/Source/WebKit/SourcesGTK.txt
r246388 r246632 22 22 // THE POSSIBILITY OF SUCH DAMAGE. 23 23 24 // FIXME: Many of these files are built with @no-unify to avoid errors25 // linking PluginProcessGTK2. I don't know why this is necessary. These26 // annotations should be revisited after removing PluginProcessGTK2.27 28 24 NetworkProcess/Classifier/WebResourceLoadStatisticsStore.cpp 29 25 NetworkProcess/Classifier/WebResourceLoadStatisticsTelemetry.cpp … … 50 46 NetworkProcess/webrtc/NetworkRTCSocket.cpp 51 47 52 Platform/IPC/glib/GSocketMonitor.cpp @no-unify53 Platform/IPC/unix/AttachmentUnix.cpp @no-unify54 Platform/IPC/unix/ConnectionUnix.cpp @no-unify48 Platform/IPC/glib/GSocketMonitor.cpp 49 Platform/IPC/unix/AttachmentUnix.cpp 50 Platform/IPC/unix/ConnectionUnix.cpp 55 51 56 52 Platform/classifier/ResourceLoadStatisticsClassifier.cpp 57 53 58 Platform/glib/ModuleGlib.cpp @no-unify59 60 Platform/unix/LoggingUnix.cpp @no-unify61 Platform/unix/SharedMemoryUnix.cpp @no-unify62 63 PluginProcess/unix/PluginControllerProxyUnix.cpp @no-unify64 PluginProcess/unix/PluginProcessMainUnix.cpp @no-unify65 PluginProcess/unix/PluginProcessUnix.cpp @no-unify54 Platform/glib/ModuleGlib.cpp 55 56 Platform/unix/LoggingUnix.cpp 57 Platform/unix/SharedMemoryUnix.cpp 58 59 PluginProcess/unix/PluginControllerProxyUnix.cpp 60 PluginProcess/unix/PluginProcessMainUnix.cpp 61 PluginProcess/unix/PluginProcessUnix.cpp 66 62 67 63 Shared/API/c/cairo/WKImageCairo.cpp … … 81 77 Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp 82 78 83 Shared/Plugins/Netscape/NetscapePluginModuleNone.cpp @no-unify84 Shared/Plugins/Netscape/unix/NetscapePluginModuleUnix.cpp @no-unify79 Shared/Plugins/Netscape/NetscapePluginModuleNone.cpp 80 Shared/Plugins/Netscape/unix/NetscapePluginModuleUnix.cpp 85 81 86 82 Shared/Plugins/unix/PluginSearchPath.cpp 87 83 88 Shared/cairo/ShareableBitmapCairo.cpp @no-unify89 90 Shared/glib/ProcessExecutablePathGLib.cpp @no-unify84 Shared/cairo/ShareableBitmapCairo.cpp 85 86 Shared/glib/ProcessExecutablePathGLib.cpp 91 87 Shared/glib/WebContextMenuItemGlib.cpp 92 88 … … 103 99 Shared/linux/WebMemorySamplerLinux.cpp 104 100 105 Shared/soup/WebCoreArgumentCodersSoup.cpp @no-unify101 Shared/soup/WebCoreArgumentCodersSoup.cpp 106 102 Shared/soup/WebErrorsSoup.cpp 107 103 108 Shared/unix/AuxiliaryProcessMain.cpp @no-unify104 Shared/unix/AuxiliaryProcessMain.cpp 109 105 110 106 UIProcess/BackingStore.cpp … … 112 108 UIProcess/LegacySessionStateCodingNone.cpp 113 109 UIProcess/ViewGestureController.cpp 114 UIProcess/ViewSnapshotStore.cpp @no-unify110 UIProcess/ViewSnapshotStore.cpp 115 111 UIProcess/WebGrammarDetail.cpp 116 UIProcess/WebMemoryPressureHandler.cpp @no-unify112 UIProcess/WebMemoryPressureHandler.cpp 117 113 UIProcess/WebTextChecker.cpp 118 114 UIProcess/WebTextCheckerClient.cpp … … 221 217 UIProcess/linux/MemoryPressureMonitor.cpp 222 218 223 UIProcess/Plugins/gtk/PluginInfoCache.cpp @no-unify224 225 UIProcess/Plugins/unix/PluginInfoStoreUnix.cpp @no-unify226 UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp @no-unify219 UIProcess/Plugins/gtk/PluginInfoCache.cpp 220 221 UIProcess/Plugins/unix/PluginInfoStoreUnix.cpp 222 UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp 227 223 228 224 UIProcess/WebsiteData/soup/WebsiteDataStoreSoup.cpp … … 238 234 UIProcess/gstreamer/WebPageProxyGStreamer.cpp 239 235 240 UIProcess/gtk/AcceleratedBackingStore.cpp @no-unify236 UIProcess/gtk/AcceleratedBackingStore.cpp 241 237 UIProcess/gtk/AcceleratedBackingStoreWayland.cpp @no-unify 242 238 UIProcess/gtk/AcceleratedBackingStoreX11.cpp @no-unify … … 244 240 UIProcess/gtk/GestureController.cpp 245 241 UIProcess/gtk/HardwareAccelerationManager.cpp 246 UIProcess/gtk/InputMethodFilter.cpp @no-unify242 UIProcess/gtk/InputMethodFilter.cpp 247 243 UIProcess/gtk/KeyBindingTranslator.cpp 248 UIProcess/gtk/RemoteWebInspectorProxyGtk.cpp @no-unify244 UIProcess/gtk/RemoteWebInspectorProxyGtk.cpp 249 245 UIProcess/gtk/TextCheckerGtk.cpp @no-unify 250 246 UIProcess/gtk/ViewGestureControllerGtk.cpp @no-unify 251 UIProcess/gtk/ViewSnapshotStoreGtk.cpp @no-unify247 UIProcess/gtk/ViewSnapshotStoreGtk.cpp 252 248 UIProcess/gtk/WaylandCompositor.cpp @no-unify 253 UIProcess/gtk/WebColorPickerGtk.cpp @no-unify249 UIProcess/gtk/WebColorPickerGtk.cpp 254 250 UIProcess/gtk/WebContextMenuProxyGtk.cpp 255 251 UIProcess/gtk/WebInspectorProxyGtk.cpp … … 391 387 WebProcess/MediaCache/WebMediaKeyStorageManager.cpp 392 388 393 WebProcess/Plugins/Netscape/unix/NetscapePluginUnix.cpp @no-unify394 WebProcess/Plugins/Netscape/unix/PluginProxyUnix.cpp @no-unify389 WebProcess/Plugins/Netscape/unix/NetscapePluginUnix.cpp 390 WebProcess/Plugins/Netscape/unix/PluginProxyUnix.cpp 395 391 396 392 WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp @no-unify -
trunk/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp
r246592 r246632 55 55 #include <WebCore/GUniquePtrGtk.h> 56 56 #include <WebCore/GtkUtilities.h> 57 #include <WebCore/GtkVersioning.h>58 57 #include <WebCore/NotImplemented.h> 59 58 #include <WebCore/PasteboardHelper.h> -
trunk/Source/WebKit/UIProcess/Launcher/glib/ProcessLauncherGLib.cpp
r241816 r246632 88 88 case ProcessLauncher::ProcessType::Plugin32: 89 89 executablePath = executablePathOfPluginProcess(); 90 #if ENABLE(PLUGIN_PROCESS_GTK2)91 if (m_launchOptions.extraInitializationData.contains("requires-gtk2"))92 executablePath.append('2');93 #endif94 90 pluginPath = m_launchOptions.extraInitializationData.get("plugin-path"); 95 91 realPluginPath = FileSystem::fileSystemRepresentation(pluginPath); -
trunk/Source/WebKit/UIProcess/Plugins/PluginProcessProxy.h
r243258 r246632 54 54 String description; 55 55 String mimeDescription; 56 57 #if PLATFORM(GTK)58 bool requiresGtk2;59 #endif60 56 }; 61 57 #endif -
trunk/Source/WebKit/UIProcess/Plugins/gtk/PluginInfoCache.cpp
r240437 r246632 134 134 #endif 135 135 136 plugin.requiresGtk2 = g_key_file_get_boolean(m_cacheFile.get(), pluginGroup.data(), "requires-gtk2", nullptr);137 138 136 return true; 139 137 } … … 155 153 #endif 156 154 157 g_key_file_set_boolean(m_cacheFile.get(), pluginGroup.data(), "requires-gtk2", plugin.requiresGtk2);158 159 155 if (m_cachePath && !m_readOnlyMode) { 160 156 // Save the cache file in an idle to make sure it happens in the main thread and -
trunk/Source/WebKit/UIProcess/Plugins/unix/PluginInfoStoreUnix.cpp
r240437 r246632 73 73 { 74 74 #if PLATFORM(GTK) 75 if (PluginInfoCache::singleton().getPluginInfo(pluginPath, plugin)) { 76 #if ENABLE(PLUGIN_PROCESS_GTK2) 77 if (plugin.requiresGtk2) { 78 if (PlatformDisplay::sharedDisplay().type() != PlatformDisplay::Type::X11) 79 return false; 80 String pluginProcessPath = executablePathOfPluginProcess(); 81 pluginProcessPath.append('2'); 82 if (!FileSystem::fileExists(pluginProcessPath)) 83 return false; 84 } 85 #endif 75 if (PluginInfoCache::singleton().getPluginInfo(pluginPath, plugin)) 86 76 return true; 87 }88 77 89 78 if (NetscapePluginModule::getPluginInfo(pluginPath, plugin)) { -
trunk/Source/WebKit/UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp
r240437 r246632 54 54 { 55 55 launchOptions.processType = ProcessLauncher::ProcessType::Plugin64; 56 57 56 launchOptions.extraInitializationData.add("plugin-path", pluginProcessAttributes.moduleInfo.path); 58 #if PLATFORM(GTK)59 if (pluginProcessAttributes.moduleInfo.requiresGtk2)60 launchOptions.extraInitializationData.add("requires-gtk2", emptyString());61 #endif62 57 } 63 58 … … 82 77 83 78 #if PLATFORM(GTK) 84 bool requiresGtk2 = pluginRequiresGtk2(pluginPath); 85 if (requiresGtk2) { 86 #if PLATFORM(WAYLAND) 87 if (PlatformDisplay::sharedDisplay().type() == PlatformDisplay::Type::Wayland) 88 return false; 89 #endif 90 #if ENABLE(PLUGIN_PROCESS_GTK2) 91 pluginProcessPath.append('2'); 92 if (!FileSystem::fileExists(pluginProcessPath)) 93 return false; 94 #else 79 if (pluginRequiresGtk2(pluginPath)) 95 80 return false; 96 #endif97 }98 81 #endif 99 82 … … 148 131 result.description.swap(lines[1]); 149 132 result.mimeDescription.swap(lines[2]); 150 #if PLATFORM(GTK)151 result.requiresGtk2 = requiresGtk2;152 #endif153 133 return !result.mimeDescription.isEmpty(); 154 134 } -
trunk/Source/WebKit/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp
r228521 r246632 40 40 #if PLATFORM(GTK) 41 41 #include <gtk/gtk.h> 42 #ifndef GTK_API_VERSION_243 42 #include <gtk/gtkx.h> 44 #endif45 #include <gdk/gdkx.h>46 #include <WebCore/GtkVersioning.h>47 43 #endif 48 44 -
trunk/Source/cmake/OptionsGTK.cmake
r246495 r246632 78 78 WEBKIT_OPTION_DEFINE(ENABLE_INTROSPECTION "Whether to enable GObject introspection." PUBLIC ON) 79 79 WEBKIT_OPTION_DEFINE(ENABLE_OPENGL "Whether to use OpenGL." PUBLIC ON) 80 WEBKIT_OPTION_DEFINE(ENABLE_PLUGIN_PROCESS_GTK2 "Whether to build WebKitPluginProcess2 to load GTK2 based plugins." PUBLIC ON)81 80 WEBKIT_OPTION_DEFINE(ENABLE_QUARTZ_TARGET "Whether to enable support for the Quartz windowing target." PUBLIC ${GTK3_SUPPORTS_QUARTZ}) 82 81 WEBKIT_OPTION_DEFINE(ENABLE_X11_TARGET "Whether to enable support for the X11 windowing target." PUBLIC ${GTK3_SUPPORTS_X11}) … … 100 99 WEBKIT_OPTION_DEPEND(ENABLE_ASYNC_SCROLLING ENABLE_OPENGL) 101 100 WEBKIT_OPTION_DEPEND(ENABLE_GLES2 ENABLE_OPENGL) 102 WEBKIT_OPTION_DEPEND(ENABLE_PLUGIN_PROCESS_GTK2 ENABLE_X11_TARGET)103 101 WEBKIT_OPTION_DEPEND(ENABLE_WEBGL ENABLE_OPENGL) 104 102 WEBKIT_OPTION_DEPEND(USE_WPE_RENDERER ENABLE_OPENGL) … … 305 303 SET_AND_EXPOSE_TO_BUILD(USE_COORDINATED_GRAPHICS TRUE) 306 304 SET_AND_EXPOSE_TO_BUILD(USE_NICOSIA TRUE) 307 endif ()308 309 if (ENABLE_PLUGIN_PROCESS_GTK2)310 find_package(GTK2 2.24.10 REQUIRED)311 find_package(GDK2 2.24.10 REQUIRED)312 305 endif () 313 306 -
trunk/Tools/ChangeLog
r246630 r246632 1 2019-06-20 Carlos Garcia Campos <cgarcia@igalia.com> 2 3 [GTK] Remove support for GTK2 plugins 4 https://bugs.webkit.org/show_bug.cgi?id=199065 5 6 Reviewed by Sergio Villar Senin. 7 8 * EWSTools/ubuntu-ews-packages: 9 * TestWebKitAPI/PlatformGTK.cmake: 10 * WebKitTestRunner/PlatformGTK.cmake: 11 * flatpak/org.webkit.GTK.yaml: 12 * gtk/install-dependencies: 13 1 14 2019-06-19 Yusuke Suzuki <ysuzuki@apple.com> 2 15 -
trunk/Tools/EWSTools/ubuntu-ews-packages
r239553 r246632 29 29 libpam0g-dev 30 30 libtool 31 libgtk2.0-dev32 31 libpango1.0-dev 33 32 libicu-dev -
trunk/Tools/TestWebKitAPI/PlatformGTK.cmake
r246590 r246632 48 48 ${GDK3_LIBRARIES} 49 49 ${GTK3_LIBRARIES} 50 51 WebCorePlatformGTK52 50 ) 53 51 ADD_WHOLE_ARCHIVE_TO_LIBRARIES(TestWebCore_LIBRARIES) -
trunk/Tools/WebKitTestRunner/PlatformGTK.cmake
r245968 r246632 31 31 ${GLIB_LIBRARIES} 32 32 WebCore 33 WebCorePlatformGTK34 33 ) 35 34 -
trunk/Tools/flatpak/org.webkit.GTK.yaml
r246256 r246632 89 89 - --without-dtrace 90 90 91 # Required for the GTK2 plugin process92 - name: gtk293 sources:94 - type: archive95 url: https://download.gnome.org/sources/gtk+/2.24/gtk+-2.24.32.tar.xz96 sha256: b6c8a93ddda5eabe3bfee1eb39636c9a03d2a56c7b62828b359bf197943c582e97 - type: script98 commands:99 - "sed -i '1s/python$/&2/' gtk/gtk-builder-convert"100 - "sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool"101 config-opts:102 - --disable-gtk-doc103 - --disable-cups104 - --disable-papi105 - --enable-introspection=no106 - --with-gdktarget=x11107 108 91 # Required for run-gtk-tests 109 92 - name: pycairo -
trunk/Tools/gtk/install-dependencies
r244214 r246632 113 113 libgl1-mesa-dev \ 114 114 libgl1-mesa-glx \ 115 libgtk2.0-dev \116 115 libgtk-3-dev \ 117 116 libgstreamer1.0-dev \ … … 283 282 mesa \ 284 283 mesa-libgl \ 285 gtk2 \286 284 gtk3 \ 287 285 libsystemd \ … … 435 433 gstreamer1-plugins-base-devel \ 436 434 gtk-doc \ 437 gtk2-devel \438 435 gtk3-devel \ 439 436 hyphen-devel \
Note: See TracChangeset
for help on using the changeset viewer.