Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(244)

Side by Side Diff: content/browser/compositor/software_output_device_win.h

Issue 1091093006: Update {virtual,override} to follow C++11 style in content. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Back out some webrtc files. Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_BROWSER_COMPOSITOR_SOFTWARE_OUTPUT_DEVICE_WIN_H_ 5 #ifndef CONTENT_BROWSER_COMPOSITOR_SOFTWARE_OUTPUT_DEVICE_WIN_H_
6 #define CONTENT_BROWSER_COMPOSITOR_SOFTWARE_OUTPUT_DEVICE_WIN_H_ 6 #define CONTENT_BROWSER_COMPOSITOR_SOFTWARE_OUTPUT_DEVICE_WIN_H_
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "cc/output/software_output_device.h" 9 #include "cc/output/software_output_device.h"
10 10
11 #include <windows.h> 11 #include <windows.h>
12 12
13 namespace gfx { 13 namespace gfx {
14 class Canvas; 14 class Canvas;
15 } 15 }
16 16
17 namespace ui { 17 namespace ui {
18 class Compositor; 18 class Compositor;
19 } 19 }
20 20
21 namespace content { 21 namespace content {
22 22
23 class SoftwareOutputDeviceWin : public cc::SoftwareOutputDevice { 23 class SoftwareOutputDeviceWin : public cc::SoftwareOutputDevice {
24 public: 24 public:
25 explicit SoftwareOutputDeviceWin(ui::Compositor* compositor); 25 explicit SoftwareOutputDeviceWin(ui::Compositor* compositor);
26 virtual ~SoftwareOutputDeviceWin(); 26 ~SoftwareOutputDeviceWin() override;
27 27
28 virtual void Resize(const gfx::Size& viewport_pixel_size, 28 void Resize(const gfx::Size& viewport_pixel_size,
29 float scale_factor) override; 29 float scale_factor) override;
30 virtual SkCanvas* BeginPaint(const gfx::Rect& damage_rect) override; 30 SkCanvas* BeginPaint(const gfx::Rect& damage_rect) override;
31 virtual void EndPaint(cc::SoftwareFrameData* frame_data) override; 31 void EndPaint(cc::SoftwareFrameData* frame_data) override;
32 virtual void CopyToPixels(const gfx::Rect& rect, void* pixels) override; 32 void CopyToPixels(const gfx::Rect& rect, void* pixels) override;
33 33
34 private: 34 private:
35 HWND hwnd_; 35 HWND hwnd_;
36 BITMAPINFO bitmap_info_; 36 BITMAPINFO bitmap_info_;
37 scoped_ptr<gfx::Canvas> contents_; 37 scoped_ptr<gfx::Canvas> contents_;
38 bool is_hwnd_composited_; 38 bool is_hwnd_composited_;
39 39
40 DISALLOW_COPY_AND_ASSIGN(SoftwareOutputDeviceWin); 40 DISALLOW_COPY_AND_ASSIGN(SoftwareOutputDeviceWin);
41 }; 41 };
42 42
43 } // namespace content 43 } // namespace content
44 44
45 #endif // CONTENT_BROWSER_COMPOSITOR_SOFTWARE_OUTPUT_DEVICE_WIN_H_ 45 #endif // CONTENT_BROWSER_COMPOSITOR_SOFTWARE_OUTPUT_DEVICE_WIN_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698