X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fthird_party%2FWebKit%2FSource%2Fcore%2Fcss%2FCSSFontSelector.cpp;h=be4318079cff9707171f085fb00aea5c8e3f4f3a;hb=ff3e2503a20db9193d323c1d19c38c68004dec4a;hp=0590cc40f0b7eeba41ea3f3a961500da35b10746;hpb=7338fba38ba696536d1cc9d389afd716a6ab2fe6;p=platform%2Fframework%2Fweb%2Fcrosswalk.git

diff --git a/src/third_party/WebKit/Source/core/css/CSSFontSelector.cpp b/src/third_party/WebKit/Source/core/css/CSSFontSelector.cpp
index 0590cc4..be43180 100644
--- a/src/third_party/WebKit/Source/core/css/CSSFontSelector.cpp
+++ b/src/third_party/WebKit/Source/core/css/CSSFontSelector.cpp
@@ -28,9 +28,6 @@
 #include "core/css/CSSFontSelector.h"
 
 #include "RuntimeEnabledFeatures.h"
-#include "core/css/CSSFontFace.h"
-#include "core/css/CSSFontFaceRule.h"
-#include "core/css/CSSFontFaceSource.h"
 #include "core/css/CSSSegmentedFontFace.h"
 #include "core/css/CSSValueList.h"
 #include "core/css/FontFaceSet.h"
@@ -118,7 +115,7 @@ CSSFontSelector::CSSFontSelector(Document* document)
     ASSERT(m_document);
     ASSERT(m_document->frame());
     FontCache::fontCache()->addClient(this);
-    FontFaceSet::from(document)->addFontFacesToCSSSegmentedFontFaceCache(&m_cssSegmentedFontFaceCache, this);
+    FontFaceSet::from(document)->addFontFacesToFontFaceCache(&m_fontFaceCache, this);
 }
 
 CSSFontSelector::~CSSFontSelector()
@@ -185,7 +182,7 @@ static AtomicString familyNameFromSettings(const GenericFontFamilySettings& sett
 
 PassRefPtr<FontData> CSSFontSelector::getFontData(const FontDescription& fontDescription, const AtomicString& familyName)
 {
-    if (CSSSegmentedFontFace* face = m_cssSegmentedFontFaceCache.get(fontDescription, familyName))
+    if (CSSSegmentedFontFace* face = m_fontFaceCache.get(fontDescription, familyName))
         return face->getFontData(fontDescription);
 
     // Try to return the correct font based off our settings, in case we were handed the generic font family name.
@@ -198,7 +195,7 @@ PassRefPtr<FontData> CSSFontSelector::getFontData(const FontDescription& fontDes
 
 void CSSFontSelector::willUseFontData(const FontDescription& fontDescription, const AtomicString& family)
 {
-    CSSSegmentedFontFace* face = m_cssSegmentedFontFaceCache.get(fontDescription, family);
+    CSSSegmentedFontFace* face = m_fontFaceCache.get(fontDescription, family);
     if (face)
         face->willUseFontData(fontDescription);
 }
@@ -219,4 +216,10 @@ void CSSFontSelector::loadPendingFonts()
     m_fontLoader.loadPendingFonts();
 }
 
+void CSSFontSelector::updateGenericFontFamilySettings(Document& document)
+{
+    ASSERT(document.settings());
+    m_genericFontFamilySettings = document.settings()->genericFontFamilySettings();
+}
+
 }