Update To 11.40.268.0

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

diff --git a/src/third_party/WebKit/Source/core/css/CSSSegmentedFontFace.cpp b/src/third_party/WebKit/Source/core/css/CSSSegmentedFontFace.cpp
index 854f80f..4c48caf 100644 (file)
--- a/src/third_party/WebKit/Source/core/css/CSSSegmentedFontFace.cpp
+++ b/src/third_party/WebKit/Source/core/css/CSSSegmentedFontFace.cpp
@@ -48,8 +48,8 @@ CSSSegmentedFontFace::~CSSSegmentedFontFace()
 {
     pruneTable();
 #if !ENABLE(OILPAN)
-    for (FontFaceList::iterator it = m_fontFaces.begin(); it != m_fontFaces.end(); ++it)
-        (*it)->cssFontFace()->clearSegmentedFontFace();
+    for (const auto& fontFace : m_fontFaces)
+        fontFace->cssFontFace()->clearSegmentedFontFace();
 #endif
 }
 
@@ -65,8 +65,8 @@ void CSSSegmentedFontFace::pruneTable()
 bool CSSSegmentedFontFace::isValid() const
 {
     // Valid if at least one font face is valid.
-    for (FontFaceList::const_iterator it = m_fontFaces.begin(); it != m_fontFaces.end(); ++it) {
-        if ((*it)->cssFontFace()->isValid())
+    for (const auto& fontFace : m_fontFaces) {
+        if (fontFace->cssFontFace()->isValid())
             return true;
     }
     return false;
@@ -150,12 +150,6 @@ PassRefPtr<FontData> CSSSegmentedFontFace::getFontData(const FontDescription& fo
             continue;
         if (RefPtr<SimpleFontData> faceFontData = (*it)->cssFontFace()->getFontData(requestedFontDescription)) {
             ASSERT(!faceFontData->isSegmented());
-#if ENABLE(SVG_FONTS)
-            // For SVG Fonts that specify that they only support the "normal" variant, we will assume they are incapable
-            // of small-caps synthesis and just ignore the font face.
-            if (faceFontData->isSVGFont() && desiredTraits.variant() == FontVariantSmallCaps && m_traits.variant() == FontVariantNormal)
-                continue;
-#endif
             appendFontData(fontData.get(), faceFontData.release(), (*it)->cssFontFace()->ranges());
         }
     }
@@ -167,8 +161,8 @@ PassRefPtr<FontData> CSSSegmentedFontFace::getFontData(const FontDescription& fo
 
 bool CSSSegmentedFontFace::isLoading() const
 {
-    for (FontFaceList::const_iterator it = m_fontFaces.begin(); it != m_fontFaces.end(); ++it) {
-        if ((*it)->loadStatus() == FontFace::Loading)
+    for (const auto& fontFace : m_fontFaces) {
+        if (fontFace->loadStatus() == FontFace::Loading)
             return true;
     }
     return false;
@@ -176,8 +170,8 @@ bool CSSSegmentedFontFace::isLoading() const
 
 bool CSSSegmentedFontFace::isLoaded() const
 {
-    for (FontFaceList::const_iterator it = m_fontFaces.begin(); it != m_fontFaces.end(); ++it) {
-        if ((*it)->loadStatus() != FontFace::Loaded)
+    for (const auto& fontFace : m_fontFaces) {
+        if (fontFace->loadStatus() != FontFace::Loaded)
             return false;
     }
     return true;
@@ -195,8 +189,8 @@ void CSSSegmentedFontFace::willUseFontData(const FontDescription& fontDescriptio
 
 bool CSSSegmentedFontFace::checkFont(const String& text) const
 {
-    for (FontFaceList::const_iterator it = m_fontFaces.begin(); it != m_fontFaces.end(); ++it) {
-        if ((*it)->loadStatus() != FontFace::Loaded && (*it)->cssFontFace()->ranges().intersectsWith(text))
+    for (const auto& fontFace : m_fontFaces) {
+        if (fontFace->loadStatus() != FontFace::Loaded && fontFace->cssFontFace()->ranges().intersectsWith(text))
             return false;
     }
     return true;
@@ -204,9 +198,9 @@ bool CSSSegmentedFontFace::checkFont(const String& text) const
 
 void CSSSegmentedFontFace::match(const String& text, WillBeHeapVector<RefPtrWillBeMember<FontFace> >& faces) const
 {
-    for (FontFaceList::const_iterator it = m_fontFaces.begin(); it != m_fontFaces.end(); ++it) {
-        if ((*it)->cssFontFace()->ranges().intersectsWith(text))
-            faces.append(*it);
+    for (const auto& fontFace : m_fontFaces) {
+        if (fontFace->cssFontFace()->ranges().intersectsWith(text))
+            faces.append(fontFace);
     }
 }