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

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

Issue 2290903002: Change (Pass)RefPtr<SkXxx> into sk_sp<SkXxx>. (Closed)
Patch Set: Rebasing... Created 4 years, 3 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 18 matching lines...) Expand all
29 */ 29 */
30 30
31 #ifndef PictureSnapshot_h 31 #ifndef PictureSnapshot_h
32 #define PictureSnapshot_h 32 #define PictureSnapshot_h
33 33
34 #include "platform/PlatformExport.h" 34 #include "platform/PlatformExport.h"
35 #include "platform/graphics/GraphicsContext.h" 35 #include "platform/graphics/GraphicsContext.h"
36 #include "platform/json/JSONValues.h" 36 #include "platform/json/JSONValues.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 "third_party/skia/include/core/SkRefCnt.h"
39 #include "wtf/RefCounted.h" 40 #include "wtf/RefCounted.h"
40 #include <memory> 41 #include <memory>
41 42
42 namespace blink { 43 namespace blink {
43 44
44 class FloatRect; 45 class FloatRect;
45 46
46 class PLATFORM_EXPORT PictureSnapshot : public RefCounted<PictureSnapshot> { 47 class PLATFORM_EXPORT PictureSnapshot : public RefCounted<PictureSnapshot> {
47 WTF_MAKE_NONCOPYABLE(PictureSnapshot); 48 WTF_MAKE_NONCOPYABLE(PictureSnapshot);
48 public: 49 public:
49 typedef Vector<Vector<double>> Timings; 50 typedef Vector<Vector<double>> Timings;
50 51
51 struct TilePictureStream : RefCounted<TilePictureStream> { 52 struct TilePictureStream : RefCounted<TilePictureStream> {
52 FloatPoint layerOffset; 53 FloatPoint layerOffset;
53 Vector<char> data; 54 Vector<char> data;
54 }; 55 };
55 56
56 static PassRefPtr<PictureSnapshot> load(const Vector<RefPtr<TilePictureStrea m>>&); 57 static PassRefPtr<PictureSnapshot> load(const Vector<RefPtr<TilePictureStrea m>>&);
57 58
58 PictureSnapshot(PassRefPtr<const SkPicture>); 59 PictureSnapshot(sk_sp<const SkPicture>);
59 60
60 std::unique_ptr<Vector<char>> replay(unsigned fromStep = 0, unsigned toStep = 0, double scale = 1.0) const; 61 std::unique_ptr<Vector<char>> replay(unsigned fromStep = 0, unsigned toStep = 0, double scale = 1.0) const;
61 std::unique_ptr<Timings> profile(unsigned minIterations, double minDuration, const FloatRect* clipRect) const; 62 std::unique_ptr<Timings> profile(unsigned minIterations, double minDuration, const FloatRect* clipRect) const;
62 std::unique_ptr<JSONArray> snapshotCommandLog() const; 63 std::unique_ptr<JSONArray> snapshotCommandLog() const;
63 bool isEmpty() const; 64 bool isEmpty() const;
64 65
65 private: 66 private:
66 std::unique_ptr<SkBitmap> createBitmap() const; 67 std::unique_ptr<SkBitmap> createBitmap() const;
67 68
68 RefPtr<const SkPicture> m_picture; 69 sk_sp<const SkPicture> m_picture;
69 }; 70 };
70 71
71 } // namespace blink 72 } // namespace blink
72 73
73 #endif // PictureSnapshot_h 74 #endif // PictureSnapshot_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698