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

Unified Diff: services/ui/ws/frame_generator.h

Issue 2481263002: Introduce Display Compositor mojo interface. Use InProcessContextProvider. (Closed)
Patch Set: Speculative fix for android build issue 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
Index: services/ui/ws/frame_generator.h
diff --git a/services/ui/ws/frame_generator.h b/services/ui/ws/frame_generator.h
index ef3e5028dd2badceb18abc18d53049747e2caecc..f5bb9b76c49f5f2886ef332ca50bdbe7d53ca800 100644
--- a/services/ui/ws/frame_generator.h
+++ b/services/ui/ws/frame_generator.h
@@ -10,10 +10,12 @@
#include "base/macros.h"
#include "base/timer/timer.h"
+#include "cc/ipc/display_compositor.mojom.h"
#include "cc/surfaces/frame_sink_id.h"
#include "cc/surfaces/surface_id.h"
#include "services/ui/public/interfaces/window_tree_constants.mojom.h"
#include "services/ui/ws/ids.h"
+#include "services/ui/ws/server_window_delegate.h"
#include "services/ui/ws/server_window_tracker.h"
#include "ui/gfx/geometry/rect.h"
#include "ui/gfx/native_widget_types.h"
@@ -49,8 +51,6 @@ class FrameGenerator : public ServerWindowTracker,
FrameGenerator(FrameGeneratorDelegate* delegate, ServerWindow* root_window);
~FrameGenerator() override;
- void OnGpuChannelEstablished(scoped_refptr<gpu::GpuChannelHost> gpu_channel);
-
// Schedules a redraw for the provided region.
void OnAcceleratedWidgetAvailable(gfx::AcceleratedWidget widget);
@@ -112,17 +112,15 @@ class FrameGenerator : public ServerWindowTracker,
// Removes all retained references to surfaces.
void RemoveAllSurfaceReferences();
- ui::DisplayCompositor* GetDisplayCompositor();
+ cc::mojom::DisplayCompositor* GetDisplayCompositor();
// ServerWindowObserver implementation.
void OnWindowDestroying(ServerWindow* window) override;
FrameGeneratorDelegate* delegate_;
ServerWindow* const root_window_;
- scoped_refptr<gpu::GpuChannelHost> gpu_channel_;
cc::mojom::MojoCompositorFrameSinkPtr compositor_frame_sink_;
- gfx::AcceleratedWidget widget_ = gfx::kNullAcceleratedWidget;
// Represents the top level root surface id that should reference the display
// root surface. We don't know the actual value, because it's generated in

Powered by Google App Engine
This is Rietveld 408576698