Changeset 167715 in webkit

Timestamp:

Apr 23, 2014 11:36:26 AM (10 years ago)

Author:

commit-queue@webkit.org

Message:

Unreviewed, rolling out r167713.
​https://bugs.webkit.org/show_bug.cgi?id=132070

broke hundreds of tests (Requested by thorton on #webkit).

Reverted changeset:

"[OS X] Make checking if a font is the system font more
robust"
​https://bugs.webkit.org/show_bug.cgi?id=132030
​http://trac.webkit.org/changeset/167713

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/Font.cpp (modified) (1 diff)
• platform/graphics/Font.h (modified) (1 diff)
• platform/graphics/mac/FontMac.mm (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-04-23  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r167713.
+        https://bugs.webkit.org/show_bug.cgi?id=132070
+
+        broke hundreds of tests (Requested by thorton on #webkit).
+
+        Reverted changeset:
+
+        "[OS X] Make checking if a font is the system font more
+        robust"
+        https://bugs.webkit.org/show_bug.cgi?id=132030
+        http://trac.webkit.org/changeset/167713
+
 2014-04-22  David Hyatt  <hyatt@apple.com>
 

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

@@ -482 +482 @@
         return false;
 
-#if PLATFORM(MAC) || PLATFORM(IOS)
-    // Internal fonts on OS X and iOS also have an invalid entry in the table for avgCharWidth.
-    if (primaryFontDataIsSystemFont())
-        return false;
-#endif
+    // Internal fonts on OS X also have an invalid entry in the table for avgCharWidth.
+    // They are hidden by having a name that begins with a period, so simply search
+    // for that here rather than try to keep the list up to date.
+    if (family.startsWith('.'))
+        return false;
 
     static HashSet<AtomicString>* fontFamiliesWithInvalidCharWidthMap = 0;

trunk/Source/WebCore/platform/graphics/Font.h

@@ -189 +189 @@
     static CodePath characterRangeCodePath(const LChar*, unsigned) { return Simple; }
     static CodePath characterRangeCodePath(const UChar*, unsigned len);
-    
-    bool primaryFontDataIsSystemFont() const;
 
 private:

trunk/Source/WebCore/platform/graphics/mac/FontMac.mm

@@ -35 +35 @@
 #import <wtf/MathExtras.h>
 
-#if __has_include(<CoreText/CTFontDescriptorPriv.h>)
-#import <CoreText/CTFontDescriptorPriv.h>
-#endif
-extern "C" bool CTFontDescriptorIsSystemUIFont(CTFontDescriptorRef);
-
 #if ENABLE(LETTERPRESS)
 #import "SoftLinking.h"
@@ -541 +536 @@
 #endif
 
-bool Font::primaryFontDataIsSystemFont() const
-{
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
-    RetainPtr<CTFontDescriptorRef> descriptor = CTFontCopyFontDescriptor(primaryFont()->platformData().ctFont());
-    return CTFontDescriptorIsSystemUIFont(descriptor.get());
-#else
-    return false;
-#endif
-}
-
-}
+}