| Index: skia/public/type_converters.h
|
| diff --git a/skia/public/type_converters.h b/skia/public/type_converters.h
|
| index a7f71d8e02edb734e51af82dbf6145e88382df0e..070f7004f51eca997515eca9c9b1f8311beedd12 100644
|
| --- a/skia/public/type_converters.h
|
| +++ b/skia/public/type_converters.h
|
| @@ -5,20 +5,20 @@
|
| #ifndef SKIA_PUBLIC_TYPE_CONVERTERS_H_
|
| #define SKIA_PUBLIC_TYPE_CONVERTERS_H_
|
|
|
| -#include "skia/public/interfaces/bitmap.mojom.h"
|
| +#include "third_party/WebKit/public/platform/bitmap.mojom.h"
|
|
|
| class SkBitmap;
|
|
|
| namespace mojo {
|
|
|
| template <>
|
| -struct TypeConverter<SkBitmap, skia::mojom::BitmapPtr> {
|
| - static SkBitmap Convert(const skia::mojom::BitmapPtr& image);
|
| +struct TypeConverter<SkBitmap, blink::mojom::BitmapPtr> {
|
| + static SkBitmap Convert(const blink::mojom::BitmapPtr& image);
|
| };
|
|
|
| template <>
|
| -struct TypeConverter<skia::mojom::BitmapPtr, SkBitmap> {
|
| - static skia::mojom::BitmapPtr Convert(const SkBitmap& bitmap);
|
| +struct TypeConverter<blink::mojom::BitmapPtr, SkBitmap> {
|
| + static blink::mojom::BitmapPtr Convert(const SkBitmap& bitmap);
|
| };
|
|
|
| } // namespace mojo
|
|
|