| Index: ui/ozone/platform/dri/test/mock_dri_wrapper.h
|
| diff --git a/ui/ozone/platform/dri/test/mock_dri_wrapper.h b/ui/ozone/platform/dri/test/mock_dri_wrapper.h
|
| index 3d4517b2f44eeed6b9e48d46b4208a2d96ce34cd..e7ac6c7e9f8e1af5c58a20f072d8ea342458bb9c 100644
|
| --- a/ui/ozone/platform/dri/test/mock_dri_wrapper.h
|
| +++ b/ui/ozone/platform/dri/test/mock_dri_wrapper.h
|
| @@ -50,50 +50,50 @@ class MockDriWrapper : public ui::DriWrapper {
|
| }
|
|
|
| // DriWrapper:
|
| - virtual ScopedDrmCrtcPtr GetCrtc(uint32_t crtc_id) OVERRIDE;
|
| + virtual ScopedDrmCrtcPtr GetCrtc(uint32_t crtc_id) override;
|
| virtual bool SetCrtc(uint32_t crtc_id,
|
| uint32_t framebuffer,
|
| std::vector<uint32_t> connectors,
|
| - drmModeModeInfo* mode) OVERRIDE;
|
| + drmModeModeInfo* mode) override;
|
| virtual bool SetCrtc(drmModeCrtc* crtc,
|
| - std::vector<uint32_t> connectors) OVERRIDE;
|
| - virtual ScopedDrmConnectorPtr GetConnector(uint32_t connector_id) OVERRIDE;
|
| + std::vector<uint32_t> connectors) override;
|
| + virtual ScopedDrmConnectorPtr GetConnector(uint32_t connector_id) override;
|
| virtual bool AddFramebuffer(uint32_t width,
|
| uint32_t height,
|
| uint8_t depth,
|
| uint8_t bpp,
|
| uint32_t stride,
|
| uint32_t handle,
|
| - uint32_t* framebuffer) OVERRIDE;
|
| - virtual bool RemoveFramebuffer(uint32_t framebuffer) OVERRIDE;
|
| + uint32_t* framebuffer) override;
|
| + virtual bool RemoveFramebuffer(uint32_t framebuffer) override;
|
| virtual bool PageFlip(uint32_t crtc_id,
|
| uint32_t framebuffer,
|
| - void* data) OVERRIDE;
|
| + void* data) override;
|
| virtual bool PageFlipOverlay(uint32_t crtc_id,
|
| uint32_t framebuffer,
|
| const gfx::Rect& location,
|
| const gfx::RectF& source,
|
| - int overlay_plane) OVERRIDE;
|
| + int overlay_plane) override;
|
| virtual ScopedDrmPropertyPtr GetProperty(drmModeConnector* connector,
|
| - const char* name) OVERRIDE;
|
| + const char* name) override;
|
| virtual bool SetProperty(uint32_t connector_id,
|
| uint32_t property_id,
|
| - uint64_t value) OVERRIDE;
|
| + uint64_t value) override;
|
| virtual ScopedDrmPropertyBlobPtr GetPropertyBlob(drmModeConnector* connector,
|
| - const char* name) OVERRIDE;
|
| + const char* name) override;
|
| virtual bool SetCursor(uint32_t crtc_id,
|
| uint32_t handle,
|
| - const gfx::Size& size) OVERRIDE;
|
| - virtual bool MoveCursor(uint32_t crtc_id, const gfx::Point& point) OVERRIDE;
|
| - virtual void HandleEvent(drmEventContext& event) OVERRIDE;
|
| + const gfx::Size& size) override;
|
| + virtual bool MoveCursor(uint32_t crtc_id, const gfx::Point& point) override;
|
| + virtual void HandleEvent(drmEventContext& event) override;
|
| virtual bool CreateDumbBuffer(const SkImageInfo& info,
|
| uint32_t* handle,
|
| uint32_t* stride,
|
| - void** pixels) OVERRIDE;
|
| + void** pixels) override;
|
| virtual void DestroyDumbBuffer(const SkImageInfo& info,
|
| uint32_t handle,
|
| uint32_t stride,
|
| - void* pixels) OVERRIDE;
|
| + void* pixels) override;
|
|
|
| private:
|
| int get_crtc_call_count_;
|
|
|