Title: [159843] trunk/Source/WebKit/gtk
- Revision
- 159843
- Author
- g...@gnome.org
- Date
- 2013-11-28 08:02:34 -0800 (Thu, 28 Nov 2013)
Log Message
REGRESSION(r154658): webkit_web_view_get_view_source_mode always returns false
https://bugs.webkit.org/show_bug.cgi?id=124954
Patch by Gustavo Noronha Silva <gustavo.noro...@collabora.com> on 2013-11-28
Reviewed by Carlos Garcia Campos.
* tests/testwebview.c: new test to ensure setting and getting source mode work as intended.
* webkit/webkitwebview.cpp:
(webkit_web_view_get_view_source_mode): actually return the value we query from WebCore.
Modified Paths
Diff
Modified: trunk/Source/WebKit/gtk/ChangeLog (159842 => 159843)
--- trunk/Source/WebKit/gtk/ChangeLog 2013-11-28 15:46:53 UTC (rev 159842)
+++ trunk/Source/WebKit/gtk/ChangeLog 2013-11-28 16:02:34 UTC (rev 159843)
@@ -1,3 +1,14 @@
+2013-11-28 Gustavo Noronha Silva <gustavo.noro...@collabora.com>
+
+ REGRESSION(r154658): webkit_web_view_get_view_source_mode always returns false
+ https://bugs.webkit.org/show_bug.cgi?id=124954
+
+ Reviewed by Carlos Garcia Campos.
+
+ * tests/testwebview.c: new test to ensure setting and getting source mode work as intended.
+ * webkit/webkitwebview.cpp:
+ (webkit_web_view_get_view_source_mode): actually return the value we query from WebCore.
+
2013-11-18 Carlos Garcia Campos <cgar...@igalia.com>
Unreviewed. Update NEWS and Versions.m4 for 2.3.2 release.
Modified: trunk/Source/WebKit/gtk/tests/testwebview.c (159842 => 159843)
--- trunk/Source/WebKit/gtk/tests/testwebview.c 2013-11-28 15:46:53 UTC (rev 159842)
+++ trunk/Source/WebKit/gtk/tests/testwebview.c 2013-11-28 16:02:34 UTC (rev 159843)
@@ -687,6 +687,27 @@
gtk_widget_destroy(window);
}
+static void test_webkit_web_view_source_mode()
+{
+ GtkWidget* web_view;
+
+ web_view = webkit_web_view_new();
+
+ webkit_web_view_load_string(WEBKIT_WEB_VIEW(web_view), "<html><body></body></html>", NULL, NULL, NULL);
+
+ g_assert(!webkit_web_view_get_view_source_mode(WEBKIT_WEB_VIEW(web_view)));
+
+ webkit_web_view_set_view_source_mode(WEBKIT_WEB_VIEW(web_view), TRUE);
+
+ g_assert(webkit_web_view_get_view_source_mode(WEBKIT_WEB_VIEW(web_view)));
+
+ webkit_web_view_set_view_source_mode(WEBKIT_WEB_VIEW(web_view), FALSE);
+
+ g_assert(!webkit_web_view_get_view_source_mode(WEBKIT_WEB_VIEW(web_view)));
+
+ gtk_widget_destroy(web_view);
+}
+
int main(int argc, char** argv)
{
SoupServer* server;
@@ -719,6 +740,7 @@
g_test_add_data_func("/webkit/webview/fullscreen", GINT_TO_POINTER(FALSE), test_webkit_web_view_fullscreen);
g_test_add_data_func("/webkit/webview/fullscreen-blocked", GINT_TO_POINTER(TRUE), test_webkit_web_view_fullscreen);
g_test_add_func("/webkit/webview/file-chooser", test_webkit_web_view_file_chooser);
+ g_test_add_func("/webkit/webview/source-mode", test_webkit_web_view_source_mode);
return g_test_run ();
}
Modified: trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp (159842 => 159843)
--- trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp 2013-11-28 15:46:53 UTC (rev 159842)
+++ trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp 2013-11-28 16:02:34 UTC (rev 159843)
@@ -5191,9 +5191,7 @@
{
g_return_val_if_fail(WEBKIT_IS_WEB_VIEW(webView), FALSE);
- core(webView)->mainFrame().inViewSourceMode();
-
- return FALSE;
+ return core(webView)->mainFrame().inViewSourceMode();
}
// Internal subresource management
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
