diff options
| author | fsamuel <fsamuel@chromium.org> | 2015-08-25 14:24:13 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-08-25 21:24:45 +0000 |
| commit | f8876f7b81eb8cfa2bf3bed4febf6acda2071d01 (patch) | |
| tree | bd4d96fd3a42007dde3535b16b0cbf2e67619a5a /mojo/converters | |
| parent | 878468ecdb4eb55dff9077cc739f0b7ea5fe6197 (diff) | |
| download | chromium_src-f8876f7b81eb8cfa2bf3bed4febf6acda2071d01.zip chromium_src-f8876f7b81eb8cfa2bf3bed4febf6acda2071d01.tar.gz chromium_src-f8876f7b81eb8cfa2bf3bed4febf6acda2071d01.tar.bz2 | |
Mandoline + CC: Move ReturnedResource to compositor_frame.mojom and add comments
BUG=492389
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
Review URL: https://codereview.chromium.org/1317703002
Cr-Commit-Position: refs/heads/master@{#345439}
Diffstat (limited to 'mojo/converters')
| -rw-r--r-- | mojo/converters/surfaces/surfaces_type_converters.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mojo/converters/surfaces/surfaces_type_converters.h b/mojo/converters/surfaces/surfaces_type_converters.h index b1f33b5..18b5212 100644 --- a/mojo/converters/surfaces/surfaces_type_converters.h +++ b/mojo/converters/surfaces/surfaces_type_converters.h @@ -9,9 +9,9 @@ #include "cc/resources/returned_resource.h" #include "cc/resources/transferable_resource.h" #include "cc/surfaces/surface_id.h" +#include "components/view_manager/public/interfaces/compositor_frame.mojom.h" #include "components/view_manager/public/interfaces/quads.mojom.h" #include "components/view_manager/public/interfaces/surface_id.mojom.h" -#include "components/view_manager/public/interfaces/surfaces.mojom.h" #include "gpu/command_buffer/common/mailbox.h" #include "gpu/command_buffer/common/mailbox_holder.h" #include "mojo/converters/surfaces/mojo_surfaces_export.h" @@ -78,7 +78,7 @@ struct MOJO_SURFACES_EXPORT TypeConverter<scoped_ptr<cc::RenderPass>, PassPtr> { static scoped_ptr<cc::RenderPass> Convert(const PassPtr& input); }; -// Types from surfaces.mojom +// Types from compositor_frame.mojom template <> struct MOJO_SURFACES_EXPORT TypeConverter<MailboxPtr, gpu::Mailbox> { static MailboxPtr Convert(const gpu::Mailbox& input); |