diff options
| author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-24 17:33:24 +0000 |
|---|---|---|
| committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-24 17:33:24 +0000 |
| commit | 17c85709a15d3c3e6fa9d3ae9db23f654018e20e (patch) | |
| tree | bd18de0898369eabdb4a214efc0e02e494c92da0 /webkit | |
| parent | 0b695059cdb06baaf7c1eb75ee9dda4341dde4ed (diff) | |
| download | chromium_src-17c85709a15d3c3e6fa9d3ae9db23f654018e20e.zip chromium_src-17c85709a15d3c3e6fa9d3ae9db23f654018e20e.tar.gz chromium_src-17c85709a15d3c3e6fa9d3ae9db23f654018e20e.tar.bz2 | |
Add WebKitCaretBrowsingEnabled support to
overridePreferences in test_shell. This is the companion
patch to http://trac.webkit.org/changeset/68191 , which adds
this to DRT.
This depends on a webkit DEPS roll.
Review URL: http://codereview.chromium.org/3442014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60485 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/glue/webpreferences.cc | 1 | ||||
| -rw-r--r-- | webkit/glue/webpreferences.h | 2 | ||||
| -rw-r--r-- | webkit/tools/test_shell/layout_test_controller.cc | 2 |
3 files changed, 5 insertions, 0 deletions
diff --git a/webkit/glue/webpreferences.cc b/webkit/glue/webpreferences.cc index 379ceb7..ddf4ddb 100644 --- a/webkit/glue/webpreferences.cc +++ b/webkit/glue/webpreferences.cc @@ -59,6 +59,7 @@ void WebPreferences::Apply(WebView* web_view) const { WebRuntimeFeatures::enableDatabase( WebRuntimeFeatures::isDatabaseEnabled() || databases_enabled); settings->setOfflineWebApplicationCacheEnabled(application_cache_enabled); + settings->setCaretBrowsingEnabled(caret_browsing_enabled); settings->setHyperlinkAuditingEnabled(hyperlink_auditing_enabled); // This setting affects the behavior of links in an editable region: diff --git a/webkit/glue/webpreferences.h b/webkit/glue/webpreferences.h index 8b2d85d..bc6d477 100644 --- a/webkit/glue/webpreferences.h +++ b/webkit/glue/webpreferences.h @@ -55,6 +55,7 @@ struct WebPreferences { bool databases_enabled; bool application_cache_enabled; bool tabs_to_links; + bool caret_browsing_enabled; bool hyperlink_auditing_enabled; bool user_style_sheet_enabled; @@ -104,6 +105,7 @@ struct WebPreferences { databases_enabled(false), application_cache_enabled(false), tabs_to_links(true), + caret_browsing_enabled(false), hyperlink_auditing_enabled(false), user_style_sheet_enabled(false), author_and_user_styles_enabled(true), diff --git a/webkit/tools/test_shell/layout_test_controller.cc b/webkit/tools/test_shell/layout_test_controller.cc index 12ef6d9..6281202 100644 --- a/webkit/tools/test_shell/layout_test_controller.cc +++ b/webkit/tools/test_shell/layout_test_controller.cc @@ -1224,6 +1224,8 @@ void LayoutTestController::overridePreference( preferences->tabs_to_links = CppVariantToBool(value); else if (key == "WebKitWebGLEnabled") preferences->experimental_webgl_enabled = CppVariantToBool(value); + else if (key == "WebKitEnableCaretBrowsing") + preferences->caret_browsing_enabled = CppVariantToBool(value); else if (key == "WebKitHyperlinkAuditingEnabled") preferences->hyperlink_auditing_enabled = CppVariantToBool(value); else { |