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

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

Issue 2050123002: Remove OwnPtr from Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: First attempt to land. Created 4 years, 6 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 19 matching lines...) Expand all
30 30
31 #ifndef PictureSnapshot_h 31 #ifndef PictureSnapshot_h
32 #define PictureSnapshot_h 32 #define PictureSnapshot_h
33 33
34 #include "platform/JSONValues.h" 34 #include "platform/JSONValues.h"
35 #include "platform/PlatformExport.h" 35 #include "platform/PlatformExport.h"
36 #include "platform/graphics/GraphicsContext.h" 36 #include "platform/graphics/GraphicsContext.h"
37 #include "third_party/skia/include/core/SkPicture.h" 37 #include "third_party/skia/include/core/SkPicture.h"
38 #include "third_party/skia/include/core/SkPictureRecorder.h" 38 #include "third_party/skia/include/core/SkPictureRecorder.h"
39 #include "wtf/RefCounted.h" 39 #include "wtf/RefCounted.h"
40 #include <memory>
40 41
41 namespace blink { 42 namespace blink {
42 43
43 class FloatRect; 44 class FloatRect;
44 45
45 class PLATFORM_EXPORT PictureSnapshot : public RefCounted<PictureSnapshot> { 46 class PLATFORM_EXPORT PictureSnapshot : public RefCounted<PictureSnapshot> {
46 WTF_MAKE_NONCOPYABLE(PictureSnapshot); 47 WTF_MAKE_NONCOPYABLE(PictureSnapshot);
47 public: 48 public:
48 typedef Vector<Vector<double>> Timings; 49 typedef Vector<Vector<double>> Timings;
49 50
50 struct TilePictureStream : RefCounted<TilePictureStream> { 51 struct TilePictureStream : RefCounted<TilePictureStream> {
51 FloatPoint layerOffset; 52 FloatPoint layerOffset;
52 Vector<char> data; 53 Vector<char> data;
53 }; 54 };
54 55
55 static PassRefPtr<PictureSnapshot> load(const Vector<RefPtr<TilePictureStrea m>>&); 56 static PassRefPtr<PictureSnapshot> load(const Vector<RefPtr<TilePictureStrea m>>&);
56 57
57 PictureSnapshot(PassRefPtr<const SkPicture>); 58 PictureSnapshot(PassRefPtr<const SkPicture>);
58 59
59 PassOwnPtr<Vector<char>> replay(unsigned fromStep = 0, unsigned toStep = 0, double scale = 1.0) const; 60 std::unique_ptr<Vector<char>> replay(unsigned fromStep = 0, unsigned toStep = 0, double scale = 1.0) const;
60 PassOwnPtr<Timings> profile(unsigned minIterations, double minDuration, cons t FloatRect* clipRect) const; 61 std::unique_ptr<Timings> profile(unsigned minIterations, double minDuration, const FloatRect* clipRect) const;
61 PassRefPtr<JSONArray> snapshotCommandLog() const; 62 PassRefPtr<JSONArray> snapshotCommandLog() const;
62 bool isEmpty() const; 63 bool isEmpty() const;
63 64
64 private: 65 private:
65 PassOwnPtr<SkBitmap> createBitmap() const; 66 std::unique_ptr<SkBitmap> createBitmap() const;
66 67
67 RefPtr<const SkPicture> m_picture; 68 RefPtr<const SkPicture> m_picture;
68 }; 69 };
69 70
70 } // namespace blink 71 } // namespace blink
71 72
72 #endif // PictureSnapshot_h 73 #endif // PictureSnapshot_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698