<!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>[169884] trunk/Source/WebKit2</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/169884">169884</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2014-06-12 00:37:41 -0700 (Thu, 12 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] Remove view mode API
https://bugs.webkit.org/show_bug.cgi?id=133725
Reviewed by Martin Robinson.
It currently does nothing because support for view source mode was
removed from WebCore.
* UIProcess/API/gtk/WebKitWebView.cpp:
(webkitWebViewSetProperty):
(webkitWebViewGetProperty):
(webkit_web_view_class_init):
(webkit_web_view_set_view_mode): Deleted.
(webkit_web_view_get_view_mode): Deleted.
* UIProcess/API/gtk/WebKitWebView.h:
* UIProcess/API/gtk/docs/webkit2gtk-sections.txt:</pre>
<h3>Modified Paths</h3>
<ul>
<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="#trunkSourceWebKit2UIProcessAPIgtkdocswebkit2gtksectionstxt">trunk/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-sections.txt</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (169883 => 169884)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-06-12 07:25:31 UTC (rev 169883)
+++ trunk/Source/WebKit2/ChangeLog 2014-06-12 07:37:41 UTC (rev 169884)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-06-12 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GTK] Remove view mode API
+ https://bugs.webkit.org/show_bug.cgi?id=133725
+
+ Reviewed by Martin Robinson.
+
+ It currently does nothing because support for view source mode was
+ removed from WebCore.
+
+ * UIProcess/API/gtk/WebKitWebView.cpp:
+ (webkitWebViewSetProperty):
+ (webkitWebViewGetProperty):
+ (webkit_web_view_class_init):
+ (webkit_web_view_set_view_mode): Deleted.
+ (webkit_web_view_get_view_mode): Deleted.
+ * UIProcess/API/gtk/WebKitWebView.h:
+ * UIProcess/API/gtk/docs/webkit2gtk-sections.txt:
+
</ins><span class="cx"> 2014-06-12 Pratik Solanki <psolanki@apple.com>
</span><span class="cx">
</span><span class="cx"> Avoid creating a CFData when checking if a resource is file backed
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitWebViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp (169883 => 169884)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2014-06-12 07:25:31 UTC (rev 169883)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2014-06-12 07:37:41 UTC (rev 169884)
</span><span class="lines">@@ -138,8 +138,7 @@
</span><span class="cx"> PROP_FAVICON,
</span><span class="cx"> PROP_URI,
</span><span class="cx"> PROP_ZOOM_LEVEL,
</span><del>- PROP_IS_LOADING,
- PROP_VIEW_MODE
</del><ins>+ PROP_IS_LOADING
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> typedef HashMap<uint64_t, GRefPtr<WebKitWebResource> > LoadingResourcesMap;
</span><span class="lines">@@ -546,9 +545,6 @@
</span><span class="cx"> case PROP_ZOOM_LEVEL:
</span><span class="cx"> webkit_web_view_set_zoom_level(webView, g_value_get_double(value));
</span><span class="cx"> break;
</span><del>- case PROP_VIEW_MODE:
- webkit_web_view_set_view_mode(webView, static_cast<WebKitViewMode>(g_value_get_enum(value)));
- break;
</del><span class="cx"> default:
</span><span class="cx"> G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propId, paramSpec);
</span><span class="cx"> }
</span><span class="lines">@@ -583,9 +579,6 @@
</span><span class="cx"> case PROP_IS_LOADING:
</span><span class="cx"> g_value_set_boolean(value, webkit_web_view_is_loading(webView));
</span><span class="cx"> break;
</span><del>- case PROP_VIEW_MODE:
- g_value_set_enum(value, webkit_web_view_get_view_mode(webView));
- break;
</del><span class="cx"> default:
</span><span class="cx"> G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propId, paramSpec);
</span><span class="cx"> }
</span><span class="lines">@@ -768,21 +761,6 @@
</span><span class="cx"> WEBKIT_PARAM_READABLE));
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * WebKitWebView:view-mode:
- *
- * The #WebKitViewMode that is used to display the contents of a #WebKitWebView.
- * See also webkit_web_view_set_view_mode().
- */
- g_object_class_install_property(gObjectClass,
- PROP_VIEW_MODE,
- g_param_spec_enum("view-mode",
- "View Mode",
- _("The view mode to display the web view contents"),
- WEBKIT_TYPE_VIEW_MODE,
- WEBKIT_VIEW_MODE_WEB,
- WEBKIT_PARAM_READWRITE));
-
- /**
</del><span class="cx"> * WebKitWebView::load-changed:
</span><span class="cx"> * @web_view: the #WebKitWebView on which the signal is emitted
</span><span class="cx"> * @load_event: the #WebKitLoadEvent
</span><span class="lines">@@ -3029,38 +3007,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * webkit_web_view_set_view_mode:
- * @web_view: a #WebKitWebView
- * @view_mode: a #WebKitViewMode
- *
- * Set the view mode of @web_view to @view_mode. This method should be called
- * before loading new contents on @web_view so that the new #WebKitViewMode will
- * be applied to the new contents.
- */
-void webkit_web_view_set_view_mode(WebKitWebView* webView, WebKitViewMode viewMode)
-{
- g_return_if_fail(WEBKIT_IS_WEB_VIEW(webView));
-
- if (viewMode == WEBKIT_VIEW_MODE_SOURCE)
- g_warning("WEBKIT_VIEW_MODE_SOURCE has been deprecated and is no longer supported.");
-}
-
-/**
- * webkit_web_view_get_view_mode:
- * @web_view: a #WebKitWebView
- *
- * Get the view mode of @web_view.
- *
- * Returns: the #WebKitViewMode of @web_view.
- */
-WebKitViewMode webkit_web_view_get_view_mode(WebKitWebView* webView)
-{
- g_return_val_if_fail(WEBKIT_IS_WEB_VIEW(webView), WEBKIT_VIEW_MODE_WEB);
-
- return WEBKIT_VIEW_MODE_WEB;
-}
-
-/**
</del><span class="cx"> * webkit_web_view_get_tls_info:
</span><span class="cx"> * @web_view: a #WebKitWebView
</span><span class="cx"> * @certificate: (out) (transfer none): return location for a #GTlsCertificate
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitWebViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h (169883 => 169884)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h 2014-06-12 07:25:31 UTC (rev 169883)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h 2014-06-12 07:37:41 UTC (rev 169884)
</span><span class="lines">@@ -150,19 +150,6 @@
</span><span class="cx"> } WebKitInsecureContentEvent;
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * WebKitViewMode:
- * @WEBKIT_VIEW_MODE_WEB: The normal view mode to display web contents.
- * @WEBKIT_VIEW_MODE_SOURCE: The source mode to display web source code. Deprecated: 2.6.
- *
- * Enum values to specify the different ways in which a #WebKitWebView
- * can display a web page.
- */
-typedef enum {
- WEBKIT_VIEW_MODE_WEB,
- WEBKIT_VIEW_MODE_SOURCE
-} WebKitViewMode;
-
-/**
</del><span class="cx"> * WebKitSnapshotOptions:
</span><span class="cx"> * @WEBKIT_SNAPSHOT_OPTIONS_NONE: Do not include any special options.
</span><span class="cx"> * @WEBKIT_SNAPSHOT_OPTIONS_INCLUDE_SELECTION_HIGHLIGHTING: Whether to include in the
</span><span class="lines">@@ -450,13 +437,6 @@
</span><span class="cx"> webkit_web_view_download_uri (WebKitWebView *web_view,
</span><span class="cx"> const char *uri);
</span><span class="cx">
</span><del>-WEBKIT_API void
-webkit_web_view_set_view_mode (WebKitWebView *web_view,
- WebKitViewMode view_mode);
-
-WEBKIT_API WebKitViewMode
-webkit_web_view_get_view_mode (WebKitWebView *web_view);
-
</del><span class="cx"> WEBKIT_API gboolean
</span><span class="cx"> webkit_web_view_get_tls_info (WebKitWebView *web_view,
</span><span class="cx"> GTlsCertificate **certificate,
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkdocswebkit2gtksectionstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-sections.txt (169883 => 169884)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-sections.txt 2014-06-12 07:25:31 UTC (rev 169883)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-sections.txt 2014-06-12 07:37:41 UTC (rev 169884)
</span><span class="lines">@@ -79,7 +79,6 @@
</span><span class="cx"> WebKitLoadEvent
</span><span class="cx"> WebKitPolicyDecisionType
</span><span class="cx"> WebKitSaveMode
</span><del>-WebKitViewMode
</del><span class="cx"> WebKitInsecureContentEvent
</span><span class="cx"> WebKitSnapshotOptions
</span><span class="cx"> WebKitSnapshotRegion
</span><span class="lines">@@ -142,8 +141,6 @@
</span><span class="cx"> webkit_web_view_save_to_file
</span><span class="cx"> webkit_web_view_save_to_file_finish
</span><span class="cx"> webkit_web_view_download_uri
</span><del>-webkit_web_view_set_view_mode
-webkit_web_view_get_view_mode
</del><span class="cx"> webkit_web_view_get_tls_info
</span><span class="cx"> webkit_web_view_get_snapshot
</span><span class="cx"> webkit_web_view_get_snapshot_finish
</span></span></pre>
</div>
</div>
</body>
</html>