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

Side by Side Diff: third_party/WebKit/Source/platform/fonts/WebFontDecoder.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) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 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 13 matching lines...) Expand all
24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
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 WebFontDecoder_h 31 #ifndef WebFontDecoder_h
32 #define WebFontDecoder_h 32 #define WebFontDecoder_h
33 33
34 #include "third_party/skia/include/core/SkRefCnt.h"
34 #include "third_party/skia/include/core/SkTypeface.h" 35 #include "third_party/skia/include/core/SkTypeface.h"
35 #include "wtf/Allocator.h" 36 #include "wtf/Allocator.h"
36 #include "wtf/RefPtr.h"
37 #include "wtf/text/WTFString.h" 37 #include "wtf/text/WTFString.h"
38 38
39 namespace blink { 39 namespace blink {
40 40
41 class SharedBuffer; 41 class SharedBuffer;
42 42
43 class WebFontDecoder final { 43 class WebFontDecoder final {
44 STACK_ALLOCATED(); 44 STACK_ALLOCATED();
45 public: 45 public:
46 WebFontDecoder() 46 WebFontDecoder()
47 { 47 {
48 } 48 }
49 49
50 PassRefPtr<SkTypeface> decode(SharedBuffer*); 50 sk_sp<SkTypeface> decode(SharedBuffer*);
51 51
52 static bool supportsFormat(const String&); 52 static bool supportsFormat(const String&);
53 String getErrorString() const { return m_otsErrorString; } 53 String getErrorString() const { return m_otsErrorString; }
54 54
55 private: 55 private:
56 void setErrorString(const String& errorString) { m_otsErrorString = errorStr ing; } 56 void setErrorString(const String& errorString) { m_otsErrorString = errorStr ing; }
57 57
58 String m_otsErrorString; 58 String m_otsErrorString;
59 }; 59 };
60 60
61 } // namespace blink 61 } // namespace blink
62 62
63 #endif // WebFontDecoder_h 63 #endif // WebFontDecoder_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/platform/fonts/TextBlob.h ('k') | third_party/WebKit/Source/platform/fonts/WebFontDecoder.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698