⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 271231 in webkit


Ignore:
Timestamp:
Jan 7, 2021, 2:02:44 AM (6 years ago)
Author:
Carlos Garcia Campos
Message:

[GTK] Build failures with GTK4 3.99.5.1
​https://bugs.webkit.org/show_bug.cgi?id=219844

Reviewed by Philippe Normand.

Source/WebCore:

  • platform/gtk/GtkVersioning.h:

(gtk_window_resize):
(gtk_window_get_size):

Source/WebKit:

  • UIProcess/API/gtk/WebKitWebViewBase.cpp:

(webkitWebViewBaseSizeAllocate):

Source/WTF:

  • wtf/Platform.h:

Tools:

  • MiniBrowser/gtk/BrowserSearchBox.c:

(browserSearchBoxSizeAllocate):

  • MiniBrowser/gtk/BrowserWindow.c:

(webViewReadyToShow):

  • MiniBrowser/gtk/CMakeLists.txt:
Location:
trunk
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WTF/ChangeLog

    r271219 r271231  
     12021-01-07  Carlos Garcia Campos  <cgarcia@igalia.com>
     2
     3        [GTK] Build failures with GTK4 3.99.5.1
     4        https://bugs.webkit.org/show_bug.cgi?id=219844
     5
     6        Reviewed by Philippe Normand.
     7
     8        * wtf/Platform.h:
     9
    1102021-01-06  Jer Noble  <jer.noble@apple.com>
    211

  • trunk/Source/WTF/wtf/Platform.h

    r270477 r271231  
    8686#define GLIB_VERSION_MIN_REQUIRED GLIB_VERSION_2_44
    8787#if USE(GTK4)
    88 #define GDK_VERSION_MIN_REQUIRED GDK_VERSION_3_92
     88#define GDK_VERSION_MIN_REQUIRED GDK_VERSION_4_0
    8989#else
    9090#define GDK_VERSION_MIN_REQUIRED GDK_VERSION_3_22

  • trunk/Source/WebCore/ChangeLog

    r271223 r271231  
     12021-01-07  Carlos Garcia Campos  <cgarcia@igalia.com>
     2
     3        [GTK] Build failures with GTK4 3.99.5.1
     4        https://bugs.webkit.org/show_bug.cgi?id=219844
     5
     6        Reviewed by Philippe Normand.
     7
     8        * platform/gtk/GtkVersioning.h:
     9        (gtk_window_resize):
     10        (gtk_window_get_size):
     11
    1122021-01-06  Rob Buis  <rbuis@igalia.com>
    213

  • trunk/Source/WebCore/platform/gtk/GtkVersioning.h

    r269470 r271231  
    6464
    6565static inline void
     66gtk_window_resize(GtkWindow* window, int width, int height)
     67{
     68    gtk_window_set_default_size(window, width, height);
     69}
     70
     71static inline void
     72gtk_window_get_size(GtkWindow* window, int* width, int* height)
     73{
     74    gtk_window_get_default_size(window, width, height);
     75}
     76
     77static inline void
    6678gtk_init(int*, char***)
    6779{

  • trunk/Source/WebKit/ChangeLog

    r271229 r271231  
     12021-01-07  Carlos Garcia Campos  <cgarcia@igalia.com>
     2
     3        [GTK] Build failures with GTK4 3.99.5.1
     4        https://bugs.webkit.org/show_bug.cgi?id=219844
     5
     6        Reviewed by Philippe Normand.
     7
     8        * UIProcess/API/gtk/WebKitWebViewBase.cpp:
     9        (webkitWebViewBaseSizeAllocate):
     10
    1112021-01-07  Youenn Fablet  <youenn@apple.com>
    212

  • trunk/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp

    r270582 r271231  
    863863#if USE(GTK4)
    864864    for (auto* child = gtk_widget_get_first_child(widget); child; child = gtk_widget_get_next_sibling(child)) {
    865         if (GTK_IS_NATIVE(child))
    866             gtk_native_check_resize(GTK_NATIVE(child));
     865        if (GTK_IS_POPOVER(child))
     866            gtk_popover_present(GTK_POPOVER(child));
    867867    }
    868868#endif

  • trunk/Tools/ChangeLog

    r271215 r271231  
     12021-01-07  Carlos Garcia Campos  <cgarcia@igalia.com>
     2
     3        [GTK] Build failures with GTK4 3.99.5.1
     4        https://bugs.webkit.org/show_bug.cgi?id=219844
     5
     6        Reviewed by Philippe Normand.
     7
     8        * MiniBrowser/gtk/BrowserSearchBox.c:
     9        (browserSearchBoxSizeAllocate):
     10        * MiniBrowser/gtk/BrowserWindow.c:
     11        (webViewReadyToShow):
     12        * MiniBrowser/gtk/CMakeLists.txt:
     13
    1142021-01-06  Katherine Cheney  <katherine_cheney@apple.com>
    215

  • trunk/Tools/MiniBrowser/gtk/BrowserSearchBox.c

    r266055 r271231  
    297297    BrowserSearchBox *searchBox = BROWSER_SEARCH_BOX(widget);
    298298    if (searchBox->optionsPopover)
    299         gtk_native_check_resize(GTK_NATIVE(searchBox->optionsPopover));
     299        gtk_popover_present(GTK_POPOVER(searchBox->optionsPopover));
    300300}
    301301#endif

  • trunk/Tools/MiniBrowser/gtk/BrowserWindow.c

    r269619 r271231  
    400400    GdkRectangle geometry;
    401401    webkit_window_properties_get_geometry(windowProperties, &geometry);
    402 #if !GTK_CHECK_VERSION(3, 98, 0)
     402#if GTK_CHECK_VERSION(3, 99, 5)
     403    if (geometry.width > 0 && geometry.height > 0)
     404        gtk_window_set_default_size(GTK_WINDOW(window), geometry.width, geometry.height);
     405#else
    403406    if (geometry.x >= 0 && geometry.y >= 0)
    404407        gtk_window_move(GTK_WINDOW(window), geometry.x, geometry.y);
    405 #endif
    406408    if (geometry.width > 0 && geometry.height > 0)
    407409        gtk_window_resize(GTK_WINDOW(window), geometry.width, geometry.height);
     410#endif
    408411
    409412    if (!webkit_window_properties_get_toolbar_visible(windowProperties))

  • trunk/Tools/MiniBrowser/gtk/CMakeLists.txt

    r265492 r271231  
    5757
    5858if (USE_GTK4)
    59     set(MiniBrowser_PRIVATE_DEFINITIONS GDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_92)
     59    set(MiniBrowser_PRIVATE_DEFINITIONS GDK_VERSION_MIN_REQUIRED=GDK_VERSION_4_0)
    6060else ()
    6161    set(MiniBrowser_PRIVATE_DEFINITIONS GDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_22)
Note: See TracChangeset for help on using the changeset viewer.