Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / css / CSSFontSelector.cpp

diff --git a/src/third_party/WebKit/Source/core/css/CSSFontSelector.cpp b/src/third_party/WebKit/Source/core/css/CSSFontSelector.cpp
index 2f1019c..965051b 100644 (file)
--- a/src/third_party/WebKit/Source/core/css/CSSFontSelector.cpp
+++ b/src/third_party/WebKit/Source/core/css/CSSFontSelector.cpp
@@ -41,7 +41,7 @@
 #include "platform/fonts/SimpleFontData.h"
 #include "wtf/text/AtomicString.h"
 
-namespace WebCore {
+namespace blink {
 
 CSSFontSelector::CSSFontSelector(Document* document)
     : m_document(document)
@@ -160,6 +160,7 @@ void CSSFontSelector::clearDocument()
 {
     m_fontLoader->clearResourceFetcherAndFontSelector();
     m_document = nullptr;
+    m_fontFaceCache.clearAll();
 }
 #endif
 
@@ -174,10 +175,12 @@ void CSSFontSelector::updateGenericFontFamilySettings(Document& document)
 
 void CSSFontSelector::trace(Visitor* visitor)
 {
+#if ENABLE(OILPAN)
     visitor->trace(m_document);
     visitor->trace(m_fontFaceCache);
     visitor->trace(m_clients);
     visitor->trace(m_fontLoader);
+#endif
     FontSelector::trace(visitor);
 }