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

Side by Side Diff: third_party/WebKit/Source/platform/graphics/gpu/AcceleratedImageBufferSurface.h

Issue 2764633002: cc/paint: Remove cc::PaintSurface. (Closed)
Patch Set: fix for relanding Created 3 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
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2013, Google Inc. All rights reserved. 2 * Copyright (c) 2013, Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 15 matching lines...) Expand all
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 30
31 #ifndef AcceleratedImageBufferSurface_h 31 #ifndef AcceleratedImageBufferSurface_h
32 #define AcceleratedImageBufferSurface_h 32 #define AcceleratedImageBufferSurface_h
33 33
34 #include "platform/graphics/ImageBufferSurface.h" 34 #include "platform/graphics/ImageBufferSurface.h"
35 #include "platform/graphics/paint/PaintCanvas.h" 35 #include "platform/graphics/paint/PaintCanvas.h"
36 #include "platform/graphics/paint/PaintSurface.h"
37 #include "public/platform/WebGraphicsContext3DProvider.h" 36 #include "public/platform/WebGraphicsContext3DProvider.h"
38 #include "third_party/skia/include/core/SkRefCnt.h" 37 #include "third_party/skia/include/core/SkRefCnt.h"
39 #include "third_party/skia/include/core/SkSurface.h" 38 #include "third_party/skia/include/core/SkSurface.h"
40 #include <memory> 39 #include <memory>
41 40
42 namespace blink { 41 namespace blink {
43 42
44 class PLATFORM_EXPORT AcceleratedImageBufferSurface 43 class PLATFORM_EXPORT AcceleratedImageBufferSurface
45 : public ImageBufferSurface { 44 : public ImageBufferSurface {
46 WTF_MAKE_NONCOPYABLE(AcceleratedImageBufferSurface); 45 WTF_MAKE_NONCOPYABLE(AcceleratedImageBufferSurface);
(...skipping 14 matching lines...) Expand all
61 60
62 private: 61 private:
63 unsigned m_contextId; 62 unsigned m_contextId;
64 sk_sp<SkSurface> m_surface; // Uses m_contextProvider. 63 sk_sp<SkSurface> m_surface; // Uses m_contextProvider.
65 std::unique_ptr<PaintCanvas> m_canvas; 64 std::unique_ptr<PaintCanvas> m_canvas;
66 }; 65 };
67 66
68 } // namespace blink 67 } // namespace blink
69 68
70 #endif 69 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698