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

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

Issue 2098953003: Make cc::CompositorFrames movable [Part 2 of 2] (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Android compiles locally 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 3c3ef4ff021ac3d7305add81d24ac545ceaab9ee..12e704089865bba3908720ee3ea5a5e865d7fbac 100644
--- a/components/mus/public/cpp/surfaces/surfaces_type_converters.h
+++ b/components/mus/public/cpp/surfaces/surfaces_type_converters.h
@@ -34,8 +34,8 @@ std::unique_ptr<cc::RenderPass> ConvertToRenderPass(
const cc::CompositorFrameMetadata& metadata);
// Types from compositor_frame.mojom
-MOJO_SURFACES_EXPORT std::unique_ptr<cc::CompositorFrame>
-ConvertToCompositorFrame(const cc::mojom::CompositorFramePtr& input);
+MOJO_SURFACES_EXPORT cc::CompositorFrame ConvertToCompositorFrame(
+ const cc::mojom::CompositorFramePtr& input);
template <>
struct MOJO_SURFACES_EXPORT
@@ -45,9 +45,9 @@ struct MOJO_SURFACES_EXPORT
};
template <>
-struct MOJO_SURFACES_EXPORT TypeConverter<std::unique_ptr<cc::CompositorFrame>,
- cc::mojom::CompositorFramePtr> {
- static std::unique_ptr<cc::CompositorFrame> Convert(
+struct MOJO_SURFACES_EXPORT
+ TypeConverter<cc::CompositorFrame, cc::mojom::CompositorFramePtr> {
+ static cc::CompositorFrame Convert(
const cc::mojom::CompositorFramePtr& input);
};

Powered by Google App Engine
This is Rietveld 408576698