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

Unified Diff: third_party/WebKit/Source/platform/graphics/compositing/PaintArtifactCompositorTest.cpp

Issue 2080623002: Revert "Remove OwnPtr from Blink." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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/compositing/PaintArtifactCompositorTest.cpp
diff --git a/third_party/WebKit/Source/platform/graphics/compositing/PaintArtifactCompositorTest.cpp b/third_party/WebKit/Source/platform/graphics/compositing/PaintArtifactCompositorTest.cpp
index ef9edb44bdf3f28918831cea691c72f01de0effb..f21059a1efee1889df5e7efe6894b75e28f2e6fe 100644
--- a/third_party/WebKit/Source/platform/graphics/compositing/PaintArtifactCompositorTest.cpp
+++ b/third_party/WebKit/Source/platform/graphics/compositing/PaintArtifactCompositorTest.cpp
@@ -17,8 +17,6 @@
#include "platform/testing/WebLayerTreeViewImplForTesting.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
-#include "wtf/PtrUtil.h"
-#include <memory>
namespace blink {
namespace {
@@ -39,7 +37,7 @@ protected:
RuntimeEnabledFeatures::setSlimmingPaintV2Enabled(true);
// Delay constructing the compositor until after the feature is set.
- m_paintArtifactCompositor = wrapUnique(new PaintArtifactCompositor);
+ m_paintArtifactCompositor = adoptPtr(new PaintArtifactCompositor);
}
void TearDown() override
@@ -53,7 +51,7 @@ protected:
private:
RuntimeEnabledFeatures::Backup m_featuresBackup;
- std::unique_ptr<PaintArtifactCompositor> m_paintArtifactCompositor;
+ OwnPtr<PaintArtifactCompositor> m_paintArtifactCompositor;
};
TEST_F(PaintArtifactCompositorTest, EmptyPaintArtifact)
@@ -387,7 +385,7 @@ protected:
cc::LayerTreeSettings settings = WebLayerTreeViewImplForTesting::defaultLayerTreeSettings();
settings.single_thread_proxy_scheduler = false;
settings.use_layer_lists = true;
- m_webLayerTreeView = wrapUnique(new WebLayerTreeViewWithOutputSurface(settings));
+ m_webLayerTreeView = adoptPtr(new WebLayerTreeViewWithOutputSurface(settings));
m_webLayerTreeView->setRootLayer(*getPaintArtifactCompositor().getWebLayer());
}
@@ -405,7 +403,7 @@ protected:
private:
scoped_refptr<base::TestSimpleTaskRunner> m_taskRunner;
base::ThreadTaskRunnerHandle m_taskRunnerHandle;
- std::unique_ptr<WebLayerTreeViewWithOutputSurface> m_webLayerTreeView;
+ OwnPtr<WebLayerTreeViewWithOutputSurface> m_webLayerTreeView;
};
TEST_F(PaintArtifactCompositorTestWithPropertyTrees, EmptyPaintArtifact)

Powered by Google App Engine
This is Rietveld 408576698