diff options
13 files changed, 24 insertions, 40 deletions
diff --git a/ui/ozone/platform/drm/common/scoped_drm_types.h b/ui/ozone/platform/drm/common/scoped_drm_types.h index 2fa16df..a56f661 100644 --- a/ui/ozone/platform/drm/common/scoped_drm_types.h +++ b/ui/ozone/platform/drm/common/scoped_drm_types.h @@ -6,7 +6,6 @@ #define UI_OZONE_PLATFORM_DRM_COMMON_SCOPED_DRM_TYPES_H_ #include "base/memory/scoped_ptr.h" -#include "ui/ozone/ozone_export.h" typedef struct _drmModeConnector drmModeConnector; typedef struct _drmModeCrtc drmModeCrtc; @@ -22,39 +21,39 @@ typedef struct _drmModeRes drmModeRes; namespace ui { -struct OZONE_EXPORT DrmResourcesDeleter { +struct DrmResourcesDeleter { void operator()(drmModeRes* resources) const; }; -struct OZONE_EXPORT DrmConnectorDeleter { +struct DrmConnectorDeleter { void operator()(drmModeConnector* connector) const; }; -struct OZONE_EXPORT DrmCrtcDeleter { +struct DrmCrtcDeleter { void operator()(drmModeCrtc* crtc) const; }; -struct OZONE_EXPORT DrmEncoderDeleter { +struct DrmEncoderDeleter { void operator()(drmModeEncoder* encoder) const; }; -struct OZONE_EXPORT DrmObjectPropertiesDeleter { +struct DrmObjectPropertiesDeleter { void operator()(drmModeObjectProperties* properties) const; }; -struct OZONE_EXPORT DrmPlaneDeleter { +struct DrmPlaneDeleter { void operator()(drmModePlane* plane) const; }; -struct OZONE_EXPORT DrmPlaneResDeleter { +struct DrmPlaneResDeleter { void operator()(drmModePlaneRes* plane_res) const; }; -struct OZONE_EXPORT DrmPropertyDeleter { +struct DrmPropertyDeleter { void operator()(drmModePropertyRes* property) const; }; #if defined(USE_DRM_ATOMIC) -struct OZONE_EXPORT DrmAtomicReqDeleter { +struct DrmAtomicReqDeleter { void operator()(drmModeAtomicReq* property) const; }; #endif // defined(USE_DRM_ATOMIC) -struct OZONE_EXPORT DrmPropertyBlobDeleter { +struct DrmPropertyBlobDeleter { void operator()(drmModePropertyBlobRes* property) const; }; -struct OZONE_EXPORT DrmFramebufferDeleter { +struct DrmFramebufferDeleter { void operator()(drmModeFB* framebuffer) const; }; diff --git a/ui/ozone/platform/drm/gpu/crtc_controller.h b/ui/ozone/platform/drm/gpu/crtc_controller.h index 0740ee9..f332ce5 100644 --- a/ui/ozone/platform/drm/gpu/crtc_controller.h +++ b/ui/ozone/platform/drm/gpu/crtc_controller.h @@ -13,7 +13,6 @@ #include "base/memory/weak_ptr.h" #include "base/observer_list.h" #include "ui/gfx/swap_result.h" -#include "ui/ozone/ozone_export.h" #include "ui/ozone/platform/drm/common/scoped_drm_types.h" #include "ui/ozone/platform/drm/gpu/hardware_display_plane_manager.h" #include "ui/ozone/platform/drm/gpu/overlay_plane.h" @@ -28,8 +27,7 @@ class PageFlipRequest; // One CRTC can be paired up with one or more connectors. The simplest // configuration represents one CRTC driving one monitor, while pairing up a // CRTC with multiple connectors results in hardware mirroring. -class OZONE_EXPORT CrtcController - : public base::SupportsWeakPtr<CrtcController> { +class CrtcController : public base::SupportsWeakPtr<CrtcController> { public: CrtcController(const scoped_refptr<DrmDevice>& drm, uint32_t crtc, diff --git a/ui/ozone/platform/drm/gpu/drm_buffer.h b/ui/ozone/platform/drm/gpu/drm_buffer.h index 61d553e..13868e3 100644 --- a/ui/ozone/platform/drm/gpu/drm_buffer.h +++ b/ui/ozone/platform/drm/gpu/drm_buffer.h @@ -11,7 +11,6 @@ #include "base/macros.h" #include "skia/ext/refptr.h" #include "third_party/skia/include/core/SkSurface.h" -#include "ui/ozone/ozone_export.h" #include "ui/ozone/platform/drm/gpu/scanout_buffer.h" namespace ui { @@ -21,7 +20,7 @@ class DrmDevice; // Wrapper for a DRM allocated buffer. Keeps track of the native properties of // the buffer and wraps the pixel memory into a SkSurface which can be used to // draw into using Skia. -class OZONE_EXPORT DrmBuffer : public ScanoutBuffer { +class DrmBuffer : public ScanoutBuffer { public: DrmBuffer(const scoped_refptr<DrmDevice>& drm); diff --git a/ui/ozone/platform/drm/gpu/drm_device.h b/ui/ozone/platform/drm/gpu/drm_device.h index 3d4e818..a53d311 100644 --- a/ui/ozone/platform/drm/gpu/drm_device.h +++ b/ui/ozone/platform/drm/gpu/drm_device.h @@ -18,7 +18,6 @@ #include "ui/gfx/geometry/rect.h" #include "ui/gfx/geometry/rect_f.h" #include "ui/gfx/overlay_transform.h" -#include "ui/ozone/ozone_export.h" #include "ui/ozone/platform/drm/common/scoped_drm_types.h" #include "ui/ozone/platform/drm/gpu/hardware_display_plane_manager.h" @@ -39,7 +38,7 @@ struct GammaRampRGBEntry; // Wraps DRM calls into a nice interface. Used to provide different // implementations of the DRM calls. For the actual implementation the DRM API // would be called. In unit tests this interface would be stubbed. -class OZONE_EXPORT DrmDevice : public base::RefCountedThreadSafe<DrmDevice> { +class DrmDevice : public base::RefCountedThreadSafe<DrmDevice> { public: typedef base::Callback<void(unsigned int /* frame */, unsigned int /* seconds */, diff --git a/ui/ozone/platform/drm/gpu/drm_device_manager.h b/ui/ozone/platform/drm/gpu/drm_device_manager.h index d415aad..e3190d4 100644 --- a/ui/ozone/platform/drm/gpu/drm_device_manager.h +++ b/ui/ozone/platform/drm/gpu/drm_device_manager.h @@ -12,7 +12,6 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "ui/gfx/native_widget_types.h" -#include "ui/ozone/ozone_export.h" namespace base { class FilePath; @@ -28,7 +27,7 @@ typedef std::vector<scoped_refptr<DrmDevice>> DrmDeviceVector; // Tracks the mapping between widgets and the DRM devices used to allocate // buffers for the window represented by the widget. -class OZONE_EXPORT DrmDeviceManager { +class DrmDeviceManager { public: DrmDeviceManager(scoped_ptr<DrmDeviceGenerator> drm_device_generator); ~DrmDeviceManager(); diff --git a/ui/ozone/platform/drm/gpu/drm_window.h b/ui/ozone/platform/drm/gpu/drm_window.h index f5dad7c..59407a5 100644 --- a/ui/ozone/platform/drm/gpu/drm_window.h +++ b/ui/ozone/platform/drm/gpu/drm_window.h @@ -14,7 +14,6 @@ #include "ui/gfx/native_widget_types.h" #include "ui/gfx/swap_result.h" #include "ui/gfx/vsync_provider.h" -#include "ui/ozone/ozone_export.h" #include "ui/ozone/platform/drm/gpu/overlay_plane.h" #include "ui/ozone/platform/drm/gpu/page_flip_request.h" #include "ui/ozone/public/surface_ozone_egl.h" @@ -46,7 +45,7 @@ class ScreenManager; // // If there's no display whose bounds match the window's, the window is // disconnected and its contents will not be visible to the user. -class OZONE_EXPORT DrmWindow { +class DrmWindow { public: DrmWindow(gfx::AcceleratedWidget widget, DrmDeviceManager* device_manager, diff --git a/ui/ozone/platform/drm/gpu/hardware_display_controller.h b/ui/ozone/platform/drm/gpu/hardware_display_controller.h index 2207452..8ec577d 100644 --- a/ui/ozone/platform/drm/gpu/hardware_display_controller.h +++ b/ui/ozone/platform/drm/gpu/hardware_display_controller.h @@ -18,7 +18,6 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" #include "ui/gfx/swap_result.h" -#include "ui/ozone/ozone_export.h" #include "ui/ozone/platform/drm/gpu/hardware_display_plane_manager.h" #include "ui/ozone/platform/drm/gpu/overlay_plane.h" @@ -86,7 +85,7 @@ class DrmDevice; // only a subset of connectors can be active independently, showing different // framebuffers. Though, in this case, it would be possible to have all // connectors active if some use the same CRTC to mirror the display. -class OZONE_EXPORT HardwareDisplayController { +class HardwareDisplayController { typedef base::Callback<void(gfx::SwapResult)> PageFlipCallback; public: diff --git a/ui/ozone/platform/drm/gpu/hardware_display_plane.h b/ui/ozone/platform/drm/gpu/hardware_display_plane.h index 798d2f3..729df45 100644 --- a/ui/ozone/platform/drm/gpu/hardware_display_plane.h +++ b/ui/ozone/platform/drm/gpu/hardware_display_plane.h @@ -11,7 +11,6 @@ #include <vector> #include "base/macros.h" -#include "ui/ozone/ozone_export.h" #include "ui/ozone/platform/drm/common/scoped_drm_types.h" namespace gfx { @@ -22,7 +21,7 @@ namespace ui { class DrmDevice; -class OZONE_EXPORT HardwareDisplayPlane { +class HardwareDisplayPlane { public: enum Type { kDummy, kPrimary, kOverlay, kCursor }; diff --git a/ui/ozone/platform/drm/gpu/hardware_display_plane_manager.h b/ui/ozone/platform/drm/gpu/hardware_display_plane_manager.h index e9b04ec..2a4fee2 100644 --- a/ui/ozone/platform/drm/gpu/hardware_display_plane_manager.h +++ b/ui/ozone/platform/drm/gpu/hardware_display_plane_manager.h @@ -12,7 +12,6 @@ #include "base/macros.h" #include "base/memory/scoped_vector.h" -#include "ui/ozone/ozone_export.h" #include "ui/ozone/platform/drm/common/scoped_drm_types.h" #include "ui/ozone/platform/drm/gpu/hardware_display_plane.h" #include "ui/ozone/platform/drm/gpu/overlay_plane.h" @@ -28,7 +27,7 @@ class DrmDevice; // This contains the list of planes controlled by one HDC on a given DRM fd. // It is owned by the HDC and filled by the CrtcController. -struct OZONE_EXPORT HardwareDisplayPlaneList { +struct HardwareDisplayPlaneList { HardwareDisplayPlaneList(); ~HardwareDisplayPlaneList(); @@ -67,7 +66,7 @@ struct OZONE_EXPORT HardwareDisplayPlaneList { #endif // defined(USE_DRM_ATOMIC) }; -class OZONE_EXPORT HardwareDisplayPlaneManager { +class HardwareDisplayPlaneManager { public: HardwareDisplayPlaneManager(); virtual ~HardwareDisplayPlaneManager(); diff --git a/ui/ozone/platform/drm/gpu/hardware_display_plane_manager_atomic.h b/ui/ozone/platform/drm/gpu/hardware_display_plane_manager_atomic.h index 3fc911c..d9512eb 100644 --- a/ui/ozone/platform/drm/gpu/hardware_display_plane_manager_atomic.h +++ b/ui/ozone/platform/drm/gpu/hardware_display_plane_manager_atomic.h @@ -8,13 +8,11 @@ #include <stdint.h> #include "base/macros.h" -#include "ui/ozone/ozone_export.h" #include "ui/ozone/platform/drm/gpu/hardware_display_plane_manager.h" namespace ui { -class OZONE_EXPORT HardwareDisplayPlaneManagerAtomic - : public HardwareDisplayPlaneManager { +class HardwareDisplayPlaneManagerAtomic : public HardwareDisplayPlaneManager { public: HardwareDisplayPlaneManagerAtomic(); ~HardwareDisplayPlaneManagerAtomic() override; diff --git a/ui/ozone/platform/drm/gpu/hardware_display_plane_manager_legacy.h b/ui/ozone/platform/drm/gpu/hardware_display_plane_manager_legacy.h index c716187..56c5576 100644 --- a/ui/ozone/platform/drm/gpu/hardware_display_plane_manager_legacy.h +++ b/ui/ozone/platform/drm/gpu/hardware_display_plane_manager_legacy.h @@ -8,13 +8,11 @@ #include <stdint.h> #include "base/macros.h" -#include "ui/ozone/ozone_export.h" #include "ui/ozone/platform/drm/gpu/hardware_display_plane_manager.h" namespace ui { -class OZONE_EXPORT HardwareDisplayPlaneManagerLegacy - : public HardwareDisplayPlaneManager { +class HardwareDisplayPlaneManagerLegacy : public HardwareDisplayPlaneManager { public: HardwareDisplayPlaneManagerLegacy(); ~HardwareDisplayPlaneManagerLegacy() override; diff --git a/ui/ozone/platform/drm/gpu/overlay_plane.h b/ui/ozone/platform/drm/gpu/overlay_plane.h index 1666e07..f3d1f77 100644 --- a/ui/ozone/platform/drm/gpu/overlay_plane.h +++ b/ui/ozone/platform/drm/gpu/overlay_plane.h @@ -12,7 +12,6 @@ #include "ui/gfx/geometry/rect.h" #include "ui/gfx/geometry/rect_f.h" #include "ui/gfx/overlay_transform.h" -#include "ui/ozone/ozone_export.h" namespace ui { @@ -21,7 +20,7 @@ class ScanoutBuffer; struct OverlayPlane; typedef std::vector<OverlayPlane> OverlayPlaneList; -struct OZONE_EXPORT OverlayPlane { +struct OverlayPlane { // Simpler constructor for the primary plane. explicit OverlayPlane(const scoped_refptr<ScanoutBuffer>& buffer); diff --git a/ui/ozone/platform/drm/gpu/screen_manager.h b/ui/ozone/platform/drm/gpu/screen_manager.h index aae384b..59f81d2 100644 --- a/ui/ozone/platform/drm/gpu/screen_manager.h +++ b/ui/ozone/platform/drm/gpu/screen_manager.h @@ -12,7 +12,6 @@ #include "base/memory/scoped_vector.h" #include "base/observer_list.h" #include "ui/gfx/native_widget_types.h" -#include "ui/ozone/ozone_export.h" #include "ui/ozone/platform/drm/gpu/hardware_display_controller.h" typedef struct _drmModeModeInfo drmModeModeInfo; @@ -30,7 +29,7 @@ class DrmWindow; class ScanoutBufferGenerator; // Responsible for keeping track of active displays and configuring them. -class OZONE_EXPORT ScreenManager { +class ScreenManager { public: ScreenManager(ScanoutBufferGenerator* surface_generator); virtual ~ScreenManager(); |