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

Unified Diff: ui/gfx/ozone/surface_factory_ozone.cc

Issue 27764002: Enable Ozone software implementation in GYP (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Refactored GYP dridrm dependency Created 7 years, 2 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 | « ui/gfx/gfx.gyp ('k') | ui/ui_unittests.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/ozone/surface_factory_ozone.cc
diff --git a/ui/gfx/ozone/surface_factory_ozone.cc b/ui/gfx/ozone/surface_factory_ozone.cc
index ca67228d4b1d178e14858c949fcb3f604b22a8b4..8c7cbb9bdd17f0e422762d1aec7c3c489b25ead8 100644
--- a/ui/gfx/ozone/surface_factory_ozone.cc
+++ b/ui/gfx/ozone/surface_factory_ozone.cc
@@ -6,6 +6,8 @@
#include <stdlib.h>
+#include "ui/gfx/ozone/impl/software_surface_factory_ozone.h"
+
namespace gfx {
// static
@@ -42,7 +44,11 @@ SurfaceFactoryOzone::~SurfaceFactoryOzone() {
}
SurfaceFactoryOzone* SurfaceFactoryOzone::GetInstance() {
- CHECK(impl_) << "SurfaceFactoryOzone accessed before constructed";
+ if (!impl_) {
+ LOG(WARNING) << "No SurfaceFactoryOzone implementation set. Using default "
+ "gfx::SoftwareSurfaceFactoryOzone.";
+ impl_ = new SoftwareSurfaceFactoryOzone();
+ }
return impl_;
}
« no previous file with comments | « ui/gfx/gfx.gyp ('k') | ui/ui_unittests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698