Update To 11.40.268.0

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

diff --git a/src/content/browser/compositor/software_output_device_win.h b/src/content/browser/compositor/software_output_device_win.h
index 4362732..85873fb 100644 (file)
--- a/src/content/browser/compositor/software_output_device_win.h
+++ b/src/content/browser/compositor/software_output_device_win.h
@@ -25,16 +25,19 @@ class SoftwareOutputDeviceWin : public cc::SoftwareOutputDevice {
   explicit SoftwareOutputDeviceWin(ui::Compositor* compositor);
   virtual ~SoftwareOutputDeviceWin();
 
-  virtual void Resize(gfx::Size viewport_size) OVERRIDE;
-  virtual SkCanvas* BeginPaint(const gfx::Rect& damage_rect) OVERRIDE;
-  virtual void EndPaint(cc::SoftwareFrameData* frame_data) OVERRIDE;
-  virtual void CopyToBitmap(const gfx::Rect& rect, SkBitmap* output) 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;
+  virtual void CopyToPixels(const gfx::Rect& rect, void* pixels) override;
 
  private:
   HWND hwnd_;
   BITMAPINFO bitmap_info_;
   scoped_ptr<gfx::Canvas> contents_;
   bool is_hwnd_composited_;
+
+  DISALLOW_COPY_AND_ASSIGN(SoftwareOutputDeviceWin);
 };
 
 }  // namespace content