| Index: components/mus/ws/server_window_surface.h
|
| diff --git a/components/mus/ws/server_window_surface.h b/components/mus/ws/server_window_surface.h
|
| index bc5129e623c66970abb29465318eee067518f1c2..0f73a31ec785078bfdf6a00da617a061b9d2414f 100644
|
| --- a/components/mus/ws/server_window_surface.h
|
| +++ b/components/mus/ws/server_window_surface.h
|
| @@ -12,7 +12,6 @@
|
| #include "cc/surfaces/surface_factory_client.h"
|
| #include "cc/surfaces/surface_id.h"
|
| #include "cc/surfaces/surface_id_allocator.h"
|
| -#include "components/mus/public/cpp/surfaces/custom_surface_converter.h"
|
| #include "components/mus/public/interfaces/compositor_frame.mojom.h"
|
| #include "components/mus/public/interfaces/window_tree.mojom.h"
|
| #include "components/mus/ws/ids.h"
|
| @@ -29,8 +28,7 @@ class ServerWindowSurfaceManager;
|
|
|
| // Server side representation of a WindowSurface.
|
| class ServerWindowSurface : public mojom::Surface,
|
| - public cc::SurfaceFactoryClient,
|
| - public mojo::CustomSurfaceConverter {
|
| + public cc::SurfaceFactoryClient {
|
| public:
|
| ServerWindowSurface(ServerWindowSurfaceManager* manager,
|
| mojo::InterfaceRequest<mojom::Surface> request,
|
| @@ -47,12 +45,6 @@ class ServerWindowSurface : public mojom::Surface,
|
| mojom::CompositorFramePtr frame,
|
| const SubmitCompositorFrameCallback& callback) override;
|
|
|
| - // Returns the set of windows referenced by the last CompositorFrame submitted
|
| - // to this window.
|
| - const std::set<WindowId>& referenced_window_ids() const {
|
| - return referenced_window_ids_;
|
| - }
|
| -
|
| const cc::SurfaceId& id() const { return surface_id_; }
|
|
|
| // Destroys old surfaces that have been outdated by a new surface.
|
| @@ -64,28 +56,12 @@ class ServerWindowSurface : public mojom::Surface,
|
| private:
|
| ServerWindow* window();
|
|
|
| - // Takes a mojom::CompositorFrame |input|, and converts it into a
|
| - // cc::CompositorFrame. Along the way, this conversion ensures that a
|
| - // CompositorFrame of this window can only refer to windows within its
|
| - // subtree. Windows referenced in |input| are stored in
|
| - // |referenced_window_ids_|.
|
| - std::unique_ptr<cc::CompositorFrame> ConvertCompositorFrame(
|
| - const mojom::CompositorFramePtr& input);
|
| -
|
| - // Overriden from CustomSurfaceConverter:
|
| - bool ConvertSurfaceDrawQuad(const cc::mojom::DrawQuadPtr& input,
|
| - const cc::CompositorFrameMetadata& metadata,
|
| - cc::SharedQuadState* sqs,
|
| - cc::RenderPass* render_pass) override;
|
| -
|
| // SurfaceFactoryClient implementation.
|
| void ReturnResources(const cc::ReturnedResourceArray& resources) override;
|
| void SetBeginFrameSource(cc::BeginFrameSource* begin_frame_source) override;
|
|
|
| ServerWindowSurfaceManager* manager_; // Owns this.
|
|
|
| - // The set of Windows referenced in the last submitted CompositorFrame.
|
| - std::set<WindowId> referenced_window_ids_;
|
| gfx::Size last_submitted_frame_size_;
|
|
|
| cc::SurfaceId surface_id_;
|
|
|