<!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>[159734] 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/159734">159734</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2013-11-24 10:20:54 -0800 (Sun, 24 Nov 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WK2][GTK] Adding SpatialNavigation setting to webkit2
https://bugs.webkit.org/show_bug.cgi?id=114298
Patch by Danilo Cesar Lemes de Paula <danilo.cesar@collabora.co.uk>, Arunprasad Rajkumar <arurajku@cisco.com> on 2013-11-24
Reviewed by Anders Carlsson.
Adding SpatialNavigation support to WebPreferencesStore allows us
to toggle that feature on WebKitSettings.
* Shared/WebPreferencesStore.h:
* UIProcess/API/C/WKPreferences.cpp:
(WKPreferencesSetSpatialNavigationEnabled):
(WKPreferencesGetSpatialNavigationEnabled):
* UIProcess/API/C/WKPreferences.h:
* UIProcess/API/gtk/WebKitSettings.cpp:
(webKitSettingsSetProperty):
(webKitSettingsGetProperty):
(webkit_settings_class_init):
(webkit_settings_set_enable_spatial_navigation):
(webkit_settings_get_enable_spatial_navigation):
* UIProcess/API/gtk/WebKitSettings.h:
* UIProcess/API/gtk/docs/webkit2gtk-sections.txt:
* UIProcess/API/gtk/tests/TestWebKitSettings.cpp:
(testWebKitSettings):
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::updatePreferences):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedWebPreferencesStoreh">trunk/Source/WebKit2/Shared/WebPreferencesStore.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPreferencescpp">trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPreferencesh">trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitSettingscpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitSettings.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitSettingsh">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitSettings.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkdocswebkit2gtksectionstxt">trunk/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-sections.txt</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtktestsTestWebKitSettingscpp">trunk/Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitSettings.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (159733 => 159734)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2013-11-24 15:24:33 UTC (rev 159733)
+++ trunk/Source/WebKit2/ChangeLog 2013-11-24 18:20:54 UTC (rev 159734)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2013-11-24 Danilo Cesar Lemes de Paula <danilo.cesar@collabora.co.uk>, Arunprasad Rajkumar <arurajku@cisco.com>
+
+ [WK2][GTK] Adding SpatialNavigation setting to webkit2
+ https://bugs.webkit.org/show_bug.cgi?id=114298
+
+ Reviewed by Anders Carlsson.
+
+ Adding SpatialNavigation support to WebPreferencesStore allows us
+ to toggle that feature on WebKitSettings.
+
+ * Shared/WebPreferencesStore.h:
+ * UIProcess/API/C/WKPreferences.cpp:
+ (WKPreferencesSetSpatialNavigationEnabled):
+ (WKPreferencesGetSpatialNavigationEnabled):
+ * UIProcess/API/C/WKPreferences.h:
+ * UIProcess/API/gtk/WebKitSettings.cpp:
+ (webKitSettingsSetProperty):
+ (webKitSettingsGetProperty):
+ (webkit_settings_class_init):
+ (webkit_settings_set_enable_spatial_navigation):
+ (webkit_settings_get_enable_spatial_navigation):
+ * UIProcess/API/gtk/WebKitSettings.h:
+ * UIProcess/API/gtk/docs/webkit2gtk-sections.txt:
+ * UIProcess/API/gtk/tests/TestWebKitSettings.cpp:
+ (testWebKitSettings):
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::updatePreferences):
+
</ins><span class="cx"> 2013-11-22 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Add DatabaseProcessCreationParameters, starting with the database path.
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebPreferencesStoreh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebPreferencesStore.h (159733 => 159734)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebPreferencesStore.h 2013-11-24 15:24:33 UTC (rev 159733)
+++ trunk/Source/WebKit2/Shared/WebPreferencesStore.h 2013-11-24 18:20:54 UTC (rev 159734)
</span><span class="lines">@@ -176,6 +176,7 @@
</span><span class="cx"> macro(MediaStreamEnabled, mediaStreamEnabled, Bool, bool, false) \
</span><span class="cx"> macro(VideoPluginProxyEnabled, isVideoPluginProxyEnabled, Bool, bool, DEFAULT_VIDEO_PLUGIN_PROXY_ENABLED) \
</span><span class="cx"> macro(UseLegacyTextAlignPositionedElementBehavior, useLegacyTextAlignPositionedElementBehavior, Bool, bool, false) \
</span><ins>+ macro(SpatialNavigationEnabled, spatialNavigationEnabled, Bool, bool, false) \
</ins><span class="cx"> \
</span><span class="cx">
</span><span class="cx"> #define FOR_EACH_WEBKIT_DOUBLE_PREFERENCE(macro) \
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPreferencescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp (159733 => 159734)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp 2013-11-24 15:24:33 UTC (rev 159733)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp 2013-11-24 18:20:54 UTC (rev 159734)
</span><span class="lines">@@ -1225,3 +1225,13 @@
</span><span class="cx"> {
</span><span class="cx"> return toImpl(preferencesRef)->isVideoPluginProxyEnabled();
</span><span class="cx"> }
</span><ins>+
+void WKPreferencesSetSpatialNavigationEnabled(WKPreferencesRef preferencesRef, bool enabled)
+{
+ toImpl(preferencesRef)->setSpatialNavigationEnabled(enabled);
+}
+
+bool WKPreferencesGetSpatialNavigationEnabled(WKPreferencesRef preferencesRef)
+{
+ return toImpl(preferencesRef)->spatialNavigationEnabled();
+}
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPreferencesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.h (159733 => 159734)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.h 2013-11-24 15:24:33 UTC (rev 159733)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.h 2013-11-24 18:20:54 UTC (rev 159734)
</span><span class="lines">@@ -248,6 +248,10 @@
</span><span class="cx"> WK_EXPORT void WKPreferencesSetVideoPluginProxyEnabled(WKPreferencesRef preferencesRef, bool enabled);
</span><span class="cx"> WK_EXPORT bool WKPreferencesGetVideoPluginProxyEnabled(WKPreferencesRef preferencesRef);
</span><span class="cx">
</span><ins>+// Defaults to false.
+WK_EXPORT void WKPreferencesSetSpatialNavigationEnabled(WKPreferencesRef preferencesRef, bool enabled);
+WK_EXPORT bool WKPreferencesGetSpatialNavigationEnabled(WKPreferencesRef preferencesRef);
+
</ins><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitSettingscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitSettings.cpp (159733 => 159734)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitSettings.cpp 2013-11-24 15:24:33 UTC (rev 159733)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitSettings.cpp 2013-11-24 18:20:54 UTC (rev 159734)
</span><span class="lines">@@ -136,7 +136,8 @@
</span><span class="cx"> PROP_ENABLE_SMOOTH_SCROLLING,
</span><span class="cx"> PROP_ENABLE_ACCELERATED_2D_CANVAS,
</span><span class="cx"> PROP_ENABLE_WRITE_CONSOLE_MESSAGES_TO_STDOUT,
</span><del>- PROP_ENABLE_MEDIA_STREAM
</del><ins>+ PROP_ENABLE_MEDIA_STREAM,
+ PROP_ENABLE_SPATIAL_NAVIGATION
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> static void webKitSettingsConstructed(GObject* object)
</span><span class="lines">@@ -301,6 +302,9 @@
</span><span class="cx"> case PROP_ENABLE_MEDIA_STREAM:
</span><span class="cx"> webkit_settings_set_enable_media_stream(settings, g_value_get_boolean(value));
</span><span class="cx"> break;
</span><ins>+ case PROP_ENABLE_SPATIAL_NAVIGATION:
+ webkit_settings_set_enable_spatial_navigation(settings, g_value_get_boolean(value));
+ break;
</ins><span class="cx"> default:
</span><span class="cx"> G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propId, paramSpec);
</span><span class="cx"> break;
</span><span class="lines">@@ -450,6 +454,10 @@
</span><span class="cx"> case PROP_ENABLE_MEDIA_STREAM:
</span><span class="cx"> g_value_set_boolean(value, webkit_settings_get_enable_media_stream(settings));
</span><span class="cx"> break;
</span><ins>+ case PROP_ENABLE_SPATIAL_NAVIGATION:
+ g_value_set_boolean(value, webkit_settings_get_enable_spatial_navigation(settings));
+ break;
+
</ins><span class="cx"> default:
</span><span class="cx"> G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propId, paramSpec);
</span><span class="cx"> break;
</span><span class="lines">@@ -1161,6 +1169,26 @@
</span><span class="cx"> FALSE,
</span><span class="cx"> readWriteConstructParamFlags));
</span><span class="cx">
</span><ins>+ /**
+ * WebKitSettings:enable-spatial-navigation:
+ *
+ * Whether to enable Spatial Navigation. This feature consists in the ability
+ * to navigate between focusable elements in a Web page, such as hyperlinks
+ * and form controls, by using Left, Right, Up and Down arrow keys.
+ * For example, if an user presses the Right key, heuristics determine whether
+ * there is an element they might be trying to reach towards the right, and if
+ * there are multiple elements, which element they probably wants.
+ *
+ * Since: 2.3
+ */
+ g_object_class_install_property(gObjectClass,
+ PROP_ENABLE_SPATIAL_NAVIGATION,
+ g_param_spec_boolean("enable-spatial-navigation",
+ _("Enable Spatial Navigation"),
+ _("Whether to enable Spatial Navigation support."),
+ FALSE,
+ readWriteConstructParamFlags));
+
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WebPreferences* webkitSettingsGetPreferences(WebKitSettings* settings)
</span><span class="lines">@@ -2863,3 +2891,44 @@
</span><span class="cx"> priv->preferences->setMediaStreamEnabled(enabled);
</span><span class="cx"> g_object_notify(G_OBJECT(settings), "enable-media-stream");
</span><span class="cx"> }
</span><ins>+
+/**
+ * webkit_settings_set_enable_spatial_navigation:
+ * @settings: a #WebKitSettings
+ * @enabled: Value to be set
+ *
+ * Set the #WebKitSettings:enable-spatial-navigation property.
+ *
+ * Since: 2.2
+ */
+void webkit_settings_set_enable_spatial_navigation(WebKitSettings* settings, gboolean enabled)
+{
+ g_return_if_fail(WEBKIT_IS_SETTINGS(settings));
+
+ WebKitSettingsPrivate* priv = settings->priv;
+ bool currentValue = priv->preferences->spatialNavigationEnabled();
+
+ if (currentValue == enabled)
+ return;
+
+ priv->preferences->setSpatialNavigationEnabled(enabled);
+ g_object_notify(G_OBJECT(settings), "enable-spatial-navigation");
+}
+
+
+/**
+ * webkit_settings_get_enable_spatial_navigation:
+ * @settings: a #WebKitSettings
+ *
+ * Get the #WebKitSettings:enable-spatial-navigation property.
+ *
+ * Returns: %TRUE If HTML5 spatial navigation support is enabled or %FALSE otherwise.
+ *
+ * Since: 2.2
+ */
+gboolean webkit_settings_get_enable_spatial_navigation(WebKitSettings* settings)
+{
+ g_return_val_if_fail(WEBKIT_IS_SETTINGS(settings), FALSE);
+
+ return settings->priv->preferences->spatialNavigationEnabled();
+}
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitSettingsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitSettings.h (159733 => 159734)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitSettings.h 2013-11-24 15:24:33 UTC (rev 159733)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitSettings.h 2013-11-24 18:20:54 UTC (rev 159734)
</span><span class="lines">@@ -400,6 +400,13 @@
</span><span class="cx"> webkit_settings_set_enable_media_stream (WebKitSettings *settings,
</span><span class="cx"> gboolean enabled);
</span><span class="cx">
</span><ins>+WEBKIT_API gboolean
+webkit_settings_get_enable_spatial_navigation (WebKitSettings *settings);
+
+WEBKIT_API void
+webkit_settings_set_enable_spatial_navigation (WebKitSettings *settings,
+ gboolean enabled);
+
</ins><span class="cx"> G_END_DECLS
</span><span class="cx">
</span><span class="cx"> #endif /* WebKitSettings_h */
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkdocswebkit2gtksectionstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-sections.txt (159733 => 159734)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-sections.txt 2013-11-24 15:24:33 UTC (rev 159733)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-sections.txt 2013-11-24 18:20:54 UTC (rev 159734)
</span><span class="lines">@@ -366,6 +366,8 @@
</span><span class="cx"> webkit_settings_set_enable_write_console_messages_to_stdout
</span><span class="cx"> webkit_settings_get_enable_media_stream
</span><span class="cx"> webkit_settings_set_enable_media_stream
</span><ins>+webkit_settings_get_enable_spatial_navigation
+webkit_settings_set_enable_spatial_navigation
</ins><span class="cx">
</span><span class="cx"> <SUBSECTION Standard>
</span><span class="cx"> WebKitSettingsClass
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtktestsTestWebKitSettingscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitSettings.cpp (159733 => 159734)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitSettings.cpp 2013-11-24 15:24:33 UTC (rev 159733)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitSettings.cpp 2013-11-24 18:20:54 UTC (rev 159734)
</span><span class="lines">@@ -263,6 +263,11 @@
</span><span class="cx"> webkit_settings_set_enable_media_stream(settings, TRUE);
</span><span class="cx"> g_assert(webkit_settings_get_enable_media_stream(settings));
</span><span class="cx">
</span><ins>+ // By default, SpatialNavigation is disabled
+ g_assert(!webkit_settings_get_enable_spatial_navigation(settings));
+ webkit_settings_set_enable_spatial_navigation(settings, TRUE);
+ g_assert(webkit_settings_get_enable_spatial_navigation(settings));
+
</ins><span class="cx"> g_object_unref(G_OBJECT(settings));
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (159733 => 159734)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2013-11-24 15:24:33 UTC (rev 159733)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2013-11-24 18:20:54 UTC (rev 159734)
</span><span class="lines">@@ -2429,7 +2429,9 @@
</span><span class="cx"> settings.setScrollAnimatorEnabled(store.getBoolValueForKey(WebPreferencesKey::scrollAnimatorEnabledKey()));
</span><span class="cx"> #endif
</span><span class="cx"> settings.setInteractiveFormValidationEnabled(store.getBoolValueForKey(WebPreferencesKey::interactiveFormValidationEnabledKey()));
</span><ins>+ settings.setSpatialNavigationEnabled(store.getBoolValueForKey(WebPreferencesKey::spatialNavigationEnabledKey()));
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> #if ENABLE(SQL_DATABASE)
</span><span class="cx"> DatabaseManager::manager().setIsAvailable(store.getBoolValueForKey(WebPreferencesKey::databasesEnabledKey()));
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>