Use removeFontFace to avoid resetting fontSelector.

Source/core/css/StyleSheetContents.cpp

 /*
  * (C) 1999-2003 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2004, 2006, 2007, 2012 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 530 matching lines @@
     // See the StyleResolver calls in ScopedStyleResolver::addRulesFromSheet.
     for (size_t i = 0; i < m_clients.size(); ++i) {
         if (Document* document = m_clients[i]->ownerDocument())
             document->styleEngine()->clearResolver();
     }
     m_ruleSet.clear();
     if (StyleSheetContents* parentSheet = parentStyleSheet())
         parentSheet->clearRuleSet();
 }
 
+static void extractFontFaceRuleFromRules(const Vector<RefPtr<StyleRuleBase> >& rules, Vector<const StyleRuleFontFace*>& fontFaceRules)
+{
+    for (unsigned i = 0; i < rules.size(); ++i) {
+        StyleRuleBase* rule = rules[i].get();
+
+        if (rule->isFontFaceRule()) {
+            fontFaceRules.append(toStyleRuleFontFace(rule));
+        } else if (rule->isMediaRule()) {
+            StyleRuleMedia* mediaRule = static_cast<StyleRuleMedia*>(rule);
+            // We cannot know whether the media rule matches or not, but
+            // for safety, remove @font-face in the media rule (if exists).
+            extractFontFaceRuleFromRules(mediaRule->childRules(), fontFaceRules);
+        }
+    }
+}
+
+void StyleSheetContents::extractFontFaceRule(Vector<const StyleRuleFontFace*>& fontFaceRules)

[dglazkov, 2013/11/25 16:27:29]

extractFontFaceRules? Actually, you're not removing these rules here, so
"extract" might be a bit too drastic-sounding. findFontFaceRules?

[tasak, 2013/11/26 07:49:06]

I see. Done.

+{
+    for (unsigned i = 0; i < m_importRules.size(); ++i) {
+        if (!m_importRules[i]->styleSheet())
+            continue;
+        m_importRules[i]->styleSheet()->extractFontFaceRule(fontFaceRules);
+    }
+
+    extractFontFaceRuleFromRules(childRules(), fontFaceRules);
+}
 
 }