| 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 1343 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1354 if (layer_id_to_synced_scroll_offset_map_.find(layer_id) == | 1354 if (layer_id_to_synced_scroll_offset_map_.find(layer_id) == |
| 1355 layer_id_to_synced_scroll_offset_map_.end()) { | 1355 layer_id_to_synced_scroll_offset_map_.end()) { |
| 1356 layer_id_to_synced_scroll_offset_map_[layer_id] = new SyncedScrollOffset; | 1356 layer_id_to_synced_scroll_offset_map_[layer_id] = new SyncedScrollOffset; |
| 1357 } | 1357 } |
| 1358 return layer_id_to_synced_scroll_offset_map_[layer_id].get(); | 1358 return layer_id_to_synced_scroll_offset_map_[layer_id].get(); |
| 1359 } | 1359 } |
| 1360 | 1360 |
| 1361 const SyncedScrollOffset* ScrollTree::GetSyncedScrollOffset( | 1361 const SyncedScrollOffset* ScrollTree::GetSyncedScrollOffset( |
| 1362 int layer_id) const { | 1362 int layer_id) const { |
| 1363 DCHECK(!property_trees()->is_main_thread); | 1363 DCHECK(!property_trees()->is_main_thread); |
| 1364 if (layer_id_to_synced_scroll_offset_map_.find(layer_id) == | 1364 auto it = layer_id_to_synced_scroll_offset_map_.find(layer_id); |
| 1365 layer_id_to_synced_scroll_offset_map_.end()) { | 1365 return it != layer_id_to_synced_scroll_offset_map_.end() ? it->second.get() |
| 1366 return nullptr; | 1366 : nullptr; |
| 1367 } | |
| 1368 return layer_id_to_synced_scroll_offset_map_.at(layer_id).get(); | |
| 1369 } | 1367 } |
| 1370 | 1368 |
| 1371 const gfx::ScrollOffset ScrollTree::current_scroll_offset(int layer_id) const { | 1369 const gfx::ScrollOffset ScrollTree::current_scroll_offset(int layer_id) const { |
| 1372 if (property_trees()->is_main_thread) { | 1370 if (property_trees()->is_main_thread) { |
| 1373 ScrollOffsetMap::const_iterator it = | 1371 ScrollOffsetMap::const_iterator it = |
| 1374 layer_id_to_scroll_offset_map_.find(layer_id); | 1372 layer_id_to_scroll_offset_map_.find(layer_id); |
| 1375 return it != layer_id_to_scroll_offset_map_.end() ? it->second | 1373 return it != layer_id_to_scroll_offset_map_.end() ? it->second |
| 1376 : gfx::ScrollOffset(); | 1374 : gfx::ScrollOffset(); |
| 1377 } | 1375 } |
| 1378 return GetSyncedScrollOffset(layer_id) | 1376 return GetSyncedScrollOffset(layer_id) |
| (...skipping 765 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2144 const EffectNode* effect_node = effect_tree.Node(effect_id); | 2142 const EffectNode* effect_node = effect_tree.Node(effect_id); |
| 2145 | 2143 |
| 2146 if (effect_node->surface_contents_scale.x() != 0.0 && | 2144 if (effect_node->surface_contents_scale.x() != 0.0 && |
| 2147 effect_node->surface_contents_scale.y() != 0.0) | 2145 effect_node->surface_contents_scale.y() != 0.0) |
| 2148 screen_space_transform.Scale(1.0 / effect_node->surface_contents_scale.x(), | 2146 screen_space_transform.Scale(1.0 / effect_node->surface_contents_scale.x(), |
| 2149 1.0 / effect_node->surface_contents_scale.y()); | 2147 1.0 / effect_node->surface_contents_scale.y()); |
| 2150 return screen_space_transform; | 2148 return screen_space_transform; |
| 2151 } | 2149 } |
| 2152 | 2150 |
| 2153 } // namespace cc | 2151 } // namespace cc |
| OLD | NEW |