Index: cc/layers/layer.cc |
diff --git a/cc/layers/layer.cc b/cc/layers/layer.cc |
index ca0e3b8e99f607d3a3e284abcbc5e454b8ec7c21..19b505b49618f20930f7d55212eb63f072d5349a 100644 |
--- a/cc/layers/layer.cc |
+++ b/cc/layers/layer.cc |
@@ -71,7 +71,7 @@ Layer::Layer() |
force_render_surface_(false), |
transform_is_invertible_(true), |
has_render_surface_(false), |
- scroll_blocks_on_(SCROLL_BLOCKS_ON_NONE), |
+ scroll_blocks_on_(ScrollBlocksOnNone), |
background_color_(0), |
opacity_(1.f), |
blend_mode_(SkXfermode::kSrcOver_Mode), |
@@ -471,7 +471,7 @@ void Layer::SetFilters(const FilterOperations& filters) { |
} |
bool Layer::FilterIsAnimating() const { |
- return layer_animation_controller_->IsAnimatingProperty(Animation::FILTER); |
+ return layer_animation_controller_->IsAnimatingProperty(Animation::Filter); |
} |
void Layer::SetBackgroundFilters(const FilterOperations& filters) { |
@@ -491,7 +491,7 @@ void Layer::SetOpacity(float opacity) { |
} |
bool Layer::OpacityIsAnimating() const { |
- return layer_animation_controller_->IsAnimatingProperty(Animation::OPACITY); |
+ return layer_animation_controller_->IsAnimatingProperty(Animation::Opacity); |
} |
bool Layer::OpacityCanAnimateOnImplThread() const { |
@@ -601,7 +601,7 @@ bool Layer::AnimationsPreserveAxisAlignment() const { |
} |
bool Layer::TransformIsAnimating() const { |
- return layer_animation_controller_->IsAnimatingProperty(Animation::TRANSFORM); |
+ return layer_animation_controller_->IsAnimatingProperty(Animation::Transform); |
} |
void Layer::SetScrollParent(Layer* parent) { |
@@ -909,7 +909,7 @@ void Layer::PushPropertiesTo(LayerImpl* layer) { |
draw_checkerboard_for_missing_tiles_); |
layer->SetDrawsContent(DrawsContent()); |
layer->SetHideLayerAndSubtree(hide_layer_and_subtree_); |
- layer->SetHasRenderSurface(has_render_surface_ || layer->HasCopyRequest()); |
+ layer->SetHasRenderSurface(has_render_surface_); |
if (!layer->FilterIsAnimatingOnImplOnly() && !FilterIsAnimating()) |
layer->SetFilters(filters_); |
DCHECK(!(FilterIsAnimating() && layer->FilterIsAnimatingOnImplOnly())); |
@@ -1181,7 +1181,7 @@ bool Layer::AddAnimation(scoped_ptr <Animation> animation) { |
if (!layer_animation_controller_->animation_registrar()) |
return false; |
- if (animation->target_property() == Animation::SCROLL_OFFSET && |
+ if (animation->target_property() == Animation::ScrollOffset && |
!layer_animation_controller_->animation_registrar() |
->supports_scroll_animations()) |
return false; |
@@ -1240,6 +1240,10 @@ RenderingStatsInstrumentation* Layer::rendering_stats_instrumentation() const { |
return layer_tree_host_->rendering_stats_instrumentation(); |
} |
+bool Layer::SupportsLCDText() const { |
+ return false; |
+} |
+ |
void Layer::RemoveFromScrollTree() { |
if (scroll_children_.get()) { |
std::set<Layer*> copy = *scroll_children_; |