Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(724)

Unified Diff: cc/layers/layer_impl.h

Issue 2018833002: cc : Delete LayerImpl::opacity (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/layers/layer.cc ('k') | cc/layers/layer_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layers/layer_impl.h
diff --git a/cc/layers/layer_impl.h b/cc/layers/layer_impl.h
index 89f3c33b5595f0b1fe2cba85a0ce9fb09a8461c2..141b610f6c3d12922976278789658f01fa4615da 100644
--- a/cc/layers/layer_impl.h
+++ b/cc/layers/layer_impl.h
@@ -100,7 +100,6 @@ class CC_EXPORT LayerImpl {
void OnOpacityIsCurrentlyAnimatingChanged(bool is_currently_animating);
void OnOpacityIsPotentiallyAnimatingChanged(bool has_potential_animation);
bool IsActive() const;
- bool OpacityCanAnimateOnImplThread() const { return false; }
// Tree structure.
LayerImpl* parent() { return parent_; }
@@ -147,7 +146,7 @@ class CC_EXPORT LayerImpl {
void UpdatePropertyTreeTransform();
void UpdatePropertyTreeTransformIsAnimated(bool is_animated);
- void UpdatePropertyTreeOpacity();
+ void UpdatePropertyTreeOpacity(float opacity);
void UpdatePropertyTreeScrollOffset();
// For compatibility with Layer.
@@ -232,8 +231,7 @@ class CC_EXPORT LayerImpl {
void SetContentsOpaque(bool opaque);
bool contents_opaque() const { return contents_opaque_; }
- void SetOpacity(float opacity);
- float opacity() const { return opacity_; }
+ float Opacity() const;
bool OpacityIsAnimating() const;
bool HasPotentiallyRunningOpacityAnimation() const;
@@ -593,7 +591,6 @@ class CC_EXPORT LayerImpl {
SkColor background_color_;
SkColor safe_opaque_background_color_;
- float opacity_;
SkXfermode::Mode blend_mode_;
// draw_blend_mode may be different than blend_mode_,
// when a RenderSurface re-parents the layer's blend_mode.
« no previous file with comments | « cc/layers/layer.cc ('k') | cc/layers/layer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698