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

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

Issue 2004973002: Revert of cc : Add IsInIdtoIndexMap to property tres (patchset #4 id:60001 of https://codereview.ch… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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') | no next file » | 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 2040 matching lines...) Expand 10 before | Expand all | Expand 10 after
2051 target_tree->effect_tree.Node(target_tree->effect_id_to_index_map[id]); 2051 target_tree->effect_tree.Node(target_tree->effect_id_to_index_map[id]);
2052 float source_opacity = source_effect_node->data.opacity; 2052 float source_opacity = source_effect_node->data.opacity;
2053 float target_opacity = target_effect_node->data.opacity; 2053 float target_opacity = target_effect_node->data.opacity;
2054 if (source_opacity == target_opacity) 2054 if (source_opacity == target_opacity)
2055 continue; 2055 continue;
2056 target_effect_node->data.opacity = source_opacity; 2056 target_effect_node->data.opacity = source_opacity;
2057 target_tree->effect_tree.set_needs_update(true); 2057 target_tree->effect_tree.set_needs_update(true);
2058 } 2058 }
2059 } 2059 }
2060 2060
2061 void PropertyTrees::RemoveIdFromIdToIndexMaps(int id) {
2062 transform_id_to_index_map.erase(id);
2063 effect_id_to_index_map.erase(id);
2064 clip_id_to_index_map.erase(id);
2065 scroll_id_to_index_map.erase(id);
2066 }
2067
2068 bool PropertyTrees::IsInIdToIndexMap(TreeType tree_type, int id) {
2069 std::unordered_map<int, int>* id_to_index_map = nullptr;
2070 switch (tree_type) {
2071 case TRANSFORM:
2072 id_to_index_map = &transform_id_to_index_map;
2073 break;
2074 case EFFECT:
2075 id_to_index_map = &effect_id_to_index_map;
2076 break;
2077 case CLIP:
2078 id_to_index_map = &clip_id_to_index_map;
2079 break;
2080 case SCROLL:
2081 id_to_index_map = &scroll_id_to_index_map;
2082 break;
2083 }
2084 return id_to_index_map->find(id) != id_to_index_map->end();
2085 }
2086
2087 void PropertyTrees::UpdateChangeTracking() { 2061 void PropertyTrees::UpdateChangeTracking() {
2088 for (int id = 1; id < static_cast<int>(effect_tree.size()); ++id) { 2062 for (int id = 1; id < static_cast<int>(effect_tree.size()); ++id) {
2089 EffectNode* node = effect_tree.Node(id); 2063 EffectNode* node = effect_tree.Node(id);
2090 EffectNode* parent_node = effect_tree.parent(node); 2064 EffectNode* parent_node = effect_tree.parent(node);
2091 effect_tree.UpdateEffectChanged(node, parent_node); 2065 effect_tree.UpdateEffectChanged(node, parent_node);
2092 } 2066 }
2093 for (int i = 1; i < static_cast<int>(transform_tree.size()); ++i) { 2067 for (int i = 1; i < static_cast<int>(transform_tree.size()); ++i) {
2094 TransformNode* node = transform_tree.Node(i); 2068 TransformNode* node = transform_tree.Node(i);
2095 TransformNode* parent_node = transform_tree.parent(node); 2069 TransformNode* parent_node = transform_tree.parent(node);
2096 TransformNode* source_node = transform_tree.Node(node->data.source_node_id); 2070 TransformNode* source_node = transform_tree.Node(node->data.source_node_id);
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
2145 value->EndDictionary(); 2119 value->EndDictionary();
2146 2120
2147 value->BeginDictionary("scroll_tree"); 2121 value->BeginDictionary("scroll_tree");
2148 scroll_tree.AsValueInto(value.get()); 2122 scroll_tree.AsValueInto(value.get());
2149 value->EndDictionary(); 2123 value->EndDictionary();
2150 2124
2151 return value; 2125 return value;
2152 } 2126 }
2153 2127
2154 } // namespace cc 2128 } // namespace cc
OLDNEW
« no previous file with comments | « cc/trees/property_tree.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698