Changeset 223600 in webkit
- Timestamp:
- Oct 18, 2017 4:05:40 AM (6 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r223596 r223600 1 2017-10-18 Fujii Hironori <Hironori.Fujii@sony.com> 2 3 Use LazyNeverDestroyed instead of DEFINE_GLOBAL for WebKitFontFamilyNames 4 https://bugs.webkit.org/show_bug.cgi?id=175106 5 6 Reviewed by Yusuke Suzuki. 7 8 No new tests because there is no behavior change. 9 10 * css/CSSFontFaceSet.cpp: 11 (WebCore::CSSFontFaceSet::familyNameFromPrimitive): Call get() method of LazyNeverDestroyed. 12 * dom/make_names.pl: Use LazyNeverDestroyed for font names. 13 1 14 2017-10-18 Zan Dobersek <zdobersek@igalia.com> 2 15 -
trunk/Source/WebCore/css/CSSFontFaceSet.cpp
r222926 r223600 132 132 switch (value.valueID()) { 133 133 case CSSValueSerif: 134 return serifFamily ;134 return serifFamily.get(); 135 135 case CSSValueSansSerif: 136 return sansSerifFamily ;136 return sansSerifFamily.get(); 137 137 case CSSValueCursive: 138 return cursiveFamily ;138 return cursiveFamily.get(); 139 139 case CSSValueFantasy: 140 return fantasyFamily ;140 return fantasyFamily.get(); 141 141 case CSSValueMonospace: 142 return monospaceFamily ;142 return monospaceFamily.get(); 143 143 case CSSValueWebkitPictograph: 144 return pictographFamily ;144 return pictographFamily.get(); 145 145 case CSSValueSystemUi: 146 return systemUiFamily ;146 return systemUiFamily.get(); 147 147 default: 148 148 return { }; -
trunk/Source/WebCore/dom/make_names.pl
r223314 r223600 110 110 111 111 printLicenseHeader($F); 112 printHeaderHead($F, "CSS", $familyNamesFileBase, "#include <wtf/text/AtomicString.h>", ""); 113 114 printMacros($F, "extern const WTF::AtomicString", "", \%parameters); 112 printHeaderHead($F, "CSS", $familyNamesFileBase, <<END, ""); 113 #include <wtf/NeverDestroyed.h> 114 #include <wtf/text/AtomicString.h> 115 END 116 117 printMacros($F, "extern LazyNeverDestroyed<const WTF::AtomicString>", "", \%parameters); 115 118 print F "#endif\n\n"; 116 119 … … 126 129 print F StaticString::GenerateStrings(\%parameters); 127 130 128 for my $name (sort keys %parameters) { 129 print F "DEFINE_GLOBAL(AtomicString, $name)\n"; 130 } 131 printMacros($F, "LazyNeverDestroyed<const WTF::AtomicString>", "", \%parameters); 131 132 132 133 printInit($F, 0); … … 139 140 # depending on whether SKIP_STATIC_CONSTRUCTORS_ON_GCC is used, so stick with a 140 141 # C-style cast for now. 141 print F " new (NotNull, (void*)&$name) AtomicString(&${name}Data);\n";142 print F " ${name}.construct(&${name}Data);\n"; 142 143 } 143 144
Note: See TracChangeset
for help on using the changeset viewer.