| Index: third_party/WebKit/Source/platform/graphics/CompositorMutableStateProvider.cpp
|
| diff --git a/third_party/WebKit/Source/platform/graphics/CompositorMutableStateProvider.cpp b/third_party/WebKit/Source/platform/graphics/CompositorMutableStateProvider.cpp
|
| index aee37a177d6597fb7d2f5eac92838ed8194df9a2..66f46a5ffe88a18b69e1475ebbbbefea4fc6f0f1 100644
|
| --- a/third_party/WebKit/Source/platform/graphics/CompositorMutableStateProvider.cpp
|
| +++ b/third_party/WebKit/Source/platform/graphics/CompositorMutableStateProvider.cpp
|
| @@ -11,6 +11,7 @@
|
| #include "platform/graphics/CompositorMutableState.h"
|
| #include "platform/graphics/CompositorMutation.h"
|
| #include "wtf/PassOwnPtr.h"
|
| +#include "wtf/PtrUtil.h"
|
|
|
| namespace blink {
|
|
|
| @@ -22,7 +23,7 @@ CompositorMutableStateProvider::CompositorMutableStateProvider(cc::LayerTreeImpl
|
|
|
| CompositorMutableStateProvider::~CompositorMutableStateProvider() {}
|
|
|
| -PassOwnPtr<CompositorMutableState>
|
| +std::unique_ptr<CompositorMutableState>
|
| CompositorMutableStateProvider::getMutableStateFor(uint64_t element_id)
|
| {
|
| cc::LayerImpl* mainLayer = m_state->LayerByElementId(createCompositorElementId(element_id, CompositorSubElementId::Primary));
|
| @@ -40,7 +41,7 @@ CompositorMutableStateProvider::getMutableStateFor(uint64_t element_id)
|
| if (result.isNewEntry)
|
| result.storedValue->value = adoptPtr(new CompositorMutation);
|
|
|
| - return adoptPtr(new CompositorMutableState(result.storedValue->value.get(), mainLayer, scrollLayer));
|
| + return wrapUnique(new CompositorMutableState(result.storedValue->value.get(), mainLayer, scrollLayer));
|
| }
|
|
|
| } // namespace blink
|
|
|