Changeset 21819 in webkit


Ignore:
Timestamp:
May 26, 2007 11:09:36 PM (17 years ago)
Author:
hyatt
Message:

Fix for radar bug 5219562, PNG isn't displayed on SVG test suite.
Improve <object> error handling so that it recovers properly when
<td> is used inside it.

Reviewed by olliej

Added fast/invalid/td-inside-object.html

  • html/HTMLObjectElement.h: (WebCore::HTMLObjectElement::tagPriority):
  • html/HTMLParser.cpp: (WebCore::HTMLParser::handleError):
  • html/HTMLParserErrorCodes.cpp: (WebCore::htmlParserErrorMessageTemplate):
  • html/HTMLParserErrorCodes.h:
Location:
trunk
Files:
6 added
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebCore/ChangeLog

    r21818 r21819  
     12007-05-26  David Hyatt  <hyatt@apple.com>
     2
     3        Fix for radar bug 5219562, PNG isn't displayed on SVG test suite.
     4        Improve <object> error handling so that it recovers properly when
     5        <td> is used inside it.
     6
     7        Reviewed by olliej
     8
     9        Added fast/invalid/td-inside-object.html
     10
     11        * html/HTMLObjectElement.h:
     12        (WebCore::HTMLObjectElement::tagPriority):
     13        * html/HTMLParser.cpp:
     14        (WebCore::HTMLParser::handleError):
     15        * html/HTMLParserErrorCodes.cpp:
     16        (WebCore::htmlParserErrorMessageTemplate):
     17        * html/HTMLParserErrorCodes.h:
     18
    1192007-05-26  David Hyatt  <hyatt@apple.com>
    220

  • trunk/WebCore/html/HTMLObjectElement.h

    r21359 r21819  
    4848    ~HTMLObjectElement();
    4949
    50     virtual int tagPriority() const { return 7; }
     50    virtual int tagPriority() const { return 5; }
    5151
    5252    virtual void parseMappedAttribute(MappedAttribute*);

  • trunk/WebCore/html/HTMLParser.cpp

    r21817 r21819  
    560560            }
    561561        } else if (h->hasLocalName(objectTag)) {
    562             reportError(BadObjectContentError, &localName);
    563             setSkipMode(objectTag);
    564             return false;
     562            reportError(MisplacedContentRetryError, &localName, &currentTagName);
     563            popBlock(objectTag);
     564            handled = true;
    565565        } else if (h->hasLocalName(pTag) || isHeaderTag(currentTagName)) {
    566566            if (!isInline(n)) {

  • trunk/WebCore/html/HTMLParserErrorCodes.cpp

    r21746 r21819  
    3535        "<head> must be a child of <html>.  Content ignored.",
    3636        "Extra %tag1 encountered.  Migrating attributes back to the original %tag1 element and ignoring the tag.",
    37         "%tag1 is not allowed inside <object>. Skipping all content until </object> is encountered.",
    3837        "<area> is not allowed inside %tag1. Moving the <area> into the nearest enclosing <map>.",
    3938        "%tag1 is not allowed inside %tag2. Content ignored.",

  • trunk/WebCore/html/HTMLParserErrorCodes.h

    r21746 r21819  
    3333    MisplacedHeadError,
    3434    RedundantHTMLBodyError,
    35     BadObjectContentError,
    3635    MisplacedAreaError,
    3736    IgnoredContentError,
Note: See TracChangeset for help on using the changeset viewer.