summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chrome/app/generated_resources.grd16
-rw-r--r--chrome/browser/about_flags.cc8
-rw-r--r--chrome/browser/chromeos/login/login_utils.cc2
-rw-r--r--chrome/browser/gpu_util.cc2
-rw-r--r--content/browser/web_contents/web_contents_impl.cc2
-rw-r--r--content/public/common/content_switches.cc4
-rw-r--r--content/public/common/content_switches.h2
7 files changed, 18 insertions, 18 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 6dbbe48..17549e1 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -5252,10 +5252,10 @@ Keep your key file in a safe place. You will need it to create new versions of y
<message name="IDS_FLAGS_THREADED_COMPOSITING_MODE_DISABLED" desc="Option name for turning off threaded compositing">
Disabled
</message>
- <message name="IDS_FLAGS_ENABLE_THREADED_ANIMATION_NAME" desc="Name of the 'Enable accelerated CSS animations' lab.">
- Enable accelerated CSS animations
+ <message name="IDS_FLAGS_DISABLE_THREADED_ANIMATION_NAME" desc="Name of the 'Disable accelerated CSS animations' lab.">
+ Disable accelerated CSS animations
</message>
- <message name="IDS_FLAGS_ENABLE_THREADED_ANIMATION_DESCRIPTION" desc="Description of the 'Enable accelerated CSS animations' lab.">
+ <message name="IDS_FLAGS_DISABLE_THREADED_ANIMATION_DESCRIPTION" desc="Description of the 'Disable accelerated CSS animations' lab.">
When threaded compositing is enabled, accelerated CSS animations run on the compositing thread. However, there may be performance gains running with accelerated CSS animations, even without the compositor thread.
</message>
<message name="IDS_FLAGS_WEBGL_NAME" desc="Name of the 'WebGL' lab.">
@@ -11880,23 +11880,23 @@ Some features may be unavailable. Please check that the profile exists and you
<message name="IDS_GOOGLE_MAILTO_HANDLER_URL">
https:////mail.google.com//mail//?extsrc=mailto&amp;url=%s
</message>
-
+
<!-- The name for the Google mailto service. -->
<message name="IDS_GOOGLE_MAILTO_HANDLER_NAME">
Google.com Mail
</message>
-
+
<!-- The URL for the Google webcal service. -->
<message name="IDS_GOOGLE_WEBCAL_HANDLER_URL">
https:////www.google.com//calendar//render?cid=%s
</message>
-
+
<!-- The name for the Google webcal service. -->
<message name="IDS_GOOGLE_WEBCAL_HANDLER_NAME">
Google Calendar
</message>
</if>
-
+
<!-- Sync promo page chrome://signin -->
<message name="IDS_SYNC_PROMO_TAB_TITLE" desc="The title of the sync promo tab.">
Sign in
@@ -16324,7 +16324,7 @@ Battery full
When enabled, will use ClientOAuth to connect a profile to a Google account. Otherwise ClientLogin is used.
ClientOAuth permits using OTPs instead of ASPs to during authentication.
</message>
-
+
</messages>
<structures fallback_to_english="true">
<!-- Make sure these stay in sync with the structures in generated_resources.grd. -->
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 269be54..9eee218 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -197,11 +197,11 @@ const Experiment kExperiments[] = {
MULTI_VALUE_TYPE(kThreadedCompositingModeChoices)
},
{
- "enable-threaded-animation",
- IDS_FLAGS_ENABLE_THREADED_ANIMATION_NAME,
- IDS_FLAGS_ENABLE_THREADED_ANIMATION_DESCRIPTION,
+ "disable-threaded-animation",
+ IDS_FLAGS_DISABLE_THREADED_ANIMATION_NAME,
+ IDS_FLAGS_DISABLE_THREADED_ANIMATION_DESCRIPTION,
kOsAll,
- SINGLE_VALUE_TYPE(switches::kEnableThreadedAnimation)
+ SINGLE_VALUE_TYPE(switches::kDisableThreadedAnimation)
},
{
"composited-layer-borders",
diff --git a/chrome/browser/chromeos/login/login_utils.cc b/chrome/browser/chromeos/login/login_utils.cc
index b2c05381..0f5bcb6 100644
--- a/chrome/browser/chromeos/login/login_utils.cc
+++ b/chrome/browser/chromeos/login/login_utils.cc
@@ -1053,7 +1053,7 @@ std::string LoginUtilsImpl::GetOffTheRecordCommandLine(
::switches::kDisableLoginAnimations,
::switches::kDisableSeccompFilterSandbox,
::switches::kDisableSeccompSandbox,
- ::switches::kEnableThreadedAnimation,
+ ::switches::kDisableThreadedAnimation,
::switches::kEnableDevicePolicy,
::switches::kEnableGView,
::switches::kEnableLogging,
diff --git a/chrome/browser/gpu_util.cc b/chrome/browser/gpu_util.cc
index 5ffe508..e388d90 100644
--- a/chrome/browser/gpu_util.cc
+++ b/chrome/browser/gpu_util.cc
@@ -229,7 +229,7 @@ Value* GetFeatureStatus() {
{
"css_animation",
flags & content::GPU_FEATURE_TYPE_ACCELERATED_COMPOSITING,
- !command_line.HasSwitch(switches::kEnableThreadedAnimation) ||
+ command_line.HasSwitch(switches::kDisableThreadedAnimation) ||
command_line.HasSwitch(switches::kDisableAcceleratedCompositing),
"Accelerated CSS animation has been disabled at the command line.",
true
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index c500a88..5b75037 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -456,7 +456,7 @@ WebPreferences WebContentsImpl::GetWebkitPrefs(RenderViewHost* rvh,
prefs.deferred_2d_canvas_enabled =
!command_line.HasSwitch(switches::kDisableDeferred2dCanvas);
prefs.threaded_animation_enabled =
- command_line.HasSwitch(switches::kEnableThreadedAnimation);
+ !command_line.HasSwitch(switches::kDisableThreadedAnimation);
prefs.accelerated_painting_enabled =
GpuProcessHost::gpu_enabled() &&
command_line.HasSwitch(switches::kEnableAcceleratedPainting);
diff --git a/content/public/common/content_switches.cc b/content/public/common/content_switches.cc
index aa1209a..5f7544c 100644
--- a/content/public/common/content_switches.cc
+++ b/content/public/common/content_switches.cc
@@ -184,8 +184,8 @@ const char kDisableSpeechInput[] = "disable-speech-input";
// Enables scripted speech api.
const char kEnableScriptedSpeech[] = "enable-scripted-speech";
-// Enables animation on the compositor thread.
-const char kEnableThreadedAnimation[] = "enable-threaded-animation";
+// Disables animation on the compositor thread.
+const char kDisableThreadedAnimation[] = "disable-threaded-animation";
// Disable web audio API.
const char kDisableWebAudio[] = "disable-webaudio";
diff --git a/content/public/common/content_switches.h b/content/public/common/content_switches.h
index dfbd025..d39cd41 100644
--- a/content/public/common/content_switches.h
+++ b/content/public/common/content_switches.h
@@ -68,7 +68,7 @@ extern const char kDisableSharedWorkers[];
extern const char kDisableSiteSpecificQuirks[];
CONTENT_EXPORT extern const char kDisableSpeechInput[];
CONTENT_EXPORT extern const char kEnableScriptedSpeech[];
-CONTENT_EXPORT extern const char kEnableThreadedAnimation[];
+CONTENT_EXPORT extern const char kDisableThreadedAnimation[];
CONTENT_EXPORT extern const char kDisableWebAudio[];
extern const char kDisableWebSecurity[];
extern const char kDisableWebSockets[];
generated by cgit v1.1 at 2025-03-29 13:23:52 +0000