diff options
author | Ben Murdoch <benm@google.com> | 2010-10-22 13:02:20 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2010-10-26 15:21:41 +0100 |
commit | a94275402997c11dd2e778633dacf4b7e630a35d (patch) | |
tree | e66f56c67e3b01f22c9c23cd932271ee9ac558ed /WebCore/svg/SVGPatternElement.cpp | |
parent | 09e26c78506587b3f5d930d7bc72a23287ffbec0 (diff) | |
download | external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.zip external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.tar.gz external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.tar.bz2 |
Merge WebKit at r70209: Initial merge by Git
Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e
Diffstat (limited to 'WebCore/svg/SVGPatternElement.cpp')
-rw-r--r-- | WebCore/svg/SVGPatternElement.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/WebCore/svg/SVGPatternElement.cpp b/WebCore/svg/SVGPatternElement.cpp index 6a8a108..0f3b5d4 100644 --- a/WebCore/svg/SVGPatternElement.cpp +++ b/WebCore/svg/SVGPatternElement.cpp @@ -200,9 +200,8 @@ RenderObject* SVGPatternElement::createRenderer(RenderArena* arena, RenderStyle* return new (arena) RenderSVGResourcePattern(this); } -PatternAttributes SVGPatternElement::collectPatternProperties() const +void SVGPatternElement::collectPatternAttributes(PatternAttributes& attributes) const { - PatternAttributes attributes; HashSet<const SVGPatternElement*> processedPatterns; const SVGPatternElement* current = this; @@ -246,8 +245,6 @@ PatternAttributes SVGPatternElement::collectPatternProperties() const } else current = 0; } - - return attributes; } bool SVGPatternElement::selfHasRelativeLengths() const |