Changeset 147702 in webkit

Timestamp:

Apr 4, 2013 9:39:58 PM (11 years ago)

Author:

benjamin@webkit.org

Message:

alternateFamilyName should return a null, not an empty value
​https://bugs.webkit.org/show_bug.cgi?id=113987

Patch by Benjamin Poulain <​bpoulain@apple.com> 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):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/FontCache.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-04-04  Benjamin Poulain  <bpoulain@apple.com>
+
+        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  <andersca@apple.com>
 

trunk/Source/WebCore/platform/graphics/FontCache.cpp

@@ -179 +179 @@
 #endif
 
-    return emptyAtom;
+    return nullAtom;
 }
 
@@ -214 +214 @@
             // 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