[compositorworker] compositor proxy mutation updates underlying layers

third_party/WebKit/Source/platform/graphics/CompositorMutableStateProvider.cpp

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 cb2d9b1158971a96cff76f152a1fb4f90688a073..42c0d8995d97dc3a0938daeea5e077f2a1ddb866 100644
--- a/third_party/WebKit/Source/platform/graphics/CompositorMutableStateProvider.cpp
+++ b/third_party/WebKit/Source/platform/graphics/CompositorMutableStateProvider.cpp
@@ -9,21 +9,22 @@
 #include "platform/graphics/CompositorMutableState.h"
 #include "platform/graphics/CompositorMutation.h"
 #include "wtf/PassOwnPtr.h"
+#include "wtf/PtrUtil.h"
 
 namespace blink {
 
-CompositorMutableStateProvider::CompositorMutableStateProvider(cc::LayerTreeImpl* state, CompositorMutations* mutations)
-    : m_state(state)
+CompositorMutableStateProvider::CompositorMutableStateProvider(cc::LayerTreeImpl* tree_impl, CompositorMutations* mutations)

[jbroman, 2016/06/13 19:45:17]

nit: "treeImpl"

Blink style still uses camelCase variable names.

[majidvp, 2016/06/13 21:52:51]

Done.

+    : m_tree(tree_impl)
     , m_mutations(mutations)
 {
 }
 
 CompositorMutableStateProvider::~CompositorMutableStateProvider() {}
 
-PassOwnPtr<CompositorMutableState>
+std::unique_ptr<CompositorMutableState>
 CompositorMutableStateProvider::getMutableStateFor(uint64_t element_id)
 {
-    cc::LayerTreeImpl::ElementLayers layers = m_state->GetMutableLayers(element_id);
+    cc::LayerTreeImpl::ElementLayers layers = m_tree->GetMutableLayers(element_id);
 
     if (!layers.main && !layers.scroll)
         return nullptr;
@@ -37,7 +38,7 @@ CompositorMutableStateProvider::getMutableStateFor(uint64_t element_id)
     if (result.isNewEntry)
         result.storedValue->value = adoptPtr(new CompositorMutation);
 
-    return adoptPtr(new CompositorMutableState(result.storedValue->value.get(), layers.main, layers.scroll));
+    return wrapUnique(new CompositorMutableState(result.storedValue->value.get(), layers.main, layers.scroll));
 }
 
 } // namespace blink