Changeset 77061 in webkit


Ignore:
Timestamp:
Jan 29, 2011 3:39:57 AM (13 years ago)
Author:
commit-queue@webkit.org
Message:

2011-01-29 Dan Winship <​danw@gnome.org>

Reviewed by Xan Lopez.

[GTK] Require the latest glib and libsoup, and remove conditional
support for older versions
​https://bugs.webkit.org/show_bug.cgi?id=50675

  • autotools/webkit.m4: use AM_PATH_GLIB_2_0 rather than doing basically the same work by hand
  • configure.ac:

2011-01-29 Dan Winship <​danw@gnome.org>

Reviewed by Xan Lopez.

[GTK] Remove HAVE_LIBSOUP_2_29_90 conditionals; we depend on
libsoup 2.33.1 now.
​https://bugs.webkit.org/show_bug.cgi?id=50675

  • platform/network/soup/CookieJarSoup.cpp: (WebCore::defaultCookieJar): (WebCore::setCookies):
  • platform/network/soup/ResourceHandleSoup.cpp: (WebCore::ResourceHandle::prepareForURL): (WebCore::restartedCallback): (WebCore::startHttp):
  • platform/network/soup/ResourceRequestSoup.cpp: (WebCore::ResourceRequest::updateSoupMessage): (WebCore::ResourceRequest::toSoupMessage): (WebCore::ResourceRequest::updateFromSoupMessage):

2011-01-29 Dan Winship <​danw@gnome.org>

Reviewed by Xan Lopez.

[GTK] Remove HAVE_LIBSOUP_2_29_90 conditionals; we depend on
libsoup 2.33.1 now.
​https://bugs.webkit.org/show_bug.cgi?id=50675

  • ewk/ewk_cookies.cpp: (ewk_cookies_file_set): (ewk_cookies_policy_set): (ewk_cookies_policy_get):

2011-01-29 Dan Winship <​danw@gnome.org>

Reviewed by Xan Lopez.

[GTK] Remove HAVE_LIBSOUP_2_29_90 and HAVE_GSETTINGS conditionals;
we depend on glib 2.27.4 and libsoup 2.33.1 now.
​https://bugs.webkit.org/show_bug.cgi?id=50675

  • GNUmakefile.am:
  • WebCoreSupport/InspectorClientGtk.cpp: (WebKit::InspectorClient::storeSetting):
  • webkit/webkitprivate.cpp: (inspectorGSettings):
  • webkit/webkitprivate.h:
