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

third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2D.cpp

 /*
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2008, 2010 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2007 Alp Toker <alp@atoker.com>
  * Copyright (C) 2008 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2008 Dirk Schulze <krit@webkit.org>
  * Copyright (C) 2010 Torch Mobile (Beijing) Co. Ltd. All rights reserved.
  * Copyright (C) 2012, 2013 Intel Corporation. All rights reserved.
  * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved.
  *
@@ skipping 391 matching lines @@
     return canvas()->baseTransform();
 }
 
 String CanvasRenderingContext2D::font() const
 {
     if (!state().hasRealizedFont())
         return defaultFont;
 
     canvas()->document().canvasFontCache()->willUseCurrentFont();
     StringBuilder serializedFont;
-    const FontDescription& fontDescription = state().font().fontDescription();
+    const FontDescription& fontDescription = state().font().getFontDescription();
 
     if (fontDescription.style() == FontStyleItalic)
         serializedFont.appendLiteral("italic ");
     if (fontDescription.weight() == FontWeightBold)
         serializedFont.appendLiteral("bold ");
     if (fontDescription.variant() == FontVariantSmallCaps)
         serializedFont.appendLiteral("small-caps ");
 
     serializedFont.appendNumber(fontDescription.computedPixelSize());
     serializedFont.appendLiteral("px");
@@ skipping 43 matching lines @@
         if (i != m_fontsResolvedUsingCurrentStyle.end()) {
             ASSERT(m_fontLRUList.contains(newFont));
             m_fontLRUList.remove(newFont);
             m_fontLRUList.add(newFont);
             modifiableState().setFont(i->value, canvas()->document().styleEngine().fontSelector());
         } else {
             MutableStylePropertySet* parsedStyle = canvasFontCache->parseFont(newFont);
             if (!parsedStyle)
                 return;
             fontStyle = ComputedStyle::create();
-            FontDescription elementFontDescription(computedStyle->fontDescription());
+            FontDescription elementFontDescription(computedStyle->getFontDescription());
             // Reset the computed size to avoid inheriting the zoom factor from the <canvas> element.
             elementFontDescription.setComputedSize(elementFontDescription.specifiedSize());
             fontStyle->setFontDescription(elementFontDescription);
-            fontStyle->font().update(fontStyle->font().fontSelector());
+            fontStyle->font().update(fontStyle->font().getFontSelector());
             canvas()->document().ensureStyleResolver().computeFont(fontStyle.get(), *parsedStyle);
             m_fontsResolvedUsingCurrentStyle.add(newFont, fontStyle->font());
             ASSERT(!m_fontLRUList.contains(newFont));
             m_fontLRUList.add(newFont);
             pruneLocalFontCache(canvasFontCache->hardMaxFonts()); // hard limit
             schedulePruneLocalFontCacheIfNeeded(); // soft limit
             modifiableState().setFont(fontStyle->font(), canvas()->document().styleEngine().fontSelector());
         }
     } else {
         Font resolvedFont;
@@ skipping 190 matching lines @@
     canvas()->document().updateLayoutTreeForNode(canvas());
     const Font& font = accessFont();
 
     TextDirection direction;
     if (state().getDirection() == CanvasRenderingContext2DState::DirectionInherit)
         direction = determineDirectionality(text);
     else
         direction = toTextDirection(state().getDirection(), canvas());
     TextRun textRun(text, 0, 0, TextRun::AllowTrailingExpansion | TextRun::ForbidLeadingExpansion, direction, false);
     textRun.setNormalizeSpace(true);
-    FloatRect textBounds = font.selectionRectForText(textRun, FloatPoint(), font.fontDescription().computedSize(), 0, -1, true);
+    FloatRect textBounds = font.selectionRectForText(textRun, FloatPoint(), font.getFontDescription().computedSize(), 0, -1, true);
 
     // x direction
     metrics->setWidth(font.width(textRun));
     metrics->setActualBoundingBoxLeft(-textBounds.x());
     metrics->setActualBoundingBoxRight(textBounds.maxX());
 
     // y direction
-    const FontMetrics& fontMetrics = font.fontMetrics();
+    const FontMetrics& fontMetrics = font.getFontMetrics();
     const float ascent = fontMetrics.floatAscent();
     const float descent = fontMetrics.floatDescent();
     const float baselineY = getFontBaseline(fontMetrics);
 
     metrics->setFontBoundingBoxAscent(ascent - baselineY);
     metrics->setFontBoundingBoxDescent(descent + baselineY);
     metrics->setActualBoundingBoxAscent(-textBounds.y() - baselineY);
     metrics->setActualBoundingBoxDescent(textBounds.maxY() + baselineY);
 
     // Note : top/bottom and ascend/descend are currently the same, so there's no difference
@@ skipping 31 matching lines @@
     // is expected when !m_hasAlpha, so we need to fall out of display list mode when
     // drawing text to an opaque canvas
     // crbug.com/583809
     if (!m_hasAlpha && !isAccelerated())
         canvas()->disableDeferral(DisableDeferralReasonSubPixelTextAntiAliasingSupport);
 
     const Font& font = accessFont();
     if (!font.primaryFont())
         return;
 
-    const FontMetrics& fontMetrics = font.fontMetrics();
+    const FontMetrics& fontMetrics = font.getFontMetrics();
 
     // FIXME: Need to turn off font smoothing.
 
     const ComputedStyle* computedStyle = 0;
     TextDirection direction = toTextDirection(state().getDirection(), canvas(), &computedStyle);
     bool isRTL = direction == RTL;
     bool override = computedStyle ? isOverride(computedStyle->unicodeBidi()) : false;
 
     TextRun textRun(text, 0, 0, TextRun::AllowTrailingExpansion, direction, override);
     textRun.setNormalizeSpace(true);
@@ skipping 146 matching lines @@
 }
 
 void CanvasRenderingContext2D::drawFocusRing(const Path& path)
 {
     if (!drawingCanvas())
         return;
 
     SkColor color = LayoutTheme::theme().focusRingColor().rgb();
     const int focusRingWidth = 5;
 
-    drawPlatformFocusRing(path.skPath(), drawingCanvas(), color, focusRingWidth);
+    drawPlatformFocusRing(path.getSkPath(), drawingCanvas(), color, focusRingWidth);
 
     // We need to add focusRingWidth to dirtyRect.
     StrokeData strokeData;
     strokeData.setThickness(focusRingWidth);
 
     SkIRect dirtyRect;
     if (!computeDirtyRect(path.strokeBoundingRect(strokeData), &dirtyRect))
         return;
 
     didDraw(dirtyRect);
@@ skipping 86 matching lines @@
 
 unsigned CanvasRenderingContext2D::hitRegionsCount() const
 {
     if (m_hitRegionManager)
         return m_hitRegionManager->getHitRegionsCount();
 
     return 0;
 }
 
 } // namespace blink