Title: [159918] releases/WebKitGTK/webkit-2.2/Source/WebKit2
- Revision
- 159918
- Author
- carlo...@webkit.org
- Date
- 2013-12-02 01:20:05 -0800 (Mon, 02 Dec 2013)
Log Message
Merge r159811 - [GTK] Programs/WebKit2APITests/TestWebKitSettings unit test is failing
https://bugs.webkit.org/show_bug.cgi?id=124924
Reviewed by Carlos Garcia Campos.
'Chrome'/'Chromium' substrings were removed from the user agent string in r159572, meaning the unit
test shouldn't check for those two substrings anymore. Instead, 'Safari' (as until now) and 'AppleWebKit'
substrings should be checked for.
* UIProcess/API/gtk/tests/TestWebKitSettings.cpp:
(testWebKitSettingsUserAgent):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.2/Source/WebKit2/ChangeLog (159917 => 159918)
--- releases/WebKitGTK/webkit-2.2/Source/WebKit2/ChangeLog 2013-12-02 09:18:15 UTC (rev 159917)
+++ releases/WebKitGTK/webkit-2.2/Source/WebKit2/ChangeLog 2013-12-02 09:20:05 UTC (rev 159918)
@@ -1,3 +1,17 @@
+2013-11-27 Zan Dobersek <zdober...@igalia.com>
+
+ [GTK] Programs/WebKit2APITests/TestWebKitSettings unit test is failing
+ https://bugs.webkit.org/show_bug.cgi?id=124924
+
+ Reviewed by Carlos Garcia Campos.
+
+ 'Chrome'/'Chromium' substrings were removed from the user agent string in r159572, meaning the unit
+ test shouldn't check for those two substrings anymore. Instead, 'Safari' (as until now) and 'AppleWebKit'
+ substrings should be checked for.
+
+ * UIProcess/API/gtk/tests/TestWebKitSettings.cpp:
+ (testWebKitSettingsUserAgent):
+
2013-11-11 Carlos Garcia Campos <cgar...@igalia.com>
[GTK] Crash when printing via _javascript_ in WebKit2
Modified: releases/WebKitGTK/webkit-2.2/Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitSettings.cpp (159917 => 159918)
--- releases/WebKitGTK/webkit-2.2/Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitSettings.cpp 2013-12-02 09:18:15 UTC (rev 159917)
+++ releases/WebKitGTK/webkit-2.2/Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitSettings.cpp 2013-12-02 09:20:05 UTC (rev 159918)
@@ -293,9 +293,8 @@
CString defaultUserAgent = webkit_settings_get_user_agent(settings.get());
webkit_web_view_set_settings(test->m_webView, settings.get());
+ g_assert(g_strstr_len(defaultUserAgent.data(), -1, "AppleWebKit"));
g_assert(g_strstr_len(defaultUserAgent.data(), -1, "Safari"));
- g_assert(g_strstr_len(defaultUserAgent.data(), -1, "Chromium"));
- g_assert(g_strstr_len(defaultUserAgent.data(), -1, "Chrome"));
webkit_settings_set_user_agent(settings.get(), 0);
g_assert_cmpstr(defaultUserAgent.data(), ==, webkit_settings_get_user_agent(settings.get()));
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
