| Index: Source/core/layout/svg/LayoutSVGResourceClipper.cpp
|
| diff --git a/Source/core/layout/svg/LayoutSVGResourceClipper.cpp b/Source/core/layout/svg/LayoutSVGResourceClipper.cpp
|
| index eaccf03569b889c5f0d24517eba4a361f04ffba3..29123dc5a19a8c1bad7a08a5ac59022348bf8342 100644
|
| --- a/Source/core/layout/svg/LayoutSVGResourceClipper.cpp
|
| +++ b/Source/core/layout/svg/LayoutSVGResourceClipper.cpp
|
| @@ -85,7 +85,7 @@ bool LayoutSVGResourceClipper::tryPathOnlyClipping(DisplayItemClient client, Gra
|
| Path clipPath = Path();
|
|
|
| for (SVGElement* childElement = Traversal<SVGElement>::firstChild(*element()); childElement; childElement = Traversal<SVGElement>::nextSibling(*childElement)) {
|
| - LayoutObject* renderer = childElement->renderer();
|
| + LayoutObject* renderer = childElement->layoutObject();
|
| if (!renderer)
|
| continue;
|
| // Only shapes or paths are supported for direct clipping. We need to fallback to masking for texts.
|
| @@ -270,7 +270,7 @@ PassRefPtr<const SkPicture> LayoutSVGResourceClipper::createPicture()
|
| context.beginRecording(bounds);
|
|
|
| for (SVGElement* childElement = Traversal<SVGElement>::firstChild(*element()); childElement; childElement = Traversal<SVGElement>::nextSibling(*childElement)) {
|
| - LayoutObject* renderer = childElement->renderer();
|
| + LayoutObject* renderer = childElement->layoutObject();
|
| if (!renderer)
|
| continue;
|
|
|
| @@ -296,7 +296,7 @@ PassRefPtr<const SkPicture> LayoutSVGResourceClipper::createPicture()
|
| context.setFillRule(newClipRule);
|
|
|
| if (isUseElement)
|
| - renderer = childElement->renderer();
|
| + renderer = childElement->layoutObject();
|
|
|
| // Switch to a paint behavior where all children of this <clipPath> will be rendered using special constraints:
|
| // - fill-opacity/stroke-opacity/opacity set to 1
|
| @@ -316,7 +316,7 @@ void LayoutSVGResourceClipper::calculateClipContentPaintInvalidationRect()
|
| {
|
| // This is a rough heuristic to appraise the clip size and doesn't consider clip on clip.
|
| for (SVGElement* childElement = Traversal<SVGElement>::firstChild(*element()); childElement; childElement = Traversal<SVGElement>::nextSibling(*childElement)) {
|
| - LayoutObject* renderer = childElement->renderer();
|
| + LayoutObject* renderer = childElement->layoutObject();
|
| if (!renderer)
|
| continue;
|
| if (!renderer->isSVGShape() && !renderer->isSVGText() && !isSVGUseElement(*childElement))
|
| @@ -349,7 +349,7 @@ bool LayoutSVGResourceClipper::hitTestClipContent(const FloatRect& objectBoundin
|
| point = animatedLocalTransform.inverse().mapPoint(point);
|
|
|
| for (SVGElement* childElement = Traversal<SVGElement>::firstChild(*element()); childElement; childElement = Traversal<SVGElement>::nextSibling(*childElement)) {
|
| - LayoutObject* renderer = childElement->renderer();
|
| + LayoutObject* renderer = childElement->layoutObject();
|
| if (!renderer)
|
| continue;
|
| if (!renderer->isSVGShape() && !renderer->isSVGText() && !isSVGUseElement(*childElement))
|
|
|