summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbear.travis@gmail.com <bear.travis@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-11 01:11:57 +0000
committerbear.travis@gmail.com <bear.travis@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-11 01:11:57 +0000
commitc76f58baf6552f5409490cf3d260ca9788f70e6b (patch)
tree5afa429802328448b4334fe8d111b1654dc36aaf
parent2c227ffdb8dd2c030482ac700da77ca6564f4458 (diff)
downloadchromium_src-c76f58baf6552f5409490cf3d260ca9788f70e6b.zip
chromium_src-c76f58baf6552f5409490cf3d260ca9788f70e6b.tar.gz
chromium_src-c76f58baf6552f5409490cf3d260ca9788f70e6b.tar.bz2
Add CSS exclusions command-line switch
Connects a command-line switch to the exclusions WebRuntimeFeature methods added for https://bugs.webkit.org/show_bug.cgi?id=91420 Contributed by betravis@adobe.com Review URL: https://chromiumcodereview.appspot.com/10832183 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151172 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--AUTHORS2
-rw-r--r--content/browser/renderer_host/render_process_host_impl.cc1
-rw-r--r--content/public/common/content_switches.cc3
-rw-r--r--content/public/common/content_switches.h1
-rw-r--r--content/renderer/render_thread_impl.cc3
5 files changed, 10 insertions, 0 deletions
diff --git a/AUTHORS b/AUTHORS
index bf8914d..423ea26 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -195,3 +195,5 @@ Petar Jovanovic <petarj@mips.com>
Sergio Carlos Morales Angeles <carloschilazo@gmail.com>
Mihai Maerean <mmaerean@adobe.com>
Kaustubh Atrawalkar <kaustubh.ra@gmail.com>
+Robert Bear Travis <betravis@adobe.com>
+Robert Bear Travis <bear.travis@gmail.com>
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
index ded3848..cae1053 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -752,6 +752,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
switches::kDisableWebSockets,
switches::kDomAutomationController,
switches::kEnableAccessibilityLogging,
+ switches::kEnableCssExclusions,
switches::kEnableDCHECK,
switches::kEnableEncryptedMedia,
switches::kEnableFixedLayout,
diff --git a/content/public/common/content_switches.cc b/content/public/common/content_switches.cc
index 52b3336..b30fc2366 100644
--- a/content/public/common/content_switches.cc
+++ b/content/public/common/content_switches.cc
@@ -255,6 +255,9 @@ const char kEnableAccessibilityLogging[] = "enable-accessibility-logging";
const char kEnableCompositingForFixedPosition[] =
"enable-fixed-position-compositing";
+// Enables CSS3 exclusions
+const char kEnableCssExclusions[] = "enable-css-exclusions";
+
// Enables CSS3 regions
const char kEnableCssRegions[] = "enable-css-regions";
diff --git a/content/public/common/content_switches.h b/content/public/common/content_switches.h
index 38908de..dc0b57e 100644
--- a/content/public/common/content_switches.h
+++ b/content/public/common/content_switches.h
@@ -93,6 +93,7 @@ CONTENT_EXPORT extern const char kEnableAcceleratedFilters[];
extern const char kEnableAcceleratedPlugins[];
extern const char kEnableAccessibilityLogging[];
CONTENT_EXPORT extern const char kEnableCompositingForFixedPosition[];
+extern const char kEnableCssExclusions[];
extern const char kEnableCssRegions[];
extern const char kEnableCssShaders[];
extern const char kEnableCssVariables[];
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
index a40b54f..35ab4ec 100644
--- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc
@@ -618,6 +618,9 @@ void RenderThreadImpl::EnsureWebKitInitialized() {
WebRuntimeFeatures::enableStyleScoped(
command_line.HasSwitch(switches::kEnableStyleScoped));
+ WebRuntimeFeatures::enableCSSExclusions(
+ command_line.HasSwitch(switches::kEnableCssExclusions));
+
FOR_EACH_OBSERVER(RenderProcessObserver, observers_, WebKitInitialized());
if (content::GetContentClient()->renderer()->