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

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

Issue 908993003: [Ozone-Dri] Rename DriWrapper to DrmDevice (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@udl3-pass-drm-fd
Patch Set: rebased Created 5 years, 10 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/ozone/platform/dri/ozone_platform_dri.cc ('k') | ui/ozone/platform/dri/scanout_buffer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/ozone/platform/dri/ozone_platform_gbm.cc
diff --git a/ui/ozone/platform/dri/ozone_platform_gbm.cc b/ui/ozone/platform/dri/ozone_platform_gbm.cc
index 7c237dfcf7d3cf09c30e88ba091805978f517c75..15d54669c892b55f1e46cc4e17f8062412f73ada 100644
--- a/ui/ozone/platform/dri/ozone_platform_gbm.cc
+++ b/ui/ozone/platform/dri/ozone_platform_gbm.cc
@@ -26,9 +26,9 @@
#include "ui/ozone/platform/dri/drm_device_generator.h"
#include "ui/ozone/platform/dri/drm_device_manager.h"
#include "ui/ozone/platform/dri/gbm_buffer.h"
+#include "ui/ozone/platform/dri/gbm_device.h"
#include "ui/ozone/platform/dri/gbm_surface.h"
#include "ui/ozone/platform/dri/gbm_surface_factory.h"
-#include "ui/ozone/platform/dri/gbm_wrapper.h"
#include "ui/ozone/platform/dri/native_display_delegate_dri.h"
#include "ui/ozone/platform/dri/native_display_delegate_proxy.h"
#include "ui/ozone/platform/dri/scanout_buffer.h"
@@ -76,9 +76,9 @@ class GbmBufferGenerator : public ScanoutBufferGenerator {
~GbmBufferGenerator() override {}
// ScanoutBufferGenerator:
- scoped_refptr<ScanoutBuffer> Create(const scoped_refptr<DriWrapper>& drm,
+ scoped_refptr<ScanoutBuffer> Create(const scoped_refptr<DrmDevice>& drm,
const gfx::Size& size) override {
- scoped_refptr<GbmWrapper> gbm(static_cast<GbmWrapper*>(drm.get()));
+ scoped_refptr<GbmDevice> gbm(static_cast<GbmDevice*>(drm.get()));
return GbmBuffer::CreateBuffer(gbm, SurfaceFactoryOzone::RGBA_8888, size,
true);
}
@@ -93,9 +93,9 @@ class GbmDeviceGenerator : public DrmDeviceGenerator {
~GbmDeviceGenerator() override {}
// DrmDeviceGenerator:
- scoped_refptr<DriWrapper> CreateDevice(const base::FilePath& path,
- base::File file) override {
- scoped_refptr<DriWrapper> drm = new GbmWrapper(path, file.Pass());
+ scoped_refptr<DrmDevice> CreateDevice(const base::FilePath& path,
+ base::File file) override {
+ scoped_refptr<DrmDevice> drm = new GbmDevice(path, file.Pass());
if (drm->Initialize())
return drm;
@@ -175,7 +175,7 @@ class OzonePlatformGbm : public OzonePlatform {
void InitializeGPU() override {
gl_api_loader_.reset(new GlApiLoader());
// Async page flips are supported only on surfaceless mode.
- gbm_ = new GbmWrapper(GetPrimaryDisplayCardPath());
+ gbm_ = new GbmDevice(GetPrimaryDisplayCardPath());
if (!gbm_->Initialize())
LOG(FATAL) << "Failed to initialize primary DRM device";
@@ -204,7 +204,7 @@ class OzonePlatformGbm : public OzonePlatform {
bool use_surfaceless_;
base::FilePath primary_graphics_card_path_;
scoped_ptr<GlApiLoader> gl_api_loader_;
- scoped_refptr<GbmWrapper> gbm_;
+ scoped_refptr<GbmDevice> gbm_;
scoped_ptr<DrmDeviceManager> drm_device_manager_;
scoped_ptr<GbmBufferGenerator> buffer_generator_;
scoped_ptr<ScreenManager> screen_manager_;
« no previous file with comments | « ui/ozone/platform/dri/ozone_platform_dri.cc ('k') | ui/ozone/platform/dri/scanout_buffer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698