#include "base/at_exit.h"
#include "ui/events/ozone/device/device_manager.h"
#include "ui/events/ozone/evdev/event_factory_evdev.h"
-#include "ui/ozone/ozone_platform.h"
+#include "ui/ozone/platform/dri/cursor_factory_evdev_dri.h"
+#include "ui/ozone/platform/dri/dri_window.h"
#include "ui/ozone/platform/dri/dri_wrapper.h"
+#include "ui/ozone/platform/dri/gbm_buffer.h"
#include "ui/ozone/platform/dri/gbm_surface.h"
#include "ui/ozone/platform/dri/gbm_surface_factory.h"
-#include "ui/ozone/platform/dri/scanout_surface.h"
+#include "ui/ozone/platform/dri/gpu_platform_support_gbm.h"
+#include "ui/ozone/platform/dri/gpu_platform_support_host_gbm.h"
+#include "ui/ozone/platform/dri/scanout_buffer.h"
#include "ui/ozone/platform/dri/screen_manager.h"
#include "ui/ozone/platform/dri/virtual_terminal_manager.h"
#include "ui/ozone/public/cursor_factory_ozone.h"
+#include "ui/ozone/public/gpu_platform_support.h"
+#include "ui/ozone/public/gpu_platform_support_host.h"
+#include "ui/ozone/public/ozone_platform.h"
#if defined(OS_CHROMEOS)
-#include "ui/ozone/common/chromeos/native_display_delegate_ozone.h"
#include "ui/ozone/common/chromeos/touchscreen_device_manager_ozone.h"
+#include "ui/ozone/platform/dri/chromeos/display_message_handler.h"
+#include "ui/ozone/platform/dri/chromeos/native_display_delegate_dri.h"
+#include "ui/ozone/platform/dri/chromeos/native_display_delegate_proxy.h"
#endif
namespace ui {
const char kDefaultGraphicsCardPath[] = "/dev/dri/card0";
-class GbmSurfaceGenerator : public ScanoutSurfaceGenerator {
+class GbmBufferGenerator : public ScanoutBufferGenerator {
public:
- GbmSurfaceGenerator(DriWrapper* dri)
+ GbmBufferGenerator(DriWrapper* dri)
: dri_(dri),
glapi_lib_(dlopen("libglapi.so.0", RTLD_LAZY | RTLD_GLOBAL)),
device_(gbm_create_device(dri_->get_fd())) {}
- virtual ~GbmSurfaceGenerator() {
+ virtual ~GbmBufferGenerator() {
gbm_device_destroy(device_);
if (glapi_lib_)
dlclose(glapi_lib_);
gbm_device* device() const { return device_; }
- virtual ScanoutSurface* Create(const gfx::Size& size) OVERRIDE {
- return new GbmSurface(device_, dri_, size);
+ virtual scoped_refptr<ScanoutBuffer> Create(const gfx::Size& size) OVERRIDE {
+ return GbmBuffer::CreateBuffer(
+ dri_, device_, SurfaceFactoryOzone::RGBA_8888, size, true);
}
- private:
+ protected:
DriWrapper* dri_; // Not owned.
// HACK: gbm drivers have broken linkage
gbm_device* device_;
- DISALLOW_COPY_AND_ASSIGN(GbmSurfaceGenerator);
+ DISALLOW_COPY_AND_ASSIGN(GbmBufferGenerator);
};
class OzonePlatformGbm : public OzonePlatform {
public:
- OzonePlatformGbm() {
+ OzonePlatformGbm(bool use_surfaceless) : use_surfaceless_(use_surfaceless) {
base::AtExitManager::RegisterTask(
base::Bind(&base::DeletePointer<OzonePlatformGbm>, this));
}
virtual ui::SurfaceFactoryOzone* GetSurfaceFactoryOzone() OVERRIDE {
return surface_factory_ozone_.get();
}
- virtual EventFactoryOzone* GetEventFactoryOzone() OVERRIDE {
- return event_factory_ozone_.get();
- }
virtual CursorFactoryOzone* GetCursorFactoryOzone() OVERRIDE {
return cursor_factory_ozone_.get();
}
virtual GpuPlatformSupport* GetGpuPlatformSupport() OVERRIDE {
- return gpu_platform_support_.get()
+ return gpu_platform_support_.get();
}
virtual GpuPlatformSupportHost* GetGpuPlatformSupportHost() OVERRIDE {
return gpu_platform_support_host_.get();
}
+ virtual scoped_ptr<PlatformWindow> CreatePlatformWindow(
+ PlatformWindowDelegate* delegate,
+ const gfx::Rect& bounds) OVERRIDE {
+ return scoped_ptr<PlatformWindow>(
+ new DriWindow(delegate,
+ bounds,
+ surface_factory_ozone_.get(),
+ event_factory_ozone_.get()));
+ }
#if defined(OS_CHROMEOS)
virtual scoped_ptr<NativeDisplayDelegate> CreateNativeDisplayDelegate()
OVERRIDE {
- return scoped_ptr<NativeDisplayDelegate>(new NativeDisplayDelegateOzone());
+ return scoped_ptr<NativeDisplayDelegate>(new NativeDisplayDelegateProxy(
+ gpu_platform_support_host_.get(), device_manager_.get()));
}
virtual scoped_ptr<TouchscreenDeviceManager>
CreateTouchscreenDeviceManager() OVERRIDE {
vt_manager_.reset(new VirtualTerminalManager());
// Needed since the browser process creates the accelerated widgets and that
// happens through SFO.
- surface_factory_ozone_.reset(new GbmSurfaceFactory(NULL, NULL, NULL));
+ surface_factory_ozone_.reset(new GbmSurfaceFactory(use_surfaceless_));
device_manager_ = CreateDeviceManager();
- cursor_factory_ozone_.reset(new CursorFactoryOzone());
+ gpu_platform_support_host_.reset(new GpuPlatformSupportHostGbm());
+ cursor_factory_ozone_.reset(
+ new CursorFactoryEvdevDri(gpu_platform_support_host_.get()));
event_factory_ozone_.reset(new EventFactoryEvdev(
- NULL, device_manager_.get()));
-
- gpu_platform_support_host_.reset(CreateStubGpuPlatformSupportHost());
+ cursor_factory_ozone_.get(), device_manager_.get()));
}
virtual void InitializeGPU() OVERRIDE {
dri_.reset(new DriWrapper(kDefaultGraphicsCardPath));
- surface_generator_.reset(new GbmSurfaceGenerator(dri_.get()));
+ buffer_generator_.reset(new GbmBufferGenerator(dri_.get()));
screen_manager_.reset(new ScreenManager(dri_.get(),
- surface_generator_.get()));
- surface_factory_ozone_.reset(
- new GbmSurfaceFactory(dri_.get(),
- surface_generator_->device(),
- screen_manager_.get()));
-
- gpu_platform_support_.reset(CreateStubGpuPlatformSupport());
+ buffer_generator_.get()));
+ if (!surface_factory_ozone_)
+ surface_factory_ozone_.reset(new GbmSurfaceFactory(use_surfaceless_));
+
+ surface_factory_ozone_->InitializeGpu(dri_.get(),
+ buffer_generator_->device(),
+ screen_manager_.get());
+ gpu_platform_support_.reset(
+ new GpuPlatformSupportGbm(surface_factory_ozone_.get()));
+#if defined(OS_CHROMEOS)
+ gpu_platform_support_->AddHandler(scoped_ptr<GpuPlatformSupport>(
+ new DisplayMessageHandler(
+ scoped_ptr<NativeDisplayDelegateDri>(new NativeDisplayDelegateDri(
+ dri_.get(),
+ screen_manager_.get(),
+ NULL)))));
+#endif
+ if (surface_factory_ozone_->InitializeHardware() !=
+ DriSurfaceFactory::INITIALIZED)
+ LOG(FATAL) << "failed to initialize display hardware";
}
private:
+ bool use_surfaceless_;
scoped_ptr<VirtualTerminalManager> vt_manager_;
scoped_ptr<DriWrapper> dri_;
- scoped_ptr<GbmSurfaceGenerator> surface_generator_;
+ scoped_ptr<GbmBufferGenerator> buffer_generator_;
scoped_ptr<ScreenManager> screen_manager_;
scoped_ptr<DeviceManager> device_manager_;
scoped_ptr<GbmSurfaceFactory> surface_factory_ozone_;
- scoped_ptr<CursorFactoryOzone> cursor_factory_ozone_;
+ scoped_ptr<CursorFactoryEvdevDri> cursor_factory_ozone_;
scoped_ptr<EventFactoryEvdev> event_factory_ozone_;
- scoped_ptr<GpuPlatformSupport> gpu_platform_support_;
- scoped_ptr<GpuPlatformSupportHost> gpu_platform_support_host_;
+ scoped_ptr<GpuPlatformSupportGbm> gpu_platform_support_;
+ scoped_ptr<GpuPlatformSupportHostGbm> gpu_platform_support_host_;
DISALLOW_COPY_AND_ASSIGN(OzonePlatformGbm);
};
} // namespace
-OzonePlatform* CreateOzonePlatformGbm() { return new OzonePlatformGbm; }
+OzonePlatform* CreateOzonePlatformGbm() {
+ return new OzonePlatformGbm(false);
+}
+OzonePlatform* CreateOzonePlatformGbmEglImage() {
+ return new OzonePlatformGbm(true);
+}
} // namespace ui
projects / platform / framework / web / crosswalk.git / blobdiff