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

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

Issue 2688673003: cc: Distinguish single texture mask from normal masks (Closed)
Patch Set: Created 3 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
OLDNEW
1 // Copyright 2010 The Chromium Authors. All rights reserved. 1 // Copyright 2010 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.h" 5 #include "cc/layers/layer.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <algorithm> 10 #include <algorithm>
(...skipping 402 matching lines...) Expand 10 before | Expand all | Expand 10 after
413 } 413 }
414 inputs_.mask_layer = mask_layer; 414 inputs_.mask_layer = mask_layer;
415 if (inputs_.mask_layer.get()) { 415 if (inputs_.mask_layer.get()) {
416 // The mask layer should not have any children. 416 // The mask layer should not have any children.
417 DCHECK(inputs_.mask_layer->children().empty()); 417 DCHECK(inputs_.mask_layer->children().empty());
418 418
419 inputs_.mask_layer->RemoveFromParent(); 419 inputs_.mask_layer->RemoveFromParent();
420 DCHECK(!inputs_.mask_layer->parent()); 420 DCHECK(!inputs_.mask_layer->parent());
421 inputs_.mask_layer->SetParent(this); 421 inputs_.mask_layer->SetParent(this);
422 inputs_.mask_layer->SetIsMask(true); 422 inputs_.mask_layer->SetIsMask(true);
423 if (!inputs_.filters.IsEmpty())
424 inputs_.mask_layer->SetIsSingleTextureMask(true);
423 } 425 }
424 SetSubtreePropertyChanged(); 426 SetSubtreePropertyChanged();
425 SetNeedsFullTreeSync(); 427 SetNeedsFullTreeSync();
426 } 428 }
427 429
428 void Layer::SetFilters(const FilterOperations& filters) { 430 void Layer::SetFilters(const FilterOperations& filters) {
429 DCHECK(IsPropertyChangeAllowed()); 431 DCHECK(IsPropertyChangeAllowed());
430 if (inputs_.filters == filters) 432 if (inputs_.filters == filters)
431 return; 433 return;
432 inputs_.filters = filters; 434 inputs_.filters = filters;
435 if (inputs_.mask_layer)
436 inputs_.mask_layer->SetIsSingleTextureMask(true);
433 SetSubtreePropertyChanged(); 437 SetSubtreePropertyChanged();
434 SetNeedsCommit(); 438 SetNeedsCommit();
435 } 439 }
436 440
437 void Layer::SetBackgroundFilters(const FilterOperations& filters) { 441 void Layer::SetBackgroundFilters(const FilterOperations& filters) {
438 DCHECK(IsPropertyChangeAllowed()); 442 DCHECK(IsPropertyChangeAllowed());
439 if (inputs_.background_filters == filters) 443 if (inputs_.background_filters == filters)
440 return; 444 return;
441 inputs_.background_filters = filters; 445 inputs_.background_filters = filters;
442 SetSubtreePropertyChanged(); 446 SetSubtreePropertyChanged();
(...skipping 1131 matching lines...) Expand 10 before | Expand all | Expand 10 after
1574 ->num_copy_requests_in_subtree; 1578 ->num_copy_requests_in_subtree;
1575 } 1579 }
1576 1580
1577 gfx::Transform Layer::screen_space_transform() const { 1581 gfx::Transform Layer::screen_space_transform() const {
1578 DCHECK_NE(transform_tree_index_, TransformTree::kInvalidNodeId); 1582 DCHECK_NE(transform_tree_index_, TransformTree::kInvalidNodeId);
1579 return draw_property_utils::ScreenSpaceTransform( 1583 return draw_property_utils::ScreenSpaceTransform(
1580 this, layer_tree_host_->property_trees()->transform_tree); 1584 this, layer_tree_host_->property_trees()->transform_tree);
1581 } 1585 }
1582 1586
1583 } // namespace cc 1587 } // namespace cc
OLDNEW
« cc/layers/layer.h ('K') | « cc/layers/layer.h ('k') | cc/layers/picture_image_layer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698