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

Unified Diff: components/mus/public/cpp/surfaces/surfaces_type_converters.h

Issue 2080383002: cc/ipc: Move CompositorFrame mojoms (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Updated owners Created 4 years, 6 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
Index: components/mus/public/cpp/surfaces/surfaces_type_converters.h
diff --git a/components/mus/public/cpp/surfaces/surfaces_type_converters.h b/components/mus/public/cpp/surfaces/surfaces_type_converters.h
index e84ff5e7026ad51bb56b25a7057e80de41d740ca..7c444733b2eae8cb677cf9f50a0085ac5732baea 100644
--- a/components/mus/public/cpp/surfaces/surfaces_type_converters.h
+++ b/components/mus/public/cpp/surfaces/surfaces_type_converters.h
@@ -7,13 +7,13 @@
#include <memory>
+#include "cc/ipc/compositor_frame.mojom.h"
#include "cc/ipc/quads.mojom.h"
#include "cc/ipc/surface_id.mojom.h"
#include "cc/resources/returned_resource.h"
#include "cc/resources/transferable_resource.h"
#include "cc/surfaces/surface_id.h"
#include "components/mus/public/cpp/surfaces/mojo_surfaces_export.h"
-#include "components/mus/public/interfaces/compositor_frame.mojom.h"
#include "gpu/command_buffer/common/mailbox.h"
#include "gpu/command_buffer/common/mailbox_holder.h"
#include "gpu/command_buffer/common/sync_token.h"
@@ -54,20 +54,20 @@ struct MOJO_SURFACES_EXPORT
// Types from compositor_frame.mojom
MOJO_SURFACES_EXPORT std::unique_ptr<cc::CompositorFrame>
-ConvertToCompositorFrame(const mus::mojom::CompositorFramePtr& input);
+ConvertToCompositorFrame(const cc::mojom::CompositorFramePtr& input);
template <>
struct MOJO_SURFACES_EXPORT
- TypeConverter<mus::mojom::CompositorFramePtr, cc::CompositorFrame> {
- static mus::mojom::CompositorFramePtr Convert(
+ TypeConverter<cc::mojom::CompositorFramePtr, cc::CompositorFrame> {
+ static cc::mojom::CompositorFramePtr Convert(
const cc::CompositorFrame& input);
};
template <>
struct MOJO_SURFACES_EXPORT TypeConverter<std::unique_ptr<cc::CompositorFrame>,
- mus::mojom::CompositorFramePtr> {
+ cc::mojom::CompositorFramePtr> {
static std::unique_ptr<cc::CompositorFrame> Convert(
- const mus::mojom::CompositorFramePtr& input);
+ const cc::mojom::CompositorFramePtr& input);
};
} // namespace mojo
« no previous file with comments | « components/mus/public/cpp/surfaces/OWNERS ('k') | components/mus/public/cpp/surfaces/surfaces_type_converters.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698