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

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

Issue 1248713002: ozone: ClientPixmapManager passes VGEM fd from browser to renderer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove redundant lock. make content_unittests run Created 5 years, 4 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/ozone_platform_gbm.cc
diff --git a/ui/ozone/platform/drm/ozone_platform_gbm.cc b/ui/ozone/platform/drm/ozone_platform_gbm.cc
index 5f125b35d1de46ace1468c57edd62c19e2c3e277..b1efad0fa6a34b3fc144d5e6c4a21820d8d8a2e7 100644
--- a/ui/ozone/platform/drm/ozone_platform_gbm.cc
+++ b/ui/ozone/platform/drm/ozone_platform_gbm.cc
@@ -46,6 +46,10 @@
#include "ui/events/ozone/layout/stub/stub_keyboard_layout_engine.h"
#endif
+#if defined(USE_VGEM_MAP)
+#include <fcntl.h>
+#endif
+
namespace ui {
namespace {
@@ -149,6 +153,15 @@ class OzonePlatformGbm : public OzonePlatform {
return make_scoped_ptr(
new DrmNativeDisplayDelegate(display_manager_.get()));
}
+ base::ScopedFD OpenClientNativePixmapDevice() const override {
+#if defined(USE_VGEM_MAP)
+ static const char kVgemPath[] = "/dev/dri/renderD129";
+ base::ScopedFD vgem_fd(open(kVgemPath, O_RDWR | O_CLOEXEC));
+ DCHECK(vgem_fd.is_valid()) << "Failed to open: " << kVgemPath;
+ return vgem_fd.Pass();
dcheng 2015/08/31 17:40:53 Pass() here is also unnecessary (NRVO applies)
dshwang 2015/08/31 18:12:29 Done.
+#endif
+ return base::ScopedFD();
+ }
void InitializeUI() override {
device_manager_ = CreateDeviceManager();
window_manager_.reset(new DrmWindowHostManager());

Powered by Google App Engine
This is Rietveld 408576698