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

Unified Diff: ui/ozone/platform/drm/gpu/gbm_surfaceless.cc

Issue 1311043016: Switch DRM platform to using a separate thread (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@mv-drm-calls-on-thread2
Patch Set: Created 5 years, 3 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
Index: ui/ozone/platform/drm/gpu/gbm_surfaceless.cc
diff --git a/ui/ozone/platform/drm/gpu/gbm_surfaceless.cc b/ui/ozone/platform/drm/gpu/gbm_surfaceless.cc
index cc713863ef9c33210c462e5c375194d693779cef..b5b47067fe0c10627d25ccd9b3d86cb2c7c457ec 100644
--- a/ui/ozone/platform/drm/gpu/gbm_surfaceless.cc
+++ b/ui/ozone/platform/drm/gpu/gbm_surfaceless.cc
@@ -6,10 +6,8 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
-#include "ui/ozone/platform/drm/gpu/drm_device.h"
-#include "ui/ozone/platform/drm/gpu/drm_device_manager.h"
#include "ui/ozone/platform/drm/gpu/drm_vsync_provider.h"
-#include "ui/ozone/platform/drm/gpu/drm_window.h"
+#include "ui/ozone/platform/drm/gpu/drm_window_proxy.h"
#include "ui/ozone/platform/drm/gpu/gbm_buffer.h"
#include "ui/ozone/platform/drm/gpu/hardware_display_controller.h"
@@ -19,10 +17,8 @@ void EmptyPageFlipCallback(gfx::SwapResult result) {
}
} // namespace
-GbmSurfaceless::GbmSurfaceless(DrmWindow* window,
- DrmDeviceManager* drm_device_manager)
- : window_(window), drm_device_manager_(drm_device_manager) {
-}
+GbmSurfaceless::GbmSurfaceless(scoped_ptr<DrmWindowProxy> window)
+ : window_(window.Pass()) {}
GbmSurfaceless::~GbmSurfaceless() {
}
@@ -47,23 +43,11 @@ bool GbmSurfaceless::OnSwapBuffersAsync(
}
scoped_ptr<gfx::VSyncProvider> GbmSurfaceless::CreateVSyncProvider() {
- return make_scoped_ptr(new DrmVSyncProvider(window_));
+ return make_scoped_ptr(new DrmVSyncProvider(window_.get()));
}
bool GbmSurfaceless::IsUniversalDisplayLinkDevice() {
- if (!drm_device_manager_)
- return false;
- scoped_refptr<DrmDevice> drm_primary =
- drm_device_manager_->GetDrmDevice(gfx::kNullAcceleratedWidget);
- DCHECK(drm_primary);
-
- HardwareDisplayController* controller = window_->GetController();
- if (!controller)
- return false;
- scoped_refptr<DrmDevice> drm = controller->GetAllocationDrmDevice();
- DCHECK(drm);
-
- return drm_primary != drm;
+ return window_->IsDisplayedOnUniversalDisplayLinkDevice();
}
} // namespace ui

Powered by Google App Engine
This is Rietveld 408576698