Minor SVGFilterPainter cleanups

third_party/WebKit/Source/core/paint/SVGFilterPainter.cpp

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/paint/SVGFilterPainter.h"
 
 #include "core/layout/svg/LayoutSVGResourceFilter.h"
 #include "core/layout/svg/SVGLayoutSupport.h"
 #include "core/paint/LayoutObjectDrawingRecorder.h"
 #include "core/paint/TransformRecorder.h"
 #include "platform/graphics/filters/SkiaImageFilterBuilder.h"
 #include "platform/graphics/filters/SourceGraphic.h"
 #include "platform/graphics/paint/CompositingRecorder.h"
 #include "platform/graphics/paint/DrawingDisplayItem.h"
 #include "platform/graphics/paint/PaintController.h"
 
 namespace blink {
 
 GraphicsContext* SVGFilterRecordingContext::beginContent(FilterData* filterData)
 {
     ASSERT(filterData->m_state == FilterData::Initial);
 
-    GraphicsContext* context = &paintingContext();
-
     // Create a new context so the contents of the filter can be drawn and cached.
     m_paintController = PaintController::create();
     m_context = adoptPtr(new GraphicsContext(*m_paintController));
-    context = m_context.get();
 
     filterData->m_state = FilterData::RecordingContent;
-    return context;
+    return m_context.get();
 }
 
 void SVGFilterRecordingContext::endContent(FilterData* filterData)
 {
     ASSERT(filterData->m_state == FilterData::RecordingContent);
 
     SourceGraphic* sourceGraphic = filterData->filter->getSourceGraphic();
     ASSERT(sourceGraphic);
 
-    GraphicsContext* context = &paintingContext();
-
     // Use the context that contains the filtered content.
     ASSERT(m_paintController);
     ASSERT(m_context);
-    context = m_context.get();
-    context->beginRecording(filterData->filter->filterRegion());
+    m_context->beginRecording(filterData->filter->filterRegion());
     m_paintController->commitNewDisplayItems();
-    m_paintController->paintArtifact().replay(*context);
+    m_paintController->paintArtifact().replay(*m_context);
 
-    SkiaImageFilterBuilder::buildSourceGraphic(sourceGraphic, toSkSp(context->endRecording()));
+    SkiaImageFilterBuilder::buildSourceGraphic(sourceGraphic, toSkSp(m_context->endRecording()));
 
     // Content is cached by the source graphic so temporaries can be freed.
     m_paintController = nullptr;
     m_context = nullptr;
 
     filterData->m_state = FilterData::ReadyToPaint;
 }
 
-static void paintFilteredContent(const LayoutObject& object, GraphicsContext& context, FilterData* filterData)
+static void paintFilteredContent(GraphicsContext& context, FilterData* filterData)
 {
     ASSERT(filterData->m_state == FilterData::ReadyToPaint);
     ASSERT(filterData->filter->getSourceGraphic());
 
     filterData->m_state = FilterData::PaintingFilter;
 
     sk_sp<SkImageFilter> imageFilter = SkiaImageFilterBuilder::build(filterData->filter->lastEffect(), ColorSpaceDeviceRGB);
     FloatRect boundaries = filterData->filter->filterRegion();
     context.save();
 
@@ skipping 77 matching lines @@
             filterData->m_state = FilterData::RecordingContent;
     }
 
     GraphicsContext& context = recordingContext.paintingContext();
     if (LayoutObjectDrawingRecorder::useCachedDrawingIfPossible(context, object, DisplayItem::SVGFilter))
         return;
 
     // TODO(chrishtr): stop using an infinite rect, and instead bound the filter.
     LayoutObjectDrawingRecorder recorder(context, object, DisplayItem::SVGFilter, LayoutRect::infiniteIntRect());
     if (filterData && filterData->m_state == FilterData::ReadyToPaint)
-        paintFilteredContent(object, context, filterData);
+        paintFilteredContent(context, filterData);
 }
 
 } // namespace blink