SurfaceAggregator should check whether output is secure when drawin

cc/layers/texture_layer_impl.cc

 // Copyright 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/layers/texture_layer_impl.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <vector>
@@ skipping 151 matching lines @@
   gfx::Rect visible_quad_rect =
       draw_properties().occlusion_in_content_space.GetUnoccludedContentRect(
           quad_rect);
   if (visible_quad_rect.IsEmpty())
     return;
 
   if (!vertex_opacity_[0] && !vertex_opacity_[1] && !vertex_opacity_[2] &&
       !vertex_opacity_[3])
     return;
 
-  if (!texture_mailbox_.secure_output_only() ||
-      (layer_tree_impl()->OutputIsSecure() && !InsideCopyRequest())) {
-    TextureDrawQuad* quad =
-        render_pass->CreateAndAppendDrawQuad<TextureDrawQuad>();
-    ResourceId id =
-        valid_texture_copy_ ? texture_copy_->id() : external_texture_resource_;
-    quad->SetNew(shared_quad_state, quad_rect, opaque_rect, visible_quad_rect,
-                 id, premultiplied_alpha_, uv_top_left_, uv_bottom_right_,
-                 bg_color, vertex_opacity_, flipped_, nearest_neighbor_);
-    if (!valid_texture_copy_) {
-      quad->set_resource_size_in_pixels(texture_mailbox_.size_in_pixels());
-    }
-    ValidateQuadResources(quad);
-  } else {
-    SolidColorDrawQuad* quad =
-        render_pass->CreateAndAppendDrawQuad<SolidColorDrawQuad>();
-    quad->SetNew(shared_quad_state, quad_rect, visible_quad_rect, SK_ColorBLACK,
-                 false);
+  TextureDrawQuad* quad =
+      render_pass->CreateAndAppendDrawQuad<TextureDrawQuad>();
+  ResourceId id =
+      valid_texture_copy_ ? texture_copy_->id() : external_texture_resource_;
+  quad->SetNew(shared_quad_state, quad_rect, opaque_rect, visible_quad_rect, id,
+               premultiplied_alpha_, uv_top_left_, uv_bottom_right_, bg_color,
+               vertex_opacity_, flipped_, nearest_neighbor_,
+               texture_mailbox_.secure_output_only());
+  if (!valid_texture_copy_) {
+    quad->set_resource_size_in_pixels(texture_mailbox_.size_in_pixels());
   }
+  ValidateQuadResources(quad);
 }
 
 SimpleEnclosedRegion TextureLayerImpl::VisibleOpaqueRegion() const {
   if (contents_opaque())
     return SimpleEnclosedRegion(visible_layer_rect());
 
   if (blend_background_color_ && (SkColorGetA(background_color()) == 0xFF))
     return SimpleEnclosedRegion(visible_layer_rect());
 
   return SimpleEnclosedRegion();
@@ skipping 65 matching lines @@
   } else if (external_texture_resource_) {
     DCHECK(!own_mailbox_);
     ResourceProvider* resource_provider =
         layer_tree_impl()->resource_provider();
     resource_provider->DeleteResource(external_texture_resource_);
     external_texture_resource_ = 0;
   }
 }
 
 }  // namespace cc