[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198
kov at webkit.org
kov at webkit.org
Mon Feb 21 00:25:53 UTC 2011
The following commit has been merged in the webkit-1.3 branch:
commit 9a7cede655bbdcd1259eedd5655fe271169e525b
Author: kov at webkit.org <kov at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Jan 31 13:59:15 2011 +0000
2011-01-31 Gustavo Noronha Silva <gustavo.noronha at 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 at 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 at 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
diff --git a/ChangeLog b/ChangeLog
index ff40fe6..f5654da 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2011-01-31 Gustavo Noronha Silva <gustavo.noronha at 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 at rim.com>
Reviewed by Maciej Stachowiak.
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 8968839..f8ceec7 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2011-01-31 Gustavo Noronha Silva <gustavo.noronha at 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 at chromium.org>
Unreviewed. Update Chromium test expectations after r77108
diff --git a/LayoutTests/platform/gtk/Skipped b/LayoutTests/platform/gtk/Skipped
index 1bbe3e1..92acbbb 100644
--- a/LayoutTests/platform/gtk/Skipped
+++ b/LayoutTests/platform/gtk/Skipped
@@ -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
diff --git a/Source/cmake/OptionsEfl.cmake b/Source/cmake/OptionsEfl.cmake
index b34ec3b..da9fe6c 100644
--- a/Source/cmake/OptionsEfl.cmake
+++ b/Source/cmake/OptionsEfl.cmake
@@ -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)
diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index b6fe5e9..becfeda 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,18 @@
+2011-01-31 Gustavo Noronha Silva <gustavo.noronha at 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 at chromium.org>
Unreviewed, build fix.
diff --git a/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp b/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp
index ff90d81..7b77464 100644
--- a/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp
+++ b/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp
@@ -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, "");
diff --git a/Tools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp b/Tools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp
index 1527811..b63c268 100644
--- a/Tools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp
+++ b/Tools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp
@@ -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)
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list