blink: Rename platform/ methods to prefix with get when they collide.

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

 /*
  * 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
@@ skipping 367 matching lines @@
     Font font;
     if (!resolveFontStyle(fontString, font)) {
         ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState);
         ScriptPromise promise = resolver->promise();
         resolver->reject(DOMException::create(SyntaxError, "Could not resolve '" + fontString + "' as a font."));
         return promise;
     }
 
     FontFaceCache* fontFaceCache = document()->styleEngine().fontSelector()->fontFaceCache();
     FontFaceArray faces;
-    for (const FontFamily* f = &font.fontDescription().family(); f; f = f->next()) {
-        CSSSegmentedFontFace* segmentedFontFace = fontFaceCache->get(font.fontDescription(), f->family());
+    for (const FontFamily* f = &font.getFontDescription().family(); f; f = f->next()) {
+        CSSSegmentedFontFace* segmentedFontFace = fontFaceCache->get(font.getFontDescription(), f->family());
         if (segmentedFontFace)
             segmentedFontFace->match(text, faces);
     }
 
     RefPtrWillBeRawPtr<LoadFontPromiseResolver> resolver = LoadFontPromiseResolver::create(faces, scriptState);
     ScriptPromise promise = resolver->promise();
     resolver->loadFonts(getExecutionContext()); // After this, resolver->promise() may return null.
     return promise;
 }
 
 bool FontFaceSet::check(const String& fontString, const String& text, ExceptionState& exceptionState)
 {
     if (!inActiveDocumentContext())
         return false;
 
     Font font;
     if (!resolveFontStyle(fontString, font)) {
         exceptionState.throwDOMException(SyntaxError, "Could not resolve '" + fontString + "' as a font.");
         return false;
     }
 
     CSSFontSelector* fontSelector = document()->styleEngine().fontSelector();
     FontFaceCache* fontFaceCache = fontSelector->fontFaceCache();
 
     bool hasLoadedFaces = false;
-    for (const FontFamily* f = &font.fontDescription().family(); f; f = f->next()) {
-        CSSSegmentedFontFace* face = fontFaceCache->get(font.fontDescription(), f->family());
+    for (const FontFamily* f = &font.getFontDescription().family(); f; f = f->next()) {
+        CSSSegmentedFontFace* face = fontFaceCache->get(font.getFontDescription(), f->family());
         if (face) {
             if (!face->checkFont(text))
                 return false;
             hasLoadedFaces = true;
         }
     }
     if (hasLoadedFaces)
         return true;
-    for (const FontFamily* f = &font.fontDescription().family(); f; f = f->next()) {
-        if (fontSelector->isPlatformFontAvailable(font.fontDescription(), f->family()))
+    for (const FontFamily* f = &font.getFontDescription().family(); f; f = f->next()) {
+        if (fontSelector->isPlatformFontAvailable(font.getFontDescription(), f->family()))
             return true;
     }
     return false;
 }
 
 bool FontFaceSet::resolveFontStyle(const String& fontString, Font& font)
 {
     if (fontString.isEmpty())
         return false;
 
@@ skipping 12 matching lines @@
     FontFamily fontFamily;
     fontFamily.setFamily(defaultFontFamily);
 
     FontDescription defaultFontDescription;
     defaultFontDescription.setFamily(fontFamily);
     defaultFontDescription.setSpecifiedSize(defaultFontSize);
     defaultFontDescription.setComputedSize(defaultFontSize);
 
     style->setFontDescription(defaultFontDescription);
 
-    style->font().update(style->font().fontSelector());
+    style->font().update(style->font().getFontSelector());
 
     document()->ensureStyleResolver().computeFont(style.get(), *parsedStyle);
 
     font = style->font();
     font.update(document()->styleEngine().fontSelector());
     return true;
 }
 
 void FontFaceSet::FontLoadHistogram::updateStatus(FontFace* fontFace)
 {
@@ skipping 75 matching lines @@
     visitor->trace(m_failedFonts);
     visitor->trace(m_nonCSSConnectedFaces);
     visitor->trace(m_asyncRunner);
     HeapSupplement<Document>::trace(visitor);
 #endif
     EventTargetWithInlineData::trace(visitor);
     ActiveDOMObject::trace(visitor);
 }
 
 } // namespace blink