Title: [150442] trunk/Source/WebCore
- Revision
- 150442
- Author
- [email protected]
- Date
- 2013-05-21 08:50:15 -0700 (Tue, 21 May 2013)
Log Message
[BlackBerry] FontCache::getFontDataForCharacters() returns nullptr
https://bugs.webkit.org/show_bug.cgi?id=116529
Patch by Alberto Garcia <[email protected]> on 2013-05-21
Reviewed by Andreas Kling.
This cannot be converted to a PassRefPtr and breaks the build.
* platform/graphics/blackberry/FontCacheBlackBerry.cpp:
(WebCore::FontCache::getFontDataForCharacters):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (150441 => 150442)
--- trunk/Source/WebCore/ChangeLog 2013-05-21 13:44:46 UTC (rev 150441)
+++ trunk/Source/WebCore/ChangeLog 2013-05-21 15:50:15 UTC (rev 150442)
@@ -1,3 +1,15 @@
+2013-05-21 Alberto Garcia <[email protected]>
+
+ [BlackBerry] FontCache::getFontDataForCharacters() returns nullptr
+ https://bugs.webkit.org/show_bug.cgi?id=116529
+
+ Reviewed by Andreas Kling.
+
+ This cannot be converted to a PassRefPtr and breaks the build.
+
+ * platform/graphics/blackberry/FontCacheBlackBerry.cpp:
+ (WebCore::FontCache::getFontDataForCharacters):
+
2013-05-21 Iago Toral Quiroga <[email protected]>
[GTK] Always use EGL to create the GL context when running on Wayland
Modified: trunk/Source/WebCore/platform/graphics/blackberry/FontCacheBlackBerry.cpp (150441 => 150442)
--- trunk/Source/WebCore/platform/graphics/blackberry/FontCacheBlackBerry.cpp 2013-05-21 13:44:46 UTC (rev 150441)
+++ trunk/Source/WebCore/platform/graphics/blackberry/FontCacheBlackBerry.cpp 2013-05-21 15:50:15 UTC (rev 150442)
@@ -147,7 +147,7 @@
FontCache::SimpleFontFamily family;
FontCache::getFontFamilyForCharacters(characters, length, locale.getLanguage(), font.fontDescription(), &family);
if (family.name.isEmpty())
- return nullptr;
+ return 0;
AtomicString atomicFamily(family.name);
// Changes weight and/or italic of given FontDescription depends on
@@ -171,7 +171,7 @@
FontPlatformData* substitutePlatformData = getCachedFontPlatformData(description, atomicFamily, DoNotRetain);
if (!substitutePlatformData)
- return nullptr;
+ return 0;
FontPlatformData platformData = FontPlatformData(*substitutePlatformData);
platformData.setFakeBold(shouldSetFakeBold);
platformData.setFakeItalic(shouldSetFakeItalic);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
