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

Side by Side Diff: third_party/WebKit/Source/platform/fonts/FontCustomPlatformData.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) 2007 Apple Computer, Inc. 2 * Copyright (C) 2007 Apple Computer, Inc.
3 * Copyright (c) 2007, 2008, 2009, Google Inc. All rights reserved. 3 * Copyright (c) 2007, 2008, 2009, Google Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are 6 * modification, are permitted provided that the following conditions are
7 * met: 7 * met:
8 * 8 *
9 * * Redistributions of source code must retain the above copyright 9 * * Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 16 matching lines...) Expand all
27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30 */ 30 */
31 31
32 #ifndef FontCustomPlatformData_h 32 #ifndef FontCustomPlatformData_h
33 #define FontCustomPlatformData_h 33 #define FontCustomPlatformData_h
34 34
35 #include "platform/PlatformExport.h" 35 #include "platform/PlatformExport.h"
36 #include "platform/fonts/FontOrientation.h" 36 #include "platform/fonts/FontOrientation.h"
37 #include "third_party/skia/include/core/SkRefCnt.h"
37 #include "wtf/Allocator.h" 38 #include "wtf/Allocator.h"
38 #include "wtf/Forward.h" 39 #include "wtf/Forward.h"
39 #include "wtf/Noncopyable.h" 40 #include "wtf/Noncopyable.h"
40 #include "wtf/RefPtr.h"
41 #include "wtf/text/WTFString.h" 41 #include "wtf/text/WTFString.h"
42 #include <memory> 42 #include <memory>
43 43
44 class SkTypeface; 44 class SkTypeface;
45 45
46 namespace blink { 46 namespace blink {
47 47
48 class FontPlatformData; 48 class FontPlatformData;
49 class SharedBuffer; 49 class SharedBuffer;
50 50
51 class PLATFORM_EXPORT FontCustomPlatformData { 51 class PLATFORM_EXPORT FontCustomPlatformData {
52 USING_FAST_MALLOC(FontCustomPlatformData); 52 USING_FAST_MALLOC(FontCustomPlatformData);
53 WTF_MAKE_NONCOPYABLE(FontCustomPlatformData); 53 WTF_MAKE_NONCOPYABLE(FontCustomPlatformData);
54 public: 54 public:
55 static std::unique_ptr<FontCustomPlatformData> create(SharedBuffer*, String& otsParseMessage); 55 static std::unique_ptr<FontCustomPlatformData> create(SharedBuffer*, String& otsParseMessage);
56 ~FontCustomPlatformData(); 56 ~FontCustomPlatformData();
57 57
58 FontPlatformData fontPlatformData(float size, bool bold, bool italic, FontOr ientation = FontOrientation::Horizontal); 58 FontPlatformData fontPlatformData(float size, bool bold, bool italic, FontOr ientation = FontOrientation::Horizontal);
59 59
60 static bool supportsFormat(const String&); 60 static bool supportsFormat(const String&);
61 61
62 private: 62 private:
63 explicit FontCustomPlatformData(PassRefPtr<SkTypeface>); 63 explicit FontCustomPlatformData(sk_sp<SkTypeface>);
64 RefPtr<SkTypeface> m_typeface; 64 sk_sp<SkTypeface> m_typeface;
65 }; 65 };
66 66
67 } // namespace blink 67 } // namespace blink
68 68
69 #endif // FontCustomPlatformData_h 69 #endif // FontCustomPlatformData_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698