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

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

Issue 2196503003: Revert of services/ui: Revert CLs that broke Windows. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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 | « services/ui/ws/frame_generator_unittest.cc ('k') | services/ui/ws/platform_display_init_params.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/ui/ws/platform_display.cc
diff --git a/services/ui/ws/platform_display.cc b/services/ui/ws/platform_display.cc
index fb781be3d1f308c9e9a3922cb7a41933c2c87920..c6621388322c28daaad245e929f72c218485a4cf 100644
--- a/services/ui/ws/platform_display.cc
+++ b/services/ui/ws/platform_display.cc
@@ -11,7 +11,6 @@
#include "cc/output/delegated_frame_data.h"
#include "services/shell/public/cpp/connection.h"
#include "services/shell/public/cpp/connector.h"
-#include "services/ui/gles2/gpu_state.h"
#include "services/ui/public/interfaces/gpu.mojom.h"
#include "services/ui/surfaces/display_compositor.h"
#include "services/ui/surfaces/surfaces_state.h"
@@ -59,9 +58,7 @@
#if !defined(OS_ANDROID)
cursor_loader_(ui::CursorLoader::Create()),
#endif
- frame_generator_(new FrameGenerator(this,
- init_params.gpu_state,
- init_params.surfaces_state)) {
+ frame_generator_(new FrameGenerator(this, init_params.surfaces_state)) {
metrics_.bounds = init_params.display_bounds;
// TODO(rjkroege): Preserve the display_id when Ozone platform can use it.
}
« no previous file with comments | « services/ui/ws/frame_generator_unittest.cc ('k') | services/ui/ws/platform_display_init_params.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698