| OLD | NEW |
| 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 1520 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1531 bool PropertyTrees::operator==(const PropertyTrees& other) const { | 1531 bool PropertyTrees::operator==(const PropertyTrees& other) const { |
| 1532 return transform_tree == other.transform_tree && | 1532 return transform_tree == other.transform_tree && |
| 1533 effect_tree == other.effect_tree && clip_tree == other.clip_tree && | 1533 effect_tree == other.effect_tree && clip_tree == other.clip_tree && |
| 1534 scroll_tree == other.scroll_tree && | 1534 scroll_tree == other.scroll_tree && |
| 1535 transform_id_to_index_map == other.transform_id_to_index_map && | 1535 transform_id_to_index_map == other.transform_id_to_index_map && |
| 1536 effect_id_to_index_map == other.effect_id_to_index_map && | 1536 effect_id_to_index_map == other.effect_id_to_index_map && |
| 1537 clip_id_to_index_map == other.clip_id_to_index_map && | 1537 clip_id_to_index_map == other.clip_id_to_index_map && |
| 1538 scroll_id_to_index_map == other.scroll_id_to_index_map && | 1538 scroll_id_to_index_map == other.scroll_id_to_index_map && |
| 1539 element_id_to_effect_node_index == | 1539 element_id_to_effect_node_index == |
| 1540 other.element_id_to_effect_node_index && | 1540 other.element_id_to_effect_node_index && |
| 1541 element_id_to_scroll_node_index == |
| 1542 other.element_id_to_scroll_node_index && |
| 1541 element_id_to_transform_node_index == | 1543 element_id_to_transform_node_index == |
| 1542 other.element_id_to_transform_node_index && | 1544 other.element_id_to_transform_node_index && |
| 1543 always_use_active_tree_opacity_effect_ids == | 1545 always_use_active_tree_opacity_effect_ids == |
| 1544 other.always_use_active_tree_opacity_effect_ids && | 1546 other.always_use_active_tree_opacity_effect_ids && |
| 1545 needs_rebuild == other.needs_rebuild && changed == other.changed && | 1547 needs_rebuild == other.needs_rebuild && changed == other.changed && |
| 1546 full_tree_damaged == other.full_tree_damaged && | 1548 full_tree_damaged == other.full_tree_damaged && |
| 1547 is_main_thread == other.is_main_thread && | 1549 is_main_thread == other.is_main_thread && |
| 1548 is_active == other.is_active && | 1550 is_active == other.is_active && |
| 1549 non_root_surfaces_enabled == other.non_root_surfaces_enabled && | 1551 non_root_surfaces_enabled == other.non_root_surfaces_enabled && |
| 1550 sequence_number == other.sequence_number; | 1552 sequence_number == other.sequence_number; |
| 1551 } | 1553 } |
| 1552 | 1554 |
| 1553 PropertyTrees& PropertyTrees::operator=(const PropertyTrees& from) { | 1555 PropertyTrees& PropertyTrees::operator=(const PropertyTrees& from) { |
| 1554 transform_tree = from.transform_tree; | 1556 transform_tree = from.transform_tree; |
| 1555 effect_tree = from.effect_tree; | 1557 effect_tree = from.effect_tree; |
| 1556 clip_tree = from.clip_tree; | 1558 clip_tree = from.clip_tree; |
| 1557 scroll_tree = from.scroll_tree; | 1559 scroll_tree = from.scroll_tree; |
| 1558 transform_id_to_index_map = from.transform_id_to_index_map; | 1560 transform_id_to_index_map = from.transform_id_to_index_map; |
| 1559 effect_id_to_index_map = from.effect_id_to_index_map; | 1561 effect_id_to_index_map = from.effect_id_to_index_map; |
| 1560 always_use_active_tree_opacity_effect_ids = | 1562 always_use_active_tree_opacity_effect_ids = |
| 1561 from.always_use_active_tree_opacity_effect_ids; | 1563 from.always_use_active_tree_opacity_effect_ids; |
| 1562 clip_id_to_index_map = from.clip_id_to_index_map; | 1564 clip_id_to_index_map = from.clip_id_to_index_map; |
| 1563 scroll_id_to_index_map = from.scroll_id_to_index_map; | 1565 scroll_id_to_index_map = from.scroll_id_to_index_map; |
| 1564 element_id_to_effect_node_index = from.element_id_to_effect_node_index; | 1566 element_id_to_effect_node_index = from.element_id_to_effect_node_index; |
| 1567 element_id_to_scroll_node_index = from.element_id_to_scroll_node_index; |
| 1565 element_id_to_transform_node_index = from.element_id_to_transform_node_index; | 1568 element_id_to_transform_node_index = from.element_id_to_transform_node_index; |
| 1566 needs_rebuild = from.needs_rebuild; | 1569 needs_rebuild = from.needs_rebuild; |
| 1567 changed = from.changed; | 1570 changed = from.changed; |
| 1568 full_tree_damaged = from.full_tree_damaged; | 1571 full_tree_damaged = from.full_tree_damaged; |
| 1569 non_root_surfaces_enabled = from.non_root_surfaces_enabled; | 1572 non_root_surfaces_enabled = from.non_root_surfaces_enabled; |
| 1570 sequence_number = from.sequence_number; | 1573 sequence_number = from.sequence_number; |
| 1571 is_main_thread = from.is_main_thread; | 1574 is_main_thread = from.is_main_thread; |
| 1572 is_active = from.is_active; | 1575 is_active = from.is_active; |
| 1573 inner_viewport_container_bounds_delta_ = | 1576 inner_viewport_container_bounds_delta_ = |
| 1574 from.inner_viewport_container_bounds_delta(); | 1577 from.inner_viewport_container_bounds_delta(); |
| (...skipping 12 matching lines...) Expand all Loading... |
| 1587 void PropertyTrees::clear() { | 1590 void PropertyTrees::clear() { |
| 1588 transform_tree.clear(); | 1591 transform_tree.clear(); |
| 1589 clip_tree.clear(); | 1592 clip_tree.clear(); |
| 1590 effect_tree.clear(); | 1593 effect_tree.clear(); |
| 1591 scroll_tree.clear(); | 1594 scroll_tree.clear(); |
| 1592 transform_id_to_index_map.clear(); | 1595 transform_id_to_index_map.clear(); |
| 1593 effect_id_to_index_map.clear(); | 1596 effect_id_to_index_map.clear(); |
| 1594 clip_id_to_index_map.clear(); | 1597 clip_id_to_index_map.clear(); |
| 1595 scroll_id_to_index_map.clear(); | 1598 scroll_id_to_index_map.clear(); |
| 1596 element_id_to_effect_node_index.clear(); | 1599 element_id_to_effect_node_index.clear(); |
| 1600 element_id_to_scroll_node_index.clear(); |
| 1597 element_id_to_transform_node_index.clear(); | 1601 element_id_to_transform_node_index.clear(); |
| 1598 always_use_active_tree_opacity_effect_ids.clear(); | 1602 always_use_active_tree_opacity_effect_ids.clear(); |
| 1599 | 1603 |
| 1600 needs_rebuild = true; | 1604 needs_rebuild = true; |
| 1601 full_tree_damaged = false; | 1605 full_tree_damaged = false; |
| 1602 changed = false; | 1606 changed = false; |
| 1603 non_root_surfaces_enabled = true; | 1607 non_root_surfaces_enabled = true; |
| 1604 sequence_number++; | 1608 sequence_number++; |
| 1605 | 1609 |
| 1606 #if DCHECK_IS_ON() | 1610 #if DCHECK_IS_ON() |
| (...skipping 453 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2060 | 2064 |
| 2061 const EffectNode* effect_node = effect_tree.Node(effect_id); | 2065 const EffectNode* effect_node = effect_tree.Node(effect_id); |
| 2062 | 2066 |
| 2063 bool success = GetFromTarget(transform_id, effect_id, transform); | 2067 bool success = GetFromTarget(transform_id, effect_id, transform); |
| 2064 transform->Scale(effect_node->surface_contents_scale.x(), | 2068 transform->Scale(effect_node->surface_contents_scale.x(), |
| 2065 effect_node->surface_contents_scale.y()); | 2069 effect_node->surface_contents_scale.y()); |
| 2066 return success; | 2070 return success; |
| 2067 } | 2071 } |
| 2068 | 2072 |
| 2069 } // namespace cc | 2073 } // namespace cc |
| OLD | NEW |