Remove CSSFontSelector argument and member from CSSSegmentedFontFace

third_party/WebKit/Source/core/css/FontFaceCache.cpp

 /*
  * 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
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "core/css/FontFaceCache.h"
 
-#include "core/css/CSSFontSelector.h"
 #include "core/css/CSSSegmentedFontFace.h"
 #include "core/css/CSSValueList.h"
 #include "core/css/FontFace.h"
 #include "core/css/FontStyleMatcher.h"
 #include "core/css/StyleRule.h"
 #include "core/loader/resource/FontResource.h"
 #include "platform/FontFamilyNames.h"
 #include "platform/fonts/FontDescription.h"
 #include "platform/loader/fetch/ResourceFetcher.h"
 #include "wtf/text/AtomicString.h"
 
 namespace blink {
 
 static unsigned s_version = 0;
 
 FontFaceCache::FontFaceCache() : m_version(0) {}
 
-void FontFaceCache::add(CSSFontSelector* cssFontSelector,
-                        const StyleRuleFontFace* fontFaceRule,
+void FontFaceCache::add(const StyleRuleFontFace* fontFaceRule,
                         FontFace* fontFace) {
   if (!m_styleRuleToFontFace.insert(fontFaceRule, fontFace).isNewEntry)
     return;
-  addFontFace(cssFontSelector, fontFace, true);
+  addFontFace(fontFace, true);
 }
 
-void FontFaceCache::addFontFace(CSSFontSelector* cssFontSelector,
-                                FontFace* fontFace,
-                                bool cssConnected) {
+void FontFaceCache::addFontFace(FontFace* fontFace, bool cssConnected) {
   FamilyToTraitsMap::AddResult traitsResult =
       m_fontFaces.insert(fontFace->family(), nullptr);
   if (!traitsResult.storedValue->value)
     traitsResult.storedValue->value = new TraitsMap;
 
   TraitsMap::AddResult segmentedFontFaceResult =
       traitsResult.storedValue->value->insert(fontFace->traits().bitfield(),
                                               nullptr);
-  if (!segmentedFontFaceResult.storedValue->value)
+  if (!segmentedFontFaceResult.storedValue->value) {
     segmentedFontFaceResult.storedValue->value =
-        CSSSegmentedFontFace::create(cssFontSelector, fontFace->traits());
+        CSSSegmentedFontFace::create(fontFace->traits());
+  }
 
   segmentedFontFaceResult.storedValue->value->addFontFace(fontFace,
                                                           cssConnected);
   if (cssConnected)
     m_cssConnectedFontFaces.add(fontFace);
 
   m_fonts.erase(fontFace->family());
   incrementVersion();
 }
 
@@ skipping 79 matching lines @@
 }
 
 DEFINE_TRACE(FontFaceCache) {
   visitor->trace(m_fontFaces);
   visitor->trace(m_fonts);
   visitor->trace(m_styleRuleToFontFace);
   visitor->trace(m_cssConnectedFontFaces);
 }
 
 }  // namespace blink