Eliminate SVGTextRunRenderingContext::m_activePaintingResource

Source/core/rendering/svg/SVGInlineTextBox.cpp

 /**
  * Copyright (C) 2007 Rob Buis <buis@kde.org>
  * Copyright (C) 2007 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) Research In Motion Limited 2010. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
@@ skipping 327 matching lines @@
             paintDecoration(paintInfo.context, TextDecorationLineThrough, fragment);
     }
 
     // finally, paint the outline if any
     if (style->hasOutline() && parentRenderer.isRenderInline())
         toRenderInline(parentRenderer).paintOutline(paintInfo, paintOffset);
 }
 
 class PaintingResourceScope {
 public:
-    PaintingResourceScope(RenderObject& renderer, TextRun::RenderingContext* renderingContext = 0)
+    PaintingResourceScope(RenderObject& renderer)
         : m_renderer(renderer)
-        , m_renderingContext(renderingContext)
         , m_paintingResource(0)
     {
     }
     ~PaintingResourceScope() { ASSERT(!m_paintingResource); }
 
     bool acquirePaintingResource(GraphicsContext*&, float scalingFactor, RenderStyle*, RenderSVGResourceModeFlags);
     void releasePaintingResource(GraphicsContext*&);
 
 private:
     RenderObject& m_renderer;
-    TextRun::RenderingContext* m_renderingContext;
     RenderSVGResource* m_paintingResource;
 };
 
 bool PaintingResourceScope::acquirePaintingResource(GraphicsContext*& context, float scalingFactor,
     RenderStyle* style, RenderSVGResourceModeFlags resourceModeFlags)
 {
     // Callers must save the context state before calling when scalingFactor is not 1.
     ASSERT(scalingFactor);
     ASSERT(style);
     ASSERT(resourceModeFlags != ApplyToDefaultMode);
     RenderSVGResourceMode resourceMode = static_cast<RenderSVGResourceMode>(resourceModeFlags & (ApplyToFillMode | ApplyToStrokeMode));
     ASSERT(resourceMode == ApplyToFillMode || resourceMode == ApplyToStrokeMode);
 
     bool hasFallback = false;
     m_paintingResource = RenderSVGResource::requestPaintingResource(resourceMode, &m_renderer, style, hasFallback);
     if (!m_paintingResource)
         return false;
 
     if (!m_paintingResource->applyResource(&m_renderer, style, context, resourceModeFlags)) {
         if (hasFallback) {
             m_paintingResource = RenderSVGResource::sharedSolidPaintingResource();
             m_paintingResource->applyResource(&m_renderer, style, context, resourceModeFlags);
         }
     }
 
     if (scalingFactor != 1 && resourceModeFlags & ApplyToStrokeMode)
         context->setStrokeThickness(context->strokeThickness() * scalingFactor);
 
-#if ENABLE(SVG_FONTS)
-    // SVG Fonts need access to the painting resource used to draw the current text chunk.
-    if (m_renderingContext)
-        static_cast<SVGTextRunRenderingContext*>(m_renderingContext)->setActivePaintingResource(m_paintingResource);
-#endif
-
     return true;
 }
 
 void PaintingResourceScope::releasePaintingResource(GraphicsContext*& context)
 {
     ASSERT(m_paintingResource);
 
     m_paintingResource->postApplyResource(&m_renderer, context);
     m_paintingResource = 0;
-
-#if ENABLE(SVG_FONTS)
-    if (m_renderingContext)
-        static_cast<SVGTextRunRenderingContext*>(m_renderingContext)->setActivePaintingResource(0);
-#endif
 }
 
 TextRun SVGInlineTextBox::constructTextRun(RenderStyle* style, const SVGTextFragment& fragment) const
 {
     ASSERT(style);
 
     RenderText* text = &renderer();
 
     // FIXME(crbug.com/264211): This should not be necessary but can occur if we
     //                          layout during layout. Remove this when 264211 is fixed.
@@ skipping 191 matching lines @@
     if (scalingFactor != 1) {
         textOrigin.scale(scalingFactor, scalingFactor);
         textSize.scale(scalingFactor);
         context->save();
         context->scale(1 / scalingFactor, 1 / scalingFactor);
     }
 
     if (hasShadow)
         context->setDrawLooper(shadowList->createDrawLooper(DrawLooperBuilder::ShadowRespectsAlpha));
 
-    PaintingResourceScope resourceScope(parent()->renderer(), textRun.renderingContext());
+    PaintingResourceScope resourceScope(parent()->renderer());
     if (resourceScope.acquirePaintingResource(context, scalingFactor, style, resourceMode)) {
         TextRunPaintInfo textRunPaintInfo(textRun);
         textRunPaintInfo.from = startPosition;
         textRunPaintInfo.to = endPosition;
 
         float baseline = scaledFont.fontMetrics().floatAscent();
         textRunPaintInfo.bounds = FloatRect(textOrigin.x(), textOrigin.y() - baseline,
             textSize.width(), textSize.height());
 
         scaledFont.drawText(context, textRunPaintInfo, textOrigin);
@@ skipping 154 matching lines @@
                 renderer().updateHitTestResult(result, locationInContainer.point() - toLayoutSize(accumulatedOffset));
                 if (!result.addNodeToRectBasedTestResult(renderer().node(), request, locationInContainer, rect))
                     return true;
              }
         }
     }
     return false;
 }
 
 } // namespace blink