Location:
trunk
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r76979 r77061  
     12011-01-29  Dan Winship  <danw@gnome.org>
     2
     3        Reviewed by Xan Lopez.
     4
     5        [GTK] Require the latest glib and libsoup, and remove conditional
     6        support for older versions
     7        https://bugs.webkit.org/show_bug.cgi?id=50675
     8
     9        * autotools/webkit.m4: use AM_PATH_GLIB_2_0 rather than doing
     10        basically the same work by hand
     11        * configure.ac:
     12
    1132011-01-28  Martin Robinson  <mrobinson@igalia.com>
    214

  • trunk/Source/WebCore/ChangeLog

    r77060 r77061  
     12011-01-29  Dan Winship  <danw@gnome.org>
     2
     3        Reviewed by Xan Lopez.
     4
     5        [GTK] Remove HAVE_LIBSOUP_2_29_90 conditionals; we depend on
     6        libsoup 2.33.1 now.
     7        https://bugs.webkit.org/show_bug.cgi?id=50675
     8
     9        * platform/network/soup/CookieJarSoup.cpp:
     10        (WebCore::defaultCookieJar):
     11        (WebCore::setCookies):
     12        * platform/network/soup/ResourceHandleSoup.cpp:
     13        (WebCore::ResourceHandle::prepareForURL):
     14        (WebCore::restartedCallback):
     15        (WebCore::startHttp):
     16        * platform/network/soup/ResourceRequestSoup.cpp:
     17        (WebCore::ResourceRequest::updateSoupMessage):
     18        (WebCore::ResourceRequest::toSoupMessage):
     19        (WebCore::ResourceRequest::updateFromSoupMessage):
     20
    1212011-01-29  Adam Barth  <abarth@webkit.org>
    222

  • trunk/Source/WebCore/platform/network/soup/CookieJarSoup.cpp

    r70038 r77061  
    3939
    4040        cookieJar = soup_cookie_jar_new();
    41 #ifdef HAVE_LIBSOUP_2_29_90
    4241        soup_cookie_jar_set_accept_policy(cookieJar, SOUP_COOKIE_JAR_ACCEPT_NO_THIRD_PARTY);
    43 #endif
    4442    }
    4543
    … …  
    6866    GOwnPtr<SoupURI> origin(soup_uri_new(url.string().utf8().data()));
    6967
    70 #ifdef HAVE_LIBSOUP_2_29_90
    7168    GOwnPtr<SoupURI> firstParty(soup_uri_new(document->firstPartyForCookies().string().utf8().data()));
    7269
    … …  
    7572                                                firstParty.get(),
    7673                                                value.utf8().data());
    77 #else
    78     soup_cookie_jar_set_cookie(jar,
    79                                origin.get(),
    80                                value.utf8().data());
    81 #endif
    8274}
    8375

  • trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp

    r76555 r77061  
    148148void ResourceHandle::prepareForURL(const KURL &url)
    149149{
    150 #ifdef HAVE_LIBSOUP_2_29_90
    151150    GOwnPtr<SoupURI> soupURI(soup_uri_new(url.prettyURL().utf8().data()));
    152151    if (!soupURI)
    153152        return;
    154153    soup_session_prepare_for_uri(ResourceHandle::defaultSession(), soupURI.get());
    155 #endif
    156154}
    157155
    … …  
    207205        return;
    208206
    209 #ifdef HAVE_LIBSOUP_2_29_90
    210207    // Update the first party in case the base URL changed with the redirect
    211208    String firstPartyString = request.firstPartyForCookies().string();
    … …  
    214211        soup_message_set_first_party(d->m_soupMessage.get(), firstParty.get());
    215212    }
    216 #endif
    217213}
    218214
    … …  
    612608    d->m_gotChunkHandler = g_signal_connect(soupMessage, "got-chunk", G_CALLBACK(gotChunkCallback), handle);
    613609
    614 #ifdef HAVE_LIBSOUP_2_29_90
    615610    String firstPartyString = request.firstPartyForCookies().string();
    616611    if (!firstPartyString.isEmpty()) {
    … …  
    618613        soup_message_set_first_party(soupMessage, firstParty.get());
    619614    }
    620 #endif
    621615
    622616    FormData* httpBody = d->m_firstRequest.httpBody();

  • trunk/Source/WebCore/platform/network/soup/ResourceRequestSoup.cpp

    r70651 r77061  
    4747    }
    4848
    49 #ifdef HAVE_LIBSOUP_2_29_90
    5049    String firstPartyString = firstPartyForCookies().string();
    5150    if (!firstPartyString.isEmpty()) {
    … …  
    5352        soup_message_set_first_party(soupMessage, firstParty.get());
    5453    }
    55 #endif
    5654
    5755    soup_message_set_flags(soupMessage, m_soupFlags);
    … …  
    7270    }
    7371
    74 #ifdef HAVE_LIBSOUP_2_29_90
    7572    String firstPartyString = firstPartyForCookies().string();
    7673    if (!firstPartyString.isEmpty()) {
    … …  
    7875        soup_message_set_first_party(soupMessage, firstParty.get());
    7976    }
    80 #endif
    8177
    8278    soup_message_set_flags(soupMessage, m_soupFlags);
    … …  
    105101        m_httpBody = FormData::create(soupMessage->request_body->data, soupMessage->request_body->length);
    106102
    107 #ifdef HAVE_LIBSOUP_2_29_90
    108103    SoupURI* firstParty = soup_message_get_first_party(soupMessage);
    109104    if (firstParty)
    110105        m_firstPartyForCookies = soupURIToKURL(firstParty);
    111 #endif
    112106
    113107    m_soupFlags = soup_message_get_flags(soupMessage);

  • trunk/Source/WebKit/efl/ChangeLog

    r76983 r77061  
     12011-01-29  Dan Winship  <danw@gnome.org>
     2
     3        Reviewed by Xan Lopez.
     4
     5        [GTK] Remove HAVE_LIBSOUP_2_29_90 conditionals; we depend on
     6        libsoup 2.33.1 now.
     7        https://bugs.webkit.org/show_bug.cgi?id=50675
     8
     9        * ewk/ewk_cookies.cpp:
     10        (ewk_cookies_file_set):
     11        (ewk_cookies_policy_set):
     12        (ewk_cookies_policy_get):
     13
    1142011-01-28  Dan Bernstein  <mitz@apple.com>
    215

  • trunk/Source/WebKit/efl/ewk/ewk_cookies.cpp

    r64005 r77061  
    5858        return EINA_FALSE;
    5959
    60 #ifdef HAVE_LIBSOUP_2_29_90
    6160    soup_cookie_jar_set_accept_policy(cookieJar, SOUP_COOKIE_JAR_ACCEPT_NO_THIRD_PARTY);
    62 #endif
    6361
    6462    SoupSession* session = WebCore::ResourceHandle::defaultSession();
    … …  
    188186{
    189187#ifdef WTF_USE_SOUP
    190 #ifdef HAVE_LIBSOUP_2_29_90
    191188    SoupCookieJar* cookieJar = WebCore::defaultCookieJar();
    192189    SoupCookieJarAcceptPolicy policy;
    … …  
    207204    soup_cookie_jar_set_accept_policy(cookieJar, policy);
    208205#endif
    209 #endif
    210206}
    211207
    … …  
    219215    Ewk_Cookie_Policy ewk_policy = EWK_COOKIE_JAR_ACCEPT_ALWAYS;
    220216#ifdef WTF_USE_SOUP
    221 #ifdef HAVE_LIBSOUP_2_29_90
    222217    SoupCookieJar* cookieJar = WebCore::defaultCookieJar();
    223218    SoupCookieJarAcceptPolicy policy;
    … …  
    236231    }
    237232#endif
    238 #endif
    239233
    240234    return ewk_policy;

  • trunk/Source/WebKit/gtk/ChangeLog

    r76983 r77061  
     12011-01-29  Dan Winship  <danw@gnome.org>
     2
     3        Reviewed by Xan Lopez.
     4
     5        [GTK] Remove HAVE_LIBSOUP_2_29_90 and HAVE_GSETTINGS conditionals;
     6        we depend on glib 2.27.4 and libsoup 2.33.1 now.
     7        https://bugs.webkit.org/show_bug.cgi?id=50675
     8
     9        * GNUmakefile.am:
     10        * WebCoreSupport/InspectorClientGtk.cpp:
     11        (WebKit::InspectorClient::storeSetting):
     12        * webkit/webkitprivate.cpp:
     13        (inspectorGSettings):
     14        * webkit/webkitprivate.h:
     15
    1162011-01-28  Dan Bernstein  <mitz@apple.com>
    217

  • trunk/Source/WebKit/gtk/GNUmakefile.am

    r75908 r77061  
    350350
    351351# GSettings
    352 if USE_GSETTINGS
    353352gsettings_SCHEMAS = $(top_builddir)/Source/WebKit/gtk/org.webkitgtk-@WEBKITGTK_API_VERSION@.gschema.xml
    354353@GSETTINGS_RULES@
    355 endif
    356354
    357355EXTRA_DIST += \

  • trunk/Source/autotools/webkit.m4

    r75313 r77061  
    109109dnl check for glib
    110110# Version requirements
    111 GLIB_REQUIRED_VERSION=2.24
    112 GOBJECT_REQUIRED_VERSION=2.0
    113 GTHREAD_REQUIRED_VERSION=2.0
    114 
    115 PKG_CHECK_MODULES([GLIB],
    116                   [glib-2.0 >= $GLIB_REQUIRED_VERSION
    117                   gobject-2.0 >= $GOBJECT_REQUIRED_VERSION
    118                   gthread-2.0 >= $GTHREAD_REQUIRED_VERSION])
    119 AC_SUBST([GLIB_CFLAGS])
    120 AC_SUBST([GLIB_LIBS])
    121 
    122 # GTK+ port only
    123 # Check for glib-genmarshal and glib-mkenums
    124 AC_PATH_PROG([GLIB_GENMARSHAL], [glib-genmarshal])
    125 AC_PATH_PROG([GLIB_MKENUMS],[glib-mkenums])
     111GLIB_REQUIRED_VERSION=2.27.90
     112AM_PATH_GLIB_2_0($GLIB_REQUIRED_VERSION)
    126113if test -z "$GLIB_GENMARSHAL" || test -z "$GLIB_MKENUMS"; then
    127114   AC_MSG_ERROR([You need the GLib dev tools in your path])
    128115fi
     116GLIB_GSETTINGS
    129117])
    130118

  • trunk/configure.ac

    r76979 r77061  
    248248
    249249# minimum base dependencies
    250 LIBSOUP_REQUIRED_VERSION=2.28.2
     250LIBSOUP_REQUIRED_VERSION=2.33.4
    251251CAIRO_REQUIRED_VERSION=1.6
    252252FONTCONFIG_REQUIRED_VERSION=2.4
    … …  
    271271# todo: webcore gtk
    272272WEBKIT_CHECK_DEPENDENCIES([glib unicode])
    273 
    274 # Check if we can use GSettings
    275 PKG_CHECK_MODULES([GSETTINGS],
    276                   [gio-2.0 >= 2.25.0],
    277                   [have_gsettings=yes],
    278                   [have_gsettings=no])
    279 if test "$have_gsettings" = "yes"; then
    280    AC_DEFINE([HAVE_GSETTINGS], 1, [Whether we can use GSettings])
    281    GLIB_GSETTINGS
    282 fi
    283273
    284274GETTEXT_PACKAGE=$PACKAGE-$GTK_API_VERSION
    … …  
    825815AC_SUBST([LIBSOUP_LIBS])
    826816
    827 # check if we can use libSoup 2.29.90 features
    828 PKG_CHECK_MODULES([LIBSOUP_2_29_90],
    829                   [libsoup-2.4 >= 2.29.90],
    830                   [have_libsoup_2_29_90=yes],
    831                   [have_libsoup_2_29_90=no])
    832 if test "$have_libsoup_2_29_90" = "yes"; then
    833    AC_DEFINE([HAVE_LIBSOUP_2_29_90], 1, [Whether libSoup 2.29.90 features are available])
    834 fi
    835 
    836817# check if FreeType/FontConfig are available
    837818if test "$with_font_backend" = "freetype"; then
    … …  
    954935AM_CONDITIONAL([USE_FREETYPE], [test "$with_font_backend" = "freetype"])
    955936AM_CONDITIONAL([USE_PANGO], [test "$with_font_backend" = "pango"])
    956 
    957 # GLib/GIO feature conditionals
    958 AM_CONDITIONAL([USE_GSETTINGS], [test "$have_gsettings" = "yes"])
    959937
    960938# GStreamer feature conditional
Note: See TracChangeset for help on using the changeset viewer.