Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / content / browser / compositor / software_output_device_ozone.h

diff --git a/src/content/browser/compositor/software_output_device_ozone.h b/src/content/browser/compositor/software_output_device_ozone.h
index 07a6170..ef947e1 100644 (file)
--- a/src/content/browser/compositor/software_output_device_ozone.h
+++ b/src/content/browser/compositor/software_output_device_ozone.h
@@ -11,9 +11,6 @@
 
 namespace ui {
 class Compositor;
-}
-
-namespace gfx {
 class SurfaceOzoneCanvas;
 }
 
@@ -28,14 +25,15 @@ class CONTENT_EXPORT SoftwareOutputDeviceOzone
   explicit SoftwareOutputDeviceOzone(ui::Compositor* compositor);
   virtual ~SoftwareOutputDeviceOzone();
 
-  virtual void Resize(const gfx::Size& viewport_size) OVERRIDE;
-  virtual SkCanvas* BeginPaint(const gfx::Rect& damage_rect) OVERRIDE;
-  virtual void EndPaint(cc::SoftwareFrameData* frame_data) OVERRIDE;
+  virtual void Resize(const gfx::Size& viewport_pixel_size,
+                      float scale_factor) override;
+  virtual SkCanvas* BeginPaint(const gfx::Rect& damage_rect) override;
+  virtual void EndPaint(cc::SoftwareFrameData* frame_data) override;
 
  private:
   ui::Compositor* compositor_;
 
-  scoped_ptr<gfx::SurfaceOzoneCanvas> surface_ozone_;
+  scoped_ptr<ui::SurfaceOzoneCanvas> surface_ozone_;
 
   DISALLOW_COPY_AND_ASSIGN(SoftwareOutputDeviceOzone);
 };