OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "platform/graphics/compositing/PaintArtifactCompositor.h" | 5 #include "platform/graphics/compositing/PaintArtifactCompositor.h" |
6 | 6 |
7 #include "cc/layers/content_layer_client.h" | 7 #include "cc/layers/content_layer_client.h" |
8 #include "cc/layers/layer.h" | 8 #include "cc/layers/layer.h" |
9 #include "cc/layers/picture_layer.h" | 9 #include "cc/layers/picture_layer.h" |
10 #include "cc/playback/display_item_list.h" | 10 #include "cc/playback/display_item_list.h" |
(...skipping 435 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
446 }; | 446 }; |
447 Vector<BlinkEffectAndCcIdPair> m_effectStack; | 447 Vector<BlinkEffectAndCcIdPair> m_effectStack; |
448 | 448 |
449 #if DCHECK_IS_ON() | 449 #if DCHECK_IS_ON() |
450 HashSet<const EffectPaintPropertyNode*> m_effectNodesConverted; | 450 HashSet<const EffectPaintPropertyNode*> m_effectNodesConverted; |
451 bool m_isFirstEffectEver; | 451 bool m_isFirstEffectEver; |
452 #endif | 452 #endif |
453 }; | 453 }; |
454 | 454 |
455 void PropertyTreeManager::setDeviceScaleFactor(float deviceScaleFactor) { | 455 void PropertyTreeManager::setDeviceScaleFactor(float deviceScaleFactor) { |
456 auto& rootTransformNode = *transformTree().Node(kSecondaryRootNodeId); | 456 auto& rootTransformNode = *transformTree().Node(kRealRootNodeId); |
457 rootTransformNode.local.Scale(deviceScaleFactor, deviceScaleFactor); | 457 rootTransformNode.needs_surface_contents_scale = true; |
| 458 rootTransformNode.surface_contents_scale = |
| 459 gfx::Vector2dF(deviceScaleFactor, deviceScaleFactor); |
| 460 // TODO(jaydasika) : We shouldn't set ToScreen and FromScreen of root |
| 461 // transform node here. They should be set while updating transform tree in |
| 462 // cc. |
| 463 gfx::Transform toScreen; |
| 464 toScreen.Scale(deviceScaleFactor, deviceScaleFactor); |
| 465 transformTree().SetToScreen(rootTransformNode.id, toScreen); |
| 466 gfx::Transform fromScreen; |
| 467 if (!toScreen.GetInverse(&fromScreen)) |
| 468 rootTransformNode.ancestors_are_invertible = false; |
| 469 transformTree().SetFromScreen(rootTransformNode.id, fromScreen); |
| 470 transformTree().set_needs_update(true); |
458 } | 471 } |
459 | 472 |
460 int PropertyTreeManager::compositorIdForTransformNode( | 473 int PropertyTreeManager::compositorIdForTransformNode( |
461 const TransformPaintPropertyNode* transformNode) { | 474 const TransformPaintPropertyNode* transformNode) { |
462 if (!transformNode) | 475 if (!transformNode) |
463 return kSecondaryRootNodeId; | 476 return kSecondaryRootNodeId; |
464 | 477 |
465 auto it = m_transformNodeMap.find(transformNode); | 478 auto it = m_transformNodeMap.find(transformNode); |
466 if (it != m_transformNodeMap.end()) | 479 if (it != m_transformNodeMap.end()) |
467 return it->value; | 480 return it->value; |
(...skipping 296 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
764 m_contentLayerClients.clear(); | 777 m_contentLayerClients.clear(); |
765 m_contentLayerClients.swap(newContentLayerClients); | 778 m_contentLayerClients.swap(newContentLayerClients); |
766 | 779 |
767 // Mark the property trees as having been rebuilt. | 780 // Mark the property trees as having been rebuilt. |
768 layerTree->property_trees()->sequence_number = kPropertyTreeSequenceNumber; | 781 layerTree->property_trees()->sequence_number = kPropertyTreeSequenceNumber; |
769 layerTree->property_trees()->needs_rebuild = false; | 782 layerTree->property_trees()->needs_rebuild = false; |
770 layerTree->property_trees()->ResetCachedData(); | 783 layerTree->property_trees()->ResetCachedData(); |
771 } | 784 } |
772 | 785 |
773 } // namespace blink | 786 } // namespace blink |
OLD | NEW |