Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1122)

Unified Diff: content/browser/aura/software_output_device_ozone_unittest.cc

Issue 131893002: [Ozone] Update gfx::SurfaceFactoryOzone interface in content_unittests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/aura/software_output_device_ozone_unittest.cc
diff --git a/content/browser/aura/software_output_device_ozone_unittest.cc b/content/browser/aura/software_output_device_ozone_unittest.cc
index 2dfbda6ef73db7682da3706a3c932683bf3d1b73..64724ab1b6f56a72d5beff0313e5048a765784be 100644
--- a/content/browser/aura/software_output_device_ozone_unittest.cc
+++ b/content/browser/aura/software_output_device_ozone_unittest.cc
@@ -13,6 +13,7 @@
#include "ui/gfx/ozone/surface_factory_ozone.h"
#include "ui/gfx/size.h"
#include "ui/gfx/skia_util.h"
+#include "ui/gfx/vsync_provider.h"
#include "ui/gl/gl_implementation.h"
namespace {
@@ -47,9 +48,9 @@ class MockSurfaceFactoryOzone : public gfx::SurfaceFactoryOzone {
virtual SkCanvas* GetCanvasForWidget(gfx::AcceleratedWidget w) OVERRIDE {
return canvas_.get();
}
- virtual gfx::VSyncProvider* GetVSyncProvider(
+ virtual scoped_ptr<gfx::VSyncProvider> CreateVSyncProvider(
gfx::AcceleratedWidget w) OVERRIDE {
- return NULL;
+ return scoped_ptr<gfx::VSyncProvider>();
}
private:
skia::RefPtr<SkBitmapDevice> device_;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698