Title: [145544] trunk/Source/WebCore
- Revision
- 145544
- Author
- commit-qu...@webkit.org
- Date
- 2013-03-12 08:00:04 -0700 (Tue, 12 Mar 2013)
Log Message
[BlackBerry] FontCacheBlackBerry: return PassRefPtr<SimpleFontData>
https://bugs.webkit.org/show_bug.cgi?id=112022
Patch by Alberto Garcia <agar...@igalia.com> on 2013-03-12
Reviewed by Rob Buis.
FontData functions return PassRefPtr since r130160.
* platform/graphics/blackberry/FontCacheBlackBerry.cpp:
(WebCore::FontCache::getFontDataForCharacters):
(WebCore::FontCache::getSimilarFontPlatformData):
(WebCore::FontCache::getLastResortFallbackFont):
* platform/graphics/blackberry/SimpleFontDataBlackBerry.cpp:
(WebCore::SimpleFontData::createScaledFontData):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (145543 => 145544)
--- trunk/Source/WebCore/ChangeLog 2013-03-12 14:53:30 UTC (rev 145543)
+++ trunk/Source/WebCore/ChangeLog 2013-03-12 15:00:04 UTC (rev 145544)
@@ -1,3 +1,19 @@
+2013-03-12 Alberto Garcia <agar...@igalia.com>
+
+ [BlackBerry] FontCacheBlackBerry: return PassRefPtr<SimpleFontData>
+ https://bugs.webkit.org/show_bug.cgi?id=112022
+
+ Reviewed by Rob Buis.
+
+ FontData functions return PassRefPtr since r130160.
+
+ * platform/graphics/blackberry/FontCacheBlackBerry.cpp:
+ (WebCore::FontCache::getFontDataForCharacters):
+ (WebCore::FontCache::getSimilarFontPlatformData):
+ (WebCore::FontCache::getLastResortFallbackFont):
+ * platform/graphics/blackberry/SimpleFontDataBlackBerry.cpp:
+ (WebCore::SimpleFontData::createScaledFontData):
+
2013-03-12 Vsevolod Vlasov <vse...@chromium.org>
Web Inspector: Fix checkContentUpdated behavior in UISourceCode.
Modified: trunk/Source/WebCore/platform/graphics/blackberry/FontCacheBlackBerry.cpp (145543 => 145544)
--- trunk/Source/WebCore/platform/graphics/blackberry/FontCacheBlackBerry.cpp 2013-03-12 14:53:30 UTC (rev 145543)
+++ trunk/Source/WebCore/platform/graphics/blackberry/FontCacheBlackBerry.cpp 2013-03-12 15:00:04 UTC (rev 145544)
@@ -50,7 +50,7 @@
CRASH();
}
-const SimpleFontData* FontCache::getFontDataForCharacters(const Font& font, const UChar* characters, int length)
+PassRefPtr<SimpleFontData> FontCache::getFontDataForCharacters(const Font& font, const UChar* characters, int length)
{
icu::Locale locale = icu::Locale::getDefault();
PlatformSupport::FontFamily family;
@@ -87,12 +87,12 @@
return getCachedFontData(&platformData, DoNotRetain);
}
-SimpleFontData* FontCache::getSimilarFontPlatformData(const Font& font)
+PassRefPtr<SimpleFontData> FontCache::getSimilarFontPlatformData(const Font& font)
{
return 0;
}
-SimpleFontData* FontCache::getLastResortFallbackFont(const FontDescription& description, ShouldRetain)
+PassRefPtr<SimpleFontData> FontCache::getLastResortFallbackFont(const FontDescription& description, ShouldRetain)
{
DEFINE_STATIC_LOCAL(const AtomicString, sansStr, ("Sans"));
DEFINE_STATIC_LOCAL(const AtomicString, serifStr, ("Serif"));
Modified: trunk/Source/WebCore/platform/graphics/blackberry/SimpleFontDataBlackBerry.cpp (145543 => 145544)
--- trunk/Source/WebCore/platform/graphics/blackberry/SimpleFontDataBlackBerry.cpp 2013-03-12 14:53:30 UTC (rev 145543)
+++ trunk/Source/WebCore/platform/graphics/blackberry/SimpleFontDataBlackBerry.cpp 2013-03-12 15:00:04 UTC (rev 145544)
@@ -107,10 +107,10 @@
{
}
-PassOwnPtr<SimpleFontData> SimpleFontData::createScaledFontData(const FontDescription& fontDescription, float scaleFactor) const
+PassRefPtr<SimpleFontData> SimpleFontData::createScaledFontData(const FontDescription& fontDescription, float scaleFactor) const
{
const float scaledSize = lroundf(fontDescription.computedSize() * scaleFactor);
- return adoptPtr(new SimpleFontData(
+ return adoptRef(new SimpleFontData(
FontPlatformData(m_platformData.font()->cur_lfnt->name,
scaledSize,
m_platformData.syntheticBold(),
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
