https://bugs.webkit.org/show_bug.cgi?id=77874
Reviewed by Eric Seidel.
Nobody seems to be maintaining the Curl backend in WebCore, the
EFL port developers all seem to be using the Soup backend and the
port itself has many features which are only implemented for the
latter.
.:
* Source/cmake/OptionsEfl.cmake: Remove network backend selection
checks and unconditionally require Glib and Libsoup, bump the
required LibSoup version to the same one the GTK+ port looks for,
since we share the same network backend.
Source/JavaScriptCore:
* wtf/PlatformEfl.cmake: Always build the gobject-dependent source
files.
Source/WebCore:
No new tests, just some dependency plumbing.
* PlatformEfl.cmake: Build the glib/soup source files
unconditionally.
* platform/efl/FileSystemEfl.cpp: Remove ENABLE(GLIB_SUPPORT) check.
Source/WebKit/efl:
* CMakeListsEfl.txt: Unconditionally build soup-dependent files
and always add the glib/soup include directories and libraries.
* WebCoreSupport/FrameLoaderClientEfl.cpp:
(WebCore::FrameLoaderClientEfl::dispatchDidReceiveResponse):
Remove USE(SOUP) checks.
* ewk/ewk_auth.cpp:
(ewk_auth_show_dialog_callback_set): Ditto.
(ewk_auth_credentials_set): Ditto.
* ewk/ewk_cookies.cpp:
(ewk_cookies_file_set): Ditto.
(ewk_cookies_clear): Ditto.
(ewk_cookies_get_all): Ditto.
(ewk_cookies_cookie_del): Ditto.
(ewk_cookies_cookie_free): Ditto.
(ewk_cookies_policy_set): Ditto.
(ewk_cookies_policy_get): Ditto.
* ewk/ewk_frame.cpp:
(ewk_frame_certificate_status_get): Ditto.
* ewk/ewk_main.cpp:
(_ewk_init_body): Ditto.
* ewk/ewk_network.cpp:
(ewk_network_proxy_uri_set): Ditto.
(ewk_network_proxy_uri_get): Ditto.
(ewk_network_tls_certificate_check_get): Ditto.
(ewk_network_tls_certificate_check_set): Ditto.
(ewk_network_tls_ca_certificates_path_get): Ditto.
(ewk_network_tls_ca_certificates_path_set): Ditto.
(ewk_network_default_soup_session_get): Ditto.
* ewk/ewk_network.h: Update apidox for
ewk_network_default_soup_session_get() now that libsoup is the
only available backend.
Source/WebKit2:
* PlatformEfl.cmake: Unconditionally build the glib/soup source
files and unconditionally add the required include directories and
libraries.
* WebProcess/efl/WebProcessMainEfl.cpp:
(WebKit::WebProcessMainEfl): Remove USE(SOUP) check.
Tools:
* DumpRenderTree/efl/CMakeLists.txt: Always link to glib/libsoup
and always add the required include directories.
* EWebLauncher/CMakeLists.txt: Add the required glib/libsoup
include directories and link to them.
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@107562
268f45cc-cd09-0410-ab3c-
d52691b4dbfc
+2012-02-06 Raphael Kubo da Costa <kubo@profusion.mobi>
+
+ [EFL] Drop support for the Curl network backend.
+ https://bugs.webkit.org/show_bug.cgi?id=77874
+
+ Reviewed by Eric Seidel.
+
+ Nobody seems to be maintaining the Curl backend in WebCore, the
+ EFL port developers all seem to be using the Soup backend and the
+ port itself has many features which are only implemented for the
+ latter.
+
+ * Source/cmake/OptionsEfl.cmake: Remove network backend selection
+ checks and unconditionally require Glib and Libsoup, bump the
+ required LibSoup version to the same one the GTK+ port looks for,
+ since we share the same network backend.
+
2012-02-12 Ryosuke Niwa <rniwa@webkit.org>
Another perf-o-matic build fix.
+2012-02-06 Raphael Kubo da Costa <kubo@profusion.mobi>
+
+ [EFL] Drop support for the Curl network backend.
+ https://bugs.webkit.org/show_bug.cgi?id=77874
+
+ Reviewed by Eric Seidel.
+
+ Nobody seems to be maintaining the Curl backend in WebCore, the
+ EFL port developers all seem to be using the Soup backend and the
+ port itself has many features which are only implemented for the
+ latter.
+
+ * wtf/PlatformEfl.cmake: Always build the gobject-dependent source
+ files.
+
2012-02-13 Patrick Gansterer <paroga@webkit.org>
Unreviewed. Build fix for !ENABLE(JIT) after r107485.
LIST(APPEND WTF_SOURCES
efl/MainThreadEfl.cpp
efl/OwnPtrEfl.cpp
+ gobject/GOwnPtr.cpp
+ gobject/GRefPtr.cpp
OSAllocatorPosix.cpp
ThreadIdentifierDataPthreads.cpp
unicode/icu/CollatorICU.cpp
)
-IF (ENABLE_GLIB_SUPPORT)
- LIST(APPEND WTF_SOURCES
- gobject/GOwnPtr.cpp
- gobject/GRefPtr.cpp
- )
-
- LIST(APPEND WTF_INCLUDE_DIRECTORIES
- ${Glib_INCLUDE_DIRS}
- ${JAVASCRIPTCORE_DIR}/wtf/gobject
- )
-
- LIST(APPEND WTF_LIBRARIES
- ${Glib_LIBRARIES}
- )
-ENDIF ()
-
LIST(APPEND WTF_LIBRARIES
pthread
+ ${Glib_LIBRARIES}
${ICU_LIBRARIES}
${ICU_I18N_LIBRARIES}
${ECORE_LIBRARIES}
${ECORE_INCLUDE_DIRS}
${ECORE_EVAS_INCLUDE_DIRS}
${EVAS_INCLUDE_DIRS}
+ ${Glib_INCLUDE_DIRS}
${ICU_INCLUDE_DIRS}
+ ${JAVASCRIPTCORE_DIR}/wtf/gobject
${JAVASCRIPTCORE_DIR}/wtf/unicode/
)
+2012-02-06 Raphael Kubo da Costa <kubo@profusion.mobi>
+
+ [EFL] Drop support for the Curl network backend.
+ https://bugs.webkit.org/show_bug.cgi?id=77874
+
+ Reviewed by Eric Seidel.
+
+ Nobody seems to be maintaining the Curl backend in WebCore, the
+ EFL port developers all seem to be using the Soup backend and the
+ port itself has many features which are only implemented for the
+ latter.
+
+ No new tests, just some dependency plumbing.
+
+ * PlatformEfl.cmake: Build the glib/soup source files
+ unconditionally.
+ * platform/efl/FileSystemEfl.cpp: Remove ENABLE(GLIB_SUPPORT) check.
+
2012-02-13 Pavel Feldman <pfeldman@google.com>
Web Inspector: wrap settings selector text and adding a rule with undoable actions.
"${WEBCORE_DIR}/page/efl"
"${WEBCORE_DIR}/platform/efl"
"${WEBCORE_DIR}/platform/graphics/efl"
+ "${WEBCORE_DIR}/platform/network/soup"
"${WEBCORE_DIR}/platform/text/efl"
"${WEBCORE_DIR}/plugins/efl"
"${WEBKIT_DIR}/efl/WebCoreSupport"
platform/image-decoders/jpeg/JPEGImageDecoder.cpp
platform/image-decoders/png/PNGImageDecoder.cpp
platform/image-decoders/webp/WEBPImageDecoder.cpp
+ platform/network/soup/CookieJarSoup.cpp
+ platform/network/soup/CredentialStorageSoup.cpp
+ platform/network/soup/GOwnPtrSoup.cpp
+ platform/network/soup/ProxyServerSoup.cpp
+ platform/network/soup/ResourceHandleSoup.cpp
+ platform/network/soup/ResourceRequestSoup.cpp
+ platform/network/soup/ResourceResponseSoup.cpp
+ platform/network/soup/SocketStreamHandleSoup.cpp
+ platform/network/soup/SoupURIUtils.cpp
platform/posix/FileSystemPOSIX.cpp
platform/text/efl/TextBreakIteratorInternalICUEfl.cpp
)
ENDIF ()
ENDIF ()
-IF (WTF_USE_SOUP)
- LIST(APPEND WebCore_INCLUDE_DIRECTORIES
- "${WEBCORE_DIR}/platform/network/soup"
- "${WEBCORE_DIR}/platform/network/soup/cache"
- "${WEBCORE_DIR}/platform/network/soup/cache/webkit"
- )
- LIST(APPEND WebCore_SOURCES
- platform/network/soup/CookieJarSoup.cpp
- platform/network/soup/CredentialStorageSoup.cpp
- platform/network/soup/GOwnPtrSoup.cpp
- platform/network/soup/ProxyServerSoup.cpp
- platform/network/soup/ResourceHandleSoup.cpp
- platform/network/soup/ResourceRequestSoup.cpp
- platform/network/soup/ResourceResponseSoup.cpp
- platform/network/soup/SocketStreamHandleSoup.cpp
- platform/network/soup/SoupURIUtils.cpp
- )
-ENDIF ()
-
-IF (WTF_USE_CURL)
- LIST(APPEND WebCore_INCLUDE_DIRECTORIES
- "${WEBCORE_DIR}/platform/network/curl"
- )
- LIST(APPEND WebCore_SOURCES
- platform/network/curl/CookieJarCurl.cpp
- platform/network/curl/CredentialStorageCurl.cpp
- platform/network/curl/DNSCurl.cpp
- platform/network/curl/FormDataStreamCurl.cpp
- platform/network/curl/ProxyServerCurl.cpp
- platform/network/curl/ResourceHandleCurl.cpp
- platform/network/curl/ResourceHandleManager.cpp
- platform/network/curl/SocketStreamHandleCurl.cpp
- )
-ENDIF ()
-
IF (WTF_USE_ICU_UNICODE)
LIST(APPEND WebCore_SOURCES
editing/SmartReplaceICU.cpp
${LIBXML2_LIBRARIES}
${LIBXSLT_LIBRARIES}
${SQLITE_LIBRARIES}
+ ${Glib_LIBRARIES}
+ ${LIBSOUP24_LIBRARIES}
)
-IF (WTF_USE_SOUP)
- LIST(APPEND WebCore_LIBRARIES
- ${LIBSOUP24_LIBRARIES}
- )
-ENDIF ()
-
-IF (WTF_USE_CURL)
- LIST(APPEND WebCore_LIBRARIES
- ${CURL_LIBRARIES}
- )
-ENDIF ()
-
IF (ENABLE_VIDEO)
LIST(APPEND WebCore_LIBRARIES
${GStreamer-App_LIBRARIES}
${LIBXML2_INCLUDE_DIR}
${LIBXSLT_INCLUDE_DIR}
${SQLITE_INCLUDE_DIR}
+ ${Glib_INCLUDE_DIRS}
+ ${LIBSOUP24_INCLUDE_DIRS}
)
IF (ENABLE_VIDEO)
)
ENDIF ()
-IF (ENABLE_GLIB_SUPPORT)
- LIST(APPEND WebCore_LIBRARIES
- ${Glib_LIBRARIES}
- )
- LIST(APPEND WebCore_INCLUDE_DIRECTORIES
- ${Glib_INCLUDE_DIRS}
- )
-ENDIF ()
-
IF (ENABLE_WEBGL)
LIST(APPEND WebCore_INCLUDE_DIRECTORIES
${OPENGL_INCLUDE_DIR}
)
ENDIF ()
-IF (WTF_USE_SOUP)
- LIST(APPEND WebCore_INCLUDE_DIRECTORIES
- ${LIBSOUP24_INCLUDE_DIRS}
- )
-ENDIF ()
-
-IF (WTF_USE_CURL)
- LIST(APPEND WebCore_INCLUDE_DIRECTORIES
- ${CURL_INCLUDE_DIRS}
- )
-ENDIF ()
-
ADD_DEFINITIONS(-DWTF_USE_CROSS_PLATFORM_CONTEXT_MENUS=1
-DDATA_DIR="${CMAKE_INSTALL_PREFIX}/${DATA_INSTALL_DIR}")
#include <dlfcn.h>
#include <errno.h>
#include <fnmatch.h>
-#if ENABLE(GLIB_SUPPORT)
#include <glib.h> // TODO: remove me after following TODO is solved.
-#endif
#include <limits.h>
#include <stdio.h>
#include <sys/stat.h>
LIST(APPEND WebKit_INCLUDE_DIRECTORIES
"${WEBKIT_DIR}/efl/ewk"
"${WEBKIT_DIR}/efl/WebCoreSupport"
+ "${JAVASCRIPTCORE_DIR}/wtf/gobject"
"${WEBCORE_DIR}/platform/efl"
"${WEBCORE_DIR}/platform/graphics/cairo"
${Cairo_INCLUDE_DIRS}
${LIBXML2_INCLUDE_DIR}
${LIBXSLT_INCLUDE_DIR}
${SQLITE_INCLUDE_DIR}
+ ${Glib_INCLUDE_DIRS}
+ ${LIBSOUP24_INCLUDE_DIRS}
)
IF (ENABLE_SVG)
efl/WebCoreSupport/InspectorClientEfl.cpp
efl/WebCoreSupport/NotificationPresenterClientEfl.cpp
+ efl/ewk/ewk_auth.cpp
+ efl/ewk/ewk_auth_soup.cpp
efl/ewk/ewk_contextmenu.cpp
efl/ewk/ewk_cookies.cpp
efl/ewk/ewk_frame.cpp
efl/ewk/ewk_history.cpp
+ efl/ewk/ewk_js.cpp
efl/ewk/ewk_main.cpp
efl/ewk/ewk_network.cpp
efl/ewk/ewk_security_policy.cpp
efl/ewk/ewk_view_single.cpp
efl/ewk/ewk_view_tiled.cpp
efl/ewk/ewk_window_features.cpp
- efl/ewk/ewk_js.cpp
)
LIST(APPEND WebKit_LIBRARIES
${PNG_LIBRARY}
${JPEG_LIBRARY}
${CMAKE_DL_LIBS}
-)
-
-IF (ENABLE_GLIB_SUPPORT)
- LIST(APPEND WebKit_INCLUDE_DIRECTORIES
- ${Gdk_INCLUDE_DIRS}
- ${Glib_INCLUDE_DIRS}
- ${JAVASCRIPTCORE_DIR}/wtf/gobject
- )
- LIST(APPEND WebKit_LIBRARIES
${Glib_LIBRARIES}
- ${Gdk_LIBRARIES}
- )
-ENDIF ()
-
-IF (WTF_USE_SOUP)
- LIST(APPEND WebKit_INCLUDE_DIRECTORIES ${LIBSOUP24_INCLUDE_DIRS})
- LIST(APPEND WebKit_LIBRARIES ${LIBSOUP24_LIBRARIES})
- LIST(APPEND WebKit_SOURCES
- efl/ewk/ewk_auth.cpp
- efl/ewk/ewk_auth_soup.cpp
- )
-ENDIF ()
-
-IF (WTF_USE_CURL)
- LIST(APPEND WebKit_INCLUDE_DIRECTORIES ${CURL_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS})
- LIST(APPEND WebKit_LIBRARIES ${CURL_LIBRARIES} ${ZLIB_LIBRARIES})
-ENDIF ()
+ ${LIBSOUP24_LIBRARIES}
+)
SET(WebKit_THEME_DEFINITION "")
IF (ENABLE_PROGRESS_TAG)
SET(EWebKit_HEADERS
${CMAKE_CURRENT_SOURCE_DIR}/efl/ewk/EWebKit.h
${CMAKE_CURRENT_SOURCE_DIR}/efl/ewk/ewk_auth.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/efl/ewk/ewk_auth_soup.h
${CMAKE_CURRENT_SOURCE_DIR}/efl/ewk/ewk_contextmenu.h
${CMAKE_CURRENT_SOURCE_DIR}/efl/ewk/ewk_cookies.h
${CMAKE_CURRENT_SOURCE_DIR}/efl/ewk/ewk_frame.h
${CMAKE_CURRENT_SOURCE_DIR}/efl/ewk/ewk_window_features.h
)
-IF (WTF_USE_SOUP)
- LIST(APPEND EWebKit_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/efl/ewk/ewk_auth_soup.h)
-ENDIF ()
-
INSTALL(FILES ${EWebKit_HEADERS}
DESTINATION include/${WebKit_LIBRARY_NAME}-${PROJECT_VERSION_MAJOR})
+2012-02-06 Raphael Kubo da Costa <kubo@profusion.mobi>
+
+ [EFL] Drop support for the Curl network backend.
+ https://bugs.webkit.org/show_bug.cgi?id=77874
+
+ Reviewed by Eric Seidel.
+
+ Nobody seems to be maintaining the Curl backend in WebCore, the
+ EFL port developers all seem to be using the Soup backend and the
+ port itself has many features which are only implemented for the
+ latter.
+
+ * CMakeListsEfl.txt: Unconditionally build soup-dependent files
+ and always add the glib/soup include directories and libraries.
+ * WebCoreSupport/FrameLoaderClientEfl.cpp:
+ (WebCore::FrameLoaderClientEfl::dispatchDidReceiveResponse):
+ Remove USE(SOUP) checks.
+ * ewk/ewk_auth.cpp:
+ (ewk_auth_show_dialog_callback_set): Ditto.
+ (ewk_auth_credentials_set): Ditto.
+ * ewk/ewk_cookies.cpp:
+ (ewk_cookies_file_set): Ditto.
+ (ewk_cookies_clear): Ditto.
+ (ewk_cookies_get_all): Ditto.
+ (ewk_cookies_cookie_del): Ditto.
+ (ewk_cookies_cookie_free): Ditto.
+ (ewk_cookies_policy_set): Ditto.
+ (ewk_cookies_policy_get): Ditto.
+ * ewk/ewk_frame.cpp:
+ (ewk_frame_certificate_status_get): Ditto.
+ * ewk/ewk_main.cpp:
+ (_ewk_init_body): Ditto.
+ * ewk/ewk_network.cpp:
+ (ewk_network_proxy_uri_set): Ditto.
+ (ewk_network_proxy_uri_get): Ditto.
+ (ewk_network_tls_certificate_check_get): Ditto.
+ (ewk_network_tls_certificate_check_set): Ditto.
+ (ewk_network_tls_ca_certificates_path_get): Ditto.
+ (ewk_network_tls_ca_certificates_path_set): Ditto.
+ (ewk_network_default_soup_session_get): Ditto.
+ * ewk/ewk_network.h: Update apidox for
+ ewk_network_default_soup_session_get() now that libsoup is the
+ only available backend.
+
2012-02-09 Gustavo Lima Chaves <glima@profusion.mobi>
[EFL] Introducing functions to set local storage db path and clear
void FrameLoaderClientEfl::dispatchDidReceiveResponse(DocumentLoader* loader, unsigned long, const ResourceResponse& response)
{
-#if USE(SOUP)
// Update our knowledge of request soup flags - some are only set
// after the request is done.
loader->request().setSoupMessageFlags(response.soupMessageFlags());
-#else
- UNUSED_PARAM(loader);
-#endif
m_response = response;
}
#include "config.h"
#include "ewk_auth.h"
-#ifdef WTF_USE_SOUP
#include "ewk_auth_soup.h"
-#endif
void ewk_auth_show_dialog_callback_set(Ewk_Auth_Show_Dialog_Callback callback)
{
-#if USE(SOUP)
ewk_auth_soup_show_dialog_callback_set(callback);
-#endif
}
void ewk_auth_credentials_set(char* username, char* password, void* data)
{
-#if USE(SOUP)
ewk_auth_soup_credentials_set(username, password, data);
-#endif
}
#include "config.h"
#include "ewk_cookies.h"
+#include "CookieJarSoup.h"
#include "ResourceHandle.h"
#include <Eina.h>
#include <eina_safety_checks.h>
-#include <wtf/text/CString.h>
-
-#if USE(SOUP)
-#include "CookieJarSoup.h"
#include <glib.h>
#include <libsoup/soup.h>
-#endif
+#include <wtf/text/CString.h>
Eina_Bool ewk_cookies_file_set(const char* filename)
{
-#if USE(SOUP)
SoupCookieJar* cookieJar = 0;
if (filename)
cookieJar = soup_cookie_jar_text_new(filename, FALSE);
soup_session_add_feature(session, SOUP_SESSION_FEATURE(cookieJar));
return true;
-#else
- return false;
-#endif
}
void ewk_cookies_clear(void)
{
-#if USE(SOUP)
GSList* list;
GSList* p;
SoupCookieJar* cookieJar = WebCore::defaultCookieJar();
soup_cookie_jar_delete_cookie(cookieJar, (SoupCookie*)p->data);
soup_cookies_free(list);
-#endif
}
Eina_List* ewk_cookies_get_all(void)
{
Eina_List* result = 0;
-#if USE(SOUP)
GSList* list;
GSList* p;
SoupCookieJar* cookieJar = WebCore::defaultCookieJar();
}
soup_cookies_free(list);
-#endif
+
return result;
}
void ewk_cookies_cookie_del(Ewk_Cookie* cookie)
{
-#if USE(SOUP)
EINA_SAFETY_ON_NULL_RETURN(cookie);
GSList* list;
GSList* p;
soup_cookie_free(cookie1);
soup_cookies_free(list);
-#endif
}
void ewk_cookies_cookie_free(Ewk_Cookie* cookie)
{
-#if USE(SOUP)
EINA_SAFETY_ON_NULL_RETURN(cookie);
free(cookie->name);
free(cookie->value);
free(cookie->domain);
free(cookie->path);
free(cookie);
-#endif
}
void ewk_cookies_policy_set(Ewk_Cookie_Policy cookiePolicy)
{
-#if USE(SOUP)
SoupCookieJar* cookieJar = WebCore::defaultCookieJar();
SoupCookieJarAcceptPolicy policy;
}
soup_cookie_jar_set_accept_policy(cookieJar, policy);
-#endif
}
Ewk_Cookie_Policy ewk_cookies_policy_get(void)
{
Ewk_Cookie_Policy ewkPolicy = EWK_COOKIE_JAR_ACCEPT_ALWAYS;
-#if USE(SOUP)
SoupCookieJar* cookieJar = WebCore::defaultCookieJar();
SoupCookieJarAcceptPolicy policy;
ewkPolicy = EWK_COOKIE_JAR_ACCEPT_NO_THIRD_PARTY;
break;
}
-#endif
return ewkPolicy;
}
Ewk_Certificate_Status ewk_frame_certificate_status_get(Evas_Object* ewkFrame)
{
-#if USE(SOUP)
EWK_FRAME_SD_GET_OR_RETURN(ewkFrame, smartData, EWK_CERTIFICATE_STATUS_NO_CERTIFICATE);
EINA_SAFETY_ON_NULL_RETURN_VAL(smartData->frame, EWK_CERTIFICATE_STATUS_NO_CERTIFICATE);
return EWK_CERTIFICATE_STATUS_TRUSTED;
return EWK_CERTIFICATE_STATUS_UNTRUSTED;
-#endif
-
- return EWK_CERTIFICATE_STATUS_NO_CERTIFICATE;
}
/**
#include "Logging.h"
#include "PageCache.h"
#include "PageGroup.h"
+#include "ResourceHandle.h"
#include "ScriptController.h"
#include "Settings.h"
#include "StorageTracker.h"
#include "StorageTrackerClientEfl.h"
+#include "ewk_auth_soup.h"
#include "ewk_logging.h"
#include "ewk_network.h"
#include "ewk_private.h"
#include <Edje.h>
#include <Eina.h>
#include <Evas.h>
-#include <stdlib.h>
-#include <sys/stat.h>
-#include <wtf/Threading.h>
-
-#if ENABLE(GLIB_SUPPORT)
#include <glib-object.h>
#include <glib.h>
-#endif
-
-#if USE(SOUP)
-// REMOVE-ME: see todo below
-#include "ResourceHandle.h"
-#include "ewk_auth_soup.h"
#include <libsoup/soup.h>
-#endif
+#include <stdlib.h>
+#include <sys/stat.h>
+#include <wtf/Threading.h>
static int _ewkInitCount = 0;
Eina_Bool _ewk_init_body(void)
{
-#if ENABLE(GLIB_SUPPORT)
g_type_init();
if (!ecore_main_loop_glib_integrate())
WRN("Ecore was not compiled with GLib support, some plugins will not "
"work (ie: Adobe Flash)");
-#endif
WebCore::ScriptController::initializeThreading();
WebCore::initializeLoggingChannelsIfNecessary();
WebCore::StorageTracker::initializeTracker(webkitDirectory.utf8().data(), trackerClient());
- // TODO: this should move to WebCore, already reported to webkit-gtk folks:
-#if USE(SOUP)
- if (1) {
- SoupSession* session = WebCore::ResourceHandle::defaultSession();
- soup_session_add_feature_by_type(session, SOUP_TYPE_CONTENT_SNIFFER);
- soup_session_add_feature_by_type(session, SOUP_TYPE_CONTENT_DECODER);
+ SoupSession* session = WebCore::ResourceHandle::defaultSession();
+ soup_session_add_feature_by_type(session, SOUP_TYPE_CONTENT_SNIFFER);
+ soup_session_add_feature_by_type(session, SOUP_TYPE_CONTENT_DECODER);
- SoupSessionFeature* auth_dialog = static_cast<SoupSessionFeature*>(g_object_new(EWK_TYPE_SOUP_AUTH_DIALOG, 0));
- soup_session_add_feature(session, auth_dialog);
- }
-#endif
+ SoupSessionFeature* auth_dialog = static_cast<SoupSessionFeature*>(g_object_new(EWK_TYPE_SOUP_AUTH_DIALOG, 0));
+ soup_session_add_feature(session, auth_dialog);
return true;
}
#include "ewk_network.h"
#include "NetworkStateNotifier.h"
+#include "ResourceHandle.h"
#include "ewk_logging.h"
#include <Eina.h>
-#include <wtf/text/CString.h>
-
-#if USE(SOUP)
-#include "ResourceHandle.h"
#include <libsoup/soup.h>
-#endif
+#include <wtf/text/CString.h>
void ewk_network_proxy_uri_set(const char* proxy)
{
-#if USE(SOUP)
SoupSession* session = WebCore::ResourceHandle::defaultSession();
if (!proxy) {
g_object_set(session, SOUP_SESSION_PROXY_URI, uri, NULL);
soup_uri_free(uri);
-#elif USE(CURL)
- EINA_SAFETY_ON_TRUE_RETURN(1);
-#endif
}
const char* ewk_network_proxy_uri_get(void)
{
-#if USE(SOUP)
SoupURI* uri;
SoupSession* session = WebCore::ResourceHandle::defaultSession();
g_object_get(session, SOUP_SESSION_PROXY_URI, &uri, NULL);
WTF::String proxy = soup_uri_to_string(uri, false);
return eina_stringshare_add(proxy.utf8().data());
-#elif USE(CURL)
- EINA_SAFETY_ON_TRUE_RETURN_VAL(1, 0);
-#endif
}
void ewk_network_state_notifier_online_set(Eina_Bool online)
{
bool checkCertificates = false;
-#if USE(SOUP)
SoupSession* defaultSession = WebCore::ResourceHandle::defaultSession();
g_object_get(defaultSession, "ssl-strict", &checkCertificates, NULL);
-#endif
return checkCertificates;
}
void ewk_network_tls_certificate_check_set(Eina_Bool checkCertificates)
{
-#if USE(SOUP)
SoupSession* defaultSession = WebCore::ResourceHandle::defaultSession();
g_object_set(defaultSession, "ssl-strict", checkCertificates, NULL);
-#endif
}
const char* ewk_network_tls_ca_certificates_path_get()
{
const char* bundlePath = 0;
-#if USE(SOUP)
SoupSession* defaultSession = WebCore::ResourceHandle::defaultSession();
g_object_get(defaultSession, "ssl-ca-file", &bundlePath, NULL);
-#endif
return bundlePath;
}
void ewk_network_tls_ca_certificates_path_set(const char* bundlePath)
{
-#if USE(SOUP)
SoupSession* defaultSession = WebCore::ResourceHandle::defaultSession();
g_object_set(defaultSession, "ssl-ca-file", bundlePath, NULL);
-#endif
}
SoupSession* ewk_network_default_soup_session_get()
{
-#if USE(SOUP)
return WebCore::ResourceHandle::defaultSession();
-#else
- return 0;
-#endif
}
#define ewk_network_h
#include <Eina.h>
+#include <libsoup/soup-session.h>
#ifdef __cplusplus
extern "C" {
#endif
-typedef struct _SoupSession SoupSession;
-
/**
* Sets the given proxy URI to network backend.
*
/**
* Returns the default @c SoupSession used by all views.
*
- * This function is meaningful only if WebKit has been compiled with the
- * @c Soup network backend.
- *
- * @return The default @c SoupSession in use, or @c NULL if another network
- * backend was used.
+ * @return The default @c SoupSession in use.
*/
EAPI SoupSession *ewk_network_default_soup_session_get(void);
+2012-02-06 Raphael Kubo da Costa <kubo@profusion.mobi>
+
+ [EFL] Drop support for the Curl network backend.
+ https://bugs.webkit.org/show_bug.cgi?id=77874
+
+ Reviewed by Eric Seidel.
+
+ Nobody seems to be maintaining the Curl backend in WebCore, the
+ EFL port developers all seem to be using the Soup backend and the
+ port itself has many features which are only implemented for the
+ latter.
+
+ * PlatformEfl.cmake: Unconditionally build the glib/soup source
+ files and unconditionally add the required include directories and
+ libraries.
+ * WebProcess/efl/WebProcessMainEfl.cpp:
+ (WebKit::WebProcessMainEfl): Remove USE(SOUP) check.
+
2012-02-11 Sheriff Bot <webkit.review.bot@gmail.com>
Unreviewed, rolling out r107435.
UIProcess/Plugins/efl/PluginInfoStoreEfl.cpp
UIProcess/Plugins/efl/PluginProcessProxyEfl.cpp
+ WebProcess/Cookies/soup/WebCookieManagerSoup.cpp
+
WebProcess/Downloads/efl/DownloadEfl.cpp
WebProcess/Downloads/efl/FileDownloaderEfl.cpp
)
LIST(APPEND WebKit2_INCLUDE_DIRECTORIES
+ "${JAVASCRIPTCORE_DIR}/wtf/gobject"
"${WEBCORE_DIR}/platform/efl"
"${WEBCORE_DIR}/platform/graphics/cairo"
+ "${WEBCORE_DIR}/platform/network/soup"
"${WEBKIT2_DIR}/Shared/efl"
"${WEBKIT2_DIR}/UIProcess/API/efl/"
"${WEBKIT2_DIR}/WebProcess/Downloads/efl"
${LIBXML2_INCLUDE_DIR}
${LIBXSLT_INCLUDE_DIRS}
${SQLITE_INCLUDE_DIRS}
+ ${Glib_INCLUDE_DIRS}
+ ${LIBSOUP24_INCLUDE_DIRS}
)
LIST(APPEND WebKit2_LIBRARIES
${PNG_LIBRARY}
${JPEG_LIBRARY}
${CMAKE_DL_LIBS}
+ ${Glib_LIBRARIES}
+ ${LIBSOUP24_LIBRARIES}
)
LIST (APPEND WebProcess_SOURCES
)
SET(ForwardingHeaders_NAME forwarding-headerEfl)
-IF (WTF_USE_SOUP)
- LIST(APPEND WebKit2_INCLUDE_DIRECTORIES
- "${WEBCORE_DIR}/platform/network/soup"
- ${LIBSOUP24_INCLUDE_DIRS}
- )
- LIST(APPEND WebKit2_LIBRARIES ${LIBSOUP24_LIBRARIES})
- LIST(APPEND WebKit2_SOURCES
- WebProcess/Cookies/soup/WebCookieManagerSoup.cpp
- )
-
- ADD_CUSTOM_TARGET(forwarding-headerSoup
- COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl ${WEBKIT2_DIR} ${DERIVED_SOURCES_WEBKIT2_DIR}/include soup
- )
- SET(ForwardingNetworkHeaders_NAME forwarding-headerSoup)
-ENDIF ()
-
-IF (WTF_USE_CURL)
- LIST(APPEND WebKit2_INCLUDE_DIRECTORIES
- "${WEBCORE_DIR}/platform/network/curl"
- ${CURL_INCLUDE_DIRS}
- )
- LIST(APPEND WebKit2_LIBRARIES ${CURL_LIBRARIES})
- LIST(APPEND WebKit2_SOURCES
- WebProcess/Cookies/curl/WebCookieManagerCurl.cpp
- )
-ENDIF ()
-
-IF (ENABLE_GLIB_SUPPORT)
- LIST(APPEND WebKit2_INCLUDE_DIRECTORIES
- ${Glib_INCLUDE_DIRS}
- ${JAVASCRIPTCORE_DIR}/wtf/gobject
- )
- LIST(APPEND WebKit2_LIBRARIES
- ${Glib_LIBRARIES}
- )
-ENDIF ()
+ADD_CUSTOM_TARGET(forwarding-headerSoup
+ COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl ${WEBKIT2_DIR} ${DERIVED_SOURCES_WEBKIT2_DIR}/include soup
+)
+SET(ForwardingNetworkHeaders_NAME forwarding-headerSoup)
RunLoop::initializeMainRunLoop();
-#if USE(SOUP)
SoupSession* session = WebCore::ResourceHandle::defaultSession();
const char* httpProxy = g_getenv("http_proxy");
if (httpProxy) {
soup_session_add_feature_by_type(session, SOUP_TYPE_CONTENT_SNIFFER);
soup_session_add_feature_by_type(session, SOUP_TYPE_CONTENT_DECODER);
-#endif
int socket = atoi(argv[1]);
WebProcess::shared().initialize(socket, RunLoop::main());
SET(WTF_PLATFORM_EFL 1)
# -----------------------------------------------------------------------------
-# Determine which network backend will be used
-# -----------------------------------------------------------------------------
-SET(ALL_NETWORK_BACKENDS soup curl)
-SET(NETWORK_BACKEND "soup" CACHE STRING "choose which network backend to use (one of ${ALL_NETWORK_BACKENDS})")
-
-# -----------------------------------------------------------------------------
# Determine which font backend will be used
# -----------------------------------------------------------------------------
SET(ALL_FONT_BACKENDS freetype pango)
FIND_PACKAGE(JPEG REQUIRED)
FIND_PACKAGE(PNG REQUIRED)
+FIND_PACKAGE(Glib REQUIRED)
+FIND_PACKAGE(Gthread REQUIRED)
+FIND_PACKAGE(LibSoup2 2.37.2.1 REQUIRED)
+SET(ENABLE_GLIB_SUPPORT ON)
+
+SET(WTF_USE_SOUP 1)
+ADD_DEFINITIONS(-DWTF_USE_SOUP=1)
+
ADD_DEFINITIONS(-DENABLE_CONTEXT_MENUS=0)
SET(WTF_USE_PTHREADS 1)
WEBKIT_FEATURE(ENABLE_FTPDIR "Enable FTP directory support" DEFAULT ON)
WEBKIT_FEATURE(ENABLE_FULLSCREEN_API "Enable Fullscreen API support" DEFAULT OFF)
WEBKIT_FEATURE(ENABLE_GEOLOCATION "Enable geolocation" DEFAULT OFF)
-WEBKIT_FEATURE(ENABLE_GLIB_SUPPORT "Enable Glib support" DEFAULT ON)
WEBKIT_FEATURE(ENABLE_ICONDATABASE "Enable icon database" DEFAULT ON)
WEBKIT_FEATURE(ENABLE_INSPECTOR "Enable inspector" DEFAULT ON)
WEBKIT_FEATURE(ENABLE_JAVASCRIPT_DEBUGGER "Enable JavaScript debugger" DEFAULT ON)
ENDIF ()
ENDIF ()
-IF (NETWORK_BACKEND STREQUAL "soup")
- IF (NOT ENABLE_GLIB_SUPPORT)
- SET(ENABLE_GLIB_SUPPORT 1)
- MESSAGE("Forcing Glib support")
- ENDIF ()
- FIND_PACKAGE(LibSoup2 2.33.4 REQUIRED)
- SET(WTF_USE_SOUP 1)
- ADD_DEFINITIONS(-DWTF_USE_SOUP=1)
-ELSE ()
- FIND_PACKAGE(CURL REQUIRED)
- FIND_PACKAGE(ZLIB REQUIRED)
- SET(WTF_USE_CURL 1)
- ADD_DEFINITIONS(-DWTF_USE_CURL=1)
-ENDIF ()
-
IF (FONT_BACKEND STREQUAL "freetype")
FIND_PACKAGE(Freetype REQUIRED)
FIND_PACKAGE(ZLIB REQUIRED)
FIND_PACKAGE(Pango REQUIRED)
SET(WTF_USE_PANGO 1)
ADD_DEFINITIONS(-DWTF_USE_PANGO=1)
-
- IF (NOT ENABLE_GLIB_SUPPORT)
- SET(ENABLE_GLIB_SUPPORT 1)
- MESSAGE("Forcing Glib support")
- ENDIF ()
ENDIF ()
IF (NOT ENABLE_SVG)
ENDIF ()
IF (ENABLE_VIDEO)
- SET(ENABLE_GLIB_SUPPORT 1)
- MESSAGE("Forcing Glib support")
-
FIND_PACKAGE(GStreamer REQUIRED)
FIND_PACKAGE(GStreamer-App REQUIRED)
FIND_PACKAGE(GStreamer-Base REQUIRED)
ADD_DEFINITIONS(-DWTF_USE_GSTREAMER=1)
ENDIF()
-IF (ENABLE_GLIB_SUPPORT)
- FIND_PACKAGE(Glib REQUIRED)
- FIND_PACKAGE(Gthread REQUIRED)
-ENDIF ()
-
IF (ENABLE_WEBGL)
FIND_PACKAGE(OpenGL REQUIRED)
ENDIF ()
+2012-02-06 Raphael Kubo da Costa <kubo@profusion.mobi>
+
+ [EFL] Drop support for the Curl network backend.
+ https://bugs.webkit.org/show_bug.cgi?id=77874
+
+ Reviewed by Eric Seidel.
+
+ Nobody seems to be maintaining the Curl backend in WebCore, the
+ EFL port developers all seem to be using the Soup backend and the
+ port itself has many features which are only implemented for the
+ latter.
+
+ * DumpRenderTree/efl/CMakeLists.txt: Always link to glib/libsoup
+ and always add the required include directories.
+ * EWebLauncher/CMakeLists.txt: Add the required glib/libsoup
+ include directories and link to them.
+
2012-02-13 Kenichi Ishibashi <bashi@chromium.org>
[WebSocket] Update pywebsocket to 0.7.1
${LIBXML2_LIBRARIES}
${LIBXSLT_LIBRARIES}
${SQLITE_LIBRARIES}
+ ${Glib_LIBRARIES}
+ ${LIBSOUP24_LIBRARIES}
)
-SET(DumpRenderTree_LIBRARIES ${DumpRenderTree_LIBRARIES})
SET(DumpRenderTree_INCLUDE_DIRECTORIES
"${WEBKIT_DIR}/efl/ewk"
${WEBKIT_DIR}/efl
${WEBCORE_DIR}/platform/graphics
${WEBCORE_DIR}/platform/graphics/cairo
${WEBCORE_DIR}/platform/network
+ ${WEBCORE_DIR}/platform/network/soup
${WEBCORE_DIR}/plugins
${WEBCORE_DIR}/rendering
${WEBCORE_DIR}/rendering/style
${JAVASCRIPTCORE_DIR}/runtime
${JAVASCRIPTCORE_DIR}/ForwardingHeaders
${JAVASCRIPTCORE_DIR}/wtf
+ ${JAVASCRIPTCORE_DIR}/wtf/gobject
${JAVASCRIPTCORE_DIR}/wtf/efl
${TOOLS_DIR}/DumpRenderTree
${TOOLS_DIR}/DumpRenderTree/cairo
${EDJE_INCLUDE_DIRS}
${EFLDEPS_INCLUDE_DIRS}
${EVAS_INCLUDE_DIRS}
+ ${Glib_INCLUDE_DIRS}
+ ${LIBSOUP24_INCLUDE_DIRS}
)
SET(DumpRenderTree_LINK_FLAGS
${EDJE_LDFLAGS}
${EFLDEPS_LDFLAGS}
${EVAS_LDFLAGS}
+ ${LIBSOUP24_LDFLAGS}
)
-IF (ENABLE_GLIB_SUPPORT)
- LIST(APPEND DumpRenderTree_INCLUDE_DIRECTORIES "${JAVASCRIPTCORE_DIR}/wtf/gobject")
-
- LIST(APPEND DumpRenderTree_LIBRARIES
- ${Gdk_LIBRARIES}
- ${Glib_LIBRARIES}
- ${Gthread_LIBRARIES}
- )
-ENDIF ()
-
-IF (WTF_USE_SOUP)
- LIST(APPEND DumpRenderTree_LIBRARIES ${LIBSOUP24_LIBRARIES})
- LIST(APPEND DumpRenderTree_LINK_FLAGS ${LIBSOUP24_LDFLAGS})
- LIST(APPEND DumpRenderTree_INCLUDE_DIRECTORIES ${LIBSOUP24_INCLUDE_DIRS} ${WEBCORE_DIR}/platform/network/soup)
-ENDIF ()
-
-IF (WTF_USE_CURL)
- LIST(APPEND DumpRenderTree_LIBRARIES ${CURL_LIBRARIES})
- LIST(APPEND DumpRenderTree_LINK_FLAGS ${CURL_LDFLAGS})
- LIST(APPEND DumpRenderTree_INCLUDE_DIRECTORIES ${WEBCORE_DIR}/platform/network/curl)
-ENDIF ()
-
ADD_DEFINITIONS(-DFONTS_CONF_DIR="${TOOLS_DIR}/DumpRenderTree/gtk/fonts"
-DDATA_DIR="${THEME_BINARY_DIR}")
${LIBXML2_LIBRARIES}
${LIBXSLT_LIBRARIES}
${SQLITE_LIBRARIES}
+ ${Glib_LIBRARIES}
+ ${LIBSOUP24_LIBRARIES}
)
SET(EWebLauncher_INCLUDE_DIRECTORIES
${EDJE_INCLUDE_DIRS}
${EFLDEPS_INCLUDE_DIRS}
${EVAS_INCLUDE_DIRS}
+ ${Glib_INCLUDE_DIRS}
+ ${LIBSOUP24_INCLUDE_DIRS}
)
SET(EWebLauncher_LINK_FLAGS
${EDJE_LDFLAGS}
${EFLDEPS_LDFLAGS}
${EVAS_LDFLAGS}
+ ${LIBSOUP24_LDFLAGS}
)
-IF (ENABLE_GLIB_SUPPORT)
- LIST(APPEND EWebLauncher_LIBRARIES
- ${Gdk_LIBRARIES}
- ${Glib_LIBRARIES}
- ${Gthread_LIBRARIES}
- )
-ENDIF ()
-
-IF (WTF_USE_SOUP)
- LIST(APPEND EWebLauncher_LIBRARIES ${LIBSOUP24_LIBRARIES})
- LIST(APPEND EWebLauncher_LINK_FLAGS ${LIBSOUP24_LDFLAGS})
-ENDIF ()
-
-IF (WTF_USE_CURL)
- LIST(APPEND EWebLauncher_LIBRARIES ${CURL_LIBRARIES})
- LIST(APPEND EWebLauncher_LINK_FLAGS ${CURL_LDFLAGS})
-ENDIF ()
-
ADD_DEFINITIONS(-DDATA_DIR=\"${THEME_BINARY_DIR}\")
INCLUDE_DIRECTORIES(${EWebLauncher_INCLUDE_DIRECTORIES})
git://git.webkit.org / WebKit-https.git / commitdiff