Changeset 69718 in webkit


Ignore:
Timestamp:
Oct 13, 2010 5:32:37 PM (13 years ago)
Author:
Martin Robinson
Message:

2010-10-13 Sergio Villar Senin <svillar@igalia.com>

Reviewed by Martin Robinson.

[GTK] Add HTTP caching support
https://bugs.webkit.org/show_bug.cgi?id=44261

This patch adds HTTP caching support to libsoup networking backend.
This code will eventually be part of libsoup, but has been temporarily
imported into the WebCore tree for testing purposes. All libsoup code
is located in WebCore/platform/network/soup/cache. The webkit prefix
was added to all the symbols to prevent problems when this lands in
libsoup. Some external API was also added under webkit/ directory and
will be used by library clients to enable HTTP caching.

There are two parts to this imported code, the first one is the code
under WebCore/platform/network/soup/cache/ that contains all the
SoupURILoader code that supports the development of the cache. The
second part is the HTTP cache implementation located in
WebCore/platform/network/soup/cache/webkit/.

  • GNUmakefile.am:
  • platform/network/soup/cache/soup-directory-input-stream.c: Added. (webkit_soup_directory_input_stream_parse_info): (webkit_soup_directory_input_stream_read_next_file): (webkit_soup_directory_input_stream_read): (webkit_soup_directory_input_stream_close): (webkit_soup_directory_input_stream_class_init): (webkit_soup_directory_input_stream_init): (webkit_soup_directory_input_stream_new):
  • platform/network/soup/cache/soup-directory-input-stream.h: Added.
  • platform/network/soup/cache/soup-http-input-stream.c: Added. (webkit_soup_http_input_stream_finalize): (webkit_soup_http_input_stream_class_init): (webkit_soup_http_input_stream_seekable_iface_init): (webkit_soup_http_input_stream_init): (webkit_soup_http_input_stream_queue_message): (webkit_soup_http_input_stream_new): (webkit_soup_http_input_stream_got_headers): (webkit_soup_http_input_stream_got_chunk): (webkit_soup_http_input_stream_finished): (webkit_soup_http_input_stream_cancelled): (webkit_soup_http_input_stream_prepare_for_io): (webkit_soup_http_input_stream_done_io): (set_error_if_http_failed): (read_from_leftover): (webkit_soup_http_input_stream_send_internal): (send_sync_finished): (webkit_soup_http_input_stream_send): (webkit_soup_http_input_stream_read): (webkit_soup_http_input_stream_close): (wrapper_callback): (send_async_thread): (webkit_soup_http_input_stream_send_async_in_thread): (send_async_finished): (webkit_soup_http_input_stream_send_async_internal): (webkit_soup_http_input_stream_send_async): (webkit_soup_http_input_stream_send_finish): (read_async_done): (webkit_soup_http_input_stream_read_async): (webkit_soup_http_input_stream_read_finish): (webkit_soup_http_input_stream_close_async): (webkit_soup_http_input_stream_close_finish): (webkit_soup_http_input_stream_tell): (webkit_soup_http_input_stream_can_seek): (webkit_soup_http_input_stream_seek): (webkit_soup_http_input_stream_can_truncate): (webkit_soup_http_input_stream_truncate): (webkit_soup_http_input_stream_get_message):
  • platform/network/soup/cache/soup-http-input-stream.h: Added.
  • platform/network/soup/cache/soup-request-data.c: Added. (webkit_soup_request_data_init): (webkit_soup_request_data_finalize): (webkit_soup_request_data_check_uri): (uri_decoded_copy): (webkit_soup_request_data_send): (webkit_soup_request_data_get_content_length): (webkit_soup_request_data_get_content_type): (webkit_soup_request_data_class_init):
  • platform/network/soup/cache/soup-request-data.h: Added.
  • platform/network/soup/cache/soup-request-file.c: Added. (webkit_soup_request_file_get_file): (webkit_soup_request_file_init): (webkit_soup_request_file_finalize): (webkit_soup_request_file_check_uri): (webkit_soup_request_file_ftp_main_loop_quit): (webkit_soup_request_file_ensure_file_ftp): (webkit_soup_request_file_ensure_file): (webkit_soup_request_file_send): (webkit_soup_request_file_send_async_thread): (webkit_soup_request_file_send_async): (webkit_soup_request_file_send_finish): (webkit_soup_request_file_get_content_length): (webkit_soup_request_file_get_content_type): (webkit_soup_request_file_class_init):
  • platform/network/soup/cache/soup-request-file.h: Added.
  • platform/network/soup/cache/soup-request-http.c: Added. (webkit_soup_request_http_get_message): (webkit_soup_request_http_init): (webkit_soup_request_http_check_uri): (webkit_soup_request_http_finalize): (webkit_soup_request_http_send): (sent_async): (conditional_get_ready_cb): (send_async_cb): (webkit_soup_request_http_send_async): (webkit_soup_request_http_send_finish): (webkit_soup_request_http_get_content_length): (webkit_soup_request_http_get_content_type): (webkit_soup_request_http_class_init):
  • platform/network/soup/cache/soup-request-http.h: Added.
  • platform/network/soup/cache/soup-request.c: Added. (webkit_soup_request_init): (webkit_soup_request_finalize): (webkit_soup_request_set_property): (webkit_soup_request_get_property): (webkit_soup_request_initable_init): (webkit_soup_request_default_check_uri): (webkit_soup_request_default_send_async): (webkit_soup_request_default_send_finish): (webkit_soup_request_send): (webkit_soup_request_send_async): (webkit_soup_request_send_finish): (webkit_soup_request_class_init): (webkit_soup_request_initable_interface_init): (webkit_soup_request_get_uri): (webkit_soup_request_get_session): (webkit_soup_request_get_content_length): (webkit_soup_request_get_content_type):
  • platform/network/soup/cache/soup-request.h: Added.
  • platform/network/soup/cache/soup-requester.c: Added. (webkit_soup_requester_init): (finalize): (webkit_soup_requester_class_init): (init_request_types): (webkit_soup_requester_new): (webkit_soup_requester_request): (webkit_soup_requester_request_uri): (webkit_soup_scheme_is_valid): (webkit_soup_requester_add_protocol): (webkit_soup_requester_remove_protocol): (webkit_soup_error_quark):
  • platform/network/soup/cache/soup-requester.h: Added.
  • platform/network/soup/cache/webkit/soup-cache-private.h: Added.
  • platform/network/soup/cache/webkit/soup-cache.c: Added. (get_cacheability): (webkit_soup_cache_entry_free): (copy_headers): (update_headers): (webkit_soup_cache_entry_get_current_age): (webkit_soup_cache_entry_is_fresh_enough): (webkit_soup_message_get_cache_key): (webkit_soup_cache_entry_set_freshness): (webkit_soup_cache_entry_new): (webkit_soup_cache_writing_fixture_free): (close_ready_cb): (write_ready_cb): (msg_got_chunk_cb): (msg_got_body_cb): (webkit_soup_cache_entry_delete): (lru_compare_func): (cache_accepts_entries_of_size): (make_room_for_new_entry): (webkit_soup_cache_entry_insert_by_key): (msg_restarted_cb): (append_to_ready_cb): (msg_got_headers_cb): (webkit_soup_cache_send_response): (request_started): (attach): (webkit_soup_cache_session_feature_init): (webkit_soup_cache_init): (webkit_soup_cache_finalize): (webkit_soup_cache_set_property): (webkit_soup_cache_get_property): (webkit_soup_cache_constructed): (webkit_soup_cache_type_get_type): (webkit_soup_cache_class_init): (webkit_soup_cache_new): (webkit_soup_cache_has_response): (webkit_soup_cache_get_cacheability): (force_flush_timeout): (webkit_soup_cache_flush): (remove_cache_item): (webkit_soup_cache_clear): (webkit_soup_cache_generate_conditional_request): (pack_entry): (webkit_soup_cache_dump): (webkit_soup_cache_load): (webkit_soup_cache_set_max_size): (webkit_soup_cache_get_max_size):
  • platform/network/soup/cache/webkit/soup-cache.h: Added.

