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

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

Issue 1175113010: cc: Rename visible_content_rect and content stuff on quads. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rename-visible-content-rect: moreandroid Created 5 years, 6 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/layer_impl.h ('k') | cc/layers/nine_patch_layer_impl_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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 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/layer_impl.h" 5 #include "cc/layers/layer_impl.h"
6 6
7 #include "base/json/json_reader.h" 7 #include "base/json/json_reader.h"
8 #include "base/numerics/safe_conversions.h" 8 #include "base/numerics/safe_conversions.h"
9 #include "base/strings/stringprintf.h" 9 #include "base/strings/stringprintf.h"
10 #include "base/trace_event/trace_event.h" 10 #include "base/trace_event/trace_event.h"
(...skipping 265 matching lines...) Expand 10 before | Expand all | Expand 10 after
276 layer_tree_impl()->set_needs_update_draw_properties(); 276 layer_tree_impl()->set_needs_update_draw_properties();
277 } 277 }
278 278
279 void LayerImpl::ClearRenderSurfaceLayerList() { 279 void LayerImpl::ClearRenderSurfaceLayerList() {
280 if (render_surface_) 280 if (render_surface_)
281 render_surface_->ClearLayerLists(); 281 render_surface_->ClearLayerLists();
282 } 282 }
283 283
284 void LayerImpl::PopulateSharedQuadState(SharedQuadState* state) const { 284 void LayerImpl::PopulateSharedQuadState(SharedQuadState* state) const {
285 state->SetAll(draw_properties_.target_space_transform, bounds(), 285 state->SetAll(draw_properties_.target_space_transform, bounds(),
286 draw_properties_.visible_content_rect, 286 draw_properties_.visible_layer_rect, draw_properties_.clip_rect,
287 draw_properties_.clip_rect, draw_properties_.is_clipped, 287 draw_properties_.is_clipped, draw_properties_.opacity,
288 draw_properties_.opacity, draw_properties_.blend_mode, 288 draw_properties_.blend_mode, sorting_context_id_);
289 sorting_context_id_);
290 } 289 }
291 290
292 void LayerImpl::PopulateScaledSharedQuadState(SharedQuadState* state, 291 void LayerImpl::PopulateScaledSharedQuadState(SharedQuadState* state,
293 float scale) const { 292 float scale) const {
294 gfx::Transform scaled_draw_transform = 293 gfx::Transform scaled_draw_transform =
295 draw_properties_.target_space_transform; 294 draw_properties_.target_space_transform;
296 scaled_draw_transform.Scale(SK_MScalar1 / scale, SK_MScalar1 / scale); 295 scaled_draw_transform.Scale(SK_MScalar1 / scale, SK_MScalar1 / scale);
297 gfx::Size scaled_bounds = gfx::ToCeiledSize(gfx::ScaleSize(bounds(), scale)); 296 gfx::Size scaled_bounds = gfx::ToCeiledSize(gfx::ScaleSize(bounds(), scale));
298 gfx::Rect scaled_visible_content_rect = 297 gfx::Rect scaled_visible_layer_rect =
299 gfx::ScaleToEnclosingRect(visible_content_rect(), scale); 298 gfx::ScaleToEnclosingRect(visible_layer_rect(), scale);
300 scaled_visible_content_rect.Intersect(gfx::Rect(scaled_bounds)); 299 scaled_visible_layer_rect.Intersect(gfx::Rect(scaled_bounds));
301 300
302 state->SetAll(scaled_draw_transform, scaled_bounds, 301 state->SetAll(scaled_draw_transform, scaled_bounds, scaled_visible_layer_rect,
303 scaled_visible_content_rect, draw_properties().clip_rect, 302 draw_properties().clip_rect, draw_properties().is_clipped,
304 draw_properties().is_clipped, draw_properties().opacity, 303 draw_properties().opacity, draw_properties().blend_mode,
305 draw_properties().blend_mode, sorting_context_id_); 304 sorting_context_id_);
306 } 305 }
307 306
308 bool LayerImpl::WillDraw(DrawMode draw_mode, 307 bool LayerImpl::WillDraw(DrawMode draw_mode,
309 ResourceProvider* resource_provider) { 308 ResourceProvider* resource_provider) {
310 // WillDraw/DidDraw must be matched. 309 // WillDraw/DidDraw must be matched.
311 DCHECK_NE(DRAW_MODE_NONE, draw_mode); 310 DCHECK_NE(DRAW_MODE_NONE, draw_mode);
312 DCHECK_EQ(DRAW_MODE_NONE, current_draw_mode_); 311 DCHECK_EQ(DRAW_MODE_NONE, current_draw_mode_);
313 current_draw_mode_ = draw_mode; 312 current_draw_mode_ = draw_mode;
314 return true; 313 return true;
315 } 314 }
(...skipping 941 matching lines...) Expand 10 before | Expand all | Expand 10 after
1257 } 1256 }
1258 1257
1259 void LayerImpl::SetDoubleSided(bool double_sided) { 1258 void LayerImpl::SetDoubleSided(bool double_sided) {
1260 if (double_sided_ == double_sided) 1259 if (double_sided_ == double_sided)
1261 return; 1260 return;
1262 1261
1263 double_sided_ = double_sided; 1262 double_sided_ = double_sided;
1264 NoteLayerPropertyChangedForSubtree(); 1263 NoteLayerPropertyChangedForSubtree();
1265 } 1264 }
1266 1265
1267 SimpleEnclosedRegion LayerImpl::VisibleContentOpaqueRegion() const { 1266 SimpleEnclosedRegion LayerImpl::VisibleOpaqueRegion() const {
1268 if (contents_opaque()) 1267 if (contents_opaque())
1269 return SimpleEnclosedRegion(visible_content_rect()); 1268 return SimpleEnclosedRegion(visible_layer_rect());
1270 return SimpleEnclosedRegion(); 1269 return SimpleEnclosedRegion();
1271 } 1270 }
1272 1271
1273 void LayerImpl::DidBeginTracing() {} 1272 void LayerImpl::DidBeginTracing() {}
1274 1273
1275 void LayerImpl::ReleaseResources() {} 1274 void LayerImpl::ReleaseResources() {}
1276 1275
1277 void LayerImpl::RecreateResources() { 1276 void LayerImpl::RecreateResources() {
1278 } 1277 }
1279 1278
(...skipping 385 matching lines...) Expand 10 before | Expand all | Expand 10 after
1665 gfx::Rect LayerImpl::GetScaledEnclosingRectInTargetSpace(float scale) const { 1664 gfx::Rect LayerImpl::GetScaledEnclosingRectInTargetSpace(float scale) const {
1666 gfx::Transform scaled_draw_transform = 1665 gfx::Transform scaled_draw_transform =
1667 draw_properties_.target_space_transform; 1666 draw_properties_.target_space_transform;
1668 scaled_draw_transform.Scale(SK_MScalar1 / scale, SK_MScalar1 / scale); 1667 scaled_draw_transform.Scale(SK_MScalar1 / scale, SK_MScalar1 / scale);
1669 gfx::Size scaled_bounds = gfx::ToCeiledSize(gfx::ScaleSize(bounds(), scale)); 1668 gfx::Size scaled_bounds = gfx::ToCeiledSize(gfx::ScaleSize(bounds(), scale));
1670 return MathUtil::MapEnclosingClippedRect(scaled_draw_transform, 1669 return MathUtil::MapEnclosingClippedRect(scaled_draw_transform,
1671 gfx::Rect(scaled_bounds)); 1670 gfx::Rect(scaled_bounds));
1672 } 1671 }
1673 1672
1674 } // namespace cc 1673 } // namespace cc
OLDNEW
« no previous file with comments | « cc/layers/layer_impl.h ('k') | cc/layers/nine_patch_layer_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698