diff options
Diffstat (limited to 'third_party')
3 files changed, 9 insertions, 9 deletions
diff --git a/third_party/WebKit/Source/platform/graphics/CompositorMutableStateProvider.cpp b/third_party/WebKit/Source/platform/graphics/CompositorMutableStateProvider.cpp index cb2d9b1..e9eedb7 100644 --- a/third_party/WebKit/Source/platform/graphics/CompositorMutableStateProvider.cpp +++ b/third_party/WebKit/Source/platform/graphics/CompositorMutableStateProvider.cpp @@ -5,14 +5,14 @@ #include "platform/graphics/CompositorMutableStateProvider.h" #include "cc/layers/layer_impl.h" -#include "cc/trees/layer_tree_impl.h" +#include "cc/layers/layer_list_impl.h" #include "platform/graphics/CompositorMutableState.h" #include "platform/graphics/CompositorMutation.h" #include "wtf/PassOwnPtr.h" namespace blink { -CompositorMutableStateProvider::CompositorMutableStateProvider(cc::LayerTreeImpl* state, CompositorMutations* mutations) +CompositorMutableStateProvider::CompositorMutableStateProvider(cc::LayerListImpl* state, CompositorMutations* mutations) : m_state(state) , m_mutations(mutations) { @@ -23,7 +23,7 @@ CompositorMutableStateProvider::~CompositorMutableStateProvider() {} PassOwnPtr<CompositorMutableState> CompositorMutableStateProvider::getMutableStateFor(uint64_t element_id) { - cc::LayerTreeImpl::ElementLayers layers = m_state->GetMutableLayers(element_id); + cc::LayerListImpl::ElementLayers layers = m_state->GetMutableLayers(element_id); if (!layers.main && !layers.scroll) return nullptr; diff --git a/third_party/WebKit/Source/platform/graphics/CompositorMutableStateProvider.h b/third_party/WebKit/Source/platform/graphics/CompositorMutableStateProvider.h index 3f1b8fc..f55a959 100644 --- a/third_party/WebKit/Source/platform/graphics/CompositorMutableStateProvider.h +++ b/third_party/WebKit/Source/platform/graphics/CompositorMutableStateProvider.h @@ -11,7 +11,7 @@ #include <cstdint> namespace cc { -class LayerTreeImpl; +class LayerListImpl; } // namespace cc namespace blink { @@ -23,12 +23,12 @@ struct CompositorMutations; // around per-element bits of this state. class PLATFORM_EXPORT CompositorMutableStateProvider { public: - CompositorMutableStateProvider(cc::LayerTreeImpl*, CompositorMutations*); + CompositorMutableStateProvider(cc::LayerListImpl*, CompositorMutations*); ~CompositorMutableStateProvider(); PassOwnPtr<CompositorMutableState> getMutableStateFor(uint64_t elementId); private: - cc::LayerTreeImpl* m_state; + cc::LayerListImpl* m_state; CompositorMutations* m_mutations; }; diff --git a/third_party/WebKit/Source/platform/graphics/CompositorMutableStateTest.cpp b/third_party/WebKit/Source/platform/graphics/CompositorMutableStateTest.cpp index ec33486..424829e 100644 --- a/third_party/WebKit/Source/platform/graphics/CompositorMutableStateTest.cpp +++ b/third_party/WebKit/Source/platform/graphics/CompositorMutableStateTest.cpp @@ -81,7 +81,7 @@ TEST_F(CompositorMutableStateTest, NoMutableState) hostImpl().UpdateNumChildrenAndDrawPropertiesForActiveTree(); CompositorMutations mutations; - CompositorMutableStateProvider provider(hostImpl().active_tree(), &mutations); + CompositorMutableStateProvider provider(hostImpl().active_tree()->list(), &mutations); OwnPtr<CompositorMutableState> state(provider.getMutableStateFor(42)); EXPECT_FALSE(state); } @@ -99,7 +99,7 @@ TEST_F(CompositorMutableStateTest, MutableStateNoMutableProperties) hostImpl().UpdateNumChildrenAndDrawPropertiesForActiveTree(); CompositorMutations mutations; - CompositorMutableStateProvider provider(hostImpl().active_tree(), &mutations); + CompositorMutableStateProvider provider(hostImpl().active_tree()->list(), &mutations); OwnPtr<CompositorMutableState> state(provider.getMutableStateFor(42)); EXPECT_FALSE(state); } @@ -130,7 +130,7 @@ TEST_F(CompositorMutableStateTest, MutableStateMutableProperties) hostImpl().UpdateNumChildrenAndDrawPropertiesForActiveTree(); CompositorMutations mutations; - CompositorMutableStateProvider provider(hostImpl().active_tree(), &mutations); + CompositorMutableStateProvider provider(hostImpl().active_tree()->list(), &mutations); OwnPtr<CompositorMutableState> state(provider.getMutableStateFor(layer->element_id())); EXPECT_TRUE(state.get()); |