Changeset 77061 in webkit
- Timestamp:
- Jan 29, 2011 3:39:57 AM (13 years ago)
- Location:
- trunk
- Files:
-
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/ChangeLog
r76979 r77061 1 2011-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 1 13 2011-01-28 Martin Robinson <mrobinson@igalia.com> 2 14 -
trunk/Source/WebCore/ChangeLog
r77060 r77061 1 2011-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 1 21 2011-01-29 Adam Barth <abarth@webkit.org> 2 22 -
trunk/Source/WebCore/platform/network/soup/CookieJarSoup.cpp
r70038 r77061 39 39 40 40 cookieJar = soup_cookie_jar_new(); 41 #ifdef HAVE_LIBSOUP_2_29_9042 41 soup_cookie_jar_set_accept_policy(cookieJar, SOUP_COOKIE_JAR_ACCEPT_NO_THIRD_PARTY); 43 #endif44 42 } 45 43 … … 68 66 GOwnPtr<SoupURI> origin(soup_uri_new(url.string().utf8().data())); 69 67 70 #ifdef HAVE_LIBSOUP_2_29_9071 68 GOwnPtr<SoupURI> firstParty(soup_uri_new(document->firstPartyForCookies().string().utf8().data())); 72 69 … … 75 72 firstParty.get(), 76 73 value.utf8().data()); 77 #else78 soup_cookie_jar_set_cookie(jar,79 origin.get(),80 value.utf8().data());81 #endif82 74 } 83 75 -
trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp
r76555 r77061 148 148 void ResourceHandle::prepareForURL(const KURL &url) 149 149 { 150 #ifdef HAVE_LIBSOUP_2_29_90151 150 GOwnPtr<SoupURI> soupURI(soup_uri_new(url.prettyURL().utf8().data())); 152 151 if (!soupURI) 153 152 return; 154 153 soup_session_prepare_for_uri(ResourceHandle::defaultSession(), soupURI.get()); 155 #endif156 154 } 157 155 … … 207 205 return; 208 206 209 #ifdef HAVE_LIBSOUP_2_29_90210 207 // Update the first party in case the base URL changed with the redirect 211 208 String firstPartyString = request.firstPartyForCookies().string(); … … 214 211 soup_message_set_first_party(d->m_soupMessage.get(), firstParty.get()); 215 212 } 216 #endif217 213 } 218 214 … … 612 608 d->m_gotChunkHandler = g_signal_connect(soupMessage, "got-chunk", G_CALLBACK(gotChunkCallback), handle); 613 609 614 #ifdef HAVE_LIBSOUP_2_29_90615 610 String firstPartyString = request.firstPartyForCookies().string(); 616 611 if (!firstPartyString.isEmpty()) { … … 618 613 soup_message_set_first_party(soupMessage, firstParty.get()); 619 614 } 620 #endif621 615 622 616 FormData* httpBody = d->m_firstRequest.httpBody(); -
trunk/Source/WebCore/platform/network/soup/ResourceRequestSoup.cpp
r70651 r77061 47 47 } 48 48 49 #ifdef HAVE_LIBSOUP_2_29_9050 49 String firstPartyString = firstPartyForCookies().string(); 51 50 if (!firstPartyString.isEmpty()) { … … 53 52 soup_message_set_first_party(soupMessage, firstParty.get()); 54 53 } 55 #endif56 54 57 55 soup_message_set_flags(soupMessage, m_soupFlags); … … 72 70 } 73 71 74 #ifdef HAVE_LIBSOUP_2_29_9075 72 String firstPartyString = firstPartyForCookies().string(); 76 73 if (!firstPartyString.isEmpty()) { … … 78 75 soup_message_set_first_party(soupMessage, firstParty.get()); 79 76 } 80 #endif81 77 82 78 soup_message_set_flags(soupMessage, m_soupFlags); … … 105 101 m_httpBody = FormData::create(soupMessage->request_body->data, soupMessage->request_body->length); 106 102 107 #ifdef HAVE_LIBSOUP_2_29_90108 103 SoupURI* firstParty = soup_message_get_first_party(soupMessage); 109 104 if (firstParty) 110 105 m_firstPartyForCookies = soupURIToKURL(firstParty); 111 #endif112 106 113 107 m_soupFlags = soup_message_get_flags(soupMessage); -
trunk/Source/WebKit/efl/ChangeLog
r76983 r77061 1 2011-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 1 14 2011-01-28 Dan Bernstein <mitz@apple.com> 2 15 -
trunk/Source/WebKit/efl/ewk/ewk_cookies.cpp
r64005 r77061 58 58 return EINA_FALSE; 59 59 60 #ifdef HAVE_LIBSOUP_2_29_9061 60 soup_cookie_jar_set_accept_policy(cookieJar, SOUP_COOKIE_JAR_ACCEPT_NO_THIRD_PARTY); 62 #endif63 61 64 62 SoupSession* session = WebCore::ResourceHandle::defaultSession(); … … 188 186 { 189 187 #ifdef WTF_USE_SOUP 190 #ifdef HAVE_LIBSOUP_2_29_90191 188 SoupCookieJar* cookieJar = WebCore::defaultCookieJar(); 192 189 SoupCookieJarAcceptPolicy policy; … … 207 204 soup_cookie_jar_set_accept_policy(cookieJar, policy); 208 205 #endif 209 #endif210 206 } 211 207 … … 219 215 Ewk_Cookie_Policy ewk_policy = EWK_COOKIE_JAR_ACCEPT_ALWAYS; 220 216 #ifdef WTF_USE_SOUP 221 #ifdef HAVE_LIBSOUP_2_29_90222 217 SoupCookieJar* cookieJar = WebCore::defaultCookieJar(); 223 218 SoupCookieJarAcceptPolicy policy; … … 236 231 } 237 232 #endif 238 #endif239 233 240 234 return ewk_policy; -
trunk/Source/WebKit/gtk/ChangeLog
r76983 r77061 1 2011-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 1 16 2011-01-28 Dan Bernstein <mitz@apple.com> 2 17 -
trunk/Source/WebKit/gtk/GNUmakefile.am
r75908 r77061 350 350 351 351 # GSettings 352 if USE_GSETTINGS353 352 gsettings_SCHEMAS = $(top_builddir)/Source/WebKit/gtk/org.webkitgtk-@WEBKITGTK_API_VERSION@.gschema.xml 354 353 @GSETTINGS_RULES@ 355 endif356 354 357 355 EXTRA_DIST += \ -
trunk/Source/autotools/webkit.m4
r75313 r77061 109 109 dnl check for glib 110 110 # 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]) 111 GLIB_REQUIRED_VERSION=2.27.90 112 AM_PATH_GLIB_2_0($GLIB_REQUIRED_VERSION) 126 113 if test -z "$GLIB_GENMARSHAL" || test -z "$GLIB_MKENUMS"; then 127 114 AC_MSG_ERROR([You need the GLib dev tools in your path]) 128 115 fi 116 GLIB_GSETTINGS 129 117 ]) 130 118 -
trunk/configure.ac
r76979 r77061 248 248 249 249 # minimum base dependencies 250 LIBSOUP_REQUIRED_VERSION=2. 28.2250 LIBSOUP_REQUIRED_VERSION=2.33.4 251 251 CAIRO_REQUIRED_VERSION=1.6 252 252 FONTCONFIG_REQUIRED_VERSION=2.4 … … 271 271 # todo: webcore gtk 272 272 WEBKIT_CHECK_DEPENDENCIES([glib unicode]) 273 274 # Check if we can use GSettings275 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"; then280 AC_DEFINE([HAVE_GSETTINGS], 1, [Whether we can use GSettings])281 GLIB_GSETTINGS282 fi283 273 284 274 GETTEXT_PACKAGE=$PACKAGE-$GTK_API_VERSION … … 825 815 AC_SUBST([LIBSOUP_LIBS]) 826 816 827 # check if we can use libSoup 2.29.90 features828 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"; then833 AC_DEFINE([HAVE_LIBSOUP_2_29_90], 1, [Whether libSoup 2.29.90 features are available])834 fi835 836 817 # check if FreeType/FontConfig are available 837 818 if test "$with_font_backend" = "freetype"; then … … 954 935 AM_CONDITIONAL([USE_FREETYPE], [test "$with_font_backend" = "freetype"]) 955 936 AM_CONDITIONAL([USE_PANGO], [test "$with_font_backend" = "pango"]) 956 957 # GLib/GIO feature conditionals958 AM_CONDITIONAL([USE_GSETTINGS], [test "$have_gsettings" = "yes"])959 937 960 938 # GStreamer feature conditional
Note: See TracChangeset
for help on using the changeset viewer.