<!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>[164634] trunk</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/164634">164634</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2014-02-24 23:51:14 -0800 (Mon, 24 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] Mark view source mode methods as deprecated
https://bugs.webkit.org/show_bug.cgi?id=128920
Reviewed by Martin Robinson.
Source/WebKit/gtk:
* webkit/webkitwebview.cpp: Mark set/get_view_source_mode as
deprecated in the documentation.
* webkit/webkitwebview.h: Add deprecation guards.
Source/WebKit2:
Mark WEBKIT_VIEW_MODE_SOURCE as deprecated in documentation and
only show warnings when set_view_mode is used with WEBKIT_VIEW_MODE_SOURCE.
* UIProcess/API/gtk/WebKitWebView.cpp:
(webkit_web_view_set_view_mode):
(webkit_web_view_get_view_mode):
* UIProcess/API/gtk/WebKitWebView.h:
Tools:
* TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebView.cpp:
(beforeAll): Remove view mode test.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitgtkChangeLog">trunk/Source/WebKit/gtk/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitgtkwebkitwebkitwebviewcpp">trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp</a></li>
<li><a href="#trunkSourceWebKitgtkwebkitwebkitwebviewh">trunk/Source/WebKit/gtk/webkit/webkitwebview.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitWebViewcpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitWebViewh">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2GtkTestWebKitWebViewcpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebView.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 (164633 => 164634)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/gtk/ChangeLog 2014-02-25 07:49:46 UTC (rev 164633)
+++ trunk/Source/WebKit/gtk/ChangeLog 2014-02-25 07:51:14 UTC (rev 164634)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-02-24 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GTK] Mark view source mode methods as deprecated
+ https://bugs.webkit.org/show_bug.cgi?id=128920
+
+ Reviewed by Martin Robinson.
+
+ * webkit/webkitwebview.cpp: Mark set/get_view_source_mode as
+ deprecated in the documentation.
+ * webkit/webkitwebview.h: Add deprecation guards.
+
</ins><span class="cx"> 2014-02-24 Martin Robinson <mrobinson@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] generate-gtkdoc should not generate documentation for source files for unbuilt source files
</span></span></pre></div>
<a id="trunkSourceWebKitgtkwebkitwebkitwebviewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp (164633 => 164634)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp 2014-02-25 07:49:46 UTC (rev 164633)
+++ trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp 2014-02-25 07:51:14 UTC (rev 164634)
</span><span class="lines">@@ -5233,6 +5233,7 @@
</span><span class="cx"> * nice and readable format.
</span><span class="cx"> *
</span><span class="cx"> * Since: 1.1.14
</span><ins>+ * Deprecated: 2.6
</ins><span class="cx"> */
</span><span class="cx"> void webkit_web_view_set_view_source_mode (WebKitWebView* webView, gboolean mode)
</span><span class="cx"> {
</span><span class="lines">@@ -5248,6 +5249,7 @@
</span><span class="cx"> * Return value: %TRUE if @web_view is in view source mode, %FALSE otherwise.
</span><span class="cx"> *
</span><span class="cx"> * Since: 1.1.14
</span><ins>+ * Deprecated: 2.6
</ins><span class="cx"> */
</span><span class="cx"> gboolean webkit_web_view_get_view_source_mode (WebKitWebView* webView)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKitgtkwebkitwebkitwebviewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/gtk/webkit/webkitwebview.h (164633 => 164634)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/gtk/webkit/webkitwebview.h 2014-02-25 07:49:46 UTC (rev 164633)
+++ trunk/Source/WebKit/gtk/webkit/webkitwebview.h 2014-02-25 07:51:14 UTC (rev 164634)
</span><span class="lines">@@ -415,12 +415,14 @@
</span><span class="cx"> WEBKIT_API gboolean
</span><span class="cx"> webkit_web_view_can_redo (WebKitWebView *web_view);
</span><span class="cx">
</span><ins>+#if !defined(WEBKIT_DISABLE_DEPRECATED)
</ins><span class="cx"> WEBKIT_API void
</span><span class="cx"> webkit_web_view_set_view_source_mode (WebKitWebView *web_view,
</span><span class="cx"> gboolean view_source_mode);
</span><span class="cx">
</span><span class="cx"> WEBKIT_API gboolean
</span><span class="cx"> webkit_web_view_get_view_source_mode (WebKitWebView *web_view);
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> WEBKIT_API WebKitHitTestResult*
</span><span class="cx"> webkit_web_view_get_hit_test_result (WebKitWebView *web_view,
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (164633 => 164634)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-02-25 07:49:46 UTC (rev 164633)
+++ trunk/Source/WebKit2/ChangeLog 2014-02-25 07:51:14 UTC (rev 164634)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-02-24 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GTK] Mark view source mode methods as deprecated
+ https://bugs.webkit.org/show_bug.cgi?id=128920
+
+ Reviewed by Martin Robinson.
+
+ Mark WEBKIT_VIEW_MODE_SOURCE as deprecated in documentation and
+ only show warnings when set_view_mode is used with WEBKIT_VIEW_MODE_SOURCE.
+
+ * UIProcess/API/gtk/WebKitWebView.cpp:
+ (webkit_web_view_set_view_mode):
+ (webkit_web_view_get_view_mode):
+ * UIProcess/API/gtk/WebKitWebView.h:
+
</ins><span class="cx"> 2014-02-24 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> [Mac] Stop looking for plug-in profiles in /S/L/Sandbox/Profiles
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitWebViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp (164633 => 164634)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2014-02-25 07:49:46 UTC (rev 164633)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2014-02-25 07:51:14 UTC (rev 164634)
</span><span class="lines">@@ -3035,7 +3035,8 @@
</span><span class="cx"> {
</span><span class="cx"> g_return_if_fail(WEBKIT_IS_WEB_VIEW(webView));
</span><span class="cx">
</span><del>- g_warning("webkit_web_view_set_view_mode has been deprecated and is a no-op.");
</del><ins>+ if (viewMode == WEBKIT_VIEW_MODE_SOURCE)
+ g_warning("WEBKIT_VIEW_MODE_SOURCE has been deprecated and is no longer supported.");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -3050,7 +3051,6 @@
</span><span class="cx"> {
</span><span class="cx"> g_return_val_if_fail(WEBKIT_IS_WEB_VIEW(webView), WEBKIT_VIEW_MODE_WEB);
</span><span class="cx">
</span><del>- g_warning("webkit_web_view_get_view_mode has been deprecated and always returns WEBKIT_VIEW_MODE_WEB.");
</del><span class="cx"> return WEBKIT_VIEW_MODE_WEB;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitWebViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h (164633 => 164634)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h 2014-02-25 07:49:46 UTC (rev 164633)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h 2014-02-25 07:51:14 UTC (rev 164634)
</span><span class="lines">@@ -152,7 +152,7 @@
</span><span class="cx"> /**
</span><span class="cx"> * WebKitViewMode:
</span><span class="cx"> * @WEBKIT_VIEW_MODE_WEB: The normal view mode to display web contents.
</span><del>- * @WEBKIT_VIEW_MODE_SOURCE: The source mode to display web source code.
</del><ins>+ * @WEBKIT_VIEW_MODE_SOURCE: The source mode to display web source code. Deprecated: 2.6.
</ins><span class="cx"> *
</span><span class="cx"> * Enum values to specify the different ways in which a #WebKitWebView
</span><span class="cx"> * can display a web page.
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (164633 => 164634)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-02-25 07:49:46 UTC (rev 164633)
+++ trunk/Tools/ChangeLog 2014-02-25 07:51:14 UTC (rev 164634)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-02-24 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GTK] Mark view source mode methods as deprecated
+ https://bugs.webkit.org/show_bug.cgi?id=128920
+
+ Reviewed by Martin Robinson.
+
+ * TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebView.cpp:
+ (beforeAll): Remove view mode test.
+
</ins><span class="cx"> 2014-02-24 Martin Robinson <mrobinson@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] generate-gtkdoc should not generate documentation for source files for unbuilt source files
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2GtkTestWebKitWebViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebView.cpp (164633 => 164634)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebView.cpp 2014-02-25 07:49:46 UTC (rev 164633)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebView.cpp 2014-02-25 07:51:14 UTC (rev 164634)
</span><span class="lines">@@ -418,27 +418,6 @@
</span><span class="cx"> g_assert_cmpint(g_file_info_get_size(fileInfo.get()), ==, totalBytesFromStream);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void testWebViewMode(WebViewTest* test, gconstpointer)
-{
- static const char* indexHTML = "<html><body><p>Test Web View Mode</p></body></html>";
-
- // Web mode.
- g_assert_cmpuint(webkit_web_view_get_view_mode(test->m_webView), ==, WEBKIT_VIEW_MODE_WEB);
- test->loadHtml(indexHTML, 0);
- test->waitUntilLoadFinished();
- WebKitJavascriptResult* javascriptResult = test->runJavaScriptAndWaitUntilFinished("window.document.body.textContent;", 0);
- GUniquePtr<char> valueString(WebViewTest::javascriptResultToCString(javascriptResult));
- g_assert_cmpstr(valueString.get(), ==, "Test Web View Mode");
-
- // Source mode.
- webkit_web_view_set_view_mode(test->m_webView, WEBKIT_VIEW_MODE_SOURCE);
- test->loadHtml(indexHTML, 0);
- test->waitUntilLoadFinished();
- javascriptResult = test->runJavaScriptAndWaitUntilFinished("window.document.body.textContent;", 0);
- valueString.reset(WebViewTest::javascriptResultToCString(javascriptResult));
- g_assert_cmpstr(valueString.get(), ==, indexHTML);
-}
-
</del><span class="cx"> // To test page visibility API. Currently only 'visible' and 'hidden' states are implemented fully in WebCore.
</span><span class="cx"> // See also http://www.w3.org/TR/2011/WD-page-visibility-20110602/ and https://developers.google.com/chrome/whitepapers/pagevisibility
</span><span class="cx"> static void testWebViewPageVisibility(WebViewTest* test, gconstpointer)
</span><span class="lines">@@ -597,7 +576,6 @@
</span><span class="cx"> WebViewTest::add("WebKitWebView", "can-show-mime-type", testWebViewCanShowMIMEType);
</span><span class="cx"> FormClientTest::add("WebKitWebView", "submit-form", testWebViewSubmitForm);
</span><span class="cx"> SaveWebViewTest::add("WebKitWebView", "save", testWebViewSave);
</span><del>- WebViewTest::add("WebKitWebView", "view-mode", testWebViewMode);
</del><span class="cx"> SnapshotWebViewTest::add("WebKitWebView", "snapshot", testWebViewSnapshot);
</span><span class="cx"> WebViewTest::add("WebKitWebView", "page-visibility", testWebViewPageVisibility);
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>