| Index: cc/surfaces/display.h
|
| diff --git a/cc/surfaces/display.h b/cc/surfaces/display.h
|
| index 451a119e61d494e20df30e6357e0c6848c884a1e..94202c5628369e65ebaecaa524504bc0b270fa05 100644
|
| --- a/cc/surfaces/display.h
|
| +++ b/cc/surfaces/display.h
|
| @@ -43,7 +43,7 @@ class CC_SURFACES_EXPORT Display : public OutputSurfaceClient,
|
| SurfaceManager* manager,
|
| SharedBitmapManager* bitmap_manager,
|
| GpuMemoryBufferManager* gpu_memory_buffer_manager);
|
| - virtual ~Display();
|
| + ~Display() override;
|
|
|
| bool Initialize(scoped_ptr<OutputSurface> output_surface);
|
| void Resize(SurfaceId id, const gfx::Size& new_size);
|
| @@ -53,32 +53,31 @@ class CC_SURFACES_EXPORT Display : public OutputSurfaceClient,
|
| int GetMaxFramesPending();
|
|
|
| // OutputSurfaceClient implementation.
|
| - virtual void DeferredInitialize() override {}
|
| - virtual void ReleaseGL() override {}
|
| - virtual void CommitVSyncParameters(base::TimeTicks timebase,
|
| - base::TimeDelta interval) override;
|
| - virtual void SetNeedsRedrawRect(const gfx::Rect& damage_rect) override {}
|
| - virtual void BeginFrame(const BeginFrameArgs& args) override {}
|
| - virtual void DidSwapBuffers() override;
|
| - virtual void DidSwapBuffersComplete() override;
|
| - virtual void ReclaimResources(const CompositorFrameAck* ack) override {}
|
| - virtual void DidLoseOutputSurface() override;
|
| - virtual void SetExternalDrawConstraints(
|
| + void DeferredInitialize() override {}
|
| + void ReleaseGL() override {}
|
| + void CommitVSyncParameters(base::TimeTicks timebase,
|
| + base::TimeDelta interval) override;
|
| + void SetNeedsRedrawRect(const gfx::Rect& damage_rect) override {}
|
| + void BeginFrame(const BeginFrameArgs& args) override {}
|
| + void DidSwapBuffers() override;
|
| + void DidSwapBuffersComplete() override;
|
| + void ReclaimResources(const CompositorFrameAck* ack) override {}
|
| + void DidLoseOutputSurface() override;
|
| + void SetExternalDrawConstraints(
|
| const gfx::Transform& transform,
|
| const gfx::Rect& viewport,
|
| const gfx::Rect& clip,
|
| const gfx::Rect& viewport_rect_for_tile_priority,
|
| const gfx::Transform& transform_for_tile_priority,
|
| bool resourceless_software_draw) override {}
|
| - virtual void SetMemoryPolicy(const ManagedMemoryPolicy& policy) override;
|
| - virtual void SetTreeActivationCallback(
|
| - const base::Closure& callback) override {}
|
| + void SetMemoryPolicy(const ManagedMemoryPolicy& policy) override;
|
| + void SetTreeActivationCallback(const base::Closure& callback) override {}
|
|
|
| // RendererClient implementation.
|
| - virtual void SetFullRootLayerDamage() override {}
|
| + void SetFullRootLayerDamage() override {}
|
|
|
| // SurfaceDamageObserver implementation.
|
| - virtual void OnSurfaceDamaged(SurfaceId surface) override;
|
| + void OnSurfaceDamaged(SurfaceId surface) override;
|
|
|
| private:
|
| void InitializeRenderer();
|
|
|