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

Unified Diff: ui/ozone/platform/dri/dri_surface_factory.cc

Issue 758853005: Remove Initialize/Shutdown from DriSurfaceFactory (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: GN Created 6 years 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/ozone/platform/dri/dri_surface_factory.h ('k') | ui/ozone/platform/dri/dri_surface_factory_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/ozone/platform/dri/dri_surface_factory.cc
diff --git a/ui/ozone/platform/dri/dri_surface_factory.cc b/ui/ozone/platform/dri/dri_surface_factory.cc
index 9fed6fb2c511310e933ef9d9d3c15928edbc948d..ba136ffa55695019f9933ca284f38c05554dd77b 100644
--- a/ui/ozone/platform/dri/dri_surface_factory.cc
+++ b/ui/ozone/platform/dri/dri_surface_factory.cc
@@ -18,42 +18,16 @@
namespace ui {
-// static
-const gfx::AcceleratedWidget DriSurfaceFactory::kDefaultWidgetHandle = 1;
-
DriSurfaceFactory::DriSurfaceFactory(DriWrapper* drm,
DriWindowDelegateManager* window_manager)
- : drm_(drm), window_manager_(window_manager), state_(UNINITIALIZED) {
+ : drm_(drm), window_manager_(window_manager) {
}
DriSurfaceFactory::~DriSurfaceFactory() {
- if (state_ == INITIALIZED)
- ShutdownHardware();
-}
-
-DriSurfaceFactory::HardwareState DriSurfaceFactory::InitializeHardware() {
- if (state_ != UNINITIALIZED)
- return state_;
-
- if (drm_->get_fd() < 0) {
- LOG(ERROR) << "Failed to create DRI connection";
- state_ = FAILED;
- return state_;
- }
-
- state_ = INITIALIZED;
- return state_;
-}
-
-void DriSurfaceFactory::ShutdownHardware() {
- DCHECK(state_ == INITIALIZED);
- state_ = UNINITIALIZED;
}
scoped_ptr<ui::SurfaceOzoneCanvas> DriSurfaceFactory::CreateCanvasForWidget(
gfx::AcceleratedWidget widget) {
- DCHECK(state_ == INITIALIZED);
-
return scoped_ptr<ui::SurfaceOzoneCanvas>(
new DriSurface(window_manager_->GetWindowDelegate(widget), drm_));
}
« no previous file with comments | « ui/ozone/platform/dri/dri_surface_factory.h ('k') | ui/ozone/platform/dri/dri_surface_factory_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698