Title: [147702] trunk/Source/WebCore
- Revision
- 147702
- Author
- [email protected]
- Date
- 2013-04-04 21:39:58 -0700 (Thu, 04 Apr 2013)
Log Message
alternateFamilyName should return a null, not an empty value
https://bugs.webkit.org/show_bug.cgi?id=113987
Patch by Benjamin Poulain <[email protected]> on 2013-04-04
Reviewed by Anders Carlsson.
The string object corresponding semantically to "no-value" is
a null string, not an empty string.
Fix alternateFamilyName() accordingly.
* platform/graphics/FontCache.cpp:
(WebCore::alternateFamilyName):
(WebCore::FontCache::getCachedFontPlatformData):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (147701 => 147702)
--- trunk/Source/WebCore/ChangeLog 2013-04-05 03:46:22 UTC (rev 147701)
+++ trunk/Source/WebCore/ChangeLog 2013-04-05 04:39:58 UTC (rev 147702)
@@ -1,3 +1,19 @@
+2013-04-04 Benjamin Poulain <[email protected]>
+
+ alternateFamilyName should return a null, not an empty value
+ https://bugs.webkit.org/show_bug.cgi?id=113987
+
+ Reviewed by Anders Carlsson.
+
+ The string object corresponding semantically to "no-value" is
+ a null string, not an empty string.
+
+ Fix alternateFamilyName() accordingly.
+
+ * platform/graphics/FontCache.cpp:
+ (WebCore::alternateFamilyName):
+ (WebCore::FontCache::getCachedFontPlatformData):
+
2013-04-04 Anders Carlsson <[email protected]>
Work around a bug in the bindings generation script.
Modified: trunk/Source/WebCore/platform/graphics/FontCache.cpp (147701 => 147702)
--- trunk/Source/WebCore/platform/graphics/FontCache.cpp 2013-04-05 03:46:22 UTC (rev 147701)
+++ trunk/Source/WebCore/platform/graphics/FontCache.cpp 2013-04-05 04:39:58 UTC (rev 147702)
@@ -178,7 +178,7 @@
return timesNewRoman;
#endif
- return emptyAtom;
+ return nullAtom;
}
FontPlatformData* FontCache::getCachedFontPlatformData(const FontDescription& fontDescription,
@@ -213,7 +213,7 @@
// We were unable to find a font. We have a small set of fonts that we alias to other names,
// e.g., Arial/Helvetica, Courier/Courier New, etc. Try looking up the font under the aliased name.
const AtomicString& alternateName = alternateFamilyName(familyName);
- if (!alternateName.isEmpty()) {
+ if (!alternateName.isNull()) {
FontPlatformData* fontPlatformDataForAlternateName = getCachedFontPlatformData(fontDescription, alternateName, true);
// Lookup the key in the hash table again as the previous iterator may have
// been invalidated by the recursive call to getCachedFontPlatformData().
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
