Chromium Code Reviews| Index: Source/web/ChromeClientImpl.cpp |
| diff --git a/Source/web/ChromeClientImpl.cpp b/Source/web/ChromeClientImpl.cpp |
| index aca8853236931b95f9e3ec3960271a192b152567..17d9d3268ed1f550e52259af7182df177b6d1ca5 100644 |
| --- a/Source/web/ChromeClientImpl.cpp |
| +++ b/Source/web/ChromeClientImpl.cpp |
| @@ -731,10 +731,10 @@ WebCore::CompositingTriggerFlags ChromeClientImpl::allowedCompositingTriggers() |
| flags |= WebCore::VideoTrigger; |
| if (settings.acceleratedCompositingForPluginsEnabled()) |
| flags |= WebCore::PluginTrigger; |
| - if (settings.acceleratedCompositingForAnimationEnabled()) |
| - flags |= WebCore::AnimationTrigger; |
| if (settings.acceleratedCompositingForCanvasEnabled()) |
|
ojan
2014/04/11 02:10:24
Reordered these to match the order in Settings.in.
|
| flags |= WebCore::CanvasTrigger; |
| + if (settings.acceleratedCompositingForAnimationEnabled()) |
| + flags |= WebCore::AnimationTrigger; |
| if (settings.acceleratedCompositingForScrollableFramesEnabled()) |
| flags |= WebCore::ScrollableInnerFrameTrigger; |
| if (settings.acceleratedCompositingForFiltersEnabled()) |