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

Side by Side Diff: cc/trees/property_tree.cc

Issue 2693703010: cc: Remove support for disabling non-root render surfaces. (Closed)
Patch Set: softwaredraw-remove-no-surfaces: rebase 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
« no previous file with comments | « cc/trees/property_tree.h ('k') | cc/trees/property_tree_builder.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 <stddef.h> 5 #include <stddef.h>
6 6
7 #include <set> 7 #include <set>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 1527 matching lines...) Expand 10 before | Expand all | Expand 10 after
1538 1538
1539 PropertyTreesCachedData::PropertyTreesCachedData() 1539 PropertyTreesCachedData::PropertyTreesCachedData()
1540 : transform_tree_update_number(0) { 1540 : transform_tree_update_number(0) {
1541 animation_scales.clear(); 1541 animation_scales.clear();
1542 } 1542 }
1543 1543
1544 PropertyTreesCachedData::~PropertyTreesCachedData() {} 1544 PropertyTreesCachedData::~PropertyTreesCachedData() {}
1545 1545
1546 PropertyTrees::PropertyTrees() 1546 PropertyTrees::PropertyTrees()
1547 : needs_rebuild(true), 1547 : needs_rebuild(true),
1548 non_root_surfaces_enabled(true),
1549 changed(false), 1548 changed(false),
1550 full_tree_damaged(false), 1549 full_tree_damaged(false),
1551 sequence_number(0), 1550 sequence_number(0),
1552 is_main_thread(true), 1551 is_main_thread(true),
1553 is_active(false) { 1552 is_active(false) {
1554 transform_tree.SetPropertyTrees(this); 1553 transform_tree.SetPropertyTrees(this);
1555 effect_tree.SetPropertyTrees(this); 1554 effect_tree.SetPropertyTrees(this);
1556 clip_tree.SetPropertyTrees(this); 1555 clip_tree.SetPropertyTrees(this);
1557 scroll_tree.SetPropertyTrees(this); 1556 scroll_tree.SetPropertyTrees(this);
1558 } 1557 }
(...skipping 14 matching lines...) Expand all
1573 element_id_to_scroll_node_index == 1572 element_id_to_scroll_node_index ==
1574 other.element_id_to_scroll_node_index && 1573 other.element_id_to_scroll_node_index &&
1575 element_id_to_transform_node_index == 1574 element_id_to_transform_node_index ==
1576 other.element_id_to_transform_node_index && 1575 other.element_id_to_transform_node_index &&
1577 always_use_active_tree_opacity_effect_ids == 1576 always_use_active_tree_opacity_effect_ids ==
1578 other.always_use_active_tree_opacity_effect_ids && 1577 other.always_use_active_tree_opacity_effect_ids &&
1579 needs_rebuild == other.needs_rebuild && changed == other.changed && 1578 needs_rebuild == other.needs_rebuild && changed == other.changed &&
1580 full_tree_damaged == other.full_tree_damaged && 1579 full_tree_damaged == other.full_tree_damaged &&
1581 is_main_thread == other.is_main_thread && 1580 is_main_thread == other.is_main_thread &&
1582 is_active == other.is_active && 1581 is_active == other.is_active &&
1583 non_root_surfaces_enabled == other.non_root_surfaces_enabled &&
1584 sequence_number == other.sequence_number; 1582 sequence_number == other.sequence_number;
1585 } 1583 }
1586 1584
1587 PropertyTrees& PropertyTrees::operator=(const PropertyTrees& from) { 1585 PropertyTrees& PropertyTrees::operator=(const PropertyTrees& from) {
1588 transform_tree = from.transform_tree; 1586 transform_tree = from.transform_tree;
1589 effect_tree = from.effect_tree; 1587 effect_tree = from.effect_tree;
1590 clip_tree = from.clip_tree; 1588 clip_tree = from.clip_tree;
1591 scroll_tree = from.scroll_tree; 1589 scroll_tree = from.scroll_tree;
1592 layer_id_to_transform_node_index = from.layer_id_to_transform_node_index; 1590 layer_id_to_transform_node_index = from.layer_id_to_transform_node_index;
1593 layer_id_to_effect_node_index = from.layer_id_to_effect_node_index; 1591 layer_id_to_effect_node_index = from.layer_id_to_effect_node_index;
1594 always_use_active_tree_opacity_effect_ids = 1592 always_use_active_tree_opacity_effect_ids =
1595 from.always_use_active_tree_opacity_effect_ids; 1593 from.always_use_active_tree_opacity_effect_ids;
1596 layer_id_to_clip_node_index = from.layer_id_to_clip_node_index; 1594 layer_id_to_clip_node_index = from.layer_id_to_clip_node_index;
1597 layer_id_to_scroll_node_index = from.layer_id_to_scroll_node_index; 1595 layer_id_to_scroll_node_index = from.layer_id_to_scroll_node_index;
1598 element_id_to_effect_node_index = from.element_id_to_effect_node_index; 1596 element_id_to_effect_node_index = from.element_id_to_effect_node_index;
1599 element_id_to_scroll_node_index = from.element_id_to_scroll_node_index; 1597 element_id_to_scroll_node_index = from.element_id_to_scroll_node_index;
1600 element_id_to_transform_node_index = from.element_id_to_transform_node_index; 1598 element_id_to_transform_node_index = from.element_id_to_transform_node_index;
1601 needs_rebuild = from.needs_rebuild; 1599 needs_rebuild = from.needs_rebuild;
1602 changed = from.changed; 1600 changed = from.changed;
1603 full_tree_damaged = from.full_tree_damaged; 1601 full_tree_damaged = from.full_tree_damaged;
1604 non_root_surfaces_enabled = from.non_root_surfaces_enabled;
1605 sequence_number = from.sequence_number; 1602 sequence_number = from.sequence_number;
1606 is_main_thread = from.is_main_thread; 1603 is_main_thread = from.is_main_thread;
1607 is_active = from.is_active; 1604 is_active = from.is_active;
1608 inner_viewport_container_bounds_delta_ = 1605 inner_viewport_container_bounds_delta_ =
1609 from.inner_viewport_container_bounds_delta(); 1606 from.inner_viewport_container_bounds_delta();
1610 outer_viewport_container_bounds_delta_ = 1607 outer_viewport_container_bounds_delta_ =
1611 from.outer_viewport_container_bounds_delta(); 1608 from.outer_viewport_container_bounds_delta();
1612 inner_viewport_scroll_bounds_delta_ = 1609 inner_viewport_scroll_bounds_delta_ =
1613 from.inner_viewport_scroll_bounds_delta(); 1610 from.inner_viewport_scroll_bounds_delta();
1614 transform_tree.SetPropertyTrees(this); 1611 transform_tree.SetPropertyTrees(this);
(...skipping 14 matching lines...) Expand all
1629 layer_id_to_clip_node_index.clear(); 1626 layer_id_to_clip_node_index.clear();
1630 layer_id_to_scroll_node_index.clear(); 1627 layer_id_to_scroll_node_index.clear();
1631 element_id_to_effect_node_index.clear(); 1628 element_id_to_effect_node_index.clear();
1632 element_id_to_scroll_node_index.clear(); 1629 element_id_to_scroll_node_index.clear();
1633 element_id_to_transform_node_index.clear(); 1630 element_id_to_transform_node_index.clear();
1634 always_use_active_tree_opacity_effect_ids.clear(); 1631 always_use_active_tree_opacity_effect_ids.clear();
1635 1632
1636 needs_rebuild = true; 1633 needs_rebuild = true;
1637 full_tree_damaged = false; 1634 full_tree_damaged = false;
1638 changed = false; 1635 changed = false;
1639 non_root_surfaces_enabled = true;
1640 sequence_number++; 1636 sequence_number++;
1641 1637
1642 #if DCHECK_IS_ON() 1638 #if DCHECK_IS_ON()
1643 PropertyTrees tree; 1639 PropertyTrees tree;
1644 tree.transform_tree = transform_tree; 1640 tree.transform_tree = transform_tree;
1645 tree.effect_tree = effect_tree; 1641 tree.effect_tree = effect_tree;
1646 tree.clip_tree = clip_tree; 1642 tree.clip_tree = clip_tree;
1647 tree.scroll_tree = scroll_tree; 1643 tree.scroll_tree = scroll_tree;
1648 tree.scroll_tree.CopyCompleteTreeState(scroll_tree); 1644 tree.scroll_tree.CopyCompleteTreeState(scroll_tree);
1649 1645
(...skipping 446 matching lines...) Expand 10 before | Expand all | Expand 10 after
2096 2092
2097 const EffectNode* effect_node = effect_tree.Node(effect_id); 2093 const EffectNode* effect_node = effect_tree.Node(effect_id);
2098 2094
2099 bool success = GetFromTarget(transform_id, effect_id, transform); 2095 bool success = GetFromTarget(transform_id, effect_id, transform);
2100 transform->Scale(effect_node->surface_contents_scale.x(), 2096 transform->Scale(effect_node->surface_contents_scale.x(),
2101 effect_node->surface_contents_scale.y()); 2097 effect_node->surface_contents_scale.y());
2102 return success; 2098 return success;
2103 } 2099 }
2104 2100
2105 } // namespace cc 2101 } // namespace cc
OLDNEW
« no previous file with comments | « cc/trees/property_tree.h ('k') | cc/trees/property_tree_builder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698