cc/layer.cc - Issue 11361223: cc: Remove cc::settings, move them to LayerTreeSettings.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: cc/layer.cc

Issue 11361223: cc: Remove cc::settings, move them to LayerTreeSettings. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Using WebLayerTreeSettings for things WebKit can set Created 8 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: cc/layer.cc

diff --git a/cc/layer.cc b/cc/layer.cc

index e300fe08c7278d2a6c5b6ec7f2c31c1e245f6a0e..2a4738f4ff8081313b700d9eb593880f0e148f07 100644

--- a/cc/layer.cc

+++ b/cc/layer.cc

@@ -9,7 +9,6 @@

#include "cc/layer_animation_controller.h"

#include "cc/layer_impl.h"

#include "cc/layer_tree_host.h"

-#include "cc/settings.h"

#include "third_party/skia/include/core/SkImageFilter.h"

#include "ui/gfx/rect_conversions.h"

#include <public/WebAnimationDelegate.h>

@@ -768,7 +767,7 @@ bool Layer::addAnimation(scoped_ptr <ActiveAnimation> animation)

if (!m_layerTreeHost)

return false;

- if (!Settings::acceleratedAnimationEnabled())

+ if (!m_layerTreeHost->settings().acceleratedAnimationEnabled)

return false;

m_layerAnimationController->addAnimation(animation.Pass());