2010-10-13 Sergio Villar Senin <svillar@igalia.com>

Reviewed by Martin Robinson.

[GTK] Add HTTP caching support
https://bugs.webkit.org/show_bug.cgi?id=44261

Bump the required version of GLib. The serialization/deserialization
code of libsoup caching code uses GVariant, which was added to GLib in
version 2.24.

  • GNUmakefile.am: Add paths for soup HTTP cache code.
  • autotools/webkit.m4: Increase required glib version.

2010-10-13 Sergio Villar Senin <svillar@igalia.com>

Reviewed by Martin Robinson.

[GTK] Add HTTP caching support
https://bugs.webkit.org/show_bug.cgi?id=44261

Add include paths for the new soup HTTP cache code.

  • GNUmakefile.am: Add paths for the new soup HTTP cache code.
Location:
trunk
Files:
19 added
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/ChangeLog

    r69655 r69718  
     12010-10-13  Sergio Villar Senin  <svillar@igalia.com>
     2
     3        Reviewed by Martin Robinson.
     4
     5        [GTK] Add HTTP caching support
     6        https://bugs.webkit.org/show_bug.cgi?id=44261
     7
     8        Bump the required version of GLib. The serialization/deserialization
     9        code of libsoup caching code uses GVariant, which was added to GLib in
     10        version 2.24.
     11
     12        * GNUmakefile.am: Add paths for soup HTTP cache code.
     13        * autotools/webkit.m4: Increase required glib version.
     14
    1152010-10-13  Xan Lopez  <xlopez@igalia.com>
    216
  • trunk/GNUmakefile.am

    r69655 r69718  
    309309
    310310webkitgtk_static_h_api += \
     311        $(srcdir)/WebCore/platform/network/soup/cache/webkit/soup-cache.h \
    311312        $(srcdir)/WebKit/gtk/webkit/webkit.h \
    312313        $(srcdir)/WebKit/gtk/webkit/webkitdefines.h \
    313314        $(srcdir)/WebKit/gtk/webkit/webkitdownload.h \
    314315        $(srcdir)/WebKit/gtk/webkit/webkiterror.h \
     316        $(srcdir)/WebKit/gtk/webkit/webkitgeolocationpolicydecision.h \
    315317        $(srcdir)/WebKit/gtk/webkit/webkithittestresult.h \
    316318        $(srcdir)/WebKit/gtk/webkit/webkitnetworkrequest.h \
    317319        $(srcdir)/WebKit/gtk/webkit/webkitnetworkresponse.h \
     320        $(srcdir)/WebKit/gtk/webkit/webkitsecurityorigin.h \
    318321        $(srcdir)/WebKit/gtk/webkit/webkitsoupauthdialog.h \
    319322        $(srcdir)/WebKit/gtk/webkit/webkitwebbackforwardlist.h \
     323        $(srcdir)/WebKit/gtk/webkit/webkitwebdatabase.h \
    320324        $(srcdir)/WebKit/gtk/webkit/webkitwebdatasource.h \
    321325        $(srcdir)/WebKit/gtk/webkit/webkitwebframe.h \
     
    324328        $(srcdir)/WebKit/gtk/webkit/webkitwebnavigationaction.h \
    325329        $(srcdir)/WebKit/gtk/webkit/webkitwebpolicydecision.h \
    326         $(srcdir)/WebKit/gtk/webkit/webkitgeolocationpolicydecision.h \
    327330        $(srcdir)/WebKit/gtk/webkit/webkitwebresource.h \
    328331        $(srcdir)/WebKit/gtk/webkit/webkitwebsettings.h \
    329332        $(srcdir)/WebKit/gtk/webkit/webkitwebwindowfeatures.h \
    330         $(srcdir)/WebKit/gtk/webkit/webkitwebview.h \
    331         $(srcdir)/WebKit/gtk/webkit/webkitwebdatabase.h \
    332         $(srcdir)/WebKit/gtk/webkit/webkitsecurityorigin.h
     333        $(srcdir)/WebKit/gtk/webkit/webkitwebview.h
    333334
    334335webkitgtk_built_h_api += \
     
    558559        -fno-strict-aliasing \
    559560        -I$(srcdir)/JavaScriptCore/ForwardingHeaders \
     561        -I$(srcdir)/WebCore/platform/network/soup/cache \
    560562        -I$(srcdir)/WebKit/gtk \
    561563        -I$(top_builddir)/WebKit/gtk \
  • trunk/WebCore/ChangeLog

    r69717 r69718  
     12010-10-13  Sergio Villar Senin  <svillar@igalia.com>
     2
     3        Reviewed by Martin Robinson.
     4
     5        [GTK] Add HTTP caching support
     6        https://bugs.webkit.org/show_bug.cgi?id=44261
     7
     8        This patch adds HTTP caching support to libsoup networking backend.
     9        This code will eventually be part of libsoup, but has been temporarily
     10        imported into the WebCore tree for testing purposes. All libsoup code
     11        is located in WebCore/platform/network/soup/cache. The webkit prefix
     12        was added to all the symbols to prevent problems when this lands in
     13        libsoup. Some external API was also added under webkit/ directory and
     14        will be used by library clients to enable HTTP caching.
     15
     16        There are two parts to this imported code, the first one is the code
     17        under WebCore/platform/network/soup/cache/ that contains all the
     18        SoupURILoader code that supports the development of the cache. The
     19        second part is the HTTP cache implementation located in
     20        WebCore/platform/network/soup/cache/webkit/.
     21
     22        * GNUmakefile.am:
     23        * platform/network/soup/cache/soup-directory-input-stream.c: Added.
     24        (webkit_soup_directory_input_stream_parse_info):
     25        (webkit_soup_directory_input_stream_read_next_file):
     26        (webkit_soup_directory_input_stream_read):
     27        (webkit_soup_directory_input_stream_close):
     28        (webkit_soup_directory_input_stream_class_init):
     29        (webkit_soup_directory_input_stream_init):
     30        (webkit_soup_directory_input_stream_new):
     31        * platform/network/soup/cache/soup-directory-input-stream.h: Added.
     32        * platform/network/soup/cache/soup-http-input-stream.c: Added.
     33        (webkit_soup_http_input_stream_finalize):
     34        (webkit_soup_http_input_stream_class_init):
     35        (webkit_soup_http_input_stream_seekable_iface_init):
     36        (webkit_soup_http_input_stream_init):
     37        (webkit_soup_http_input_stream_queue_message):
     38        (webkit_soup_http_input_stream_new):
     39        (webkit_soup_http_input_stream_got_headers):
     40        (webkit_soup_http_input_stream_got_chunk):
     41        (webkit_soup_http_input_stream_finished):
     42        (webkit_soup_http_input_stream_cancelled):
     43        (webkit_soup_http_input_stream_prepare_for_io):
     44        (webkit_soup_http_input_stream_done_io):
     45        (set_error_if_http_failed):
     46        (read_from_leftover):
     47        (webkit_soup_http_input_stream_send_internal):
     48        (send_sync_finished):
     49        (webkit_soup_http_input_stream_send):
     50        (webkit_soup_http_input_stream_read):
     51        (webkit_soup_http_input_stream_close):
     52        (wrapper_callback):
     53        (send_async_thread):
     54        (webkit_soup_http_input_stream_send_async_in_thread):
     55        (send_async_finished):
     56        (webkit_soup_http_input_stream_send_async_internal):
     57        (webkit_soup_http_input_stream_send_async):
     58        (webkit_soup_http_input_stream_send_finish):
     59        (read_async_done):
     60        (webkit_soup_http_input_stream_read_async):
     61        (webkit_soup_http_input_stream_read_finish):
     62        (webkit_soup_http_input_stream_close_async):
     63        (webkit_soup_http_input_stream_close_finish):
     64        (webkit_soup_http_input_stream_tell):
     65        (webkit_soup_http_input_stream_can_seek):
     66        (webkit_soup_http_input_stream_seek):
     67        (webkit_soup_http_input_stream_can_truncate):
     68        (webkit_soup_http_input_stream_truncate):
     69        (webkit_soup_http_input_stream_get_message):
     70        * platform/network/soup/cache/soup-http-input-stream.h: Added.
     71        * platform/network/soup/cache/soup-request-data.c: Added.
     72        (webkit_soup_request_data_init):
     73        (webkit_soup_request_data_finalize):
     74        (webkit_soup_request_data_check_uri):
     75        (uri_decoded_copy):
     76        (webkit_soup_request_data_send):
     77        (webkit_soup_request_data_get_content_length):
     78        (webkit_soup_request_data_get_content_type):
     79        (webkit_soup_request_data_class_init):
     80        * platform/network/soup/cache/soup-request-data.h: Added.
     81        * platform/network/soup/cache/soup-request-file.c: Added.
     82        (webkit_soup_request_file_get_file):
     83        (webkit_soup_request_file_init):
     84        (webkit_soup_request_file_finalize):
     85        (webkit_soup_request_file_check_uri):
     86        (webkit_soup_request_file_ftp_main_loop_quit):
     87        (webkit_soup_request_file_ensure_file_ftp):
     88        (webkit_soup_request_file_ensure_file):
     89        (webkit_soup_request_file_send):
     90        (webkit_soup_request_file_send_async_thread):
     91        (webkit_soup_request_file_send_async):
     92        (webkit_soup_request_file_send_finish):
     93        (webkit_soup_request_file_get_content_length):
     94        (webkit_soup_request_file_get_content_type):
     95        (webkit_soup_request_file_class_init):
     96        * platform/network/soup/cache/soup-request-file.h: Added.
     97        * platform/network/soup/cache/soup-request-http.c: Added.
     98        (webkit_soup_request_http_get_message):
     99        (webkit_soup_request_http_init):
     100        (webkit_soup_request_http_check_uri):
     101        (webkit_soup_request_http_finalize):
     102        (webkit_soup_request_http_send):
     103        (sent_async):
     104        (conditional_get_ready_cb):
     105        (send_async_cb):
     106        (webkit_soup_request_http_send_async):
     107        (webkit_soup_request_http_send_finish):
     108        (webkit_soup_request_http_get_content_length):
     109        (webkit_soup_request_http_get_content_type):
     110        (webkit_soup_request_http_class_init):
     111        * platform/network/soup/cache/soup-request-http.h: Added.
     112        * platform/network/soup/cache/soup-request.c: Added.
     113        (webkit_soup_request_init):
     114        (webkit_soup_request_finalize):
     115        (webkit_soup_request_set_property):
     116        (webkit_soup_request_get_property):
     117        (webkit_soup_request_initable_init):
     118        (webkit_soup_request_default_check_uri):
     119        (webkit_soup_request_default_send_async):
     120        (webkit_soup_request_default_send_finish):
     121        (webkit_soup_request_send):
     122        (webkit_soup_request_send_async):
     123        (webkit_soup_request_send_finish):
     124        (webkit_soup_request_class_init):
     125        (webkit_soup_request_initable_interface_init):
     126        (webkit_soup_request_get_uri):
     127        (webkit_soup_request_get_session):
     128        (webkit_soup_request_get_content_length):
     129        (webkit_soup_request_get_content_type):
     130        * platform/network/soup/cache/soup-request.h: Added.
     131        * platform/network/soup/cache/soup-requester.c: Added.
     132        (webkit_soup_requester_init):
     133        (finalize):
     134        (webkit_soup_requester_class_init):
     135        (init_request_types):
     136        (webkit_soup_requester_new):
     137        (webkit_soup_requester_request):
     138        (webkit_soup_requester_request_uri):
     139        (webkit_soup_scheme_is_valid):
     140        (webkit_soup_requester_add_protocol):
     141        (webkit_soup_requester_remove_protocol):
     142        (webkit_soup_error_quark):
     143        * platform/network/soup/cache/soup-requester.h: Added.
     144        * platform/network/soup/cache/webkit/soup-cache-private.h: Added.
     145        * platform/network/soup/cache/webkit/soup-cache.c: Added.
     146        (get_cacheability):
     147        (webkit_soup_cache_entry_free):
     148        (copy_headers):
     149        (update_headers):
     150        (webkit_soup_cache_entry_get_current_age):
     151        (webkit_soup_cache_entry_is_fresh_enough):
     152        (webkit_soup_message_get_cache_key):
     153        (webkit_soup_cache_entry_set_freshness):
     154        (webkit_soup_cache_entry_new):
     155        (webkit_soup_cache_writing_fixture_free):
     156        (close_ready_cb):
     157        (write_ready_cb):
     158        (msg_got_chunk_cb):
     159        (msg_got_body_cb):
     160        (webkit_soup_cache_entry_delete):
     161        (lru_compare_func):
     162        (cache_accepts_entries_of_size):
     163        (make_room_for_new_entry):
     164        (webkit_soup_cache_entry_insert_by_key):
     165        (msg_restarted_cb):
     166        (append_to_ready_cb):
     167        (msg_got_headers_cb):
     168        (webkit_soup_cache_send_response):
     169        (request_started):
     170        (attach):
     171        (webkit_soup_cache_session_feature_init):
     172        (webkit_soup_cache_init):
     173        (webkit_soup_cache_finalize):
     174        (webkit_soup_cache_set_property):
     175        (webkit_soup_cache_get_property):
     176        (webkit_soup_cache_constructed):
     177        (webkit_soup_cache_type_get_type):
     178        (webkit_soup_cache_class_init):
     179        (webkit_soup_cache_new):
     180        (webkit_soup_cache_has_response):
     181        (webkit_soup_cache_get_cacheability):
     182        (force_flush_timeout):
     183        (webkit_soup_cache_flush):
     184        (remove_cache_item):
     185        (webkit_soup_cache_clear):
     186        (webkit_soup_cache_generate_conditional_request):
     187        (pack_entry):
     188        (webkit_soup_cache_dump):
     189        (webkit_soup_cache_load):
     190        (webkit_soup_cache_set_max_size):
     191        (webkit_soup_cache_get_max_size):
     192        * platform/network/soup/cache/webkit/soup-cache.h: Added.
     193
    11942010-10-13  Gavin Barraclough  <barraclough@apple.com>
    2195
  • trunk/WebCore/GNUmakefile.am

    r69594 r69718  
    7979        -I$(srcdir)/WebCore/platform/graphics/gtk \
    8080        -I$(srcdir)/WebCore/platform/gtk \
    81         -I$(srcdir)/WebCore/platform/network/soup
     81        -I$(srcdir)/WebCore/platform/network/soup \
     82        -I$(srcdir)/WebCore/platform/network/soup/cache \
     83        -I$(srcdir)/WebCore/platform/network/soup/cache/webkit
    8284
    8385webcore_built_nosources += \
     
    35813583        WebCore/platform/network/soup/SocketStreamHandle.h \
    35823584        WebCore/platform/network/soup/SocketStreamHandleSoup.cpp \
     3585        WebCore/platform/network/soup/cache/soup-directory-input-stream.c \
     3586        WebCore/platform/network/soup/cache/soup-directory-input-stream.h \
     3587        WebCore/platform/network/soup/cache/soup-http-input-stream.c \
     3588        WebCore/platform/network/soup/cache/soup-http-input-stream.h \
     3589        WebCore/platform/network/soup/cache/soup-request-data.c \
     3590        WebCore/platform/network/soup/cache/soup-request-data.h \
     3591        WebCore/platform/network/soup/cache/soup-request-file.c \
     3592        WebCore/platform/network/soup/cache/soup-request-file.h \
     3593        WebCore/platform/network/soup/cache/soup-request-http.c \
     3594        WebCore/platform/network/soup/cache/soup-request-http.h \
     3595        WebCore/platform/network/soup/cache/soup-request.c \
     3596        WebCore/platform/network/soup/cache/soup-request.h \
     3597        WebCore/platform/network/soup/cache/soup-requester.c \
     3598        WebCore/platform/network/soup/cache/soup-requester.h \
     3599        WebCore/platform/network/soup/cache/webkit/soup-cache.c \
     3600        WebCore/platform/network/soup/cache/webkit/soup-cache.h \
    35833601        WebCore/plugins/gtk/PluginDataGtk.cpp \
    35843602        WebCore/plugins/gtk/PluginPackageGtk.cpp \
  • trunk/WebKitTools/ChangeLog

    r69714 r69718  
     12010-10-13  Sergio Villar Senin  <svillar@igalia.com>
     2
     3        Reviewed by Martin Robinson.
     4
     5        [GTK] Add HTTP caching support
     6        https://bugs.webkit.org/show_bug.cgi?id=44261
     7
     8        Add include paths for the new soup HTTP cache code.
     9
     10        * GNUmakefile.am: Add paths for the new soup HTTP cache code.
     11
    1122010-10-13  Yi Shen  <yi.4.shen@nokia.com>
    213
  • trunk/WebKitTools/GNUmakefile.am

    r68403 r69718  
    77Programs_GtkLauncher_CPPFLAGS = \
    88        -I$(srcdir)/WebKit/gtk \
     9        -I$(srcdir)/WebCore/platform/network/soup/cache/ \
    910        -I$(top_builddir)/WebKit/gtk \
    1011        -I$(top_builddir)/DerivedSources \
     
    3940        -I$(srcdir)/WebKit/gtk \
    4041        -I$(srcdir)/WebCore/platform/gtk \
     42        -I$(srcdir)/WebCore/platform/network/soup/cache/ \
    4143        -I$(top_builddir)/WebKit/gtk \
    4244        -I$(top_builddir)/DerivedSources \
  • trunk/autotools/webkit.m4

    r57944 r69718  
    109109dnl check for glib
    110110# Version requirements
    111 GLIB_REQUIRED_VERSION=2.21.3
     111GLIB_REQUIRED_VERSION=2.24
    112112GOBJECT_REQUIRED_VERSION=2.0
    113113GTHREAD_REQUIRED_VERSION=2.0
Note: See TracChangeset for help on using the changeset viewer.