Diff
Modified: trunk/Source/WebKit/gtk/ChangeLog (164633 => 164634)
--- 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)
@@ -1,3 +1,14 @@
+2014-02-24 Carlos Garcia Campos <[email protected]>
+
+ [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.
+
2014-02-24 Martin Robinson <[email protected]>
[GTK] generate-gtkdoc should not generate documentation for source files for unbuilt source files
Modified: trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp (164633 => 164634)
--- 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)
@@ -5233,6 +5233,7 @@
* nice and readable format.
*
* Since: 1.1.14
+ * Deprecated: 2.6
*/
void webkit_web_view_set_view_source_mode (WebKitWebView* webView, gboolean mode)
{
@@ -5248,6 +5249,7 @@
* Return value: %TRUE if @web_view is in view source mode, %FALSE otherwise.
*
* Since: 1.1.14
+ * Deprecated: 2.6
*/
gboolean webkit_web_view_get_view_source_mode (WebKitWebView* webView)
{
Modified: trunk/Source/WebKit/gtk/webkit/webkitwebview.h (164633 => 164634)
--- 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)
@@ -415,12 +415,14 @@
WEBKIT_API gboolean
webkit_web_view_can_redo (WebKitWebView *web_view);
+#if !defined(WEBKIT_DISABLE_DEPRECATED)
WEBKIT_API void
webkit_web_view_set_view_source_mode (WebKitWebView *web_view,
gboolean view_source_mode);
WEBKIT_API gboolean
webkit_web_view_get_view_source_mode (WebKitWebView *web_view);
+#endif
WEBKIT_API WebKitHitTestResult*
webkit_web_view_get_hit_test_result (WebKitWebView *web_view,
Modified: trunk/Source/WebKit2/ChangeLog (164633 => 164634)
--- 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)
@@ -1,3 +1,18 @@
+2014-02-24 Carlos Garcia Campos <[email protected]>
+
+ [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:
+
2014-02-24 Alexey Proskuryakov <[email protected]>
[Mac] Stop looking for plug-in profiles in /S/L/Sandbox/Profiles
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp (164633 => 164634)
--- 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)
@@ -3035,7 +3035,8 @@
{
g_return_if_fail(WEBKIT_IS_WEB_VIEW(webView));
- g_warning("webkit_web_view_set_view_mode has been deprecated and is a no-op.");
+ if (viewMode == WEBKIT_VIEW_MODE_SOURCE)
+ g_warning("WEBKIT_VIEW_MODE_SOURCE has been deprecated and is no longer supported.");
}
/**
@@ -3050,7 +3051,6 @@
{
g_return_val_if_fail(WEBKIT_IS_WEB_VIEW(webView), WEBKIT_VIEW_MODE_WEB);
- g_warning("webkit_web_view_get_view_mode has been deprecated and always returns WEBKIT_VIEW_MODE_WEB.");
return WEBKIT_VIEW_MODE_WEB;
}
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h (164633 => 164634)
--- 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)
@@ -152,7 +152,7 @@
/**
* 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.
+ * @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.
Modified: trunk/Tools/ChangeLog (164633 => 164634)
--- trunk/Tools/ChangeLog 2014-02-25 07:49:46 UTC (rev 164633)
+++ trunk/Tools/ChangeLog 2014-02-25 07:51:14 UTC (rev 164634)
@@ -1,3 +1,13 @@
+2014-02-24 Carlos Garcia Campos <[email protected]>
+
+ [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.
+
2014-02-24 Martin Robinson <[email protected]>
[GTK] generate-gtkdoc should not generate documentation for source files for unbuilt source files
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebView.cpp (164633 => 164634)
--- 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)
@@ -418,27 +418,6 @@
g_assert_cmpint(g_file_info_get_size(fileInfo.get()), ==, totalBytesFromStream);
}
-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* _javascript_Result = test->runJavaScriptAndWaitUntilFinished("window.document.body.textContent;", 0);
- GUniquePtr<char> valueString(WebViewTest::_javascript_ResultToCString(_javascript_Result));
- 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();
- _javascript_Result = test->runJavaScriptAndWaitUntilFinished("window.document.body.textContent;", 0);
- valueString.reset(WebViewTest::_javascript_ResultToCString(_javascript_Result));
- g_assert_cmpstr(valueString.get(), ==, indexHTML);
-}
-
// To test page visibility API. Currently only 'visible' and 'hidden' states are implemented fully in WebCore.
// See also http://www.w3.org/TR/2011/WD-page-visibility-20110602/ and https://developers.google.com/chrome/whitepapers/pagevisibility
static void testWebViewPageVisibility(WebViewTest* test, gconstpointer)
@@ -597,7 +576,6 @@
WebViewTest::add("WebKitWebView", "can-show-mime-type", testWebViewCanShowMIMEType);
FormClientTest::add("WebKitWebView", "submit-form", testWebViewSubmitForm);
SaveWebViewTest::add("WebKitWebView", "save", testWebViewSave);
- WebViewTest::add("WebKitWebView", "view-mode", testWebViewMode);
SnapshotWebViewTest::add("WebKitWebView", "snapshot", testWebViewSnapshot);
WebViewTest::add("WebKitWebView", "page-visibility", testWebViewPageVisibility);
}
