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

Side by Side Diff: cc/layers/texture_layer_impl.cc

Issue 935333002: Update from https://crrev.com/316786 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 10 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 unified diff | Download patch
« no previous file with comments | « cc/layers/texture_layer_impl.h ('k') | cc/layers/texture_layer_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2011 The Chromium Authors. All rights reserved. 1 // Copyright 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "cc/layers/texture_layer_impl.h" 5 #include "cc/layers/texture_layer_impl.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/strings/stringprintf.h" 9 #include "base/strings/stringprintf.h"
10 #include "cc/output/renderer.h" 10 #include "cc/output/renderer.h"
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 gfx::Vector2d()); 134 gfx::Vector2d());
135 135
136 valid_texture_copy_ = true; 136 valid_texture_copy_ = true;
137 } 137 }
138 } 138 }
139 return (external_texture_resource_ || valid_texture_copy_) && 139 return (external_texture_resource_ || valid_texture_copy_) &&
140 LayerImpl::WillDraw(draw_mode, resource_provider); 140 LayerImpl::WillDraw(draw_mode, resource_provider);
141 } 141 }
142 142
143 void TextureLayerImpl::AppendQuads(RenderPass* render_pass, 143 void TextureLayerImpl::AppendQuads(RenderPass* render_pass,
144 const Occlusion& occlusion_in_content_space,
145 AppendQuadsData* append_quads_data) { 144 AppendQuadsData* append_quads_data) {
146 DCHECK(external_texture_resource_ || valid_texture_copy_); 145 DCHECK(external_texture_resource_ || valid_texture_copy_);
147 146
148 SharedQuadState* shared_quad_state = 147 SharedQuadState* shared_quad_state =
149 render_pass->CreateAndAppendSharedQuadState(); 148 render_pass->CreateAndAppendSharedQuadState();
150 PopulateSharedQuadState(shared_quad_state); 149 PopulateSharedQuadState(shared_quad_state);
151 150
152 AppendDebugBorderQuad( 151 AppendDebugBorderQuad(
153 render_pass, content_bounds(), shared_quad_state, append_quads_data); 152 render_pass, content_bounds(), shared_quad_state, append_quads_data);
154 153
155 SkColor bg_color = blend_background_color_ ? 154 SkColor bg_color = blend_background_color_ ?
156 background_color() : SK_ColorTRANSPARENT; 155 background_color() : SK_ColorTRANSPARENT;
157 bool opaque = contents_opaque() || (SkColorGetA(bg_color) == 0xFF); 156 bool opaque = contents_opaque() || (SkColorGetA(bg_color) == 0xFF);
158 157
159 gfx::Rect quad_rect(content_bounds()); 158 gfx::Rect quad_rect(content_bounds());
160 gfx::Rect opaque_rect = opaque ? quad_rect : gfx::Rect(); 159 gfx::Rect opaque_rect = opaque ? quad_rect : gfx::Rect();
161 gfx::Rect visible_quad_rect = 160 gfx::Rect visible_quad_rect =
162 occlusion_in_content_space.GetUnoccludedContentRect(quad_rect); 161 draw_properties().occlusion_in_content_space.GetUnoccludedContentRect(
162 quad_rect);
163 if (visible_quad_rect.IsEmpty()) 163 if (visible_quad_rect.IsEmpty())
164 return; 164 return;
165 165
166 TextureDrawQuad* quad = 166 TextureDrawQuad* quad =
167 render_pass->CreateAndAppendDrawQuad<TextureDrawQuad>(); 167 render_pass->CreateAndAppendDrawQuad<TextureDrawQuad>();
168 ResourceProvider::ResourceId id = 168 ResourceProvider::ResourceId id =
169 valid_texture_copy_ ? texture_copy_->id() : external_texture_resource_; 169 valid_texture_copy_ ? texture_copy_->id() : external_texture_resource_;
170 quad->SetNew(shared_quad_state, 170 quad->SetNew(shared_quad_state,
171 quad_rect, 171 quad_rect,
172 opaque_rect, 172 opaque_rect,
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
256 } else if (external_texture_resource_) { 256 } else if (external_texture_resource_) {
257 DCHECK(!own_mailbox_); 257 DCHECK(!own_mailbox_);
258 ResourceProvider* resource_provider = 258 ResourceProvider* resource_provider =
259 layer_tree_impl()->resource_provider(); 259 layer_tree_impl()->resource_provider();
260 resource_provider->DeleteResource(external_texture_resource_); 260 resource_provider->DeleteResource(external_texture_resource_);
261 external_texture_resource_ = 0; 261 external_texture_resource_ = 0;
262 } 262 }
263 } 263 }
264 264
265 } // namespace cc 265 } // namespace cc
OLDNEW
« no previous file with comments | « cc/layers/texture_layer_impl.h ('k') | cc/layers/texture_layer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698