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

Unified Diff: cc/test/layer_tree_pixel_test.cc

Issue 1821863002: Hook up ui::Compositor to Display's BeginFrameSource (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix Display member destruction order 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/fake_output_surface_client.h ('k') | cc/test/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.cc
diff --git a/cc/test/layer_tree_pixel_test.cc b/cc/test/layer_tree_pixel_test.cc
index aaf0b5a22fe8c26e7dbf9c3343fea7f989146268..db48d9734a3c8487c18e6a638ffb9d8ff24881df 100644
--- a/cc/test/layer_tree_pixel_test.cc
+++ b/cc/test/layer_tree_pixel_test.cc
@@ -8,7 +8,6 @@
#include <stdint.h>
#include "base/command_line.h"
-#include "base/memory/ptr_util.h"
#include "base/path_service.h"
#include "cc/base/switches.h"
#include "cc/layers/solid_color_layer.h"
@@ -49,8 +48,8 @@ std::unique_ptr<OutputSurface> LayerTreePixelTest::CreateOutputSurface() {
new PixelTestSoftwareOutputDevice);
software_output_device->set_surface_expansion_size(
surface_expansion_size);
- output_surface = base::WrapUnique(
- new PixelTestOutputSurface(std::move(software_output_device)));
+ output_surface = base::WrapUnique(new PixelTestOutputSurface(
+ std::move(software_output_device), nullptr));
break;
}
case PIXEL_TEST_GL: {
@@ -59,8 +58,9 @@ std::unique_ptr<OutputSurface> LayerTreePixelTest::CreateOutputSurface() {
new TestInProcessContextProvider(nullptr));
scoped_refptr<TestInProcessContextProvider> worker(
new TestInProcessContextProvider(compositor.get()));
- output_surface = base::WrapUnique(new PixelTestOutputSurface(
- std::move(compositor), std::move(worker), flipped_output_surface));
+ output_surface = base::WrapUnique(
+ new PixelTestOutputSurface(std::move(compositor), std::move(worker),
+ flipped_output_surface, nullptr));
break;
}
}
« no previous file with comments | « cc/test/fake_output_surface_client.h ('k') | cc/test/pixel_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698