| Index: mojo/services/public/cpp/surfaces/surfaces_type_converters.h
|
| diff --git a/mojo/services/public/cpp/surfaces/surfaces_type_converters.h b/mojo/services/public/cpp/surfaces/surfaces_type_converters.h
|
| index 89abd160d5115b572751357247da806df2a23318..f51e825f4200d88b3acc6ba290d96962043ee780 100644
|
| --- a/mojo/services/public/cpp/surfaces/surfaces_type_converters.h
|
| +++ b/mojo/services/public/cpp/surfaces/surfaces_type_converters.h
|
| @@ -49,13 +49,6 @@ class MOJO_SURFACES_EXPORT TypeConverter<surfaces::QuadPtr, cc::DrawQuad> {
|
| static surfaces::QuadPtr ConvertFrom(const cc::DrawQuad& input);
|
| };
|
|
|
| -// This can't use the TypeConverter since it has to return a pointer to a type
|
| -// since cc::DrawQuad is polymorphic and needs an additional input. The
|
| -// TypeConverter for surfaces::Pass calls this explicitly.
|
| -MOJO_SURFACES_EXPORT scoped_ptr<cc::DrawQuad> ConvertTo(
|
| - const surfaces::QuadPtr& input,
|
| - cc::SharedQuadState* sqs);
|
| -
|
| template <>
|
| class MOJO_SURFACES_EXPORT
|
| TypeConverter<surfaces::SharedQuadStatePtr, cc::SharedQuadState> {
|
| @@ -64,9 +57,6 @@ TypeConverter<surfaces::SharedQuadStatePtr, cc::SharedQuadState> {
|
| const cc::SharedQuadState& input);
|
| };
|
|
|
| -MOJO_SURFACES_EXPORT scoped_ptr<cc::SharedQuadState> ConvertTo(
|
| - const surfaces::SharedQuadStatePtr& input);
|
| -
|
| template <>
|
| class MOJO_SURFACES_EXPORT TypeConverter<surfaces::PassPtr, cc::RenderPass> {
|
| public:
|
|
|