Bug 43682 – Add missing String builder for SVGPathParser

• Status: RESOLVED
• Resolution: FIXED
• Component: SVG

[Dirk Schulze]

Add missing String builder (inheriting from SVGCustomer) for SVGPathParser.

[Dirk Schulze]

Created attachment 63832 [details]
Patch

[Nikolas Zimmermann]

Comment on attachment 63832 [details]
Patch

WebCore/svg/SVGPathParserFactory.cpp:80
 +      s_parser->setCurrentSource(source);
For consistency, add a newline before this statement and remove the one before return s_parser :-)

WebCore/svg/SVGPathParserFactory.cpp:181
 +      ASSERT(stream);
Ok you misunderstood the suggestion I gave.

The passed in OwnPtr should not be initialized, this is the task of this function.
The function should be used like this:

OwnPtr<SVGPathByteStream> stream; // stream pointer is null here!
if (!factory->buildSVGPathByteStreamFromString(d, stream, NormalizedParsing))
    return false;
// stream pointer is now set.

That means, the ASSERT(stream) should go away. The function should be used like this:

bool SVGPathParserFactory::buildSVGPathByteStreamFromString(const String& d, OwnPtr<SVGPathByteStream>& result, PathParsingMode parsingMode)
{
    if (d.isEmpty())
        return false;

    OwnPtr<SVGPathByteStream> stream = SVGPathByteStream::create();
    SVGPathByteStreamBuilder* builder = globalSVGPathByteStreamBuilder(stream.get());

    OwnPtr<SVGPathStringSource> source = SVGPathStringSource::create(d);
    SVGPathParser* parser = globalSVGPathParser(source.get(), builder);
    bool ok = parser->parsePathDataFromSource(parsingMode);
    parser->cleanup();
    result = stream.release(); // this is the important step
    return ok;
}

r=me, with those fixes.

[Dirk Schulze]

Committed r64949: <http://trac.webkit.org/changeset/64949>