| Index: third_party/WebKit/Source/core/paint/ObjectPaintProperties.h
|
| diff --git a/third_party/WebKit/Source/core/paint/ObjectPaintProperties.h b/third_party/WebKit/Source/core/paint/ObjectPaintProperties.h
|
| index db6e7070340f7d58527568e16531d5182ebe5391..2d729712ed4d258ab5d5a4d25b3a1cdd79812e37 100644
|
| --- a/third_party/WebKit/Source/core/paint/ObjectPaintProperties.h
|
| +++ b/third_party/WebKit/Source/core/paint/ObjectPaintProperties.h
|
| @@ -92,12 +92,12 @@ private:
|
| void setPerspective(PassRefPtr<TransformPaintPropertyNode> perspective) { m_perspective = perspective; }
|
| void setSvgLocalToBorderBoxTransform(PassRefPtr<TransformPaintPropertyNode> transform)
|
| {
|
| - DCHECK(!scrollTranslation()) << "SVG elements cannot scroll so there should never be both a scroll translation and an SVG local to border box transform.";
|
| + DCHECK(!scrollTranslation() || !transform) << "SVG elements cannot scroll so there should never be both a scroll translation and an SVG local to border box transform.";
|
| m_svgLocalToBorderBoxTransform = transform;
|
| }
|
| void setScrollTranslation(PassRefPtr<TransformPaintPropertyNode> translation)
|
| {
|
| - DCHECK(!svgLocalToBorderBoxTransform()) << "SVG elements cannot scroll so there should never be both a scroll translation and an SVG local to border box transform.";
|
| + DCHECK(!svgLocalToBorderBoxTransform() || !translation) << "SVG elements cannot scroll so there should never be both a scroll translation and an SVG local to border box transform.";
|
| m_scrollTranslation = translation;
|
| }
|
| void setScrollbarPaintOffset(PassRefPtr<TransformPaintPropertyNode> paintOffset) { m_scrollbarPaintOffset = paintOffset; }
|
|
|