| Index: content/browser/android/in_process/synchronous_compositor_output_surface.cc
|
| diff --git a/content/browser/android/in_process/synchronous_compositor_output_surface.cc b/content/browser/android/in_process/synchronous_compositor_output_surface.cc
|
| index 59556ad894a191dd0bef8f95399947fe3892a0fd..3b7a8c1d9d126b08628b12bf6bb044fe34e318bf 100644
|
| --- a/content/browser/android/in_process/synchronous_compositor_output_surface.cc
|
| +++ b/content/browser/android/in_process/synchronous_compositor_output_surface.cc
|
| @@ -42,10 +42,10 @@ class SynchronousCompositorOutputSurface::SoftwareDevice
|
| : surface_(surface) {
|
| }
|
| virtual void Resize(const gfx::Size& pixel_size,
|
| - float scale_factor) OVERRIDE {
|
| + float scale_factor) override {
|
| // Intentional no-op: canvas size is controlled by the embedder.
|
| }
|
| - virtual SkCanvas* BeginPaint(const gfx::Rect& damage_rect) OVERRIDE {
|
| + virtual SkCanvas* BeginPaint(const gfx::Rect& damage_rect) override {
|
| if (!surface_->current_sw_canvas_) {
|
| NOTREACHED() << "BeginPaint with no canvas set";
|
| return &null_canvas_;
|
| @@ -54,9 +54,9 @@ class SynchronousCompositorOutputSurface::SoftwareDevice
|
| << "Mutliple calls to BeginPaint per frame";
|
| return surface_->current_sw_canvas_;
|
| }
|
| - virtual void EndPaint(cc::SoftwareFrameData* frame_data) OVERRIDE {
|
| + virtual void EndPaint(cc::SoftwareFrameData* frame_data) override {
|
| }
|
| - virtual void CopyToPixels(const gfx::Rect& rect, void* pixels) OVERRIDE {
|
| + virtual void CopyToPixels(const gfx::Rect& rect, void* pixels) override {
|
| NOTIMPLEMENTED();
|
| }
|
|
|
|
|