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

Unified Diff: cc/test/layer_tree_pixel_test.h

Issue 1866203004: Convert //cc from scoped_ptr to std::unique_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: scopedptrcc: rebase Created 4 years, 8 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
« no previous file with comments | « cc/test/layer_tree_pixel_resource_test.cc ('k') | cc/test/layer_tree_pixel_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/test/layer_tree_pixel_test.h
diff --git a/cc/test/layer_tree_pixel_test.h b/cc/test/layer_tree_pixel_test.h
index 199378efb196e0655ade559a1cca2da94a1bf0a2..9a0d5925c522abdf7c62265f8a8d7f102eb90980 100644
--- a/cc/test/layer_tree_pixel_test.h
+++ b/cc/test/layer_tree_pixel_test.h
@@ -5,11 +5,11 @@
#ifndef CC_TEST_LAYER_TREE_PIXEL_TEST_H_
#define CC_TEST_LAYER_TREE_PIXEL_TEST_H_
+#include <memory>
#include <vector>
#include "base/files/file_path.h"
#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
#include "cc/resources/single_release_callback.h"
#include "cc/test/layer_tree_test.h"
#include "ui/gl/gl_implementation.h"
@@ -40,12 +40,12 @@ class LayerTreePixelTest : public LayerTreeTest {
LayerTreePixelTest();
~LayerTreePixelTest() override;
- scoped_ptr<OutputSurface> CreateOutputSurface() override;
+ std::unique_ptr<OutputSurface> CreateOutputSurface() override;
void WillCommitCompleteOnThread(LayerTreeHostImpl* impl) override;
- virtual scoped_ptr<CopyOutputRequest> CreateCopyOutputRequest();
+ virtual std::unique_ptr<CopyOutputRequest> CreateCopyOutputRequest();
- void ReadbackResult(scoped_ptr<CopyOutputResult> result);
+ void ReadbackResult(std::unique_ptr<CopyOutputResult> result);
void BeginTest() override;
void SetupTree() override;
@@ -75,7 +75,7 @@ class LayerTreePixelTest : public LayerTreeTest {
Layer* target,
base::FilePath file_name);
- scoped_ptr<SkBitmap> CopyTextureMailboxToBitmap(
+ std::unique_ptr<SkBitmap> CopyTextureMailboxToBitmap(
const gfx::Size& size,
const TextureMailbox& texture_mailbox);
@@ -91,12 +91,12 @@ class LayerTreePixelTest : public LayerTreeTest {
static const SkColor kCSSGreen = 0xff008000;
gfx::DisableNullDrawGLBindings enable_pixel_output_;
- scoped_ptr<PixelComparator> pixel_comparator_;
+ std::unique_ptr<PixelComparator> pixel_comparator_;
PixelTestType test_type_;
scoped_refptr<Layer> content_root_;
Layer* readback_target_;
base::FilePath ref_file_;
- scoped_ptr<SkBitmap> result_bitmap_;
+ std::unique_ptr<SkBitmap> result_bitmap_;
std::vector<scoped_refptr<TextureLayer>> texture_layers_;
int pending_texture_mailbox_callbacks_;
gfx::Vector2d enlarge_texture_amount_;
« no previous file with comments | « cc/test/layer_tree_pixel_resource_test.cc ('k') | cc/test/layer_tree_pixel_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698