Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1080)

Unified Diff: Source/core/rendering/svg/RenderSVGResourceGradient.cpp

Issue 638933002: Introduce SVGPaintServer (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Disambiguate. Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/core/rendering/svg/RenderSVGResourceGradient.cpp
diff --git a/Source/core/rendering/svg/RenderSVGResourceGradient.cpp b/Source/core/rendering/svg/RenderSVGResourceGradient.cpp
index 2edfe27f45389ae35d0aa40782022addc6b6b8a0..bc69c81a5b8f0a19054f661e19b9554fffd8cb0f 100644
--- a/Source/core/rendering/svg/RenderSVGResourceGradient.cpp
+++ b/Source/core/rendering/svg/RenderSVGResourceGradient.cpp
@@ -21,13 +21,8 @@
*/
#include "config.h"
-
#include "core/rendering/svg/RenderSVGResourceGradient.h"
-#include "core/rendering/svg/RenderSVGShape.h"
-#include "core/rendering/svg/SVGRenderSupport.h"
-#include "platform/graphics/GraphicsContext.h"
-
namespace blink {
RenderSVGResourceGradient::RenderSVGResourceGradient(SVGGradientElement* node)
@@ -50,11 +45,10 @@ void RenderSVGResourceGradient::removeClientFromCache(RenderObject* client, bool
markClientForInvalidation(client, markForInvalidation ? PaintInvalidation : ParentOnlyInvalidation);
}
-bool RenderSVGResourceGradient::applyResource(RenderObject* object, RenderStyle* style, GraphicsContext* context, RenderSVGResourceModeFlags resourceMode)
+SVGPaintServer RenderSVGResourceGradient::preparePaintServer(RenderObject* object, RenderStyle* style, RenderSVGResourceModeFlags resourceMode)
{
ASSERT(object);
ASSERT(style);
- ASSERT(context);
clearInvalidationMask();
@@ -64,12 +58,12 @@ bool RenderSVGResourceGradient::applyResource(RenderObject* object, RenderStyle*
// GradientData object! Leaving out the line below will cause svg/dynamic-updates/SVG*GradientElement-svgdom* to crash.
SVGGradientElement* gradientElement = toSVGGradientElement(element());
if (!gradientElement)
- return false;
+ return SVGPaintServer::invalid();
if (m_shouldCollectGradientAttributes) {
gradientElement->synchronizeAnimatedSVGAttribute(anyQName());
if (!collectGradientAttributes(gradientElement))
- return false;
+ return SVGPaintServer::invalid();
m_shouldCollectGradientAttributes = false;
}
@@ -78,7 +72,7 @@ bool RenderSVGResourceGradient::applyResource(RenderObject* object, RenderStyle*
// then the given effect (e.g. a gradient or a filter) will be ignored.
FloatRect objectBoundingBox = object->objectBoundingBox();
if (gradientUnits() == SVGUnitTypes::SVG_UNIT_TYPE_OBJECTBOUNDINGBOX && objectBoundingBox.isEmpty())
- return false;
+ return SVGPaintServer::invalid();
OwnPtr<GradientData>& gradientData = m_gradientMap.add(object, nullptr).storedValue->value;
if (!gradientData)
@@ -101,29 +95,14 @@ bool RenderSVGResourceGradient::applyResource(RenderObject* object, RenderStyle*
}
if (!gradientData->gradient)
- return false;
+ return SVGPaintServer::invalid();
const SVGRenderStyle& svgStyle = style->svgStyle();
AffineTransform computedGradientSpaceTransform = computeResourceSpaceTransform(object, gradientData->userspaceTransform, svgStyle, resourceMode);
gradientData->gradient->setGradientSpaceTransform(computedGradientSpaceTransform);
- // Draw gradient
- context->save();
-
- if (resourceMode & ApplyToFillMode)
- context->setFillGradient(gradientData->gradient);
- else if (resourceMode & ApplyToStrokeMode)
- context->setStrokeGradient(gradientData->gradient);
-
- updateGraphicsContext(context, style, *object, resourceMode);
- return true;
-}
-
-void RenderSVGResourceGradient::postApplyResource(GraphicsContext* context)
-{
- ASSERT(context);
- context->restore();
+ return SVGPaintServer(gradientData->gradient);
}
bool RenderSVGResourceGradient::isChildAllowed(RenderObject* child, RenderStyle*) const

Powered by Google App Engine
This is Rietveld 408576698