Chromium Code Reviews| 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_) { |
|
rjkroege
2013/10/18 14:54:05
i had a discussion with spang about how this logic
dnicoara
2013/10/18 16:00:50
OK, thank you. I remember us talking about this at
|
| + LOG(WARNING) << "No SurfaceFactoryOzone implementation set. Using default " |
| + "gfx::SoftwareSurfaceFactoryOzone."; |
| + impl_ = new SoftwareSurfaceFactoryOzone(); |
| + } |
| return impl_; |
| } |