Add CSSFontSelector::removeFontFaceRule()

Source/core/css/CSSSegmentedFontFaceCache.h

 /*
  * Copyright (C) 2007, 2008, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 15 matching lines @@
 
 #ifndef CSSSegmentedFontFaceCache_h
 #define CSSSegmentedFontFaceCache_h
 
 #include "wtf/Forward.h"
 #include "wtf/HashMap.h"
 #include "wtf/text/StringHash.h"
 
 namespace WebCore {
 
+class CSSFontFace;
 class CSSFontSelector;
 class CSSSegmentedFontFace;
 class FontData;
 class FontDescription;
 class StyleRuleFontFace;
 class Settings;
 
 class CSSSegmentedFontFaceCache {
 public:
     CSSSegmentedFontFaceCache();
 
     // FIXME: Remove CSSFontSelector as argument. Passing CSSFontSelector here is
     // a result of egregious spaghettification in CSSFontFace/FontFaceSet.
     void addFontFaceRule(CSSFontSelector*, const StyleRuleFontFace*);
+    void removeFontFaceRule(const StyleRuleFontFace*);
     PassRefPtr<FontData> getFontData(Settings*, const FontDescription&, const AtomicString&);
     CSSSegmentedFontFace* getFontFace(const FontDescription&, const AtomicString& family);
 
     unsigned version() const { return m_version; }
 
 private:
-    HashMap<String, OwnPtr<HashMap<unsigned, RefPtr<CSSSegmentedFontFace> > >, CaseFoldingHash> m_fontFaces;
-    HashMap<String, OwnPtr<Vector<RefPtr<CSSSegmentedFontFace> > >, CaseFoldingHash> m_locallyInstalledFontFaces;
-    HashMap<String, OwnPtr<HashMap<unsigned, RefPtr<CSSSegmentedFontFace> > >, CaseFoldingHash> m_fonts;
+    typedef HashMap<unsigned, RefPtr<CSSSegmentedFontFace> > TraitsMap;
+    typedef HashMap<String, OwnPtr<TraitsMap>, CaseFoldingHash> FamilyToTraitsMap;
+    typedef HashMap<String, OwnPtr<Vector<RefPtr<CSSSegmentedFontFace> > >, CaseFoldingHash> FamilyToFontFaces;
+    typedef HashMap<const StyleRuleFontFace*, RefPtr<CSSFontFace> > StyleRuleToFontFace;
+    FamilyToTraitsMap m_fontFaces;
+    FamilyToFontFaces m_locallyInstalledFontFaces;
+    FamilyToTraitsMap m_fonts;
+    StyleRuleToFontFace m_styleRuleToFontFace;
 
     // FIXME: See if this could be ditched
     // Used to compare Font instances, and the usage seems suspect.
     unsigned m_version;
 };
 
 }
 
 #endif