diff options
| author | jbauman@chromium.org <jbauman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-28 05:21:09 +0000 |
|---|---|---|
| committer | jbauman@chromium.org <jbauman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-28 05:21:09 +0000 |
| commit | 672c934384d168e8aafaf2b8c4207cb6d20e4fcd (patch) | |
| tree | 0fe5df01500cf86eb3e6e825d665d099b5fac7f7 /ui | |
| parent | 4002002051b55045953017b4fb69015dd75fcf84 (diff) | |
| download | chromium_src-672c934384d168e8aafaf2b8c4207cb6d20e4fcd.zip chromium_src-672c934384d168e8aafaf2b8c4207cb6d20e4fcd.tar.gz chromium_src-672c934384d168e8aafaf2b8c4207cb6d20e4fcd.tar.bz2 | |
Revert 144578 - Disable core animation plugins when compositing is unavailable.
When compositing is disabled or blacklisted we won't be able to composite core animation plugins, so disable them.
BUG=122430
TEST=flash works on nytimes.com with --disable-accelerated-compositing
Review URL: https://chromiumcodereview.appspot.com/10542112
TBR=jbauman@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10698028
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@144665 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/base/ui_base_switches.cc | 4 | ||||
| -rw-r--r-- | ui/base/ui_base_switches.h | 1 |
2 files changed, 0 insertions, 5 deletions
diff --git a/ui/base/ui_base_switches.cc b/ui/base/ui_base_switches.cc index b4c1ca3..9e106fc 100644 --- a/ui/base/ui_base_switches.cc +++ b/ui/base/ui_base_switches.cc @@ -66,10 +66,6 @@ const char kTouchOptimizedUIDisabled[] = "disabled"; #if defined(OS_MACOSX) const char kDisableCompositedCoreAnimationPlugins[] = "disable-composited-core-animation-plugins"; -// Disables using core animation in plugins. This is triggered when accelerated -// compositing is disabled. See http://crbug.com/122430 -const char kDisableCoreAnimationPlugins[] = - "disable-core-animation-plugins"; #endif #if defined(TOOLKIT_VIEWS) && defined(OS_LINUX) diff --git a/ui/base/ui_base_switches.h b/ui/base/ui_base_switches.h index 7f8de82..c8f3bc7 100644 --- a/ui/base/ui_base_switches.h +++ b/ui/base/ui_base_switches.h @@ -36,7 +36,6 @@ UI_EXPORT extern const char kTouchOptimizedUIEnabled[]; // convenient place where it can be shared between // src/webkit/plugins/npapi/ and src/content/plugin/ . UI_EXPORT extern const char kDisableCompositedCoreAnimationPlugins[]; -UI_EXPORT extern const char kDisableCoreAnimationPlugins[]; #endif #if defined(TOOLKIT_VIEWS) && defined(OS_LINUX) |