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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: Source/WebCore/platform/graphics/SimpleFontData.h

Issue 11299089: Merge 134871 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1312/
Patch Set: Created 8 years, 1 month 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/WebCore/platform/graphics/FontCache.cpp ('k') | Source/WebCore/platform/graphics/SimpleFontData.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/platform/graphics/SimpleFontData.h
===================================================================
--- Source/WebCore/platform/graphics/SimpleFontData.h (revision 135210)
+++ Source/WebCore/platform/graphics/SimpleFontData.h (working copy)
@@ -102,7 +102,7 @@
const FontPlatformData& platformData() const { return m_platformData; }
#if ENABLE(OPENTYPE_VERTICAL)
- const OpenTypeVerticalData* verticalData() const { return m_verticalData; }
+ const OpenTypeVerticalData* verticalData() const { return m_verticalData.get(); }
#endif
PassRefPtr<SimpleFontData> smallCapsFontData(const FontDescription&) const;
@@ -273,7 +273,7 @@
bool m_isTextOrientationFallback;
bool m_isBrokenIdeographFallback;
#if ENABLE(OPENTYPE_VERTICAL)
- const OpenTypeVerticalData* m_verticalData;
+ RefPtr<OpenTypeVerticalData> m_verticalData;
#endif
bool m_hasVerticalGlyphs;
« no previous file with comments | « Source/WebCore/platform/graphics/FontCache.cpp ('k') | Source/WebCore/platform/graphics/SimpleFontData.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698