Changeset 29427 in webkit

Timestamp:

Jan 11, 2008, 9:50:36 PM (17 years ago)

Author:

mitz@apple.com

Message:

WebCore:

2008-01-11 Anyang Ren <​anyang.ren@gmail.com>

Reviewed by Darin Adler.

​http://bugs.webkit.org/show_bug.cgi?id=15960
The view source mode should skip an empty attribute value only if
the attribute name is not followed by an equal sign (=).

Test: fast/frames/viewsource-empty-attribute-value.html

• html/HTMLViewSourceDocument.cpp: (WebCore::HTMLViewSourceDocument::addViewSourceToken):

LayoutTests:

2008-01-11 Anyang Ren <​anyang.ren@gmail.com>

Reviewed by Darin Adler.

Add a new regression test for
​http://bugs.webkit.org/show_bug.cgi?id=15960
The view source mode should skip an empty attribute value only if
the attribute name is not followed by an equal sign (=).

• fast/frames/resources/viewsource-frame-1.html: Added.
• fast/frames/viewsource-empty-attribute-value-expected.txt: Added.
• fast/frames/viewsource-empty-attribute-value.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/frames/resources/viewsource-frame-1.html (added)
• LayoutTests/fast/frames/viewsource-empty-attribute-value-expected.txt (added)
• LayoutTests/fast/frames/viewsource-empty-attribute-value.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/html/HTMLViewSourceDocument.cpp (modified) (4 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2008-01-11  Anyang Ren  <anyang.ren@gmail.com>
+
+        Reviewed by Darin Adler.
+
+        Add a new regression test for
+        http://bugs.webkit.org/show_bug.cgi?id=15960
+        The view source mode should skip an empty attribute value only if
+        the attribute name is not followed by an equal sign (=).
+
+        * fast/frames/resources/viewsource-frame-1.html: Added.
+        * fast/frames/viewsource-empty-attribute-value-expected.txt: Added.
+        * fast/frames/viewsource-empty-attribute-value.html: Added.
+
 2008-01-11  Cameron Zwarich  <cwzwarich@uwaterloo.ca>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-01-11  Anyang Ren  <anyang.ren@gmail.com>
+
+        Reviewed by Darin Adler.
+
+        http://bugs.webkit.org/show_bug.cgi?id=15960
+        The view source mode should skip an empty attribute value only if
+        the attribute name is not followed by an equal sign (=).
+
+        Test: fast/frames/viewsource-empty-attribute-value.html
+
+        * html/HTMLViewSourceDocument.cpp:
+        (WebCore::HTMLViewSourceDocument::addViewSourceToken):
+
 2008-01-11  Sylvain Pasche  <sylvain.pasche@gmail.com>
 

trunk/WebCore/html/HTMLViewSourceDocument.cpp

@@ -129 +129 @@
             unsigned begin = 0;
             unsigned currAttr = 0;
+            Attribute* attr = 0;
             for (unsigned i = 0; i < size; i++) {
                 if (guide->at(i) == 'a' || guide->at(i) == 'x' || guide->at(i) == 'v') {
@@ -136 +137 @@
                     begin = i + 1;
 
-                    if (token->attrs && currAttr < token->attrs->length()) {
+                    if (guide->at(i) == 'a') {
+                        if (token->attrs && currAttr < token->attrs->length())
+                            attr = token->attrs->attributeItem(currAttr++);
+                        else
+                            attr = 0;
+                    }
+                    if (attr) {
                         if (guide->at(i) == 'a') {
-                            Attribute* attr = token->attrs->attributeItem(currAttr);
                             String name = attr->name().toString();
                             if (doctype)
@@ -148 +154 @@
                                     m_current = static_cast<Element*>(m_current->parent());
                             }
-                            if (attr->value().isNull() || attr->value().isEmpty())
-                                currAttr++;
                         } else {
-                            Attribute* attr = token->attrs->attributeItem(currAttr);
                             String value = attr->value().domString();
                             if (doctype)
@@ -165 +168 @@
                                     m_current = static_cast<Element*>(m_current->parent());
                             }
-                            currAttr++;
                         }
                     }