Remove CSSFontSelector argument and member from CSSSegmentedFontFace

third_party/WebKit/Source/core/css/FontFaceCache.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 18 matching lines @@
 
 #include "platform/heap/Handle.h"
 #include "wtf/Forward.h"
 #include "wtf/HashMap.h"
 #include "wtf/ListHashSet.h"
 #include "wtf/text/StringHash.h"
 
 namespace blink {
 
 class FontFace;
-class CSSFontSelector;
 class CSSSegmentedFontFace;
 class FontDescription;
 class StyleRuleFontFace;
 
 class FontFaceCache final {
   DISALLOW_NEW();
 
  public:
   FontFaceCache();
 
-  // FIXME: Remove CSSFontSelector as argument. Passing CSSFontSelector here is
-  // a result of egregious spaghettification in FontFace/FontFaceSet.
-  void add(CSSFontSelector*, const StyleRuleFontFace*, FontFace*);
+  void add(const StyleRuleFontFace*, FontFace*);
   void remove(const StyleRuleFontFace*);
   void clearCSSConnected();
   void clearAll();
-  void addFontFace(CSSFontSelector*, FontFace*, bool cssConnected);
+  void addFontFace(FontFace*, bool cssConnected);
   void removeFontFace(FontFace*, bool cssConnected);
 
   // FIXME: It's sort of weird that add/remove uses StyleRuleFontFace* as key,
   // but this function uses FontDescription/family pair.
   CSSSegmentedFontFace* get(const FontDescription&, const AtomicString& family);
 
   const HeapListHashSet<Member<FontFace>>& cssConnectedFontFaces() const {
     return m_cssConnectedFontFaces;
   }
 
@@ skipping 14 matching lines @@
   HeapListHashSet<Member<FontFace>> m_cssConnectedFontFaces;
 
   // FIXME: See if this could be ditched
   // Used to compare Font instances, and the usage seems suspect.
   unsigned m_version;
 };
 
 }  // namespace blink
 
 #endif