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

Unified Diff: cc/layers/layer.cc

Issue 15995031: cc: Don't clear transparent piles to an opaque color (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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.h ('k') | cc/layers/layer_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layers/layer.cc
diff --git a/cc/layers/layer.cc b/cc/layers/layer.cc
index 8826b669b9f4b2d007e0c6fe52686e91ded14047..a3f16ed688ccd30a8cf46aa61467b7cbd51b6765 100644
--- a/cc/layers/layer.cc
+++ b/cc/layers/layer.cc
@@ -343,6 +343,25 @@ void Layer::SetBackgroundColor(SkColor background_color) {
SetNeedsCommit();
}
+SkColor Layer::SafeOpaqueBackgroundColor() const {
+ SkColor color = background_color();
+ if (SkColorGetA(color) == 255 && !contents_opaque()) {
+ color = SK_ColorTRANSPARENT;
+ } else if (SkColorGetA(color) != 255 && contents_opaque()) {
+ for (const Layer* layer = parent(); layer;
+ layer = layer->parent()) {
+ color = layer->background_color();
+ if (SkColorGetA(color) == 255)
+ break;
+ }
+ if (SkColorGetA(color) != 255)
+ color = layer_tree_host_->background_color();
+ if (SkColorGetA(color) != 255)
+ color = SkColorSetA(color, 255);
+ }
+ return color;
+}
+
void Layer::CalculateContentsScale(
float ideal_contents_scale,
float device_scale_factor,
« no previous file with comments | « cc/layers/layer.h ('k') | cc/layers/layer_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698