diff options
| author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-30 06:42:01 +0000 |
|---|---|---|
| committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-30 06:42:01 +0000 |
| commit | b1b1321e783506c11e306469179e8ae4830219d1 (patch) | |
| tree | 5d744435b42d44224a2f9367ef0d4faba22dd4f5 /chrome/renderer | |
| parent | 3a075e1fe68e5b79607e4a39d68f0256671d92d1 (diff) | |
| download | chromium_src-b1b1321e783506c11e306469179e8ae4830219d1.zip chromium_src-b1b1321e783506c11e306469179e8ae4830219d1.tar.gz chromium_src-b1b1321e783506c11e306469179e8ae4830219d1.tar.bz2 | |
Move various runtime enabled features into a WebRuntimeFeatures class.
There are separate functions to set/test each feature.
R=jorlow
BUG=25286
TEST=none
Review URL: http://codereview.chromium.org/343001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30564 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer')
| -rw-r--r-- | chrome/renderer/render_thread.cc | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/chrome/renderer/render_thread.cc b/chrome/renderer/render_thread.cc index 33702fc..c82b030 100644 --- a/chrome/renderer/render_thread.cc +++ b/chrome/renderer/render_thread.cc @@ -50,6 +50,7 @@ #include "webkit/api/public/WebCache.h" #include "webkit/api/public/WebColor.h" #include "webkit/api/public/WebCrossOriginPreflightResultCache.h" +#include "webkit/api/public/WebRuntimeFeatures.h" #include "webkit/api/public/WebFontCache.h" #include "webkit/api/public/WebColor.h" #include "webkit/api/public/WebDatabase.h" @@ -71,6 +72,7 @@ using WebKit::WebCache; using WebKit::WebCrossOriginPreflightResultCache; +using WebKit::WebRuntimeFeatures; using WebKit::WebFontCache; using WebKit::WebSecurityPolicy; using WebKit::WebScriptController; @@ -518,14 +520,14 @@ void RenderThread::EnsureWebKitInitialized() { extensions_v8::PlaybackExtension::Get()); } - if (RenderProcess::current()->initialized_media_library()) - WebKit::enableMediaPlayer(); + WebRuntimeFeatures::enableMediaPlayer( + RenderProcess::current()->initialized_media_library()); - if (command_line.HasSwitch(switches::kEnableWebSockets)) - WebKit::enableWebSockets(); + WebRuntimeFeatures::enableSockets( + command_line.HasSwitch(switches::kEnableWebSockets)); - if (command_line.HasSwitch(switches::kEnableDatabases)) - WebKit::enableDatabases(); + WebRuntimeFeatures::enableDatabase( + command_line.HasSwitch(switches::kEnableDatabases)); } void RenderThread::IdleHandler() { |