<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[159843] trunk/Source/WebKit/gtk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/159843">159843</a></dd>
<dt>Author</dt> <dd>gns@gnome.org</dd>
<dt>Date</dt> <dd>2013-11-28 08:02:34 -0800 (Thu, 28 Nov 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION(<a href="http://trac.webkit.org/projects/webkit/changeset/154658">r154658</a>): 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.noronha@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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitgtkChangeLog">trunk/Source/WebKit/gtk/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitgtkteststestwebviewc">trunk/Source/WebKit/gtk/tests/testwebview.c</a></li>
<li><a href="#trunkSourceWebKitgtkwebkitwebkitwebviewcpp">trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitgtkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/gtk/ChangeLog (159842 => 159843)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2013-11-28 Gustavo Noronha Silva <gustavo.noronha@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.
+
</ins><span class="cx"> 2013-11-18 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed. Update NEWS and Versions.m4 for 2.3.2 release.
</span></span></pre></div>
<a id="trunkSourceWebKitgtkteststestwebviewc"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/gtk/tests/testwebview.c (159842 => 159843)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -687,6 +687,27 @@
</span><span class="cx"> gtk_widget_destroy(window);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+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);
+}
+
</ins><span class="cx"> int main(int argc, char** argv)
</span><span class="cx"> {
</span><span class="cx"> SoupServer* server;
</span><span class="lines">@@ -719,6 +740,7 @@
</span><span class="cx"> g_test_add_data_func("/webkit/webview/fullscreen", GINT_TO_POINTER(FALSE), test_webkit_web_view_fullscreen);
</span><span class="cx"> g_test_add_data_func("/webkit/webview/fullscreen-blocked", GINT_TO_POINTER(TRUE), test_webkit_web_view_fullscreen);
</span><span class="cx"> g_test_add_func("/webkit/webview/file-chooser", test_webkit_web_view_file_chooser);
</span><ins>+ g_test_add_func("/webkit/webview/source-mode", test_webkit_web_view_source_mode);
</ins><span class="cx">
</span><span class="cx"> return g_test_run ();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitgtkwebkitwebkitwebviewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp (159842 => 159843)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -5191,9 +5191,7 @@
</span><span class="cx"> {
</span><span class="cx"> g_return_val_if_fail(WEBKIT_IS_WEB_VIEW(webView), FALSE);
</span><span class="cx">
</span><del>- core(webView)->mainFrame().inViewSourceMode();
-
- return FALSE;
</del><ins>+ return core(webView)->mainFrame().inViewSourceMode();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Internal subresource management
</span></span></pre>
</div>
</div>
</body>
</html>