summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authorachicu@adobe.com <achicu@adobe.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-29 09:02:29 +0000
committerachicu@adobe.com <achicu@adobe.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-29 09:02:29 +0000
commitbc19958dfca1ec36632a3b9fc829966d17e7bdda (patch)
treee44fe087b011645bce74ccd9e5167348f92268c7 /content
parente17c6c88ee78be809eeec115c3fe771fb5308b1e (diff)
downloadchromium_src-bc19958dfca1ec36632a3b9fc829966d17e7bdda.zip
chromium_src-bc19958dfca1ec36632a3b9fc829966d17e7bdda.tar.gz
chromium_src-bc19958dfca1ec36632a3b9fc829966d17e7bdda.tar.bz2
Added the command line flag that enables CSS Shaders: "--enable-css-shaders".
BUG=119861 TEST= Review URL: http://codereview.chromium.org/9839073 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@129598 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r--content/browser/tab_contents/tab_contents.cc3
-rw-r--r--content/common/view_messages.h1
-rw-r--r--content/public/common/content_switches.cc3
-rw-r--r--content/public/common/content_switches.h1
4 files changed, 7 insertions, 1 deletions
diff --git a/content/browser/tab_contents/tab_contents.cc b/content/browser/tab_contents/tab_contents.cc
index aa7d8e0..9f783d0 100644
--- a/content/browser/tab_contents/tab_contents.cc
+++ b/content/browser/tab_contents/tab_contents.cc
@@ -433,7 +433,8 @@ WebPreferences TabContents::GetWebkitPrefs(RenderViewHost* rvh,
!command_line.HasSwitch(switches::kDisableFullScreen);
prefs.css_regions_enabled =
command_line.HasSwitch(switches::kEnableCssRegions);
-
+ prefs.css_shaders_enabled =
+ command_line.HasSwitch(switches::kEnableCssShaders);
#if defined(OS_MACOSX)
bool default_enable_scroll_animator = true;
diff --git a/content/common/view_messages.h b/content/common/view_messages.h
index 2eb279e..8916bbf 100644
--- a/content/common/view_messages.h
+++ b/content/common/view_messages.h
@@ -212,6 +212,7 @@ IPC_STRUCT_TRAITS_BEGIN(WebPreferences)
IPC_STRUCT_TRAITS_MEMBER(per_tile_painting_enabled)
IPC_STRUCT_TRAITS_MEMBER(password_echo_enabled)
IPC_STRUCT_TRAITS_MEMBER(css_regions_enabled)
+ IPC_STRUCT_TRAITS_MEMBER(css_shaders_enabled)
IPC_STRUCT_TRAITS_END()
IPC_STRUCT_TRAITS_BEGIN(WebMenuItem)
diff --git a/content/public/common/content_switches.cc b/content/public/common/content_switches.cc
index 135dc3d..445cb90 100644
--- a/content/public/common/content_switches.cc
+++ b/content/public/common/content_switches.cc
@@ -242,6 +242,9 @@ const char kEnableCompositeToTexture[] = "enable-composite-to-texture";
// Enables CSS3 regions
const char kEnableCssRegions[] = "enable-css-regions";
+// Enables CSS3 custom filters
+const char kEnableCssShaders[] = "enable-css-shaders";
+
// Enables device motion events.
const char kEnableDeviceMotion[] = "enable-device-motion";
diff --git a/content/public/common/content_switches.h b/content/public/common/content_switches.h
index 70d770a..e5e8a7a 100644
--- a/content/public/common/content_switches.h
+++ b/content/public/common/content_switches.h
@@ -82,6 +82,7 @@ extern const char kEnableAccessibilityLogging[];
extern const char kEnableBrowserPlugin[];
CONTENT_EXPORT extern const char kEnableCompositingForFixedPosition[];
extern const char kEnableCssRegions[];
+extern const char kEnableCssShaders[];
CONTENT_EXPORT extern const char kEnableDeferred2dCanvas[];
extern const char kEnableCompositeToTexture[];
CONTENT_EXPORT extern const char kEnableDeviceMotion[];