Title: [152693] branches/safari-537-branch/Source
- Revision
- 152693
- Author
- lforsch...@apple.com
- Date
- 2013-07-15 18:44:18 -0700 (Mon, 15 Jul 2013)
Log Message
Merged r152689. <rdar://problem/14446014>
Modified Paths
Diff
Modified: branches/safari-537-branch/Source/WebCore/ChangeLog (152692 => 152693)
--- branches/safari-537-branch/Source/WebCore/ChangeLog 2013-07-16 01:34:49 UTC (rev 152692)
+++ branches/safari-537-branch/Source/WebCore/ChangeLog 2013-07-16 01:44:18 UTC (rev 152693)
@@ -1,5 +1,23 @@
2013-07-15 Lucas Forschler <lforsch...@apple.com>
+ Merge r152689
+
+ 2013-07-15 Andreas Kling <akl...@apple.com>
+
+ Pack WebCore::Font slightly better.
+ <http://webkit.org/b/118681>
+ <rdar://problem/14446014>
+
+ Reviewed by Sam Weinig.
+
+ Knock 8 bytes off of Font by packing the members better. Reduces memory consumption by 429 kB when
+ viewing the full HTML5 spec at <http://whatwg.org/c>
+
+ * platform/graphics/Font.h:
+ (WebCore::Font::typesettingFeatures):
+
+2013-07-15 Lucas Forschler <lforsch...@apple.com>
+
Merge r152653
2013-07-15 Antoine Quint <grao...@apple.com>
Modified: branches/safari-537-branch/Source/WebCore/platform/graphics/Font.h (152692 => 152693)
--- branches/safari-537-branch/Source/WebCore/platform/graphics/Font.h 2013-07-16 01:34:49 UTC (rev 152692)
+++ branches/safari-537-branch/Source/WebCore/platform/graphics/Font.h 2013-07-16 01:44:18 UTC (rev 152693)
@@ -128,7 +128,7 @@
FontRenderingMode renderingMode() const { return m_fontDescription.renderingMode(); }
- TypesettingFeatures typesettingFeatures() const { return m_typesettingFeatures; }
+ TypesettingFeatures typesettingFeatures() const { return static_cast<TypesettingFeatures>(m_typesettingFeatures); }
const AtomicString& firstFamily() const { return m_fontDescription.firstFamily(); }
unsigned familyCount() const { return m_fontDescription.familyCount(); }
@@ -310,7 +310,7 @@
short m_letterSpacing;
short m_wordSpacing;
bool m_needsTranscoding;
- mutable TypesettingFeatures m_typesettingFeatures; // Caches values computed from m_fontDescription.
+ mutable unsigned m_typesettingFeatures : 2; // (TypesettingFeatures) Caches values computed from m_fontDescription.
};
void invalidateFontGlyphsCache();
Modified: branches/safari-537-branch/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js (152692 => 152693)
--- branches/safari-537-branch/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2013-07-16 01:34:49 UTC (rev 152692)
+++ branches/safari-537-branch/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2013-07-16 01:44:18 UTC (rev 152693)
@@ -258,9 +258,9 @@
l o c a l i z e d S t r i n g s [ " O r i g i n a l " ] = " O r i g i n a l " ;
l o c a l i z e d S t r i n g s [ " O r i g i n a l f o r m a t t i n g " ] = " O r i g i n a l f o r m a t t i n g " ;
l o c a l i z e d S t r i n g s [ " O r i g i n a l l y % s " ] = " O r i g i n a l l y % s " ;
- l o c a l i z e d S t r i n g s [ " O u t p u t : " ] = " O u t p u t : " ;
l o c a l i z e d S t r i n g s [ " O t h e r " ] = " O t h e r " ;
l o c a l i z e d S t r i n g s [ " O t h e r I s s u e " ] = " O t h e r I s s u e " ;
+ l o c a l i z e d S t r i n g s [ " O u t p u t : " ] = " O u t p u t : " ;
l o c a l i z e d S t r i n g s [ " P a g e I s s u e " ] = " P a g e I s s u e " ;
l o c a l i z e d S t r i n g s [ " P a i n t " ] = " P a i n t " ;
l o c a l i z e d S t r i n g s [ " P a i n t s " ] = " P a i n t s " ;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
