Title: [192793] trunk/Tools
- Revision
- 192793
- Author
- carlo...@webkit.org
- Date
- 2015-11-30 03:26:21 -0800 (Mon, 30 Nov 2015)
Log Message
Unreviewed. Fix a crash in GTK+ test /webkit2/WebKitWebView/custom-charset.
It's an assert hit because we are reloading a view loaded with
HTML data which is not supported. Use loadURI instead.
* TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebView.cpp:
(testWebViewCustomCharset):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (192792 => 192793)
--- trunk/Tools/ChangeLog 2015-11-30 09:39:49 UTC (rev 192792)
+++ trunk/Tools/ChangeLog 2015-11-30 11:26:21 UTC (rev 192793)
@@ -1,5 +1,15 @@
2015-11-30 Carlos Garcia Campos <cgar...@igalia.com>
+ Unreviewed. Fix a crash in GTK+ test /webkit2/WebKitWebView/custom-charset.
+
+ It's an assert hit because we are reloading a view loaded with
+ HTML data which is not supported. Use loadURI instead.
+
+ * TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebView.cpp:
+ (testWebViewCustomCharset):
+
+2015-11-30 Carlos Garcia Campos <cgar...@igalia.com>
+
[GLIB] Remove GMainLoopSource and GThreadSafeMainLoopSource
https://bugs.webkit.org/show_bug.cgi?id=151633
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebView.cpp (192792 => 192793)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebView.cpp 2015-11-30 09:39:49 UTC (rev 192792)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebView.cpp 2015-11-30 11:26:21 UTC (rev 192793)
@@ -96,7 +96,8 @@
static void testWebViewCustomCharset(WebViewTest* test, gconstpointer)
{
- test->loadHtml("<html><body>WebKitGTK+ custom encoding test</body></html>", nullptr);
+ test->loadURI(gServer->getURIForPath("/").data());
+ test->waitUntilLoadFinished();
g_assert(!webkit_web_view_get_custom_charset(test->m_webView));
webkit_web_view_set_custom_charset(test->m_webView, "utf8");
// Changing the charset reloads the page, so wait until reloaded.
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
