Chromium Code Reviews Chromium Code Reviews
Issue 1975623002:
cc : Add LayerToPropertyTreeIndices map to PropertyTrees (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master| 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 1905 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1916 is_active == other.is_active && | 1916 is_active == other.is_active && |
| 1917 non_root_surfaces_enabled == other.non_root_surfaces_enabled && | 1917 non_root_surfaces_enabled == other.non_root_surfaces_enabled && |
| 1918 sequence_number == other.sequence_number; | 1918 sequence_number == other.sequence_number; |
| 1919 } | 1919 } |
| 1920 | 1920 |
| 1921 PropertyTrees& PropertyTrees::operator=(const PropertyTrees& from) { | 1921 PropertyTrees& PropertyTrees::operator=(const PropertyTrees& from) { |
| 1922 transform_tree = from.transform_tree; | 1922 transform_tree = from.transform_tree; |
| 1923 effect_tree = from.effect_tree; | 1923 effect_tree = from.effect_tree; |
| 1924 clip_tree = from.clip_tree; | 1924 clip_tree = from.clip_tree; |
| 1925 scroll_tree = from.scroll_tree; | 1925 scroll_tree = from.scroll_tree; |
| 1926 transform_node_owner_to_node_map = from.transform_node_owner_to_node_map; | |
| 1927 effect_node_owner_to_node_map = from.effect_node_owner_to_node_map; | |
| 1928 clip_node_owner_to_node_map = from.clip_node_owner_to_node_map; | |
| 1929 scroll_node_owner_to_node_map = from.scroll_node_owner_to_node_map; | |
|
ajuma
2016/05/13 14:38:53
Do these also need to be handled in ToProtobuf and
jaydasika
2016/05/13 19:40:39
I have added code to reconstruct the map rather th
| |
| 1926 needs_rebuild = from.needs_rebuild; | 1930 needs_rebuild = from.needs_rebuild; |
| 1927 changed = from.changed; | 1931 changed = from.changed; |
| 1928 full_tree_damaged = from.full_tree_damaged; | 1932 full_tree_damaged = from.full_tree_damaged; |
| 1929 non_root_surfaces_enabled = from.non_root_surfaces_enabled; | 1933 non_root_surfaces_enabled = from.non_root_surfaces_enabled; |
| 1930 sequence_number = from.sequence_number; | 1934 sequence_number = from.sequence_number; |
| 1931 is_main_thread = from.is_main_thread; | 1935 is_main_thread = from.is_main_thread; |
| 1932 is_active = from.is_active; | 1936 is_active = from.is_active; |
| 1933 inner_viewport_container_bounds_delta_ = | 1937 inner_viewport_container_bounds_delta_ = |
| 1934 from.inner_viewport_container_bounds_delta(); | 1938 from.inner_viewport_container_bounds_delta(); |
| 1935 outer_viewport_container_bounds_delta_ = | 1939 outer_viewport_container_bounds_delta_ = |
| (...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2076 value->EndDictionary(); | 2080 value->EndDictionary(); |
| 2077 | 2081 |
| 2078 value->BeginDictionary("scroll_tree"); | 2082 value->BeginDictionary("scroll_tree"); |
| 2079 scroll_tree.AsValueInto(value.get()); | 2083 scroll_tree.AsValueInto(value.get()); |
| 2080 value->EndDictionary(); | 2084 value->EndDictionary(); |
| 2081 | 2085 |
| 2082 return value; | 2086 return value; |
| 2083 } | 2087 } |
| 2084 | 2088 |
| 2085 } // namespace cc | 2089 } // namespace cc |
| OLD | NEW |
