| Index: ui/ozone/platform/caca/caca_surface_factory.cc
|
| diff --git a/ui/ozone/platform/caca/caca_surface_factory.cc b/ui/ozone/platform/caca/caca_surface_factory.cc
|
| index 13b8a8c01ed51fc5f36fadf60bd681ae1989613e..1786831cb9cea87ab6209eaee7165afab3834bc0 100644
|
| --- a/ui/ozone/platform/caca/caca_surface_factory.cc
|
| +++ b/ui/ozone/platform/caca/caca_surface_factory.cc
|
| @@ -23,6 +23,8 @@ class CacaSurface : public gfx::SurfaceOzoneCanvas {
|
| CacaSurface(CacaConnection* connection);
|
| virtual ~CacaSurface();
|
|
|
| + bool Initialize();
|
| +
|
| // gfx::SurfaceOzoneCanvas overrides:
|
| virtual skia::RefPtr<SkCanvas> GetCanvas() OVERRIDE;
|
| virtual bool ResizeCanvas(const gfx::Size& viewport_size) OVERRIDE;
|
| @@ -46,7 +48,7 @@ CacaSurface::~CacaSurface() {
|
| caca_free_dither(dither_);
|
| }
|
|
|
| -bool CacaSurface::InitializeCanvas() {
|
| +bool CacaSurface::Initialize() {
|
| SkImageInfo info = SkImageInfo::Make(connection_->bitmap_size().width(),
|
| connection_->bitmap_size().height(),
|
| kPMColor_SkColorType,
|
| @@ -140,7 +142,9 @@ scoped_ptr<gfx::SurfaceOzoneCanvas> CacaSurfaceFactory::CreateCanvasForWidget(
|
| CHECK_EQ(INITIALIZED, state_);
|
| CHECK_EQ(kDefaultWidgetHandle, widget);
|
|
|
| - return make_scoped_ptr<gfx::SurfaceOzoneCanvas>(new CacaSurface(connection_));
|
| + scoped_ptr<CacaSurface> canvas(new CacaSurface(connection_));
|
| + CHECK(canvas->Initialize());
|
| + return canvas.PassAs<gfx::SurfaceOzoneCanvas>();
|
| }
|
|
|
| } // namespace ui
|
|
|