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

Side by Side Diff: cc/output/software_output_device.h

Issue 1855273002: Update new Surface callsites (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: software_output_device was indirectly including skia::refptr, switch to sk_sp<> Created 4 years, 8 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
« no previous file with comments | « cc/output/renderer_pixeltest.cc ('k') | cc/output/software_output_device.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 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 CC_OUTPUT_SOFTWARE_OUTPUT_DEVICE_H_ 5 #ifndef CC_OUTPUT_SOFTWARE_OUTPUT_DEVICE_H_
6 #define CC_OUTPUT_SOFTWARE_OUTPUT_DEVICE_H_ 6 #define CC_OUTPUT_SOFTWARE_OUTPUT_DEVICE_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "cc/base/cc_export.h" 10 #include "cc/base/cc_export.h"
11 #include "skia/ext/refptr.h"
12 #include "third_party/skia/include/core/SkSurface.h" 11 #include "third_party/skia/include/core/SkSurface.h"
13 #include "ui/gfx/geometry/rect.h" 12 #include "ui/gfx/geometry/rect.h"
14 #include "ui/gfx/geometry/size.h" 13 #include "ui/gfx/geometry/size.h"
15 #include "ui/gfx/geometry/vector2d.h" 14 #include "ui/gfx/geometry/vector2d.h"
16 15
17 class SkBitmap; 16 class SkBitmap;
18 class SkCanvas; 17 class SkCanvas;
19 18
20 namespace gfx { 19 namespace gfx {
21 class VSyncProvider; 20 class VSyncProvider;
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 virtual void EnsureBackbuffer() {} 52 virtual void EnsureBackbuffer() {}
54 53
55 // VSyncProvider used to update the timer used to schedule draws with the 54 // VSyncProvider used to update the timer used to schedule draws with the
56 // hardware vsync. Return NULL if a provider doesn't exist. 55 // hardware vsync. Return NULL if a provider doesn't exist.
57 virtual gfx::VSyncProvider* GetVSyncProvider(); 56 virtual gfx::VSyncProvider* GetVSyncProvider();
58 57
59 protected: 58 protected:
60 gfx::Size viewport_pixel_size_; 59 gfx::Size viewport_pixel_size_;
61 float scale_factor_; 60 float scale_factor_;
62 gfx::Rect damage_rect_; 61 gfx::Rect damage_rect_;
63 skia::RefPtr<SkSurface> surface_; 62 sk_sp<SkSurface> surface_;
64 scoped_ptr<gfx::VSyncProvider> vsync_provider_; 63 scoped_ptr<gfx::VSyncProvider> vsync_provider_;
65 64
66 private: 65 private:
67 DISALLOW_COPY_AND_ASSIGN(SoftwareOutputDevice); 66 DISALLOW_COPY_AND_ASSIGN(SoftwareOutputDevice);
68 }; 67 };
69 68
70 } // namespace cc 69 } // namespace cc
71 70
72 #endif // CC_OUTPUT_SOFTWARE_OUTPUT_DEVICE_H_ 71 #endif // CC_OUTPUT_SOFTWARE_OUTPUT_DEVICE_H_
OLDNEW
« no previous file with comments | « cc/output/renderer_pixeltest.cc ('k') | cc/output/software_output_device.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698