diff options
author | ccameron <ccameron@chromium.org> | 2016-01-11 18:46:53 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-01-12 02:47:37 +0000 |
commit | cb169224a678a3a127975535e383b37711d4ef4b (patch) | |
tree | f326599b1458eeea0132ca22cd9183fcdf6f7297 /cc/output | |
parent | 57c85d1742a4f52b054e348bdd16b33806e474ef (diff) | |
download | chromium_src-cb169224a678a3a127975535e383b37711d4ef4b.zip chromium_src-cb169224a678a3a127975535e383b37711d4ef4b.tar.gz chromium_src-cb169224a678a3a127975535e383b37711d4ef4b.tar.bz2 |
Mac Overlays: Initialize edge aa mask
BUG=567946
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
Review URL: https://codereview.chromium.org/1573543002
Cr-Commit-Position: refs/heads/master@{#368780}
Diffstat (limited to 'cc/output')
-rw-r--r-- | cc/output/ca_layer_overlay.cc | 7 | ||||
-rw-r--r-- | cc/output/ca_layer_overlay.h | 10 |
2 files changed, 7 insertions, 10 deletions
diff --git a/cc/output/ca_layer_overlay.cc b/cc/output/ca_layer_overlay.cc index 01922ef..8704a06 100644 --- a/cc/output/ca_layer_overlay.cc +++ b/cc/output/ca_layer_overlay.cc @@ -136,6 +136,7 @@ CALayerResult FromDrawQuad(ResourceProvider* resource_provider, } // Enable edge anti-aliasing only on layer boundaries. + ca_layer_overlay->edge_aa_mask = 0; if (quad->IsLeftEdge()) ca_layer_overlay->edge_aa_mask |= GL_CA_LAYER_EDGE_LEFT_CHROMIUM; if (quad->IsRightEdge()) @@ -210,11 +211,7 @@ CALayerResult FromDrawQuad(ResourceProvider* resource_provider, } // namespace -CALayerOverlay::CALayerOverlay() - : contents_resource_id(0), - opacity(1), - background_color(SK_ColorTRANSPARENT), - transform(SkMatrix44::kIdentity_Constructor) {} +CALayerOverlay::CALayerOverlay() {} CALayerOverlay::~CALayerOverlay() {} diff --git a/cc/output/ca_layer_overlay.h b/cc/output/ca_layer_overlay.h index 3e8bd4a..ab234f4 100644 --- a/cc/output/ca_layer_overlay.h +++ b/cc/output/ca_layer_overlay.h @@ -22,19 +22,19 @@ class CC_EXPORT CALayerOverlay { // Texture that corresponds to an IOSurface to set as the content of the // CALayer. If this is 0 then the CALayer is a solid color. - unsigned contents_resource_id; + unsigned contents_resource_id = 0; // The contents rect property for the CALayer. gfx::RectF contents_rect; // The opacity property for the CAayer. - float opacity; + float opacity = 1; // The background color property for the CALayer. - SkColor background_color; + SkColor background_color = SK_ColorTRANSPARENT; // The edge anti-aliasing mask property for the CALayer. - unsigned edge_aa_mask; + unsigned edge_aa_mask = 0; // The bounds for the CALayer in pixels. gfx::SizeF bounds_size; // The transform to apply to the CALayer. - SkMatrix44 transform; + SkMatrix44 transform = SkMatrix44(SkMatrix44::kIdentity_Constructor); }; typedef std::vector<CALayerOverlay> CALayerOverlayList; |