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

Unified Diff: services/ui/ws/test_utils.cc

Issue 2470143006: Remove dependency on SurfaceManager in FrameGenerator (Closed)
Patch Set: Remove a couple of bad std::moves Created 4 years, 1 month 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 | « services/ui/ws/platform_display_init_params.h ('k') | services/ui/ws/window_tree.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/ui/ws/test_utils.cc
diff --git a/services/ui/ws/test_utils.cc b/services/ui/ws/test_utils.cc
index 979b03d59112c588e05292ed54bacfad956f2ae1..8a8b972bc936620266451cff6692f9b76feba4bf 100644
--- a/services/ui/ws/test_utils.cc
+++ b/services/ui/ws/test_utils.cc
@@ -11,7 +11,6 @@
#include "gpu/ipc/client/gpu_channel_host.h"
#include "services/service_manager/public/interfaces/connector.mojom.h"
#include "services/ui/public/interfaces/cursor.mojom.h"
-#include "services/ui/surfaces/display_compositor.h"
#include "services/ui/ws/display_binding.h"
#include "services/ui/ws/display_manager.h"
#include "services/ui/ws/platform_display_init_params.h"
@@ -490,12 +489,8 @@ WindowServerTestHelper::~WindowServerTestHelper() {
// WindowEventTargetingHelper ------------------------------------------------
WindowEventTargetingHelper::WindowEventTargetingHelper()
- : wm_client_(nullptr),
- display_binding_(nullptr),
- display_(nullptr),
- display_compositor_(new DisplayCompositor(nullptr)) {
+ : wm_client_(nullptr), display_binding_(nullptr), display_(nullptr) {
PlatformDisplayInitParams display_init_params;
- display_init_params.display_compositor = display_compositor_;
display_ = new Display(window_server(), display_init_params);
display_binding_ = new TestDisplayBinding(window_server());
display_->Init(base::WrapUnique(display_binding_));
« no previous file with comments | « services/ui/ws/platform_display_init_params.h ('k') | services/ui/ws/window_tree.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698