Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(815)

Unified Diff: third_party/WebKit/Source/platform/graphics/CompositorMutableStateProvider.cpp

Issue 2050123002: Remove OwnPtr from Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments from Kent; merge. Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..3aaf96576951b1f0e69693a69e31e8ad6314ad76 100644
--- a/third_party/WebKit/Source/platform/graphics/CompositorMutableStateProvider.cpp
+++ b/third_party/WebKit/Source/platform/graphics/CompositorMutableStateProvider.cpp
@@ -8,7 +8,8 @@
#include "cc/trees/layer_tree_impl.h"
#include "platform/graphics/CompositorMutableState.h"
#include "platform/graphics/CompositorMutation.h"
-#include "wtf/PassOwnPtr.h"
+#include "wtf/PtrUtil.h"
+#include <memory>
namespace blink {
@@ -20,7 +21,7 @@ CompositorMutableStateProvider::CompositorMutableStateProvider(cc::LayerTreeImpl
CompositorMutableStateProvider::~CompositorMutableStateProvider() {}
-PassOwnPtr<CompositorMutableState>
+std::unique_ptr<CompositorMutableState>
CompositorMutableStateProvider::getMutableStateFor(uint64_t element_id)
{
cc::LayerTreeImpl::ElementLayers layers = m_state->GetMutableLayers(element_id);
@@ -35,9 +36,9 @@ CompositorMutableStateProvider::getMutableStateFor(uint64_t element_id)
// Only if this is a new entry do we want to allocate a new mutation.
if (result.isNewEntry)
- result.storedValue->value = adoptPtr(new CompositorMutation);
+ result.storedValue->value = wrapUnique(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

Powered by Google App Engine
This is Rietveld 408576698