Fix build even more. Not a strong performance here.
authorakling@apple.com <akling@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 14 Dec 2014 10:02:57 +0000 (10:02 +0000)
committerakling@apple.com <akling@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 14 Dec 2014 10:02:57 +0000 (10:02 +0000)
* platform/graphics/Font.cpp:
(WebCore::FontGlyphsCacheEntry::FontGlyphsCacheEntry):
(WebCore::retrieveOrAddCachedFontGlyphs):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@177262 268f45cc-cd09-0410-ab3c-d52691b4dbfc

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

index 01a26cc..502af2d 100644 (file)
@@ -1,5 +1,13 @@
 2014-12-14  Andreas Kling  <akling@apple.com>
 
+        Fix build even more. Not a strong performance here.
+
+        * platform/graphics/Font.cpp:
+        (WebCore::FontGlyphsCacheEntry::FontGlyphsCacheEntry):
+        (WebCore::retrieveOrAddCachedFontGlyphs):
+
+2014-12-14  Andreas Kling  <akling@apple.com>
+
         Fix build. :-|
 
         * css/CSSFunctionValue.cpp:
index d57fbc2..890b68e 100644 (file)
@@ -215,6 +215,10 @@ struct FontGlyphsCacheKey {
 struct FontGlyphsCacheEntry {
     WTF_MAKE_FAST_ALLOCATED;
 public:
+    FontGlyphsCacheEntry(FontGlyphsCacheKey&& k, Ref<FontGlyphs>&& g)
+        : key(WTF::move(k))
+        , glyphs(WTF::move(g))
+    { }
     FontGlyphsCacheKey key;
     Ref<FontGlyphs> glyphs;
 };
@@ -306,7 +310,7 @@ static Ref<FontGlyphs> retrieveOrAddCachedFontGlyphs(const FontDescription& font
         return addResult.iterator->value->glyphs.get();
 
     std::unique_ptr<FontGlyphsCacheEntry>& newEntry = addResult.iterator->value;
-    newEntry = std::make_unique<FontGlyphsCacheEntry>({WTF::move(key), FontGlyphs::create(fontSelector)});
+    newEntry = std::make_unique<FontGlyphsCacheEntry>(WTF::move(key), FontGlyphs::create(fontSelector));
     Ref<FontGlyphs> glyphs = newEntry->glyphs.get();
 
     static const unsigned unreferencedPruneInterval = 50;