Title: [167715] trunk/Source/WebCore
- Revision
- 167715
- Author
- commit-qu...@webkit.org
- Date
- 2014-04-23 11:36:26 -0700 (Wed, 23 Apr 2014)
Log 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
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (167714 => 167715)
--- trunk/Source/WebCore/ChangeLog 2014-04-23 18:05:33 UTC (rev 167714)
+++ trunk/Source/WebCore/ChangeLog 2014-04-23 18:36:26 UTC (rev 167715)
@@ -1,3 +1,17 @@
+2014-04-23 Commit Queue <commit-qu...@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 <hy...@apple.com>
[New Multicolumn] Nested columns not working at all.
Modified: trunk/Source/WebCore/platform/graphics/Font.cpp (167714 => 167715)
--- trunk/Source/WebCore/platform/graphics/Font.cpp 2014-04-23 18:05:33 UTC (rev 167714)
+++ trunk/Source/WebCore/platform/graphics/Font.cpp 2014-04-23 18:36:26 UTC (rev 167715)
@@ -481,11 +481,11 @@
if (family.isEmpty())
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())
+ // 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;
-#endif
static HashSet<AtomicString>* fontFamiliesWithInvalidCharWidthMap = 0;
Modified: trunk/Source/WebCore/platform/graphics/Font.h (167714 => 167715)
--- trunk/Source/WebCore/platform/graphics/Font.h 2014-04-23 18:05:33 UTC (rev 167714)
+++ trunk/Source/WebCore/platform/graphics/Font.h 2014-04-23 18:36:26 UTC (rev 167715)
@@ -188,8 +188,6 @@
CodePath codePath(const TextRun&) const;
static CodePath characterRangeCodePath(const LChar*, unsigned) { return Simple; }
static CodePath characterRangeCodePath(const UChar*, unsigned len);
-
- bool primaryFontDataIsSystemFont() const;
private:
enum ForTextEmphasisOrNot { NotForTextEmphasis, ForTextEmphasis };
Modified: trunk/Source/WebCore/platform/graphics/mac/FontMac.mm (167714 => 167715)
--- trunk/Source/WebCore/platform/graphics/mac/FontMac.mm 2014-04-23 18:05:33 UTC (rev 167714)
+++ trunk/Source/WebCore/platform/graphics/mac/FontMac.mm 2014-04-23 18:36:26 UTC (rev 167715)
@@ -34,11 +34,6 @@
#endif
#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"
#if __has_include(<CoreGraphics/CoreGraphicsPrivate.h>)
@@ -540,14 +535,4 @@
}
#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
}
-
-}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
