Diff
Modified: trunk/Source/WebKit/ChangeLog (227606 => 227607)
--- trunk/Source/WebKit/ChangeLog 2018-01-25 15:37:26 UTC (rev 227606)
+++ trunk/Source/WebKit/ChangeLog 2018-01-25 15:52:20 UTC (rev 227607)
@@ -1,3 +1,31 @@
+2018-01-25 Sergio Villar Senin <[email protected]>
+
+ [WebVR][GTK][WPE] Remove the WebVR public API added in r227518
+ https://bugs.webkit.org/show_bug.cgi?id=182102
+
+ Reviewed by Carlos Garcia Campos.
+
+ * UIProcess/API/gtk/docs/webkit2gtk-4.0-sections.txt:
+
+2018-01-25 Sergio Villar Senin <[email protected]>
+
+ [WebVR][GTK][WPE] Remove the WebVR public API added in r227518
+ https://bugs.webkit.org/show_bug.cgi?id=182102
+
+ Reviewed by Carlos Garcia Campos.
+
+ This new public API was not supposed to be included in the patch
+ that added OpenVR to the tree and to the build.
+
+ * UIProcess/API/glib/WebKitSettings.cpp:
+ (webKitSettingsSetProperty):
+ (webKitSettingsGetProperty):
+ (webkit_settings_class_init):
+ (webkit_settings_get_enable_webvr): Deleted.
+ (webkit_settings_set_enable_webvr): Deleted.
+ * UIProcess/API/gtk/WebKitSettings.h:
+ * UIProcess/API/wpe/WebKitSettings.h:
+
2018-01-25 Claudio Saavedra <[email protected]>
[GTK] Fix build with touch events disabled
Modified: trunk/Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp (227606 => 227607)
--- trunk/Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp 2018-01-25 15:37:26 UTC (rev 227606)
+++ trunk/Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp 2018-01-25 15:52:20 UTC (rev 227607)
@@ -158,7 +158,6 @@
#if PLATFORM(GTK)
PROP_HARDWARE_ACCELERATION_POLICY,
#endif
- PROP_ENABLE_WEBVR,
};
static void webKitSettingsDispose(GObject* object)
@@ -364,9 +363,6 @@
webkit_settings_set_hardware_acceleration_policy(settings, static_cast<WebKitHardwareAccelerationPolicy>(g_value_get_enum(value)));
break;
#endif
- case PROP_ENABLE_WEBVR:
- webkit_settings_set_enable_webvr(settings, g_value_get_boolean(value));
- break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propId, paramSpec);
break;
@@ -538,9 +534,6 @@
g_value_set_enum(value, webkit_settings_get_hardware_acceleration_policy(settings));
break;
#endif
- case PROP_ENABLE_WEBVR:
- g_value_set_boolean(value, webkit_settings_get_enable_webvr(settings));
- break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propId, paramSpec);
break;
@@ -1384,19 +1377,6 @@
WEBKIT_HARDWARE_ACCELERATION_POLICY_ON_DEMAND,
readWriteConstructParamFlags));
#endif // PLATFOTM(GTK)
-
- /**
- * WebKitSettings:enable-webvr:
- *
- * Enable or disable support for WebVR on pages.
- */
- g_object_class_install_property(gObjectClass,
- PROP_ENABLE_WEBVR,
- g_param_spec_boolean("enable-webvr",
- _("Enable WebVR"),
- _("Whether WebVR content should be rendered"),
- FALSE,
- readWriteConstructParamFlags));
}
WebPreferences* webkitSettingsGetPreferences(WebKitSettings* settings)
@@ -3422,38 +3402,3 @@
return std::round(points * WebCore::screenDPI() / 72);
}
#endif // PLATFORM(GTK)
-
-/**
- * webkit_settings_get_enable_webvr:
- * @settings: a #WebKitSettings
- *
- * Get the #WebKitSettings:enable-webvr property.
- *
- * Returns: %TRUE If Webvr support is enabled or %FALSE otherwise.
- */
-gboolean webkit_settings_get_enable_webvr(WebKitSettings* settings)
-{
- g_return_val_if_fail(WEBKIT_IS_SETTINGS(settings), FALSE);
-
- return settings->priv->preferences->webVREnabled();
-}
-
-/**
- * webkit_settings_set_enable_webvr:
- * @settings: a #WebKitSettings
- * @enabled: Value to be set
- *
- * Set the #WebKitSettings:enable-webvr property.
- */
-void webkit_settings_set_enable_webvr(WebKitSettings* settings, gboolean enabled)
-{
- g_return_if_fail(WEBKIT_IS_SETTINGS(settings));
-
- WebKitSettingsPrivate* priv = settings->priv;
- bool currentValue = priv->preferences->webVREnabled();
- if (currentValue == enabled)
- return;
-
- priv->preferences->setWebVREnabled(enabled);
- g_object_notify(G_OBJECT(settings), "enable-webvr");
-}
Modified: trunk/Source/WebKit/UIProcess/API/gtk/WebKitSettings.h (227606 => 227607)
--- trunk/Source/WebKit/UIProcess/API/gtk/WebKitSettings.h 2018-01-25 15:37:26 UTC (rev 227606)
+++ trunk/Source/WebKit/UIProcess/API/gtk/WebKitSettings.h 2018-01-25 15:52:20 UTC (rev 227607)
@@ -464,13 +464,6 @@
WEBKIT_API guint32
webkit_settings_font_size_to_pixels (guint32 points);
-WEBKIT_API gboolean
-webkit_settings_get_enable_webvr (WebKitSettings *settings);
-
-WEBKIT_API void
-webkit_settings_set_enable_webvr (WebKitSettings *settings,
- gboolean enabled);
-
G_END_DECLS
#endif /* WebKitSettings_h */
Modified: trunk/Source/WebKit/UIProcess/API/gtk/docs/webkit2gtk-4.0-sections.txt (227606 => 227607)
--- trunk/Source/WebKit/UIProcess/API/gtk/docs/webkit2gtk-4.0-sections.txt 2018-01-25 15:37:26 UTC (rev 227606)
+++ trunk/Source/WebKit/UIProcess/API/gtk/docs/webkit2gtk-4.0-sections.txt 2018-01-25 15:52:20 UTC (rev 227607)
@@ -473,8 +473,6 @@
webkit_settings_set_hardware_acceleration_policy
webkit_settings_font_size_to_points
webkit_settings_font_size_to_pixels
-webkit_settings_get_enable_webvr
-webkit_settings_set_enable_webvr
<SUBSECTION Standard>
WebKitSettingsClass
Modified: trunk/Source/WebKit/UIProcess/API/wpe/WebKitSettings.h (227606 => 227607)
--- trunk/Source/WebKit/UIProcess/API/wpe/WebKitSettings.h 2018-01-25 15:37:26 UTC (rev 227606)
+++ trunk/Source/WebKit/UIProcess/API/wpe/WebKitSettings.h 2018-01-25 15:52:20 UTC (rev 227607)
@@ -435,13 +435,6 @@
webkit_settings_set_allow_universal_access_from_file_urls (WebKitSettings *settings,
gboolean allowed);
-WEBKIT_API gboolean
-webkit_settings_get_enable_webvr (WebKitSettings *settings);
-
-WEBKIT_API void
-webkit_settings_set_enable_webvr (WebKitSettings *settings,
- gboolean enabled);
-
G_END_DECLS
#endif /* WebKitSettings_h */
Modified: trunk/Tools/ChangeLog (227606 => 227607)
--- trunk/Tools/ChangeLog 2018-01-25 15:37:26 UTC (rev 227606)
+++ trunk/Tools/ChangeLog 2018-01-25 15:52:20 UTC (rev 227607)
@@ -1,3 +1,13 @@
+2018-01-25 Sergio Villar Senin <[email protected]>
+
+ [WebVR][GTK][WPE] Remove the WebVR public API added in r227518
+ https://bugs.webkit.org/show_bug.cgi?id=182102
+
+ Reviewed by Carlos Garcia Campos.
+
+ * MiniBrowser/gtk/main.c:
+ (main): Removed the call to set_enable_webvr().
+
2018-01-25 Carlos Garcia Campos <[email protected]>
WebDriver: add support for slow tests
Modified: trunk/Tools/MiniBrowser/gtk/main.c (227606 => 227607)
--- trunk/Tools/MiniBrowser/gtk/main.c 2018-01-25 15:37:26 UTC (rev 227606)
+++ trunk/Tools/MiniBrowser/gtk/main.c 2018-01-25 15:52:20 UTC (rev 227607)
@@ -489,7 +489,6 @@
webkit_settings_set_enable_developer_extras(webkitSettings, TRUE);
webkit_settings_set_enable_webgl(webkitSettings, TRUE);
webkit_settings_set_enable_media_stream(webkitSettings, TRUE);
- webkit_settings_set_enable_webvr(webkitSettings, TRUE);
if (!addSettingsGroupToContext(context, webkitSettings))
g_clear_object(&webkitSettings);
