| 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 362 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 373 return nodeA; | 373 return nodeA; |
| 374 } | 374 } |
| 375 | 375 |
| 376 int PropertyTreeManager::switchToEffectNode(const EffectPaintPropertyNode& nextE
ffect) | 376 int PropertyTreeManager::switchToEffectNode(const EffectPaintPropertyNode& nextE
ffect) |
| 377 { | 377 { |
| 378 const EffectPaintPropertyNode* ancestor = lowestCommonAncestor(currentEffect
Node(), &nextEffect); | 378 const EffectPaintPropertyNode* ancestor = lowestCommonAncestor(currentEffect
Node(), &nextEffect); |
| 379 while (currentEffectNode() != ancestor) | 379 while (currentEffectNode() != ancestor) |
| 380 m_effectStack.removeLast(); | 380 m_effectStack.removeLast(); |
| 381 | 381 |
| 382 #if DCHECK_IS_ON() | 382 #if DCHECK_IS_ON() |
| 383 DCHECK(m_isFirstEffectEver || currentEffectNode()) << "Malformed effect tree
. Nodes in the same property tree should have common root."; | 383 DCHECK(m_isFirstEffectEver || currentEffectNode()) << "Malformed effect tree
. Nodes in the same property tree should have common root. " << &nextEffect; |
| 384 m_isFirstEffectEver = false; | 384 m_isFirstEffectEver = false; |
| 385 #endif | 385 #endif |
| 386 buildEffectNodesRecursively(&nextEffect); | 386 buildEffectNodesRecursively(&nextEffect); |
| 387 | 387 |
| 388 return compositorIdForCurrentEffectNode(); | 388 return compositorIdForCurrentEffectNode(); |
| 389 } | 389 } |
| 390 | 390 |
| 391 void PropertyTreeManager::buildEffectNodesRecursively(const EffectPaintPropertyN
ode* nextEffect) | 391 void PropertyTreeManager::buildEffectNodesRecursively(const EffectPaintPropertyN
ode* nextEffect) |
| 392 { | 392 { |
| 393 if (nextEffect == currentEffectNode()) | 393 if (nextEffect == currentEffectNode()) |
| (...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 482 if (m_extraDataForTestingEnabled) | 482 if (m_extraDataForTestingEnabled) |
| 483 m_extraDataForTesting->contentLayers.append(layer); | 483 m_extraDataForTesting->contentLayers.append(layer); |
| 484 } | 484 } |
| 485 | 485 |
| 486 // Mark the property trees as having been rebuilt. | 486 // Mark the property trees as having been rebuilt. |
| 487 host->GetLayerTree()->property_trees()->sequence_number = kPropertyTreeSeque
nceNumber; | 487 host->GetLayerTree()->property_trees()->sequence_number = kPropertyTreeSeque
nceNumber; |
| 488 host->GetLayerTree()->property_trees()->needs_rebuild = false; | 488 host->GetLayerTree()->property_trees()->needs_rebuild = false; |
| 489 } | 489 } |
| 490 | 490 |
| 491 } // namespace blink | 491 } // namespace blink |
| OLD | NEW |