| Index: third_party/WebKit/Source/platform/graphics/compositing/PropertyTreeManager.cpp
|
| diff --git a/third_party/WebKit/Source/platform/graphics/compositing/PropertyTreeManager.cpp b/third_party/WebKit/Source/platform/graphics/compositing/PropertyTreeManager.cpp
|
| index a47117c9f1627f76506f98eadf06d211e67ae38f..754722a3779cd2f0b760d52398b0c0aa129acc0c 100644
|
| --- a/third_party/WebKit/Source/platform/graphics/compositing/PropertyTreeManager.cpp
|
| +++ b/third_party/WebKit/Source/platform/graphics/compositing/PropertyTreeManager.cpp
|
| @@ -33,8 +33,11 @@ static constexpr int kSecondaryRootNodeId = 1;
|
| } // namespace
|
|
|
| PropertyTreeManager::PropertyTreeManager(cc::PropertyTrees& propertyTrees,
|
| - cc::Layer* rootLayer)
|
| - : m_propertyTrees(propertyTrees), m_rootLayer(rootLayer) {
|
| + cc::Layer* rootLayer,
|
| + int sequenceNumber)
|
| + : m_propertyTrees(propertyTrees),
|
| + m_rootLayer(rootLayer),
|
| + m_sequenceNumber(sequenceNumber) {
|
| setupRootTransformNode();
|
| setupRootClipNode();
|
| setupRootEffectNode();
|
| @@ -191,7 +194,7 @@ int PropertyTreeManager::ensureCompositorTransformNode(
|
| dummyLayer->SetClipTreeIndex(kSecondaryRootNodeId);
|
| dummyLayer->SetEffectTreeIndex(kSecondaryRootNodeId);
|
| dummyLayer->SetScrollTreeIndex(kRealRootNodeId);
|
| - dummyLayer->set_property_tree_sequence_number(kPropertyTreeSequenceNumber);
|
| + dummyLayer->set_property_tree_sequence_number(m_sequenceNumber);
|
| CompositorElementId compositorElementId =
|
| transformNode->compositorElementId();
|
| if (compositorElementId) {
|
| @@ -244,7 +247,7 @@ int PropertyTreeManager::ensureCompositorClipNode(
|
| dummyLayer->SetClipTreeIndex(id);
|
| dummyLayer->SetEffectTreeIndex(kSecondaryRootNodeId);
|
| dummyLayer->SetScrollTreeIndex(kRealRootNodeId);
|
| - dummyLayer->set_property_tree_sequence_number(kPropertyTreeSequenceNumber);
|
| + dummyLayer->set_property_tree_sequence_number(m_sequenceNumber);
|
|
|
| auto result = m_clipNodeMap.set(clipNode, id);
|
| DCHECK(result.isNewEntry);
|
| @@ -452,7 +455,7 @@ void PropertyTreeManager::buildEffectNodesRecursively(
|
| }
|
| m_effectStack.push_back(BlinkEffectAndCcIdPair{nextEffect, effectNode.id});
|
|
|
| - dummyLayer->set_property_tree_sequence_number(kPropertyTreeSequenceNumber);
|
| + dummyLayer->set_property_tree_sequence_number(m_sequenceNumber);
|
| dummyLayer->SetTransformTreeIndex(kSecondaryRootNodeId);
|
| dummyLayer->SetClipTreeIndex(outputClipId);
|
| dummyLayer->SetEffectTreeIndex(effectNode.id);
|
|
|