Commit 9a7cede6 authored by kov@webkit.org's avatar kov@webkit.org

2011-01-31 Gustavo Noronha Silva <gustavo.noronha@collabora.co.uk>

        Reviewed by Xan Lopez.

        [GTK] REGRESSION:  http/tests/media/video-{cookie,referer}.html failing
        https://bugs.webkit.org/show_bug.cgi?id=53379

        Remove left over mentions of HAVE_SOUP_2_29_90, and apply the
        dependency on newer soup to efl as well.

        * Source/cmake/OptionsEfl.cmake:
2011-01-31  Gustavo Noronha Silva  <gustavo.noronha@collabora.co.uk>

        Reviewed by Xan Lopez.

        [GTK] REGRESSION:  http/tests/media/video-{cookie,referer}.html failing
        https://bugs.webkit.org/show_bug.cgi?id=53379

        Unskip tests that pass again.

        * platform/gtk/Skipped:
2011-01-31  Gustavo Noronha Silva  <gustavo.noronha@collabora.co.uk>

        Reviewed by Xan Lopez.

        [GTK] REGRESSION:  http/tests/media/video-{cookie,referer}.html failing
        https://bugs.webkit.org/show_bug.cgi?id=53379

        Remove left over #ifdef's. I thought all of the conditional code
        had been freed from the condition, but I forgot to check DRT.

        * DumpRenderTree/gtk/DumpRenderTree.cpp:
        (resetDefaultsToConsistentValues):
        * DumpRenderTree/gtk/LayoutTestControllerGtk.cpp:
        (LayoutTestController::setAlwaysAcceptCookies):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@77123 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent b7548abb
2011-01-31 Gustavo Noronha Silva <gustavo.noronha@collabora.co.uk>
Reviewed by Xan Lopez.
[GTK] REGRESSION: http/tests/media/video-{cookie,referer}.html failing
https://bugs.webkit.org/show_bug.cgi?id=53379
Remove left over mentions of HAVE_SOUP_2_29_90, and apply the
dependency on newer soup to efl as well.
* Source/cmake/OptionsEfl.cmake:
2011-01-29 Daniel Bates <dbates@rim.com>
Reviewed by Maciej Stachowiak.
......
2011-01-31 Gustavo Noronha Silva <gustavo.noronha@collabora.co.uk>
Reviewed by Xan Lopez.
[GTK] REGRESSION: http/tests/media/video-{cookie,referer}.html failing
https://bugs.webkit.org/show_bug.cgi?id=53379
Unskip tests that pass again.
* platform/gtk/Skipped:
2011-01-31 Yury Semikhatsky <yurys@chromium.org>
Unreviewed. Update Chromium test expectations after r77108
......@@ -5098,7 +5098,3 @@ media/audio-mpeg4-supported.html
# https://bugs.webkit.org/show_bug.cgi?id=53247
media/audio-delete-while-slider-thumb-clicked.html
# https://bugs.webkit.org/show_bug.cgi?id=53379
http/tests/media/video-cookie.html
http/tests/media/video-referer.html
......@@ -114,15 +114,9 @@ IF (NETWORK_BACKEND STREQUAL "soup")
SET(ENABLE_GLIB_SUPPORT 1)
MESSAGE("Forcing Glib support")
ENDIF ()
FIND_PACKAGE(LibSoup2 2.28.2 REQUIRED)
FIND_PACKAGE(LibSoup2 2.33.4 REQUIRED)
SET(WTF_USE_SOUP 1)
ADD_DEFINITIONS(-DWTF_USE_SOUP=1)
IF (LIBSOUP24_VERSION VERSION_LESS 2.29.90)
ELSE (LIBSOUP24_VERSION VERSION_LESS 2.29.90)
SET(HAVE_LIBSOUP_2_29_90 1)
ADD_DEFINITIONS(-DHAVE_LIBSOUP_2_29_90=1)
ENDIF ()
ELSE ()
FIND_PACKAGE(CURL REQUIRED)
SET(WTF_USE_CURL 1)
......
2011-01-31 Gustavo Noronha Silva <gustavo.noronha@collabora.co.uk>
Reviewed by Xan Lopez.
[GTK] REGRESSION: http/tests/media/video-{cookie,referer}.html failing
https://bugs.webkit.org/show_bug.cgi?id=53379
Remove left over #ifdef's. I thought all of the conditional code
had been freed from the condition, but I forgot to check DRT.
* DumpRenderTree/gtk/DumpRenderTree.cpp:
(resetDefaultsToConsistentValues):
* DumpRenderTree/gtk/LayoutTestControllerGtk.cpp:
(LayoutTestController::setAlwaysAcceptCookies):
2011-01-30 Dirk Pranke <dpranke@chromium.org>
Unreviewed, build fix.
......@@ -432,7 +432,6 @@ static void resetDefaultsToConsistentValues()
WebKitWebBackForwardList* list = webkit_web_view_get_back_forward_list(webView);
webkit_web_back_forward_list_clear(list);
#ifdef HAVE_LIBSOUP_2_29_90
SoupSession* session = webkit_get_default_session();
SoupCookieJar* jar = reinterpret_cast<SoupCookieJar*>(soup_session_get_feature(session, SOUP_TYPE_COOKIE_JAR));
......@@ -440,7 +439,6 @@ static void resetDefaultsToConsistentValues()
// HTTP. Should we initialize it earlier, perhaps?
if (jar)
g_object_set(G_OBJECT(jar), SOUP_COOKIE_JAR_ACCEPT_POLICY, SOUP_COOKIE_JAR_ACCEPT_NO_THIRD_PARTY, NULL);
#endif
setlocale(LC_ALL, "");
......
......@@ -230,7 +230,6 @@ void LayoutTestController::setAcceptsEditing(bool acceptsEditing)
void LayoutTestController::setAlwaysAcceptCookies(bool alwaysAcceptCookies)
{
#ifdef HAVE_LIBSOUP_2_29_90
SoupSession* session = webkit_get_default_session();
SoupCookieJar* jar = reinterpret_cast<SoupCookieJar*>(soup_session_get_feature(session, SOUP_TYPE_COOKIE_JAR));
......@@ -251,7 +250,6 @@ void LayoutTestController::setAlwaysAcceptCookies(bool alwaysAcceptCookies)
policy = SOUP_COOKIE_JAR_ACCEPT_NO_THIRD_PARTY;
g_object_set(G_OBJECT(jar), SOUP_COOKIE_JAR_ACCEPT_POLICY, policy, NULL);
#endif
}
void LayoutTestController::setCustomPolicyDelegate(bool setDelegate, bool permissive)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment