summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorxji@chromium.org <xji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-09 00:00:29 +0000
committerxji@chromium.org <xji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-09 00:00:29 +0000
commite062a62215d4b73936ff6628933c95acea206847 (patch)
tree4ae3b0b1331277eb3f69d079323e8524e6b83985 /webkit
parentc19956259e34880d33ace2dd243458a8bcd3cceb (diff)
downloadchromium_src-e062a62215d4b73936ff6628933c95acea206847.zip
chromium_src-e062a62215d4b73936ff6628933c95acea206847.tar.gz
chromium_src-e062a62215d4b73936ff6628933c95acea206847.tar.bz2
To minimize the risk to LTR users, we are thinking to enable this feature first to chromium win by command line flag. (This and corresponding changset in webkit should be removed after this feature is enabled without command line flag).
This is chromium side's change that 1. adds command-line flag: --enable-visual-word-movement 2. passes this per-page setting to WebCore::Settings through WebPreferences. The dependent WebKit change is in http://trac.webkit.org/changeset/99255 workflow: 1. adds command line flag --enable-visual-word-movement, pass it to WebCore::Settings through WebPreferences. 2. (WebKit) in FrameSelection::modifyMovingLeft|Right, when 'visualWordMovementEnabled' is true in page's Settings, trigger visual word movement instead of logical one. Review URL: http://codereview.chromium.org/8400078 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109133 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/glue/webpreferences.cc4
-rw-r--r--webkit/glue/webpreferences.h1
-rw-r--r--webkit/tools/test_shell/test_shell.cc1
3 files changed, 5 insertions, 1 deletions
diff --git a/webkit/glue/webpreferences.cc b/webkit/glue/webpreferences.cc
index c26ddc2..199c6e7 100644
--- a/webkit/glue/webpreferences.cc
+++ b/webkit/glue/webpreferences.cc
@@ -92,7 +92,8 @@ WebPreferences::WebPreferences()
allow_running_insecure_content(false),
should_print_backgrounds(false),
enable_scroll_animator(false),
- hixie76_websocket_protocol_enabled(false) {
+ hixie76_websocket_protocol_enabled(false),
+ visual_word_movement_enabled(false) {
}
WebPreferences::~WebPreferences() {
@@ -318,6 +319,7 @@ void WebPreferences::Apply(WebView* web_view) const {
settings->setEnableScrollAnimator(enable_scroll_animator);
settings->setHixie76WebSocketProtocolEnabled(
hixie76_websocket_protocol_enabled);
+ settings->setVisualWordMovementEnabled(visual_word_movement_enabled);
WebNetworkStateNotifier::setOnLine(is_online);
}
diff --git a/webkit/glue/webpreferences.h b/webkit/glue/webpreferences.h
index 02a2612..5cf7aa0 100644
--- a/webkit/glue/webpreferences.h
+++ b/webkit/glue/webpreferences.h
@@ -107,6 +107,7 @@ struct WebPreferences {
bool should_print_backgrounds;
bool enable_scroll_animator;
bool hixie76_websocket_protocol_enabled;
+ bool visual_word_movement_enabled;
// We try to keep the default values the same as the default values in
// chrome, except for the cases where it would require lots of extra work for
// the embedder to use the same default value.
diff --git a/webkit/tools/test_shell/test_shell.cc b/webkit/tools/test_shell/test_shell.cc
index 0a49bca..324c0f3 100644
--- a/webkit/tools/test_shell/test_shell.cc
+++ b/webkit/tools/test_shell/test_shell.cc
@@ -363,6 +363,7 @@ void TestShell::ResetWebPreferences() {
// LayoutTests/http/tests/local, to access http server.
if (layout_test_mode_)
web_prefs_->allow_universal_access_from_file_urls = true;
+ web_prefs_->visual_word_movement_enabled = false;
}
}