projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upstream version 10.39.225.0
[platform/framework/web/crosswalk.git]
/
src
/
third_party
/
WebKit
/
Source
/
core
/
rendering
/
svg
/
RenderSVGResourceMasker.cpp
diff --git
a/src/third_party/WebKit/Source/core/rendering/svg/RenderSVGResourceMasker.cpp
b/src/third_party/WebKit/Source/core/rendering/svg/RenderSVGResourceMasker.cpp
index
b5def17
..
6e3a84a
100644
(file)
--- a/
src/third_party/WebKit/Source/core/rendering/svg/RenderSVGResourceMasker.cpp
+++ b/
src/third_party/WebKit/Source/core/rendering/svg/RenderSVGResourceMasker.cpp
@@
-76,13
+76,11
@@
bool RenderSVGResourceMasker::applyResource(RenderObject* object, RenderStyle*,
return true;
}
return true;
}
-void RenderSVGResourceMasker::postApplyResource(RenderObject* object, GraphicsContext*& context,
- unsigned short resourceMode, const Path*, const RenderSVGShape*)
+void RenderSVGResourceMasker::postApplyResource(RenderObject* object, GraphicsContext*& context)
{
ASSERT(object);
ASSERT(context);
ASSERT(style());
{
ASSERT(object);
ASSERT(context);
ASSERT(style());
- ASSERT_UNUSED(resourceMode, resourceMode == ApplyToDefaultMode);
ASSERT_WITH_SECURITY_IMPLICATION(!needsLayout());
FloatRect paintInvalidationRect = object->paintInvalidationRectInLocalCoordinates();
ASSERT_WITH_SECURITY_IMPLICATION(!needsLayout());
FloatRect paintInvalidationRect = object->paintInvalidationRectInLocalCoordinates();
@@
-122,12
+120,12
@@
void RenderSVGResourceMasker::drawMaskForRenderer(GraphicsContext* context, cons
}
if (!m_maskContentDisplayList)
}
if (!m_maskContentDisplayList)
-
m_maskContentDisplayList = as
DisplayList(context, contentTransformation);
+
create
DisplayList(context, contentTransformation);
ASSERT(m_maskContentDisplayList);
context->drawDisplayList(m_maskContentDisplayList.get());
}
ASSERT(m_maskContentDisplayList);
context->drawDisplayList(m_maskContentDisplayList.get());
}
-
PassRefPtr<DisplayList> RenderSVGResourceMasker::as
DisplayList(GraphicsContext* context,
+
void RenderSVGResourceMasker::create
DisplayList(GraphicsContext* context,
const AffineTransform& contentTransform)
{
ASSERT(context);
const AffineTransform& contentTransform)
{
ASSERT(context);
@@
-135,7
+133,8
@@
PassRefPtr<DisplayList> RenderSVGResourceMasker::asDisplayList(GraphicsContext*
// Using strokeBoundingBox (instead of paintInvalidationRectInLocalCoordinates) to avoid the intersection
// with local clips/mask, which may yield incorrect results when mixing objectBoundingBox and
// userSpaceOnUse units (http://crbug.com/294900).
// Using strokeBoundingBox (instead of paintInvalidationRectInLocalCoordinates) to avoid the intersection
// with local clips/mask, which may yield incorrect results when mixing objectBoundingBox and
// userSpaceOnUse units (http://crbug.com/294900).
- context->beginRecording(strokeBoundingBox());
+ FloatRect bounds = strokeBoundingBox();
+ context->beginRecording(bounds);
for (SVGElement* childElement = Traversal<SVGElement>::firstChild(*element()); childElement; childElement = Traversal<SVGElement>::nextSibling(*childElement)) {
RenderObject* renderer = childElement->renderer();
if (!renderer)
for (SVGElement* childElement = Traversal<SVGElement>::firstChild(*element()); childElement; childElement = Traversal<SVGElement>::nextSibling(*childElement)) {
RenderObject* renderer = childElement->renderer();
if (!renderer)
@@
-146,8
+145,7
@@
PassRefPtr<DisplayList> RenderSVGResourceMasker::asDisplayList(GraphicsContext*
SVGRenderingContext::renderSubtree(context, renderer, contentTransform);
}
SVGRenderingContext::renderSubtree(context, renderer, contentTransform);
}
-
- return context->endRecording();
+ m_maskContentDisplayList = context->endRecording();
}
void RenderSVGResourceMasker::calculateMaskContentPaintInvalidationRect()
}
void RenderSVGResourceMasker::calculateMaskContentPaintInvalidationRect()