Modified: trunk/Source/WebKit2/ChangeLog (169883 => 169884)
--- 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)
@@ -1,3 +1,22 @@
+2014-06-12 Carlos Garcia Campos <[email protected]>
+
+ [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:
+
2014-06-12 Pratik Solanki <[email protected]>
Avoid creating a CFData when checking if a resource is file backed
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp (169883 => 169884)
--- 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)
@@ -138,8 +138,7 @@
PROP_FAVICON,
PROP_URI,
PROP_ZOOM_LEVEL,
- PROP_IS_LOADING,
- PROP_VIEW_MODE
+ PROP_IS_LOADING
};
typedef HashMap<uint64_t, GRefPtr<WebKitWebResource> > LoadingResourcesMap;
@@ -546,9 +545,6 @@
case PROP_ZOOM_LEVEL:
webkit_web_view_set_zoom_level(webView, g_value_get_double(value));
break;
- case PROP_VIEW_MODE:
- webkit_web_view_set_view_mode(webView, static_cast<WebKitViewMode>(g_value_get_enum(value)));
- break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propId, paramSpec);
}
@@ -583,9 +579,6 @@
case PROP_IS_LOADING:
g_value_set_boolean(value, webkit_web_view_is_loading(webView));
break;
- case PROP_VIEW_MODE:
- g_value_set_enum(value, webkit_web_view_get_view_mode(webView));
- break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propId, paramSpec);
}
@@ -768,21 +761,6 @@
WEBKIT_PARAM_READABLE));
/**
- * 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));
-
- /**
* WebKitWebView::load-changed:
* @web_view: the #WebKitWebView on which the signal is emitted
* @load_event: the #WebKitLoadEvent
@@ -3029,38 +3007,6 @@
}
/**
- * 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;
-}
-
-/**
* webkit_web_view_get_tls_info:
* @web_view: a #WebKitWebView
* @certificate: (out) (transfer none): return location for a #GTlsCertificate
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h (169883 => 169884)
--- 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)
@@ -150,19 +150,6 @@
} WebKitInsecureContentEvent;
/**
- * 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;
-
-/**
* WebKitSnapshotOptions:
* @WEBKIT_SNAPSHOT_OPTIONS_NONE: Do not include any special options.
* @WEBKIT_SNAPSHOT_OPTIONS_INCLUDE_SELECTION_HIGHLIGHTING: Whether to include in the
@@ -450,13 +437,6 @@
webkit_web_view_download_uri (WebKitWebView *web_view,
const char *uri);
-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);
-
WEBKIT_API gboolean
webkit_web_view_get_tls_info (WebKitWebView *web_view,
GTlsCertificate **certificate,
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-sections.txt (169883 => 169884)
--- 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)
@@ -79,7 +79,6 @@
WebKitLoadEvent
WebKitPolicyDecisionType
WebKitSaveMode
-WebKitViewMode
WebKitInsecureContentEvent
WebKitSnapshotOptions
WebKitSnapshotRegion
@@ -142,8 +141,6 @@
webkit_web_view_save_to_file
webkit_web_view_save_to_file_finish
webkit_web_view_download_uri
-webkit_web_view_set_view_mode
-webkit_web_view_get_view_mode
webkit_web_view_get_tls_info
webkit_web_view_get_snapshot
webkit_web_view_get_snapshot_finish
