X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fcontent%2Fbrowser%2Fcompositor%2Fsoftware_output_device_ozone_unittest.cc;h=8b720055d8f91b547f0cc816a036903dd2559db4;hb=1afa4dd80ef85af7c90efaea6959db1d92330844;hp=972126e33819d72b63d1465a6d5dcf80bbbf248c;hpb=90762837333c13ccf56f2ad88e4481fc71e8d281;p=platform%2Fframework%2Fweb%2Fcrosswalk.git diff --git a/src/content/browser/compositor/software_output_device_ozone_unittest.cc b/src/content/browser/compositor/software_output_device_ozone_unittest.cc index 972126e..8b72005 100644 --- a/src/content/browser/compositor/software_output_device_ozone_unittest.cc +++ b/src/content/browser/compositor/software_output_device_ozone_unittest.cc @@ -26,15 +26,15 @@ class MockSurfaceOzone : public ui::SurfaceOzoneCanvas { virtual ~MockSurfaceOzone() {} // ui::SurfaceOzoneCanvas overrides: - virtual void ResizeCanvas(const gfx::Size& size) OVERRIDE { + virtual void ResizeCanvas(const gfx::Size& size) override { surface_ = skia::AdoptRef(SkSurface::NewRaster( SkImageInfo::MakeN32Premul(size.width(), size.height()))); } - virtual skia::RefPtr GetCanvas() OVERRIDE { + virtual skia::RefPtr GetCanvas() override { return skia::SharePtr(surface_->getCanvas()); } - virtual void PresentCanvas(const gfx::Rect& damage) OVERRIDE {} - virtual scoped_ptr CreateVSyncProvider() OVERRIDE { + virtual void PresentCanvas(const gfx::Rect& damage) override {} + virtual scoped_ptr CreateVSyncProvider() override { return scoped_ptr(); } @@ -51,11 +51,11 @@ class MockSurfaceFactoryOzone : public ui::SurfaceFactoryOzone { virtual bool LoadEGLGLES2Bindings( AddGLLibraryCallback add_gl_library, - SetGLGetProcAddressProcCallback set_gl_get_proc_address) OVERRIDE { + SetGLGetProcAddressProcCallback set_gl_get_proc_address) override { return false; } virtual scoped_ptr CreateCanvasForWidget( - gfx::AcceleratedWidget widget) OVERRIDE { + gfx::AcceleratedWidget widget) override { return make_scoped_ptr(new MockSurfaceOzone()); } @@ -70,8 +70,8 @@ class SoftwareOutputDeviceOzoneTest : public testing::Test { SoftwareOutputDeviceOzoneTest(); virtual ~SoftwareOutputDeviceOzoneTest(); - virtual void SetUp() OVERRIDE; - virtual void TearDown() OVERRIDE; + virtual void SetUp() override; + virtual void TearDown() override; protected: scoped_ptr output_device_; @@ -122,7 +122,7 @@ void SoftwareOutputDeviceOzoneTest::TearDown() { class SoftwareOutputDeviceOzonePixelTest : public SoftwareOutputDeviceOzoneTest { protected: - virtual void SetUp() OVERRIDE; + virtual void SetUp() override; }; void SoftwareOutputDeviceOzonePixelTest::SetUp() {